blitze / phpBB-ext-sitemaker_content

services/feed.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	 * @param \phpbb\template\template		$template				Template object
 	 * @param \phpbb\user					$user					User object
 	 * @param string						$php_ext				php file extension
-	*/
+	 */
 	public function __construct(\phpbb\config\config $config, \phpbb\controller\helper $controller_helper, \phpbb\symfony_request $symfony_request, \phpbb\template\template $template, \phpbb\user $user, $php_ext)
 	{
 		$this->config = $config;

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
 		$this->template->assign_vars(array(
 			'BOARD_URL'				=> $this->board_url,
 			'SELF_LINK'				=> $this->controller_helper->route($this->symfony_request->attributes->get('_route'), $this->symfony_request->attributes->get('_route_params'), true, '', UrlGeneratorInterface::ABSOLUTE_URL),
-			'FEED_LINK'				=> $this->board_url . $this->user->page['script_path'] . 'index.' . $this->php_ext,
+			'FEED_LINK'				=> $this->board_url.$this->user->page['script_path'].'index.'.$this->php_ext,
 			'FEED_TITLE'			=> $this->config['sitename'],
 			'FEED_SUBTITLE'			=> $this->config['site_desc'],
 			'FEED_UPDATED'			=> $max_update_time,
@@ -88,7 +88,7 @@ 
 		$response = new Response($this->prepare_content($content));
 		$response->headers->set('Content-Type', 'application/atom+xml');
 		$response->setCharset('UTF-8');
-		$response->setLastModified(new \DateTime('@' . $max_update_time));
+		$response->setLastModified(new \DateTime('@'.$max_update_time));
 
 		if (!empty($this->user->data['is_bot']))
 		{
@@ -107,8 +107,8 @@ 
 	{
 		// convert relative urls to absolute urls
 		$script_path = trim($this->user->page['script_path'], '/');
-		$full_path = $this->board_url . '/' . $script_path;
-		$content = preg_replace('/(href|src)=("|\')((?:\.*\/)+(?:' . $script_path . '\/)?)(.*?)("|\')/i', '$1=$2' . $full_path . '/$4$5', $content);
+		$full_path = $this->board_url.'/'.$script_path;
+		$content = preg_replace('/(href|src)=("|\')((?:\.*\/)+(?:'.$script_path.'\/)?)(.*?)("|\')/i', '$1=$2'.$full_path.'/$4$5', $content);
 
 		// remove hidden field labels
 		$content = preg_replace('#<div class="field-label label-hidden">(.*?)</div>#', '', $content);
@@ -117,7 +117,7 @@ 
 		$content = preg_replace('/((?:\?|&)sid=[a-z0-9]+)/', '', $content);
 
 		// Remove Comments from inline attachments [ia]
-		$content = preg_replace('#<dd>(.*?)</dd>#','',$content);
+		$content = preg_replace('#<dd>(.*?)</dd>#', '', $content);
 
 		// Replace some entities with their unicode counterpart
 		$entities = array(

event/feed.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 * @param \phpbb\db\driver\driver_interface		$db					Database connection
 	 * @param \phpbb\template\template				$template			Template object
 	 * @param \blitze\content\services\types		$content_types		Content types object
-	*/
+	 */
 	public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\template\template $template, \blitze\content\services\types $content_types)
 	{
 		$this->config = $config;

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 		$sql_ary = $event['sql_ary'];
 
 		$forum_ids = array_keys($this->content_types->get_forum_types());
-		$sql_ary['WHERE'] .= ' AND ' . $this->db->sql_in_set('f.forum_id', array_map('intval', $forum_ids), true);
+		$sql_ary['WHERE'] .= ' AND '.$this->db->sql_in_set('f.forum_id', array_map('intval', $forum_ids), true);
 
 		$event['sql_ary'] = $sql_ary;
 	}

services/form/field/color.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 	public function get_field_value(array $data)
 	{
 		$default = is_array($data['field_value']) ? $data['field_value'] : explode("\n", $data['field_value']);
-		$value =  $this->request->variable($data['field_name'], array(0 => ''));
+		$value = $this->request->variable($data['field_name'], array(0 => ''));
 		return $value ?: $default;
 	}
 
@@ -101,7 +101,7 @@ 
 	 */
 	protected function make_box($color)
 	{
-		$style = 'display: inline-block; width: 15px; height: 15px; border: 1 solid #fff; border-radius: 4px; background-color: ' . $color;
-		return ($color) ? '<div style="' . $style . '" title="' . $color . '"></div>' : '';
+		$style = 'display: inline-block; width: 15px; height: 15px; border: 1 solid #fff; border-radius: 4px; background-color: '.$color;
+		return ($color) ? '<div style="'.$style.'" title="'.$color.'"></div>' : '';
 	}
 }

services/form/builder.php

Spacing +6 added lines, -6 removed lines

@@ -147,7 +147,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;
@@ -200,13 +200,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;
 	}
@@ -402,8 +402,8 @@ 
 		}
 		else
 		{
-			$options[ITEM_UNAPPROVED]	= 'CONTENT_STATUS_DISAPPROVE';
-			$options[ITEM_APPROVED]		= 'CONTENT_STATUS_APPROVE';
+			$options[ITEM_UNAPPROVED] = 'CONTENT_STATUS_DISAPPROVE';
+			$options[ITEM_APPROVED] = 'CONTENT_STATUS_APPROVE';
 		}
 
 		return $options;

Braces +3 added lines, -6 removed lines

@@ -286,8 +286,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);
 		}
