blitze / phpBB-ext-sitemaker_content

controller/main_controller.php

Doc Comments -1 removed lines

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

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 * @param \blitze\content\services\comments				$comments			Comments 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, \blitze\content\services\types $content_types, \blitze\content\services\views\views_factory $views_factory)
 	{
 		$this->db = $db;

Spacing +3 added lines, -3 removed lines

@@ -156,15 +156,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);

services/actions/topic/moderate.php

Doc Comments +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	}
 
 	/**
-	 * @param $action
+	 * @param string $action
 	 * @param array $topic_ids
 	 */
 	protected function change_topic_type($action, array $topic_ids)

Braces +2 added lines, -4 removed lines

@@ -70,8 +70,7 @@ 
 		{
 			$forum_ids = $this->get_selected_forum_ids($topic_ids);
 			$this->{$action}($topic_ids, $forum_ids);
-		}
-		else
+		} else
 		{
 			$message =  $this->language->lang('INVALID_REQUEST', $action);
 			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $u_action . '">', '</a>'));
@@ -113,8 +112,7 @@ 
 		{
 			$this->approve($topic_ids, $forum_ids, false);
 			\mcp_queue::disapprove_posts($post_id_list, '-blitze-content-mcp-content_module', 'content');
-		}
-		else
+		} else
 		{
 			trigger_error('NO_POST_SELECTED');
 		}

Spacing +7 added lines, -7 removed lines

@@ -73,8 +73,8 @@ 
 		}
 		else
 		{
-			$message =  $this->language->lang('INVALID_REQUEST', $action);
-			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $u_action . '">', '</a>'));
+			$message = $this->language->lang('INVALID_REQUEST', $action);
+			trigger_error($message.'<br /><br />'.$this->language->lang('RETURN_PAGE', '<a href="'.$u_action.'">', '</a>'));
 		}
 	}
 
@@ -86,8 +86,8 @@ 
 	 */
 	protected function approve(array $topic_ids, array $forum_ids, $execute = true)
 	{
-		include($this->phpbb_root_path . 'includes/mcp/mcp_queue.' . $this->php_ext);
-		include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
+		include($this->phpbb_root_path.'includes/mcp/mcp_queue.'.$this->php_ext);
+		include($this->phpbb_root_path.'includes/functions_messenger.'.$this->php_ext);
 
 		if (!(sizeof(array_intersect_key($forum_ids, $this->auth->acl_getf('m_approve', true)))))
 		{
@@ -149,7 +149,7 @@ 
 	 */
 	protected function resync(array $topic_ids)
 	{
-		include($this->phpbb_root_path . 'includes/mcp/mcp_forum.' . $this->php_ext);
+		include($this->phpbb_root_path.'includes/mcp/mcp_forum.'.$this->php_ext);
 
 		mcp_resync_topics($topic_ids);
 	}
@@ -229,7 +229,7 @@ 
 		}
 
 		$sql = 'SELECT forum_id
-			FROM ' . TOPICS_TABLE . '
+			FROM ' . TOPICS_TABLE.'
 			WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
 		$result = $this->db->sql_query($sql);
 
@@ -257,7 +257,7 @@ 
 		}
 
 		$sql = 'SELECT post_id
-			FROM ' . POSTS_TABLE . '
+			FROM ' . POSTS_TABLE.'
 			WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
 		$result = $this->db->sql_query($sql);
 

services/builder.php

Doc Comments +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 	 * @param int $forum_id
 	 * @param string $mode
 	 * @param bool $save_draft
-	 * @return string|false
+	 * @return string|boolean
 	 */
 	public function init($forum_id, $mode, $save_draft)
 	{

Braces +2 added lines, -4 removed lines

@@ -223,8 +223,7 @@ 
 		if (!$field_data['field_mod_only'] || $this->mode === 'mcp')
 		{
 			$this->form->add($field, $field_data['field_type'], $field_data, $topic_id);
-		}
-		else if (!empty($field_data['field_value']))
+		} else if (!empty($field_data['field_value']))
 		{
 			$this->form->add($field, 'hidden', $field_data, $topic_id);
 		}
@@ -271,8 +270,7 @@ 
 			{
 				$data['force_approved_state'] = $force_status;
 			}
