blitze / phpBB-ext-sitemaker

controller/blocks_admin.php

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,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->user);
 		}

controller/menus_admin.php

Braces +2 added lines, -4 removed lines

@@ -58,12 +58,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->user);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			$return_data['message'] = $this->user->lang($e->getMessage());
 		}

blocks/login.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 				'title'		=> 'LOGIN',
 				'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);

Spacing +3 added lines, -3 removed lines

@@ -71,9 +71,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')), '?'), './../'))
 			));
 

services/tree/display.php

Braces +1 added lines, -2 removed lines

@@ -237,8 +237,7 @@
 			{
 				$padding .= $pad_with;
 				$padding_store[$row['parent_id']] = $padding;
-			}
-			else if ($row['left_id'] > $right + 1)
+			} else if ($row['left_id'] > $right + 1)
 			{
 				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
 			}

Indentation +7 added lines, -7 removed lines

@@ -33,13 +33,13 @@
 	protected $data = array();
 
 	/**
-	* Construct
-	*
-	* @param \phpbb\db\driver\driver_interface		$db             Database connection
-	* @param string									$items_table	Table name
-	* @param string									$pk				Primary key
-	* @param string									$sql_where		Column restriction
-	*/
+	 * Construct
+	 *
+	 * @param \phpbb\db\driver\driver_interface		$db             Database connection
+	 * @param string									$items_table	Table name
+	 * @param string									$pk				Primary key
+	 * @param string									$sql_where		Column restriction
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, $items_table, $pk, $sql_where = '')
 	{
 		$this->db = $db;

Spacing +11 added lines, -11 removed lines

@@ -78,7 +78,7 @@ 
 	{
 		$sql = "SELECT *
 			FROM $this->items_table
-			WHERE $this->pk = " . (int) $node_id ;
+			WHERE $this->pk = ".(int) $node_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
@@ -107,8 +107,8 @@ 
 					$this->items_table => ' t'
 				),
 				'WHERE'		=> array(
-					't.depth ' . (($level) ? " BETWEEN $start AND " . ($start + $level) : ' >= ' . $start),
-					(($this->sql_where) ? 't.' . $this->sql_where : ''),
+					't.depth '.(($level) ? " BETWEEN $start AND ".($start + $level) : ' >= '.$start),
+					(($this->sql_where) ? 't.'.$this->sql_where : ''),
 				),
 				'ORDER_BY'	=> 't.left_id ASC',
 			),
@@ -147,7 +147,7 @@ 
 	 * @param \phpbb\template\twig\twig $template
 	 * @param string $handle
 	 */
-	public function display_list(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
+	public function display_list(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
 	{
 		$prev_depth = 0;
 		$parental_depth = array(0 => -1);
@@ -156,10 +156,10 @@ 
 		for ($i = 0, $size = sizeof($data); $i < $size; $i++)
 		{
 			$row 		= $data[$i];
-			$this_depth	= $parental_depth[$row['parent_id']] + 1;
-			$repeat		= abs($prev_depth - $this_depth);
+			$this_depth = $parental_depth[$row['parent_id']] + 1;
+			$repeat = abs($prev_depth - $this_depth);
 
-			$tpl_data	= array(
+			$tpl_data = array(
 				'PREV_DEPTH'	=> $prev_depth,
 				'THIS_DEPTH'	=> $this_depth,
 				'NUM_KIDS'		=> $this->count_descendants($row),
@@ -169,7 +169,7 @@ 
 
 			for ($j = 0; $j < $repeat; $j++)
 			{
-				$template->assign_block_vars($handle . '.close', array());
+				$template->assign_block_vars($handle.'.close', array());
 			}
 
 			$prev_depth = $this_depth;
@@ -178,7 +178,7 @@ 
 
 		for ($i = 0; $i < $prev_depth; $i++)
 		{
-			$template->assign_block_vars('close_' . $handle, array());
+			$template->assign_block_vars('close_'.$handle, array());
 		}
 	}
 
@@ -217,10 +217,10 @@ 
 			}
 
 			$right = $row['right_id'];
-			$title = $padding . '&#x251c;&#x2500; ' . $row[$title_column];
+			$title = $padding.'&#x251c;&#x2500; '.$row[$title_column];
 			$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
 
-			$return_options .= '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
+			$return_options .= '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
 			$return_data[$row[$this->pk]] = $title;
 		}
 

services/blocks/action/add_block.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,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/action/save_blocks.php

Braces +2 added lines, -4 removed lines

@@ -50,8 +50,7 @@ 
 		if (!empty($collection))
 		{
 			return $collection->get_entities();
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -88,8 +87,7 @@ 
 		if (!$has_blocks && !$hiding_blocks && !sizeof($ex_positions))
 		{
 			$this->route_mapper->delete($route);
-		}
-		else
+		} else
 		{
 			$route->set_has_blocks($has_blocks);
 			$this->route_mapper->save($route);

services/blocks/display.php

Braces +3 added lines, -6 removed lines

@@ -135,8 +135,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'];
 		}
@@ -172,8 +171,7 @@ 
 				self::SHOW_BLOCK_LANDING	=> true,
 				self::SHOW_BLOCK_SUBPAGE	=> false,
 			);
-		}
-		else
+		} else
 		{
 			$modes = array(
 				self::SHOW_BLOCK_BOTH		=> true,
@@ -200,8 +198,7 @@ 
 			}
 
 			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'style')), '?'), './../'), 'edit_mode=' . (($edit_mode) ? 0 : 1));
-		}
-		else
+		} else
 		{
 			$edit_mode = false;
 		}

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,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'], './');
 			$route_info = $blocks->get_route_info($current_route, $this->user->page['page_dir'], $style_id, $edit_mode);
 
 			$display_modes = $this->get_display_modes($route_info['is_sub_route']);
@@ -114,7 +114,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'))
 		{
@@ -170,7 +170,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
 		{

services/url_checker.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 			$headers = $headers[0];
 		}
 
-		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 (is_array($message))
 		{
 			$this->message = (string) $message[0];
-		}
-		else
+		} else
 		{
 			$this->message = $message;
 		}

model/blocks/entity/block.php

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 		if (!is_array($settings))
 		{
 			$this->settings = $settings;
-		}
-		else if (sizeof($settings))
+		} else if (sizeof($settings))
 		{
 			$this->settings = serialize($settings);
 			$this->hash = md5($this->settings);

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 	 */
 	public function set_class($class)
 	{
-		$this->class = ($class) ? ' ' . $class : '';
+		$this->class = ($class) ? ' '.$class : '';
 		return $this;
 	}