blitze / phpBB-ext-sitemaker

services/tree/display.php

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

@@ -79,7 +79,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);
@@ -108,8 +108,8 @@ 
 					$this->items_table => 'i'
 				),
 				'WHERE'		=> array(
-					'i.depth ' . (($max_depth) ? " BETWEEN $start AND " . ($start + $max_depth) : ' >= ' . $start),
-					(($this->sql_where) ? 'i.' . $this->sql_where : ''),
+					'i.depth '.(($max_depth) ? " BETWEEN $start AND ".($start + $max_depth) : ' >= '.$start),
+					(($this->sql_where) ? 'i.'.$this->sql_where : ''),
 				),
 				'ORDER_BY'	=> 'i.left_id ASC',
 			),
@@ -155,7 +155,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);
@@ -164,10 +164,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),
@@ -177,7 +177,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;
@@ -186,7 +186,7 @@ 
 
 		for ($i = 0; $i < $prev_depth; $i++)
 		{
-			$template->assign_block_vars('close_' . $handle, array());
+			$template->assign_block_vars('close_'.$handle, array());
 		}
 	}
 
@@ -225,10 +225,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/forum/data.php

Braces +1 added lines, -2 removed lines

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

services/forum/tracker.php

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
 		if ($this->can_track_by_lastread())
 		{
 			$info = $this->build_tracking_info('get_topic_tracking', $forums, $topics);
-		}
-		else if ($this->can_track_anonymous())
+		} else if ($this->can_track_anonymous())
 		{
 			$info = $this->build_tracking_info('get_complete_topic_tracking', $forums, $topics);
 		}

model/menus/mapper/items.php

Spacing +1 added lines, -1 removed lines

@@ -172,6 +172,6 @@
 	 */
 	protected function get_sql_where($menu_id)
 	{
-		return '%smenu_id = ' . (int) $menu_id;
+		return '%smenu_id = '.(int) $menu_id;
 	}
 }

model/menus/entity/item.php

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
 	 */
 	public function set_item_icon($icon)
 	{
-		$this->item_icon = ($icon) ? trim($icon) . ' ' : '';
+		$this->item_icon = ($icon) ? trim($icon).' ' : '';
 		return $this;
 	}
 
@@ -150,7 +150,7 @@ 
 
 		if ($this->item_url && empty($parts['host']) && strpos($parts['path'], '.') === false)
 		{
-			$this->item_url = 'app.php/' . $this->item_url;
+			$this->item_url = 'app.php/'.$this->item_url;
 		}
 
 		return $this;
@@ -166,7 +166,7 @@ 
 
 		if ($item_url && empty($host))
 		{
-			$item_url = $this->board_url . '/' . $item_url;
+			$item_url = $this->board_url.'/'.$item_url;
 
 			if ($this->mod_rewrite_enabled === true)
 			{

services/poll.php

Spacing +8 added lines, -8 removed lines

@@ -68,7 +68,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->translator->add_lang('viewtopic');
 
@@ -100,7 +100,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',
 		));
 	}
 
@@ -132,7 +132,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
@@ -177,7 +177,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)
 		{
@@ -208,8 +208,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 = ' . $this->user->data['user_id'];
 			$result = $this->db->sql_query($sql);
 
@@ -224,9 +224,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/members.php

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
 
 		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);
 		}
 	}
 
@@ -99,8 +99,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']),
@@ -168,7 +168,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);
@@ -198,7 +198,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;
 	}
 
 	/**
@@ -207,7 +207,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'] = '';
@@ -230,7 +230,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';
 
@@ -247,7 +247,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/cfg_fields.php

Spacing +9 added lines, -9 removed lines

@@ -34,11 +34,11 @@ 
 	 */
 	public function build_select($option_ary, $selected_item, $key)
 	{
-		$html = '<select id="' . $key . '" name="config[' . $key . ']">';
+		$html = '<select id="'.$key.'" name="config['.$key.']">';
 		foreach ($option_ary as $value => $title)
 		{
 			$selected = ($value == $selected_item) ? ' selected="selected"' : '';
-			$html .= '<option value="' . $value . '"' . $selected . '>' . $this->translator->lang($title) . '</option>';
+			$html .= '<option value="'.$value.'"'.$selected.'>'.$this->translator->lang($title).'</option>';
 		}
 		$html .= '</select>';
 
@@ -57,11 +57,11 @@ 
 	{
 		$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)
 		{
 			$selected = $this->get_selected_option($value, $selected_items);
-			$html .= '<option value="' . $value . '"' . $selected . '>' . $this->translator->lang($title) . '</option>';
+			$html .= '<option value="'.$value.'"'.$selected.'>'.$this->translator->lang($title).'</option>';
 		}
 		$html .= '</select>';
 
@@ -119,7 +119,7 @@ 
 		foreach ($option_ary as $value => $title)
 		{
 			$selected = $this->get_selected_option($value, $selected_item, 'checked');
-			$html .= '<label><input type="radio" name="config[' . $key . ']" value="' . $value . '"' . $selected . ' class="radio" /> ' . $this->translator->lang($title) . '</label><br />';
+			$html .= '<label><input type="radio" name="config['.$key.']" value="'.$value.'"'.$selected.' class="radio" /> '.$this->translator->lang($title).'</label><br />';
 		}
 
 		return $html;
@@ -134,7 +134,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.'" />';
 	}
 
 	/**
@@ -174,7 +174,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.'"' : '';
 	}
 
 	/**
@@ -187,12 +187,12 @@ 
 	 */
 	protected function get_checkbox_column(array $row, array $selected_items, $field, $column_count, $column_class)
 	{
-		$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->translator->lang($title);
 			$selected = $this->get_selected_option($value, $selected_items, 'checked');
-			$column .= '<label><input type="checkbox" name="config[' . $field . '][]" value="' . $value . '"' . $selected . ' accesskey="' . $field . '" class="checkbox" /> ' . $title . '</label><br />';
+			$column .= '<label><input type="checkbox" name="config['.$field.'][]" value="'.$value.'"'.$selected.' accesskey="'.$field.'" class="checkbox" /> '.$title.'</label><br />';
 		}
 		$column .= '</div>';
 

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->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;
@@ -215,10 +215,10 @@ 
 	 */
 	public function get_excluded_position_options(array $ex_positions)
 	{
-		$options = '<option value=""' . ((!sizeof($ex_positions)) ? ' selected="selected"' : '') . '>' . $this->translator->lang('NONE') . '</option>';
+		$options = '<option value=""'.((!sizeof($ex_positions)) ? ' selected="selected"' : '').'>'.$this->translator->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;