blitze / phpBB-ext-sitemaker_content

model/entity/field.php

Braces +2 added lines, -4 removed lines

@@ -168,8 +168,7 @@ 
 		{
 			$data = generate_text_for_edit($this->field_explain, $this->field_exp_uid, $this->field_exp_options);
 			return $data['text'];
-		}
-		else
+		} else
 		{
 			$parse_flags = ($this->field_exp_bitfield ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
 			return generate_text_for_display($this->field_explain, $this->field_exp_uid, $this->field_exp_bitfield, $parse_flags);
@@ -186,8 +185,7 @@ 
 		if (!is_array($props))
 		{
 			$this->field_props = $props;
-		}
-		else if (sizeof($props))
+		} else if (sizeof($props))
 		{
 			$this->field_props = json_encode($props);
 		}

services/actions/type/add.php

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 * @param \blitze\sitemaker\services\auto_lang				$auto_lang				Auto add lang file
 	 * @param \blitze\content\services\form\fields_factory		$fields_factory			Fields factory  object
 	 * @param \blitze\content\services\views\views_factory		$views_factory			Views factory object
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\controller\helper $controller_helper, \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)
 	{
 		$this->auth = $auth;

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 			'ITEMS_PER_PAGE'	=> 10,
 			'TOPICS_PER_GROUP'	=> 4,
 
-			'U_ACTION'			=> $u_action . "&do=save&type=$type",
+			'U_ACTION'			=> $u_action."&do=save&type=$type",
 			'UA_AJAX_URL'		=> $this->controller_helper->route('blitze_content_field_settings', array(), false),
 
 			'S_TYPE_OPS'				=> $this->get_field_options(),
@@ -108,7 +108,7 @@ 
 		$options = '';
 		foreach ($fields as $field => $object)
 		{
-			$options .= '<option value="' . $field . '">' . $this->language->lang($object->get_langname()) . '</option>';
+			$options .= '<option value="'.$field.'">'.$this->language->lang($object->get_langname()).'</option>';
 		}
 
 		return $options;

services/form/builder.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -144,7 +144,7 @@ 
 		foreach ($fields_data as $field => $value)
 		{
 			$value = is_array($value) ? join("\n", $value) : $value;
-			$message .= '[smcf=' . $field . ']' . $value . '[/smcf]';
+			$message .= '[smcf='.$field.']'.$value.'[/smcf]';
 		}
 
 		return $message;
@@ -196,13 +196,13 @@ 
 		$text = '';
 		if ($entity = $this->types->get_type($content_type))
 		{
-			$fields_accessor = 'get_' . $view . '_fields';
-			$template_accessor = 'get_' . $view . '_tpl';
+			$fields_accessor = 'get_'.$view.'_fields';
+			$template_accessor = 'get_'.$view.'_tpl';
 
 			$this->fields->prepare_to_show($entity, array($post_data['topic_id']), $entity->$fields_accessor(), $entity->$template_accessor(), $view);
 			$content = $this->fields->build_content(array_change_key_case($post_data, CASE_UPPER));
 
-			$text =  $content['CUSTOM_DISPLAY'] ?: join('', $content['FIELDS']['all']);
+			$text = $content['CUSTOM_DISPLAY'] ?: join('', $content['FIELDS']['all']);
 		}
 		return $text;
 	}
@@ -397,8 +397,8 @@ 
 		}
 		else
 		{
-			$options[ITEM_UNAPPROVED]	= 'STATUS_DISAPPROVE';
-			$options[ITEM_APPROVED]		= 'STATUS_APPROVE';
+			$options[ITEM_UNAPPROVED] = 'STATUS_DISAPPROVE';
+			$options[ITEM_APPROVED] = 'STATUS_APPROVE';
 		}
 
 		return $options;

Braces +3 added lines, -6 removed lines

@@ -281,8 +281,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);
 		}
@@ -329,8 +328,7 @@ 
 			{
 				$data['force_visibility'] = $visibility;
 			}
-		}
-		else if ($this->force_state())
+		} else if ($this->force_state())
 		{
 			$data['force_visibility'] = ($mode == 'edit_first_post') ? ITEM_REAPPROVE : ITEM_UNAPPROVED;
 		}
@@ -394,8 +392,7 @@ 
 		if ($visibility == ITEM_APPROVED)
 		{
 			$options[ITEM_REAPPROVE] = 'STATUS_REAPPROVE';
-		}
-		else
+		} else
 		{
 			$options[ITEM_UNAPPROVED]	= 'STATUS_DISAPPROVE';
 			$options[ITEM_APPROVED]		= 'STATUS_APPROVE';

services/quickmod.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,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\template\template $template, \phpbb\user $user, $phpbb_root_path, $php_ext)
 	{
 		$this->auth = $auth;

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
 	 */
 	protected function allow_topic_delete(array $topic_data)
 	{
-		return ($this->auth->acl_get('m_delete',  $topic_data['forum_id'])) || (($topic_data['topic_visibility'] != ITEM_DELETED) && $this->auth->acl_get('m_softdelete',  $topic_data['forum_id']));
+		return ($this->auth->acl_get('m_delete', $topic_data['forum_id'])) || (($topic_data['topic_visibility'] != ITEM_DELETED) && $this->auth->acl_get('m_softdelete', $topic_data['forum_id']));
 	}
 
 	/**

services/poll.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 *
 	 * @param \blitze\sitemaker\services\poll		$poll			Poll Object
 	 * @param \blitze\sitemaker\services\template	$ptemplate		Sitemaker Template Object
-	*/
+	 */
 	public function __construct(\blitze\sitemaker\services\poll $poll, \blitze\sitemaker\services\template $ptemplate)
 	{
 		$this->poll = $poll;

services/form/field/range.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
 			),
 			'css'   => array(
 				'@blitze_content/vendor/ion.rangeSlider/css/ion.rangeSlider.min.css',
-				'@blitze_content/vendor/ion.rangeSlider/css/ion.rangeSlider.' . $data['field_props']['theme'] . '.min.css',
+				'@blitze_content/vendor/ion.rangeSlider/css/ion.rangeSlider.'.$data['field_props']['theme'].'.min.css',
 			)
 		));
 
@@ -89,7 +89,7 @@ 
 			array_walk($range, array($this, 'set_prefix'), $data['field_props']['prefix']);
 		}
 
-		return join($range, ' - ') . $data['field_props']['postfix'];
+		return join($range, ' - ').$data['field_props']['postfix'];
 	}
 
 	/**
@@ -129,6 +129,6 @@ 
 	 */
 	protected function set_prefix(&$item, $key, $prefix)
 	{
-		$item = $prefix . $item;
+		$item = $prefix.$item;
 	}
 }

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/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()['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');
 	}
 }