blitze / phpBB-ext-sitemaker_content

services/actions/type/save.php

Indentation +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 * @param \blitze\content\model\mapper_factory		$mapper_factory			Mapper factory object
 	 * @param string									$phpbb_admin_path       Relative admin root path
 	 * @param string									$php_ext				php file extension
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\cache\service $cache, \phpbb\config\db $config, \phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\request\request_interface $request, \phpbb\template\template $template, \blitze\content\services\types $content_types, \blitze\sitemaker\services\forum\manager $forum, \blitze\content\model\mapper_factory $mapper_factory, $phpbb_admin_path, $php_ext)
 	{
 		$this->auth = $auth;

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
 		{
 			meta_refresh(3, $u_action);
 			$message = $this->language->lang('CONTENT_TYPE_UPDATED');

Spacing +6 added lines, -6 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
 		{
@@ -196,7 +196,7 @@ 
 			$message = $this->language->lang('CONTENT_TYPE_UPDATED');
 		}
 
-		trigger_error($message . adm_back_link($u_action));
+		trigger_error($message.adm_back_link($u_action));
 	}
 
 	/**
@@ -235,7 +235,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);
 		}
 	}
@@ -306,7 +306,7 @@ 
 	 */
 	protected function get_field_settings($field, array $fields_settings, array $fields_defaults)
 	{
-		$field_options = $this->request->variable($field . '_options', array(''), true);
+		$field_options = $this->request->variable($field.'_options', array(''), true);
 
 		if (sizeof($field_options))
 		{

services/actions/type/edit.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,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($language, $template, $user, $auto_lang, $fields_factory, $views_factory);

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 			$this->template->assign_block_vars('field', array_merge(
 				array_change_key_case($entity->to_array(), CASE_UPPER),
 				array(
-					'TOKEN'			=> '{' . strtoupper($entity->get_field_name()) . '}',
+					'TOKEN'			=> '{'.strtoupper($entity->get_field_name()).'}',
 					'TYPE_LABEL'	=> $this->language->lang($object->get_langname()),
 					'DEFAULT_TYPE'	=> $this->get_field_type($entity->get_field_type(), $object->get_default_props()),
 					'FIELD_EXPLAIN'	=> $explain['text'],

services/actions/topic/index.php

Braces +3 added lines, -6 removed lines

@@ -272,16 +272,13 @@
 		if ($topic_deleted)
 		{
 			$topic_status = 'deleted';
-		}
-		else if ($topic_unapproved)
+		} else if ($topic_unapproved)
 		{
 			$topic_status = 'unapproved';
-		}
-		else if ($row['topic_time'] > time())
+		} else if ($row['topic_time'] > time())
 		{
 			$topic_status = 'scheduled';
-		}
-		else
+		} else
 		{
 			$topic_status = $this->filter_topic_types_ary[$row['topic_type']];
 		}

Spacing +15 added lines, -15 removed lines

@@ -90,7 +90,7 @@ 
 	 */
 	public function execute($u_action, $mode = '')
 	{
-		include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+		include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
 
 		$this->language->add_lang('viewforum');
 		$this->language->add_lang('manager', 'blitze/content');
@@ -103,8 +103,8 @@ 
 		$filter_topic_status = $this->apply_status_filter($sql_where_array);
 		$filter_content_type = $this->apply_content_type_filter();
 
-		$callable = 'init_' . $mode . '_mode';
-		$this->base_url = $u_action . (sizeof($this->params) ? '&' : '');
+		$callable = 'init_'.$mode.'_mode';
+		$this->base_url = $u_action.(sizeof($this->params) ? '&' : '');
 		$this->$callable($content_types, $sql_where_array);
 
 		$this->forum->query()
@@ -135,7 +135,7 @@ 
 		$topic_tracking_info = $this->forum->get_topic_tracking_info();
 
 		$topics_data = array_values($topics_data);
-		$base_url = $u_action . http_build_query($this->params);
+		$base_url = $u_action.http_build_query($this->params);
 
 		for ($i = 0, $size = sizeof($topics_data); $i < $size; $i++)
 		{
@@ -170,7 +170,7 @@ 
 	{
 		return array(
 			'ATTACH_ICON_IMG'	=> $this->get_attachment_icon($row),
-			'U_REVIEW_TOPIC'	=> $u_action . "&amp;do=view&amp;type=$content_type&amp;t=" . $row['topic_id'],
+			'U_REVIEW_TOPIC'	=> $u_action."&amp;do=view&amp;type=$content_type&amp;t=".$row['topic_id'],
 			'U_DELETE'			=> $this->get_delete_url($mode, $u_action, $row, $post_row),
 		);
 	}
@@ -196,7 +196,7 @@ 
 			'S_CAN_MAKE_NORMAL'		=> ($s_can_make_sticky || $s_can_make_announce),
 			'S_CAN_MAKE_STICKY'		=> $s_can_make_sticky,
 			'S_CAN_MAKE_ANNOUNCE'	=> $s_can_make_announce,
-			'U_MCP_ACTION'			=> $this->base_url . '&amp;do=moderate&amp;redirect=' . $this->get_redirect_url($this->base_url),
+			'U_MCP_ACTION'			=> $this->base_url.'&amp;do=moderate&amp;redirect='.$this->get_redirect_url($this->base_url),
 		));
 	}
 
@@ -206,7 +206,7 @@ 
 	 */
 	protected function init_ucp_mode(array $content_types, array &$sql_where_array)
 	{
-		$sql_where_array[] =  't.topic_poster = ' . (int) $this->user->data['user_id'];
+		$sql_where_array[] = 't.topic_poster = '.(int) $this->user->data['user_id'];
 
 		// list all content types that the user can post in
 		$postable_forums = array_intersect_key($this->content_forums, $this->auth->acl_getf('f_post', true));
@@ -218,7 +218,7 @@ 
 			$this->template->assign_block_vars('postable', array(
 				'TYPE'		=> $entity->get_content_langname(),
 				'COLOUR'	=> $entity->get_content_colour(),
-				'U_POST'	=> append_sid("{$this->phpbb_root_path}posting." . $this->php_ext, 'mode=post&amp;f=' . $entity->get_forum_id()),
+				'U_POST'	=> append_sid("{$this->phpbb_root_path}posting.".$this->php_ext, 'mode=post&amp;f='.$entity->get_forum_id()),
 			));
 		}
 	}
@@ -237,7 +237,7 @@ 
 			'CONTENT_TYPE'			=> $entity->get_content_langname(),
 			'CONTENT_TYPE_COLOR'	=> $entity->get_content_colour(),
 			'S_COMMENTS'			=> $entity->get_allow_comments(),
-			'U_CONTENT_TYPE'		=> $base_url . "&amp;type=$type",
+			'U_CONTENT_TYPE'		=> $base_url."&amp;type=$type",
 		);
 	}
 
