blitze / phpBB-ext-sitemaker_content

services/template/loader.php

Braces +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 		{
 			$data = $this->blocks_data[$id];
 			$column_name = 'block_tpl';
-		}
-		else
+		} else
 		{
 			$data = $this->content_types[$id];
 			$column_name = $view . '_tpl';

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 		else
 		{
 			$data = $this->content_types[$id];
-			$column_name = $view . '_tpl';
+			$column_name = $view.'_tpl';
 		}
 
 		$return = array(

services/topic.php

Spacing +3 added lines, -3 removed lines

@@ -211,7 +211,7 @@ 
 		$l_edited_by = $edit_reason = '';
 		if (($row['post_edit_count'] && $this->config['display_last_edited']) || $row['post_edit_reason'])
 		{
-			$display_username	= $users_cache[$row['poster_id']]['username_full'];
+			$display_username = $users_cache[$row['poster_id']]['username_full'];
 			$l_edited_by = $this->language->lang('EDITED_TIMES_TOTAL', (int) $row['post_edit_count'], $display_username, $this->user->format_date($row['post_edit_time'], false, true));
 			$edit_reason = $row['post_edit_reason'];
 		}
@@ -232,8 +232,8 @@ 
 		$l_deleted_by = $delete_reason = $l_deleted_message = '';
 		if ($row['post_visibility'] === ITEM_DELETED && $row['post_delete_user'])
 		{
-			$display_postername	= $users_cache[$row['poster_id']]['username_full'];
-			$display_username	= $users_cache[$row['post_delete_user']]['username_full'];
+			$display_postername = $users_cache[$row['poster_id']]['username_full'];
+			$display_username = $users_cache[$row['post_delete_user']]['username_full'];
 
 			if ($row['post_delete_reason'])
 			{

Braces +1 added lines, -2 removed lines

@@ -238,8 +238,7 @@
 			if ($row['post_delete_reason'])
 			{
 				$l_deleted_message = $this->language->lang('POST_DELETED_BY_REASON', $display_postername, $display_username, $this->user->format_date($row['post_delete_time'], false, true), $row['post_delete_reason']);
-			}
-			else
+			} else
 			{
 				$l_deleted_message = $this->language->lang('POST_DELETED_BY', $display_postername, $display_username, $this->user->format_date($row['post_delete_time'], false, true));
 			}

services/fields.php

Braces +1 added lines, -2 removed lines

@@ -122,8 +122,7 @@
 			)), CASE_UPPER));
 			$this->template->set_filenames(array('content' => $this->tpl_name));
 			$tpl_data['CUSTOM_DISPLAY'] = $this->template->assign_display('content');
-		}
-		else
+		} else
 		{
 			$tpl_data['SEQ_DISPLAY'] = join('<br />', $fields_data);
 		}

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
 
 		if (!empty($custom_tpl))
 		{
-			$this->tpl_name	= ($tpl_name) ? $tpl_name : $content_type . '_' . $view_mode;
+			$this->tpl_name	= ($tpl_name) ? $tpl_name : $content_type.'_'.$view_mode;
 		}
 
 		$this->view_mode = (in_array($view_mode, array('summary', 'detail'))) ? $view_mode : 'summary';
