blitze / phpBB-ext-sitemaker

blocks/forum_topics.php

Spacing +5 added lines, -5 removed lines

@@ -108,7 +108,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);
 
@@ -156,10 +156,10 @@ 
 				'VIEWS'				=> (int) $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]);
 		}

Braces +2 added lines, -4 removed lines

@@ -257,8 +257,7 @@ 
 		if ($this->settings['context'] && $this->settings['preview_chars'])
 		{
 			$post_data = $this->forum_data->get_post_data($this->settings['context']);
-		}
-		else
+		} else
 		{
 			$post_data = array_fill_keys(array_keys($topic_data), array(array('post_text' => '', 'bbcode_uid' => '', 'bbcode_bitfield' => '')));
 		}
@@ -277,8 +276,7 @@ 
 			$this->fields['user_id'] = 'topic_last_poster_id';
 
 			$this->ptemplate->assign_var('L_POST_BY_AUTHOR', $this->translator->lang('LAST_POST_BY_AUTHOR'));
-		}
-		else
+		} else
 		{
 			$this->fields['time'] = 'topic_time';
 			$this->fields['user_id'] = 'topic_poster';

blocks/whats_new.php

Braces +2 added lines, -4 removed lines

@@ -72,8 +72,7 @@ 
 				'title'		=> '',
 				'content'	=> '',
 			);
-		}
-		else
+		} else
 		{
 			$this->fetch_new($bdata['settings']);
 
@@ -117,8 +116,7 @@ 
 		{
 			$sorting = 't.topic_last_post_time';
 			$sql_array = $this->get_topics_sql();
-		}
-		else
+		} else
 		{
 			$sorting = 'p.post_time';
 			$sql_array = $this->get_posts_sql();

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'],
 			),
 		);
 	}

blocks/stats.php

Spacing +3 added lines, -3 removed lines

@@ -45,9 +45,9 @@
 	public function display(array $settings, $edit_mode = false)
 	{
 		$content = '';
-		$content .= $this->translator->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']) . '<br />';
-		$content .= $this->translator->lang('TOTAL_TOPICS', (int) $this->config['num_topics']) . '<br />';
-		$content .= $this->translator->lang('TOTAL_USERS', (int) $this->config['num_users']) . '<br />';
+		$content .= $this->translator->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']).'<br />';
+		$content .= $this->translator->lang('TOTAL_TOPICS', (int) $this->config['num_topics']).'<br />';
+		$content .= $this->translator->lang('TOTAL_USERS', (int) $this->config['num_users']).'<br />';
 		$content .= $this->translator->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour']));
 
 		$this->template->assign_var('NEWEST_USER', false);

blocks/custom.php

Braces +1 added lines, -2 removed lines

@@ -150,8 +150,7 @@
 		if (!$block_exists)
 		{
 			$sql = 'INSERT INTO ' . $this->cblocks_table . ' ' . $this->db->sql_build_array('INSERT', $sql_data);
-		}
-		else
+		} else
 		{
 			$sql = 'UPDATE ' . $this->cblocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE block_id = ' . (int) $sql_data['block_id'];
 		}

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,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, false, true);
@@ -149,11 +149,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('sm_cblocks');
@@ -173,7 +173,7 @@ 
 
 			$block_is_active = $status;
 			$status = ($content && $status) ? true : false;
-			$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'] . '" data-active="' . $block_is_active . '">' . $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'].'" data-active="'.$block_is_active.'">'.$content.'</div>';
 		}
 	}
 

services/poll.php

Braces +1 added lines, -2 removed lines

@@ -303,8 +303,7 @@
 				$cur_voted_id[] = $row['poll_option_id'];
 			}
 			$this->db->sql_freeresult($result);
-		}
-		else
+		} else
 		{
 			// Cookie based guest tracking ... I don't like this but hum ho
 			// it's oft requested. This relies on "nice" users who don't feel

Spacing +6 added lines, -6 removed lines

@@ -100,7 +100,7 @@ 
 			'S_POLL_ACTION'		=> $viewtopic_url,
 			'S_FORM_TOKEN'		=> $this->sitemaker->get_form_key('posting'),
 
-			'U_VIEW_RESULTS'	=> $viewtopic_url . '&view=viewpoll',
+			'U_VIEW_RESULTS'	=> $viewtopic_url.'&view=viewpoll',
 		));
 	}
 
@@ -171,7 +171,7 @@ 
 		$post_id = (int) $topic_data['topic_first_post_id'];
 
 		$sql = 'SELECT o.*, p.bbcode_bitfield, p.bbcode_uid
-			FROM ' . POLL_OPTIONS_TABLE . ' o, ' . POSTS_TABLE . " p
+			FROM ' . POLL_OPTIONS_TABLE.' o, '.POSTS_TABLE." p
 			WHERE o.topic_id = $topic_id
 				AND p.post_id = $post_id
 				AND p.topic_id = o.topic_id