@@ -287,8 +287,8 @@ 
 		}
 
 		return array(
-			'TOPIC_STATUS'		=> $this->language->lang('TOPIC_' . strtoupper($topic_status)),
-			'U_TOPIC_STATUS'	=> $base_url . "&amp;status=$topic_status",
+			'TOPIC_STATUS'		=> $this->language->lang('TOPIC_'.strtoupper($topic_status)),
+			'U_TOPIC_STATUS'	=> $base_url."&amp;status=$topic_status",
 		);
 	}
 
@@ -316,7 +316,7 @@ 
 		if ($mode === 'mcp')
 		{
 			$u_mcp_queue = $this->get_mcp_queue_url($topic_unapproved, $posts_unapproved, $topic_id);
-			$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode=deleted_topics&amp;t=' . $topic_id, true, $this->user->session_id) : $u_mcp_queue;
+			$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode=deleted_topics&amp;t='.$topic_id, true, $this->user->session_id) : $u_mcp_queue;
 		}
 
 		return array(
@@ -332,7 +332,7 @@ 
 	 */
 	protected function get_mcp_queue_url($topic_unapproved, $posts_unapproved, $topic_id)
 	{
-		return ($topic_unapproved || $posts_unapproved) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&amp;t=$topic_id", true, $this->user->session_id) : '';
+		return ($topic_unapproved || $posts_unapproved) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode='.(($topic_unapproved) ? 'approve_details' : 'unapproved_posts')."&amp;t=$topic_id", true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -349,7 +349,7 @@ 
 			if ($mode === 'mcp')
 			{
 				$redirect_url = $this->get_redirect_url($u_action);
-				$u_delete = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&amp;action=delete_topic&amp;t=' . $row['topic_id'] . '&amp;redirect=' . $redirect_url, true, $this->user->session_id);
+				$u_delete = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&amp;action=delete_topic&amp;t='.$row['topic_id'].'&amp;redirect='.$redirect_url, true, $this->user->session_id);
 			}
 		}
 
@@ -362,7 +362,7 @@ 
 	 */
 	protected function get_redirect_url($base_url)
 	{
-		$base_url .= (sizeof($this->params)) ? '&' . http_build_query($this->params) : '';
+		$base_url .= (sizeof($this->params)) ? '&'.http_build_query($this->params) : '';
 		return urlencode(str_replace('&amp;', '&', $base_url));
 	}
 

services/views/base_view.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 * @param \blitze\content\services\helper			$helper				Content helper object
 	 * @param string									$phpbb_root_path	Path to the phpbb includes directory.
 	 * @param string									$php_ext			php file extension
-	*/
+	 */
 	public function __construct(\phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, $phpbb_root_path, $php_ext)
 	{
 		$this->language = $language;

Spacing +6 added lines, -6 removed lines

@@ -121,9 +121,9 @@ 
 
 		for ($i = 0, $size = sizeof($topics_data); $i < $size; $i++)
 		{
-			$topic_data	= $topics_data[$i];
+			$topic_data = $topics_data[$i];
 			$topic_id	= $topic_data['topic_id'];
-			$post_data	= array_shift($posts_data[$topic_id]);
+			$post_data = array_shift($posts_data[$topic_id]);
 
 			$tpl_data = array_merge(
 				$this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info),
@@ -214,8 +214,8 @@ 
 		$this->pagination->generate_template_pagination(
 			array(
 				'routes' => array(
-					'blitze_content_' . $route,
-					'blitze_content_' . $route . '_page',
+					'blitze_content_'.$route,
+					'blitze_content_'.$route.'_page',
 				),
 				'params' => $params,
 			),
@@ -246,7 +246,7 @@ 
 				'L_USER_ABOUT'			=> $this->language->lang('AUTHOR_INFO_EXPLAIN', $user_cache['username_full'], $user_cache['joined'], $user_content_topics, $content_langname, $user_cache['posts']),
 				'L_USER_VIEW_ALL'		=> $this->language->lang('VIEW_AUTHOR_CONTENTS', $content_langname, $user_cache['username']),
 				'L_SEARCH_USER_POSTS'	=> $this->language->lang('SEARCH_USER_POSTS', $user_cache['username']),
-				'U_SEARCH_CONTENTS'		=> append_sid("{$this->phpbb_root_path}search.{$this->php_ext}", "author={$user_cache['username']}&amp;" . urlencode('fid[]') . "=$forum_id&amp;sc=0&amp;sf=titleonly&amp;sr=topics")
+				'U_SEARCH_CONTENTS'		=> append_sid("{$this->phpbb_root_path}search.{$this->php_ext}", "author={$user_cache['username']}&amp;".urlencode('fid[]')."=$forum_id&amp;sc=0&amp;sf=titleonly&amp;sr=topics")
 			)));
 		}
 	}
