blitze / phpBB-ext-sitemaker_content

model/entity/type.php

Spacing +4 added lines, -4 removed lines

@@ -306,11 +306,11 @@
 		$summary_tags = $this->get_template_tags($summary_tags, $this->summary_tpl, $fields);
 		$detail_tags = $this->get_template_tags($detail_tags, $this->detail_tpl, $fields);
 
-		$this->summary_tags	= array_intersect_key($field_types, array_flip($summary_tags));
-		$this->detail_tags	= array_intersect_key($field_types, array_flip($detail_tags));
+		$this->summary_tags = array_intersect_key($field_types, array_flip($summary_tags));
+		$this->detail_tags = array_intersect_key($field_types, array_flip($detail_tags));
 
-		$this->content_fields	= $content_fields;
-		$this->field_types		= $field_types;
+		$this->content_fields = $content_fields;
+		$this->field_types = $field_types;
 	}
 
 	/**

Braces +2 added lines, -4 removed lines

@@ -232,8 +232,7 @@ 
 		{
 			$data = generate_text_for_edit($this->content_desc, $this->content_desc_uid, $this->content_desc_options);
 			return $data['text'];
-		}
-		else
+		} else
 		{
 			$parse_flags = ($this->content_desc_bitfield ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
 			return generate_text_for_display($this->content_desc, $this->content_desc_uid, $this->content_desc_bitfield, $parse_flags);
@@ -251,8 +250,7 @@ 
 		if (!is_array($settings))
 		{
 			$this->content_view_settings = $settings;
-		}
-		else if (sizeof($settings))
+		} else if (sizeof($settings))
 		{
 			$this->content_view_settings = json_encode($settings);
 		}

blocks/archive.php

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 	 * @param \phpbb\controller\helper				$helper					Helper object
 	 * @param \phpbb\user							$user					User object
 	 * @param \blitze\content\services\types		$content_types			Content types object
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\content_visibility $content_visibility, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\user $user, \blitze\content\services\types $content_types, $phpbb_root_path, $php_ext)
 	{
 		$this->auth = $auth;

Spacing +2 added lines, -2 removed lines

@@ -94,8 +94,8 @@
 			'FROM'		=> array(
 				TOPICS_TABLE => 't',
 			),
-			'WHERE'		=> 't.forum_id = ' . (int) $settings['forum_id'] . '
-				AND t.topic_time <= ' . time() . '
+			'WHERE'		=> 't.forum_id = '.(int) $settings['forum_id'].'
+				AND t.topic_time <= ' . time().'
 				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.'),
 			'GROUP_BY'	=> 'year, month',
 			'ORDER_BY'	=> 'year DESC',

blocks/recent.php

Spacing +4 added lines, -4 removed lines

@@ -166,14 +166,14 @@ 
 			$attachments = $this->forum->get_attachments($forum_id);
 			$topic_tracking_info = $this->forum->get_topic_tracking_info($forum_id);
 
-			$this->fields->prepare_to_show($type, 'block', $this->get_block_fields($entity->get_field_types()), $entity->get_content_fields(), $this->settings['block_tpl'], $block_id . '_block', $this->settings['max_chars']);
+			$this->fields->prepare_to_show($type, 'block', $this->get_block_fields($entity->get_field_types()), $entity->get_content_fields(), $this->settings['block_tpl'], $block_id.'_block', $this->settings['max_chars']);
 
 			$update_count = array();
 			$topics_data = array_values($topics_data);
 			for ($i = 0, $size = sizeof($topics_data); $i < $size; $i++)
 			{
 				$topic_data	= $topics_data[$i];
-				$post_data	= array_shift($posts_data[$topic_data['topic_id']]);
+				$post_data = array_shift($posts_data[$topic_data['topic_id']]);
 
 				$tpl_data = $this->fields->show($type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info);
 				$this->ptemplate->assign_block_vars('topic_row', $tpl_data);
@@ -201,7 +201,7 @@ 
 			POST_STICKY		=> 'CONTENT_STICKY_POSTS',
 		);
 
-		return (isset($topic_types[$this->settings['topic_type']])) ? $topic_types[$this->settings['topic_types']] :  $this->language->lang('CONTENT_' . $this->sort_options[$this->settings['sort_key']], $content_langname);
+		return (isset($topic_types[$this->settings['topic_type']])) ? $topic_types[$this->settings['topic_types']] : $this->language->lang('CONTENT_'.$this->sort_options[$this->settings['sort_key']], $content_langname);
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 		foreach ($content_types as $value => $title)
 		{
 			$selected = ($type == $value) ? ' selected="selected"' : '';
-			$html .= '<option value="' . $value . '"' . $selected . ' data-toggle-setting="#fields-col-' . $value . '">' . $title . '</option>';
+			$html .= '<option value="'.$value.'"'.$selected.' data-toggle-setting="#fields-col-'.$value.'">'.$title.'</option>';
 		}
 
 		return $html;

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

model/mapper_factory.php

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 	 */
 	public function create($type)
 	{
-		$mapper_class = 'blitze\\content\\model\\mapper\\' . $type;
-		$collection = 'blitze\\content\\model\\collections\\' . $type;
+		$mapper_class = 'blitze\\content\\model\\mapper\\'.$type;
+		$collection = 'blitze\\content\\model\\collections\\'.$type;
 
 		return new $mapper_class($this->db, new $collection, $this, $this->mapper_tables[$type]);
 	}

