blitze / phpBB-ext-sitemaker_content

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 +8 added lines, -8 removed lines

@@ -97,7 +97,7 @@ 
 
 		$this->board_url = generate_board_url(true);
 		$this->display_mode = $view_mode;
-		$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->db_fields = $db_fields;
 
@@ -120,7 +120,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'],
@@ -129,7 +129,7 @@ 
 			$topic_data_overwrite
 		);
 
-		$tpl_data['PERMA_LINK'] = $this->board_url . parse_url($tpl_data['TOPIC_URL'], PHP_URL_PATH);
+		$tpl_data['PERMA_LINK'] = $this->board_url.parse_url($tpl_data['TOPIC_URL'], PHP_URL_PATH);
 
 		return $this->build_content($tpl_data);
 	}
@@ -207,21 +207,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, $tpl_data, $this->display_mode);
+			$field_contents = $this->form_fields[$field_type]->display_field($field_data, $tpl_data, $this->display_mode);
 
 			// 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 = $this->get_field_label($field_data['field_' . $this->view_mode . '_ldisp'], $field_data['field_label']) . $field_contents;
+				$field = $this->get_field_label($field_data['field_'.$this->view_mode.'_ldisp'], $field_data['field_label']).$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;
 			}
 		}
 
@@ -238,7 +238,7 @@ 
 		$html = '';
 		if ($label_type)
 		{
-			$html = '<div class="field-label ' . $this->label[$label_type] . '">' . $label_text . $this->language->lang('COLON') . ' </div>';
+			$html = '<div class="field-label '.$this->label[$label_type].'">'.$label_text.$this->language->lang('COLON').' </div>';
 		}
 		return $html;
 	}

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

services/actions/topic/view.php

Spacing +2 added lines, -2 removed lines

@@ -94,14 +94,14 @@
 	protected function get_data_overwrite($mode, $u_action, $type, $topic_id)
 	{
 		$overwrite = array(
-			'TOPIC_URL'	=> $u_action . '&do=view&type=' . $type . '&t=' . $topic_id,
+			'TOPIC_URL'	=> $u_action.'&do=view&type='.$type.'&t='.$topic_id,
 			'U_INFO'	=> '',
 		);
 
 		if ($mode === 'mcp')
 		{
 			$redirect_url = urlencode(str_replace('&', '&', $u_action));
-			$overwrite['U_DELETE'] = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&action=delete_topic&t=' . $topic_id . '&redirect=' . $redirect_url);
+			$overwrite['U_DELETE'] = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&action=delete_topic&t='.$topic_id.'&redirect='.$redirect_url);
 		}
 
 		return $overwrite;

event/bbcodes.php

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
 		// Let's create the new BBCode
 		$configurator->BBCodes->addCustom(
 			'[pagebreak title={SIMPLETEXT;optional;postFilter=ucwords}]',
-			'<p><!-- pagebreak --></p>' .
+			'<p><!-- pagebreak --></p>'.
 			'<xsl:if test="@title"><h4>{SIMPLETEXT}</h4><br /></xsl:if>'
 		);
 	}
@@ -64,8 +64,8 @@ 
 		// smcf = sitemaker content field (hopefully unique enough)
 		$configurator->BBCodes->addCustom(
 			'[smcf={IDENTIFIER}]{TEXT}[/smcf]',
-			"<!-- begin field -->\n" .
-			"<div data-field=\"{IDENTIFIER}\">{TEXT}</div><br />\n" .
+			"<!-- begin field -->\n".
+			"<div data-field=\"{IDENTIFIER}\">{TEXT}</div><br />\n".
 			"<!-- end field -->\n"
 		);
 	}

services/views/driver/portal.php

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(

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	 * @param \blitze\content\services\topic\blocks_factory		$topic_blocks_factory	Topic blocks factory object
 	 * @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, \blitze\content\services\topic\blocks_factory $topic_blocks_factory, \phpbb\config\config $config, \blitze\content\services\types $content_types)
 	{
 		parent::__construct($phpbb_dispatcher, $language, $pagination, $template, $fields, $forum, $helper, $quickmod, $topic_blocks_factory);

blocks/archive.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 				'count'	=> $row['total'],
 				'url'	=> $this->helper->route($info['route_name'], $info['route_params'] + array(
 					'filter_type'	=> 'archive',
-					'filter_value'	=> $row['year'] . '-' . $row['month'],
+					'filter_value'	=> $row['year'].'-'.$row['month'],
 				)),
 			);
 		}

Braces +1 added lines, -2 removed lines

@@ -106,8 +106,7 @@
 				'route_name'	=> 'blitze_content_type_filter',
 				'route_params'	=> array('type' => $this->content_types->get_forum_type($settings['forum_id'])),
 			);
