blitze / phpBB-ext-sitemaker

blocks/login.php

Spacing +4 added lines, -4 removed lines

@@ -77,9 +77,9 @@ 
 			$this->ptemplate->assign_vars(array(
 				'S_SHOW_HIDE_ME'		=> ($settings['show_hide_me']) ? true : false,
 				'S_AUTOLOGIN_ENABLED'   => ($settings['allow_autologin']) ? true : false,
-				'S_LOGIN_ACTION'		=> append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=login'),
-				'U_REGISTER'			=> append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=register'),
-				'U_SEND_PASSWORD'		=> append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=sendpassword'),
+				'S_LOGIN_ACTION'		=> append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=login'),
+				'U_REGISTER'			=> append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=register'),
+				'U_SEND_PASSWORD'		=> append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=sendpassword'),
 				'U_REDIRECT'			=> reapply_sid(ltrim(rtrim(build_url(array('edit_mode')), '?'), './../'))
 			));
 
@@ -104,7 +104,7 @@ 
 	private function hide_quicklogin()
 	{
 		$current_page = $this->user->page['page_name'];
-		if ($current_page === 'index.' . $this->php_ext)
+		if ($current_page === 'index.'.$this->php_ext)
 		{
 			$this->template->assign_var('S_USER_LOGGED_IN', true);
 		}

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
 			));
 
 			$content = $this->ptemplate->render_view('blitze/sitemaker', 'blocks/login.html', 'login_block');
-		}
-		else if ($settings['show_member_menu'])
+		} else if ($settings['show_member_menu'])
 		{
 			$block = $this->phpbb_container->get('blitze.sitemaker.block.member_menu');
 			$block->set_template($this->ptemplate);

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/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'));
 			}

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'],
 			),
 		);
 	}

services/poll.php

Braces +1 added lines, -2 removed lines

@@ -303,8 +303,7 @@
 				$cur_voted_id[] = $row['poll_option_id'];
 			}
 			$this->db->sql_freeresult($result);
-		}
-		else
+		} else
 		{
 			// Cookie based guest tracking ... I don't like this but hum ho
 			// it's oft requested. This relies on "nice" users who don't feel

Spacing +8 added lines, -8 removed lines

@@ -63,7 +63,7 @@ 
 	 * @param array $topic_data
 	 * @param \phpbb\template\twig\twig $template
 	 */
-	public function build(array $topic_data, \phpbb\template\twig\twig &$template)
+	public function build(array $topic_data, \phpbb\template\twig\twig & $template)
 	{
 		$this->user->add_lang('viewtopic');
 
@@ -95,7 +95,7 @@ 
 			'S_POLL_ACTION'		=> $viewtopic_url,
 			'S_FORM_TOKEN'		=> $this->sitemaker->get_form_key('posting'),
 
-			'U_VIEW_RESULTS'	=> $viewtopic_url . '&view=viewpoll',
+			'U_VIEW_RESULTS'	=> $viewtopic_url.'&view=viewpoll',
 		));
 	}
 
@@ -127,7 +127,7 @@ 
 		$post_id = (int) $topic_data['topic_first_post_id'];
 
 		$sql = 'SELECT o.*, p.bbcode_bitfield, p.bbcode_uid
-			FROM ' . POLL_OPTIONS_TABLE . ' o, ' . POSTS_TABLE . " p
+			FROM ' . POLL_OPTIONS_TABLE.' o, '.POSTS_TABLE." p
 			WHERE o.topic_id = $topic_id
 				AND p.post_id = $post_id
 				AND p.topic_id = o.topic_id
@@ -172,7 +172,7 @@ 
 	 * @param int $poll_most
 	 * @param \phpbb\template\twig\twig $template
 	 */
