blitze / phpBB-ext-sitemaker

blocks/attachments.php

Spacing +3 added lines, -3 removed lines

@@ -140,7 +140,7 @@ 
 				$this->ptemplate->assign_block_vars('postrow.attachment', array(
 					'DISPLAY_ATTACHMENT'	=> $attachment,
 					'EXTENSION_GROUP'		=> $extensions[$row['extension']]['group_name'],
-					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id") . '#p' . $post_id,
+					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id").'#p'.$post_id,
 				));
 			}
 		}
@@ -152,7 +152,7 @@ 
 	private function get_posts_data()
 	{
 		$topic_ids = $post_ids = array();
-		${$this->settings['ids_type'] . '_ids'} = array_filter(explode(',', $this->settings['ids']));
+		${$this->settings['ids_type'].'_ids'} = array_filter(explode(',', $this->settings['ids']));
 		$range_info = $this->date_range->get($this->settings['date_range']);
 
 		$sql_array = $this->forum_data->query(false)
@@ -164,7 +164,7 @@ 
 			->get_sql_array();
 
 		$sql_array['SELECT'] = '';
-		$sql_array['WHERE'] .= ' AND p.topic_id = t.topic_id AND p.post_attachment <> 0' . (($this->settings['first_only']) ? ' AND p.post_id = t.topic_first_post_id' : '');
+		$sql_array['WHERE'] .= ' AND p.topic_id = t.topic_id AND p.post_attachment <> 0'.(($this->settings['first_only']) ? ' AND p.post_id = t.topic_first_post_id' : '');
 
 		return $this->forum_data->get_post_data(false, $post_ids, $this->settings['limit'], 0, $sql_array);
 	}

model/entity/item.php

Spacing +3 added lines, -3 removed lines

@@ -136,7 +136,7 @@ 
 	 */
 	public function set_item_icon($icon)
 	{
-		$this->item_icon = ($icon) ? trim($icon) . ' ' : '';
+		$this->item_icon = ($icon) ? trim($icon).' ' : '';
 		return $this;
 	}
 
@@ -153,7 +153,7 @@ 
 		// add leading / for local paths, except leading hashtags
 		if ($this->is_local($this->item_url) && $this->item_url[0] !== '#')
 		{
-			$this->item_url = '/' . ltrim($this->item_url, './');
+			$this->item_url = '/'.ltrim($this->item_url, './');
 		}
 
 		return $this;