@@ -96,7 +96,7 @@ 
 	 */
 	public function show($type, array $topic_data, array $post_data, array $users_cache, array $attachments, array &$update_count, array $topic_tracking_info, array $topic_data_overwrite = array(), $mode = '')
 	{
-		$callable = 'get_' . $this->view_mode . '_template_data';
+		$callable = 'get_'.$this->view_mode.'_template_data';
 		$tpl_data = array_merge(
 			$this->{$callable}($type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info, $mode),
 			$topic_data_overwrite
@@ -166,7 +166,7 @@ 
 		{
 			$field_type		= $row['field_type'];
 			$field_value	= &$post_field_data[$field_name];
-			$field_contents	= $this->form_fields[$field_type]->display_field($field_value, $this->view_mode, $tpl_data, $row);
+			$field_contents = $this->form_fields[$field_type]->display_field($field_value, $this->view_mode, $tpl_data, $row);
 
 			// this essentially hides other fields if the field returns an array
 			if (is_array($field_contents))
@@ -175,7 +175,7 @@ 
 				break;
 			}
 
-			$fields_data[$field_name] = '<div class="field-label ' . $this->label[$row['field_' . $this->view_mode . '_ldisp']] . '">' . $row['field_label'] . ': </div>' . $field_contents;
+			$fields_data[$field_name] = '<div class="field-label '.$this->label[$row['field_'.$this->view_mode.'_ldisp']].'">'.$row['field_label'].': </div>'.$field_contents;
 		}
 
 		return $fields_data;

services/helper.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,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)
 	{
 		$this->auth = $auth;

Spacing +10 added lines, -10 removed lines

@@ -137,7 +137,7 @@ 
 	public function edit_post(array $topic_data, array $post_data, $cp_class = '')
 	{
 		$cp_class = $this->get_cp_class($post_data['poster_id'], $cp_class);
-		$callable = $cp_class . '_can_edit_topic';
+		$callable = $cp_class.'_can_edit_topic';
 		$edit_url = '';
 
 		if ($this->user->data['is_registered'] &&
@@ -204,7 +204,7 @@ 
 	public function delete_post(array $topic_data, array $post_data)
 	{
 		$cp_class = $this->get_cp_class($post_data['poster_id']);
-		$callable = $cp_class . '_can_delete_topic';
+		$callable = $cp_class.'_can_delete_topic';
 		$u_delete = '';
 
 		if ($this->user->data['is_registered'] &&
@@ -223,7 +223,7 @@ 
 	 */
 	public function mini_post($post_id)
 	{
-		return append_sid("{$this->phpbb_root_path}viewtopic.$this->php_ext", 'p=' . $post_id) . '#p' . $post_id;
+		return append_sid("{$this->phpbb_root_path}viewtopic.$this->php_ext", 'p='.$post_id).'#p'.$post_id;
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 */
 	public function report_topic($forum_id, $post_id)
 	{
-		return ($this->auth->acl_get('f_report', $forum_id)) ? append_sid("{$this->phpbb_root_path}report.$this->php_ext", 'f=' . $forum_id . '&p=' . $post_id) : '';
+		return ($this->auth->acl_get('f_report', $forum_id)) ? append_sid("{$this->phpbb_root_path}report.$this->php_ext", 'f='.$forum_id.'&p='.$post_id) : '';
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	 */
 	public function mcp_report($forum_id, $post_id)
 	{
-		return ($this->auth->acl_get('m_report', $forum_id)) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=reports&mode=report_details&f=' . $forum_id . '&p=' . $post_id, true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_report', $forum_id)) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=reports&mode=report_details&f='.$forum_id.'&p='.$post_id, true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 */
 	public function mcp_approve($forum_id, $post_id)
 	{
-		return ($this->auth->acl_get('m_approve', $forum_id)) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&mode=approve_details&f=' . $forum_id . '&p=' . $post_id, true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_approve', $forum_id)) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&mode=approve_details&f='.$forum_id.'&p='.$post_id, true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -275,7 +275,7 @@ 
 	 */
 	public function mcp_approve_action($forum_id, $post_id, $viewtopic_url)
 	{
-		return append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=queue&p=$post_id&f=$forum_id&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url . '&p=' . $post_id . '#p' . $post_id)));
+		return append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=queue&p=$post_id&f=$forum_id&redirect=".urlencode(str_replace('&', '&', $viewtopic_url.'&p='.$post_id.'#p'.$post_id)));
 	}
 
 	/**
@@ -286,7 +286,7 @@ 
 	 */
 	public function mcp_restore($forum_id, $post_id, $topic_visibility)
 	{
-		return ($this->auth->acl_get('m_approve', $forum_id)) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&mode=' . (($topic_visibility !== ITEM_DELETED) ? 'deleted_posts' : 'deleted_topics') . '&f=' . $forum_id . '&p=' . $post_id, true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_approve', $forum_id)) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&mode='.(($topic_visibility !== ITEM_DELETED) ? 'deleted_posts' : 'deleted_topics').'&f='.$forum_id.'&p='.$post_id, true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 */
 	public function mcp_notes($poster_id)
 	{
-		return ($this->auth->acl_getf_global('m_')) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=notes&mode=user_notes&u=' . $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='.$poster_id, true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -306,6 +306,6 @@ 
 	 */
 	public function mcp_warn($forum_id, $post_id, $poster_id)
 	{
-		return ($this->auth->acl_get('m_warn') && $poster_id !== $this->user->data['user_id'] && $poster_id !== ANONYMOUS) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=warn&mode=warn_post&f=' . $forum_id . '&p=' . $post_id, true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_warn') && $poster_id !== $this->user->data['user_id'] && $poster_id !== ANONYMOUS) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=warn&mode=warn_post&f='.$forum_id.'&p='.$post_id, true, $this->user->session_id) : '';
 	}
 }

