blitze / phpBB-ext-sitemaker

services/forum/manager.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 
 		if (!class_exists('acp_forums'))
 		{
-			include($this->phpbb_root_path . 'includes/acp/acp_forums.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/acp/acp_forums.'.$this->php_ext);
 		}
 
 		$translator->add_lang('acp/forums');

services/forum/options.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 		// @codeCoverageIgnoreStart
 		if (!function_exists('make_forum_select'))
 		{
-			include($phpbb_root_path . 'includes/functions_admin.' . $php_ext); // @codeCoverageIgnore
+			include($phpbb_root_path.'includes/functions_admin.'.$php_ext); // @codeCoverageIgnore
 		}
 		// @codeCoverageIgnoreEnd
 	}
@@ -43,7 +43,7 @@ 
 		$forum_options = array('' => 'ALL');
 		foreach ($forumlist as $row)
 		{
-			$forum_options[$row['forum_id']] = $row['padding'] . $row['forum_name'];
+			$forum_options[$row['forum_id']] = $row['padding'].$row['forum_name'];
 		}
 
 		return $forum_options;

services/forum/query_builder.php

Spacing +7 added lines, -7 removed lines

@@ -142,7 +142,7 @@ 
 
 		if (in_array($topic_type, array(POST_STICKY, POST_ANNOUNCE)))
 		{
-			$this->store['sql_array']['WHERE'][] = '(t.topic_time_limit > 0 AND (t.topic_time + t.topic_time_limit) < ' . time() . ')';
+			$this->store['sql_array']['WHERE'][] = '(t.topic_time_limit > 0 AND (t.topic_time + t.topic_time_limit) < '.time().')';
 		}
 
 		return $this;
@@ -207,12 +207,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'
 			);
 		}
 
@@ -231,7 +231,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;
@@ -263,7 +263,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;
 	}
@@ -324,7 +324,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;
 		}
 	}
 
@@ -335,7 +335,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.');
 		}
 	}

services/users/data.php

Spacing +8 added lines, -8 removed lines

@@ -75,7 +75,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);
 		}
 
@@ -150,8 +150,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 = ' . $this->user->get_iso_lang_id() . '
+			FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f
+			WHERE l.lang_id = ' . $this->user->get_iso_lang_id().'
 				AND f.field_active = 1
 				AND f.field_no_view = 0
 				AND f.field_hide = 0
@@ -203,7 +203,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") : '';
 	}
 
 	/**
@@ -214,7 +214,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']);
@@ -288,8 +288,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_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/users/userlist.php

Spacing +2 added lines, -2 removed lines

@@ -45,11 +45,11 @@
 			$curr_key = (int) array_search($settings['current_user'], $userlist);
 
 			// Remove the invalid user from the list
-			$new_list = str_replace($settings['current_user'] . ',', '', $settings['userlist'] . ',');
+			$new_list = str_replace($settings['current_user'].',', '', $settings['userlist'].',');
 			$new_list = trim($new_list, ',');
 
 			$new_userlist = self::_get_userlist($new_list);
-			$current_user =& $new_userlist[$curr_key - 1];
+			$current_user = & $new_userlist[$curr_key - 1];
 			$settings['current_user'] = (int) $current_user;
 			$settings['userlist'] = trim($new_list);
 			$settings['last_changed'] = 0;

services/users/contacts.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 	 */
 	protected function get_email_url(array $row)
 	{
-		return ($this->email_form_allowed) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&u=' . $row['user_id']) : (($this->mailto_allowed) ? 'mailto:' . $row['user_email'] : '');
+		return ($this->email_form_allowed) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&u='.$row['user_id']) : (($this->mailto_allowed) ? 'mailto:'.$row['user_email'] : '');
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 			$jabber = array(
 				'ID'		=> 'jabber',
 				'NAME' 		=> $this->translator->lang('JABBER'),
-				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=contact&action=jabber&u=' . $row['user_id']),
+				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=contact&action=jabber&u='.$row['user_id']),
 			);
 		}
 
@@ -156,7 +156,7 @@ 
 			$pm = array(
 				'ID'		=> 'pm',
 				'NAME' 		=> $this->translator->lang('SEND_PRIVATE_MESSAGE'),
-				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'i=pm&mode=compose&u=' . $row['user_id']),
+				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'i=pm&mode=compose&u='.$row['user_id']),
 			);
 		}
 
