Skip to content

Commit 0be23c6

Browse files
adauradaur
committed
Switch variables from snake_case to camelCase
1 parent 0802941 commit 0be23c6

Some content is hidden

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

73 files changed

+5044
-5036
lines changed

‎featherbb/Controller/Admin/Bans.php‎

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

3434
// Display bans
3535
if (Input::query('find_ban')) {
36-
$ban_info = $this->model->findBan();
36+
$banInfo = $this->model->findBan();
3737

38-
// Determine the ban offset (based on $_GET['p'])
39-
$num_pages = ceil($ban_info['num_bans'] / 50);
38+
// Determine the ban offset (based on $_gET['p'])
39+
$numPages = ceil($banInfo['num_bans'] / 50);
4040

41-
$p = (!Input::query('p') || Input::query('p') <= 1 || Input::query('p') > $num_pages) ? 1 : intval(Input::query('p'));
42-
$start_from = 50 * ($p - 1);
41+
$p = (!Input::query('p') || Input::query('p') <= 1 || Input::query('p') > $numPages) ? 1 : intval(Input::query('p'));
42+
$startFrom = 50 * ($p - 1);
4343

44-
$ban_data = $this->model->findBan($start_from);
44+
$banData = $this->model->findBan($startFrom);
4545

4646
View::setPageInfo([
4747
'admin_console' => true,
4848
'page' => $p,
4949
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Bans'), __('Results head')],
50-
'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . Url::paginateOld($num_pages, $p, '?find_ban=&amp;' . implode('&amp;', $ban_info['query_str'])),
51-
'ban_data' => $ban_data['data'],
50+
'paging_links' => '<span class="pages-label">' . __('Pages') . ' </span>' . Url::paginateOld($numPages, $p, '?find_ban=&amp;' . implode('&amp;', $banInfo['query_str'])),
51+
'ban_data' => $banData['data'],
5252
]
5353
)->addTemplate('admin/bans/search_ban.php')->display();
5454
} else {
@@ -75,7 +75,7 @@ public function add($req, $res, $args)
7575
View::setPageInfo([
7676
'admin_console' => true,
7777
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Bans')],
78-
'ban' => $this->model->add_ban_info($args['id']),
78+
'ban' => $this->model->addBanInfo($args['id']),
7979
]
8080
)->addTemplate('admin/bans/add_ban.php')->display();
8181
}

