blitze / phpBB-ext-sitemaker_content

controller/admin_controller.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 *
 	 * @param \phpbb\language\language					$language			Language object
 	 * @param \blitze\content\services\action_handler	$action_handler		Handles actions
-	*/
+	 */
 	public function __construct(\phpbb\language\language $language, \blitze\content\services\action_handler $action_handler)
 	{
 		$this->language = $language;

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		catch (\blitze\sitemaker\exception\base $e)
 		{
 			$message = $e->get_message($this->language);
-			trigger_error($this->language->lang($message) . adm_back_link($base_url), E_USER_WARNING);
+			trigger_error($this->language->lang($message).adm_back_link($base_url), E_USER_WARNING);
 		}
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
 		{
 			$command = $this->action_handler->create('type', $action);
 			$command->execute($base_url, $type);
-		}
-		catch (\blitze\sitemaker\exception\base $e)
+		} catch (\blitze\sitemaker\exception\base $e)
 		{
 			$message = $e->get_message($this->language);
 			trigger_error($this->language->lang($message) . adm_back_link($base_url), E_USER_WARNING);

model/mapper/fields.php

Spacing +3 added lines, -3 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 field_order ASC';
 	}
 
@@ -35,7 +35,7 @@ 
 	 */
 	public function get_max_field_id()
 	{
-		$result = $this->db->sql_query('SELECT MAX(' . $this->entity_pkey . ') AS max_id FROM ' . $this->entity_table);
+		$result = $this->db->sql_query('SELECT MAX('.$this->entity_pkey.') AS max_id FROM '.$this->entity_table);
 		$max_id = $this->db->sql_fetchfield('max_id');
 		$this->db->sql_freeresult($result);
 

model/mapper_factory.php

Spacing +2 added lines, -2 removed lines

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

services/form/form.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 	 */
 	public function add($name, $type, array $field_data, $forum_id = 0, $topic_id = 0)
 	{
-		$field_data += array('field_id' => 'field-' . $name);
+		$field_data += array('field_id' => 'field-'.$name);
 		$field_data += $this->get_default_field_data();
 
 		if ($this->fields_factory->exists($type))

Braces +3 added lines, -6 removed lines

@@ -197,8 +197,7 @@ 
 			if ($previewing || empty($row['field_props']['is_db_field']))
 			{
 				$fields_data[$field] = $value;
-			}
-			else
+			} else
 			{
 				$this->db_fields[$field] = $value;
 			}
@@ -238,14 +237,12 @@ 
 		if (!empty($field_value))
 		{
 			$this->errors[] = $obj->validate_field($row);
-		}
-		else if ($row['field_required'])
+		} else if ($row['field_required'])
 		{
 			if (!$row['field_mod_only'] || $cp_class === 'mcp')
 			{
 				$this->errors[] = $this->language->lang_array('FIELD_REQUIRED', array($row['field_label']));
-			}
-			else
+			} else
 			{
 				$req_mod_input = true;
 			}