@@ -247,8 +247,8 @@ 
 		if ($this->user->data['is_registered'])
 		{
 			$sql = 'SELECT poll_option_id
-			FROM ' . POLL_VOTES_TABLE . '
-			WHERE topic_id = ' . (int) $topic_id . '
+			FROM ' . POLL_VOTES_TABLE.'
+			WHERE topic_id = ' . (int) $topic_id.'
 				AND vote_user_id = ' . (int) $this->user->data['user_id'];
 			$result = $this->db->sql_query($sql);
 
@@ -263,9 +263,9 @@ 
 			// Cookie based guest tracking ... I don't like this but hum ho
 			// it's oft requested. This relies on "nice" users who don't feel
 			// the need to delete cookies to mess with results.
-			if ($this->request->is_set($this->config['cookie_name'] . '_poll_' . $topic_id, \phpbb\request\request_interface::COOKIE))
+			if ($this->request->is_set($this->config['cookie_name'].'_poll_'.$topic_id, \phpbb\request\request_interface::COOKIE))
 			{
-				$cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'] . '_poll_' . $topic_id, '', true, \phpbb\request\request_interface::COOKIE));
+				$cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'].'_poll_'.$topic_id, '', true, \phpbb\request\request_interface::COOKIE));
 				$cur_voted_id = array_map('intval', $cur_voted_id);
 			}
 		}

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_GROUPS') . '</option>';
+		$options = '<option value="0">'.$this->translator->lang('ALL_GROUPS').'</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']);
 	}
 
 	/**

services/members.php

Spacing +9 added lines, -9 removed lines

@@ -63,7 +63,7 @@ 
 		// @codeCoverageIgnoreStart
 		if (!function_exists('phpbb_get_user_avatar'))
 		{
-			include($phpbb_root_path . 'includes/functions_display.' . $php_ext);
+			include($phpbb_root_path.'includes/functions_display.'.$php_ext);
 		}
 		// @codeCoverageIgnoreEnd
 	}
@@ -101,8 +101,8 @@ 
 	 */
 	protected function member_posts(array $row)
 	{
-		$u_posts = append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id={$row['user_id']}&sr=posts" . $this->explain_range);
-		$user_posts = '<a href="' . $u_posts . '">' . $row['user_posts'] . '</a>';
+		$u_posts = append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id={$row['user_id']}&amp;sr=posts".$this->explain_range);
+		$user_posts = '<a href="'.$u_posts.'">'.$row['user_posts'].'</a>';
 
 		return array(
 			'USERNAME'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
@@ -170,7 +170,7 @@ 
 			'WHERE'			=> $this->db->sql_in_set('u.user_type', array(USER_NORMAL, USER_FOUNDER)),
 		);
 
-		$sql_method = 'set_' . $this->settings['query_type'] . '_sql';
+		$sql_method = 'set_'.$this->settings['query_type'].'_sql';
 		call_user_func_array(array($this, $sql_method), array(&$sql_ary));
 
 		$this->set_range_sql($sql_ary);
@@ -184,7 +184,7 @@ 
 	protected function set_visits_sql(array &$sql_ary)
 	{
 		$sql_ary['SELECT'] .= ', u.user_lastvisit as member_date';
-		$sql_ary['WHERE'] .= ' AND u.user_lastvisit <> 0 AND u.user_id <> ' . (int) $this->user->data['user_id'];
+		$sql_ary['WHERE'] .= ' AND u.user_lastvisit <> 0 AND u.user_id <> '.(int) $this->user->data['user_id'];
 		$sql_ary['ORDER_BY'] = 'u.user_lastvisit DESC';
 
 		$this->sql_date_field = 'user_lastvisit';
@@ -200,7 +200,7 @@ 
 		$this->info_header = '';
 		$this->view_mode = 'member_bots';
 
-		$sql_ary['WHERE'] = 'u.user_type = ' . USER_IGNORE;
+		$sql_ary['WHERE'] = 'u.user_type = '.USER_IGNORE;
 	}
 
 	/**
@@ -209,7 +209,7 @@ 
 	protected function set_tenured_sql(array &$sql_ary)
 	{
 		$sql_ary['SELECT'] .= ', u.user_regdate as member_date';
-		$sql_ary['ORDER_BY'] = 'u.user_regdate ' . (($this->settings['query_type'] == 'tenured') ? 'ASC' : 'DESC');
+		$sql_ary['ORDER_BY'] = 'u.user_regdate '.(($this->settings['query_type'] == 'tenured') ? 'ASC' : 'DESC');
 
 		$this->sql_date_field = 'u.user_regdate';
 		$this->settings['date_range'] = '';
@@ -232,7 +232,7 @@ 
 		$sql_ary['SELECT'] .= ', COUNT(p.post_id) as user_posts';
 		$sql_ary['FROM'] += array(TOPICS_TABLE => 't');
 		$sql_ary['FROM'] += array(POSTS_TABLE => 'p');
-		$sql_ary['WHERE'] .= ' AND ' . time() . ' > t.topic_time AND t.topic_id = p.topic_id AND p.post_visibility = ' . ITEM_APPROVED . ' AND p.poster_id = u.user_id';
+		$sql_ary['WHERE'] .= ' AND '.time().' > t.topic_time AND t.topic_id = p.topic_id AND p.post_visibility = '.ITEM_APPROVED.' AND p.poster_id = u.user_id';
 		$sql_ary['GROUP_BY'] = 'u.user_id';
 		$sql_ary['ORDER_BY'] = 'user_posts DESC, u.username ASC';
 
@@ -249,7 +249,7 @@ 
 		if ($this->settings['date_range'] && $this->sql_date_field)
 		{
 			$range = $this->date_range->get($this->settings['date_range']);
-			$this->explain_range = '&amp;date=' . $range['date'];
+			$this->explain_range = '&amp;date='.$range['date'];
 
 			$sql_ary['WHERE'] .= " AND {$this->sql_date_field} BETWEEN {$range['start']} AND {$range['stop']}";
 		}

services/blocks/action/base_action.php

Braces +1 added lines, -2 removed lines

@@ -144,8 +144,7 @@
 		{
 			$content = $this->translator->lang('BLOCK_NO_DATA');
 			$returned_data['status'] = 0;
-		}
-		else
+		} else
 		{
 			$content = $returned_data['content'];
 		}

services/blocks/action/save_blocks.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
 		if (!$has_blocks && !$this->route_is_customized($entity->to_array()))
 		{
 			$this->route_mapper->delete($entity);
-		}
-		else
+		} else
 		{
 			$entity->set_has_blocks($has_blocks);
 			$this->route_mapper->save($entity);