@@ -219,7 +219,7 @@ 
 	{
 		if (!function_exists('phpbb_get_banned_user_ids'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/functions_user.'.$this->php_ext);
 		}
 
 		return phpbb_get_banned_user_ids($user_ids, false);

services/groups.php

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
 	public function get_users_groups()
 	{
 		$sql = 'SELECT group_id
-			FROM ' . USER_GROUP_TABLE . '
+			FROM ' . USER_GROUP_TABLE.'
 			WHERE user_id = ' . (int) $this->user->data['user_id'];
 		$result = $this->db->sql_query($sql);
 
@@ -83,13 +83,13 @@ 
 		$sql = $this->_get_group_sql($mode);
 		$result = $this->db->sql_query($sql);
 
-		$options = '<option value="0">' . $this->translator->lang('ALL') . '</option>';
+		$options = '<option value="0">'.$this->translator->lang('ALL').'</option>';
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$group_name = $this->_get_group_name($row);
 			$group_class = $this->_get_group_class($row['group_type']);
 			$selected_option = $this->_get_selected_option($row['group_id'], $selected);
-			$options .= '<option' . $group_class . ' value="' . $row['group_id'] . '"' . $selected_option . '>' . $group_name . '</option>';
+			$options .= '<option'.$group_class.' value="'.$row['group_id'].'"'.$selected_option.'>'.$group_name.'</option>';
 		}
 		$this->db->sql_freeresult($result);
 
@@ -103,8 +103,8 @@ 
 	private function _get_group_sql($mode)
 	{
 		return 'SELECT group_id, group_name, group_type
-			FROM ' . GROUPS_TABLE .
-			(($mode === 'special') ? ' WHERE group_type = ' . GROUP_SPECIAL : '') . '
+			FROM ' . GROUPS_TABLE.
+			(($mode === 'special') ? ' WHERE group_type = '.GROUP_SPECIAL : '').'
 			ORDER BY group_type DESC, group_name ASC';
 	}
 
@@ -114,7 +114,7 @@ 
 	 */
 	private function _get_group_name(array $row)
 	{
-		return ($row['group_type'] == GROUP_SPECIAL) ? $this->translator->lang('G_' . $row['group_name']) : ucfirst($row['group_name']);
+		return ($row['group_type'] == GROUP_SPECIAL) ? $this->translator->lang('G_'.$row['group_name']) : ucfirst($row['group_name']);
 	}
 
 	/**

blocks/custom.php

Spacing +4 added lines, -4 removed lines

@@ -69,7 +69,7 @@ 
 		$content = $this->request->variable('content', '', true);
 		$cblocks = $this->get_custom_blocks();
 
-		$sql_data =	$this->get_default_fields($block_id);
+		$sql_data = $this->get_default_fields($block_id);
 		$sql_data['block_content'] = $content;
 
 		generate_text_for_storage($sql_data['block_content'], $sql_data['bbcode_uid'], $sql_data['bbcode_bitfield'], $sql_data['bbcode_options'], true, true, true);
@@ -130,11 +130,11 @@ 
 	{
 		if (!$block_exists)
 		{
-			$sql = 'INSERT INTO ' . $this->cblocks_table . ' ' . $this->db->sql_build_array('INSERT', $sql_data);
+			$sql = 'INSERT INTO '.$this->cblocks_table.' '.$this->db->sql_build_array('INSERT', $sql_data);
 		}
 		else
 		{
-			$sql = 'UPDATE ' . $this->cblocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE block_id = ' . (int) $sql_data['block_id'];
+			$sql = 'UPDATE '.$this->cblocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE block_id = '.(int) $sql_data['block_id'];
 		}
 		$this->db->sql_query($sql);
 		$this->cache->destroy('pt_cblocks');
@@ -151,7 +151,7 @@ 
 		if ($edit_mode !== false)
 		{
 			decode_message($cblock['block_content'], $cblock['bbcode_uid']);
-			$content = '<div id="block-editor-' . $cblock['block_id'] . '" class="editable editable-block" data-service="blitze.sitemaker.block.custom" data-method="edit" data-raw="' . $cblock['block_content'] . '">' . $content . '</div>';
+			$content = '<div id="block-editor-'.$cblock['block_id'].'" class="editable editable-block" data-service="blitze.sitemaker.block.custom" data-method="edit" data-raw="'.$cblock['block_content'].'">'.$content.'</div>';
 		}
 	}
 

blocks/featured_member.php

Spacing +6 added lines, -6 removed lines

@@ -147,7 +147,7 @@ 
 	private function change_user()
 	{
 		$change = false;
-		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 ' . self::$rotations[$this->settings['rotation']]))
+		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 '.self::$rotations[$this->settings['rotation']]))
 		{
 			$this->settings['last_changed'] = time();
 			$change = true;
@@ -162,7 +162,7 @@ 
 	 */
 	private function get_settings(array $bdata)
 	{
-		$cached_settings = $this->cache->get('pt_block_data_' . $bdata['bid']);
+		$cached_settings = $this->cache->get('pt_block_data_'.$bdata['bid']);
 		$settings = ($cached_settings && $cached_settings['hash'] === $bdata['hash']) ? $cached_settings : $bdata['settings'];
 		$settings['hash'] = $bdata['hash'];
 
@@ -182,8 +182,8 @@ 
 			$sql_data = array(
 				'settings'	=> json_encode($settings)
 			);
-			$this->db->sql_query('UPDATE ' . $this->blocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE bid = ' . (int) $bid);
-			$this->cache->put('pt_block_data_' . $bid, $this->settings);
+			$this->db->sql_query('UPDATE '.$this->blocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE bid = '.(int) $bid);
+			$this->cache->put('pt_block_data_'.$bid, $this->settings);
 		}
 	}
 
@@ -235,8 +235,8 @@ 
 		$rotation = $this->settings['rotation'];
 
 		$this->ptemplate->assign_vars(array(
-			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->translator->lang('QTYPE_' . strtoupper($query_type)) : '',
-			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->translator->lang(strtoupper($rotation) . '_MEMBER') : '',
+			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->translator->lang('QTYPE_'.strtoupper($query_type)) : '',
+			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->translator->lang(strtoupper($rotation).'_MEMBER') : '',
 		));
 	}