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

Braces +1 added lines, -2 removed lines

@@ -96,8 +96,7 @@
 		if ($entity->get_item_id())
 		{
 			$item = $this->tree->update_item($entity->get_item_id(), $sql_data);
-		}
-		else
+		} else
 		{
 			$item = $this->tree->insert($sql_data);
 		}

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

Braces +1 added lines, -2 removed lines

@@ -175,8 +175,7 @@
 		if (!is_array($settings))
 		{
 			$this->settings = $settings;
-		}
-		else if (sizeof($settings))
+		} else if (sizeof($settings))
 		{
 			$this->settings = json_encode($settings);
 			$this->hash = md5($this->settings);

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

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

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
 			));
 
 			$content = $this->ptemplate->render_view('blitze/sitemaker', 'blocks/login.html', 'login_block');
-		}
-		else if ($settings['show_member_menu'])
+		} else if ($settings['show_member_menu'])
 		{
 			$block = $this->phpbb_container->get('blitze.sitemaker.block.member_menu');
 			$block->set_template($this->ptemplate);

model/base_collection.php

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 		{
 			$this->entities = array_filter(
 				$this->entities,
-				function ($v) use ($key)
+				function($v) use ($key)
 				{
 					return $v !== $key;
 				}

Braces +1 added lines, -2 removed lines

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

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

model/base_mapper.php

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);
 			$sql_where[] = $this->$callable($field, $value, $operator);
 		}
 
@@ -223,7 +223,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)."'";
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 */
 	protected function get_sql_where_integer($field, $value, $operator)
 	{
-		return $field . " $operator " . (int) $value;
+		return $field." $operator ".(int) $value;
 	}
 
 	/**

Braces +2 added lines, -4 removed lines

@@ -89,8 +89,7 @@ 
 		if (is_null($entity->$accessor()))
 		{
 			$entity = $this->insert($entity);
-		}
-		else
+		} else
 		{
 			$this->update($entity);
 		}
@@ -109,8 +108,7 @@ 
 			{
 				$accessor = 'get_' . $this->entity_pkey;
 				$condition = array($this->entity_pkey, '=', $condition->$accessor());
-			}
-			else
+			} else
 			{
 				throw new \blitze\sitemaker\exception\invalid_argument(array('entity', 'INVALID_ENTITY'));
 			}

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