blitze / phpBB-ext-sitemaker

services/groups.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 	public function get_users_groups()
 	{
 		$sql = 'SELECT group_id
-			FROM ' . USER_GROUP_TABLE . '
+			FROM ' . USER_GROUP_TABLE.'
 			WHERE user_id = ' . (int) $this->user->data['user_id'];
 		$result = $this->db->sql_query($sql);
 
@@ -78,13 +78,13 @@ 
 		$sql = $this->_get_group_sql($mode);
 		$result = $this->db->sql_query($sql);
 
-		$options = '<option value="0">' . $this->user->lang('ALL') . '</option>';
+		$options = '<option value="0">'.$this->user->lang('ALL').'</option>';
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$group_name = $this->_get_group_name($row);
 			$group_class = $this->_get_group_class($row['group_type']);
 			$selected_option = $this->_get_selected_option($row['group_id'], $selected);
-			$options .= '<option' . $group_class . ' value="' . $row['group_id'] . '"' . $selected_option . '>' . $group_name . '</option>';
+			$options .= '<option'.$group_class.' value="'.$row['group_id'].'"'.$selected_option.'>'.$group_name.'</option>';
 		}
 		$this->db->sql_freeresult($result);
 
@@ -98,8 +98,8 @@ 
 	private function _get_group_sql($mode)
 	{
 		return 'SELECT group_id, group_name, group_type 
-			FROM ' . GROUPS_TABLE .
-			(($mode === 'special') ? ' WHERE group_type = ' . GROUP_SPECIAL : '') . '
+			FROM ' . GROUPS_TABLE.
+			(($mode === 'special') ? ' WHERE group_type = '.GROUP_SPECIAL : '').'
 			ORDER BY group_type DESC, group_name ASC';
 	}
 
@@ -109,7 +109,7 @@ 
 	 */
 	private function _get_group_name(array $row)
 	{
-		return ($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang('G_' . $row['group_name']) : ucfirst($row['group_name']);
+		return ($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang('G_'.$row['group_name']) : ucfirst($row['group_name']);
 	}
 
 	/**

services/blocks/admin_bar.php

Spacing +8 added lines, -8 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);
 		}
 
@@ -149,7 +149,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();
@@ -162,7 +162,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,
 			));
 		}
 	}
@@ -197,11 +197,11 @@ 
 	{
 		$routes_ary = $this->get_routes();
 
-		$options = '<option value="">' . $this->user->lang('SELECT') . '</option>';
+		$options = '<option value="">'.$this->user->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;
@@ -215,10 +215,10 @@ 
 	 */
 	public function get_excluded_position_options(array $ex_positions)
 	{
-		$options = '<option value=""' . ((!sizeof($ex_positions)) ? ' selected="selected"' : '') . '>' . $this->user->lang('NONE') . '</option>';
+		$options = '<option value=""'.((!sizeof($ex_positions)) ? ' selected="selected"' : '').'>'.$this->user->lang('NONE').'</option>';
 		foreach ($ex_positions as $position)
 		{
-			$options .= '<option value="' . $position . '" selected="selected">' . $position . '</option>';
+			$options .= '<option value="'.$position.'" selected="selected">'.$position.'</option>';
 		}
 
 		return $options;

blocks/forum_topics.php

Spacing +4 added lines, -4 removed lines

@@ -139,7 +139,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);
 
@@ -164,7 +164,7 @@ 
 	{
 		for ($i = 0, $size = sizeof($topic_data); $i < $size; $i++)
 		{
-			$row =& $topic_data[$i];
+			$row = & $topic_data[$i];
 			$forum_id = $row['forum_id'];
 			$topic_id = $row['topic_id'];
 
@@ -179,8 +179,8 @@ 
 				'VIEWS'				=> $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&amp;t=$topic_id"),
-				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"),
+				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id"),
+				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"),
 			);
 
 			$this->ptemplate->assign_block_vars('topicrow', $tpl_ary);

Braces +2 added lines, -4 removed lines

@@ -281,8 +281,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' => '')));
 		}
@@ -303,8 +302,7 @@ 
 			$this->fields['user_colour'] = 'topic_last_poster_colour';
 
 			$this->ptemplate->assign_var('L_POST_BY_AUTHOR', $this->user->lang('LAST_POST_BY_AUTHOR'));
-		}
-		else
+		} else
 		{
 			$this->fields['time'] = 'topic_time';
 			$this->fields['user_id'] = 'topic_poster';

controller/forum.php

Spacing +2 added lines, -2 removed lines

@@ -59,11 +59,11 @@
 		 * to fix relative paths for forum images
 		 */
 		global $phpbb_root_path;
-		$phpbb_root_path = generate_board_url() . '/';
+		$phpbb_root_path = generate_board_url().'/';
 
 		if (!function_exists('display_forums'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); // @codeCoverageIgnore
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext); // @codeCoverageIgnore
 		}
 
 		display_forums('', $this->config['load_moderators']);

