blitze / phpBB-ext-sitemaker_content

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

services/actions/type/toggle_status.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	 * @param \blitze\content\services\types			$content_types			Content types object
 	 * @param \blitze\content\model\mapper_factory		$mapper_factory			Mapper factory object
 	 * @param boolean									$redirect				Used for testing
-	*/
+	 */
 	public function __construct(\phpbb\cache\driver\driver_interface $cache, \blitze\content\services\types $content_types, \blitze\content\model\mapper_factory $mapper_factory, $redirect = true)
 	{
 		$this->cache = $cache;

services/actions/type/index.php

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 	 * @param string								$phpbb_root_path		Path to the phpbb includes directory.
 	 * @param string								$relative_admin_path	Relative admin root path
 	 * @param string								$php_ext				php file extension
-	*/
+	 */
 	public function __construct(\phpbb\controller\helper $controller_helper, \phpbb\language\language $language, \phpbb\template\template $template, \blitze\content\services\types $content_types, $phpbb_root_path, $relative_admin_path, $php_ext)
 	{
 		$this->controller_helper = $controller_helper;

Spacing +8 added lines, -8 removed lines

@@ -52,7 +52,7 @@ 
 		$this->template = $template;
 		$this->content_types = $content_types;
 		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpbb_admin_path = $this->phpbb_root_path . $relative_admin_path;
+		$this->phpbb_admin_path = $this->phpbb_root_path.$relative_admin_path;
 		$this->php_ext = $php_ext;
 	}
 
@@ -76,19 +76,19 @@ 
 
 				'S_ENABLED'		=> $entity->get_content_enabled(),
 
-				'U_DELETE'		=> $u_action . '&do=pre_delete&type=' . $type,
-				'U_EDIT'		=> $u_action . '&do=edit&type=' . $type,
-				'U_STATUS'		=> $u_action . '&do=toggle_status&type=' . $type,
+				'U_DELETE'		=> $u_action.'&do=pre_delete&type='.$type,
+				'U_EDIT'		=> $u_action.'&do=edit&type='.$type,
+				'U_STATUS'		=> $u_action.'&do=toggle_status&type='.$type,
 				'U_VIEW'		=> $this->controller_helper->route('blitze_content_type', array('type' => $type)),
-				'U_POST'		=> append_sid("{$this->phpbb_root_path}posting." . $this->php_ext, "mode=post&f=$forum_id"),
-				'U_GROUP_PERMS'	=> append_sid("{$this->phpbb_admin_path}index." . $this->php_ext, "i=acp_permissions&mode=setting_group_global"),
-				'U_FORUM_PERMS'	=> append_sid("{$this->phpbb_admin_path}index." . $this->php_ext, "i=acp_permissions&mode=setting_forum_local&forum_id[]=$forum_id"),
+				'U_POST'		=> append_sid("{$this->phpbb_root_path}posting.".$this->php_ext, "mode=post&f=$forum_id"),
+				'U_GROUP_PERMS'	=> append_sid("{$this->phpbb_admin_path}index.".$this->php_ext, "i=acp_permissions&mode=setting_group_global"),
+				'U_FORUM_PERMS'	=> append_sid("{$this->phpbb_admin_path}index.".$this->php_ext, "i=acp_permissions&mode=setting_forum_local&forum_id[]=$forum_id"),
 			);
 		}
 
 		$this->template->assign_vars(array(
 			'TYPES'			=> $types_list,
-			'U_ADD_TYPE'	=> $u_action . "&do=add",
+			'U_ADD_TYPE'	=> $u_action."&do=add",
 		));
 	}
 }

services/actions/type/save.php

Indentation +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 * @param string									$phpbb_admin_path       Relative admin root path
 	 * @param string									$php_ext				php file extension
 	 * @param boolean									$auto_refresh			Used for testing
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\cache\driver\driver_interface $cache, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \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 $mapper_factory, $phpbb_admin_path, $php_ext, $auto_refresh = true)
 	{
 		$this->auth = $auth;

Spacing +4 added lines, -4 removed lines

@@ -108,7 +108,7 @@ 
 	 * @param \blitze\content\model\entity\type $unsaved_entity
 	 * @return void
 	 */
-	protected function handle_content_type($type, \blitze\content\model\entity\type &$unsaved_entity)
+	protected function handle_content_type($type, \blitze\content\model\entity\type & $unsaved_entity)
 	{
 		$forum_perm_from = $this->request->variable('copy_forum_perm', 0);
 
@@ -187,8 +187,8 @@ 
 	{
 		if (!$type)
 		{
-			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]=' . $forum_id, true);
-			$message = $this->language->lang('CONTENT_TYPE_CREATED', '<a href="' . $u_set_permission . '">', '</a>');
+			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]='.$forum_id, true);
+			$message = $this->language->lang('CONTENT_TYPE_CREATED', '<a href="'.$u_set_permission.'">', '</a>');
 		}
 		else
 		{
@@ -237,7 +237,7 @@ 
 		if ($old_langname !== $new_langname)
 		{
 			$forum_name = $this->language->lang($new_langname);
-			$sql = 'UPDATE ' . FORUMS_TABLE . " SET forum_name = '" . $this->db->sql_escape($forum_name) . "' WHERE forum_id = " . (int) $forum_id;
+			$sql = 'UPDATE '.FORUMS_TABLE." SET forum_name = '".$this->db->sql_escape($forum_name)."' WHERE forum_id = ".(int) $forum_id;
 			$this->db->sql_query($sql);
 		}
 	}

Braces +2 added lines, -4 removed lines

@@ -121,8 +121,7 @@ 
 			$unsaved_entity->set_content_id($entity->get_content_id());
 			$this->handle_langname_change($forum_id, $entity->get_content_langname(), $unsaved_entity->get_content_langname());
 			$this->copy_forum_permissions($forum_id, $forum_perm_from);
-		}
-		else
+		} else
 		{
 			$forum_id = $this->create_content_forum($unsaved_entity->get_content_langname(), $forum_perm_from);
 			$unsaved_entity->set_forum_id($forum_id);
@@ -189,8 +188,7 @@ 
 		{
 			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]=' . $forum_id, true);
 			$message = $this->language->lang('CONTENT_TYPE_CREATED', '<a href="' . $u_set_permission . '">', '</a>');
-		}
-		else
+		} else
 		{
 			$this->meta_refresh(3, $u_action);
 			$message = $this->language->lang('CONTENT_TYPE_UPDATED');

controller/field_controller.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 	 */
 	protected function set_prop($prop, array &$data)
 	{
-		$field_prop = $this->request->variable('field_' . $prop, array('' => array(0 => '')), true);
+		$field_prop = $this->request->variable('field_'.$prop, array('' => array(0 => '')), true);
 
 		if (null !== ($array = array_pop($field_prop)))
 		{