blitze / phpBB-ext-sitemaker

services/members.php

Spacing +9 added lines, -9 removed lines

@@ -63,7 +63,7 @@ 
 		// @codeCoverageIgnoreStart
 		if (!function_exists('phpbb_get_user_avatar'))
 		{
-			include($phpbb_root_path . 'includes/functions_display.' . $php_ext);
+			include($phpbb_root_path.'includes/functions_display.'.$php_ext);
 		}
 		// @codeCoverageIgnoreEnd
 	}
@@ -101,8 +101,8 @@ 
 	 */
 	protected function member_posts(array $row)
 	{
-		$u_posts = append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id={$row['user_id']}&sr=posts" . $this->explain_range);
-		$user_posts = '<a href="' . $u_posts . '">' . $row['user_posts'] . '</a>';
+		$u_posts = append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id={$row['user_id']}&amp;sr=posts".$this->explain_range);
+		$user_posts = '<a href="'.$u_posts.'">'.$row['user_posts'].'</a>';
 
 		return array(
 			'USERNAME'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
@@ -170,7 +170,7 @@ 
 			'WHERE'			=> $this->db->sql_in_set('u.user_type', array(USER_NORMAL, USER_FOUNDER)),
 		);
 
-		$sql_method = 'set_' . $this->settings['query_type'] . '_sql';
+		$sql_method = 'set_'.$this->settings['query_type'].'_sql';
 		call_user_func_array(array($this, $sql_method), array(&$sql_ary));
 
 		$this->set_range_sql($sql_ary);
@@ -184,7 +184,7 @@ 
 	protected function set_visits_sql(array &$sql_ary)
 	{
 		$sql_ary['SELECT'] .= ', u.user_lastvisit as member_date';
-		$sql_ary['WHERE'] .= ' AND u.user_lastvisit <> 0 AND u.user_id <> ' . (int) $this->user->data['user_id'];
+		$sql_ary['WHERE'] .= ' AND u.user_lastvisit <> 0 AND u.user_id <> '.(int) $this->user->data['user_id'];
 		$sql_ary['ORDER_BY'] = 'u.user_lastvisit DESC';
 
 		$this->sql_date_field = 'user_lastvisit';
@@ -200,7 +200,7 @@ 
 		$this->info_header = '';
 		$this->view_mode = 'member_bots';
 
-		$sql_ary['WHERE'] = 'u.user_type = ' . USER_IGNORE;
+		$sql_ary['WHERE'] = 'u.user_type = '.USER_IGNORE;
 	}
 
 	/**
@@ -209,7 +209,7 @@ 
 	protected function set_tenured_sql(array &$sql_ary)
 	{
 		$sql_ary['SELECT'] .= ', u.user_regdate as member_date';
-		$sql_ary['ORDER_BY'] = 'u.user_regdate ' . (($this->settings['query_type'] == 'tenured') ? 'ASC' : 'DESC');
+		$sql_ary['ORDER_BY'] = 'u.user_regdate '.(($this->settings['query_type'] == 'tenured') ? 'ASC' : 'DESC');
 
 		$this->sql_date_field = 'u.user_regdate';
 		$this->settings['date_range'] = '';
@@ -232,7 +232,7 @@ 
 		$sql_ary['SELECT'] .= ', COUNT(p.post_id) as user_posts';
 		$sql_ary['FROM'] += array(TOPICS_TABLE => 't');
 		$sql_ary['FROM'] += array(POSTS_TABLE => 'p');
-		$sql_ary['WHERE'] .= ' AND ' . time() . ' > t.topic_time AND t.topic_id = p.topic_id AND p.post_visibility = ' . ITEM_APPROVED . ' AND p.poster_id = u.user_id';
+		$sql_ary['WHERE'] .= ' AND '.time().' > t.topic_time AND t.topic_id = p.topic_id AND p.post_visibility = '.ITEM_APPROVED.' AND p.poster_id = u.user_id';
 		$sql_ary['GROUP_BY'] = 'u.user_id';
 		$sql_ary['ORDER_BY'] = 'user_posts DESC, u.username ASC';
 
@@ -249,7 +249,7 @@ 
 		if ($this->settings['date_range'] && $this->sql_date_field)
 		{
 			$range = $this->date_range->get($this->settings['date_range']);
-			$this->explain_range = '&amp;date=' . $range['date'];
+			$this->explain_range = '&amp;date='.$range['date'];
 
 			$sql_ary['WHERE'] .= " AND {$this->sql_date_field} BETWEEN {$range['start']} AND {$range['stop']}";
 		}

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

Spacing +7 added lines, -7 removed lines

@@ -96,13 +96,13 @@ 
 	public function set_javascript_data($route, $style_id)
 	{
 		$board_url = generate_board_url();
-		$ajax_url = $board_url . ((!$this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '');
+		$ajax_url = $board_url.((!$this->config['enable_mod_rewrite']) ? '/app.'.$this->php_ext : '');
 
 		$is_default_route = $u_default_route = false;
 		if ($this->config['sitemaker_default_layout'])
 		{
 			$is_default_route = ($this->config['sitemaker_default_layout'] === $route) ? true : false;
-			$u_default_route .= $board_url . '/' . $this->config['sitemaker_default_layout'];
+			$u_default_route .= $board_url.'/'.$this->config['sitemaker_default_layout'];
 			$u_default_route = reapply_sid($u_default_route);
 		}
 
@@ -150,7 +150,7 @@ 
 			list($controller_service, $controller_method) = explode(':', $controller);
 			$controller_params	= $symfony_request->attributes->get('_route_params');
 			$controller_object	= $this->phpbb_container->get($controller_service);
-			$controller_class	= get_class($controller_object);
+			$controller_class = get_class($controller_object);
 
 			$r = new \ReflectionMethod($controller_class, $controller_method);
 			$class_params = $r->getParameters();
@@ -163,7 +163,7 @@ 
 				'CONTROLLER_METHOD'	=> $controller_method,
 				'CONTROLLER_PARAMS'	=> $controller_arguments,
 				'S_IS_STARTPAGE'	=> $this->is_startpage($controller_service, $controller_arguments),
-				'UA_EXTENSION'		=> $namespace . '/' . $extension,
+				'UA_EXTENSION'		=> $namespace.'/'.$extension,
 			));
 		}
 	}
@@ -198,11 +198,11 @@ 
 	{
 		$routes_ary = $this->get_routes();
 
-		$options = '<option value="">' . $this->translator->lang('SELECT') . '</option>';
+		$options = '<option value="">'.$this->translator->lang('SELECT').'</option>';
 		foreach ($routes_ary as $route)
 		{
 			$selected = ($route == $current_route) ? ' selected="selected"' : '';
-			$options .= '<option value="' . $route . '"' . $selected . '>' . $route . '</option>';
+			$options .= '<option value="'.$route.'"'.$selected.'>'.$route.'</option>';
 		}
 
 		return $options;
@@ -219,7 +219,7 @@ 
 		$options = '';
 		foreach ($ex_positions as $position)
 		{
-			$options .= '<option value="' . $position . '" selected="selected">' . $position . '</option>';
+			$options .= '<option value="'.$position.'" selected="selected">'.$position.'</option>';
 		}
 
 		return $options;

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

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 = ' . $this->user->get_iso_lang_id() . '
+			FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f
+			WHERE l.lang_id = ' . $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 : '');
 	}
 }

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