blitze / phpBB-ext-sitemaker_content

services/form/field/choice.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
 		$this->ptemplate->assign_vars(array_change_key_case($data, CASE_UPPER));
 
-		return $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field . '_field');
+		return $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field.'_field');
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 		foreach ($data['field_settings']['field_options'] as $value => $label)
 		{
 			$this->ptemplate->assign_block_vars('option', array(
-				'ID'		=> 'field-'. $name . '-' . $count,
+				'ID'		=> 'field-'.$name.'-'.$count,
 				'LABEL'		=> $this->language->lang($label),
 				'SELECTED'	=> (in_array($value, $selected, true)) ? true : false,
 				'VALUE'		=> $value

services/form/field/image.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 		$value = $this->request->variable($name, $value);
 		$value = $this->get_image_src($value);
 
-		return ($value) ? '[img]' . $value . '[/img]' : '';
+		return ($value) ? '[img]'.$value.'[/img]' : '';
 	}
 
 	/**
@@ -34,7 +34,7 @@ 
 		$data['field_value'] = $this->get_image_src($bbcode_value);
 
 		$this->ptemplate->assign_vars(array_change_key_case($data, CASE_UPPER));
-		$field = $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field . '_field');
+		$field = $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field.'_field');
 
 		$data['field_value'] = $bbcode_value;
 
@@ -46,7 +46,7 @@ 
 	 */
 	public function display_field($value)
 	{
-		return ($value) ? '<div class="img-ui">' . $value . '</div>' : '';
+		return ($value) ? '<div class="img-ui">'.$value.'</div>' : '';
 	}
 
 	/**

services/action_handler.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 */
 	public function create($mode, $action)
 	{
-		$service_name = 'blitze.content.actions.' . $mode . '.' . $action;
+		$service_name = 'blitze.content.actions.'.$mode.'.'.$action;
 		if (!$this->phpbb_container->has($service_name))
 		{
 			throw new \blitze\sitemaker\exception\out_of_bounds(array($action, 'INVALID_REQUEST'));

services/actions/topic/view.php

Spacing +2 added lines, -2 removed lines

@@ -65,14 +65,14 @@
 		$entity->set_allow_comments(false);
 
 		$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);
 		}
 
 		$update_count = array();

services/actions/topic/filter.php

Spacing +10 added lines, -10 removed lines

@@ -88,7 +88,7 @@ 
 	{
 		$copy_params = $this->params;
 		unset($copy_params['type']);
-		$view_url = $u_action . http_build_query($copy_params);
+		$view_url = $u_action.http_build_query($copy_params);
 
 		$this->template->assign_block_vars('content', array(
 			'TITLE'			=> $this->language->lang('TOPIC_ALL'),
@@ -104,7 +104,7 @@ 
 				'TITLE'			=> $entity->get_content_langname(),
 				'COLOUR'		=> $entity->get_content_colour(),
 				'S_SELECTED'	=> ($type === $content_name) ? true : false,
-				'U_VIEW'		=> $view_url . '&type=' . $content_name
+				'U_VIEW'		=> $view_url.'&type='.$content_name
 			));
 		}
 	}
@@ -134,7 +134,7 @@ 
 	{
 		$copy_params = $this->params;
 		unset($copy_params['status']);
-		$view_url = $u_action . http_build_query($copy_params);
+		$view_url = $u_action.http_build_query($copy_params);
 
 		$this->template->assign_block_vars('status', array(
 			'TITLE'			=> $this->language->lang('TOPIC_ALL'),
@@ -146,9 +146,9 @@ 
 		foreach ($topic_status_ary as $status)
 		{
 			$this->template->assign_block_vars('status', array(
-				'TITLE'			=> $this->language->lang('TOPIC_' . strtoupper($status)),
+				'TITLE'			=> $this->language->lang('TOPIC_'.strtoupper($status)),
 				'S_SELECTED'	=> ($status === $topic_status) ? true : false,
-				'U_VIEW'		=> $view_url . '&status=' . $status
+				'U_VIEW'		=> $view_url.'&status='.$status
 			));
 		}
 	}
@@ -163,18 +163,18 @@ 
 		switch ($topic_status)
 		{
 			case 'scheduled':
-				$sql_where_array[] = 't.topic_time > ' . time();
+				$sql_where_array[] = 't.topic_time > '.time();
 			break;
 			case 'unapproved':
 			case 'published':
 			case 'deleted':
-				$sql_where_array[] = 't.topic_visibility = ' . array_search($topic_status, $this->filter_topic_status_ary);
+				$sql_where_array[] = 't.topic_visibility = '.array_search($topic_status, $this->filter_topic_status_ary);
 			break;
 			case 'recommended':
 			case 'featured':
 			case 'must_read':
-				$sql_where_array[] = 't.topic_type = ' . array_search($topic_status, $this->filter_topic_types_ary);
-				$sql_where_array[] = 't.topic_visibility = ' . ITEM_APPROVED;
+				$sql_where_array[] = 't.topic_type = '.array_search($topic_status, $this->filter_topic_types_ary);
+				$sql_where_array[] = 't.topic_visibility = '.ITEM_APPROVED;
 			break;
 		}
 	}
@@ -188,7 +188,7 @@ 
 		if ($keyword = $this->request->variable('keyword', '', true))
 		{
 			$this->params['keyword'] = $keyword;
-			$sql_where_array[] = 't.topic_title ' . $this->db->sql_like_expression($this->db->get_any_char() . $keyword . $this->db->get_any_char());
+			$sql_where_array[] = 't.topic_title '.$this->db->sql_like_expression($this->db->get_any_char().$keyword.$this->db->get_any_char());
 		}
 	}
 }