@@ -266,7 +266,7 @@ 
 				->fetch_forum($topic_data['forum_id'])
 				->fetch_topic_poster($topic_data['topic_poster'])
 				->fetch_custom(array(
-					'WHERE' => array('t.topic_id <> ' . (int) $topic_data['topic_id'])
+					'WHERE' => array('t.topic_id <> '.(int) $topic_data['topic_id'])
 				))->build(true, true, false);
 
 			$topics_data = $this->forum->get_topic_data(5);

services/views/tiles.php

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	 * @param \blitze\content\services\helper			$helper				Content helper object
 	 * @param string									$phpbb_root_path	Path to the phpbb includes directory.
 	 * @param string									$php_ext			php file extension
-	*/
+	 */
 	public function __construct(\phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\request\request_interface $request, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, $phpbb_root_path, $php_ext)
 	{
 		parent::__construct($language, $pagination, $template, $fields, $forum, $helper, $phpbb_root_path, $php_ext);

event/listener.php

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 	 * @param \blitze\content\services\fields		$fields				Content fields object
 	 * @param string								$phpbb_root_path	Path to the phpbb includes directory.
 	 * @param string								$php_ext			php file extension
-	*/
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\language\language $language, \blitze\content\services\types $content_types, \blitze\content\services\fields $fields, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;

Spacing +4 added lines, -4 removed lines

@@ -94,7 +94,7 @@ 
 	public function modify_posts_data(\phpbb\event\data $event)
 	{
 		$sql_array = $event['sql_array'];
-		$sql_array['WHERE'] .= ' AND t.topic_time <= ' . time();
+		$sql_array['WHERE'] .= ' AND t.topic_time <= '.time();
 
 		$sql_count = $sql_array;
 		$sql_count['SELECT'] = 'COUNT(p.post_id) AS total_results';
@@ -115,9 +115,9 @@ 
 	public function modify_topic_data(\phpbb\event\data $event)
 	{
 		$sql_where = $event['sql_where'];
-		$sql_where .= ' AND t.topic_time <= ' . time();
+		$sql_where .= ' AND t.topic_time <= '.time();
 
-		$sql = 'SELECT COUNT(t.topic_id) AS total_results FROM ' . $event['sql_from'] . ' WHERE ' . $sql_where;
+		$sql = 'SELECT COUNT(t.topic_id) AS total_results FROM '.$event['sql_from'].' WHERE '.$sql_where;
 		$result = $this->db->sql_query($sql);
 		$total_results = $this->db->sql_fetchfield('total_results');
 		$this->db->sql_freeresult($result);
@@ -212,7 +212,7 @@ 
 	 */
 	public function add_viewonline_location(\phpbb\event\data $event)
 	{
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/content/') === 0)
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/content/') === 0)
 		{
 			$types = join('|', $this->content_types->get_forum_types());
 			preg_match("/\/content\/($types)(\/[0-9]\/.*)?/is", $event['row']['session_page'], $match);

event/posting.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 * Constructor
 	 *
 	 * @param \blitze\content\services\builder		$builder		Form builder object
-	*/
+	 */
 	public function __construct(\blitze\content\services\builder $builder)
 	{
 		$this->builder = $builder;

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

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
 		{
 			$command = $this->action_handler->create('topic', $action);
 			$command->execute($base_url, 'ucp');
-		}
-		catch (\blitze\sitemaker\exception\base $e)
+		} catch (\blitze\sitemaker\exception\base $e)
 		{
 			$message = $e->get_message($this->language);
 			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>'));

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 		catch (\blitze\sitemaker\exception\base $e)
 		{
 			$message = $e->get_message($this->language);
-			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>'));
+			trigger_error($message.'<br /><br />'.$this->language->lang('RETURN_PAGE', '<a href="'.$base_url.'">', '</a>'));
 		}
 	}
 }

controller/mcp_controller.php

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
 		{
 			$command = $this->action_handler->create('topic', $action);
 			$command->execute($base_url, 'mcp');
-		}
-		catch (\blitze\sitemaker\exception\base $e)
+		} catch (\blitze\sitemaker\exception\base $e)
 		{
 			$message = $e->get_message($this->language);
 			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>'));

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

@@ -46,7 +46,7 @@
 		catch (\blitze\sitemaker\exception\base $e)
 		{
 			$message = $e->get_message($this->language);
-			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>'));
+			trigger_error($message.'<br /><br />'.$this->language->lang('RETURN_PAGE', '<a href="'.$base_url.'">', '</a>'));
 		}
 	}
 }