Skip to content

Commit ddd60fb

Browse files
adauradaur
committed
Short array syntax
1 parent 737f665 commit ddd60fb

File tree

112 files changed

+1488
-1488
lines changed

Some content is hidden

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

112 files changed

+1488
-1488
lines changed

‎featherbb/Controller/Admin/Bans.php‎

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

4444
$ban_data = $this->model->find_ban($start_from);
4545

46-
View::setPageInfo(array(
46+
View::setPageInfo([
4747
'admin_console' => true,
4848
'page' => $p,
49-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Bans'), __('Results head')),
49+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Bans'), __('Results head')],
5050
'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . Url::paginate_old($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str'])),
5151
'ban_data' => $ban_data['data'],
52-
)
52+
]
5353
)->addTemplate('admin/bans/search_ban.php')->display();
5454
}
5555
else {
5656
AdminUtils::generateAdminMenu('bans');
5757

58-
View::setPageInfo(array(
58+
View::setPageInfo([
5959
'admin_console' => true,
60-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Bans')),
61-
)
60+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Bans')],
61+
]
6262
)->addTemplate('admin/bans/admin_bans.php')->display();
6363
}
6464
}
@@ -73,11 +73,11 @@ public function add($req, $res, $args)
7373

7474
AdminUtils::generateAdminMenu('bans');
7575

76-
View::setPageInfo(array(
76+
View::setPageInfo([
7777
'admin_console' => true,
78-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Bans')),
78+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Bans')],
7979
'ban' => $this->model->add_ban_info($args['id']),
80-
)
80+
]
8181
)->addTemplate('admin/bans/add_ban.php')->display();
8282
}
8383

@@ -98,11 +98,11 @@ public function edit($req, $res, $args)
9898
}
9999
AdminUtils::generateAdminMenu('bans');
100100

101-
View::setPageInfo(array(
101+
View::setPageInfo([
102102
'admin_console' => true,
103-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Bans')),
103+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Bans')],
104104
'ban' => $this->model->edit_ban_info($args['id']),
105-
)
105+
]
106106
)->addTemplate('admin/bans/add_ban.php')->display();
107107
}
108108
}

‎featherbb/Controller/Admin/Categories.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public function edit($req, $res, $args)
5151
}
5252

5353
foreach (Input::post('cat') as $cat_id => $properties) {
54-
$category = array('id' => (int) $cat_id,
54+
$category = ['id' => (int) $cat_id,
5555
'name' => Utils::escape($properties['name']),
56-
'order' => (int) $properties['order'], );
56+
'order' => (int) $properties['order'],];
5757
if ($category['name'] == '') {
5858
return Router::redirect(Router::pathFor('adminCategories'), __('Must enter name message'));
5959
}
@@ -94,11 +94,11 @@ public function display($req, $res, $args)
9494

9595
AdminUtils::generateAdminMenu('categories');
9696

97-
View::setPageInfo(array(
98-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Categories')),
97+
View::setPageInfo([
98+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Categories')],
9999
'active_page' => 'admin',
100100
'admin_console' => true,
101101
'cat_list' => $this->model->get_cat_list(),
102-
))->addTemplate('admin/categories.php')->display();
102+
])->addTemplate('admin/categories.php')->display();
103103
}
104104
}

‎featherbb/Controller/Admin/Censoring.php‎

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

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

48-
return View::setPageInfo(array(
49-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Censoring')),
48+
return View::setPageInfo([
49+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Censoring')],
5050
'active_page' => 'admin',
5151
'admin_console' => true,
5252
'word_data' => $this->model->get_words(),
53-
)
53+
]
5454
)->addTemplate('admin/censoring.php')->display();
5555
}
5656
}

‎featherbb/Controller/Admin/Forums.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function add()
4040
// Regenerate the quick jump cache
4141
Container::get('cache')->store('quickjump', Cache::get_quickjump());
4242

