blitze / phpBB-ext-sitemaker_content

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->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'],
 		);
 	}
 
@@ -197,7 +197,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),
 		));
 	}
 
@@ -207,7 +207,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));
@@ -219,7 +219,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()),
 			));
 		}
 	}
@@ -237,7 +237,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",
 		);
 	}
 
@@ -287,8 +287,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",
 		);
 	}
 
@@ -315,7 +315,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(
@@ -331,7 +331,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) : '';
 	}
 
 	/**
@@ -348,7 +348,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);
 			}
 		}
 
@@ -361,7 +361,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/feed.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	 * @param \phpbb\template\template		$template				Template object
 	 * @param \phpbb\user					$user					User object
 	 * @param string						$php_ext				php file extension
-	*/
+	 */
 	public function __construct(\phpbb\config\config $config, \phpbb\controller\helper $controller_helper, \phpbb\symfony_request $symfony_request, \phpbb\template\template $template, \phpbb\user $user, $php_ext)
 	{
 		$this->config = $config;

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
 		$this->template->assign_vars(array(
 			'BOARD_URL'				=> $this->board_url,
 			'SELF_LINK'				=> $this->controller_helper->route($this->symfony_request->attributes->get('_route'), $this->symfony_request->attributes->get('_route_params'), true, '', UrlGeneratorInterface::ABSOLUTE_URL),
-			'FEED_LINK'				=> $this->board_url . $this->user->page['script_path'] . 'index.' . $this->php_ext,
+			'FEED_LINK'				=> $this->board_url.$this->user->page['script_path'].'index.'.$this->php_ext,
 			'FEED_TITLE'			=> $this->config['sitename'],
 			'FEED_SUBTITLE'			=> $this->config['site_desc'],
 			'FEED_UPDATED'			=> $max_update_time,
@@ -88,7 +88,7 @@ 
 		$response = new Response($this->prepare_content($content));
 		$response->headers->set('Content-Type', 'application/atom+xml');
 		$response->setCharset('UTF-8');
-		$response->setLastModified(new \DateTime('@' . $max_update_time));
+		$response->setLastModified(new \DateTime('@'.$max_update_time));
 
 		if (!empty($this->user->data['is_bot']))
 		{
@@ -107,8 +107,8 @@ 
 	{
 		// convert relative urls to absolute urls
 		$script_path = trim($this->user->page['script_path'], '/');
-		$full_path = $this->board_url . '/' . $script_path;
-		$content = preg_replace('/(href|src)=("|\')((?:\.*\/)+(?:' . $script_path . '\/)?)(.*?)("|\')/i', '$1=$2' . $full_path . '/$4$5', $content);
+		$full_path = $this->board_url.'/'.$script_path;
+		$content = preg_replace('/(href|src)=("|\')((?:\.*\/)+(?:'.$script_path.'\/)?)(.*?)("|\')/i', '$1=$2'.$full_path.'/$4$5', $content);
 
 		// remove hidden field labels
 		$content = preg_replace('#<div class="field-label label-hidden">(.*?)</div>#', '', $content);
@@ -117,7 +117,7 @@ 
 		$content = preg_replace('/((?:\?|&)sid=[a-z0-9]+)/', '', $content);
 
 		// Remove Comments from inline attachments [ia]
-		$content = preg_replace('#<dd>(.*?)</dd>#','',$content);
+		$content = preg_replace('#<dd>(.*?)</dd>#', '', $content);
 
 		// Replace some entities with their unicode counterpart
 		$entities = array(

services/comments/comments.php

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()['pagination'];
+		$data = & $this->template_context->get_data_ref()['pagination'];
 		foreach ($data 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');
 	}
 }

event/feed.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 * @param \phpbb\db\driver\driver_interface		$db					Database connection
 	 * @param \phpbb\template\template				$template			Template object
 	 * @param \blitze\content\services\types		$content_types		Content types object
-	*/
+	 */
 	public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\template\template $template, \blitze\content\services\types $content_types)
 	{
 		$this->config = $config;

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 		$sql_ary = $event['sql_ary'];
 
 		$forum_ids = array_keys($this->content_types->get_forum_types());
-		$sql_ary['WHERE'] .= ' AND ' . $this->db->sql_in_set('f.forum_id', array_map('intval', $forum_ids), true);
+		$sql_ary['WHERE'] .= ' AND '.$this->db->sql_in_set('f.forum_id', array_map('intval', $forum_ids), true);
 
 		$event['sql_ary'] = $sql_ary;
 	}