services/action_handler.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 */
 	public function create($mode, $action)
 	{
-		$service_name = 'blitze.content.actions.' . $mode . '.' . $action;
+		$service_name = 'blitze.content.actions.'.$mode.'.'.$action;
 		if (!$this->phpbb_container->has($service_name))
 		{
 			throw new \blitze\sitemaker\exception\out_of_bounds(array($action, 'INVALID_REQUEST'));

services/actions/topic/view.php

Spacing +2 added lines, -2 removed lines

@@ -65,14 +65,14 @@
 		$entity->set_allow_comments(false);
 
 		$overwrite = array(
-			'TOPIC_URL'	=> $u_action . '&do=view&type=' . $type . '&t=' . $topic_id,
+			'TOPIC_URL'	=> $u_action.'&do=view&type='.$type.'&t='.$topic_id,
 			'U_INFO'	=> '',
 		);
 
 		if ($mode === 'mcp')
 		{
 			$redirect_url = urlencode(str_replace('&', '&', $u_action));
-			$overwrite['U_DELETE'] = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&action=delete_topic&t=' . $topic_id . '&redirect=' . $redirect_url);
+			$overwrite['U_DELETE'] = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&action=delete_topic&t='.$topic_id.'&redirect='.$redirect_url);
 		}
 
 		$update_count = array();

services/actions/topic/filter.php

Spacing +10 added lines, -10 removed lines

@@ -88,7 +88,7 @@ 
 	{
 		$copy_params = $this->params;
 		unset($copy_params['type']);
-		$view_url = $u_action . http_build_query($copy_params);
+		$view_url = $u_action.http_build_query($copy_params);
 
 		$this->template->assign_block_vars('content', array(
 			'TITLE'			=> $this->language->lang('TOPIC_ALL'),
@@ -104,7 +104,7 @@ 
 				'TITLE'			=> $entity->get_content_langname(),
 				'COLOUR'		=> $entity->get_content_colour(),
 				'S_SELECTED'	=> ($type === $content_name) ? true : false,
-				'U_VIEW'		=> $view_url . '&type=' . $content_name
+				'U_VIEW'		=> $view_url.'&type='.$content_name
 			));
 		}
 	}
@@ -134,7 +134,7 @@ 
 	{
 		$copy_params = $this->params;
 		unset($copy_params['status']);
-		$view_url = $u_action . http_build_query($copy_params);
+		$view_url = $u_action.http_build_query($copy_params);
 
 		$this->template->assign_block_vars('status', array(
 			'TITLE'			=> $this->language->lang('TOPIC_ALL'),
@@ -146,9 +146,9 @@ 
 		foreach ($topic_status_ary as $status)
 		{
 			$this->template->assign_block_vars('status', array(
-				'TITLE'			=> $this->language->lang('TOPIC_' . strtoupper($status)),
+				'TITLE'			=> $this->language->lang('TOPIC_'.strtoupper($status)),
 				'S_SELECTED'	=> ($status === $topic_status) ? true : false,
-				'U_VIEW'		=> $view_url . '&status=' . $status
+				'U_VIEW'		=> $view_url.'&status='.$status
 			));
 		}
 	}
@@ -163,18 +163,18 @@ 
 		switch ($topic_status)
 		{
 			case 'scheduled':
-				$sql_where_array[] = 't.topic_time > ' . time();
+				$sql_where_array[] = 't.topic_time > '.time();
 			break;
 			case 'unapproved':
 			case 'published':
 			case 'deleted':
-				$sql_where_array[] = 't.topic_visibility = ' . array_search($topic_status, $this->filter_topic_status_ary);
+				$sql_where_array[] = 't.topic_visibility = '.array_search($topic_status, $this->filter_topic_status_ary);
 			break;
 			case 'recommended':
 			case 'featured':
 			case 'must_read':
-				$sql_where_array[] = 't.topic_type = ' . array_search($topic_status, $this->filter_topic_types_ary);
-				$sql_where_array[] = 't.topic_visibility = ' . ITEM_APPROVED;
+				$sql_where_array[] = 't.topic_type = '.array_search($topic_status, $this->filter_topic_types_ary);
+				$sql_where_array[] = 't.topic_visibility = '.ITEM_APPROVED;
 			break;
 		}
 	}
@@ -188,7 +188,7 @@ 
 		if ($keyword = $this->request->variable('keyword', '', true))
 		{
 			$this->params['keyword'] = $keyword;
-			$sql_where_array[] = 't.topic_title ' . $this->db->sql_like_expression($this->db->get_any_char() . $keyword . $this->db->get_any_char());
+			$sql_where_array[] = 't.topic_title '.$this->db->sql_like_expression($this->db->get_any_char().$keyword.$this->db->get_any_char());
 		}
 	}
 }