blitze / phpBB-ext-sitemaker

blocks/custom.php

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
 		$content = $this->request->variable('content', '', true);
 		$cblocks = $this->get_custom_blocks();
 
-		$sql_data =	$this->get_default_fields($block_id);
+		$sql_data = $this->get_default_fields($block_id);
 		$sql_data['block_content'] = $content;
 
 		generate_text_for_storage($sql_data['block_content'], $sql_data['bbcode_uid'], $sql_data['bbcode_bitfield'], $sql_data['bbcode_options'], true, true, true);
@@ -149,11 +149,11 @@ 
 	{
 		if (!$block_exists)
 		{
-			$sql = 'INSERT INTO ' . $this->cblocks_table . ' ' . $this->db->sql_build_array('INSERT', $sql_data);
+			$sql = 'INSERT INTO '.$this->cblocks_table.' '.$this->db->sql_build_array('INSERT', $sql_data);
 		}
 		else
 		{
-			$sql = 'UPDATE ' . $this->cblocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE block_id = ' . (int) $sql_data['block_id'];
+			$sql = 'UPDATE '.$this->cblocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE block_id = '.(int) $sql_data['block_id'];
 		}
 		$this->db->sql_query($sql);
 		$this->cache->destroy('sm_cblocks');
@@ -173,7 +173,7 @@ 
 
 			$block_is_active = $status;
 			$status = ($content && $status) ? true : false;
-			$content = '<div id="block-editor-' . $cblock['block_id'] . '" class="editable editable-block" data-service="blitze.sitemaker.block.custom" data-method="edit" data-raw="' . $cblock['block_content'] . '" data-active="' . $block_is_active . '">' . $content . '</div>';
+			$content = '<div id="block-editor-'.$cblock['block_id'].'" class="editable editable-block" data-service="blitze.sitemaker.block.custom" data-method="edit" data-raw="'.$cblock['block_content'].'" data-active="'.$block_is_active.'">'.$content.'</div>';
 		}
 	}
 

Braces +1 added lines, -2 removed lines

@@ -150,8 +150,7 @@
 		if (!$block_exists)
 		{
 			$sql = 'INSERT INTO ' . $this->cblocks_table . ' ' . $this->db->sql_build_array('INSERT', $sql_data);
-		}
-		else
+		} else
 		{
 			$sql = 'UPDATE ' . $this->cblocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE block_id = ' . (int) $sql_data['block_id'];
 		}