services/actions/type/edit.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 			$this->template->assign_block_vars('field', array_merge(
 				array_change_key_case($entity->to_array(), CASE_UPPER),
 				array(
-					'TOKEN'			=> '{' . strtoupper($entity->get_field_name()) . '}',
+					'TOKEN'			=> '{'.strtoupper($entity->get_field_name()).'}',
 					'TYPE_LABEL'	=> $this->language->lang($object->get_langname()),
 					'DEFAULT_TYPE'	=> $this->get_field_type($entity->get_field_type(), $object->get_default_props()),
 					'FIELD_EXPLAIN'	=> $explain['text'],

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * @param \blitze\content\services\form\fields_factory		$fields_factory			Fields factory  object
 	 * @param \blitze\content\model\mapper_factory				$mapper_factory			Mapper factory object
 	 * @param \blitze\content\services\views\views_factory		$views_factory			Views factory object
-	*/
+	 */
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \blitze\sitemaker\services\auto_lang $auto_lang, \blitze\content\services\types $content_types, \blitze\content\services\form\fields_factory $fields_factory, \blitze\content\model\mapper_factory $mapper_factory, \blitze\content\services\views\views_factory $views_factory)
 	{
 		parent::__construct($auth, $language, $template, $user, $auto_lang, $fields_factory, $views_factory);

services/actions/type/save.php

Doc Comments +1 added lines, -1 removed lines

@@ -300,7 +300,7 @@
 	/**
 	 * @param string $field
 	 * @param array $fields_settings
-	 * @param array $fields_options
+	 * @param array $field_options
 	 * @param array $fields_defaults
 	 * @return array
 	 */

Indentation +1 added lines, -1 removed lines

@@ -62,7 +62,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\language\language $language, \phpbb\request\request_interface $request, \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;

Spacing +4 added lines, -4 removed lines

@@ -108,7 +108,7 @@ 
 	 * @param \blitze\content\model\entity\type $unsaved_entity
 	 * @return void
 	 */
-	protected function handle_content_type($type, \blitze\content\model\entity\type &$unsaved_entity)
+	protected function handle_content_type($type, \blitze\content\model\entity\type & $unsaved_entity)
 	{
 		$forum_perm_from = $this->request->variable('copy_forum_perm', 0);
 
@@ -187,8 +187,8 @@ 
 	{
 		if (!$type)
 		{
-			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]=' . $forum_id, true);
-			$message = $this->language->lang('CONTENT_TYPE_CREATED', '<a href="' . $u_set_permission . '">', '</a>');
+			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]='.$forum_id, true);
+			$message = $this->language->lang('CONTENT_TYPE_CREATED', '<a href="'.$u_set_permission.'">', '</a>');
 		}
 		else
 		{
@@ -237,7 +237,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);
 		}
 	}

Braces +2 added lines, -4 removed lines

@@ -121,8 +121,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);
@@ -189,8 +188,7 @@ 
 		{
 			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]=' . $forum_id, true);
 			$message = $this->language->lang('CONTENT_TYPE_CREATED', '<a href="' . $u_set_permission . '">', '</a>');
-		}
-		else
+		} else
 		{
 			$this->meta_refresh(3, $u_action);
 			$message = $this->language->lang('CONTENT_TYPE_UPDATED');

services/actions/type/delete.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,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\request\request_interface $request, \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/add.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,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\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

@@ -77,7 +77,7 @@ 
 			'POST_DATE'			=> $this->user->format_date(time()),
 			'ITEMS_PER_PAGE'	=> 10,
 			'TOPICS_PER_GROUP'	=> 4,
-			'U_ACTION'			=> $u_action . "&do=save&type=$type",
+			'U_ACTION'			=> $u_action."&do=save&type=$type",
 
 			'S_TYPE_OPS'				=> $this->get_field_options(),
 			'S_FORUM_OPTIONS'			=> make_forum_select(false, $forum_id, true, false, false),
@@ -115,7 +115,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;