blitze / phpBB-ext-sitemaker_content

services/actions/type/save.php

Doc Comments +1 added lines, -1 removed lines

@@ -300,7 +300,7 @@
 	/**
 	 * @param string $field
 	 * @param array $fields_settings
-	 * @param array $fields_options
+	 * @param array $field_options
 	 * @param array $fields_defaults
 	 * @return array
 	 */

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/admin_controller.php

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

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/add.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * @param \blitze\sitemaker\services\auto_lang				$auto_lang				Auto add lang file
 	 * @param \blitze\content\services\form\fields_factory		$fields_factory			Fields factory  object
 	 * @param \blitze\content\services\views\views_factory		$views_factory			Views factory object
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \blitze\sitemaker\services\auto_lang $auto_lang, \blitze\content\services\form\fields_factory $fields_factory, \blitze\content\services\views\views_factory $views_factory)
 	{
 		$this->auth = $auth;

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
 			'POST_DATE'			=> $this->user->format_date(time()),
 			'ITEMS_PER_PAGE'	=> 10,
 			'TOPICS_PER_GROUP'	=> 4,
-			'U_ACTION'			=> $u_action . "&do=save&type=$type",
+			'U_ACTION'			=> $u_action."&do=save&type=$type",
 
 			'S_TYPE_OPS'				=> $this->get_field_options(),
 			'S_FORUM_OPTIONS'			=> make_forum_select(false, $forum_id, true, false, false),
@@ -115,7 +115,7 @@ 
 		$options = '';
 		foreach ($fields as $field => $object)
 		{
-			$options .= '<option value="' . $field . '">' . $this->language->lang($object->get_langname()) . '</option>';
+			$options .= '<option value="'.$field.'">'.$this->language->lang($object->get_langname()).'</option>';
 		}
 
 		return $options;

services/actions/type/edit.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * @param \blitze\content\services\form\fields_factory		$fields_factory			Fields factory  object
 	 * @param \blitze\content\model\mapper_factory				$mapper_factory			Mapper factory object
 	 * @param \blitze\content\services\views\views_factory		$views_factory			Views factory object
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \blitze\sitemaker\services\auto_lang $auto_lang, \blitze\content\services\types $content_types, \blitze\content\services\form\fields_factory $fields_factory, \blitze\content\model\mapper_factory $mapper_factory, \blitze\content\services\views\views_factory $views_factory)
 	{
 		parent::__construct($auth, $language, $template, $user, $auto_lang, $fields_factory, $views_factory);

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;
 	}
 
@@ -75,16 +75,16 @@ 
 				'L_FORUM_PERMS'	=> $this->language->lang('EDIT_FORUM_PERMISSIONS', $langname),
 				'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_index', array('type' => $type)),
-				'U_POST'		=> append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, "i=-blitze-content-ucp-content_module&mode=content&action=post&type={$type}"),
-				'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}ucp.".$this->php_ext, "i=-blitze-content-ucp-content_module&mode=content&action=post&type={$type}"),
+				'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_var('U_ADD_TYPE', $u_action . "&do=add");
+		$this->template->assign_var('U_ADD_TYPE', $u_action."&do=add");
 	}
 }