blitze / phpBB-ext-sitemaker_content

services/form/field/telephone.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 */
 	public function display_field(array $data)
 	{
-		return $data['field_value'] ? '<a href="tel:' . $data['field_value'] . '">' . preg_replace("/^1?(\d{3})(\d{3})(\d{4})$/", "$1-$2-$3", $data['field_value']) . '</a>' : '';
+		return $data['field_value'] ? '<a href="tel:'.$data['field_value'].'">'.preg_replace("/^1?(\d{3})(\d{3})(\d{4})$/", "$1-$2-$3", $data['field_value']).'</a>' : '';
 	}
 
 	/**

services/form/field/choice.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 	public function get_field_value($name, $default)
 	{
 		$default = is_array($default) ? $default : explode("\n", $default);
-		$value =  $this->request->variable($name, $default, true);
+		$value = $this->request->variable($name, $default, true);
 
 		if (empty($value) && $this->request->server('REQUEST_METHOD') !== 'POST')
 		{
@@ -62,7 +62,7 @@ 
 		$this->ptemplate->assign_vars($data);
 
 		$tpl_name = ($data['field_type'] === 'select') ? 'select' : 'pickem';
-		return $this->ptemplate->render_view('blitze/content', "fields/$tpl_name.html", $data['field_type'] . '_field');
+		return $this->ptemplate->render_view('blitze/content', "fields/$tpl_name.html", $data['field_type'].'_field');
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 			foreach ($choices as $value => $option)
 			{
 				$options[] = array(
-					'id'		=> 'smc-'. $name . '-' . $count,
+					'id'		=> 'smc-'.$name.'-'.$count,
 					'label'		=> $this->language->lang($option),
 					'selected'	=> (int) (in_array($value, $selected)),
 					'value'		=> $value,

services/comments/form.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @param \phpbb\user					$user				User object
 	 * @param string						$root_path			Path to the phpbb includes directory.
 	 * @param string						$php_ext			php file extension
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, $root_path, $php_ext)
 	{
 		$this->auth = $auth;

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 				'L_QUICKREPLY'			=> $this->language->lang('NEW_COMMENT'),
 				'U_QR_ACTION'			=> append_sid("{$this->phpbb_root_path}posting.{$this->php_ext}", "mode=reply&f={$topic_data['forum_id']}&t={$topic_data['topic_id']}"),
 				'QR_HIDDEN_FIELDS'		=> build_hidden_fields($qr_hidden_fields),
-				'SUBJECT'				=> 'Re: ' . censor_text($topic_data['topic_title']),
+				'SUBJECT'				=> 'Re: '.censor_text($topic_data['topic_title']),
 			));
 		}
 	}

services/comments/comments.php

Indentation +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 	 * @param \blitze\content\services\topic			$topic				Topic object
 	 * @param string									$root_path			Path to the phpbb directory.
 	 * @param string									$php_ext			php file extension
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\content_visibility $content_visibility, \phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\request\request_interface $request, \phpbb\template\template $template, \phpbb\template\context $template_context, \phpbb\user $user, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\topic $topic, $root_path, $php_ext)
 	{
 		parent::__construct($auth, $config, $language, $template, $user, $root_path, $php_ext);

Braces +2 added lines, -4 removed lines

@@ -258,8 +258,7 @@ 
 				$prev_posts_count = $this->content_visibility->get_count('topic_posts', $topic_data, $topic_data['forum_id']) - 1;
 			}
 			return $prev_posts_count;
-		}
-		else
+		} else
 		{
 			return $this->get_prev_posts_count($topic_data['forum_id'], $topic_data['topic_id'], $post_id, $sort_dir) - 1;
 		}
@@ -290,8 +289,7 @@ 
 		if ($sort_dir == 'd')
 		{
 			$sql .= " AND (p.post_time > {$row['post_time']} OR (p.post_time = {$row['post_time']} AND p.post_id >= {$row['post_id']}))";
-		}
-		else
+		} else
 		{
 			$sql .= " AND (p.post_time < {$row['post_time']} OR (p.post_time = {$row['post_time']} AND p.post_id <= {$row['post_id']}))";
 		}

Spacing +17 added lines, -17 removed lines

@@ -87,9 +87,9 @@ 
 	{
 		if ($topic_data['total_comments'])
 		{
-			$view		= $this->request->variable('view', '');
-			$start		= $this->request->variable('start', 0);
-			$post_id	= $this->request->variable('p', 0);
+			$view = $this->request->variable('view', '');
+			$start = $this->request->variable('start', 0);
+			$post_id = $this->request->variable('p', 0);
 
 			$this->find_unread($view, $topic_data);
 
@@ -104,10 +104,10 @@ 
 				->build();
 			$posts_data = $this->forum->get_post_data(false, array(), $this->config['posts_per_page'], $start, array(
 				'WHERE'		=> array(
-					'p.topic_id = ' . (int) $topic_data['topic_id'],
-					'p.post_id <> ' . (int) $topic_data['topic_first_post_id'],
+					'p.topic_id = '.(int) $topic_data['topic_id'],
+					'p.post_id <> '.(int) $topic_data['topic_first_post_id'],
 				),
-				'ORDER_BY'	=> $this->sort_by_sql[$sort_key] . ' ' . $this->sort_dir_sql[$sort_dir],
+				'ORDER_BY'	=> $this->sort_by_sql[$sort_key].' '.$this->sort_dir_sql[$sort_dir],
 			));
 
 			$topic_tracking_info = $this->forum->get_topic_tracking_info();
@@ -172,9 +172,9 @@ 
 			$topic_last_read = (isset($topic_tracking_info[$topic_id])) ? $topic_tracking_info[$topic_id] : 0;
 
 			$sql = 'SELECT post_id, topic_id, forum_id
-				FROM ' . POSTS_TABLE . "
+				FROM ' . POSTS_TABLE."
 				WHERE topic_id = $topic_id
-					AND " . $this->content_visibility->get_visibility_sql('post', $forum_id) . "
+					AND ".$this->content_visibility->get_visibility_sql('post', $forum_id)."
 					AND post_time > $topic_last_read
 					AND forum_id = $forum_id
 				ORDER BY post_time ASC, post_id ASC";
@@ -184,7 +184,7 @@ 
 
 			if ($row)
 			{
-				redirect(append_sid($topic_data['topic_url'], 'p=' . $row['post_id']) . '#p' . $row['post_id']);
+				redirect(append_sid($topic_data['topic_url'], 'p='.$row['post_id']).'#p'.$row['post_id']);
 			}
 		}
 	}
@@ -211,7 +211,7 @@ 
 		$start = $this->pagination->validate_start($start, $this->config['posts_per_page'], $topic_data['total_comments']);
 		$this->pagination->generate_template_pagination($base_url, 'pagination', 'start', $topic_data['total_comments'], $this->config['posts_per_page'], $start);
 
-		$data =& $this->template_context->get_data_ref();
+		$data = & $this->template_context->get_data_ref();
 		foreach ($data['pagination'] as &$row)
 		{
 			$row['PAGE_URL'] .= '#comments';
@@ -273,7 +273,7 @@ 
 	protected function get_prev_posts_count($forum_id, $topic_id, $post_id, $sort_dir)
 	{
 		$sql = 'SELECT post_id, post_time, post_visibility
-			FROM ' . POSTS_TABLE . " p
+			FROM ' . POSTS_TABLE." p
 			WHERE p.topic_id = $topic_id
 				AND p.post_id = $post_id";
 		$result = $this->db->sql_query($sql);
@@ -281,9 +281,9 @@ 
 		$this->db->sql_freeresult($result);
 
 		$sql = 'SELECT COUNT(p.post_id) AS prev_posts
-			FROM ' . POSTS_TABLE . " p
+			FROM ' . POSTS_TABLE." p
 			WHERE p.topic_id = $topic_id
-				AND " . $this->content_visibility->get_visibility_sql('post', $forum_id, 'p.');
+				AND ".$this->content_visibility->get_visibility_sql('post', $forum_id, 'p.');
 
 		if ($sort_dir == 'd')
 		{
@@ -310,11 +310,11 @@ 
 	 */
 	protected function set_sorting_options(&$sort_days, &$sort_key, &$sort_dir, &$u_sort_param)
 	{
-		$default_sort_days	= (!empty($this->user->data['user_post_show_days'])) ? $this->user->data['user_post_show_days'] : 0;
+		$default_sort_days = (!empty($this->user->data['user_post_show_days'])) ? $this->user->data['user_post_show_days'] : 0;
 		$default_sort_key	= (!empty($this->user->data['user_post_sortby_type'])) ? $this->user->data['user_post_sortby_type'] : 't';
 		$default_sort_dir	= (!empty($this->user->data['user_post_sortby_dir'])) ? $this->user->data['user_post_sortby_dir'] : 'a';
 
-		$sort_days	= $this->request->variable('st', $default_sort_days);
+		$sort_days = $this->request->variable('st', $default_sort_days);
 		$sort_key	= $this->request->variable('sk', $default_sort_key);
 		$sort_dir	= $this->request->variable('sd', $default_sort_dir);
 
@@ -376,7 +376,7 @@ 
 	 */
 	protected function get_post_display_lang(array $row, $topic_url)
 	{
-		return ($row['hide_post']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="' . $row['post_id'] . '" href="' . append_sid($topic_url, "p={$row['post_id']}&amp;view=show") . "#p{$row['post_id']}" . '">', '</a>') : '';
+		return ($row['hide_post']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="'.$row['post_id'].'" href="'.append_sid($topic_url, "p={$row['post_id']}&amp;view=show")."#p{$row['post_id']}".'">', '</a>') : '';
 	}
 
 	/**
@@ -386,6 +386,6 @@ 
 	 */
 	protected function set_form_action($topic_url, $start)
 	{
-		$this->template->assign_var('S_TOPIC_ACTION', append_sid($topic_url, (($start == 0) ? '' : "start=$start")) . '#comments');
+		$this->template->assign_var('S_TOPIC_ACTION', append_sid($topic_url, (($start == 0) ? '' : "start=$start")).'#comments');
 	}
 }

services/notification/topic_in_queue.php

Indentation +4 added lines, -4 removed lines

@@ -34,10 +34,10 @@
 	}
 
 	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
+	 * Get the url to this item
+	 *
+	 * @return string URL
+	 */
 	public function get_url()
 	{
 		if ($type = $this->types->get_forum_type($this->item_parent_id))

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	{
 		if ($type = $this->types->get_forum_type($this->item_parent_id))
 		{
-			return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "i=-blitze-content-mcp-content_module&mode=content&type=$type&t={$this->item_id}&do=view");
+			return append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, "i=-blitze-content-mcp-content_module&mode=content&type=$type&t={$this->item_id}&do=view");
 		}
 
 		return parent::get_url();

services/actions/type/edit.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	 * @param \blitze\content\services\views\views_factory		$views_factory			Views factory 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\auth\auth $auth, \phpbb\controller\helper $controller_helper, \phpbb\event\dispatcher_interface $phpbb_dispatcher, \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, \blitze\content\services\types $content_types, \blitze\content\model\mapper_factory $mapper_factory)
 	{
 		parent::__construct($auth, $controller_helper, $phpbb_dispatcher, $language, $template, $user, $auto_lang, $fields_factory, $views_factory);

services/topic.php

Braces +1 added lines, -2 removed lines

@@ -301,8 +301,7 @@
 		if ($row['post_delete_reason'])
 		{
 			return $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
 		{
 			return $this->language->lang('POST_DELETED_BY', $display_postername, $display_username, $this->user->format_date($row['post_delete_time'], false, true));
 		}

Spacing +6 added lines, -6 removed lines

@@ -250,10 +250,10 @@ 
 	{
 		if ($topic_data['topic_first_post_id'] === $post_data['post_id'])
 		{
-			return append_sid($topic_data['topic_url'], 'view=unread') . '#unread';
+			return append_sid($topic_data['topic_url'], 'view=unread').'#unread';
 		}
 
-		return append_sid($topic_data['topic_url'], 'p=' . $post_data['post_id']) . '#p' . $post_data['post_id'];
+		return append_sid($topic_data['topic_url'], 'p='.$post_data['post_id']).'#p'.$post_data['post_id'];
 	}
 
 	/**
@@ -266,7 +266,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'];
 		}
@@ -289,8 +289,8 @@ 
 
 		if ($s_post_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'];
 
 			$l_deleted_message = $this->get_delete_message($row, $display_postername, $display_username);
 			$l_deleted_by = $this->language->lang('DELETED_INFORMATION', $display_username, $this->user->format_date($row['post_delete_time'], false, true));
@@ -366,7 +366,7 @@ 
 		);
 
 		return array(
-			'U_BOOKMARK_TOPIC'		=> ($this->user->data['is_registered'] && $this->config['allow_bookmarks']) ? $this->helper->get_viewtopic_url($topic_data) . '&bookmark=1&hash=' . generate_link_hash("topic_{$topic_data['topic_id']}") : '',
+			'U_BOOKMARK_TOPIC'		=> ($this->user->data['is_registered'] && $this->config['allow_bookmarks']) ? $this->helper->get_viewtopic_url($topic_data).'&bookmark=1&hash='.generate_link_hash("topic_{$topic_data['topic_id']}") : '',
 			'S_BOOKMARK_TOPIC'		=> $this->language->lang($lang_keys['bookmark'][$state_key]),
 			'S_BOOKMARK_TOGGLE'		=> $this->language->lang($lang_keys['toggle'][$state_key]),
 			'S_BOOKMARKED_TOPIC'	=> $bookmarked,

controller/main_controller.php

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 * @param \blitze\content\services\poll							$poll				Poll object
 	 * @param \blitze\content\services\types						$content_types		Content types object
 	 * @param \blitze\content\services\views\views_factory			$views_factory		Views handlers
-	*/
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\request\request_interface $request, \phpbb\template\template $template, \phpbb\user $user, \blitze\content\services\comments\comments_interface $comments, \blitze\content\services\poll $poll, \blitze\content\services\types $content_types, \blitze\content\services\views\views_factory $views_factory)
 	{
 		$this->db = $db;

Spacing +4 added lines, -4 removed lines

@@ -136,7 +136,7 @@ 
 		else
 		{
 			$template_file = 'views/print.html';
-			$this->template->assign_var('TOPIC_URL', generate_board_url(true) . $topic_data['topic_url']);
+			$this->template->assign_var('TOPIC_URL', generate_board_url(true).$topic_data['topic_url']);
 		}
 
 		return $this->helper->render($template_file, $topic_data['topic_title']);
@@ -184,15 +184,15 @@ 
 	{
 		if (!$this->user->data['is_bot'] && !$this->request->is_set('page'))
 		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET topic_views = topic_views + 1, topic_last_view_time = ' . time() . "
+			$sql = 'UPDATE '.TOPICS_TABLE.'
+				SET topic_views = topic_views + 1, topic_last_view_time = ' . time()."
 				WHERE topic_id = $topic_id";
 			$this->db->sql_query($sql);
 
 			// Update the attachment download counts
 			if (sizeof($update_count))
 			{
-				$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
+				$sql = 'UPDATE '.ATTACHMENTS_TABLE.'
 					SET download_count = download_count + 1
 					WHERE ' . $this->db->sql_in_set('attach_id', array_unique($update_count));
 				$this->db->sql_query($sql);

Braces +1 added lines, -2 removed lines

@@ -132,8 +132,7 @@
 		{
 			$this->update_views($topic_id, $update_count);
 			$template_file = $view_handler->get_detail_template();
-		}
-		else
+		} else
 		{
 			$template_file = 'views/print.html';
 			$this->template->assign_var('TOPIC_URL', generate_board_url(true) . $topic_data['topic_url']);

event/mcp_topic.php

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,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, \blitze\content\services\types $content_types, \blitze\content\services\fields $fields, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;

Spacing +3 added lines, -3 removed lines

@@ -115,9 +115,9 @@
 		$forum_list = is_array($forum_list) ? $forum_list : array($forum_list);
 
 		$sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, t.topic_title AS post_subject, t.topic_time AS post_time, t.topic_poster AS poster_id, t.topic_first_post_id AS post_id, t.topic_attachment AS post_attachment, t.topic_first_poster_name AS username, t.topic_first_poster_colour AS user_colour
-			FROM ' . TOPICS_TABLE . ' t
-			WHERE ' . $this->db->sql_in_set('forum_id', $this->get_forum_list($forum_list)) . '
-				AND  ' . $this->db->sql_in_set('topic_visibility', $event['visibility_const']) . "
+			FROM ' . TOPICS_TABLE.' t
+			WHERE ' . $this->db->sql_in_set('forum_id', $this->get_forum_list($forum_list)).'
+				AND  ' . $this->db->sql_in_set('topic_visibility', $event['visibility_const'])."
 				AND topic_delete_user <> 0
 				{$event['limit_time_sql']}
 			ORDER BY {$event['sort_order_sql']}";