-		}
-		else
+		} else
 		{
 			if ($this->force_state())
 			{

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 		foreach ($fields_data as $field => $value)
 		{
 			$value = is_array($value) ? join("\n", $value) : $value;
-			$message .= '[tag=' . $field . ']' . $value . '[/tag]';
+			$message .= '[tag='.$field.']'.$value.'[/tag]';
 		}
 
 		return $message;

services/comments.php

Doc Comments +5 added lines, -1 removed lines

@@ -64,7 +64,6 @@ 
 	 * @param \phpbb\user								$user				User object
 	 * @param \blitze\content\services\form\form		$form				Form object
 	 * @param \blitze\sitemaker\services\forum\data		$forum				Forum Data object
-	 * @param \blitze\content\services\topic			$topic				Content topic object
 	 * @param string									$root_path			Path to the phpbb includes directory.
 	 * @param string									$php_ext			php file extension
 	*/
@@ -217,6 +216,11 @@ 
 		$this->template->assign_var('POST_FORM', $this->form->get_form());
 	}
 
+	/**
+	 * @param integer $topic_id
+	 * @param integer $total_comments
+	 * @param string $base_url
+	 */
 	protected function build_pagination(&$start, $forum_id, $topic_id, $post_id, $total_comments, $action, $base_url)
 	{
 		if ($post_id && !$action)

Indentation +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 	 * @param \blitze\content\services\topic			$topic				Content topic 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\db $config, \phpbb\content_visibility $content_visibility, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\pagination $pagination, \phpbb\request\request_interface $request, \phpbb\template\template $template, \phpbb\user $user, \blitze\content\services\form\form $form, \blitze\sitemaker\services\forum\data $forum, $root_path, $php_ext)
 	{
 		$this->auth = $auth;

Spacing +11 added lines, -11 removed lines

@@ -107,7 +107,7 @@ 
 			$this->build_pagination($start, $topic_data['forum_id'], $topic_id, $post_id, $total_comments, $action, $base_url);
 
 			$posts_data = $this->forum->get_post_data(false, array(), $this->config['posts_per_page'], $start, array(
-				'WHERE' => 'p.post_id <> ' . (int) $topic_data['topic_first_post_id'],
+				'WHERE' => 'p.post_id <> '.(int) $topic_data['topic_first_post_id'],
 			));
 
 			$topic_tracking_info = $this->forum->get_topic_tracking_info();
@@ -150,7 +150,7 @@ 
 
 		if ($action == 'edit')
 		{
-			$result = $this->db->sql_query('SELECT * FROM ' . POSTS_TABLE . ' WHERE post_id = ' . (int) $post_id);
+			$result = $this->db->sql_query('SELECT * FROM '.POSTS_TABLE.' WHERE post_id = '.(int) $post_id);
 			$post_data = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 
@@ -177,14 +177,14 @@ 
 			{
 				if (!function_exists('submit_post'))
 				{
-					include($this->root_path . 'includes/functions_posting.' . $this->php_ext);
+					include($this->root_path.'includes/functions_posting.'.$this->php_ext);
 				}
 
 				$poll = array();
 				$uid = $bitfield = $options = '';
-				$allow_bbcode	= ($this->config['allow_bbcode']) ? true : false;
-				$allow_smilies	= ($this->config['allow_smilies']) ? true : false;
-				$allow_urls		= ($this->config['allow_post_links']) ? true : false;
+				$allow_bbcode = ($this->config['allow_bbcode']) ? true : false;
+				$allow_smilies = ($this->config['allow_smilies']) ? true : false;
+				$allow_urls = ($this->config['allow_post_links']) ? true : false;
 
 				generate_text_for_storage($message, $uid, $bitfield, $options, $allow_bbcode, $allow_urls, $allow_smilies);
 
@@ -206,8 +206,8 @@ 
 				submit_post($action, $topic_data['topic_title'], $this->user->data['username'], POST_NORMAL, $poll, $post_data);
 
 				$post_id = $post_data['post_id'];
-				$redirect_url = $current_page . ((strpos($current_page, '?') === false) ? '?' : '&amp;')  . "p=$post_id#p$post_id";
-				$message = $this->user->lang['COMMENT_POSTED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_PAGE'], '<a href="' . $redirect_url . '">', '</a>');
+				$redirect_url = $current_page.((strpos($current_page, '?') === false) ? '?' : '&amp;')."p=$post_id#p$post_id";
+				$message = $this->user->lang['COMMENT_POSTED'].'<br /><br />'.sprintf($this->user->lang['RETURN_PAGE'], '<a href="'.$redirect_url.'">', '</a>');
 
 				meta_refresh(3, $redirect_url);
 				trigger_error($message);
@@ -222,7 +222,7 @@ 
 		if ($post_id && !$action)
 		{
 			$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);
@@ -230,10 +230,10 @@ 
 			$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 (p.post_time < {$row['post_time']} OR (p.post_time = {$row['post_time']} AND p.post_id <= {$row['post_id']}))
-					AND " . $this->content_visibility->get_visibility_sql('post', $forum_id, 'p.');
+					AND ".$this->content_visibility->get_visibility_sql('post', $forum_id, 'p.');
 
 			$result = $this->db->sql_query($sql);
 			$row = $this->db->sql_fetchrow($result);

services/form/field/textarea.php

Doc Comments +4 added lines, -5 removed lines

@@ -75,10 +75,8 @@ 
 	/**
 	 * Display content field
 	 *
-	 * @param string $field_value
 	 * @param string $view_mode
 	 * @param array $topic_data
-	 * @param array $field_data
 	 * @return mixed
 	 */
 	public function display_field($value, $view_mode = 'detail', array $topic_data = array(), array $field = array())
@@ -182,7 +180,7 @@ 
 	 * @param string $value
 	 * @param string $topic_url
 	 * @param string $view_mode
-	 * @return void
+	 * @return string
 	 */
 	protected function generate_field_pages($field_name, $value, $topic_url, $view_mode)
 	{
@@ -212,8 +210,8 @@ 
 	/**
 	 * Generate pagination for topic subpages
 	 *
-	 * @param array $pages
-	 * @param array $page_titles
+	 * @param string[] $pages
+	 * @param string[] $page_titles
 	 * @param int $start
 	 * @param string $topic_url
 	 * @param string $view_mode
@@ -235,6 +233,7 @@ 
 	 *
 	 * @param int $start
 	 * @param $page_titles
+	 * @param string $topic_url
 	 * @return void
 	 */
 	protected function generate_toc($start, $page_titles, $topic_url)

Spacing +4 added lines, -4 removed lines

@@ -104,7 +104,7 @@ 
 			$asset_path = $this->util->get_web_path();
 			$this->util->add_assets(array(
 				'js'   => array(
-					$asset_path . 'assets/javascript/editor.js',
+					$asset_path.'assets/javascript/editor.js',
 					'@blitze_content/assets/content_posting.min.js'
 				)
 			));
@@ -155,12 +155,12 @@ 
 		// Assigning custom bbcodes
 		if (!function_exists('display_custom_bbcodes'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
 		}
 
 		display_custom_bbcodes();
 
-		$bbcode_status	= ($this->config['allow_bbcode'] && $this->auth->acl_get('f_bbcode', $forum_id)) ? true : false;
+		$bbcode_status = ($this->config['allow_bbcode'] && $this->auth->acl_get('f_bbcode', $forum_id)) ? true : false;
 
 		$dataref = $this->template_context->get_data_ref();
 		$this->ptemplate->assign_block_vars_array('custom_tags', (isset($dataref['custom_tags'])) ? $dataref['custom_tags'] : array());
@@ -245,7 +245,7 @@ 
 			$this->template->assign_block_vars('toc', array(
 				'TITLE'		=> $title,
 				'S_PAGE'	=> ($page === $start),
-				'U_VIEW'	=> append_sid($topic_url, 'page=' . $page),
+				'U_VIEW'	=> append_sid($topic_url, 'page='.$page),
 			));
 		}
 	}

services/types.php

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
 			if ($trigger_error)
 			{
 				throw new \blitze\sitemaker\exception\out_of_bounds($type);
-			}
-			else
+			} else
 			{
 				return false;
 			}

services/form/form.php

Braces +2 added lines, -4 removed lines

@@ -206,14 +206,12 @@
 		if (!empty($field_value))
 		{
 			$this->errors[] = $obj->validate_field($row);
-		}
-		else if ($row['field_required'])
+		} else if ($row['field_required'])
 		{
 			if (!$row['field_mod_only'] || $cp_class === 'mcp')
 			{
 				$this->errors[] = $this->language->lang_array('FIELD_REQUIRED', array($row['field_label']));
-			}
-			else
+			} else
 			{
 				$req_mod_input = true;
 			}

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 	 */
 	public function add($name, $type, array $field_data, $forum_id = 0, $topic_id = 0)
 	{
-		$field_data += array('field_id' => 'field-' . $name);
+		$field_data += array('field_id' => 'field-'.$name);
 		$field_data += $this->get_default_field_data();
 
 		if ($this->fields_factory->exists($type))

services/form/field/checkbox.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,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')
 		{

services/form/field/base.php

Braces +2 added lines, -4 removed lines

@@ -134,12 +134,10 @@
 		if ($this->is_too_short($data, $length))
 		{
 			return $this->language->lang('FIELD_TOO_SHORT', $data['field_label'], $data['field_minlength']);
-		}
-		else if ($this->is_too_long($data, $length))
+		} else if ($this->is_too_long($data, $length))
 		{
 			return $this->language->lang('FIELD_TOO_LONG', $data['field_label'], $data['field_maxlength']);
-		}
-		else
+		} else
 		{
 			return $this->language->lang('FIELD_INVALID', $data['field_label']);
 		}

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 
 		$this->ptemplate->assign_vars(array_change_key_case($data, CASE_UPPER));
 
-		return $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field . '_field');
+		return $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field.'_field');
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 	 */
 	public function get_langname()
 	{
-		return strtoupper('FORM_FIELD_' . $this->get_name());
+		return strtoupper('FORM_FIELD_'.$this->get_name());
 	}
 
 	/**