model/base_collection.php

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 		{
 			$this->entities = array_filter(
 				$this->entities,
-				function ($v) use ($key)
+				function($v) use ($key)
 				{
 					return $v !== $key;
 				}

Braces +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
 			if (!isset($key))
 			{
 				$this->entities[] = $entity;
-			}
-			else
+			} else
 			{
 				$this->entities[$key] = $entity;
 			}

model/mapper/blocks.php

Spacing +10 added lines, -10 removed lines

@@ -25,8 +25,8 @@ 
 	 */
 	protected function find_sql(array $sql_where)
 	{
-		return 'SELECT * FROM ' . $this->entity_table .
-			((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . '
+		return 'SELECT * FROM '.$this->entity_table.
+			((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').'
 			ORDER BY position, weight ASC';
 	}
 
@@ -40,12 +40,12 @@ 
 		// move blocks up for position
 		if ($condition instanceof $this->entity_class)
 		{
-			$this->db->sql_query('UPDATE ' . $this->entity_table . '
+			$this->db->sql_query('UPDATE '.$this->entity_table.'
 				SET weight = weight - 1
-				WHERE weight > ' . (int) $condition->get_weight() . '
-					AND style = ' . (int) $condition->get_style() . '
-					AND route_id = ' . (int) $condition->get_route_id() . "
-					AND position = '" . $this->db->sql_escape($condition->get_position()) . "'");
+				WHERE weight > ' . (int) $condition->get_weight().'
+					AND style = ' . (int) $condition->get_style().'
+					AND route_id = ' . (int) $condition->get_route_id()."
+					AND position = '" . $this->db->sql_escape($condition->get_position())."'");
 		}
 	}
 
@@ -65,10 +65,10 @@ 
 	protected function move_blocks_down(\blitze\sitemaker\model\entity_interface $entity)
 	{
 		/** @type \blitze\sitemaker\model\entity\block $entity */
-		$sql = 'UPDATE ' . $this->entity_table . '
+		$sql = 'UPDATE '.$this->entity_table.'
 			SET weight = weight + 1
-			WHERE weight >= ' . (int) $entity->get_weight() . '
-				AND route_id = ' . (int) $entity->get_route_id() . '
+			WHERE weight >= ' . (int) $entity->get_weight().'
+				AND route_id = ' . (int) $entity->get_route_id().'
 				AND style = ' . (int) $entity->get_style();
 		$this->db->sql_query($sql);
 	}

model/base_mapper.php

Spacing +14 added lines, -14 removed lines

@@ -85,7 +85,7 @@ 
 	 */
 	public function save(\blitze\sitemaker\model\entity_interface $entity)
 	{
-		$accessor = 'get_' . $this->entity_pkey;
+		$accessor = 'get_'.$this->entity_pkey;
 		if (is_null($entity->$accessor()))
 		{
 			$entity = $this->insert($entity);
@@ -107,7 +107,7 @@ 
 		{
 			if ($condition instanceof $this->entity_class)
 			{
-				$accessor = 'get_' . $this->entity_pkey;
+				$accessor = 'get_'.$this->entity_pkey;
 				$condition = array($this->entity_pkey, '=', $condition->$accessor());
 			}
 			else
@@ -117,7 +117,7 @@ 
 		}
 
 		$sql_where = $this->get_sql_condition($condition);
-		$this->db->sql_query('DELETE FROM ' . $this->entity_table . (sizeof($sql_where) ? ' WHERE ' . join(' AND ', $sql_where) : ''));
+		$this->db->sql_query('DELETE FROM '.$this->entity_table.(sizeof($sql_where) ? ' WHERE '.join(' AND ', $sql_where) : ''));
 	}
 
 	/**
@@ -136,9 +136,9 @@ 
 	 */
 	protected function insert(\blitze\sitemaker\model\entity_interface $entity)
 	{
-		$this->db->sql_query('INSERT INTO ' . $this->entity_table . ' ' . $this->db->sql_build_array('INSERT', $entity->to_db()));
+		$this->db->sql_query('INSERT INTO '.$this->entity_table.' '.$this->db->sql_build_array('INSERT', $entity->to_db()));
 
-		$mutator = 'set_' . $this->entity_pkey;
+		$mutator = 'set_'.$this->entity_pkey;
 		$entity->$mutator((int) $this->db->sql_nextid());
 
 		return $entity;
@@ -152,11 +152,11 @@ 
 	 */
 	protected function update(\blitze\sitemaker\model\entity_interface $entity)
 	{
-		$accessor = 'get_' . $this->entity_pkey;
+		$accessor = 'get_'.$this->entity_pkey;
 
-		return $this->db->sql_query('UPDATE ' . $this->entity_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $entity->to_db()) . '
-			WHERE ' . $this->entity_pkey . ' = ' . (int) $entity->$accessor());
+		return $this->db->sql_query('UPDATE '.$this->entity_table.'
+			SET ' . $this->db->sql_build_array('UPDATE', $entity->to_db()).'
+			WHERE ' . $this->entity_pkey.' = '.(int) $entity->$accessor());
 	}
 
 	/**
@@ -165,8 +165,8 @@ 
 	 */
 	protected function find_sql(array $sql_where)
 	{
-		return 'SELECT * FROM ' . $this->entity_table .
-			(sizeof($sql_where) ? ' WHERE ' . join(' AND ', $sql_where) : '');
+		return 'SELECT * FROM '.$this->entity_table.
+			(sizeof($sql_where) ? ' WHERE '.join(' AND ', $sql_where) : '');
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 		{
 			list($field, $operator, $value) = $info;
 
-			$callable = 'get_sql_where_' . gettype($value);
+			$callable = 'get_sql_where_'.gettype($value);
 			$sql_where[] = $this->$callable($field, $value, $operator);
 		}
 
@@ -223,7 +223,7 @@ 
 	 */
 	protected function get_sql_where_string($field, $value, $operator)
 	{
-		return $field . " $operator '" . $this->db->sql_escape($value) . "'";
+		return $field." $operator '".$this->db->sql_escape($value)."'";
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 */
 	protected function get_sql_where_integer($field, $value, $operator)
 	{
-		return $field . " $operator " . (int) $value;
+		return $field." $operator ".(int) $value;
 	}
 
 	/**

Braces +2 added lines, -4 removed lines

@@ -89,8 +89,7 @@ 
 		if (is_null($entity->$accessor()))
 		{
 			$entity = $this->insert($entity);
-		}
-		else
+		} else
 		{
 			$this->update($entity);
 		}
@@ -109,8 +108,7 @@ 
 			{
 				$accessor = 'get_' . $this->entity_pkey;
 				$condition = array($this->entity_pkey, '=', $condition->$accessor());
-			}
-			else
+			} else
 			{
 				throw new \blitze\sitemaker\exception\invalid_argument(array('entity', 'INVALID_ENTITY'));
 			}

acp/settings_module.php

Spacing +6 added lines, -6 removed lines

@@ -135,7 +135,7 @@ 
 			$this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
 			$this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
 
-			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
 		}
 	}
 
@@ -147,7 +147,7 @@ 
 	{
 		$style_prefs = (array) json_decode($this->config_text->get('sm_layout_prefs'), true);
 
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
 
 		$styles = array();
 		while ($row = $this->db->sql_fetchrow($result))
@@ -201,7 +201,7 @@ 
 		foreach ($layouts as $name => $path)
 		{
 			$selected = ($path == $pref) ? ' selected="selected"' : '';
-			$options .= '<option value="' . $path . '"' . $selected . '>' . $this->translator->lang('LAYOUT_' . strtoupper($name)) . '</option>';
+			$options .= '<option value="'.$path.'"'.$selected.'>'.$this->translator->lang('LAYOUT_'.strtoupper($name)).'</option>';
 		}
 
 		return $options;
@@ -215,11 +215,11 @@ 
 	{
 		$views = array('basic', 'boxed', 'simple');
 
-		$options = '<option value="">' . $this->translator->lang('BLOCK_VIEW_DEFAULT') . '</option>';
+		$options = '<option value="">'.$this->translator->lang('BLOCK_VIEW_DEFAULT').'</option>';
 		foreach ($views as $view)
 		{
 			$selected = ($view == $pref) ? ' selected="selected"' : '';
-			$options .= '<option value="' . $view . '"' . $selected . '>' . $this->translator->lang('BLOCK_VIEW_' . strtoupper($view)) . '</option>';
+			$options .= '<option value="'.$view.'"'.$selected.'>'.$this->translator->lang('BLOCK_VIEW_'.strtoupper($view)).'</option>';
 		}
 
 		return $options;
@@ -261,7 +261,7 @@ 
 			$path = dirname($path);
 			$name = basename($path);
 
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
 		}
 		ksort($layouts);
 

controller/blocks_admin.php

Braces +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
 			$return_data = $command->execute($style_id);
 
 			$this->action_handler->clear_cache();
-		}
-		catch (\blitze\sitemaker\exception\base $e)
+		} catch (\blitze\sitemaker\exception\base $e)
 		{
 			$json_data['message'] = $e->get_message($this->translator);
 		}

controller/menus_admin.php

Braces +2 added lines, -4 removed lines

@@ -63,12 +63,10 @@
 			$return_data = $command->execute();
 
 			$this->action_handler->clear_cache();
-		}
-		catch (\blitze\sitemaker\exception\base $e)
+		} catch (\blitze\sitemaker\exception\base $e)
 		{
 			$return_data['message'] = $e->get_message($this->translator);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			$return_data['message'] = $this->translator->lang($e->getMessage());
 		}

blocks/forum_topics.php

Spacing +5 added lines, -5 removed lines

@@ -108,7 +108,7 @@ 
 	{
 		$this->set_display_fields();
 
-		$view = 'S_' . strtoupper($this->settings['template']);
+		$view = 'S_'.strtoupper($this->settings['template']);
 		$post_data = $this->get_post_data($topic_data);
 		$topic_data = array_values($topic_data);
 
@@ -156,10 +156,10 @@ 
 				'VIEWS'				=> (int) $row['topic_views'],
 				'S_UNREAD_TOPIC'	=> $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']),
 
-				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"),
-				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"),
-				'U_NEW_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&view=unread") . '#unread',
-				'U_LAST_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&p=" . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
+				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"),
+				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"),
+				'U_NEW_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&view=unread").'#unread',
+				'U_LAST_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&p=".$row['topic_last_post_id']).'#p'.$row['topic_last_post_id'],
 			));
 			unset($topic_data[$i], $post_data[$topic_id]);
 		}

Braces +2 added lines, -4 removed lines

@@ -257,8 +257,7 @@ 
 		if ($this->settings['context'] && $this->settings['preview_chars'])
 		{
 			$post_data = $this->forum_data->get_post_data($this->settings['context']);
-		}
-		else
+		} else
 		{
 			$post_data = array_fill_keys(array_keys($topic_data), array(array('post_text' => '', 'bbcode_uid' => '', 'bbcode_bitfield' => '')));
 		}
@@ -277,8 +276,7 @@ 
 			$this->fields['user_id'] = 'topic_last_poster_id';
 
 			$this->ptemplate->assign_var('L_POST_BY_AUTHOR', $this->translator->lang('LAST_POST_BY_AUTHOR'));
-		}
-		else
+		} else
 		{
 			$this->fields['time'] = 'topic_time';
 			$this->fields['user_id'] = 'topic_poster';

blocks/whats_new.php

Braces +2 added lines, -4 removed lines

@@ -72,8 +72,7 @@ 
 				'title'		=> '',
 				'content'	=> '',
 			);
-		}
-		else
+		} else
 		{
 			$this->fetch_new($bdata['settings']);
 
@@ -117,8 +116,7 @@ 
 		{
 			$sorting = 't.topic_last_post_time';
 			$sql_array = $this->get_topics_sql();
-		}
-		else
+		} else
 		{
 			$sorting = 'p.post_time';
 			$sql_array = $this->get_posts_sql();

Spacing +3 added lines, -3 removed lines

@@ -94,7 +94,7 @@ 
 
 			$this->ptemplate->assign_block_vars('topicrow', array(
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"),
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"),
 			));
 			unset($topic_data[$i]);
 		}
@@ -135,7 +135,7 @@ 
 	{
 		return array(
 			'WHERE'		=> array(
-				't.topic_last_post_time > ' . (int) $this->user->data['user_lastvisit'],
+				't.topic_last_post_time > '.(int) $this->user->data['user_lastvisit'],
 				't.topic_moved_id = 0',
 			),
 		);
@@ -151,7 +151,7 @@ 
 				POSTS_TABLE		=> 'p',
 			),
 			'WHERE'		=> array(
-				't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'],
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
 			),
 		);
 	}