blitze / phpBB-ext-sitemaker

blocks/custom.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 +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/whats_new.php

Braces +2 added lines, -4 removed lines

@@ -50,8 +50,7 @@ 
 		if (!empty($collection))
 		{
 			return $collection->get_entities();
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -88,8 +87,7 @@ 
 		if (!$has_blocks && !$hiding_blocks && !sizeof($ex_positions))
 		{
 			$this->route_mapper->delete($route);
-		}
-		else
+		} else
 		{
 			$route->set_has_blocks($has_blocks);
 			$this->route_mapper->save($route);

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 > ' . $this->user->data['user_lastvisit'],
+				't.topic_last_post_time > '.$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 > ' . $this->user->data['user_lastvisit'],
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
 			),
 		);
 	}

blocks/whois.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 +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 
 		if (!empty($data['.'][0]['TOTAL_USERS_ONLINE']))
 		{
-			$l_online_users	= $data['.'][0]['TOTAL_USERS_ONLINE'];
+			$l_online_users = $data['.'][0]['TOTAL_USERS_ONLINE'];
 			$online_userlist = $data['.'][0]['LOGGED_IN_USER_LIST'];
 			$l_online_record = $data['.'][0]['RECORD_USERS'];
 		}
@@ -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/tree/builder.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 +19 added lines, -19 removed lines

@@ -55,8 +55,8 @@ 
 	 */
 	public function get_item_info($item_id = 0)
 	{
-		$sql = 'SELECT * FROM ' . $this->table_name . ' ' . $this->get_sql_where('WHERE') .
-			(($item_id) ? " AND {$this->column_item_id} = " . (int) $item_id : '');
+		$sql = 'SELECT * FROM '.$this->table_name.' '.$this->get_sql_where('WHERE').
+			(($item_id) ? " AND {$this->column_item_id} = ".(int) $item_id : '');
 
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -75,8 +75,8 @@ 
 	public function update_item($item_id, array $sql_data)
 	{
 		$sql = "UPDATE {$this->table_name}
-			SET " . $this->db->sql_build_array('UPDATE', $sql_data) . "
-			WHERE $this->column_item_id = " . (int) $item_id;
+			SET ".$this->db->sql_build_array('UPDATE', $sql_data)."
+			WHERE $this->column_item_id = ".(int) $item_id;
 		$this->db->sql_query($sql);
 
 		return $sql_data;
@@ -109,7 +109,7 @@ 
 
 		// Rather than updating each item individually, we will just delete all items
 		// then add them all over again with new parent_id|left_id|right_id
-		$this->db->sql_query("DELETE FROM {$this->table_name} " . $this->get_sql_where('WHERE'));
+		$this->db->sql_query("DELETE FROM {$this->table_name} ".$this->get_sql_where('WHERE'));
 
 		// Now we add it back
 		$sql_data = $this->add_sub_tree($tree, 0);
@@ -158,7 +158,7 @@ 
 
 			if ($depth && !$parent_id)
 			{
-				throw new \RuntimeException($this->message_prefix . 'MALFORMED_TREE');
+				throw new \RuntimeException($this->message_prefix.'MALFORMED_TREE');
 			}
 
 			$key = $i + $max_id + 1;
@@ -230,23 +230,23 @@ 
 		foreach ($branch as $i => $row)
 		{
 			$left_id	= $right_id + 1;
-			$right_id   = $right_id + 2;
+			$right_id = $right_id + 2;
 
 			$sql_data[$i] = $row;
-			$sql_data[$i]['parent_id']	= $parent_id;
-			$sql_data[$i]['left_id']	= $left_id;
-			$sql_data[$i]['right_id']	= $right_id;
-			$sql_data[$i]['depth']		= $depth;
+			$sql_data[$i]['parent_id'] = $parent_id;
+			$sql_data[$i]['left_id'] = $left_id;
+			$sql_data[$i]['right_id'] = $right_id;
+			$sql_data[$i]['depth'] = $depth;
 
 			if ($row['parent_id'])
 			{
-				$left_id	= $sql_data[$row['parent_id']]['right_id'];
-				$right_id   = $left_id + 1;
+				$left_id = $sql_data[$row['parent_id']]['right_id'];
+				$right_id = $left_id + 1;
 
-				$sql_data[$i]['parent_id']	= $row['parent_id'];
-				$sql_data[$i]['depth']		= $sql_data[$row['parent_id']]['depth'] + 1;
-				$sql_data[$i]['left_id']	= $left_id;
-				$sql_data[$i]['right_id']	= $right_id;
+				$sql_data[$i]['parent_id'] = $row['parent_id'];
+				$sql_data[$i]['depth'] = $sql_data[$row['parent_id']]['depth'] + 1;
+				$sql_data[$i]['left_id'] = $left_id;
+				$sql_data[$i]['right_id'] = $right_id;
 
 				$this->update_right_side($sql_data, $right_id, $row['parent_id'], $branch);
 			}
@@ -272,7 +272,7 @@ 
 				$this->db->sql_transaction('rollback');
 				$this->lock->release();
 
-				throw new \RuntimeException($this->message_prefix . 'INVALID_PARENT');
+				throw new \RuntimeException($this->message_prefix.'INVALID_PARENT');
 			}
 
 			// adjust items in affected branch
@@ -300,7 +300,7 @@ 
 	protected function get_max_id($column, $use_sql_where = true)
 	{
 		$sql = "SELECT MAX($column) AS $column
-			FROM {$this->table_name} " .
+			FROM {$this->table_name} ".
 			(($use_sql_where) ? $this->get_sql_where('WHERE') : '');
 		$result = $this->db->sql_query($sql);
 		$max_id = $this->db->sql_fetchfield($column);

blocks/forum_topics.php

Braces +2 added lines, -4 removed lines

@@ -50,8 +50,7 @@ 
 		if (!empty($collection))
 		{
 			return $collection->get_entities();
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -88,8 +87,7 @@ 
 		if (!$has_blocks && !$hiding_blocks && !sizeof($ex_positions))
 		{
 			$this->route_mapper->delete($route);
-		}
-		else
+		} else
 		{
 			$route->set_has_blocks($has_blocks);
 			$this->route_mapper->save($route);

Spacing +5 added lines, -5 removed lines

@@ -141,7 +141,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);
 
@@ -189,10 +189,10 @@ 
 				'VIEWS'				=> $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]);
 		}

services/blocks/blocks.php

Braces +1 added lines, -2 removed lines

@@ -178,8 +178,7 @@
 		if (!empty($block['content']))
 		{
 			$content = $block['content'];
-		}
-		else if ($edit_mode)
+		} else if ($edit_mode)
 		{
 			$content = $this->user->lang('BLOCK_NO_DATA');
 		}

blocks/featured_member.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 +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') : '',
 		));
 	}
 

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

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;
 	}
 
 	/**