Skip to content

Commit 28230fb

Browse files
adauradaur
committed
Massive rewrite
1 parent 79a91a2 commit 28230fb

Some content is hidden

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

46 files changed

+722
-722
lines changed

‎featherbb/Controller/Admin/Bans.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public function __construct()
2424
$this->user = Container::get('user');
2525
$this->request = $this->feather->request;
2626
$this->model = new \FeatherBB\Model\Admin\Bans();
27-
load_textdomain('featherbb', Container::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/bans.mo');
27+
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/bans.mo');
2828

29-
if ($this->user->g_id != Container::get('forum_env')['FEATHER_ADMIN'] && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
29+
if ($this->user->g_id != Config::get('forum_env')['FEATHER_ADMIN'] && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
3030
throw new Error(__('No permission'), '403');
3131
}
3232
}

‎featherbb/Controller/Admin/Categories.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function __construct()
2525
$this->user = Container::get('user');
2626
$this->request = $this->feather->request;
2727
$this->model = new \FeatherBB\Model\Admin\Categories();
28-
load_textdomain('featherbb', Container::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/categories.mo');
28+
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/categories.mo');
2929
}
3030

3131
public function add()

‎featherbb/Controller/Admin/Censoring.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function __construct()
2222
$this->user = Container::get('user');
2323
$this->request = $this->feather->request;
2424
$this->model = new \FeatherBB\Model\Admin\Censoring();
25-
load_textdomain('featherbb', Container::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/censoring.mo');
25+
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/censoring.mo');
2626
}
2727

2828
public function display()

‎featherbb/Controller/Admin/Forums.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function __construct()
2323
$this->user = Container::get('user');
2424
$this->request = $this->feather->request;
2525
$this->model = new \FeatherBB\Model\Admin\Forums();
26-
load_textdomain('featherbb', Container::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/forums.mo');
26+
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/forums.mo');
2727
}
2828

2929
public function add()

‎featherbb/Controller/Admin/Groups.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function __construct()
2323
$this->user = Container::get('user');
2424
$this->request = $this->feather->request;
2525
$this->model = new \FeatherBB\Model\Admin\Groups();
26-
load_textdomain('featherbb', Container::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/groups.mo');
26+
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/groups.mo');
2727
}
2828

2929
public function display()

‎featherbb/Controller/Admin/Index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function __construct()
2323
$this->config = $this->feather->config;
2424
$this->user = Container::get('user');
2525
$this->request = $this->feather->request;
26-
load_textdomain('featherbb', Container::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/index.mo');
26+
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/index.mo');
2727
}
2828

2929
public function display($action = null)

‎featherbb/Controller/Admin/Maintenance.php‎

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

2424
public function display()

‎featherbb/Controller/Admin/Options.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function __construct()
2222
$this->user = Container::get('user');
2323
$this->request = $this->feather->request;
2424
$this->model = new \FeatherBB\Model\Admin\Options();
25-
load_textdomain('featherbb', Container::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/options.mo');
25+
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/options.mo');
2626
}
2727

2828
public function display()

‎featherbb/Controller/Admin/Parser.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function __construct()
2424
$this->user = Container::get('user');
2525
$this->request = $this->feather->request;
2626
$this->model = new \FeatherBB\Model\Admin\Parser();
27-
load_textdomain('featherbb', Container::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/parser.mo');
27+
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/parser.mo');
2828
}
2929

3030
public function display()
@@ -34,15 +34,15 @@ public function display()
3434
Container::get('hooks')->fire('controller.admin.parser.display');
3535

3636
// Legacy
37-
require Container::get('forum_env')['FEATHER_ROOT'] . 'featherbb/lang/' . $this->user->language . '/admin/parser.php';
37+
require Config::get('forum_env')['FEATHER_ROOT'] . 'featherbb/lang/' . $this->user->language . '/admin/parser.php';
3838

3939
// This is where the parser data lives and breathes.
40-
$cache_file = Container::get('forum_env')['FEATHER_ROOT'].'cache/cache_parser_data.php';
40+
$cache_file = Config::get('forum_env')['FEATHER_ROOT'].'cache/cache_parser_data.php';
4141

4242
// If RESET button pushed, or no cache file, re-compile master bbcode source file.
4343
if ($this->request->post('reset') || !file_exists($cache_file)) {
44-
require_once(Container::get('forum_env')['FEATHER_ROOT'].'featherbb/Core/parser/bbcd_source.php');
45-
require_once(Container::get('forum_env')['FEATHER_ROOT'].'featherbb/Core/parser/bbcd_compile.php');
44+
require_once(Config::get('forum_env')['FEATHER_ROOT'].'featherbb/Core/parser/bbcd_source.php');
45+
require_once(Config::get('forum_env')['FEATHER_ROOT'].'featherbb/Core/parser/bbcd_compile.php');
4646
Router::redirect(Router::pathFor('adminParser'), $lang_admin_parser['reset_success']);
4747
}
4848

@@ -65,7 +65,7 @@ public function display()
6565
if (preg_match('/^[\w\-.]++$/', $name)) { // If we have a valid filename?
6666
if (preg_match('%^image/%', $f['type'])) { // If we have an image file type?
6767
if ($f['size'] > 0 && $f['size'] <= $this->config['o_avatars_size']) {
68-
if (move_uploaded_file($f['tmp_name'], Container::get('forum_env')['FEATHER_ROOT'] .'style/img/smilies/'. $name)) {
68+
if (move_uploaded_file($f['tmp_name'], Config::get('forum_env')['FEATHER_ROOT'] .'style/img/smilies/'. $name)) {
6969
Router::redirect(Router::pathFor('adminParser'), $lang_admin_parser['upload success']);
7070
} else { // Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
7171
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
@@ -22,7 +22,7 @@ public function __construct()
2222
$this->user = Container::get('user');
2323
$this->request = $this->feather->request;
2424
$this->model = new \FeatherBB\Model\Admin\Permissions();
25-
load_textdomain('featherbb', Container::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/permissions.mo');
25+
load_textdomain('featherbb', Config::get('forum_env')['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/permissions.mo');
2626
}
2727

2828
public function display()

0 commit comments

Comments
 (0)