services/menus/display.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
 	 * @param string $handle
 	 * @return void
 	 */
-	public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
+	public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
 	{
 		$this->prepare_items($data);
 
@@ -84,10 +84,10 @@ 
 				$row['num_kids'] = $this->count_descendants($row);
 
 				$template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER));
-				$this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth));
+				$this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth));
 			}
 
-			$this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth));
+			$this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth));
 		}
 	}
 
@@ -126,7 +126,7 @@ 
 			}
 
 			$is_current_item = $this->is_current_item($row);
-			$this_depth	= $this->parental_depth[$row['parent_id']] + 1;
+			$this_depth = $this->parental_depth[$row['parent_id']] + 1;
 			$leaf = $this->get_leaf_node($row, $is_current_item);
 
 			$this->parental_depth[$row[$this->pk]] = $this_depth;
@@ -155,8 +155,8 @@ 
 	 */
 	protected function set_current_item(array $data)
 	{
-		$curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
-		$curr_page = str_replace('/index.' . $this->php_ext, '/', $curr_page);
+		$curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
+		$curr_page = str_replace('/index.'.$this->php_ext, '/', $curr_page);
 		$curr_parts = explode('&', $this->user->page['query_string']);
 
 		$data = array_values($data);
@@ -239,7 +239,7 @@ 
 	 * @param int $repeat
 	 * @return void
 	 */
-	protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat)
+	protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat)
 	{
 		for ($i = 0; $i < $repeat; $i++)
 		{

services/menus/menu_block.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
 	{
 		$row['is_navigable'] = $this->is_navigable($row);
 		$row['is_expandable'] = ($row['is_navigable'] && !$row['item_target']) ? true : false;
-		$row['url_path'] = str_replace('/index.' . $this->php_ext, '/', $row['url_path']);
+		$row['url_path'] = str_replace('/index.'.$this->php_ext, '/', $row['url_path']);
 	}
 
 	/**

services/blocks/routes.php

Spacing +3 added lines, -3 removed lines

@@ -175,12 +175,12 @@
 	{
 		if ($page_dir)
 		{
-			$route = ltrim(dirname($page_dir) . '/index.php', './');
+			$route = ltrim(dirname($page_dir).'/index.php', './');
 			$parent_route = $this->get_parent_route_info($routes, $route);
 		}
-		else if ($current_route === 'viewtopic.' . $this->php_ext)
+		else if ($current_route === 'viewtopic.'.$this->php_ext)
 		{
-			$route = 'viewforum.' . $this->php_ext;
+			$route = 'viewforum.'.$this->php_ext;
 			$parent_route = $this->get_parent_route_info($routes, $route);
 		}
 		else

Braces +2 added lines, -4 removed lines

@@ -177,13 +177,11 @@
 		{
 			$route = ltrim(dirname($page_dir) . '/index.php', './');
 			$parent_route = $this->get_parent_route_info($routes, $route);
-		}
-		else if ($current_route === 'viewtopic.' . $this->php_ext)
+		} else if ($current_route === 'viewtopic.' . $this->php_ext)
 		{
 			$route = 'viewforum.' . $this->php_ext;
 			$parent_route = $this->get_parent_route_info($routes, $route);
-		}
-		else
+		} else
 		{
 			$parent_route = $this->get_virtual_parent($routes, $current_route);
 		}

model/menus/entity/item.php

Spacing +4 added lines, -4 removed lines

@@ -136,7 +136,7 @@ 
 	 */
 	public function set_item_icon($icon)
 	{
-		$this->item_icon = ($icon) ? trim($icon) . ' ' : '';
+		$this->item_icon = ($icon) ? trim($icon).' ' : '';
 		return $this;
 	}
 
@@ -153,7 +153,7 @@ 
 		// add leading / for local paths, except leading hashtags
 		if ($this->is_local($this->item_url) && $this->item_url[0] !== '#')
 		{
-			$this->item_url = '/' . ltrim($this->item_url, './');
+			$this->item_url = '/'.ltrim($this->item_url, './');
 		}
 
 		return $this;
@@ -168,7 +168,7 @@ 
 
 		if ($this->is_local($item_url) && $item_url[0] === '/')
 		{
-			$item_url = $this->board_url . $item_url;
+			$item_url = $this->board_url.$item_url;
 			if ($this->mod_rewrite_enabled)
 			{
 				$item_url = str_replace('app.php/', '', $item_url);
@@ -185,6 +185,6 @@ 
 	private function is_local($item_url)
 	{
 		$host = parse_url($item_url, PHP_URL_HOST);
-		return (!$item_url || $host || substr($item_url, 0, 2) === '//') ? false: true;
+		return (!$item_url || $host || substr($item_url, 0, 2) === '//') ? false : true;
 	}
 }

Doc Comments +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
 
 	/**
 	 * @param string $item_url
-	 * @return true|false
+	 * @return boolean
 	 */
 	private function is_local($item_url)
 	{

services/blocks/cfg_fields.php

Spacing +7 added lines, -7 removed lines

@@ -35,12 +35,12 @@ 
 	public function build_multi_select(array $option_ary, $selected_items, $field)
 	{
 		$selected_items = $this->ensure_array($selected_items);
-		$html = '<select id="' . $field . '" name="config[' . $field . '][]" multiple="multiple">';
+		$html = '<select id="'.$field.'" name="config['.$field.'][]" multiple="multiple">';
 		foreach ($option_ary as $value => $title)
 		{
 			$title = $this->user->lang($title);
 			$selected = $this->get_selected_option($value, $selected_items);
-			$html .= '<option value="' . $value . '"' . $selected . '>' . $title . '</option>';
+			$html .= '<option value="'.$value.'"'.$selected.'>'.$title.'</option>';
 		}
 		$html .= '</select>';
 
@@ -100,7 +100,7 @@ 
 		{
 			$title = $this->user->lang($title);
 			$selected = $this->get_selected_option($value, $selected_item, 'checked');
-			$html .= '<label><input type="radio" name="config[' . $key . ']" value="' . $value . '"' . $selected . ' class="radio" /> ' . $title . '</label><br />';
+			$html .= '<label><input type="radio" name="config['.$key.']" value="'.$value.'"'.$selected.' class="radio" /> '.$title.'</label><br />';
 		}
 
 		return $html;
@@ -115,7 +115,7 @@ 
 	 */
 	public function build_hidden($value, $field)
 	{
-		return '<input type="hidden" name="config[' . $field . ']" value="' . $value . '" />';
+		return '<input type="hidden" name="config['.$field.']" value="'.$value.'" />';
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	protected function get_selected_option($needle, array $haystack, $type = 'selected')
 	{
-		return (in_array($needle, $haystack)) ? ' ' . $type . '="' . $type . '"' : '';
+		return (in_array($needle, $haystack)) ? ' '.$type.'="'.$type.'"' : '';
 	}
 
 	/**
@@ -169,12 +169,12 @@ 
 	 */
 	protected function get_checkbox_column(array $row, array $selected_items, $field, $column_class, $column_count, &$index)
 	{
-		$column = '<div class="' . $column_class . $field . '-checkbox" id="' . $field . '-col-' . $column_count . '">';
+		$column = '<div class="'.$column_class.$field.'-checkbox" id="'.$field.'-col-'.$column_count.'">';
 		foreach ($row as $value => $title)
 		{
 			$title = $this->user->lang($title);
 			$selected = $this->get_selected_option($value, $selected_items, 'checked');
-			$column .= '<label><input type="checkbox" name="config[' . $field . '][' . $index . ']" value="' . $value . '"' . $selected . ' class="checkbox" /> ' . $title . '</label><br />';
+			$column .= '<label><input type="checkbox" name="config['.$field.']['.$index.']" value="'.$value.'"'.$selected.' class="checkbox" /> '.$title.'</label><br />';
 			$index++;
 		}
 		$column .= '</div>';