@@ -150,8 +150,7 @@ |
||
| 150 | 150 | if (!$block_exists) |
| 151 | 151 | { |
| 152 | 152 | $sql = 'INSERT INTO ' . $this->cblocks_table . ' ' . $this->db->sql_build_array('INSERT', $sql_data); |
| 153 | - } |
|
| 154 | - else |
|
| 153 | + } else |
|
| 155 | 154 | { |
| 156 | 155 | $sql = 'UPDATE ' . $this->cblocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE block_id = ' . (int) $sql_data['block_id']; |
| 157 | 156 | } |
@@ -84,8 +84,7 @@ |
||
| 84 | 84 | )); |
| 85 | 85 | |
| 86 | 86 | $content = $this->ptemplate->render_view('blitze/sitemaker', 'blocks/login.html', 'login_block'); |
| 87 | - } |
|
| 88 | - else if ($settings['show_member_menu']) |
|
| 87 | + } else if ($settings['show_member_menu']) |
|
| 89 | 88 | { |
| 90 | 89 | $block = $this->phpbb_container->get('blitze.sitemaker.block.member_menu'); |
| 91 | 90 | $block->set_template($this->ptemplate); |
@@ -96,10 +96,10 @@ |
||
| 96 | 96 | foreach ($this->message_full as &$message) |
| 97 | 97 | { |
| 98 | 98 | // Attempt to translate each portion |
| 99 | - $translated_message = $translator->lang('EXCEPTION_' . $message); |
|
| 99 | + $translated_message = $translator->lang('EXCEPTION_'.$message); |
|
| 100 | 100 | |
| 101 | 101 | // Check if translating did anything |
| 102 | - if ($translated_message !== 'EXCEPTION_' . $message) |
|
| 102 | + if ($translated_message !== 'EXCEPTION_'.$message) |
|
| 103 | 103 | { |
| 104 | 104 | // It did, so replace message with the translated version |
| 105 | 105 | $message = $translated_message; |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | public function get_users_groups() |
| 41 | 41 | { |
| 42 | 42 | $sql = 'SELECT group_id |
| 43 | - FROM ' . USER_GROUP_TABLE . ' |
|
| 43 | + FROM ' . USER_GROUP_TABLE.' |
|
| 44 | 44 | WHERE user_id = ' . (int) $this->user->data['user_id']; |
| 45 | 45 | $result = $this->db->sql_query($sql); |
| 46 | 46 | |
@@ -83,13 +83,13 @@ discard block |
||
| 83 | 83 | $sql = $this->_get_group_sql($mode); |
| 84 | 84 | $result = $this->db->sql_query($sql); |
| 85 | 85 | |
| 86 | - $options = '<option value="0">' . $this->translator->lang('ALL_GROUPS') . '</option>'; |
|
| 86 | + $options = '<option value="0">'.$this->translator->lang('ALL_GROUPS').'</option>'; |
|
| 87 | 87 | while ($row = $this->db->sql_fetchrow($result)) |
| 88 | 88 | { |
| 89 | 89 | $group_name = $this->_get_group_name($row); |
| 90 | 90 | $group_class = $this->_get_group_class($row['group_type']); |
| 91 | 91 | $selected_option = $this->_get_selected_option($row['group_id'], $selected); |
| 92 | - $options .= '<option' . $group_class . ' value="' . $row['group_id'] . '"' . $selected_option . '>' . $group_name . '</option>'; |
|
| 92 | + $options .= '<option'.$group_class.' value="'.$row['group_id'].'"'.$selected_option.'>'.$group_name.'</option>'; |
|
| 93 | 93 | } |
| 94 | 94 | $this->db->sql_freeresult($result); |
| 95 | 95 | |
@@ -103,8 +103,8 @@ discard block |
||
| 103 | 103 | private function _get_group_sql($mode) |
| 104 | 104 | { |
| 105 | 105 | return 'SELECT group_id, group_name, group_type |
| 106 | - FROM ' . GROUPS_TABLE . |
|
| 107 | - (($mode === 'special') ? ' WHERE group_type = ' . GROUP_SPECIAL : '') . ' |
|
| 106 | + FROM ' . GROUPS_TABLE. |
|
| 107 | + (($mode === 'special') ? ' WHERE group_type = '.GROUP_SPECIAL : '').' |
|
| 108 | 108 | ORDER BY group_type DESC, group_name ASC'; |
| 109 | 109 | } |
| 110 | 110 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | private function _get_group_name(array $row) |
| 116 | 116 | { |
| 117 | - return ($row['group_type'] == GROUP_SPECIAL) ? $this->translator->lang('G_' . $row['group_name']) : ucfirst($row['group_name']); |
|
| 117 | + return ($row['group_type'] == GROUP_SPECIAL) ? $this->translator->lang('G_'.$row['group_name']) : ucfirst($row['group_name']); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | // @codeCoverageIgnoreStart |
| 64 | 64 | if (!function_exists('phpbb_get_user_avatar')) |
| 65 | 65 | { |
| 66 | - include($phpbb_root_path . 'includes/functions_display.' . $php_ext); |
|
| 66 | + include($phpbb_root_path.'includes/functions_display.'.$php_ext); |
|
| 67 | 67 | } |
| 68 | 68 | // @codeCoverageIgnoreEnd |
| 69 | 69 | } |
@@ -101,8 +101,8 @@ discard block |
||
| 101 | 101 | */ |
| 102 | 102 | protected function member_posts(array $row) |
| 103 | 103 | { |
| 104 | - $u_posts = append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id={$row['user_id']}&sr=posts" . $this->explain_range); |
|
| 105 | - $user_posts = '<a href="' . $u_posts . '">' . $row['user_posts'] . '</a>'; |
|
| 104 | + $u_posts = append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id={$row['user_id']}&sr=posts".$this->explain_range); |
|
| 105 | + $user_posts = '<a href="'.$u_posts.'">'.$row['user_posts'].'</a>'; |
|
| 106 | 106 | |
| 107 | 107 | return array( |
| 108 | 108 | 'USERNAME' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | 'WHERE' => $this->db->sql_in_set('u.user_type', array(USER_NORMAL, USER_FOUNDER)), |
| 171 | 171 | ); |
| 172 | 172 | |
| 173 | - $sql_method = 'set_' . $this->settings['query_type'] . '_sql'; |
|
| 173 | + $sql_method = 'set_'.$this->settings['query_type'].'_sql'; |
|
| 174 | 174 | call_user_func_array(array($this, $sql_method), array(&$sql_ary)); |
| 175 | 175 | |
| 176 | 176 | $this->set_range_sql($sql_ary); |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | protected function set_visits_sql(array &$sql_ary) |
| 185 | 185 | { |
| 186 | 186 | $sql_ary['SELECT'] .= ', u.user_lastvisit as member_date'; |
| 187 | - $sql_ary['WHERE'] .= ' AND u.user_lastvisit <> 0 AND u.user_id <> ' . (int) $this->user->data['user_id']; |
|
| 187 | + $sql_ary['WHERE'] .= ' AND u.user_lastvisit <> 0 AND u.user_id <> '.(int) $this->user->data['user_id']; |
|
| 188 | 188 | $sql_ary['ORDER_BY'] = 'u.user_lastvisit DESC'; |
| 189 | 189 | |
| 190 | 190 | $this->sql_date_field = 'user_lastvisit'; |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | $this->info_header = ''; |
| 201 | 201 | $this->view_mode = 'member_bots'; |
| 202 | 202 | |
| 203 | - $sql_ary['WHERE'] = 'u.user_type = ' . USER_IGNORE; |
|
| 203 | + $sql_ary['WHERE'] = 'u.user_type = '.USER_IGNORE; |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | protected function set_tenured_sql(array &$sql_ary) |
| 210 | 210 | { |
| 211 | 211 | $sql_ary['SELECT'] .= ', u.user_regdate as member_date'; |
| 212 | - $sql_ary['ORDER_BY'] = 'u.user_regdate ' . (($this->settings['query_type'] == 'tenured') ? 'ASC' : 'DESC'); |
|
| 212 | + $sql_ary['ORDER_BY'] = 'u.user_regdate '.(($this->settings['query_type'] == 'tenured') ? 'ASC' : 'DESC'); |
|
| 213 | 213 | |
| 214 | 214 | $this->sql_date_field = 'u.user_regdate'; |
| 215 | 215 | $this->settings['date_range'] = ''; |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | $sql_ary['SELECT'] .= ', COUNT(p.post_id) as user_posts'; |
| 233 | 233 | $sql_ary['FROM'] += array(TOPICS_TABLE => 't'); |
| 234 | 234 | $sql_ary['FROM'] += array(POSTS_TABLE => 'p'); |
| 235 | - $sql_ary['WHERE'] .= ' AND ' . time() . ' > t.topic_time AND t.topic_id = p.topic_id AND p.post_visibility = ' . ITEM_APPROVED . ' AND p.poster_id = u.user_id'; |
|
| 235 | + $sql_ary['WHERE'] .= ' AND '.time().' > t.topic_time AND t.topic_id = p.topic_id AND p.post_visibility = '.ITEM_APPROVED.' AND p.poster_id = u.user_id'; |
|
| 236 | 236 | $sql_ary['GROUP_BY'] = 'u.user_id'; |
| 237 | 237 | $sql_ary['ORDER_BY'] = 'user_posts DESC, u.username ASC'; |
| 238 | 238 | |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | if ($this->settings['date_range'] && $this->sql_date_field) |
| 250 | 250 | { |
| 251 | 251 | $range = $this->date_range->get($this->settings['date_range']); |
| 252 | - $this->explain_range = '&date=' . $range['date']; |
|
| 252 | + $this->explain_range = '&date='.$range['date']; |
|
| 253 | 253 | |
| 254 | 254 | $sql_ary['WHERE'] .= " AND {$this->sql_date_field} BETWEEN {$range['start']} AND {$range['stop']}"; |
| 255 | 255 | } |
@@ -144,8 +144,7 @@ |
||
| 144 | 144 | { |
| 145 | 145 | $content = $this->translator->lang('BLOCK_NO_DATA'); |
| 146 | 146 | $returned_data['status'] = 0; |
| 147 | - } |
|
| 148 | - else |
|
| 147 | + } else |
|
| 149 | 148 | { |
| 150 | 149 | $content = $returned_data['content']; |
| 151 | 150 | } |
@@ -118,8 +118,7 @@ |
||
| 118 | 118 | if (!$has_blocks && !$this->route_is_customized($entity->to_array())) |
| 119 | 119 | { |
| 120 | 120 | $this->route_mapper->delete($entity); |
| 121 | - } |
|
| 122 | - else |
|
| 121 | + } else |
|
| 123 | 122 | { |
| 124 | 123 | $entity->set_has_blocks($has_blocks); |
| 125 | 124 | $this->route_mapper->save($entity); |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | public function execute($style_id) |
| 19 | 19 | { |
| 20 | - $name = $this->request->variable('block', ''); |
|
| 21 | - $route = $this->request->variable('route', ''); |
|
| 20 | + $name = $this->request->variable('block', ''); |
|
| 21 | + $route = $this->request->variable('route', ''); |
|
| 22 | 22 | |
| 23 | 23 | if (($block_instance = $this->block_factory->get_block($name)) === null) |
| 24 | 24 | { |
@@ -154,8 +154,7 @@ |
||
| 154 | 154 | if (!empty($returned_data['content'])) |
| 155 | 155 | { |
| 156 | 156 | $content = $returned_data['content']; |
| 157 | - } |
|
| 158 | - else if ($edit_mode) |
|
| 157 | + } else if ($edit_mode) |
|
| 159 | 158 | { |
| 160 | 159 | $returned_data['status'] = 0; |
| 161 | 160 | $content = $this->translator->lang('BLOCK_NO_DATA'); |