@@ -276,9 +276,9 @@ |
||
| 276 | 276 | /** |
| 277 | 277 | * Build the query |
| 278 | 278 | * |
| 279 | - * @param bool|true $check_visibility Should we only return data from forums the user is allowed to see? |
|
| 280 | - * @param bool|true $enable_caching Should the query be cached where possible? |
|
| 281 | - * @param bool|true $exclude_hidden_forums Leave out hidden forums? |
|
| 279 | + * @param boolean $check_visibility Should we only return data from forums the user is allowed to see? |
|
| 280 | + * @param boolean $enable_caching Should the query be cached where possible? |
|
| 281 | + * @param boolean $exclude_hidden_forums Leave out hidden forums? |
|
| 282 | 282 | * @return $this |
| 283 | 283 | */ |
| 284 | 284 | public function build($check_visibility = true, $enable_caching = true, $exclude_hidden_forums = true) |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | $this->store['sql_array']['SELECT'][] = 'ws.notify_status'; |
| 166 | 166 | $this->store['sql_array']['LEFT_JOIN'][] = array( |
| 167 | 167 | 'FROM' => array($keys[$type]['table'] => 'ws'), |
| 168 | - 'ON' => $keys[$type]['cond'] . ' AND ws.user_id = ' . (int) $this->user->data['user_id'], |
|
| 168 | + 'ON' => $keys[$type]['cond'].' AND ws.user_id = '.(int) $this->user->data['user_id'], |
|
| 169 | 169 | ); |
| 170 | 170 | } |
| 171 | 171 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | $this->store['sql_array']['SELECT'][] = 'bm.topic_id as bookmarked'; |
| 185 | 185 | $this->store['sql_array']['LEFT_JOIN'][] = array( |
| 186 | 186 | 'FROM' => array(BOOKMARKS_TABLE => 'bm'), |
| 187 | - 'ON' => 'bm.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = bm.topic_id' |
|
| 187 | + 'ON' => 'bm.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = bm.topic_id' |
|
| 188 | 188 | ); |
| 189 | 189 | } |
| 190 | 190 | |
@@ -205,12 +205,12 @@ discard block |
||
| 205 | 205 | $this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time'; |
| 206 | 206 | $this->store['sql_array']['LEFT_JOIN'][] = array( |
| 207 | 207 | 'FROM' => array(TOPICS_TRACK_TABLE => 'tt'), |
| 208 | - 'ON' => 'tt.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id' |
|
| 208 | + 'ON' => 'tt.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = tt.topic_id' |
|
| 209 | 209 | ); |
| 210 | 210 | |
| 211 | 211 | $this->store['sql_array']['LEFT_JOIN'][] = array( |
| 212 | 212 | 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), |
| 213 | - 'ON' => 'ft.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id' |
|
| 213 | + 'ON' => 'ft.user_id = '.(int) $this->user->data['user_id'].' AND t.forum_id = ft.forum_id' |
|
| 214 | 214 | ); |
| 215 | 215 | } |
| 216 | 216 | |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | { |
| 230 | 230 | if ($unix_start_time && $unix_stop_time) |
| 231 | 231 | { |
| 232 | - $this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time"; |
|
| 232 | + $this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time"; |
|
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | return $this; |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | */ |
| 269 | 269 | public function set_sorting($sort_key, $sort_dir = 'DESC') |
| 270 | 270 | { |
| 271 | - $this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir; |
|
| 271 | + $this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir; |
|
| 272 | 272 | |
| 273 | 273 | return $this; |
| 274 | 274 | } |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | { |
| 337 | 337 | if (!empty($column_id)) |
| 338 | 338 | { |
| 339 | - $this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id; |
|
| 339 | + $this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id; |
|
| 340 | 340 | } |
| 341 | 341 | } |
| 342 | 342 | |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | { |
| 349 | 349 | if ($check_visibility) |
| 350 | 350 | { |
| 351 | - $this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . $this->time(); |
|
| 351 | + $this->store['sql_array']['WHERE'][] = 't.topic_time <= '.$this->time(); |
|
| 352 | 352 | $this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.'); |
| 353 | 353 | } |
| 354 | 354 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | * @param string $handle |
| 71 | 71 | * @return void |
| 72 | 72 | */ |
| 73 | - public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree') |
|
| 73 | + public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree') |
|
| 74 | 74 | { |
| 75 | 75 | $this->set_current_item($data); |
| 76 | 76 | $this->prepare_items($data['items']); |
@@ -85,10 +85,10 @@ discard block |
||
| 85 | 85 | $row['num_kids'] = $this->count_descendants($row); |
| 86 | 86 | |
| 87 | 87 | $template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER)); |
| 88 | - $this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth)); |
|
| 88 | + $this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth)); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - $this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth)); |
|
| 91 | + $this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth)); |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
@@ -156,12 +156,12 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | protected function get_current_path() |
| 158 | 158 | { |
| 159 | - $curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './'); |
|
| 159 | + $curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './'); |
|
| 160 | 160 | $curr_parts = explode('&', $this->user->page['query_string']); |
| 161 | 161 | |
| 162 | 162 | sort($curr_parts); |
| 163 | 163 | |
| 164 | - return $curr_page . '?' . join('&', $curr_parts); |
|
| 164 | + return $curr_page.'?'.join('&', $curr_parts); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | |
| 204 | 204 | $is_current_item = $this->is_current_item($row); |
| 205 | 205 | $is_parent = $this->is_parent_of_current_item($row); |
| 206 | - $this_depth = $this->parental_depth[$row['parent_id']] + 1; |
|
| 206 | + $this_depth = $this->parental_depth[$row['parent_id']] + 1; |
|
| 207 | 207 | $leaf = $this->get_leaf_node($row, $is_current_item, $is_parent); |
| 208 | 208 | |
| 209 | 209 | $this->parental_depth[$row[$this->pk]] = $this_depth; |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | * @param int $repeat |
| 285 | 285 | * @return void |
| 286 | 286 | */ |
| 287 | - protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat) |
|
| 287 | + protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat) |
|
| 288 | 288 | { |
| 289 | 289 | for ($i = 0; $i < $repeat; $i++) |
| 290 | 290 | { |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if ($type === 'list') |
| 59 | 59 | { |
| 60 | 60 | $this->tree->display_list($data['items'], $template, 'tree'); |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->tree->set_params($settings); |
| 65 | 64 | $this->tree->display_navlist($data, $template, 'tree'); |