blitze / phpBB-ext-sitemaker

model/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';
 	}
 }

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

model/mapper/items.php

Spacing +1 added lines, -1 removed lines

@@ -172,6 +172,6 @@
 	 */
 	protected function get_sql_where($menu_id)
 	{
-		return '%smenu_id = ' . (int) $menu_id;
+		return '%smenu_id = '.(int) $menu_id;
 	}
 }

model/entity/item.php

Spacing +4 added lines, -4 removed lines

@@ -136,7 +136,7 @@ 
 	 */
 	public function set_item_icon($icon)
 	{
-		$this->item_icon = ($icon) ? trim($icon) . ' ' : '';
+		$this->item_icon = ($icon) ? trim($icon).' ' : '';
 		return $this;
 	}
 
@@ -153,7 +153,7 @@ 
 		// add leading / for local paths, except leading hashtags
 		if ($this->is_local($this->item_url) && $this->item_url[0] !== '#')
 		{
-			$this->item_url = '/' . ltrim($this->item_url, './');
+			$this->item_url = '/'.ltrim($this->item_url, './');
 		}
 
 		return $this;
@@ -168,7 +168,7 @@ 
 
 		if ($this->is_local($item_url) && $item_url[0] === '/')
 		{
-			$item_url = $this->board_url . $item_url;
+			$item_url = $this->board_url.$item_url;
 			if ($this->mod_rewrite_enabled)
 			{
 				$item_url = str_replace('app.php/', '', $item_url);
@@ -185,6 +185,6 @@ 
 	private function is_local($item_url)
 	{
 		$host = parse_url($item_url, PHP_URL_HOST);
-		return (!$item_url || !empty($host) || substr($item_url, 0, 2) === '//') ? false: true;
+		return (!$item_url || !empty($host) || substr($item_url, 0, 2) === '//') ? false : true;
 	}
 }

model/entity/block.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 	 */
 	public function set_class($class)
 	{
-		$this->class = ($class) ? ' ' . trim($class) : '';
+		$this->class = ($class) ? ' '.trim($class) : '';
 		return $this;
 	}
 

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

services/poll.php

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',
 		));
 	}
 
@@ -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
@@ -216,7 +216,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)
 		{
@@ -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 = ' . $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);
 			}
 		}

blocks/login.php

Spacing +4 added lines, -4 removed lines

@@ -77,9 +77,9 @@ 
 			$this->ptemplate->assign_vars(array(
 				'S_SHOW_HIDE_ME'		=> ($settings['show_hide_me']) ? true : false,
 				'S_AUTOLOGIN_ENABLED'   => ($settings['allow_autologin']) ? true : false,
-				'S_LOGIN_ACTION'		=> append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=login'),
-				'U_REGISTER'			=> append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=register'),
-				'U_SEND_PASSWORD'		=> append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=sendpassword'),
+				'S_LOGIN_ACTION'		=> append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=login'),
+				'U_REGISTER'			=> append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=register'),
+				'U_SEND_PASSWORD'		=> append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=sendpassword'),
 				'U_REDIRECT'			=> reapply_sid(ltrim(rtrim(build_url(array('edit_mode')), '?'), './../'))
 			));
 
@@ -104,7 +104,7 @@ 
 	private function hide_quicklogin()
 	{
 		$current_page = $this->user->page['page_name'];
-		if ($current_page === 'index.' . $this->php_ext)
+		if ($current_page === 'index.'.$this->php_ext)
 		{
 			$this->template->assign_var('S_USER_LOGGED_IN', true);
 		}

blocks/custom.php

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