-	private function _build_poll_options(array $cur_voted_id, array $poll_info, $poll_total, $poll_most, \phpbb\template\twig\twig &$template)
+	private function _build_poll_options(array $cur_voted_id, array $poll_info, $poll_total, $poll_most, \phpbb\template\twig\twig & $template)
 	{
 		foreach ($poll_info as $poll_option)
 		{
@@ -203,8 +203,8 @@ 
 		if ($this->user->data['is_registered'])
 		{
 			$sql = 'SELECT poll_option_id
-			FROM ' . POLL_VOTES_TABLE . '
-			WHERE topic_id = ' . (int) $topic_id . '
+			FROM ' . POLL_VOTES_TABLE.'
+			WHERE topic_id = ' . (int) $topic_id.'
 				AND vote_user_id = ' . (int) $this->user->data['user_id'];
 			$result = $this->db->sql_query($sql);
 
@@ -219,9 +219,9 @@ 
 			// Cookie based guest tracking ... I don't like this but hum ho
 			// it's oft requested. This relies on "nice" users who don't feel
 			// the need to delete cookies to mess with results.
-			if ($this->request->is_set($this->config['cookie_name'] . '_poll_' . $topic_id, \phpbb\request\request_interface::COOKIE))
+			if ($this->request->is_set($this->config['cookie_name'].'_poll_'.$topic_id, \phpbb\request\request_interface::COOKIE))
 			{
-				$cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'] . '_poll_' . $topic_id, '', true, \phpbb\request\request_interface::COOKIE));
+				$cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'].'_poll_'.$topic_id, '', true, \phpbb\request\request_interface::COOKIE));
 				$cur_voted_id = array_map('intval', $cur_voted_id);
 			}
 		}

services/blocks/action/add_block.php

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
 	 */
 	public function execute($style_id)
 	{
-		$name	= $this->request->variable('block', '');
-		$route	= $this->request->variable('route', '');
+		$name = $this->request->variable('block', '');
+		$route = $this->request->variable('route', '');
 
 		if (($block_instance = $this->block_factory->get_block($name)) === null)
 		{

services/blocks/display.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 		{
 			$edit_mode = $this->toggle_edit_mode();
 			$style_id = $this->get_style_id();
-			$current_route = ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
+			$current_route = ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
 
 			$this->show_sitemaker($current_route, $this->user->page['page_dir'], $style_id, $edit_mode);
 		}
@@ -107,7 +107,7 @@ 
 	 */
 	protected function toggle_edit_mode()
 	{
-		$edit_mode = $this->request->variable($this->config['cookie_name'] . '_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE);
+		$edit_mode = $this->request->variable($this->config['cookie_name'].'_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE);
 
 		if ($this->request->is_set('edit_mode'))
 		{
@@ -163,7 +163,7 @@ 
 				);
 			}
 
-			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode=' . (int) !$edit_mode);
+			$u_edit_mode = append_sid(generate_board_url().'/'.ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode='.(int) !$edit_mode);
 		}
 		else
 		{

Braces +3 added lines, -6 removed lines

@@ -86,8 +86,7 @@ 
 		if ($this->request->is_set('style'))
 		{
 			return $this->request->variable('style', 0);
-		}
-		else
+		} else
 		{
 			return (!$this->config['override_user_style']) ? $this->user->data['user_style'] : $this->config['default_style'];
 		}
@@ -131,8 +130,7 @@ 
 				self::SHOW_ON_PARENT_ROUTE_ONLY	=> true,
 				self::SHOW_ON_CHILD_ROUTE_ONLY	=> false,
 			);
-		}
-		else
+		} else
 		{
 			$modes = array(
 				self::SHOW_ON_ALL_ROUTES		=> true,
@@ -164,8 +162,7 @@ 
 			}
 
 			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode=' . (int) !$edit_mode);
-		}
-		else
+		} else
 		{
 			$edit_mode = false;
 		}

services/url_checker.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 		$status = array();
 		$headers = $this->get_headers($url, $curl);
 
-		preg_match('/HTTP\/.* ([0-9]+) .*/', $headers , $status);
+		preg_match('/HTTP\/.* ([0-9]+) .*/', $headers, $status);
 
 		return ($status[1] == 200) ? true : false;
 	}

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		if (extension_loaded('curl') && $curl)
 		{
 			$headers = $this->curl_header($url);
-		}
-		else
+		} else
 		{
 			$headers = get_headers($url);
 			$headers = $headers[0];