-		}
-		else
+		} else
 		{
 			return array(
 				'forum_ids'		=> array_keys($this->content_types->get_forum_types()),

services/form/field/choice.php

Spacing +2 added lines, -2 removed lines

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

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
 		$this->util->add_assets(array(
 			'js'	=> array(
 				100 => '@blitze_content/assets/fields/form.min.js',
-				101 => '//maps.googleapis.com/maps/api/js?key=' . $this->google_api_key . '&libraries=places&callback=initMap&language=' . $this->language->get_used_language() . '" async defer charset="UTF-8',
+				101 => '//maps.googleapis.com/maps/api/js?key='.$this->google_api_key.'&libraries=places&callback=initMap&language='.$this->language->get_used_language().'" async defer charset="UTF-8',
 			)
 		));
 		$data['show_input'] = true;
@@ -103,7 +103,7 @@ 
 		}
 
 		$data['field_value'] = $this->get_field_value($data);
-		$callable = 'display_' . $data['field_props']['disp_type'];
+		$callable = 'display_'.$data['field_props']['disp_type'];
 
 		return $this->$callable($data);
 	}
@@ -114,7 +114,7 @@ 
 	 */
 	protected function display_address(array $data)
 	{
-		return $this->get_location_title($data['field_value']['place'], $data['field_value']['address']) . $data['field_value']['address'];
+		return $this->get_location_title($data['field_value']['place'], $data['field_value']['address']).$data['field_value']['address'];
 	}
 
 	/**
@@ -123,8 +123,8 @@ 
 	 */
 	protected function display_coordinates(array $data)
 	{
-		return $this->get_location_title($data['field_value']['place'], $data['field_value']['address']) .
-			$data['field_value']['latitude'] . ', ' . $data['field_value']['longitude'];
+		return $this->get_location_title($data['field_value']['place'], $data['field_value']['address']).
+			$data['field_value']['latitude'].', '.$data['field_value']['longitude'];
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 		{
 			$this->util->add_assets(array(
 				'js'	=> array(
-					'//maps.googleapis.com/maps/api/js?key=' . $this->google_api_key . '&callback=initMap&language=' . $this->language->get_used_language() . '" async defer charset="UTF-8',
+					'//maps.googleapis.com/maps/api/js?key='.$this->google_api_key.'&callback=initMap&language='.$this->language->get_used_language().'" async defer charset="UTF-8',
 					'@blitze_content/assets/fields/display.min.js',
 				)
 			));
@@ -157,18 +157,18 @@ 
 		$info = $data['field_value'];
 		$settings = $data['field_props'];
 		$map_types = $settings['options'] ?: ['roadmap'];
-		$coordinates = $info['latitude'] . ',' . $info['longitude'];
+		$coordinates = $info['latitude'].','.$info['longitude'];
 
 		$params = array(
 			'center'	=> $coordinates,
 			'zoom'		=> $settings['map_zoom'] ?: $info['zoom'],
-			'size'		=> $settings['map_width'] . 'x' . $settings['map_height'],
+			'size'		=> $settings['map_width'].'x'.$settings['map_height'],
 			'maptype'	=> $info['map_type'] ?: $map_types[0],
 			'markers'	=> $coordinates,
 			'key'		=> $this->google_api_key,
 		);
 
-		return '<img src="https://maps.googleapis.com/maps/api/staticmap?' . http_build_query($params) . '" alt="' . $info['address'] . '" title="' . $info['place'] . '" />';
+		return '<img src="https://maps.googleapis.com/maps/api/staticmap?'.http_build_query($params).'" alt="'.$info['address'].'" title="'.$info['place'].'" />';
 	}
 
 	/**
@@ -178,6 +178,6 @@ 
 	 */
 	protected function get_location_title($place, $address)
 	{
-		return (strpos($address, $place) === false) ? '<strong>' . $place . '</strong><br />' : '';
+		return (strpos($address, $place) === false) ? '<strong>'.$place.'</strong><br />' : '';
 	}
 }

services/form/field/textarea.php

Spacing +6 added lines, -6 removed lines

@@ -94,9 +94,9 @@ 
 	{
 		$toc_pattern = '(<h4>(.*?)</h4>)?';
 		$pages_pattern = '<p><!-- pagebreak --></p>';
-		$split_pattern = $pages_pattern . (($view_mode !== 'detail') ? $toc_pattern : '');
+		$split_pattern = $pages_pattern.(($view_mode !== 'detail') ? $toc_pattern : '');
 
-		$pages = array_filter(preg_split('#' . $split_pattern . '#s', $data['field_value']));
+		$pages = array_filter(preg_split('#'.$split_pattern.'#s', $data['field_value']));
 
 		if ($view_mode !== 'detail')
 		{
@@ -104,7 +104,7 @@ 
 		}
 
 		// get page titles to generate TOC
-		preg_match_all('#' . $pages_pattern . $toc_pattern . '#s', $data['field_value'], $matches);
+		preg_match_all('#'.$pages_pattern.$toc_pattern.'#s', $data['field_value'], $matches);
 
 		return $this->get_detail_value($pages, $matches[2], $data);
 	}
@@ -119,7 +119,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/fields/textarea.min.js'
 				)
 			));
@@ -227,7 +227,7 @@ 
 				$this->template->assign_block_vars('toc', array(
 					'TITLE'		=> ($title) ? $title : $this->language->lang('CONTENT_TOC_UNTITLED'),
 					'S_PAGE'	=> ($page === $start),
-					'U_VIEW'	=> append_sid($topic_url, ($page) ? 'page=' . $page : false),
+					'U_VIEW'	=> append_sid($topic_url, ($page) ? 'page='.$page : false),
 				));
 			}
 		}
@@ -279,7 +279,7 @@ 
 		// 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();