services/template_loader.php

Indentation +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 
 		return new \Twig_Source($source, $name);
 	}
-	*/
+	 */
 
 	/**
 	 * Twig_ExistsLoaderInterface as of Twig 1.11

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 		else
 		{
 			$data = $this->content_types[$id];
-			$column_name = $view . '_tpl';
+			$column_name = $view.'_tpl';
 		}
 
 		$return = array(

Braces +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 		{
 			$data = $this->blocks_data[$id];
 			$column_name = 'block_tpl';
-		}
-		else
+		} else
 		{
 			$data = $this->content_types[$id];
 			$column_name = $view . '_tpl';

services/actions/type/delete.php

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 	 * @param \blitze\sitemaker\services\forum\manager	$forum_manager		Forum manager object
 	 * @param \blitze\content\model\mapper_factory		$cmapper_factory	Content Mapper factory object
 	 * @param \blitze\sitemaker\model\mapper_factory	$smapper_factory	Sitemaker Mapper factory object
-	*/
+	 */
 	public function __construct(\phpbb\cache\service $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 $cmapper_factory, \blitze\sitemaker\model\mapper_factory $smapper_factory)
 	{
 		$this->cache = $cache;

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 	{
 		if (!check_form_key('delete_content_type'))
 		{
-			trigger_error($this->language->lang('FORM_INVALID') . adm_back_link($u_action));
+			trigger_error($this->language->lang('FORM_INVALID').adm_back_link($u_action));
 		}
 
 		$types_mapper = $this->cmapper_factory->create('types');
@@ -77,7 +77,7 @@ 
 		$this->cache->destroy('_content_types');
 
 		meta_refresh(3, $u_action);
-		trigger_error($this->language->lang('CONTENT_TYPE_DELETED') . adm_back_link($u_action));
+		trigger_error($this->language->lang('CONTENT_TYPE_DELETED').adm_back_link($u_action));
 
 	}
 

services/actions/type/toggle_status.php

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 * @param \phpbb\cache\service						$cache					Cache 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\cache\service $cache, \blitze\content\services\types $content_types, \blitze\content\model\mapper_factory $mapper_factory)
 	{
 		$this->cache = $cache;

services/actions/type/pre_delete.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,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\config\db $config, \phpbb\language\language $language, \phpbb\template\template $template, \blitze\content\services\types $content_types)
 	{
 		$this->config = $config;

services/actions/type/add.php

Indentation +1 added lines, -1 removed lines

@@ -43,7 +43,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\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->language = $language;

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,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),
@@ -110,7 +110,7 @@ 
 		$options = '';
 		foreach ($fields as $object)
 		{
-			$options .= '<option value="' . $object->get_name() . '">' . $this->language->lang($object->get_langname()) . "</option>\n";
+			$options .= '<option value="'.$object->get_name().'">'.$this->language->lang($object->get_langname())."</option>\n";
 		}
 
 		return $options;