blitze / phpBB-ext-sitemaker_content

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/fields.php

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
 
 		$this->display_mode = $view_mode;
 		$this->content_type = $entity->get_content_name();
-		$this->tpl_name	= ($custom_tpl) ? $this->content_type . '_' . $view_mode : '';
+		$this->tpl_name = ($custom_tpl) ? $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;
@@ -114,7 +114,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'],
@@ -181,7 +181,7 @@ 
 			$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))
@@ -192,7 +192,7 @@ 
 
 			if (!empty($field_contents))
 			{
-				$display_data[$field_name] = '<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[$field_name] = '<div class="field-label '.$this->label[$field_data['field_'.$this->view_mode.'_ldisp']].'">'.$field_data['field_label'].$this->language->lang('COLON').' </div>'.$field_contents;
 			}
 		}
 

Braces +1 added lines, -2 removed lines

@@ -139,8 +139,7 @@
 			$this->template->assign_vars(array_change_key_case(array_merge($tpl_data, $fields_data), CASE_UPPER));
 			$this->template->set_filenames(array('content' => $this->tpl_name));
 			$tpl_data['CUSTOM_DISPLAY'] = $this->template->assign_display('content');
-		}
-		else
+		} else
 		{
 			$tpl_data['SEQ_DISPLAY'] = join("\n", $fields_data);
 		}

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

Doc Comments +1 added lines, -2 removed lines

@@ -244,7 +244,7 @@ 
 	/**
 	 * @param array $topic_data
 	 * @param array $post_data
-	 * @return array
+	 * @return string
 	 */
 	protected function get_mini_post_url(array $topic_data, array $post_data)
 	{
@@ -324,7 +324,6 @@ 
 	}
 
 	/**
-	 * @param array $row
 	 * @return array
 	 */
 	protected function get_watch_status_data(array $topic_data)

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_poster, $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;

Doc Comments -1 removed lines

@@ -106,7 +106,6 @@
 	 *
 	 * @param string $type
 	 * @param int $topic_id
-	 * @param int $page
 	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
 	 */
 	public function show($type, $topic_id)

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']}";

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/listener.php

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 * @param \phpbb\language\language				$language			Language object
 	 * @param \blitze\content\services\types		$content_types		Content types object
 	 * @param string								$php_ext			php file extension
-	*/
+	 */
 	public function __construct(\phpbb\language\language $language, \blitze\content\services\types $content_types, $php_ext)
 	{
 		$this->language = $language;

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	 */
 	public function add_viewonline_location(\phpbb\event\data $event)
 	{
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/content/') === 0)
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/content/') === 0)
 		{
 			$types = join('|', $this->content_types->get_forum_types());
 			preg_match("/\/content\/($types)(\/[0-9]\/.*)?/is", $event['row']['session_page'], $match);

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