blitze / phpBB-ext-sitemaker

services/forum/query_builder.php

Spacing +6 added lines, -6 removed lines

@@ -202,12 +202,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 = ' . $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
+				'ON'	=> 'tt.user_id = '.$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 = ' . $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
+				'ON'	=> 'ft.user_id = '.$this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
 			);
 		}
 
@@ -226,7 +226,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;
@@ -258,7 +258,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;
 	}
@@ -319,7 +319,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;
 		}
 	}
 
@@ -330,7 +330,7 @@ 
 	{
 		if ($check_visibility)
 		{
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . time();
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.time();
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.');
 		}
 	}

blocks/forum_topics.php

Spacing +5 added lines, -5 removed lines

@@ -141,7 +141,7 @@ 
 	{
 		$this->set_display_fields();
 
-		$view = 'S_' . strtoupper($this->settings['template']);
+		$view = 'S_'.strtoupper($this->settings['template']);
 		$post_data = $this->get_post_data($topic_data);
 		$topic_data = array_values($topic_data);
 
@@ -189,10 +189,10 @@ 
 				'VIEWS'				=> $row['topic_views'],
 				'S_UNREAD_TOPIC'	=> $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']),
 
-				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"),
-				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"),
-				'U_NEW_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&view=unread") . '#unread',
-				'U_LAST_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&p=" . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
+				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"),
+				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"),
+				'U_NEW_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&view=unread").'#unread',
+				'U_LAST_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&p=".$row['topic_last_post_id']).'#p'.$row['topic_last_post_id'],
 			));
 			unset($topic_data[$i], $post_data[$topic_id]);
 		}

blocks/member_menu.php

Spacing +8 added lines, -8 removed lines

@@ -68,11 +68,11 @@ 
 				'USER_POSTS'	=> $this->user->data['user_posts'],
 				'NEW_POSTS'		=> $this->get_new_posts_count(),
 
-				'U_PROFILE'		=> append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile&u=' . $this->user->data['user_id']),
-				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=newposts'),
-				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=egosearch'),
-				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'i=pm&folder=inbox'),
-				'U_LOGOUT'		=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'mode=logout', true, $this->user->session_id),
+				'U_PROFILE'		=> append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile&u='.$this->user->data['user_id']),
+				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=newposts'),
+				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=egosearch'),
+				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'i=pm&folder=inbox'),
+				'U_LOGOUT'		=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'mode=logout', true, $this->user->session_id),
 				'U_MCP' 		=> $this->get_mcp_url(),
 				'U_ACP'			=> $this->get_acp_url(),
 			));
@@ -99,7 +99,7 @@ 
 	 */
 	protected function get_mcp_url()
 	{
-		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, false, true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, false, true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	protected function get_acp_url()
 	{
-		return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path . 'adm/index.' . $this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path.'adm/index.'.$this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 				POSTS_TABLE		=> 'p',
 			),
 			'WHERE'		=> array(
-				't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'],
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
 			),
 		);
 

