Skip to content

Commit 783f0dc

Browse files
adauradaur
committed
Use Error instead of \FeatherBB\Core\Error
1 parent 5019562 commit 783f0dc

File tree

145 files changed

+408
-316
lines changed

Some content is hidden

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

145 files changed

+408
-316
lines changed

‎cache/85f15bc57d6c4e8a3a00b5f5c72a639f5f734f32.cache‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎cache/cache_parser_data.php‎

Lines changed: 3 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 03:54:56. DO NOT EDIT!!!
1+
<?php // File: cache_parser_data.php. Automatically generated: 2015-09-06 09:21:25. DO NOT EDIT!!!
22
$pd = array (
33
'newer_php_version' => true,
44
'in_signature' => false,
@@ -73,7 +73,7 @@
7373
're_bbcode' => '% # re_bbcode Rev:20110220_1200
7474
# First, match opening tag of syntax: "[TAGNAME (= ("\')ATTRIBUTE("\') )]";
7575
\\[ # Match opening bracket of outermost opening TAGNAME tag.
76-
(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err|dbug)\\s*+) # $1:
76+
(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err)\\s*+) # $1:
7777
(?> # Atomically group remainder of opening tag.
7878
(?: # Optional attribute.
7979
(=)\\s*+ # $2: = Optional attribute\'s equals sign delimiter, ws.
@@ -112,7 +112,7 @@
112112
're_bbtag' => '%# re_bbtag Rev:20110220_1200
113113
# Match open or close BBtag.
114114
\\[/?+ # Match opening bracket of outermost opening TAGNAME tag.
115-
(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err|dbug)\\s*+) #$1:
115+
(?>(b|code|color|colour|del|email|em|h|img|ins|i|table|tr|th|td|list|\\*|quote|sub|sup|s|tt|url|u|center|right|left|justify|youtube|large|small|err)\\s*+) #$1:
116116
(?: # Optional attribute.
117117
(=)\\s*+ # $2: = Optional attribute\'s equals sign delimiter, ws.
118118
(?: # Group for 1-line attribute value alternatives.
@@ -284,7 +284,6 @@
284284
'list' => true,
285285
'*' => true,
286286
'quote' => true,
287-
'dbug' => true,
288287
),
289288
),
290289
'code' =>
@@ -343,7 +342,6 @@
343342
'list' => true,
344343
'*' => true,
345344
'quote' => true,
346-
'dbug' => true,
347345
),
348346
),
349347
'colour' =>
@@ -374,7 +372,6 @@
374372
'list' => true,
375373
'*' => true,
376374
'quote' => true,
377-
'dbug' => true,
378375
),
379376
),
380377
'del' =>
@@ -405,7 +402,6 @@
405402
'list' => true,
406403
'*' => true,
407404
'quote' => true,
408-
'dbug' => true,
409405
),
410406
),
411407
'email' =>
@@ -444,7 +440,6 @@
444440
'*' => true,
445441
'quote' => true,
446442
'url' => true,
447-
'dbug' => true,
448443
),
449444
),
450445
'em' =>
@@ -475,7 +470,6 @@
475470
'list' => true,
476471
'*' => true,
477472
'quote' => true,
478-
'dbug' => true,
479473
),
480474
),
481475
'h' =>
@@ -506,7 +500,6 @@
506500
'list' => true,
507501
'*' => true,
508502
'quote' => true,
509-
'dbug' => true,
510503
),
511504
),
512505
'img' =>
@@ -566,7 +559,6 @@
566559
'large' => true,
567560
'small' => true,
568561
'err' => true,
569-
'dbug' => true,
570562
),
571563
),
572564
'ins' =>
@@ -597,7 +589,6 @@
597589
'list' => true,
598590
'*' => true,
599591
'quote' => true,
600-
'dbug' => true,
601592
),
602593
),
603594
'i' =>
@@ -628,7 +619,6 @@
628619
'list' => true,
629620
'*' => true,
630621
'quote' => true,
631-
'dbug' => true,
632622
),
633623
),
634624
'table' =>
@@ -681,7 +671,6 @@
681671
'youtube' => true,
682672
'large' => true,
683673
'small' => true,
684-
'dbug' => true,
685674
),
686675
'tags_only' => true,
687676
),
@@ -738,7 +727,6 @@
738727
'youtube' => true,
739728
'large' => true,
740729
'small' => true,
741-
'dbug' => true,
742730
),
743731
'tags_only' => true,
744732
),
@@ -862,7 +850,6 @@
862850
'large' => true,
863851
'small' => true,
864852
'err' => true,
865-
'dbug' => true,
866853
),
867854
'tags_only' => true,
868855
),
@@ -948,7 +935,6 @@
948935
'list' => true,
949936
'*' => true,
950937
'quote' => true,
951-
'dbug' => true,
952938
),
953939
),
954940
'sup' =>
@@ -979,7 +965,6 @@
979965
'list' => true,
980966
'*' => true,
981967
'quote' => true,
982-
'dbug' => true,
983968
),
984969
),
985970
's' =>
@@ -1010,7 +995,6 @@
1010995
'list' => true,
1011996
'*' => true,
1012997
'quote' => true,
1013-
'dbug' => true,
1014998
),
1015999
),
10161000
'tt' =>
@@ -1071,7 +1055,6 @@
10711055
'*' => true,
10721056
'quote' => true,
10731057
'url' => true,
1074-
'dbug' => true,
10751058
),
10761059
),
10771060
'u' =>
@@ -1102,7 +1085,6 @@
11021085
'list' => true,
11031086
'*' => true,
11041087
'quote' => true,
1105-
'dbug' => true,
11061088
),
11071089
),
11081090
'center' =>
@@ -1133,7 +1115,6 @@
11331115
'list' => true,
11341116
'*' => true,
11351117
'quote' => true,
1136-
'dbug' => true,
11371118
),
11381119
),
11391120
'right' =>
@@ -1164,7 +1145,6 @@
11641145
'list' => true,
11651146
'*' => true,
11661147
'quote' => true,
1167-
'dbug' => true,
11681148
),
11691149
),
11701150
'left' =>
@@ -1195,7 +1175,6 @@
11951175
'list' => true,
11961176
'*' => true,
11971177
'quote' => true,
1198-
'dbug' => true,
11991178
),
12001179
),
12011180
'justify' =>
@@ -1226,7 +1205,6 @@
12261205
'list' => true,
12271206
'*' => true,
12281207
'quote' => true,
1229-
'dbug' => true,
12301208
),
12311209
),
12321210
'youtube' =>
@@ -1289,7 +1267,6 @@
12891267
'large' => true,
12901268
'small' => true,
12911269
'err' => true,
1292-
'dbug' => true,
12931270
),
12941271
'x_padding' => 20,
12951272
'y_padding' => 45,
@@ -1322,7 +1299,6 @@
13221299
'list' => true,
13231300
'*' => true,
13241301
'quote' => true,
1325-
'dbug' => true,
13261302
),
13271303
),
13281304
'small' =>
@@ -1353,7 +1329,6 @@
13531329
'list' => true,
13541330
'*' => true,
13551331
'quote' => true,
1356-
'dbug' => true,
13571332
),
13581333
),
13591334
'err' =>
@@ -1384,28 +1359,6 @@
13841359
array (
13851360
),
13861361
),
1387-
'dbug' =>
1388-
array (
1389-
'depth' => 0,
1390-
'depth_max' => 5,
1391-
'handlers' =>
1392-
array (
1393-
'ATTRIB' =>
1394-
array (
1395-
'a_type' => 'text',
1396-
'c_type' => 'text',
1397-
'format' => '</p><p class="debug" title="%a_str%">%c_str%</p><p>',
1398-
),
1399-
),
1400-
'html_type' => 'block',
1401-
'in_post' => true,
1402-
'in_sig' => true,
1403-
'nest_type' => 'err',
1404-
'tag_type' => 'normal',
1405-
'tags_excluded' =>
1406-
array (
1407-
),
1408-
),
14091362
'_ROOT_' =>
14101363
array (
14111364
'depth' => 0,

‎extern.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757

5858
namespace FeatherBB;
5959
use DB;
60+
use FeatherBB\Core\Error;
6061
use FeatherBB\Core\Utils;
6162
use FeatherBB\Core\Url;
6263
use FeatherBB\Core\Cache;

‎featherbb/Controller/Admin/Bans.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace FeatherBB\Controller\Admin;
1111

12+
use FeatherBB\Core\Error;
1213
use FeatherBB\Core\Utils;
1314
use FeatherBB\Core\AdminUtils;
1415
use FeatherBB\Core\Url;
@@ -26,7 +27,7 @@ public function __construct()
2627
load_textdomain('featherbb', $this->feather->forum_env['FEATHER_ROOT'].'featherbb/lang/'.$this->user->language.'/admin/bans.mo');
2728

2829
if ($this->user->g_id != FEATHER_ADMIN && ($this->user->g_moderator != '1' || $this->user->g_mod_ban_users == '0')) {
29-
throw new \FeatherBB\Core\Error(__('No permission'), '403');
30+
throw new Error(__('No permission'), '403');
3031
}
3132
}
3233