43-
return Router::redirect(Router::pathFor('editForum', array('id' => $fid)), __('Forum added redirect'));
43+
return Router::redirect(Router::pathFor('editForum', ['id' => $fid]), __('Forum added redirect'));
4444
} else {
4545
return Router::redirect(Router::pathFor('adminForums'), __('Unable to add forum'));
4646
}
@@ -54,26 +54,26 @@ public function edit($req, $res, $args)
5454
if (Input::post('save') && Input::post('read_forum_old')) {
5555

5656
// Forums parameters / TODO : better handling of wrong parameters
57-
$forum_data = array('forum_name' => Utils::escape(Input::post('forum_name')),
57+
$forum_data = ['forum_name' => Utils::escape(Input::post('forum_name')),
5858
'forum_desc' => Input::post('forum_desc') ? Utils::linebreaks(Utils::trim(Input::post('forum_desc'))) : NULL,
5959
'cat_id' => (int) Input::post('cat_id'),
6060
'sort_by' => (int) Input::post('sort_by'),
61-
'redirect_url' => Url::is_valid(Input::post('redirect_url')) ? Utils::escape(Input::post('redirect_url')) : NULL);
61+
'redirect_url' => Url::is_valid(Input::post('redirect_url')) ? Utils::escape(Input::post('redirect_url')) : NULL];
6262

6363
if ($forum_data['forum_name'] == '') {
64-
return Router::redirect(Router::pathFor('editForum', array('id' => $args['id'])), __('Must enter name message'));
64+
return Router::redirect(Router::pathFor('editForum', ['id' => $args['id']]), __('Must enter name message'));
6565
}
6666
if ($forum_data['cat_id'] < 1) {
67-
return Router::redirect(Router::pathFor('editForum', array('id' => $args['id'])), __('Must be valid category'));
67+
return Router::redirect(Router::pathFor('editForum', ['id' => $args['id']]), __('Must be valid category'));
6868
}
6969

7070
$this->model->update_forum($args['id'], $forum_data);
7171

7272
// Permissions
7373
$permissions = $this->model->get_default_group_permissions(false);
7474
foreach($permissions as $perm_group) {
75-
$permissions_data = array('group_id' => $perm_group['g_id'],
76-
'forum_id' => $args['id']);
75+
$permissions_data = ['group_id' => $perm_group['g_id'],
76+
'forum_id' => $args['id']];
7777
if ($perm_group['board.read'] == '1' && isset(Input::post('read_forum_new')[$perm_group['g_id']]) && Input::post('read_forum_new')[$perm_group['g_id']] == '1') {
7878
$permissions_data['read_forum'] = '1';
7979
}
@@ -100,29 +100,29 @@ public function edit($req, $res, $args)
100100
// Regenerate the quick jump cache
101101
Container::get('cache')->store('quickjump', Cache::get_quickjump());
102102

103-
return Router::redirect(Router::pathFor('editForum', array('id' => $args['id'])), __('Forum updated redirect'));
103+
return Router::redirect(Router::pathFor('editForum', ['id' => $args['id']]), __('Forum updated redirect'));
104104

105105
} elseif (Input::post('revert_perms')) {
106106
$this->model->delete_permissions($args['id']);
107107

108108
// Regenerate the quick jump cache
109109
Container::get('cache')->store('quickjump', Cache::get_quickjump());
110110

111-
return Router::redirect(Router::pathFor('editForum', array('id' => $args['id'])), __('Perms reverted redirect'));
111+
return Router::redirect(Router::pathFor('editForum', ['id' => $args['id']]), __('Perms reverted redirect'));
112112
}
113113

114114
} else {
115115
AdminUtils::generateAdminMenu('forums');
116116

117-
View::setPageInfo(array(
118-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Forums')),
117+
View::setPageInfo([
118+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Forums')],
119119
'active_page' => 'admin',
120120
'admin_console' => true,
121121
'perm_data' => $this->model->get_permissions($args['id']),
122122
'cur_index' => 7,
123123
'cur_forum' => $this->model->get_forum_info($args['id']),
124124
'forum_data' => $this->model->get_forums(),
125-
)
125+
]
126126
)->addTemplate('admin/forums/permissions.php')->display();
127127
}
128128
}
@@ -147,12 +147,12 @@ public function delete($req, $res, $args)
147147

