blitze / phpBB-ext-sitemaker_content

event/search.php

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 * @param \phpbb\db\driver\driver_interface		$db					Database object
 	 * @param \phpbb\controller\helper				$helper				Helper object
 	 * @param \blitze\content\services\types		$content_types		Content types object
-	*/
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \blitze\content\services\types $content_types)
 	{
 		$this->db = $db;

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
 	public function modify_posts_data(\phpbb\event\data $event)
 	{
 		$sql_array = $event['sql_array'];
-		$sql_array['WHERE'] .= ' AND t.topic_time <= ' . time();
+		$sql_array['WHERE'] .= ' AND t.topic_time <= '.time();
 
 		$sql_count = $sql_array;
 		$sql_count['SELECT'] = 'COUNT(p.post_id) AS total_results';
@@ -82,9 +82,9 @@ 
 	public function modify_topic_data(\phpbb\event\data $event)
 	{
 		$sql_where = $event['sql_where'];
-		$sql_where .= ' AND t.topic_time <= ' . time();
+		$sql_where .= ' AND t.topic_time <= '.time();
 
-		$sql = 'SELECT COUNT(t.topic_id) AS total_results FROM ' . $event['sql_from'] . ' WHERE ' . $sql_where;
+		$sql = 'SELECT COUNT(t.topic_id) AS total_results FROM '.$event['sql_from'].' WHERE '.$sql_where;
 		$result = $this->db->sql_query($sql);
 		$total_results = $this->db->sql_fetchfield('total_results');
 		$this->db->sql_freeresult($result);

event/viewtopic.php

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 *
 	 * @param \phpbb\controller\helper				$helper				Helper object
 	 * @param \blitze\content\services\types		$content_types		Content types object
-	*/
+	 */
 	public function __construct(\phpbb\controller\helper $helper, \blitze\content\services\types $content_types)
 	{
 		$this->helper = $helper;

event/posting.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * Constructor
 	 *
 	 * @param \blitze\content\services\form\builder		$builder		Form builder object
-	*/
+	 */
 	public function __construct(\blitze\content\services\form\builder $builder)
 	{
 		$this->builder = $builder;

Braces +1 added lines, -2 removed lines

@@ -160,8 +160,7 @@
 			if ($this->build_content)
 			{
 				$event['redirect_url'] = $this->builder->get_cp_url();
-			}
-			else
+			} else
 			{
 				$topic_url = $this->builder->get_post_url($this->content_type, $event['post_data']);
 

services/views/driver/portal.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	 * @param \blitze\content\services\quickmod			$quickmod			Quick moderator tools
 	 * @param \phpbb\config\config						$config				Config object
 	 * @param \blitze\content\services\types			$content_types		Content types object
-	*/
+	 */
 	public function __construct(\phpbb\event\dispatcher_interface $phpbb_dispatcher, \phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, \blitze\content\services\quickmod $quickmod, \phpbb\config\config $config, \blitze\content\services\types $content_types)
 	{
 		parent::__construct($phpbb_dispatcher, $language, $pagination, $template, $fields, $forum, $helper, $quickmod);

Braces +1 added lines, -2 removed lines

@@ -136,8 +136,7 @@
 		if (sizeof(array_keys($filters)) > 1)
 		{
 			return array('filters' => $filters);
-		}
-		else
+		} else
 		{
 			$key = key($filters);
 			return array(

services/views/driver/base_view.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 * @param \blitze\sitemaker\services\forum\data		$forum				Forum Data object
 	 * @param \blitze\content\services\helper			$helper				Content helper object
 	 * @param \blitze\content\services\quickmod			$quickmod			Quick moderator tools
-	*/
+	 */
 	public function __construct(\phpbb\event\dispatcher_interface $phpbb_dispatcher, \phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, \blitze\content\services\quickmod $quickmod)
 	{
 		$this->phpbb_dispatcher = $phpbb_dispatcher;

Spacing +4 added lines, -4 removed lines

@@ -134,7 +134,7 @@ 
 
 		foreach ($posts_data as $topic_id => $posts)
 		{
-			$post_data	= array_shift($posts);
+			$post_data = array_shift($posts);
 			$topic_data	= $topics_data[$topic_id];
 			$topic_data = array_merge(
 				$this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info),
@@ -248,8 +248,8 @@ 
 		$this->pagination->generate_template_pagination(
 			array(
 				'routes' => array(
-					'blitze_content_' . $route_type,
-					'blitze_content_' . $route_type . '_page',
+					'blitze_content_'.$route_type,
+					'blitze_content_'.$route_type.'_page',
 				),
 				'params' => $params,
 			),
@@ -340,7 +340,7 @@ 
 				->fetch_forum($topic_data['forum_id'])
 				->fetch_topic_poster($topic_data['topic_poster'])
 				->fetch_custom(array(
-					'WHERE' => array('t.topic_id <> ' . (int) $topic_data['topic_id'])
+					'WHERE' => array('t.topic_id <> '.(int) $topic_data['topic_id'])
 				))->build(true, true, false);
 
 			$topics_data = $this->forum->get_topic_data(5);

services/views/driver/tiles.php

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	 * @param \blitze\content\services\helper			$helper				Content helper object
 	 * @param \blitze\content\services\quickmod			$quickmod			Quick moderator tools
 	 * @param \phpbb\request\request_interface			$request			Request object
-	*/
+	 */
 	public function __construct(\phpbb\event\dispatcher_interface $phpbb_dispatcher, \phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, \blitze\content\services\quickmod $quickmod, \phpbb\request\request_interface $request)
 	{
 		parent::__construct($phpbb_dispatcher, $language, $pagination, $template, $fields, $forum, $helper, $quickmod);

controller/main_controller.php

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

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	 * @param \blitze\content\services\feed							$feed				Feed object
 	 * @param \blitze\content\services\poll							$poll				Poll 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\types $content_types, \blitze\content\services\feed $feed, \blitze\content\services\poll $poll, \blitze\content\services\views\views_factory $views_factory)
 	{
 		$this->db = $db;

Braces +2 added lines, -4 removed lines

@@ -122,8 +122,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']);
@@ -244,8 +243,7 @@ 
 		if ($filter_type)
 		{
 			$filters = array($filter_type => (array) $filter_value);
-		}
-		else
+		} else
 		{
 			$filters = $this->request->variable('filters', array('' => array('' => '')), true);
 		}

services/fields.php

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
 			$this->template->assign_vars(array_change_key_case(array_merge($tpl_data, $fields_data['all']), CASE_UPPER));
 			$this->template->set_filenames(array('content' => $this->tpl_name));
 			$tpl_data['CUSTOM_DISPLAY'] = $this->template->assign_display('content');
-		}
-		else
+		} else
 		{
 			$tpl_data['FIELDS'] = $fields_data;
 		}

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
 
 		$this->display_mode = $view_mode;
 		$this->content_type = $entity->get_content_name();
-		$this->tpl_name	= ($custom_tpl) ? $tpl_name ?: $this->content_type . '_' . $view_mode : '';
+		$this->tpl_name = ($custom_tpl) ? $tpl_name ?: $this->content_type.'_'.$view_mode : '';
 		$this->view_mode = (in_array($view_mode, array('summary', 'detail'))) ? $view_mode : 'summary';
 		$this->form_fields = array_intersect_key($this->fields_factory->get_all(), array_flip($view_mode_fields));
 		$this->db_fields = $db_fields;
@@ -118,7 +118,7 @@ 
 	 */
 	public function show($type, array $topic_data, array $post_data, array $users_cache, array &$attachments, array &$update_count, array $topic_tracking_info, array $topic_data_overwrite = array(), $mode = '')
 	{
-		$callable = 'get_' . $this->view_mode . '_template_data';
+		$callable = 'get_'.$this->view_mode.'_template_data';
 		$tpl_data = array_merge(array(
 				'TOPIC_COMMENTS'	=> $this->comments->count($topic_data),
 				'S_USER_LOGGED_IN'	=> $this->user->data['is_registered'],
@@ -185,21 +185,21 @@ 
 			$field_data['field_props'] = array_replace_recursive($this->form_fields[$field_type]->get_default_props(), $field_data['field_props']);
 			$field_data['field_value'] = &$field_values[$field_name];
 
-			$field_contents	= $this->form_fields[$field_type]->display_field($field_data, $this->display_mode, $tpl_data, $this->content_type);
+			$field_contents = $this->form_fields[$field_type]->display_field($field_data, $this->display_mode, $tpl_data, $this->content_type);
 
 			// this essentially hides other fields if the field returns an array
 			if (is_array($field_contents))
 			{
 				$display_data['all'] = $field_contents;
-				$display_data[$field_data['field_' . $this->view_mode . '_show']] = $field_contents;
+				$display_data[$field_data['field_'.$this->view_mode.'_show']] = $field_contents;
 				break;
 			}
 
 			if (!empty($field_contents))
 			{
-				$field = '<div class="field-label ' . $this->label[$field_data['field_' . $this->view_mode . '_ldisp']] . '">' . $field_data['field_label'] . $this->language->lang('COLON') . ' </div>' . $field_contents;
+				$field = '<div class="field-label '.$this->label[$field_data['field_'.$this->view_mode.'_ldisp']].'">'.$field_data['field_label'].$this->language->lang('COLON').' </div>'.$field_contents;
 				$display_data['all'][$field_name] = $field;
-				$display_data[$field_data['field_' . $this->view_mode . '_show']][$field_name] = $field;
+				$display_data[$field_data['field_'.$this->view_mode.'_show']][$field_name] = $field;
 			}
 		}
 

services/helper.php

Spacing +12 added lines, -12 removed lines

@@ -53,7 +53,7 @@ 
 	public function get_edit_url(array $post_data, array $topic_data, $cp_mode = '')
 	{
 		$cp_param = $this->get_cp_param($post_data, $topic_data, $cp_mode);
-		return ($this->edit_allowed($post_data, $topic_data)) ? append_sid("{$this->phpbb_root_path}posting.$this->php_ext", "mode=edit&f={$topic_data['forum_id']}&p={$post_data['post_id']}" . $cp_param) : '';
+		return ($this->edit_allowed($post_data, $topic_data)) ? append_sid("{$this->phpbb_root_path}posting.$this->php_ext", "mode=edit&f={$topic_data['forum_id']}&p={$post_data['post_id']}".$cp_param) : '';
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	public function get_delete_url(array $post_data, array $topic_data, $cp_mode = '')
 	{
 		$cp_param = $this->get_cp_param($post_data, $topic_data, $cp_mode);
-		return ($this->delete_allowed($post_data, $topic_data)) ? append_sid("{$this->phpbb_root_path}posting.$this->php_ext", 'mode=' . (($this->softdelete_allowed($post_data)) ? 'soft_delete' : 'delete') . "&f={$post_data['forum_id']}&p={$post_data['post_id']}" . $cp_param) : '';
+		return ($this->delete_allowed($post_data, $topic_data)) ? append_sid("{$this->phpbb_root_path}posting.$this->php_ext", 'mode='.(($this->softdelete_allowed($post_data)) ? 'soft_delete' : 'delete')."&f={$post_data['forum_id']}&p={$post_data['post_id']}".$cp_param) : '';
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 	 */
 	public function get_print_topic_url(array $topic_data)
 	{
-		return ($this->auth->acl_get('f_print', $topic_data['forum_id'])) ? $topic_data['topic_url'] . '?view=print' : '';
+		return ($this->auth->acl_get('f_print', $topic_data['forum_id'])) ? $topic_data['topic_url'].'?view=print' : '';
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public function get_email_topic_url(array $topic_data)
 	{
-		return ($this->auth->acl_get('f_email', $topic_data['forum_id']) && $this->config['email_enable']) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&t=' . $topic_data['topic_id']) : '';
+		return ($this->auth->acl_get('f_email', $topic_data['forum_id']) && $this->config['email_enable']) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&t='.$topic_data['topic_id']) : '';
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function get_search_users_posts_url($forum_id, $username)
 	{
-		return append_sid("{$this->phpbb_root_path}search.{$this->php_ext}", "author={$username}&" . urlencode('fid[]') . "=$forum_id&sc=0&sf=titleonly&sr=topics");
+		return append_sid("{$this->phpbb_root_path}search.{$this->php_ext}", "author={$username}&".urlencode('fid[]')."=$forum_id&sc=0&sf=titleonly&sr=topics");
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	public function get_info_url(array $post_data)
 	{
 		$forum_id = $post_data['forum_id'];
-		return ($this->auth->acl_get('m_info', $forum_id)) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=main&mode=post_details&f=$forum_id&p=" . $post_data['post_id'], true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_info', $forum_id)) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=main&mode=post_details&f=$forum_id&p=".$post_data['post_id'], true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -132,7 +132,7 @@ 
 	 */
 	public function get_approve_url(array $post_data, $viewtopic_url)
 	{
-		return append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=queue&p={$post_data['post_id']}&f={$post_data['forum_id']}&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url . '&p=' . $post_data['post_id'] . '#p' . $post_data['post_id'])));
+		return append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", "i=queue&p={$post_data['post_id']}&f={$post_data['forum_id']}&redirect=".urlencode(str_replace('&', '&', $viewtopic_url.'&p='.$post_data['post_id'].'#p'.$post_data['post_id'])));
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	 */
 	public function get_mcp_report_url(array $post_data)
 	{
-		return ($this->auth->acl_get('m_report', $post_data['forum_id'])) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=reports&mode=report_details&f=' . $post_data['forum_id'] . '&p=' . $post_data['post_id'], true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_report', $post_data['forum_id'])) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=reports&mode=report_details&f='.$post_data['forum_id'].'&p='.$post_data['post_id'], true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function get_mcp_restore_url(array $post_data, array $topic_data)
 	{
-		return ($this->auth->acl_get('m_approve', $post_data['forum_id'])) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&mode=' . (($topic_data['topic_visibility'] != ITEM_DELETED) ? 'deleted_posts' : 'deleted_topics') . '&f=' . $post_data['forum_id'] . '&p=' . $post_data['post_id'], true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_approve', $post_data['forum_id'])) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&mode='.(($topic_data['topic_visibility'] != ITEM_DELETED) ? 'deleted_posts' : 'deleted_topics').'&f='.$post_data['forum_id'].'&p='.$post_data['post_id'], true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function get_notes_url(array $post_data)
 	{
-		return ($this->auth->acl_getf_global('m_')) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=notes&mode=user_notes&u=' . $post_data['poster_id'], true, $this->user->session_id) : '';
+		return ($this->auth->acl_getf_global('m_')) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=notes&mode=user_notes&u='.$post_data['poster_id'], true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	 */
 	public function get_warning_url(array $post_data)
 	{
-		return ($this->auth->acl_get('m_warn') && !$this->user_is_poster($post_data['poster_id']) && $post_data['poster_id'] != ANONYMOUS) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=warn&mode=warn_post&f=' . $post_data['forum_id'] . '&p=' . $post_data['post_id'], true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_warn') && !$this->user_is_poster($post_data['poster_id']) && $post_data['poster_id'] != ANONYMOUS) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=warn&mode=warn_post&f='.$post_data['forum_id'].'&p='.$post_data['post_id'], true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -242,7 +242,7 @@ 
 		$cp_param = '';
 		if ($topic_data['topic_first_post_id'] == $post_data['post_id'])
 		{
-			$cp_param = '&cp=' . ((!$cp_mode) ? (($this->user_is_poster($post_data['poster_id'])) ? 'ucp' : 'mcp') : $cp_mode);
+			$cp_param = '&cp='.((!$cp_mode) ? (($this->user_is_poster($post_data['poster_id'])) ? 'ucp' : 'mcp') : $cp_mode);
 		}
 		return $cp_param;
 	}

Braces +1 added lines, -2 removed lines

@@ -222,8 +222,7 @@
 			if ($topic_id)
 			{
 				$u_mcp = append_sid("{$this->phpbb_root_path}mcp.{$this->php_ext}", "i=mcp_main&mode=topic_view&f=$forum_id&t=$topic_id", true, $this->user->session_id);
-			}
-			else
+			} else
 			{
 				$u_mcp = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=-blitze-content-mcp-content_module&mode=content', true, $this->user->session_id);
 			}

Indentation +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	 * @param \phpbb\user			$user				User object
 	 * @param string				$phpbb_root_path	Path to the phpbb includes directory.
 	 * @param string				$php_ext			php file extension
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\db $config, \phpbb\user $user, $phpbb_root_path, $php_ext)
 	{
 		parent::__construct($auth, $config, $user);