Skip to content

Commit 79a91a2

Browse files
adauradaur
committed
Massive rewrite
1 parent 94b6961 commit 79a91a2

23 files changed

+94
-106
lines changed

‎featherbb/Controller/Admin/Bans.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function display()
4747

4848
$ban_data = $this->model->find_ban($start_from);
4949

50-
$this->feather->template->setPageInfo(array(
50+
View::setPageInfo(array(
5151
'admin_console' => true,
5252
'page' => $p,
5353
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans'), __('Results head')),
@@ -59,7 +59,7 @@ public function display()
5959
else {
6060
AdminUtils::generateAdminMenu('bans');
6161

62-
$this->feather->template->setPageInfo(array(
62+
View::setPageInfo(array(
6363
'admin_console' => true,
6464
'focus_element' => array('bans', 'new_ban_user'),
6565
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans')),
@@ -78,7 +78,7 @@ public function add($id = null)
7878

7979
AdminUtils::generateAdminMenu('bans');
8080

81-
$this->feather->template->setPageInfo(array(
81+
View::setPageInfo(array(
8282
'admin_console' => true,
8383
'focus_element' => array('bans2', 'ban_user'),
8484
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans')),
@@ -104,7 +104,7 @@ public function edit($id)
104104
}
105105
AdminUtils::generateAdminMenu('bans');
106106

107-
$this->feather->template->setPageInfo(array(
107+
View::setPageInfo(array(
108108
'admin_console' => true,
109109
'focus_element' => array('bans2', 'ban_user'),
110110
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Bans')),

‎featherbb/Controller/Admin/Categories.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function display()
9696

9797
AdminUtils::generateAdminMenu('categories');
9898

99-
$this->feather->template->setPageInfo(array(
99+
View::setPageInfo(array(
100100
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Categories')),
101101
'active_page' => 'admin',
102102
'admin_console' => true,

‎featherbb/Controller/Admin/Censoring.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function display()
4646

4747
AdminUtils::generateAdminMenu('censoring');
4848

49-
$this->feather->template->setPageInfo(array(
49+
View::setPageInfo(array(
5050
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Censoring')),
5151
'focus_element' => array('censoring', 'new_search_for'),
5252
'active_page' => 'admin',

‎featherbb/Controller/Admin/Forums.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ class Forums
1818
{
1919
public function __construct()
2020
{
21-
$this->feather = \Slim\Slim::getInstance();
2221
$this->start = $this->feather->start;
2322
$this->config = $this->feather->config;
2423
$this->user = Container::get('user');
@@ -115,7 +114,7 @@ public function edit($forum_id)
115114
} else {
116115
AdminUtils::generateAdminMenu('forums');
117116

118-
$this->feather->template->setPageInfo(array(
117+
View::setPageInfo(array(
119118
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
120119
'active_page' => 'admin',
121120
'admin_console' => true,
@@ -143,7 +142,7 @@ public function delete($forum_id)
143142

144143
AdminUtils::generateAdminMenu('forums');
145144

146-
$this->feather->template->setPageInfo(array(
145+
View::setPageInfo(array(
147146
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
148147
'active_page' => 'admin',
149148
'admin_console' => true,
@@ -179,7 +178,7 @@ public function display()
179178
AdminUtils::generateAdminMenu('forums');
180179

181180
$categories_model = new \FeatherBB\Model\Admin\Categories();
182-
$this->feather->template->setPageInfo(array(
181+
View::setPageInfo(array(
183182
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Forums')),
184183
'active_page' => 'admin',
185184
'admin_console' => true,

‎featherbb/Controller/Admin/Groups.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function display()
3939

4040
AdminUtils::generateAdminMenu('groups');
4141

42-
$this->feather->template->setPageInfo(array(
42+
View::setPageInfo(array(
4343
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
4444
'active_page' => 'admin',
4545
'admin_console' => true,
@@ -72,7 +72,7 @@ public function delete($id)
7272
} else {
7373
AdminUtils::generateAdminMenu('groups');
7474

75-
$this->feather->template->setPageInfo(array(
75+
View::setPageInfo(array(
7676
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
7777
'active_page' => 'admin',
7878
'admin_console' => true,
@@ -85,7 +85,7 @@ public function delete($id)
8585

8686
AdminUtils::generateAdminMenu('groups');
8787

88-
$this->feather->template->setPageInfo(array(
88+
View::setPageInfo(array(
8989
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
9090
'active_page' => 'admin',
9191
'admin_console' => true,
@@ -114,7 +114,7 @@ public function addedit($id = '')
114114

115115
$group = $this->model->info_add_group($groups, $id);
116116

117-
$this->feather->template->setPageInfo(array(
117+
View::setPageInfo(array(
118118
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('User groups')),
119119
'active_page' => 'admin',
120120
'admin_console' => true,

‎featherbb/Controller/Admin/Index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function display($action = null)
5050

5151
AdminUtils::generateAdminMenu('index');
5252

53-
$this->feather->template->setPageInfo(array(
53+
View::setPageInfo(array(
5454
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Index')),
5555
'active_page' => 'admin',
5656
'admin_console' => true

‎featherbb/Controller/Admin/Maintenance.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function display()
3535
if ($action == 'rebuild') {
3636
$this->model->rebuild();
3737

38-
$this->feather->template->setPageInfo(array(
38+
View::setPageInfo(array(
3939
'page_title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Rebuilding search index')),
4040
'query_str' => $this->model->get_query_str()
4141
)
@@ -52,7 +52,7 @@ public function display()
5252
$this->model->prune_comply($prune_from, $prune_sticky);
5353
}
5454

55-
$this->feather->template->setPageInfo(array(
55+
View::setPageInfo(array(
5656
'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Prune')),
5757
'active_page' => 'admin',
5858
'admin_console' => true,
@@ -65,7 +65,7 @@ public function display()
6565

6666
AdminUtils::generateAdminMenu('maintenance');
6767

68-
$this->feather->template->setPageInfo(array(
68+
View::setPageInfo(array(
6969
'title' => array(Utils::escape($this->feather->forum_settings['o_board_title']), __('Admin'), __('Maintenance')),
7070
'active_page' => 'admin',
7171
'admin_console' => true,

‎featherbb/Controller/Admin/Options.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function display()
3535

3636
AdminUtils::generateAdminMenu('options');
3737

38-
$this->feather->template->setPageInfo(array(
38+
View::setPageInfo(array(
3939
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Options')),
4040
'active_page' => 'admin',
4141
'admin_console' => true,

‎featherbb/Controller/Admin/Parser.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public function display()
205205

206206
AdminUtils::generateAdminMenu('parser');
207207

208-
$this->feather->template->setPageInfo(array(
208+
View::setPageInfo(array(
209209
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Parser')),
210210
'active_page' => 'admin',
211211
'admin_console' => true,

‎featherbb/Controller/Admin/Permissions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function display()
3636

3737
AdminUtils::generateAdminMenu('permissions');
3838

39-
$this->feather->template->setPageInfo(array(
39+
View::setPageInfo(array(
4040
'title' => array(Utils::escape($this->config['o_board_title']), __('Admin'), __('Permissions')),
4141
'active_page' => 'admin',
4242
'admin_console' => true,

0 commit comments

Comments
 (0)