blitze / phpBB-ext-sitemaker_content

services/actions/type/delete.php

Indentation +6 added lines, -6 removed lines

@@ -35,13 +35,13 @@ 
 	/** @var \blitze\sitemaker\model\mapper_factory */
 	protected $sitemaker_mapper_factory;
 
-    /** @var bool */
-    private $auto_refresh;
+	/** @var bool */
+	private $auto_refresh;
 
-    /** @var bool */
-    private $trigger_error;
+	/** @var bool */
+	private $trigger_error;
 
-    /**
+	/**
 	 * Constructor
 	 *
 	 * @param \phpbb\cache\driver\driver_interface		$cache						Cache object
@@ -53,7 +53,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/edit.php

Indentation +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 	 * Constructor
 	 *
 	 * @param \phpbb\auth\auth									$auth					Auth object
-     * @param \phpbb\controller\helper                          $controller_helper      Controller Helper object
+	 * @param \phpbb\controller\helper                          $controller_helper      Controller Helper object
 	 * @param \phpbb\language\language							$language				Language Object
 	 * @param \phpbb\event\dispatcher_interface					$phpbb_dispatcher		Event dispatcher object
 	 * @param \phpbb\template\template							$template				Template object
@@ -31,7 +31,7 @@ 
 	 * @param \blitze\content\services\views\views_factory		$views_factory			Views factory object
 	 * @param \blitze\content\services\types					$content_types			Content types object
 	 * @param \blitze\content\model\mapper_factory				$mapper_factory			Mapper factory object
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\controller\helper $controller_helper, \phpbb\event\dispatcher_interface $phpbb_dispatcher, \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, \blitze\content\services\types $content_types, \blitze\content\model\mapper_factory $mapper_factory)
 	{
 		parent::__construct($auth, $controller_helper, $phpbb_dispatcher, $language, $template, $user, $auto_lang, $fields_factory, $views_factory);

services/permissions.php

Indentation +22 added lines, -22 removed lines

@@ -11,28 +11,28 @@
 
 class permissions
 {
-    /** @var \phpbb\auth\auth */
-    protected $auth;
-
-    /** @var \phpbb\config\db */
-    protected $config;
-
-    /** @var \phpbb\user */
-    protected $user;
-
-    /**
-     * Constructor
-     *
-     * @param \phpbb\auth\auth		$auth		Auth object
-     * @param \phpbb\config\db		$config		Config object
-     * @param \phpbb\user			$user		User object
-     */
-    public function __construct(\phpbb\auth\auth $auth, \phpbb\config\db $config, \phpbb\user $user)
-    {
-        $this->auth = $auth;
-        $this->config = $config;
-        $this->user = $user;
-    }
+	/** @var \phpbb\auth\auth */
+	protected $auth;
+
+	/** @var \phpbb\config\db */
+	protected $config;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/**
+	 * Constructor
+	 *
+	 * @param \phpbb\auth\auth		$auth		Auth object
+	 * @param \phpbb\config\db		$config		Config object
+	 * @param \phpbb\user			$user		User object
+	 */
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\db $config, \phpbb\user $user)
+	{
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->user = $user;
+	}
 
 	/**
 	 * @param array $post_data

services/helper.php

Indentation +6 added lines, -6 removed lines

@@ -25,7 +25,7 @@ 
 	 * @param \phpbb\user			$user				User object
 	 * @param string				$phpbb_root_path	Path to the phpbb includes directory.
 	 * @param string				$php_ext			php file extension
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\db $config, \phpbb\user $user, $phpbb_root_path, $php_ext)
 	{
 		parent::__construct($auth, $config, $user);
@@ -191,11 +191,11 @@ 
 		return append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=-blitze-content-mcp-content_module&mode=content&do=view&type=$content_type&t=$topic_id");
 	}
 
-    /**
-     * @param int $forum_id
-     * @param int $topic_id
-     * @return string
-     */
+	/**
+	 * @param int $forum_id
+	 * @param int $topic_id
+	 * @return string
+	 */
 	public function get_mcp_url($forum_id, $topic_id)
 	{
 		$u_mcp = '';

Spacing +12 added lines, -12 removed lines

@@ -53,7 +53,7 @@ 
 	public function get_edit_url(array $post_data, array $topic_data, $cp_mode = '')
 	{
 		$cp_param = $this->get_cp_param($post_data, $topic_data, $cp_mode);
-		return ($this->edit_allowed($post_data, $topic_data)) ? append_sid("{$this->phpbb_root_path}posting.$this->php_ext", "mode=edit&f={$topic_data['forum_id']}&p={$post_data['post_id']}" . $cp_param) : '';
+		return ($this->edit_allowed($post_data, $topic_data)) ? append_sid("{$this->phpbb_root_path}posting.$this->php_ext", "mode=edit&f={$topic_data['forum_id']}&p={$post_data['post_id']}".$cp_param) : '';
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	public function get_delete_url(array $post_data, array $topic_data, $cp_mode = '')
 	{
 		$cp_param = $this->get_cp_param($post_data, $topic_data, $cp_mode);
-		return ($this->delete_allowed($post_data, $topic_data)) ? append_sid("{$this->phpbb_root_path}posting.$this->php_ext", 'mode=' . (($this->softdelete_allowed($post_data)) ? 'soft_delete' : 'delete') . "&f={$post_data['forum_id']}&p={$post_data['post_id']}" . $cp_param) : '';
+		return ($this->delete_allowed($post_data, $topic_data)) ? append_sid("{$this->phpbb_root_path}posting.$this->php_ext", 'mode='.(($this->softdelete_allowed($post_data)) ? 'soft_delete' : 'delete')."&f={$post_data['forum_id']}&p={$post_data['post_id']}".$cp_param) : '';
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 	 */
 	public function get_print_topic_url(array $topic_data)
 	{
-		return ($this->auth->acl_get('f_print', $topic_data['forum_id'])) ? $topic_data['topic_url'] . '?view=print' : '';
+		return ($this->auth->acl_get('f_print', $topic_data['forum_id'])) ? $topic_data['topic_url'].'?view=print' : '';
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public function get_email_topic_url(array $topic_data)
 	{
-		return ($this->auth->acl_get('f_email', $topic_data['forum_id']) && $this->config['email_enable']) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&t=' . $topic_data['topic_id']) : '';
+		return ($this->auth->acl_get('f_email', $topic_data['forum_id']) && $this->config['email_enable']) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&t='.$topic_data['topic_id']) : '';
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function get_search_users_posts_url($forum_id, $username)
 	{
-		return append_sid("{$this->phpbb_root_path}search.{$this->php_ext}", "author={$username}&" . urlencode('fid[]') . "=$forum_id&sc=0&sf=titleonly&sr=topics");
+		return append_sid("{$this->phpbb_root_path}search.{$this->php_ext}", "author={$username}&".urlencode('fid[]')."=$forum_id&sc=0&sf=titleonly&sr=topics");
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	public function get_info_url(array $post_data)
 	{
 		$forum_id = $post_data['forum_id'];
-		return ($this->auth->acl_get('m_info', $forum_id)) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=main&mode=post_details&f=$forum_id&p=" . $post_data['post_id'], true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_info', $forum_id)) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=main&mode=post_details&f=$forum_id&p=".$post_data['post_id'], true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -132,7 +132,7 @@ 
 	 */
 	public function get_approve_url(array $post_data, $viewtopic_url)
 	{
-		return append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=queue&p={$post_data['post_id']}&f={$post_data['forum_id']}&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url . '&p=' . $post_data['post_id'] . '#p' . $post_data['post_id'])));
+		return append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=queue&p={$post_data['post_id']}&f={$post_data['forum_id']}&redirect=".urlencode(str_replace('&', '&', $viewtopic_url.'&p='.$post_data['post_id'].'#p'.$post_data['post_id'])));
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	 */
 	public function get_mcp_report_url(array $post_data)
 	{
-		return ($this->auth->acl_get('m_report', $post_data['forum_id'])) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=reports&mode=report_details&f=' . $post_data['forum_id'] . '&p=' . $post_data['post_id'], true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_report', $post_data['forum_id'])) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=reports&mode=report_details&f='.$post_data['forum_id'].'&p='.$post_data['post_id'], true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function get_mcp_restore_url(array $post_data, array $topic_data)
 	{
-		return ($this->auth->acl_get('m_approve', $post_data['forum_id'])) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&mode=' . (($topic_data['topic_visibility'] != ITEM_DELETED) ? 'deleted_posts' : 'deleted_topics') . '&f=' . $post_data['forum_id'] . '&p=' . $post_data['post_id'], true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_approve', $post_data['forum_id'])) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&mode='.(($topic_data['topic_visibility'] != ITEM_DELETED) ? 'deleted_posts' : 'deleted_topics').'&f='.$post_data['forum_id'].'&p='.$post_data['post_id'], true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function get_notes_url(array $post_data)
 	{
-		return ($this->auth->acl_getf_global('m_')) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=notes&mode=user_notes&u=' . $post_data['poster_id'], true, $this->user->session_id) : '';
+		return ($this->auth->acl_getf_global('m_')) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=notes&mode=user_notes&u='.$post_data['poster_id'], true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	 */
 	public function get_warning_url(array $post_data)
 	{
-		return ($this->auth->acl_get('m_warn') && !$this->user_is_poster($post_data['poster_id']) && $post_data['poster_id'] != ANONYMOUS) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=warn&mode=warn_post&f=' . $post_data['forum_id'] . '&p=' . $post_data['post_id'], true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_warn') && !$this->user_is_poster($post_data['poster_id']) && $post_data['poster_id'] != ANONYMOUS) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=warn&mode=warn_post&f='.$post_data['forum_id'].'&p='.$post_data['post_id'], true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -242,7 +242,7 @@ 
 		$cp_param = '';
 		if ($topic_data['topic_first_post_id'] == $post_data['post_id'])
 		{
-			$cp_param = '&cp=' . ((!$cp_mode) ? (($this->user_is_poster($post_data['poster_id'])) ? 'ucp' : 'mcp') : $cp_mode);
+			$cp_param = '&cp='.((!$cp_mode) ? (($this->user_is_poster($post_data['poster_id'])) ? 'ucp' : 'mcp') : $cp_mode);
 		}
 		return $cp_param;
 	}

Braces +1 added lines, -2 removed lines

@@ -222,8 +222,7 @@
 			if ($topic_id)
 			{
 				$u_mcp = append_sid("{$this->phpbb_root_path}mcp.{$this->php_ext}", "i=mcp_main&mode=topic_view&f=$forum_id&t=$topic_id", true, $this->user->session_id);
-			}
-			else
+			} else
 			{
 				$u_mcp = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=-blitze-content-mcp-content_module&mode=content', true, $this->user->session_id);
 			}

model/mapper/types.php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
 	 */
 	public function delete($entity)
 	{
-        /** @var \blitze\content\model\entity\type $entity */
-        parent::delete($entity);
+		/** @var \blitze\content\model\entity\type $entity */
+		parent::delete($entity);
 
 		if ($entity instanceof $this->entity_class)
 		{