blitze / phpBB-ext-sitemaker_content

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/form/field/choice.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,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')
 		{
@@ -62,7 +62,7 @@ 
 		$this->ptemplate->assign_vars($data);
 
 		$tpl_name = ($data['field_type'] === 'select') ? 'select' : 'pickem';
-		return $this->ptemplate->render_view('blitze/content', "fields/$tpl_name.html", $data['field_type'] . '_field');
+		return $this->ptemplate->render_view('blitze/content', "fields/$tpl_name.html", $data['field_type'].'_field');
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 			foreach ($choices as $value => $option)
 			{
 				$options[] = array(
-					'id'		=> 'smc-'. $name . '-' . $count,
+					'id'		=> 'smc-'.$name.'-'.$count,
 					'label'		=> $this->language->lang($option),
 					'selected'	=> (int) (in_array($value, $selected)),
 					'value'		=> $value,

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

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();
@@ -133,7 +133,7 @@ 
 		$attachments = $this->forum->get_attachments($topic_data['forum_id']);
 
 		$this->template->assign_vars(array(
-			'S_TOPIC_ACTION' => append_sid($topic_data['topic_url'], (($start == 0) ? '' : "?start=$start")) . '#comments',
+			'S_TOPIC_ACTION' => append_sid($topic_data['topic_url'], (($start == 0) ? '' : "?start=$start")).'#comments',
 		));
 
 		for ($i = 0, $size = sizeof($posts_data); $i < $size; $i++)
@@ -150,7 +150,7 @@ 
 				'S_POST_REPORTED'			=> ($row['post_reported'] && $this->auth->acl_get('m_report', $forum_id)) ? true : false,
 				'S_TOPIC_POSTER'			=> ($topic_data['topic_poster'] == $poster_id) ? true : false,
 				'S_POST_HIDDEN'				=> $row['hide_post'],
-				'L_POST_DISPLAY'			=> ($row['hide_post']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="' . $row['post_id'] . '" href="' . $viewtopic_url . "&amp;p={$row['post_id']}&amp;view=show#p{$row['post_id']}" . '">', '</a>') : '',
+				'L_POST_DISPLAY'			=> ($row['hide_post']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="'.$row['post_id'].'" href="'.$viewtopic_url."&amp;p={$row['post_id']}&amp;view=show#p{$row['post_id']}".'">', '</a>') : '',
 			)));
 
 			$this->topic->show_attachments($attachments, $row['post_id'], 'postrow.attachment');
@@ -174,9 +174,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";
@@ -186,7 +186,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']);
 			}
 		}
 	 }
@@ -213,7 +213,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();
+		$data = & $this->template_context->get_data_ref();
 		foreach ($data['pagination'] as &$row)
 		{
 			$row['PAGE_URL'] .= '#comments';
@@ -275,7 +275,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);
@@ -283,9 +283,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')
 		{
@@ -312,11 +312,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);
 

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

services/notification/topic_in_queue.php

Indentation +4 added lines, -4 removed lines

@@ -34,10 +34,10 @@
 	}
 
 	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
+	 * Get the url to this item
+	 *
+	 * @return string URL
+	 */
 	public function get_url()
 	{
 		if ($type = $this->types->get_forum_type($this->item_parent_id))

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	{
 		if ($type = $this->types->get_forum_type($this->item_parent_id))
 		{
-			return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "i=-blitze-content-mcp-content_module&mode=content&type=$type&t={$this->item_id}&do=view");
+			return append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, "i=-blitze-content-mcp-content_module&mode=content&type=$type&t={$this->item_id}&do=view");
 		}
 
 		return parent::get_url();

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

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