services/action_handler.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 */
 	public function create($mode, $action)
 	{
-		$service_name = 'blitze.content.actions.' . $mode . '.' . $action;
+		$service_name = 'blitze.content.actions.'.$mode.'.'.$action;
 		if (!$this->phpbb_container->has($service_name))
 		{
 			throw new \blitze\sitemaker\exception\out_of_bounds(array($action, 'INVALID_REQUEST'));

services/actions/topic/view.php

Spacing +2 added lines, -2 removed lines

@@ -65,14 +65,14 @@
 		$entity->set_allow_comments(false);
 
 		$overwrite = array(
-			'TOPIC_URL'	=> $u_action . '&do=view&type=' . $type . '&t=' . $topic_id,
+			'TOPIC_URL'	=> $u_action.'&do=view&type='.$type.'&t='.$topic_id,
 			'U_INFO'	=> '',
 		);
 
 		if ($mode === 'mcp')
 		{
 			$redirect_url = urlencode(str_replace('&', '&', $u_action));
-			$overwrite['U_DELETE'] = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&action=delete_topic&t=' . $topic_id . '&redirect=' . $redirect_url);
+			$overwrite['U_DELETE'] = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&action=delete_topic&t='.$topic_id.'&redirect='.$redirect_url);
 		}
 
 		$update_count = array();

services/actions/topic/filter.php

Spacing +10 added lines, -10 removed lines

@@ -88,7 +88,7 @@ 
 	{
 		$copy_params = $this->params;
 		unset($copy_params['type']);
-		$view_url = $u_action . http_build_query($copy_params);
+		$view_url = $u_action.http_build_query($copy_params);
 
 		$this->template->assign_block_vars('content', array(
 			'TITLE'			=> $this->language->lang('TOPIC_ALL'),
@@ -104,7 +104,7 @@ 
 				'TITLE'			=> $entity->get_content_langname(),
 				'COLOUR'		=> $entity->get_content_colour(),
 				'S_SELECTED'	=> ($type === $content_name) ? true : false,
-				'U_VIEW'		=> $view_url . '&type=' . $content_name
+				'U_VIEW'		=> $view_url.'&type='.$content_name
 			));
 		}
 	}
@@ -134,7 +134,7 @@ 
 	{
 		$copy_params = $this->params;
 		unset($copy_params['status']);
-		$view_url = $u_action . http_build_query($copy_params);
+		$view_url = $u_action.http_build_query($copy_params);
 
 		$this->template->assign_block_vars('status', array(
 			'TITLE'			=> $this->language->lang('TOPIC_ALL'),
@@ -146,9 +146,9 @@ 
 		foreach ($topic_status_ary as $status)
 		{
 			$this->template->assign_block_vars('status', array(
-				'TITLE'			=> $this->language->lang('TOPIC_' . strtoupper($status)),
+				'TITLE'			=> $this->language->lang('TOPIC_'.strtoupper($status)),
 				'S_SELECTED'	=> ($status === $topic_status) ? true : false,
-				'U_VIEW'		=> $view_url . '&status=' . $status
+				'U_VIEW'		=> $view_url.'&status='.$status
 			));
 		}
 	}
@@ -163,18 +163,18 @@ 
 		switch ($topic_status)
 		{
 			case 'scheduled':
-				$sql_where_array[] = 't.topic_time > ' . time();
+				$sql_where_array[] = 't.topic_time > '.time();
 			break;
 			case 'unapproved':
 			case 'published':
 			case 'deleted':
-				$sql_where_array[] = 't.topic_visibility = ' . array_search($topic_status, $this->filter_topic_status_ary);
+				$sql_where_array[] = 't.topic_visibility = '.array_search($topic_status, $this->filter_topic_status_ary);
 			break;
 			case 'recommended':
 			case 'featured':
 			case 'must_read':
-				$sql_where_array[] = 't.topic_type = ' . array_search($topic_status, $this->filter_topic_types_ary);
-				$sql_where_array[] = 't.topic_visibility = ' . ITEM_APPROVED;
+				$sql_where_array[] = 't.topic_type = '.array_search($topic_status, $this->filter_topic_types_ary);
+				$sql_where_array[] = 't.topic_visibility = '.ITEM_APPROVED;
 			break;
 		}
 	}
@@ -188,7 +188,7 @@ 
 		if ($keyword = $this->request->variable('keyword', '', true))
 		{
 			$this->params['keyword'] = $keyword;
-			$sql_where_array[] = 't.topic_title ' . $this->db->sql_like_expression($this->db->get_any_char() . $keyword . $this->db->get_any_char());
+			$sql_where_array[] = 't.topic_title '.$this->db->sql_like_expression($this->db->get_any_char().$keyword.$this->db->get_any_char());
 		}
 	}
 }

services/actions/type/delete.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * @param \blitze\sitemaker\model\mapper_factory	$sitemaker_mapper_factory	Sitemaker Mapper factory object
 	 * @param bool										$auto_refresh				Used during testing
 	 * @param bool										$trigger_error				Used during testing
-	*/
+	 */
 	public function __construct(\phpbb\cache\driver\driver_interface $cache, \phpbb\language\language $language, \phpbb\request\request_interface $request, \blitze\content\services\types $content_types, \blitze\sitemaker\services\forum\manager $forum_manager, \blitze\content\model\mapper_factory $content_mapper_factory, \blitze\sitemaker\model\mapper_factory $sitemaker_mapper_factory, $auto_refresh = true, $trigger_error = true)
 	{
 		$this->cache = $cache;

services/actions/type/pre_delete.php

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 * @param \phpbb\language\language					$language			Language Object
 	 * @param \phpbb\template\template					$template			Template object
 	 * @param \blitze\content\services\types			$content_types		Content types object
-	*/
+	 */
 	public function __construct(\phpbb\language\language $language, \phpbb\template\template $template, \blitze\content\services\types $content_types)
 	{
 		$this->language = $language;