services/util.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
 	 */
 	public function get_default_avatar()
 	{
-		return '<img src="' . $this->get_theme_path() . '/images/no_avatar.gif" alt="" />';
+		return '<img src="'.$this->get_theme_path().'/images/no_avatar.gif" alt="" />';
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	public function get_theme_path()
 	{
 		$web_path = $this->get_web_path();
-		return "{$web_path}styles/" . rawurlencode($this->user->style['style_path']) . '/theme';
+		return "{$web_path}styles/".rawurlencode($this->user->style['style_path']).'/theme';
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	public function get_web_path()
 	{
 		// Determine board url - we may need it later
-		$board_url = generate_board_url() . '/';
+		$board_url = generate_board_url().'/';
 
 		$corrected_path = $this->path_helper->get_web_root_path();
 		return (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;

services/tree/display.php

Spacing +11 added lines, -11 removed lines

@@ -79,7 +79,7 @@ 
 	{
 		$sql = "SELECT *
 			FROM $this->items_table
-			WHERE $this->pk = " . (int) $node_id ;
+			WHERE $this->pk = ".(int) $node_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
@@ -108,8 +108,8 @@ 
 					$this->items_table => 'i'
 				),
 				'WHERE'		=> array(
-					'i.depth ' . (($max_depth) ? " BETWEEN $start AND " . ($start + $max_depth) : ' >= ' . $start),
-					(($this->sql_where) ? 'i.' . $this->sql_where : ''),
+					'i.depth '.(($max_depth) ? " BETWEEN $start AND ".($start + $max_depth) : ' >= '.$start),
+					(($this->sql_where) ? 'i.'.$this->sql_where : ''),
 				),
 				'ORDER_BY'	=> 'i.left_id ASC',
 			),
@@ -155,7 +155,7 @@ 
 	 * @param \phpbb\template\twig\twig $template
 	 * @param string $handle
 	 */
-	public function display_list(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
+	public function display_list(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
 	{
 		$prev_depth = 0;
 		$parental_depth = array(0 => -1);
@@ -164,10 +164,10 @@ 
 		for ($i = 0, $size = sizeof($data); $i < $size; $i++)
 		{
 			$row 		= $data[$i];
-			$this_depth	= $parental_depth[$row['parent_id']] + 1;
-			$repeat		= abs($prev_depth - $this_depth);
+			$this_depth = $parental_depth[$row['parent_id']] + 1;
+			$repeat = abs($prev_depth - $this_depth);
 
-			$tpl_data	= array(
+			$tpl_data = array(
 				'PREV_DEPTH'	=> $prev_depth,
 				'THIS_DEPTH'	=> $this_depth,
 				'NUM_KIDS'		=> $this->count_descendants($row),
@@ -177,7 +177,7 @@ 
 
 			for ($j = 0; $j < $repeat; $j++)
 			{
-				$template->assign_block_vars($handle . '.close', array());
+				$template->assign_block_vars($handle.'.close', array());
 			}
 
 			$prev_depth = $this_depth;
@@ -186,7 +186,7 @@ 
 
 		for ($i = 0; $i < $prev_depth; $i++)
 		{
-			$template->assign_block_vars('close_' . $handle, array());
+			$template->assign_block_vars('close_'.$handle, array());
 		}
 	}
 
@@ -225,10 +225,10 @@ 
 			}
 
 			$right = $row['right_id'];
-			$title = $padding . '&#x251c;&#x2500; ' . $row[$title_column];
+			$title = $padding.'&#x251c;&#x2500; '.$row[$title_column];
 			$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
 
-			$return_options .= '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
+			$return_options .= '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
 			$return_data[$row[$this->pk]] = $title;
 		}
 

services/icon_picker.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 				'@blitze_sitemaker/assets/icons/picker.min.js',
 			),
 			'css'	=> array(
-				defined('IN_ADMIN') ? $this->util->get_web_path() . 'assets/css/font-awesome.min.css' : '',
+				defined('IN_ADMIN') ? $this->util->get_web_path().'assets/css/font-awesome.min.css' : '',
 				'@blitze_sitemaker/vendor/jquery-ui/themes/smoothness/jquery-ui.min.css',
 				'@blitze_sitemaker/assets/icons/picker.min.css',
 			)

controller/forum.php

Spacing +2 added lines, -2 removed lines

@@ -59,12 +59,12 @@
 		 * to fix relative paths for forum images
 		 */
 		global $phpbb_root_path;
-		$phpbb_root_path = generate_board_url() . '/';
+		$phpbb_root_path = generate_board_url().'/';
 
 		// @codeCoverageIgnoreStart
 		if (!function_exists('display_forums'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
 		}
 		// @codeCoverageIgnoreEnd
 

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->prepare_items($data);
 
@@ -84,10 +84,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));
 		}
 	}
 
@@ -126,7 +126,7 @@ 
 			}
 
 			$is_current_item = $this->is_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);
 
 			$this->parental_depth[$row[$this->pk]] = $this_depth;
@@ -155,8 +155,8 @@ 
 	 */
 	protected function set_current_item(array $data)
 	{
-		$curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
-		$curr_page = str_replace('/index.' . $this->php_ext, '/', $curr_page);
+		$curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
+		$curr_page = str_replace('/index.'.$this->php_ext, '/', $curr_page);
 		$curr_parts = explode('&', $this->user->page['query_string']);
 
 		$data = array_values($data);
@@ -239,7 +239,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/menu_block.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
 	{
 		$row['is_navigable'] = $this->is_navigable($row);
 		$row['is_expandable'] = ($row['is_navigable'] && !$row['item_target']) ? true : false;
-		$row['url_path'] = str_replace('/index.' . $this->php_ext, '/', $row['url_path']);
+		$row['url_path'] = str_replace('/index.'.$this->php_ext, '/', $row['url_path']);
 	}
 
 	/**