blitze / phpBB-ext-sitemaker

services/menus/action/add_menu.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 		/** @type \blitze\sitemaker\model\entity\menu $entity */
 		$entity = $menu_mapper->create_entity(array(
-			'menu_name' => $this->translator->lang('MENU') . '-' . mt_rand(1000, 9999),
+			'menu_name' => $this->translator->lang('MENU').'-'.mt_rand(1000, 9999),
 		));
 
 		$entity = $menu_mapper->save($entity);

blocks/mybookmarks.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
 
 			$this->ptemplate->assign_block_vars('topicrow', array(
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"),
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"),
 			));
 			unset($topic_data[$i]);
 		}
@@ -120,7 +120,7 @@ 
 				BOOKMARKS_TABLE		=> 'b',
 			),
 			'WHERE'		=> array(
-				'b.user_id = ' . (int) $this->user->data['user_id'],
+				'b.user_id = '.(int) $this->user->data['user_id'],
 				'b.topic_id = t.topic_id',
 			),
 		);

blocks/member_menu.php

Spacing +8 added lines, -8 removed lines

@@ -68,11 +68,11 @@ 
 				'USER_POSTS'	=> $this->user->data['user_posts'],
 				'NEW_POSTS'		=> $this->get_new_posts_count(),
 
-				'U_PROFILE'		=> append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile&u=' . $this->user->data['user_id']),
-				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=newposts'),
-				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=egosearch'),
-				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'i=pm&folder=inbox'),
-				'U_LOGOUT'		=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'mode=logout', true, $this->user->session_id),
+				'U_PROFILE'		=> append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile&u='.$this->user->data['user_id']),
+				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=newposts'),
+				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=egosearch'),
+				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'i=pm&folder=inbox'),
+				'U_LOGOUT'		=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'mode=logout', true, $this->user->session_id),
 				'U_MCP' 		=> $this->get_mcp_url(),
 				'U_ACP'			=> $this->get_acp_url(),
 			));
@@ -99,7 +99,7 @@ 
 	 */
 	protected function get_mcp_url()
 	{
-		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, false, true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, false, true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	protected function get_acp_url()
 	{
-		return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path . 'adm/index.' . $this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path.'adm/index.'.$this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 				POSTS_TABLE		=> 'p',
 			),
 			'WHERE'		=> array(
-				't.topic_id = p.topic_id AND p.post_time > ' . (int) $this->user->data['user_lastvisit'],
+				't.topic_id = p.topic_id AND p.post_time > '.(int) $this->user->data['user_lastvisit'],
 			),
 		);
 

services/blocks/cfg_fields.php

Spacing +8 added lines, -8 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>';
 
@@ -120,7 +120,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;
@@ -163,7 +163,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.'"' : '';
 	}
 
 	/**
@@ -177,12 +177,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->translator->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>';

services/forum/attachments.php

Spacing +4 added lines, -4 removed lines

@@ -77,10 +77,10 @@
 	protected function get_attachment_sql(array $attach_ids, array $allowed_extensions, $exclude_in_message, $order_by)
 	{
 		return 'SELECT *
-			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('post_msg_id', array_map('intval', $attach_ids)) .
-				(($exclude_in_message) ? ' AND in_message = 0' : '') .
-				(sizeof($allowed_extensions) ? ' AND ' . $this->db->sql_in_set('extension', $allowed_extensions) : '') . '
+			FROM ' . ATTACHMENTS_TABLE.'
+			WHERE ' . $this->db->sql_in_set('post_msg_id', array_map('intval', $attach_ids)).
+				(($exclude_in_message) ? ' AND in_message = 0' : '').
+				(sizeof($allowed_extensions) ? ' AND '.$this->db->sql_in_set('extension', $allowed_extensions) : '').'
 			ORDER BY ' . $order_by;
 	}
 }

blocks/attachments.php

Spacing +3 added lines, -3 removed lines

@@ -140,7 +140,7 @@ 
 				$this->ptemplate->assign_block_vars('postrow.attachment', array(
 					'DISPLAY_ATTACHMENT'	=> $attachment,
 					'EXTENSION_GROUP'		=> $extensions[$row['extension']]['group_name'],
-					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id") . '#p' . $post_id,
+					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id").'#p'.$post_id,
 				));
 			}
 		}
@@ -152,7 +152,7 @@ 
 	private function get_posts_data()
 	{
 		$topic_ids = $post_ids = array();
-		${$this->settings['ids_type'] . '_ids'} = array_filter(explode(',', $this->settings['ids']));
+		${$this->settings['ids_type'].'_ids'} = array_filter(explode(',', $this->settings['ids']));
 		$range_info = $this->date_range->get($this->settings['date_range']);
 
 		$sql_array = $this->forum_data->query(false)
@@ -164,7 +164,7 @@ 
 			->get_sql_array();
 
 		$sql_array['SELECT'] = '';
-		$sql_array['WHERE'] .= ' AND p.topic_id = t.topic_id AND p.post_attachment <> 0' . (($this->settings['first_only']) ? ' AND p.post_id = t.topic_first_post_id' : '');
+		$sql_array['WHERE'] .= ' AND p.topic_id = t.topic_id AND p.post_attachment <> 0'.(($this->settings['first_only']) ? ' AND p.post_id = t.topic_first_post_id' : '');
 
 		return $this->forum_data->get_post_data(false, $post_ids, $this->settings['limit'], 0, $sql_array);
 	}

model/entity/item.php

Spacing +3 added lines, -3 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);

blocks/links.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
 		return array(
 			'title'     => $this->title,
-			'content'   => $this->ptemplate->render_view('blitze/sitemaker', 'blocks/' . $this->tpl_name . '.html', $this->tpl_name . '_block'),
+			'content'   => $this->ptemplate->render_view('blitze/sitemaker', 'blocks/'.$this->tpl_name.'.html', $this->tpl_name.'_block'),
 		);
 	}
 

services/menus/navigation.php

Spacing +3 added lines, -3 removed lines

@@ -138,7 +138,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']);
 	}
 
 	/**
@@ -177,8 +177,8 @@ 
 	{
 		sort($row['url_query']);
 
-		$row['url_path'] = ($row['url_path'] === '/') ? '/index.' . $this->php_ext : $row['url_path'];
+		$row['url_path'] = ($row['url_path'] === '/') ? '/index.'.$this->php_ext : $row['url_path'];
 
-		return $row['url_path'] . ((sizeof($row['url_query'])) ? '?' . join('&', $row['url_query']) : '');
+		return $row['url_path'].((sizeof($row['url_query'])) ? '?'.join('&', $row['url_query']) : '');
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if (!$is_navigation)
 		{
 			$this->tree->display_list($data['items'], $template, 'tree');
-		}
-		else
+		} else
 		{
 			$this->tree->set_params($settings);
 			$this->tree->display_navlist($data, $template, 'tree');