148148
AdminUtils::generateAdminMenu('forums');
149149

150-
View::setPageInfo(array(
151-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Forums')),
150+
View::setPageInfo([
151+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Forums')],
152152
'active_page' => 'admin',
153153
'admin_console' => true,
154154
'cur_forum' => $cur_forum
155-
)
155+
]
156156
)->addTemplate('admin/forums/delete_forum.php')->display();
157157
}
158158
}
@@ -183,14 +183,14 @@ public function display($req, $res, $args)
183183
AdminUtils::generateAdminMenu('forums');
184184

185185
$categories_model = new \FeatherBB\Model\Admin\Categories();
186-
View::setPageInfo(array(
187-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Forums')),
186+
View::setPageInfo([
187+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Forums')],
188188
'active_page' => 'admin',
189189
'admin_console' => true,
190190
'cat_list' => $categories_model->get_cat_list(),
191191
'forum_data' => $this->model->get_forums(),
192192
'cur_index' => 4,
193-
)
193+
]
194194
)->addTemplate('admin/forums/admin_forums.php')->display();
195195
}
196196
}

‎featherbb/Controller/Admin/Groups.php‎

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

3838
AdminUtils::generateAdminMenu('user groups');
3939

40-
View::setPageInfo(array(
41-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('User groups')),
40+
View::setPageInfo([
41+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('User groups')],
4242
'active_page' => 'admin',
4343
'admin_console' => true,
4444
'groups' => $groups,
4545
'cur_index' => 5,
46-
)
46+
]
4747
)->addTemplate('admin/groups/admin_groups.php')->display();
4848
}
4949

@@ -70,27 +70,27 @@ public function delete($req, $res, $args)
7070
} else {
7171
AdminUtils::generateAdminMenu('user groups');
7272

73-
return View::setPageInfo(array(
74-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('User groups')),
73+
return View::setPageInfo([
74+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('User groups')],
7575
'active_page' => 'admin',
7676
'admin_console' => true,
7777
'group_title' => $this->model->get_group_title($args['id']),
7878
'id' => $args['id'],
79-
)
79+
]
8080
)->addTemplate('admin/groups/confirm_delete.php')->display();
8181
}
8282
}
8383

8484
AdminUtils::generateAdminMenu('user groups');
8585

86-
return View::setPageInfo(array(
87-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('User groups')),
86+
return View::setPageInfo([
87+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('User groups')],
8888
'active_page' => 'admin',
8989
'admin_console' => true,
9090
'id' => $args['id'],
9191
'group_info' => $this->model->get_title_members($args['id']),
9292
'group_list_delete' => $this->model->get_group_list_delete($args['id']),
93-
)
93+
]
9494
)->addTemplate('admin/groups/delete_group.php')->display();
9595
}
9696

@@ -113,14 +113,14 @@ public function addedit($req, $res, $args)
113113
$id = isset($args['id']) ? intval($args['id']) : intval(Input::post('base_group'));
114114
$group = $this->model->info_add_group($groups, $id);
115115

116-
View::setPageInfo(array(
117-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('User groups')),
116+
View::setPageInfo([
117+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('User groups')],
118118
'active_page' => 'admin',
119119
'admin_console' => true,
120120
'group' => $group,
121121
'id' => $id,
122122
'group_list' => $this->model->get_group_list($groups, $group),
123-
)
123+
]
124124
)->addTemplate('admin/groups/add_edit_group.php')->display();
125125
}
126126
}

‎featherbb/Controller/Admin/Index.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ public function display($req, $res, $args)
4949

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