‎featherbb/Controller/Admin/Categories.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace FeatherBB\Controller\Admin;
1111

12+
use FeatherBB\Core\Error;
1213
use FeatherBB\Core\Utils;
1314
use FeatherBB\Core\AdminUtils;
1415
use FeatherBB\Core\Url;
@@ -49,7 +50,7 @@ public function add_category()
4950
public function edit_categories()
5051
{
5152
if (empty($this->request->post('cat'))) {
52-
throw new \FeatherBB\Core\Error(__('Bad request'), '400');
53+
throw new Error(__('Bad request'), '400');
5354
}
5455

5556
foreach ($this->request->post('cat') as $cat_id => $properties) {
@@ -74,7 +75,7 @@ public function delete_category()
7475
$cat_to_delete = (int) $this->request->post('cat_to_delete');
7576

7677
if ($cat_to_delete < 1) {
77-
throw new \FeatherBB\Core\Error(__('Bad request'), '400');
78+
throw new Error(__('Bad request'), '400');
7879
}
7980

8081
if (intval($this->request->post('disclaimer')) != 1) {

‎featherbb/Controller/Admin/Censoring.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace FeatherBB\Controller\Admin;
1111

12+
use FeatherBB\Core\Error;
1213
use FeatherBB\Core\Utils;
1314
use FeatherBB\Core\AdminUtils;
1415
use FeatherBB\Core\Url;

‎featherbb/Controller/Admin/Forums.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace FeatherBB\Controller\Admin;
1111

12+
use FeatherBB\Core\Error;
1213
use FeatherBB\Core\Utils;
1314
use FeatherBB\Core\AdminUtils;
1415
use FeatherBB\Core\Url;

‎featherbb/Controller/Admin/Groups.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace FeatherBB\Controller\Admin;
1111

12+
use FeatherBB\Core\Error;
1213
use FeatherBB\Core\Utils;
1314
use FeatherBB\Core\AdminUtils;
1415
use FeatherBB\Core\Url;
@@ -55,12 +56,12 @@ public function display()
5556
public function delete($id)
5657
{
5758
if ($id < 5) {
58-
throw new \FeatherBB\Core\Error(__('Bad request'), 403);
59+
throw new Error(__('Bad request'), 403);
5960
}
6061

6162
// Make sure we don't remove the default group
6263
if ($id == $this->config['o_default_user_group']) {
63-
throw new \FeatherBB\Core\Error(__('Cannot remove default message'), 403);
64+
throw new Error(__('Cannot remove default message'), 403);
6465
}
6566

6667
// Check if this group has any members

‎featherbb/Controller/Admin/Index.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace FeatherBB\Controller\Admin;
1111

12+
use FeatherBB\Core\Error;
1213
use FeatherBB\Core\Utils;
1314
use FeatherBB\Core\AdminUtils;
1415
use FeatherBB\Core\Url;
@@ -50,12 +51,12 @@ public function display($action = null)
5051
// Check for upgrade
5152
if ($action == 'check_upgrade') {
5253
if (!ini_get('allow_url_fopen')) {
53-
throw new \FeatherBB\Core\Error(__('fopen disabled message'), 500);
54+
throw new Error(__('fopen disabled message'), 500);
5455
}
5556

5657
$latest_version = trim(@file_get_contents('http://featherbb.org/latest_version'));
5758
if (empty($latest_version)) {
58-
throw new \FeatherBB\Core\Error(__('Upgrade check failed message'), 500);
59+
throw new Error(__('Upgrade check failed message'), 500);
5960
}
6061

6162
if (version_compare($this->config['o_cur_version'], $latest_version, '>=')) {
@@ -71,7 +72,7 @@ public function display($action = null)
7172
if ($deleted) {
7273
Url::redirect($this->feather->urlFor('adminIndex'), __('Deleted install.php redirect'));
7374
} else {
74-
throw new \FeatherBB\Core\Error(__('Delete install.php failed'), 500);
75+
throw new Error(__('Delete install.php failed'), 500);
7576
}
7677
}
7778

‎featherbb/Controller/Admin/Maintenance.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace FeatherBB\Controller\Admin;
1111

12+
use FeatherBB\Core\Error;
1213
use FeatherBB\Core\Utils;
1314
use FeatherBB\Core\AdminUtils;
1415
use FeatherBB\Core\Url;

0 commit comments

Comments
 (0)