@@ -334,8 +333,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;
 		}
@@ -399,8 +397,7 @@ 
 		if ($visibility == ITEM_APPROVED)
 		{
 			$options[ITEM_REAPPROVE] = 'CONTENT_STATUS_REAPPROVE';
-		}
-		else
+		} else
 		{
 			$options[ITEM_UNAPPROVED]	= 'CONTENT_STATUS_DISAPPROVE';
 			$options[ITEM_APPROVED]		= 'CONTENT_STATUS_APPROVE';

services/actions/type/delete.php

Indentation +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 * @param \blitze\sitemaker\model\mapper_factory	$sitemaker_mapper_factory	Sitemaker Mapper factory object
 	 * @param bool										$auto_refresh				Used during testing
 	 * @param bool										$trigger_error				Used during testing
-	*/
+	 */
 	public function __construct(\phpbb\cache\driver\driver_interface $cache, \phpbb\language\language $language, \phpbb\log\log_interface $logger, \phpbb\request\request_interface $request, \phpbb\user $user, \blitze\content\services\types $content_types, \blitze\sitemaker\services\forum\manager $forum_manager, \blitze\content\model\mapper_factory $content_mapper_factory, \blitze\sitemaker\model\mapper_factory $sitemaker_mapper_factory, $auto_refresh = true, $trigger_error = true)
 	{
 		$this->cache = $cache;

services/actions/type/save.php

Braces +2 added lines, -4 removed lines

@@ -137,8 +137,7 @@ 
 			$unsaved_entity->set_content_id($entity->get_content_id());
 			$this->handle_langname_change($forum_id, $entity->get_content_langname(), $unsaved_entity->get_content_langname());
 			$this->copy_forum_permissions($forum_id, $forum_perm_from);
-		}
-		else
+		} else
 		{
 			$forum_id = $this->create_content_forum($unsaved_entity->get_content_langname(), $forum_perm_from);
 			$unsaved_entity->set_forum_id($forum_id);
@@ -210,8 +209,7 @@ 
 			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]=' . $entity->get_forum_id(), true);
 			$lang_key = 'CONTENT_TYPE_CREATED';
 			$message = $this->language->lang($lang_key, '<a href="' . $u_set_permission . '">', '</a>');
-		}
-		else
+		} else
 		{
 			$this->meta_refresh(3, $u_action);
 			$lang_key = 'CONTENT_TYPE_UPDATED';

Spacing +4 added lines, -4 removed lines

@@ -207,9 +207,9 @@ 
 	{
 		if (!$type)
 		{
-			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]=' . $entity->get_forum_id(), true);
+			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]='.$entity->get_forum_id(), true);
 			$lang_key = 'CONTENT_TYPE_CREATED';
-			$message = $this->language->lang($lang_key, '<a href="' . $u_set_permission . '">', '</a>');
+			$message = $this->language->lang($lang_key, '<a href="'.$u_set_permission.'">', '</a>');
 		}
 		else
 		{
@@ -226,7 +226,7 @@ 
 		}
 
 		$additional_data[] = $entity->get_content_langname();
