blitze / phpBB-ext-sitemaker

services/poll.php

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		if (is_array($message))
 		{
 			$this->message = (string) $message[0];
-		}
-		else
+		} else
 		{
 			$this->message = $message;
 		}

Spacing +8 added lines, -8 removed lines

@@ -68,7 +68,7 @@ 
 	 * @param array $topic_data
 	 * @param \phpbb\template\twig\twig $template
 	 */
-	public function build(array $topic_data, \phpbb\template\twig\twig &$template)
+	public function build(array $topic_data, \phpbb\template\twig\twig & $template)
 	{
 		$this->translator->add_lang('viewtopic');
 
@@ -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',
 		));
 	}
 
@@ -132,7 +132,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
@@ -177,7 +177,7 @@ 
 	 * @param int $poll_most
 	 * @param \phpbb\template\twig\twig $template
 	 */
-	private function _build_poll_options(array $cur_voted_id, array $poll_info, $poll_total, $poll_most, \phpbb\template\twig\twig &$template)
+	private function _build_poll_options(array $cur_voted_id, array $poll_info, $poll_total, $poll_most, \phpbb\template\twig\twig & $template)
 	{
 		foreach ($poll_info as $poll_option)
 		{
@@ -208,8 +208,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 = ' . $this->user->data['user_id'];
 			$result = $this->db->sql_query($sql);
 
@@ -224,9 +224,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/forum/data.php

Braces +2 added lines, -4 removed lines

@@ -215,8 +215,7 @@ 
 		if (sizeof($post_ids))
 		{
 			$sql_where[] = $this->db->sql_in_set('p.post_id', $post_ids);
-		}
-		else if (sizeof($this->store['topic']))
+		} else if (sizeof($this->store['topic']))
 		{
 			$sql_where[] = $this->db->sql_in_set('p.topic_id', array_keys($this->store['topic']));
 
@@ -240,8 +239,7 @@ 
 		if ($this->_can_track_by_lastread())
 		{
 			$info = $this->_build_tracking_info('get_topic_tracking');
-		}
-		else if ($this->_can_track_anonymous())
+		} else if ($this->_can_track_anonymous())
 		{
 			$info = $this->_build_tracking_info('get_complete_topic_tracking');
 		}

Spacing +5 added lines, -5 removed lines

@@ -84,7 +84,7 @@ 
 			$this->store['topic'][$row['topic_id']] = $row;
 
 			$this->store['tracking'][$row['forum_id']]['topic_list'][] = $row['topic_id'];
-			$this->store['tracking'][$row['forum_id']]['mark_time'] =& $row['forum_mark_time'];
+			$this->store['tracking'][$row['forum_id']]['mark_time'] = & $row['forum_mark_time'];
 			$this->store['post_ids']['first'][] = $row['topic_first_post_id'];
 			$this->store['post_ids']['last'][] = $row['topic_last_post_id'];
 		}
@@ -319,10 +319,10 @@ 
 	private function _get_attachment_sql($allowed_extensions, $exclude_in_message, $order_by)
 	{
 		return 'SELECT *
-			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('post_msg_id', $this->store['attachments']) .
-				(($exclude_in_message) ? ' AND in_message = 0' : '') .
-				(sizeof($allowed_extensions) ? ' AND ' . $this->db->sql_in_set('extension', $allowed_extensions) : '') . '
+			FROM ' . ATTACHMENTS_TABLE.'
+			WHERE ' . $this->db->sql_in_set('post_msg_id', $this->store['attachments']).
+				(($exclude_in_message) ? ' AND in_message = 0' : '').
+				(sizeof($allowed_extensions) ? ' AND '.$this->db->sql_in_set('extension', $allowed_extensions) : '').'
 			ORDER BY ' . $order_by;
 	}
 }

exception/out_of_bounds.php

