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

@@ -97,7 +97,7 @@ 
 
 		$this->display_mode = $view_mode;
 		$this->content_type = $entity->get_content_name();
-		$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->form_fields = array_intersect_key($this->fields_factory->get_all(), array_flip($view_mode_fields));
 		$this->db_fields = $db_fields;
@@ -118,7 +118,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'],
@@ -185,21 +185,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, $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))
 			{
 				$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 = '<div class="field-label ' . $this->label[$field_data['field_' . $this->view_mode . '_ldisp']] . '">' . $field_data['field_label'] . $this->language->lang('COLON') . ' </div>' . $field_contents;
+				$field = '<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['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;
 			}
 		}
 

services/form/field/textarea.php

Spacing +6 added lines, -6 removed lines

@@ -99,9 +99,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')
 		{
@@ -109,7 +109,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);
 	}
@@ -124,7 +124,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/form/textarea.min.js'
 				)
 			));
@@ -232,7 +232,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),
 				));
 			}
 		}
@@ -282,7 +282,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();

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;

blocks/recent.php

Spacing +5 added lines, -5 removed lines

@@ -163,13 +163,13 @@ 
 			$topic_tracking_info = $this->forum->get_topic_tracking_info($forum_id);
 			$block_fields = $this->get_block_fields($entity->get_field_types());
 
-			$this->fields->prepare_to_show($entity, array_keys($topics_data), $block_fields, $this->settings['block_tpl'], 'block', $block_id . '_block');
+			$this->fields->prepare_to_show($entity, array_keys($topics_data), $block_fields, $this->settings['block_tpl'], 'block', $block_id.'_block');
 
 			$update_count = array();
 			foreach ($posts_data as $topic_id => $posts)
 			{
-				$post_data	= array_shift($posts);
-				$topic_data	= $topics_data[$topic_id];
+				$post_data = array_shift($posts);
+				$topic_data = $topics_data[$topic_id];
 				$this->ptemplate->assign_block_vars('topicrow', $this->fields->show($type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info));
 			}
 			unset($topics_data, $posts_data, $users_cache, $attachments, $topic_tracking_info);
@@ -196,7 +196,7 @@ 
 			POST_STICKY		=> 'CONTENT_STICKY_POSTS',
 		);
 
-		return (isset($topic_types[$this->settings['topic_type']])) ? $topic_types[$this->settings['topic_types']] :  $this->language->lang('CONTENT_' . $this->sort_options[$this->settings['sort_key']], $content_langname);
+		return (isset($topic_types[$this->settings['topic_type']])) ? $topic_types[$this->settings['topic_types']] : $this->language->lang('CONTENT_'.$this->sort_options[$this->settings['sort_key']], $content_langname);
 	}
 
 	/**
@@ -263,7 +263,7 @@ 
 		foreach ($content_types as $value => $title)
 		{
 			$selected = ($type == $value) ? ' selected="selected"' : '';
-			$html .= '<option value="' . $value . '"' . $selected . ' data-toggle-setting="#fields-col-' . $value . '">' . $title . '</option>';
+			$html .= '<option value="'.$value.'"'.$selected.' data-toggle-setting="#fields-col-'.$value.'">'.$title.'</option>';
 		}
 
 		return $html;

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

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()),

event/listener.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,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\controller\helper $helper, \phpbb\language\language $language, \blitze\content\services\types $content_types, $php_ext)
 	{
 		$this->helper = $helper;

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,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);
@@ -125,12 +125,12 @@ 
 	{
 		$list = $this->content_types->get_all_types();
 
-		$text = $this->language->lang('CONTENT_TYPES') . '|' . $this->helper->route('blitze_content_types', array(), false, '', UrlGeneratorInterface::RELATIVE_PATH) . "\n";
+		$text = $this->language->lang('CONTENT_TYPES').'|'.$this->helper->route('blitze_content_types', array(), false, '', UrlGeneratorInterface::RELATIVE_PATH)."\n";
 
 		foreach ($list as $type => $entity)
 		{
-			$text .= "\t" . $entity->get_content_langname() . '|';
-			$text .= $this->helper->route('blitze_content_type', array('type' => $type), false, '', UrlGeneratorInterface::RELATIVE_PATH) . "\n";
+			$text .= "\t".$entity->get_content_langname().'|';
+			$text .= $this->helper->route('blitze_content_type', array('type' => $type), false, '', UrlGeneratorInterface::RELATIVE_PATH)."\n";
 		}
 
 		return trim($text);

services/form/field/field_interface.php

Doc Comments -1 removed lines

@@ -67,7 +67,6 @@
 	 *
 	 * @param int $topic_id
 	 * @param mixed $field_value
-	 * @param array $field_data
 	 * @return void
 	 */
 	public function save_field($topic_id, $field_value, array $data);