blitze / phpBB-ext-sitemaker

services/forum/query_builder.php

Doc Comments +3 added lines, -3 removed lines

@@ -276,9 +276,9 @@
 	/**
 	 * Build the query
 	 *
-	 * @param bool|true $check_visibility		Should we only return data from forums the user is allowed to see?
-	 * @param bool|true $enable_caching			Should the query be cached where possible?
-	 * @param bool|true $exclude_hidden_forums	Leave out hidden forums?
+	 * @param boolean $check_visibility		Should we only return data from forums the user is allowed to see?
+	 * @param boolean $enable_caching			Should the query be cached where possible?
+	 * @param boolean $exclude_hidden_forums	Leave out hidden forums?
 	 * @return $this
 	 */
 	public function build($check_visibility = true, $enable_caching = true, $exclude_hidden_forums = true)

Spacing +8 added lines, -8 removed lines

@@ -165,7 +165,7 @@ 
 			$this->store['sql_array']['SELECT'][] = 'ws.notify_status';
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
 				'FROM'	=> array($keys[$type]['table'] => 'ws'),
-				'ON'	=> $keys[$type]['cond'] . ' AND ws.user_id = ' . (int) $this->user->data['user_id'],
+				'ON'	=> $keys[$type]['cond'].' AND ws.user_id = '.(int) $this->user->data['user_id'],
 			);
 		}
 
@@ -184,7 +184,7 @@ 
 			$this->store['sql_array']['SELECT'][] = 'bm.topic_id as bookmarked';
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
 				'FROM'	=> array(BOOKMARKS_TABLE => 'bm'),
-				'ON'	=> 'bm.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = bm.topic_id'
+				'ON'	=> 'bm.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = bm.topic_id'
 			);
 		}
 
@@ -205,12 +205,12 @@ 
 			$this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time';
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
 				'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
-				'ON'	=> 'tt.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
+				'ON'	=> 'tt.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = tt.topic_id'
 			);
 
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
 				'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
-				'ON'	=> 'ft.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
+				'ON'	=> 'ft.user_id = '.(int) $this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
 			);
 		}
 
@@ -229,7 +229,7 @@ 
 	{
 		if ($unix_start_time && $unix_stop_time)
 		{
-			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time";
+			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time";
 		}
 
 		return $this;
@@ -268,7 +268,7 @@ 
 	 */
 	public function set_sorting($sort_key, $sort_dir = 'DESC')
 	{
-		$this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir;
+		$this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir;
 
 		return $this;
 	}
@@ -336,7 +336,7 @@ 
 	{
 		if (!empty($column_id))
 		{
-			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id;
+			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id;
 		}
 	}
 
@@ -348,7 +348,7 @@ 
 	{
 		if ($check_visibility)
 		{
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . $this->time();
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.$this->time();
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.');
 		}
 	}

services/menus/display.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
 	 * @param string $handle
 	 * @return void
 	 */
-	public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
+	public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
 	{
 		$this->set_current_item($data);
 		$this->prepare_items($data['items']);
@@ -85,10 +85,10 @@ 
 				$row['num_kids'] = $this->count_descendants($row);
 
 				$template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER));
-				$this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth));
+				$this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth));
 			}
 
-			$this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth));
+			$this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth));
 		}
 	}
 
@@ -156,12 +156,12 @@ 
 	 */
 	protected function get_current_path()
 	{
-		$curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
+		$curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
 		$curr_parts = explode('&', $this->user->page['query_string']);
 
 		sort($curr_parts);
 
-		return $curr_page . '?' . join('&', $curr_parts);
+		return $curr_page.'?'.join('&', $curr_parts);
 	}
 
 	/**
@@ -203,7 +203,7 @@ 
 
 			$is_current_item = $this->is_current_item($row);
 			$is_parent = $this->is_parent_of_current_item($row);
-			$this_depth	= $this->parental_depth[$row['parent_id']] + 1;
+			$this_depth = $this->parental_depth[$row['parent_id']] + 1;
 			$leaf = $this->get_leaf_node($row, $is_current_item, $is_parent);
 
 			$this->parental_depth[$row[$this->pk]] = $this_depth;
@@ -284,7 +284,7 @@ 
 	 * @param int $repeat
 	 * @return void
 	 */
-	protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat)
+	protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat)
 	{
 		for ($i = 0; $i < $repeat; $i++)
 		{

services/menus/navigation.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($type === 'list')
 		{
 			$this->tree->display_list($data['items'], $template, 'tree');
-		}
-		else
+		} else
 		{
 			$this->tree->set_params($settings);
 			$this->tree->display_navlist($data, $template, 'tree');