52-
return View::setPageInfo(array(
53-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Index')),
52+
return View::setPageInfo([
53+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Index')],
5454
'active_page' => 'admin',
5555
'admin_console' => true
56-
)
56+
]
5757
)->addTemplate('admin/index.php')->display();
5858
}
5959
}

‎featherbb/Controller/Admin/Maintenance.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public function display($req, $res, $args)
3838
if ($action == 'rebuild') {
3939
$this->model->rebuild();
4040

41-
View::setPageInfo(array(
42-
'page_title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Rebuilding search index')),
41+
View::setPageInfo([
42+
'page_title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Rebuilding search index')],
4343
'query_str' => $this->model->get_query_str()
44-
)
44+
]
4545
)->addTemplate('admin/maintenance/rebuild.php')->display();
4646
}
4747

@@ -55,26 +55,26 @@ public function display($req, $res, $args)
5555
$this->model->prune_comply($prune_from, $prune_sticky);
5656
}
5757

58-
View::setPageInfo(array(
59-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Prune')),
58+
View::setPageInfo([
59+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Prune')],
6060
'active_page' => 'admin',
6161
'admin_console' => true,
6262
'prune_sticky' => $prune_sticky,
6363
'prune_from' => $prune_from,
6464
'prune' => $this->model->get_info_prune($prune_sticky, $prune_from),
65-
)
65+
]
6666
)->addTemplate('admin/maintenance/prune.php')->display();
6767
}
6868

6969
AdminUtils::generateAdminMenu('maintenance');
7070

71-
View::setPageInfo(array(
72-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Maintenance')),
71+
View::setPageInfo([
72+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Maintenance')],
7373
'active_page' => 'admin',
7474
'admin_console' => true,
7575
'first_id' => $this->model->get_first_id(),
7676
'categories' => $this->model->get_categories(),
77-
)
77+
]
7878
)->addTemplate('admin/maintenance/admin_maintenance.php')->display();
7979
}
8080
}

‎featherbb/Controller/Admin/Options.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ public function display($req, $res, $args)
3434

3535
AdminUtils::generateAdminMenu('admin options');
3636

37-
View::setPageInfo(array(
38-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Admin options')),
37+
View::setPageInfo([
38+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Admin options')],
3939
'active_page' => 'admin',
4040
'admin_console' => true,
4141
'languages' => $this->model->get_langs(),
4242
'styles' => $this->model->get_styles(),
4343
'times' => $this->model->get_times(),
44-
)
44+
]
4545
)->addTemplate('admin/options.php')->display();
4646
}
4747
}

‎featherbb/Controller/Admin/Parser.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ public function display($req, $res, $args)
184184
$sfile = Input::post('smiley_file');
185185
$len = count($stext);
186186
$good = '';
187-
$smilies = array();
187+
$smilies = [];
188188
for ($i = 0; $i < $len; ++$i) { // Loop through all posted smileys.
189189
if ($stext[$i] && $sfile !== 'select new file') {
190-
$smilies[$stext[$i]] = array('file' => $sfile[$i]);
190+
$smilies[$stext[$i]] = ['file' => $sfile[$i]];
191191
}
192192
}
193193
}
@@ -198,8 +198,8 @@ public function display($req, $res, $args)
198198

199199
AdminUtils::generateAdminMenu('parser');
200200

201-
return View::setPageInfo(array(
202-
'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Parser')),
201+
return View::setPageInfo([
202+
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Parser')],
203203
'active_page' => 'admin',
204204
'admin_console' => true,
205205
'tag_summary' => $this->model->tagSummary(),
@@ -208,7 +208,7 @@ public function display($req, $res, $args)
208208
'config' => $config,
209209
'smilies' => $smilies,
210210
'i' => -1,
211-
)
211+
]
212212
)->addTemplate('admin/parser.php')->display();
213213
}
214214
}

0 commit comments

Comments
 (0)