blitze / phpBB-ext-sitemaker

services/blocks/action/base_action.php

Braces +1 added lines, -2 removed lines

@@ -144,8 +144,7 @@
 		{
 			$content = $this->translator->lang('BLOCK_NO_DATA');
 			$returned_data['status'] = 0;
-		}
-		else
+		} else
 		{
 			$content = $returned_data['content'];
 		}

services/blocks/action/save_blocks.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
 		if (!$has_blocks && !$this->route_is_customized($entity->to_array()))
 		{
 			$this->route_mapper->delete($entity);
-		}
-		else
+		} else
 		{
 			$entity->set_has_blocks($has_blocks);
 			$this->route_mapper->save($entity);

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/blocks.php

Braces +1 added lines, -2 removed lines

@@ -154,8 +154,7 @@
 		if (!empty($returned_data['content']))
 		{
 			$content = $returned_data['content'];
-		}
-		else if ($edit_mode)
+		} else if ($edit_mode)
 		{
 			$returned_data['status'] = 0;
 			$content = $this->translator->lang('BLOCK_NO_DATA');

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 	 * @param string $position
 	 * @param array $blocks
 	 * @param array $ex_positions
-	 * @param array $users_groups
+	 * @param integer[] $users_groups
 	 * @param array $display_modes
 	 * @param bool $edit_mode
 	 * @return array[]

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];

services/users/data.php

Braces +1 added lines, -2 removed lines

@@ -288,8 +288,7 @@
 					'NAME'		=> $field_data['PROFILE_FIELD_NAME'],
 					'U_CONTACT'	=> $field_data['PROFILE_FIELD_CONTACT'],
 				);
-			}
-			else
+			} else
 			{
 				$this->user_cache[$user_id]['profile_fields'][$field] = $field_data;
 			}

Spacing +8 added lines, -8 removed lines

@@ -83,7 +83,7 @@ 
 
 		if (sizeof($query_ids))
 		{
-			$sql_where .= (($sql_where) ? ' AND ' : '') . $this->db->sql_in_set('user_id', $query_ids);
+			$sql_where .= (($sql_where) ? ' AND ' : '').$this->db->sql_in_set('user_id', $query_ids);
 			$this->query($sql_where);
 		}
 
@@ -160,8 +160,8 @@ 
 	public function get_profile_fields()
 	{
 		$sql = 'SELECT l.lang_name, f.field_ident
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
-			WHERE l.lang_id = ' . (int) $this->user->get_iso_lang_id() . '
+			FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f
+			WHERE l.lang_id = ' . (int) $this->user->get_iso_lang_id().'
 				AND f.field_active = 1
 				AND f.field_no_view = 0
 				AND f.field_hide = 0
@@ -219,7 +219,7 @@ 
 	 */
 	protected function get_search_url($user_id)
 	{
-		return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id=$user_id&sr=posts") : '';
+		return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id=$user_id&sr=posts") : '';
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	{
 		if (!function_exists('phpbb_get_user_rank'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
 		}
 
 		$user_rank_data = phpbb_get_user_rank($row, $row['user_posts']);
@@ -304,8 +304,8 @@ 
 	protected function get_sql_statement($sql_where = '', $order_by = '')
 	{
 		return 'SELECT user_id, username, user_type, user_colour, user_avatar, user_avatar_type, user_avatar_height, user_avatar_width, user_regdate, user_lastvisit, user_birthday, user_posts, user_rank, user_email, user_allow_viewemail, user_allow_pm, user_jabber, user_inactive_reason
-			FROM ' . USERS_TABLE .
-			(($sql_where) ? ' WHERE ' . $sql_where : '') .
-			(($order_by) ? ' ORDER BY ' . $order_by : '');
+			FROM ' . USERS_TABLE.
+			(($sql_where) ? ' WHERE '.$sql_where : '').
+			(($order_by) ? ' ORDER BY '.$order_by : '');
 	}
 }

services/forum/options.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 		// @codeCoverageIgnoreStart
 		if (!function_exists('make_forum_select'))
 		{
-			include($phpbb_root_path . 'includes/functions_admin.' . $php_ext);
+			include($phpbb_root_path.'includes/functions_admin.'.$php_ext);
 		}
 		// @codeCoverageIgnoreEnd
 	}
@@ -43,7 +43,7 @@ 
 		$forum_options = array('' => 'ALL_FORUMS');
 		foreach ($forumlist as $row)
 		{
-			$forum_options[$row['forum_id']] = $row['padding'] . $row['forum_name'];
+			$forum_options[$row['forum_id']] = $row['padding'].$row['forum_name'];
 		}
 
 		return $forum_options;

services/forum/data.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 			$this->store['topic'][$row['topic_id']] = $row;
 
 			$this->store['tracking'][$row['forum_id']]['topic_list'][] = $row['topic_id'];
-			$this->store['tracking'][$row['forum_id']]['mark_time'] =& $row['forum_mark_time'];
+			$this->store['tracking'][$row['forum_id']]['mark_time'] = & $row['forum_mark_time'];
 			$this->store['post_ids']['first'][] = $row['topic_first_post_id'];
 			$this->store['post_ids']['last'][] = $row['topic_last_post_id'];
 			$this->store['poster_ids'][] = $row['topic_poster'];

Braces +1 added lines, -2 removed lines

@@ -242,8 +242,7 @@
 		{
 			$sql_where[] = $this->db->sql_in_set('p.post_id', array_map('intval', $post_ids));
 			return $sql_where;
-		}
-		else if (sizeof($this->store['topic']))
+		} else if (sizeof($this->store['topic']))
 		{
 			$this->_limit_posts_by_topic($sql_where, $topic_first_or_last_post);
 		}