blitze / phpBB-ext-sitemaker

model/mapper_factory.php

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
 	 */
 	public function create($type)
 	{
-		$mapper_class = 'blitze\\sitemaker\\model\\mapper\\' . $type;
-		$collection = 'blitze\\sitemaker\\model\\collections\\' . $type;
+		$mapper_class = 'blitze\\sitemaker\\model\\mapper\\'.$type;
+		$collection = 'blitze\\sitemaker\\model\\collections\\'.$type;
 
 		return new $mapper_class($this->db, new $collection, $this, $this->mapper_tables[$type], $this->config);
 	}

model/mapper/blocks.php

Spacing +10 added lines, -10 removed lines

@@ -25,8 +25,8 @@ 
 	 */
 	protected function find_sql(array $sql_where)
 	{
-		return 'SELECT * FROM ' . $this->entity_table .
-			((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . '
+		return 'SELECT * FROM '.$this->entity_table.
+			((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').'
 			ORDER BY position, weight ASC';
 	}
 
@@ -40,12 +40,12 @@ 
 		// move blocks up for position
 		if ($condition instanceof $this->entity_class)
 		{
-			$this->db->sql_query('UPDATE ' . $this->entity_table . '
+			$this->db->sql_query('UPDATE '.$this->entity_table.'
 				SET weight = weight - 1
-				WHERE weight > ' . (int) $condition->get_weight() . '
-					AND style = ' . (int) $condition->get_style() . '
-					AND route_id = ' . (int) $condition->get_route_id() . "
-					AND position = '" . $this->db->sql_escape($condition->get_position()) . "'");
+				WHERE weight > ' . (int) $condition->get_weight().'
+					AND style = ' . (int) $condition->get_style().'
+					AND route_id = ' . (int) $condition->get_route_id()."
+					AND position = '" . $this->db->sql_escape($condition->get_position())."'");
 		}
 	}
 
@@ -65,10 +65,10 @@ 
 	protected function move_blocks_down(\blitze\sitemaker\model\entity_interface $entity)
 	{
 		/** @type \blitze\sitemaker\model\entity\block $entity */
-		$sql = 'UPDATE ' . $this->entity_table . '
+		$sql = 'UPDATE '.$this->entity_table.'
 			SET weight = weight + 1
-			WHERE weight >= ' . (int) $entity->get_weight() . '
-				AND route_id = ' . (int) $entity->get_route_id() . '
+			WHERE weight >= ' . (int) $entity->get_weight().'
+				AND route_id = ' . (int) $entity->get_route_id().'
 				AND style = ' . (int) $entity->get_style();
 		$this->db->sql_query($sql);
 	}

controller/blocks_admin.php

Braces +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
 			$return_data = $command->execute($style_id);
 
 			$this->action_handler->clear_cache();
-		}
-		catch (\blitze\sitemaker\exception\base $e)
+		} catch (\blitze\sitemaker\exception\base $e)
 		{
 			$json_data['message'] = $e->get_message($this->translator);
 		}

controller/menus_admin.php

Braces +2 added lines, -4 removed lines

@@ -63,12 +63,10 @@
 			$return_data = $command->execute();
 
 			$this->action_handler->clear_cache();
-		}
-		catch (\blitze\sitemaker\exception\base $e)
+		} catch (\blitze\sitemaker\exception\base $e)
 		{
 			$return_data['message'] = $e->get_message($this->translator);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			$return_data['message'] = $this->translator->lang($e->getMessage());
 		}

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/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);

exception/base.php

Spacing +2 added lines, -2 removed lines

@@ -96,10 +96,10 @@
 		foreach ($this->message_full as &$message)
 		{
 			// Attempt to translate each portion
-			$translated_message = $translator->lang('EXCEPTION_' . $message);
+			$translated_message = $translator->lang('EXCEPTION_'.$message);
 
 			// Check if translating did anything
-			if ($translated_message !== 'EXCEPTION_' . $message)
+			if ($translated_message !== 'EXCEPTION_'.$message)
 			{
 				// It did, so replace message with the translated version
 				$message = $translated_message;

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