blitze / phpBB-ext-sitemaker_content

services/form/form.php

Braces +3 added lines, -6 removed lines

@@ -195,8 +195,7 @@ 
 			if ($previewing || empty($row['field_props']['is_db_field']))
 			{
 				$fields_data[$field] = $value;
-			}
-			else
+			} else
 			{
 				$this->db_fields[$field] = $value;
 			}
@@ -236,14 +235,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('CONTENT_FIELD_REQUIRED', array($row['field_label']));
-			}
-			else
+			} else
 			{
 				$req_mod_input = true;
 			}

services/form/builder.php

Spacing +6 added lines, -6 removed lines

@@ -147,7 +147,7 @@ 
 		foreach ($fields_data as $field => $value)
 		{
 			$value = is_array($value) ? join("\n", $value) : $value;
-			$message .= '[smcf=' . $field . ']' . $value . '[/smcf]';
+			$message .= '[smcf='.$field.']'.$value.'[/smcf]';
 		}
 
 		return $message;
@@ -200,13 +200,13 @@ 
 		$text = '';
 		if ($entity = $this->types->get_type($content_type))
 		{
-			$fields_accessor = 'get_' . $view . '_fields';
-			$template_accessor = 'get_' . $view . '_tpl';
+			$fields_accessor = 'get_'.$view.'_fields';
+			$template_accessor = 'get_'.$view.'_tpl';
 
 			$this->fields->prepare_to_show($entity, array($post_data['topic_id']), $entity->$fields_accessor(), $entity->$template_accessor(), $view);
 			$content = $this->fields->build_content(array_change_key_case($post_data, CASE_UPPER));
 
-			$text =  $content['CUSTOM_DISPLAY'] ?: join('', $content['FIELDS']['all']);
+			$text = $content['CUSTOM_DISPLAY'] ?: join('', $content['FIELDS']['all']);
 		}
 		return $text;
 	}
@@ -402,8 +402,8 @@ 
 		}
 		else
 		{
-			$options[ITEM_UNAPPROVED]	= 'CONTENT_STATUS_DISAPPROVE';
-			$options[ITEM_APPROVED]		= 'CONTENT_STATUS_APPROVE';
+			$options[ITEM_UNAPPROVED] = 'CONTENT_STATUS_DISAPPROVE';
+			$options[ITEM_APPROVED] = 'CONTENT_STATUS_APPROVE';
 		}
 
 		return $options;

Braces +3 added lines, -6 removed lines

@@ -286,8 +286,7 @@ 
 		if (!$field_data['field_mod_only'] || $this->mode === 'mcp')
 		{
 			$this->form->add($field, $field_data['field_type'], $field_data, $topic_id);
-		}
-		else if (!empty($field_data['field_value']))
+		} else if (!empty($field_data['field_value']))
 		{
 			$this->form->add($field, 'hidden', $field_data, $topic_id);
 		}
@@ -334,8 +333,7 @@ 
 			{
 				$data['force_visibility'] = $visibility;
 			}
-		}
-		else if ($this->force_state())
+		} else if ($this->force_state())
 		{
 			$data['force_visibility'] = ($mode == 'edit_first_post') ? ITEM_REAPPROVE : ITEM_UNAPPROVED;
 		}
@@ -399,8 +397,7 @@ 
 		if ($visibility == ITEM_APPROVED)
 		{
 			$options[ITEM_REAPPROVE] = 'CONTENT_STATUS_REAPPROVE';
-		}
-		else
+		} else
 		{
 			$options[ITEM_UNAPPROVED]	= 'CONTENT_STATUS_DISAPPROVE';
 			$options[ITEM_APPROVED]		= 'CONTENT_STATUS_APPROVE';

services/actions/topic/index.php

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->template->assign_var('MODE', $mode);
@@ -105,8 +105,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(true, false)
@@ -137,7 +137,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++)
 		{
@@ -169,7 +169,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'],
 		);
 	}
 
@@ -194,7 +194,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),
 		));
 	}
 
@@ -204,7 +204,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));
@@ -216,7 +216,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()),
 			));
 		}
 	}
@@ -234,7 +234,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",
 		);
 	}
 
@@ -284,8 +284,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",
 		);
 	}
 
@@ -312,7 +312,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(
@@ -328,7 +328,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) : '';
 	}
 
 	/**
@@ -345,7 +345,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);
 			}
 		}
 
@@ -358,7 +358,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/actions/type/delete.php

Indentation +1 added lines, -1 removed lines

@@ -61,7 +61,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\log\log_interface $logger, \phpbb\request\request_interface $request, \phpbb\user $user, \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/save.php

Indentation +1 added lines, -1 removed lines

@@ -73,7 +73,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\log\log_interface $logger, \phpbb\request\request_interface $request, \phpbb\user $user, \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 +5 added lines, -5 removed lines

@@ -122,7 +122,7 @@ 
 	 * @param \blitze\content\model\entity\type $unsaved_entity
 	 * @return string
 	 */
-	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)
 	{
 		$existing_langname = '';
 		$forum_perm_from = $this->request->variable('copy_forum_perm', 0);
@@ -207,9 +207,9 @@ 
 	{
 		if (!$type)
 		{
-			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]=' . $entity->get_forum_id(), true);
+			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]='.$entity->get_forum_id(), true);
 			$lang_key = 'CONTENT_TYPE_CREATED';
-			$message = $this->language->lang($lang_key, '<a href="' . $u_set_permission . '">', '</a>');
+			$message = $this->language->lang($lang_key, '<a href="'.$u_set_permission.'">', '</a>');
 		}
 		else
 		{
@@ -226,7 +226,7 @@ 
 		}
 
 		$additional_data[] = $entity->get_content_langname();
-		$this->logger->add('admin', $this->user->data['user_id'], $this->user->ip, 'ACP_LOG_' . $lang_key, time(), $additional_data);
+		$this->logger->add('admin', $this->user->data['user_id'], $this->user->ip, 'ACP_LOG_'.$lang_key, time(), $additional_data);
 
 		$this->trigger_error($message, $u_action);
 	}
@@ -269,7 +269,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

@@ -137,8 +137,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);
@@ -210,8 +209,7 @@ 
 			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]=' . $entity->get_forum_id(), true);
 			$lang_key = 'CONTENT_TYPE_CREATED';
 			$message = $this->language->lang($lang_key, '<a href="' . $u_set_permission . '">', '</a>');
-		}
-		else
+		} else
 		{
 			$this->meta_refresh(3, $u_action);
 			$lang_key = 'CONTENT_TYPE_UPDATED';