blitze / phpBB-ext-sitemaker_content

services/types.php

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
 			if ($trigger_error)
 			{
 				throw new \blitze\sitemaker\exception\out_of_bounds($type);
-			}
-			else
+			} else
 			{
 				return false;
 			}

services/form/field/base.php

Braces +2 added lines, -4 removed lines

@@ -134,12 +134,10 @@
 		if ($this->is_too_short($data, $length))
 		{
 			return $this->language->lang('FIELD_TOO_SHORT', $data['field_label'], $data['field_minlength']);
-		}
-		else if ($this->is_too_long($data, $length))
+		} else if ($this->is_too_long($data, $length))
 		{
 			return $this->language->lang('FIELD_TOO_LONG', $data['field_label'], $data['field_maxlength']);
-		}
-		else
+		} else
 		{
 			return $this->language->lang('FIELD_INVALID', $data['field_label']);
 		}

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 		$this->ptemplate->assign_vars($data);
 
 		$field = $this->get_name();
-		return $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field . '_field');
+		return $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field.'_field');
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 	 */
 	public function get_langname()
 	{
-		return strtoupper('FORM_FIELD_' . $this->get_name());
+		return strtoupper('FORM_FIELD_'.$this->get_name());
 	}
 
 	/**

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/actions/topic/moderate.php

Braces +2 added lines, -4 removed lines

@@ -70,8 +70,7 @@ 
 		{
 			$forum_ids = $this->get_selected_forum_ids($topic_ids);
 			$this->{$action}($topic_ids, $forum_ids);
-		}
-		else
+		} else
 		{
 			$message =  $this->language->lang('INVALID_REQUEST', $action);
 			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $u_action . '">', '</a>'));
@@ -113,8 +112,7 @@ 
 		{
 			$this->approve($topic_ids, $forum_ids, false);
 			\mcp_queue::disapprove_posts($post_id_list, '-blitze-content-mcp-content_module', 'content');
-		}
-		else
+		} else
 		{
 			trigger_error('NO_POST_SELECTED');
 		}

Spacing +7 added lines, -7 removed lines

@@ -73,8 +73,8 @@ 
 		}
 		else
 		{
-			$message =  $this->language->lang('INVALID_REQUEST', $action);
-			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $u_action . '">', '</a>'));
+			$message = $this->language->lang('INVALID_REQUEST', $action);
+			trigger_error($message.'<br /><br />'.$this->language->lang('RETURN_PAGE', '<a href="'.$u_action.'">', '</a>'));
 		}
 	}
 
@@ -86,8 +86,8 @@ 
 	 */
 	protected function approve(array $topic_ids, array $forum_ids, $execute = true)
 	{
-		include($this->phpbb_root_path . 'includes/mcp/mcp_queue.' . $this->php_ext);
-		include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
+		include($this->phpbb_root_path.'includes/mcp/mcp_queue.'.$this->php_ext);
+		include($this->phpbb_root_path.'includes/functions_messenger.'.$this->php_ext);
 
 		if (!(sizeof(array_intersect_key($forum_ids, $this->auth->acl_getf('m_approve', true)))))
 		{
@@ -149,7 +149,7 @@ 
 	 */
 	protected function resync(array $topic_ids)
 	{
-		include($this->phpbb_root_path . 'includes/mcp/mcp_forum.' . $this->php_ext);
+		include($this->phpbb_root_path.'includes/mcp/mcp_forum.'.$this->php_ext);
 
 		mcp_resync_topics($topic_ids);
 	}
@@ -229,7 +229,7 @@ 
 		}
 
 		$sql = 'SELECT forum_id
-			FROM ' . TOPICS_TABLE . '
+			FROM ' . TOPICS_TABLE.'
 			WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
 		$result = $this->db->sql_query($sql);
 
@@ -257,7 +257,7 @@ 
 		}
 
 		$sql = 'SELECT post_id
-			FROM ' . POSTS_TABLE . '
+			FROM ' . POSTS_TABLE.'
 			WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
 		$result = $this->db->sql_query($sql);
 

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');
@@ -106,8 +106,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)
@@ -138,7 +138,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++)
 		{
@@ -172,7 +172,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),
 		);
 	}
@@ -198,7 +198,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),
 		));
 	}
 
@@ -208,7 +208,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));
@@ -220,7 +220,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()),
 			));
 		}
 	}
@@ -238,7 +238,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",
 		);
 	}
 
@@ -288,8 +288,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));
 	}
 

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

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

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

model/mapper/fields.php

Spacing +3 added lines, -3 removed lines

@@ -25,8 +25,8 @@ 
 	 */
 	protected function _find_sql(array $sql_where)
 	{
-		return 'SELECT * FROM ' . $this->entity_table .
-			((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . '
+		return 'SELECT * FROM '.$this->entity_table.
+			((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').'
 			ORDER BY field_order ASC';
 	}
 
@@ -35,7 +35,7 @@ 
 	 */
 	public function get_max_field_id()
 	{
-		$result = $this->db->sql_query('SELECT MAX(' . $this->entity_pkey . ') AS max_id FROM ' . $this->entity_table);
+		$result = $this->db->sql_query('SELECT MAX('.$this->entity_pkey.') AS max_id FROM '.$this->entity_table);
 		$max_id = $this->db->sql_fetchfield('max_id');
 		$this->db->sql_freeresult($result);