-		$this->logger->add('admin', $this->user->data['user_id'], $this->user->ip, 'ACP_LOG_' . $lang_key, time(), $additional_data);
+		$this->logger->add('admin', $this->user->data['user_id'], $this->user->ip, 'ACP_LOG_'.$lang_key, time(), $additional_data);
 
 		$this->trigger_error($message, $u_action);
 	}
@@ -269,7 +269,7 @@ 
 		if ($old_langname !== $new_langname)
 		{
 			$forum_name = $this->language->lang($new_langname);
-			$sql = 'UPDATE ' . FORUMS_TABLE . " SET forum_name = '" . $this->db->sql_escape($forum_name) . "' WHERE forum_id = " . (int) $forum_id;
+			$sql = 'UPDATE '.FORUMS_TABLE." SET forum_name = '".$this->db->sql_escape($forum_name)."' WHERE forum_id = ".(int) $forum_id;
 			$this->db->sql_query($sql);
 		}
 	}

Indentation +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	 * @param string									$phpbb_admin_path       Relative admin root path
 	 * @param string									$php_ext				php file extension
 	 * @param boolean									$auto_refresh			Used for testing
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\cache\driver\driver_interface $cache, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher_interface $phpbb_dispatcher, \phpbb\language\language $language, \phpbb\log\log_interface $logger, \phpbb\request\request_interface $request, \phpbb\user $user, \blitze\content\services\types $content_types, \blitze\sitemaker\services\forum\manager $forum_manager, \blitze\content\model\mapper_factory $mapper_factory, $phpbb_admin_path, $php_ext, $auto_refresh = true)
 	{
 		$this->auth = $auth;

services/form/field/range.php

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
 			return '';
 		}
 
-		$callable = 'display_field_' . $data['field_props']['display'];
+		$callable = 'display_field_'.$data['field_props']['display'];
 		return $this->$callable($data);
 	}
 
@@ -125,7 +125,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'];
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	protected function set_prefix(&$item, $key, $prefix)
 	{
-		$item = $prefix . $item;
+		$item = $prefix.$item;
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 			),
 			'css'   => array(
 				'@blitze_content/vendor/ion.rangeSlider/css/ion.rangeSlider.min.css',
-				'@blitze_content/vendor/ion.rangeSlider/css/ion.rangeSlider.' . $theme . '.min.css',
+				'@blitze_content/vendor/ion.rangeSlider/css/ion.rangeSlider.'.$theme.'.min.css',
 			)
 		));
 	}

services/views/driver/base_view.php

Doc Comments +1 added lines

@@ -283,6 +283,7 @@
 
 	/**
 	 * {@inheritdoc}
+	 * @param integer $forum_id
 	 */
 	protected function get_filter_sql(array $filters, $forum_id)
 	{

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 * @param \blitze\content\services\helper					$helper					Content helper object
 	 * @param \blitze\content\services\quickmod					$quickmod				Quick moderator tools
 	 * @param \blitze\content\services\topic\blocks_factory		$topic_blocks_factory	Topic blocks factory 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)
 	{
 		$this->phpbb_dispatcher = $phpbb_dispatcher;

Spacing +3 added lines, -3 removed lines

@@ -139,7 +139,7 @@ 
 
 		foreach ($posts_data as $topic_id => $posts)
 		{
-			$post_data	= array_shift($posts);
+			$post_data = array_shift($posts);
 			$topic_data	= $topics_data[$topic_id];
 			$topic_data = array_merge(
 				$this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info),
@@ -253,8 +253,8 @@ 
 		$this->pagination->generate_template_pagination(
 			array(
 				'routes' => array(
-					'blitze_content_' . $route_type,
-					'blitze_content_' . $route_type . '_page',
+					'blitze_content_'.$route_type,
+					'blitze_content_'.$route_type.'_page',
 				),
 				'params' => $params,
 			),

services/actions/type/edit.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 * @param \phpbb\event\dispatcher_interface					$phpbb_dispatcher		Event dispatcher 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\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\topic\blocks_factory $topic_blocks_factory, \blitze\content\services\views\views_factory $views_factory, \phpbb\event\dispatcher_interface $phpbb_dispatcher, \blitze\content\services\types $content_types, \blitze\content\model\mapper_factory $mapper_factory)
 	{
 		parent::__construct($auth, $controller_helper, $language, $template, $user, $auto_lang, $fields_factory, $topic_blocks_factory, $views_factory);