blitze / phpBB-ext-sitemaker

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

services/forum/manager.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	{
 		if (!class_exists('acp_forums'))
 		{
-			include($this->phpbb_root_path . 'includes/acp/acp_forums.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/acp/acp_forums.'.$this->php_ext);
 		}
 
 		$this->translator->add_lang('acp/forums');

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/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/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',
 		));
 	}
 
@@ -171,7 +171,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
@@ -216,7 +216,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)
 		{
@@ -247,8 +247,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 = ' . (int) $this->user->data['user_id'];
 			$result = $this->db->sql_query($sql);
 
@@ -263,9 +263,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);
 			}
 		}

acp/settings_module.php

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
 			$this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
 			$this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
 
-			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
 		}
 	}
 
@@ -147,7 +147,7 @@ 
 	{
 		$style_prefs = (array) json_decode($this->config_text->get('sm_layout_prefs'), true);
 
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
 
 		$styles = array();
 		while ($row = $this->db->sql_fetchrow($result))
@@ -225,7 +225,7 @@ 
 			$path = dirname($path);
 			$name = basename($path);
 
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
 		}
 		ksort($layouts);
 

blocks/custom.php

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
 		$content = $this->request->variable('content', '', true);
 		$cblocks = $this->get_custom_blocks();
 
-		$sql_data =	$this->get_default_fields($block_id);
+		$sql_data = $this->get_default_fields($block_id);
 		$sql_data['block_content'] = $content;
 
 		generate_text_for_storage($sql_data['block_content'], $sql_data['bbcode_uid'], $sql_data['bbcode_bitfield'], $sql_data['bbcode_options'], true, false, true);
@@ -149,11 +149,11 @@ 
 	{
 		if (!$block_exists)
 		{
-			$sql = 'INSERT INTO ' . $this->cblocks_table . ' ' . $this->db->sql_build_array('INSERT', $sql_data);
+			$sql = 'INSERT INTO '.$this->cblocks_table.' '.$this->db->sql_build_array('INSERT', $sql_data);
 		}
 		else
 		{
-			$sql = 'UPDATE ' . $this->cblocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE block_id = ' . (int) $sql_data['block_id'];
+			$sql = 'UPDATE '.$this->cblocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE block_id = '.(int) $sql_data['block_id'];
 		}
 		$this->db->sql_query($sql);
 		$this->cache->destroy('sm_cblocks');
@@ -173,7 +173,7 @@ 
 
 			$block_is_active = $status;
 			$status = ($content && $status) ? true : false;
-			$content = '<div id="block-editor-' . $cblock['block_id'] . '" class="editable editable-block" data-service="blitze.sitemaker.block.custom" data-method="edit" data-raw="' . $cblock['block_content'] . '" data-active="' . $block_is_active . '">' . $content . '</div>';
+			$content = '<div id="block-editor-'.$cblock['block_id'].'" class="editable editable-block" data-service="blitze.sitemaker.block.custom" data-method="edit" data-raw="'.$cblock['block_content'].'" data-active="'.$block_is_active.'">'.$content.'</div>';
 		}
 	}
 

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