Skip to content

Commit 63af6f1

Browse files
beaver-devbeaver-dev
committed
Fix redirects in Admin pages
1 parent f54a1a7 commit 63af6f1

File tree

15 files changed

+44
-40
lines changed

15 files changed

+44
-40
lines changed

‎featherbb/Controller/Admin/Bans.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function add($req, $res, $args)
6868
Container::get('hooks')->fire('controller.admin.bans.add');
6969

7070
if (Input::post('add_edit_ban')) {
71-
$this->model->insert_ban();
71+
return $this->model->insert_ban();
7272
}
7373

7474
AdminUtils::generateAdminMenu('bans');
@@ -87,15 +87,15 @@ public function delete($req, $res, $args)
8787
Container::get('hooks')->fire('controller.admin.bans.delete');
8888

8989
// Remove the ban
90-
$this->model->remove_ban($req, $res, $args);
90+
return $this->model->remove_ban($req, $res, $args);
9191
}
9292

9393
public function edit($req, $res, $args)
9494
{
9595
Container::get('hooks')->fire('controller.admin.bans.edit');
9696

9797
if (Input::post('add_edit_ban')) {
98-
$this->model->insert_ban();
98+
return $this->model->insert_ban();
9999
}
100100
AdminUtils::generateAdminMenu('bans');
101101

‎featherbb/Controller/Admin/Censoring.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ public function display($req, $res, $args)
2626

2727
// Add a censor word
2828
if (Input::post('add_word')) {
29-
$this->model->add_word();
29+
return $this->model->add_word();
3030
}
3131

3232
// Update a censor word
3333
elseif (Input::post('update')) {
34-
$this->model->update_word();
34+
return $this->model->update_word();
3535
}
3636

3737
// Remove a censor word
3838
elseif (Input::post('remove')) {
39-
$this->model->remove_word();
39+
return $this->model->remove_word();
4040
}
4141

4242
AdminUtils::generateAdminMenu('censoring');
4343

44-
View::setPageInfo(array(
44+
return View::setPageInfo(array(
4545
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Censoring')),
4646
'focus_element' => array('censoring', 'new_search_for'),
4747
'active_page' => 'admin',

‎featherbb/Controller/Admin/Forums.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,13 @@ public function delete($req, $res, $args)
127127
{
128128
Container::get('hooks')->fire('controller.admin.forums.delete');
129129

130+
if (!$cur_forum = $this->model->get_forum_info($args['id'])) {
131+
$notFoundHandler = Container::get('notFoundHandler');
132+
return $notFoundHandler($req, $res);
133+
}
134+
130135
if(Request::isPost()) {
131-
$this->model->delete_forum($args['forum_id']);
136+
$this->model->delete_forum($args['id']);
132137
// Regenerate the quick jump cache
133138
Container::get('cache')->store('quickjump', Cache::get_quickjump());
134139

@@ -142,7 +147,7 @@ public function delete($req, $res, $args)
142147
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Forums')),
143148
'active_page' => 'admin',
144149
'admin_console' => true,
145-
'cur_forum' => $this->model->get_forum_info($args['forum_id']),
150+
'cur_forum' => $cur_forum
146151
)
147152
)->addTemplate('admin/forums/delete_forum.php')->display();
148153
}

‎featherbb/Controller/Admin/Groups.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ public function delete($req, $res, $args)
6363
// If the group doesn't have any members or if we've already selected a group to move the members to
6464
if (!$is_member || Input::post('del_group')) {
6565
if (Input::post('del_group_comply') || Input::post('del_group')) {
66-
$this->model->delete_group($args['id']);
66+
return $this->model->delete_group($args['id']);
6767
} else {
6868
AdminUtils::generateAdminMenu('groups');
6969

70-
View::setPageInfo(array(
70+
return View::setPageInfo(array(
7171
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('User groups')),
7272
'active_page' => 'admin',
7373
'admin_console' => true,
@@ -80,7 +80,7 @@ public function delete($req, $res, $args)
8080

8181
AdminUtils::generateAdminMenu('groups');
8282

83-
View::setPageInfo(array(
83+
return View::setPageInfo(array(
8484
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('User groups')),
8585
'active_page' => 'admin',
8686
'admin_console' => true,

‎featherbb/Controller/Admin/Index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function display($req, $res, $args)
4949

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

52-
View::setPageInfo(array(
52+
return View::setPageInfo(array(
5353
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Index')),
5454
'active_page' => 'admin',
5555
'admin_console' => true

‎featherbb/Controller/Admin/Options.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function display($req, $res, $args)
2525
Container::get('hooks')->fire('controller.admin.options.display');
2626

2727
if (Request::isPost()) {
28-
$this->model->update_options();
28+
return $this->model->update_options();
2929
}
3030

3131
AdminUtils::generateAdminMenu('options');

‎featherbb/Controller/Admin/Parser.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,18 +163,18 @@ public function display($req, $res, $args)
163163
continue; // Skip last pseudo-tag
164164
}
165165
$tag =& $bbcd[$tagname];
166-
if ($this->request->post($tagname.'_in_post') && $this->request->post($tagname.'_in_post') == '1') {
166+
if (Input::post($tagname.'_in_post') && Input::post($tagname.'_in_post') == '1') {
167167
$tag['in_post'] = true;
168168
} else {
169169
$tag['in_post'] = false;
170170
}
171-
if ($this->request->post($tagname.'_in_sig') && $this->request->post($tagname.'_in_sig') == '1') {
171+
if (Input::post($tagname.'_in_sig') && Input::post($tagname.'_in_sig') == '1') {
172172
$tag['in_sig'] = true;
173173
} else {
174174
$tag['in_sig'] = false;
175175
}
176-
if ($this->request->post($tagname.'_depth_max') && preg_match('/^\d++$/', $this->request->post($tagname.'_depth_max'))) {
177-
$tag['depth_max'] = (int)$this->request->post($tagname.'_depth_max');
176+
if (Input::post($tagname.'_depth_max') && preg_match('/^\d++$/', Input::post($tagname.'_depth_max'))) {
177+
$tag['depth_max'] = (int)Input::post($tagname.'_depth_max');
178178
}
179179
}
180180

@@ -200,7 +200,7 @@ public function display($req, $res, $args)
200200

201201
AdminUtils::generateAdminMenu('parser');
202202

203-
View::setPageInfo(array(
203+
return View::setPageInfo(array(
204204
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Parser')),
205205
'active_page' => 'admin',
206206
'admin_console' => true,

‎featherbb/Controller/Admin/Permissions.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public function display($req, $res, $args)
2626

2727
// Update permissions
2828
if (Request::isPost()) {
29-
$this->model->update_permissions();
29+
return $this->model->update_permissions();
3030
}
3131

3232
AdminUtils::generateAdminMenu('permissions');
3333

34-
View::setPageInfo(array(
34+
return View::setPageInfo(array(
3535
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Permissions')),
3636
'active_page' => 'admin',
3737
'admin_console' => true,

‎featherbb/Controller/Admin/Reports.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function display($req, $res, $args)
3434

3535
AdminUtils::generateAdminMenu('reports');
3636

37-
View::setPageInfo(array(
37+
return View::setPageInfo(array(
3838
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Reports')),
3939
'active_page' => 'admin',
4040
'admin_console' => true,

‎featherbb/Controller/Admin/Statistics.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function display($req, $res, $args)
2929

3030
$total = $this->model->get_total_size();
3131

32-
View::setPageInfo(array(
32+
return View::setPageInfo(array(
3333
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Server statistics')),
3434
'active_page' => 'admin',
3535
'admin_console' => true,

0 commit comments

Comments
 (0)