Skip to content

Commit d9ccfe9

Browse files
beaver-devbeaver-dev
committed
Add proxy to ForumEnv settings
1 parent 208b5b7 commit d9ccfe9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+238
-238
lines changed

‎featherbb/Controller/Admin/Bans.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ class Bans
1919
public function __construct()
2020
{
2121
$this->model = new \FeatherBB\Model\Admin\Bans();
22-
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.Container::get('user')->language.'/admin/bans.mo');
22+
load_textdomain('featherbb', ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.Container::get('user')->language.'/admin/bans.mo');
2323

24-
if (Container::get('user')->g_id != Config::get('forum_env')['FEATHER_ADMIN'] && (Container::get('user')->g_moderator != '1' || Container::get('user')->g_mod_ban_users == '0')) {
24+
if (Container::get('user')->g_id != ForumEnv::get('FEATHER_ADMIN') && (Container::get('user')->g_moderator != '1' || Container::get('user')->g_mod_ban_users == '0')) {
2525
throw new Error(__('No permission'), '403');
2626
}
2727
}

‎featherbb/Controller/Admin/Categories.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Categories
2020
public function __construct()
2121
{
2222
$this->model = new \FeatherBB\Model\Admin\Categories();
23-
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.Container::get('user')->language.'/admin/categories.mo');
23+
load_textdomain('featherbb', ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.Container::get('user')->language.'/admin/categories.mo');
2424
}
2525

2626
public function add($req, $res, $args)

‎featherbb/Controller/Admin/Censoring.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Censoring
1717
public function __construct()
1818
{
1919
$this->model = new \FeatherBB\Model\Admin\Censoring();
20-
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.Container::get('user')->language.'/admin/censoring.mo');
20+
load_textdomain('featherbb', ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.Container::get('user')->language.'/admin/censoring.mo');
2121
}
2222

2323
public function display($req, $res, $args)

‎featherbb/Controller/Admin/Forums.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Forums
1919
public function __construct()
2020
{
2121
$this->model = new \FeatherBB\Model\Admin\Forums();
22-
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.Container::get('user')->language.'/admin/forums.mo');
22+
load_textdomain('featherbb', ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.Container::get('user')->language.'/admin/forums.mo');
2323
}
2424

2525
public function add()

‎featherbb/Controller/Admin/Groups.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Groups
1818
public function __construct()
1919
{
2020
$this->model = new \FeatherBB\Model\Admin\Groups();
21-
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.Container::get('user')->language.'/admin/groups.mo');
21+
load_textdomain('featherbb', ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.Container::get('user')->language.'/admin/groups.mo');
2222
}
2323

2424
public function display($req, $res, $args)

‎featherbb/Controller/Admin/Index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Index
1818
{
1919
public function __construct()
2020
{
21-
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.Container::get('user')->language.'/admin/index.mo');
21+
load_textdomain('featherbb', ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.Container::get('user')->language.'/admin/index.mo');
2222
}
2323

2424
public function display($req, $res, $args)

‎featherbb/Controller/Admin/Maintenance.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Maintenance
1717
public function __construct()
1818
{
1919
$this->model = new \FeatherBB\Model\Admin\Maintenance();
20-
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.Container::get('user')->language.'/admin/maintenance.mo');
20+
load_textdomain('featherbb', ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.Container::get('user')->language.'/admin/maintenance.mo');
2121
}
2222

2323
public function display($req, $res, $args)

‎featherbb/Controller/Admin/Options.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Options
1717
public function __construct()
1818
{
1919
$this->model = new \FeatherBB\Model\Admin\Options();
20-
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.Container::get('user')->language.'/admin/options.mo');
20+
load_textdomain('featherbb', ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.Container::get('user')->language.'/admin/options.mo');
2121
}
2222

2323
public function display($req, $res, $args)

‎featherbb/Controller/Admin/Parser.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Parser
1919
public function __construct()
2020
{
2121
$this->model = new \FeatherBB\Model\Admin\Parser();
22-
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.Container::get('user')->language.'/admin/parser.mo');
22+
load_textdomain('featherbb', ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.Container::get('user')->language.'/admin/parser.mo');
2323
}
2424

2525
public function display($req, $res, $args)
@@ -29,15 +29,15 @@ public function display($req, $res, $args)
2929
Container::get('hooks')->fire('controller.admin.parser.display');
3030

3131
// Legacy
32-
require Config::get('forum_env')['FEATHER_ROOT'] . 'featherbb/lang/' . Container::get('user')->language . '/admin/parser.php';
32+
require ForumEnv::get('FEATHER_ROOT') . 'featherbb/lang/' . Container::get('user')->language . '/admin/parser.php';
3333

3434
// This is where the parser data lives and breathes.
35-
$cache_file = Config::get('forum_env')['FEATHER_ROOT'].'cache/cache_parser_data.php';
35+
$cache_file = ForumEnv::get('FEATHER_ROOT').'cache/cache_parser_data.php';
3636

3737
// If RESET button pushed, or no cache file, re-compile master bbcode source file.
3838
if (Input::post('reset') || !file_exists($cache_file)) {
39-
require_once(Config::get('forum_env')['FEATHER_ROOT'].'featherbb/Core/parser/bbcd_source.php');
40-
require_once(Config::get('forum_env')['FEATHER_ROOT'].'featherbb/Core/parser/bbcd_compile.php');
39+
require_once(ForumEnv::get('FEATHER_ROOT').'featherbb/Core/parser/bbcd_source.php');
40+
require_once(ForumEnv::get('FEATHER_ROOT').'featherbb/Core/parser/bbcd_compile.php');
4141
return Router::redirect(Router::pathFor('adminParser'), $lang_admin_parser['reset_success']);
4242
}
4343

@@ -60,7 +60,7 @@ public function display($req, $res, $args)
6060
if (preg_match('/^[\w\-.]++$/', $name)) { // If we have a valid filename?
6161
if (preg_match('%^image/%', $f['type'])) { // If we have an image file type?
6262
if ($f['size'] > 0 && $f['size'] <= ForumSettings::get('o_avatars_size')) {
63-
if (move_uploaded_file($f['tmp_name'], Config::get('forum_env')['FEATHER_ROOT'] .'style/img/smilies/'. $name)) {
63+
if (move_uploaded_file($f['tmp_name'], ForumEnv::get('FEATHER_ROOT') .'style/img/smilies/'. $name)) {
6464
return Router::redirect(Router::pathFor('adminParser'), $lang_admin_parser['upload success']);
6565
} else { // Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
6666
throw new Error($lang_admin_parser['upload_err_1'], 500);

‎featherbb/Controller/Admin/Permissions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Permissions
1717
public function __construct()
1818
{
1919
$this->model = new \FeatherBB\Model\Admin\Permissions();
20-
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.Container::get('user')->language.'/admin/permissions.mo');
20+
load_textdomain('featherbb', ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.Container::get('user')->language.'/admin/permissions.mo');
2121
}
2222

2323
public function display($req, $res, $args)

0 commit comments

Comments
 (0)