@@ -168,7 +168,7 @@ 
 
 		if ($this->is_local($item_url) && $item_url[0] === '/')
 		{
-			$item_url = $this->board_url . $item_url;
+			$item_url = $this->board_url.$item_url;
 			if ($this->mod_rewrite_enabled)
 			{
 				$item_url = str_replace('app.php/', '', $item_url);

blocks/links.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
 		return array(
 			'title'     => $this->title,
-			'content'   => $this->ptemplate->render_view('blitze/sitemaker', 'blocks/' . $this->tpl_name . '.html', $this->tpl_name . '_block'),
+			'content'   => $this->ptemplate->render_view('blitze/sitemaker', 'blocks/'.$this->tpl_name.'.html', $this->tpl_name.'_block'),
 		);
 	}
 

services/menus/navigation.php

Spacing +3 added lines, -3 removed lines

@@ -138,7 +138,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']);
 	}
 
 	/**
@@ -177,8 +177,8 @@ 
 	{
 		sort($row['url_query']);
 
-		$row['url_path'] = ($row['url_path'] === '/') ? '/index.' . $this->php_ext : $row['url_path'];
+		$row['url_path'] = ($row['url_path'] === '/') ? '/index.'.$this->php_ext : $row['url_path'];
 
-		return $row['url_path'] . ((sizeof($row['url_query'])) ? '?' . join('&', $row['url_query']) : '');
+		return $row['url_path'].((sizeof($row['url_query'])) ? '?'.join('&', $row['url_query']) : '');
 	}
 }

event/startpage.php

Spacing +2 added lines, -2 removed lines

@@ -120,13 +120,13 @@
 	 */
 	public function set_startpage()
 	{
-		if ($this->user->page['page_name'] == 'index.' . $this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
+		if ($this->user->page['page_name'] == 'index.'.$this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
 		{
 			$method = $this->config['sitemaker_startpage_method'];
 			$this->is_startpage = true;
 
 			$controller_dir = explode('\\', get_class($controller_object));
-			$controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles';
+			$controller_style_dir = 'ext/'.$controller_dir[0].'/'.$controller_dir[1].'/styles';
 			$this->template->set_style(array($controller_style_dir, 'styles'));
 
 			$arguments = explode('/', $this->config['sitemaker_startpage_params']);

blocks/whois.php

Spacing +1 added lines, -1 removed lines

@@ -105,6 +105,6 @@
 	 */
 	private function get_viewonline_url()
 	{
-		return ($this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$this->phpbb_root_path}viewonline." . $this->php_ext) : '';
+		return ($this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$this->phpbb_root_path}viewonline.".$this->php_ext) : '';
 	}
 }

services/users/data.php

Spacing +8 added lines, -8 removed lines

@@ -83,7 +83,7 @@ 
 
 		if (sizeof($query_ids))
 		{
-			$sql_where .= (($sql_where) ? ' AND ' : '') . $this->db->sql_in_set('user_id', $query_ids);
+			$sql_where .= (($sql_where) ? ' AND ' : '').$this->db->sql_in_set('user_id', $query_ids);
 			$this->query($sql_where);
 		}
 
@@ -160,8 +160,8 @@ 
 	public function get_profile_fields()
 	{
 		$sql = 'SELECT l.lang_name, f.field_ident
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
-			WHERE l.lang_id = ' . (int) $this->user->get_iso_lang_id() . '
+			FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f
+			WHERE l.lang_id = ' . (int) $this->user->get_iso_lang_id().'
 				AND f.field_active = 1
 				AND f.field_no_view = 0
 				AND f.field_hide = 0
@@ -219,7 +219,7 @@ 
 	 */
 	protected function get_search_url($user_id)
 	{
-		return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id=$user_id&sr=posts") : '';
+		return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id=$user_id&sr=posts") : '';
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	{
 		if (!function_exists('phpbb_get_user_rank'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
 		}
 
 		$user_rank_data = phpbb_get_user_rank($row, $row['user_posts']);
@@ -304,8 +304,8 @@ 
 	protected function get_sql_statement($sql_where = '', $order_by = '')
 	{
 		return 'SELECT user_id, username, user_type, user_colour, user_avatar, user_avatar_type, user_avatar_height, user_avatar_width, user_regdate, user_lastvisit, user_birthday, user_posts, user_rank, user_email, user_allow_viewemail, user_allow_pm, user_jabber, user_inactive_reason
-			FROM ' . USERS_TABLE .
-			(($sql_where) ? ' WHERE ' . $sql_where : '') .
-			(($order_by) ? ' ORDER BY ' . $order_by : '');
+			FROM ' . USERS_TABLE.
+			(($sql_where) ? ' WHERE '.$sql_where : '').
+			(($order_by) ? ' ORDER BY '.$order_by : '');
 	}
 }

services/forum/query_builder.php

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 <= ' . (int) $this->time();
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.(int) $this->time();
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', array_map('intval', $this->ex_fid_ary), 't.');
 		}
 	}

blocks/whats_new.php

Spacing +3 added lines, -3 removed lines

@@ -99,7 +99,7 @@ 
 
 			$this->ptemplate->assign_block_vars('topicrow', array(
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"),
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"),
 			));
 			unset($topic_data[$i]);
 		}
@@ -140,7 +140,7 @@ 
 	{
 		return array(
 			'WHERE'		=> array(
-				't.topic_last_post_time > ' . (int) $this->user->data['user_lastvisit'],
+				't.topic_last_post_time > '.(int) $this->user->data['user_lastvisit'],
 				't.topic_moved_id = 0',
 			),
 		);
@@ -156,7 +156,7 @@ 
 				POSTS_TABLE		=> 'p',
 			),
 			'WHERE'		=> array(
-				't.topic_id = p.topic_id AND p.post_time > ' . (int) $this->user->data['user_lastvisit'],
+				't.topic_id = p.topic_id AND p.post_time > '.(int) $this->user->data['user_lastvisit'],
 			),
 		);
 	}