Indentation +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@
 class unexpected_value extends base
 {
 	/**
-	* Translate this exception
-	*
-	* @param \phpbb\user $user
-	* @return array|string
-	* @access public
-	*/
+	 * Translate this exception
+	 *
+	 * @param \phpbb\user $user
+	 * @return array|string
+	 * @access public
+	 */
 	public function get_message(\phpbb\user $user)
 	{
 		return $this->translate_portions($user, $this->message_full, 'EXCEPTION_UNEXPECTED_VALUE');

exception/invalid_argument.php

Indentation +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@
 class unexpected_value extends base
 {
 	/**
-	* Translate this exception
-	*
-	* @param \phpbb\user $user
-	* @return array|string
-	* @access public
-	*/
+	 * Translate this exception
+	 *
+	 * @param \phpbb\user $user
+	 * @return array|string
+	 * @access public
+	 */
 	public function get_message(\phpbb\user $user)
 	{
 		return $this->translate_portions($user, $this->message_full, 'EXCEPTION_UNEXPECTED_VALUE');

model/base_mapper.php

Braces +2 added lines, -4 removed lines

@@ -336,8 +336,7 @@ 
 		if ($this->settings['display_preview'])
 		{
 			$post_data = $this->forum->get_post_data($this->settings['display_preview']);
-		}
-		else
+		} else
 		{
 			$post_data = array_fill_keys(array_keys($topic_data), array(array('post_text' => '', 'bbcode_uid' => '', 'bbcode_bitfield' => '')));
 		}
@@ -360,8 +359,7 @@ 
 				$this->fields['user_colour'] = 'topic_last_poster_colour';
 
 				$this->ptemplate->assign_var('L_POST_BY_AUTHOR', $this->user->lang('LAST_POST_BY_AUTHOR'));
-			}
-			else
+			} else
 			{
 				$this->fields['time'] = 'topic_time';
 				$this->fields['user_id'] = 'topic_poster';

Spacing +14 added lines, -14 removed lines

@@ -85,7 +85,7 @@ 
 	 */
 	public function save(\blitze\sitemaker\model\entity_interface $entity)
 	{
-		$accessor = 'get_' . $this->entity_pkey;
+		$accessor = 'get_'.$this->entity_pkey;
 		if (is_null($entity->$accessor()))
 		{
 			$entity = $this->insert($entity);
@@ -107,7 +107,7 @@ 
 		{
 			if ($condition instanceof $this->entity_class)
 			{
-				$accessor = 'get_' . $this->entity_pkey;
+				$accessor = 'get_'.$this->entity_pkey;
 				$condition = array($this->entity_pkey, '=', $condition->$accessor());
 			}
 			else
@@ -117,7 +117,7 @@ 
 		}
 
 		$sql_where = $this->get_sql_condition($condition);
-		$this->db->sql_query('DELETE FROM ' . $this->entity_table . (sizeof($sql_where) ? ' WHERE ' . join(' AND ', $sql_where) : ''));
+		$this->db->sql_query('DELETE FROM '.$this->entity_table.(sizeof($sql_where) ? ' WHERE '.join(' AND ', $sql_where) : ''));
 	}
 
 	/**
@@ -136,9 +136,9 @@ 
 	 */
 	protected function insert(\blitze\sitemaker\model\entity_interface $entity)
 	{
-		$this->db->sql_query('INSERT INTO ' . $this->entity_table . ' ' . $this->db->sql_build_array('INSERT', $entity->to_db()));
+		$this->db->sql_query('INSERT INTO '.$this->entity_table.' '.$this->db->sql_build_array('INSERT', $entity->to_db()));
 
-		$mutator = 'set_' . $this->entity_pkey;
+		$mutator = 'set_'.$this->entity_pkey;
 		$entity->$mutator((int) $this->db->sql_nextid());
 
 		return $entity;
@@ -152,11 +152,11 @@ 
 	 */
 	protected function update(\blitze\sitemaker\model\entity_interface $entity)
 	{
-		$accessor = 'get_' . $this->entity_pkey;
+		$accessor = 'get_'.$this->entity_pkey;
 
-		return $this->db->sql_query('UPDATE ' . $this->entity_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $entity->to_db()) . '
-			WHERE ' . $this->entity_pkey . ' = ' . (int) $entity->$accessor());
+		return $this->db->sql_query('UPDATE '.$this->entity_table.'
+			SET ' . $this->db->sql_build_array('UPDATE', $entity->to_db()).'
+			WHERE ' . $this->entity_pkey.' = '.(int) $entity->$accessor());
 	}
 
 	/**
@@ -165,8 +165,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) : '');
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 		{
 			list($field, $operator, $value) = $info;
 
-			$callable = 'get_sql_where_' . gettype($value);
+			$callable = 'get_sql_where_'.gettype($value);
 			if (is_callable(array($this, $callable)))
 			{
 				$sql_where[] = call_user_func_array(array($this, $callable), array($field, $value, $operator));
@@ -220,7 +220,7 @@ 
 	 */
 	protected function get_sql_where_string($field, $value, $operator)
 	{
-		return $field . " $operator '" . $this->db->sql_escape($value) . "'";
+		return $field." $operator '".$this->db->sql_escape($value)."'";
 	}
 
 	/**
@@ -231,7 +231,7 @@ 
 	 */
 	protected function get_sql_where_integer($field, $value, $operator)
 	{
-		return $field . " $operator " . (int) $value;
+		return $field." $operator ".(int) $value;
 	}
 
 	/**

model/base_entity.php

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
 			if (!isset($key))
 			{
 				$this->_entities[] = $entity;
-			}
-			else
+			} else
 			{
 				$this->_entities[$key] = $entity;
 			}

Indentation +4 added lines, -4 removed lines

@@ -56,8 +56,8 @@ 
 	}
 
 	/**
-	* {@inheritdoc}
-	*/
+	 * {@inheritdoc}
+	 */
 	public function to_array()
 	{
 		$attributes = $this->get_attributes();
@@ -74,8 +74,8 @@ 
 	}
 
 	/**
-	* {@inheritdoc}
-	*/
+	 * {@inheritdoc}
+	 */
 	public function to_db()
 	{
 		$this->check_required();

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	{
 		foreach ($data as $name => $value)
 		{
-			$mutator = 'set_' . $name;
+			$mutator = 'set_'.$name;
 			$this->$mutator($value);
 		}
 	}
@@ -65,7 +65,7 @@ 
 		$data = array();
 		foreach ($attributes as $attribute)
 		{
-			$accessor = 'get_' . $attribute;
+			$accessor = 'get_'.$attribute;
 			$data[$attribute] = $this->$accessor();
 		}
 		unset($data['db_fields'], $data['required_fields']);

cron/blocks_cleanup.php

Spacing +4 added lines, -4 removed lines

@@ -91,8 +91,8 @@ 
 	 */
 	private function clean_styles()
 	{
-		$routes_ary	= $this->manager->get_routes_per_style();
-		$style_ids	= $this->get_style_ids();
+		$routes_ary = $this->manager->get_routes_per_style();
+		$style_ids = $this->get_style_ids();
 
 		$routes = array();
 		foreach ($routes_ary as $style_id => $style_routes)
@@ -122,7 +122,7 @@ 
 
 		foreach ($routes as $route => $row)
 		{
-			$url = $board_url . '/' . (($row['ext_name']) ? 'app.php' : '') . $row['route'];
+			$url = $board_url.'/'.(($row['ext_name']) ? 'app.php' : '').$row['route'];
 
 			// Route no longer exists => remove all blocks for route
 			if ($this->url_checker->exists($url) !== true)
@@ -185,7 +185,7 @@ 
 
 		if (sizeof($block_ids))
 		{
-			$this->db->sql_query('DELETE FROM ' . $this->cblocks_table . ' WHERE ' . $this->db->sql_in_set('block_id', $block_ids));
+			$this->db->sql_query('DELETE FROM '.$this->cblocks_table.' WHERE '.$this->db->sql_in_set('block_id', $block_ids));
 		}
 	}
 

model/blocks/mapper/routes.php

Spacing +2 added lines, -2 removed lines

@@ -70,8 +70,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 route ASC';
 	}
 }

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	}
 
 	/**
-	 * @param array|\blitze\sitemaker\model\blocks\entity\route $condition
+	 * @param \blitze\sitemaker\model\blocks\entity\route $condition
 	 */
 	public function delete($condition)
 	{

model/blocks/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\blocks\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);
 	}