From 2d87dc449c3234dc8d7a4a98fbf6bc1479f440f7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 3 Nov 2013 15:31:38 +0100 Subject: [PATCH] [fix/code_sniffer] Fix code_sniffer complaints --- develop/generate_migrations_data.php | 2 +- includes/trim_message/bbcodes.php | 2 +- portal/includes/functions.php | 22 +++++++++++----------- portal/includes/functions_modules.php | 4 ++-- portal/includes/functions_upload.php | 2 +- portal/modules/portal_links.php | 2 +- portal/modules/portal_main_menu.php | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/develop/generate_migrations_data.php b/develop/generate_migrations_data.php index 4a1397d4..3aec2f3c 100644 --- a/develop/generate_migrations_data.php +++ b/develop/generate_migrations_data.php @@ -284,7 +284,7 @@ class db $ret[$key] = "{foobar.{$key}.{$this->sql_in_set[$id][1][$this->int_pointer]}}"; } } - $this->int_pointer++;; + $this->int_pointer++; return $ret; } } diff --git a/includes/trim_message/bbcodes.php b/includes/trim_message/bbcodes.php index 8178d14a..eb382680 100644 --- a/includes/trim_message/bbcodes.php +++ b/includes/trim_message/bbcodes.php @@ -342,7 +342,7 @@ class phpbb_trim_message_bbcodes for ($i = 1; $i <= $this->array_size; $i++) { if (($this->bbcode_list[$this->array_size - $i]['open_start'] < $position) && - ($this->bbcode_list[$this->array_size - $i]['close_start'] >= $position)) + ($this->bbcode_list[$this->array_size - $i]['close_start'] >= $position)) { $bbcodes[] = $this->bbcode_list[$this->array_size - $i]['bbcode_tag']; } diff --git a/portal/includes/functions.php b/portal/includes/functions.php index d0744aa3..bd13aa78 100644 --- a/portal/includes/functions.php +++ b/portal/includes/functions.php @@ -9,7 +9,7 @@ if (!defined('IN_PHPBB') && !defined('UMIL_AUTO') && !defined('IN_INSTALL')) { - exit; + exit; } // Get portal config @@ -175,10 +175,10 @@ function phpbb_fetch_posts($module_id, $forum_from, $permissions, $number_of_pos $topic_order = ($config['board3_news_show_last_' . $module_id]) ? 't.topic_last_post_time DESC' : 't.topic_time DESC' ; break; - default: - $topic_type = $str_where = $user_link = $post_link = ''; - $topic_order = 't.topic_time DESC'; - // maybe use trigger_error here, as this shouldn't happen + default: + $topic_type = $str_where = $user_link = $post_link = ''; + $topic_order = 't.topic_time DESC'; + // maybe use trigger_error here, as this shouldn't happen } if ($type == 'announcements' && $global_f < 1) @@ -447,10 +447,10 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite $anker = '#n'; break; - default: - // this shouldn't happend @todo: use trigger_error() - $pagination_type = 'ap'; - $anker = '#a'; + default: + // this shouldn't happend @todo: use trigger_error() + $pagination_type = 'ap'; + $anker = '#a'; } // Make sure $per_page is a valid value @@ -609,13 +609,13 @@ function get_portal_tracking_info($fetch_news) } $db->sql_freeresult($result); - // @todo: do not use $current_forum here as this is already used by the outside foreach + // @todo: do not use $current_forum here as this is already used by the outside foreach foreach($forum_ids as $current_forum) { $user_lastmark[$current_forum] = (isset($mark_time[$current_forum])) ? $mark_time[$current_forum] : $user->data['user_lastmark']; } - // @todo: also check if $user_lastmark has been defined for this specific forum_id + // @todo: also check if $user_lastmark has been defined for this specific forum_id foreach ($topic_ids as $topic_id) { $last_read[$topic_id] = (!isset($last_read[$topic_id]) || $user_lastmark[$rev_forum_ids[$topic_id]] > $last_read[$topic_id]) ? $user_lastmark[$rev_forum_ids[$topic_id]] : $last_read[$topic_id]; diff --git a/portal/includes/functions_modules.php b/portal/includes/functions_modules.php index 2ac1622f..30f8a958 100644 --- a/portal/includes/functions_modules.php +++ b/portal/includes/functions_modules.php @@ -26,8 +26,8 @@ function column_num_string($column) return 'top'; case 5: return 'bottom'; - default: - return 0; + default: + return 0; } } diff --git a/portal/includes/functions_upload.php b/portal/includes/functions_upload.php index 61d11bce..844d5cd8 100755 --- a/portal/includes/functions_upload.php +++ b/portal/includes/functions_upload.php @@ -9,7 +9,7 @@ if (!defined('IN_PHPBB')) { - exit; + exit; } /** diff --git a/portal/modules/portal_links.php b/portal/modules/portal_links.php index 2f51c376..fc82e7c3 100644 --- a/portal/modules/portal_links.php +++ b/portal/modules/portal_links.php @@ -103,7 +103,7 @@ class portal_links_module public function get_template_acp($module_id) { // do not remove this as it is needed in order to run manage_links - return array( + return array( 'title' => 'ACP_PORTAL_LINKS', 'vars' => array( 'legend1' => 'ACP_PORTAL_LINKS', diff --git a/portal/modules/portal_main_menu.php b/portal/modules/portal_main_menu.php index 26ea2f95..ce065583 100644 --- a/portal/modules/portal_main_menu.php +++ b/portal/modules/portal_main_menu.php @@ -113,7 +113,7 @@ class portal_main_menu_module public function get_template_acp($module_id) { // do not remove this as it is needed in order to run manage_links - return array( + return array( 'title' => 'ACP_PORTAL_MENU', 'vars' => array( 'legend1' => 'ACP_PORTAL_MENU',