‎featherbb/Controller/Admin/Categories.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public function add($req, $res, $args)
3030
{
3131
Container::get('hooks')->fire('controller.admin.categories.add');
3232

33-
$cat_name = Utils::trim(Input::post('cat_name'));
34-
if ($cat_name == '') {
33+
$catName = Utils::trim(Input::post('cat_name'));
34+
if ($catName == '') {
3535
return Router::redirect(Router::pathFor('adminCategories'), __('Must enter name message'));
3636
}
3737

38-
if ($this->model->addCategory($cat_name)) {
38+
if ($this->model->addCategory($catName)) {
3939
return Router::redirect(Router::pathFor('adminCategories'), __('Category added redirect'));
4040
} else { //TODO, add error message
4141
return Router::redirect(Router::pathFor('adminCategories'), __('Category added redirect'));
@@ -50,14 +50,14 @@ public function edit($req, $res, $args)
5050
throw new Error(__('Bad request'), '400');
5151
}
5252

53-
foreach (Input::post('cat') as $cat_id => $properties) {
54-
$category = ['id' => (int) $cat_id,
53+
foreach (Input::post('cat') as $catId => $properties) {
54+
$category = ['id' => (int) $catId,
5555
'name' => Utils::escape($properties['name']),
5656
'order' => (int) $properties['order'],];
5757
if ($category['name'] == '') {
5858
return Router::redirect(Router::pathFor('adminCategories'), __('Must enter name message'));
5959
}
60-
$this->model->update_category($category);
60+
$this->model->updateCategory($category);
6161
}
6262

6363
// Regenerate the quick jump cache
@@ -70,17 +70,17 @@ public function delete($req, $res, $args)
7070
{
7171
Container::get('hooks')->fire('controller.admin.categories.delete');
7272

73-
$cat_to_delete = (int) Input::post('cat_to_delete');
73+
$catToDelete = (int) Input::post('cat_to_delete');
7474

75-
if ($cat_to_delete < 1) {
75+
if ($catToDelete < 1) {
7676
throw new Error(__('Bad request'), '400');
7777
}
7878

7979
if (intval(Input::post('disclaimer')) != 1) {
8080
return Router::redirect(Router::pathFor('adminCategories'), __('Delete category not validated'));
8181
}
8282

83-
if ($this->model->deleteCategory($cat_to_delete)) {
83+
if ($this->model->deleteCategory($catToDelete)) {
8484
return Router::redirect(Router::pathFor('adminCategories'), __('Category deleted redirect'));
8585
} else {
8686
return Router::redirect(Router::pathFor('adminCategories'), __('Unable to delete category'));

‎featherbb/Controller/Admin/Forums.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ public function add()
3030
{
3131
Container::get('hooks')->fire('controller.admin.forums.add');
3232

33-
$cat_id = (int) Input::post('cat');
33+
$catId = (int) Input::post('cat');
3434

35-
if ($cat_id < 1) {
35+
if ($catId < 1) {
3636
return Router::redirect(Router::pathFor('adminForums'), __('Must be valid category'));
3737
}
3838

39-
if ($fid = $this->model->addForum($cat_id, __('New forum'))) {
39+
if ($fid = $this->model->addForum($catId, __('New forum'))) {
4040
// Regenerate the quick jump cache
4141
Container::get('cache')->store('quickjump', Cache::quickjump());
4242

@@ -54,44 +54,44 @@ 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 = ['forum_name' => Utils::escape(Input::post('forum_name')),
57+
$forumData = ['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'),
6161
'redirect_url' => Url::isValid(Input::post('redirect_url')) ? Utils::escape(Input::post('redirect_url')) : null];
6262

63-
if ($forum_data['forum_name'] == '') {
63+
if ($forumData['forum_name'] == '') {
6464
return Router::redirect(Router::pathFor('editForum', ['id' => $args['id']]), __('Must enter name message'));
6565
}
66-
if ($forum_data['cat_id'] < 1) {
66+
if ($forumData['cat_id'] < 1) {
6767
return Router::redirect(Router::pathFor('editForum', ['id' => $args['id']]), __('Must be valid category'));
6868
}
6969

70-
$this->model->updateForum($args['id'], $forum_data);
70+
$this->model->updateForum($args['id'], $forumData);
7171

7272
// Permissions
7373
$permissions = $this->model->getDefaultGroupPermissions(false);
74-
foreach ($permissions as $perm_group) {
75-
$permissions_data = ['group_id' => $perm_group['g_id'],
74+
foreach ($permissions as $permGroup) {
75+
$permissionsData = ['group_id' => $permGroup['g_id'],
7676
'forum_id' => $args['id']];
77-
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') {
78-
$permissions_data['read_forum'] = '1';
77+
if ($permGroup['board.read'] == '1' && isset(Input::post('read_forum_new')[$permGroup['g_id']]) && Input::post('read_forum_new')[$permGroup['g_id']] == '1') {
78+
$permissionsData['read_forum'] = '1';
7979
} else {
80-
$permissions_data['read_forum'] = '0';
80+
$permissionsData['read_forum'] = '0';
8181
}
8282

83-
$permissions_data['post_replies'] = (isset(Input::post('post_replies_new')[$perm_group['g_id']])) ? '1' : '0';
84-
$permissions_data['post_topics'] = (isset(Input::post('post_topics_new')[$perm_group['g_id']])) ? '1' : '0';
83+
$permissionsData['post_replies'] = (isset(Input::post('post_replies_new')[$permGroup['g_id']])) ? '1' : '0';
84+
$permissionsData['post_topics'] = (isset(Input::post('post_topics_new')[$permGroup['g_id']])) ? '1' : '0';
8585
// Check if the new settings differ from the old
86-
if ($permissions_data['read_forum'] != Input::post('read_forum_old')[$perm_group['g_id']] ||
87-
$permissions_data['post_replies'] != Input::post('post_replies_old')[$perm_group['g_id']] ||
88-
$permissions_data['post_topics'] != Input::post('post_topics_old')[$perm_group['g_id']]) {
86+
if ($permissionsData['read_forum'] != Input::post('read_forum_old')[$permGroup['g_id']] ||
87+
$permissionsData['post_replies'] != Input::post('post_replies_old')[$permGroup['g_id']] ||
88+
$permissionsData['post_topics'] != Input::post('post_topics_old')[$permGroup['g_id']]) {
8989
// If there is no group permissions override for this forum
90-
if ($permissions_data['read_forum'] == '1' && $permissions_data['post_replies'] == $perm_group['topic.reply'] && $permissions_data['post_topics'] == $perm_group['topic.post']) {
91-
$this->model->deletePermissions($args['id'], $perm_group['g_id']);
90+
if ($permissionsData['read_forum'] == '1' && $permissionsData['post_replies'] == $permGroup['topic.reply'] && $permissionsData['post_topics'] == $permGroup['topic.post']) {
91+
$this->model->deletePermissions($args['id'], $permGroup['g_id']);
9292
} else {
9393
// Run an UPDATE and see if it affected a row, if not, INSERT
94-
$this->model->updatePermissions($permissions_data);
94+
$this->model->updatePermissions($permissionsData);
9595
}
9696
}
9797
}
@@ -128,13 +128,13 @@ public function delete($req, $res, $args)
128128
{
129129
Container::get('hooks')->fire('controller.admin.forums.delete');
130130

131-
if (!$cur_forum = $this->model->getForumInfo($args['id'])) {
131+
if (!$curForum = $this->model->getForumInfo($args['id'])) {
132132
$notFoundHandler = Container::get('notFoundHandler');
133133
return $notFoundHandler($req, $res);
134134
}
135135

136136
if (Request::isPost()) {
137-
$this->model->delete_forum($args['id']);
137+
$this->model->deleteForum($args['id']);
138138
// Regenerate the quick jump cache
139139
Container::get('cache')->store('quickjump', Cache::quickjump());
140140

@@ -147,7 +147,7 @@ public function delete($req, $res, $args)
147147
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Forums')],
148148
'active_page' => 'admin',
149149
'admin_console' => true,
150-
'cur_forum' => $cur_forum
150+
'cur_forum' => $curForum
151151
]
152152
)->addTemplate('admin/forums/delete_forum.php')->display();
153153
}
@@ -178,12 +178,12 @@ public function display($req, $res, $args)
178178

179179
AdminUtils::generateAdminMenu('forums');
180180

181-
$categories_model = new \FeatherBB\Model\Admin\Categories();
181+
$categoriesModel = new \FeatherBB\Model\Admin\Categories();
182182
View::setPageInfo([
183183
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Forums')],
184184
'active_page' => 'admin',
185185
'admin_console' => true,
186-
'cat_list' => $categories_model->categoryList(),
186+
'cat_list' => $categoriesModel->categoryList(),
187187
'forum_data' => $this->model->getForums(),
188188
'cur_index' => 4,
189189
]

‎featherbb/Controller/Admin/Groups.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ public function delete($req, $res, $args)
6161
}
6262

6363
// Check if this group has any members
64-
$is_member = $this->model->checkMembers($args['id']);
64+
$isMember = $this->model->checkMembers($args['id']);
6565

6666
// If the group doesn't have any members or if we've already selected a group to move the members to
67-
if (!$is_member || Input::post('del_group')) {
67+
if (!$isMember || Input::post('del_group')) {
6868
if (Input::post('del_group_comply') || Input::post('del_group')) {
6969
return $this->model->deleteGroup($args['id']);
7070
} else {

‎featherbb/Controller/Admin/Index.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ public function display($req, $res, $args)
3535
throw new Error(__('fopen disabled message'), 500);
3636
}
3737

38-
$latest_version = trim(@file_get_contents('http://featherbb.org/latest_version.html'));
39-
if (empty($latest_version)) {
38+
$latestVersion = trim(@file_get_contents('http://featherbb.org/latest_version.html'));
39+
if (empty($latestVersion)) {
4040
throw new Error(__('Upgrade check failed message'), 500);
4141
}
4242

43-
if (version_compare(ForumSettings::get('o_cur_version'), $latest_version, '>=')) {
43+
if (version_compare(ForumSettings::get('o_cur_version'), $latestVersion, '>=')) {
4444
return Router::redirect(Router::pathFor('adminIndex'), __('Running latest version message'));
4545
} else {
4646
return Router::redirect(Router::pathFor('adminIndex'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));

‎featherbb/Controller/Admin/Maintenance.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,22 @@ public function display($req, $res, $args)
4646
}
4747

4848
if ($action == 'prune') {
49-
$prune_from = Utils::trim(Input::post('prune_from'));
50-
$prune_sticky = intval(Input::post('prune_sticky'));
49+
$pruneFrom = Utils::trim(Input::post('prune_from'));
50+
$pruneSticky = intval(Input::post('prune_sticky'));
5151

5252
AdminUtils::generateAdminMenu('maintenance');
5353

5454
if (Input::post('prune_comply')) {
55-
$this->model->pruneComply($prune_from, $prune_sticky);
55+
$this->model->pruneComply($pruneFrom, $pruneSticky);
5656
}
5757

5858
View::setPageInfo([
5959
'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Prune')],
6060
'active_page' => 'admin',
6161
'admin_console' => true,
62-
'prune_sticky' => $prune_sticky,
63-
'prune_from' => $prune_from,
64-
'prune' => $this->model->getInfoPrune($prune_sticky, $prune_from),
62+
'prune_sticky' => $pruneSticky,
63+
'prune_from' => $pruneFrom,
64+
'prune' => $this->model->getInfoPrune($pruneSticky, $pruneFrom),
6565
]
6666
)->addTemplate('admin/maintenance/prune.php')->display();
6767
}

‎featherbb/Controller/Admin/Parser.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ public function display($req, $res, $args)
3030
Container::get('hooks')->fire('controller.admin.parser.display');
3131

3232
// This is where the parser data lives and breathes.
33-
$cache_file = ForumEnv::get('FEATHER_ROOT').'cache/cache_parser_data.php';
33+
$cacheFile = ForumEnv::get('FEATHER_ROOT').'cache/cache_parser_data.php';
3434

3535
// If RESET button pushed, or no cache file, re-compile master bbcode source file.
36-
if (Input::post('reset') || !file_exists($cache_file)) {
36+
if (Input::post('reset') || !file_exists($cacheFile)) {
3737
require_once(ForumEnv::get('FEATHER_ROOT').'featherbb/Core/parser/bbcd_source.php');
3838
require_once(ForumEnv::get('FEATHER_ROOT').'featherbb/Core/parser/bbcd_compile.php');
3939
return Router::redirect(Router::pathFor('adminParser'), __('reset_success'));
4040
}
4141

4242
// Load the current BBCode $pd array from featherbb/Core/parser/parser_data.inc.php.
43-
require_once($cache_file); // Fetch $pd compiled global regex data.
43+
require_once($cacheFile); // Fetch $pd compiled global regex data.
4444
$bbcd = $pd['bbcd']; // Local scratch copy of $bbcd.
4545
$smilies = $pd['smilies']; // Local scratch copy of $smilies.
4646
$config = $pd['config']; // Local scratch copy of $config.
@@ -49,8 +49,8 @@ public function display($req, $res, $args)
4949
if (Input::post('form_sent')) {
5050

5151
// Upload new smiley image to style/img/smilies
52-
if (Input::post('upload') && isset($_FILES['new_smiley']) && isset($_FILES['new_smiley']['error'])) {
53-
$f = $_FILES['new_smiley'];
52+
if (Input::post('upload') && isset($_fILES['new_smiley']) && isset($_fILES['new_smiley']['error'])) {
53+
$f = $_fILES['new_smiley'];
5454
switch ($f['error']) {
5555
case 0: // 0: Successful upload.
5656
$name = str_replace(' ', '_', $f['name']); // Convert spaces to underscoree.
@@ -203,7 +203,7 @@ public function display($req, $res, $args)
203203
'active_page' => 'admin',
204204
'admin_console' => true,
205205
'tag_summary' => $this->model->tagSummary(),
206-
'smiley_files' => $this->model->get_smiley_files(),
206+
'smiley_files' => $this->model->getSmileyFiles(),
207207
'bbcd' => $bbcd,
208208
'config' => $config,
209209
'smilies' => $smilies,

‎featherbb/Controller/Admin/Plugins.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function index($req, $res, $args)
4242
Container::get('hooks')->fire('controller.admin.plugins.index');
4343

4444
if (Request::isPost()) {
45-
return $this->model->uploadPlugin($_FILES);
45+
return $this->model->uploadPlugin($_fILES);
4646
}
4747

4848
View::addAsset('js', 'style/imports/common.js', ['type' => 'text/javascript']);

‎featherbb/Controller/Admin/Reports.php‎

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

2929
// Zap a report
3030
if (Request::isPost()) {
31-
$zap_id = intval(key(Input::post('zap_id')));
32-
$this->model->zap($zap_id);
31+
$zapId = intval(key(Input::post('zap_id')));
32+
$this->model->zap($zapId);
3333
return Router::redirect(Router::pathFor('adminReports'), __('Report zapped redirect'));
3434
}
3535

0 commit comments

Comments
 (0)