blitze / phpBB-ext-sitemaker

services/blocks/action/update_block.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
 		if (isset($allowed_fields[$field]))
 		{
-			$mutator = 'set_' . $field;
+			$mutator = 'set_'.$field;
 			$entity->$mutator($allowed_fields[$field]);
 			$entity = $block_mapper->save($entity);
 		}

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', $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', $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;
 	}
 }

services/users/contacts.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 	 */
 	protected function get_email_url(array $row)
 	{
-		return ($this->email_form_allowed) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&u=' . $row['user_id']) : (($this->mailto_allowed) ? 'mailto:' . $row['user_email'] : '');
+		return ($this->email_form_allowed) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&u='.$row['user_id']) : (($this->mailto_allowed) ? 'mailto:'.$row['user_email'] : '');
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 			$jabber = array(
 				'ID'		=> 'jabber',
 				'NAME' 		=> $this->translator->lang('JABBER'),
-				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=contact&action=jabber&u=' . $row['user_id']),
+				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=contact&action=jabber&u='.$row['user_id']),
 			);
 		}
 
@@ -156,7 +156,7 @@ 
 			$pm = array(
 				'ID'		=> 'pm',
 				'NAME' 		=> $this->translator->lang('SEND_PRIVATE_MESSAGE'),
-				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'i=pm&mode=compose&u=' . $row['user_id']),
+				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'i=pm&mode=compose&u='.$row['user_id']),
 			);
 		}
 
@@ -219,7 +219,7 @@ 
 	{
 		if (!function_exists('phpbb_get_banned_user_ids'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/functions_user.'.$this->php_ext);
 		}
 
 		return phpbb_get_banned_user_ids($user_ids, false);

blocks/featured_member.php

Spacing +6 added lines, -6 removed lines

@@ -147,7 +147,7 @@ 
 	private function change_user()
 	{
 		$change = false;
-		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 ' . self::$rotations[$this->settings['rotation']]))
+		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 '.self::$rotations[$this->settings['rotation']]))
 		{
 			$this->settings['last_changed'] = time();
 			$change = true;
@@ -162,7 +162,7 @@ 
 	 */
 	private function get_settings(array $bdata)
 	{
-		$cached_settings = $this->cache->get('pt_block_data_' . $bdata['bid']);
+		$cached_settings = $this->cache->get('pt_block_data_'.$bdata['bid']);
 		$settings = ($cached_settings && $cached_settings['hash'] === $bdata['hash']) ? $cached_settings : $bdata['settings'];
 		$settings['hash'] = $bdata['hash'];
 
@@ -182,8 +182,8 @@ 
 			$sql_data = array(
 				'settings'	=> json_encode($settings)
 			);
-			$this->db->sql_query('UPDATE ' . $this->blocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE bid = ' . (int) $bid);
-			$this->cache->put('pt_block_data_' . $bid, $this->settings);
+			$this->db->sql_query('UPDATE '.$this->blocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE bid = '.(int) $bid);
+			$this->cache->put('pt_block_data_'.$bid, $this->settings);
 		}
 	}
 
@@ -235,8 +235,8 @@ 
 		$rotation = $this->settings['rotation'];
 
 		$this->ptemplate->assign_vars(array(
-			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->translator->lang('QTYPE_' . strtoupper($query_type)) : '',
-			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->translator->lang(strtoupper($rotation) . '_MEMBER') : '',
+			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->translator->lang('QTYPE_'.strtoupper($query_type)) : '',
+			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->translator->lang(strtoupper($rotation).'_MEMBER') : '',
 		));
 	}
 

event/listener.php

Spacing +6 added lines, -6 removed lines

@@ -117,9 +117,9 @@ 
 	public function load_permission_language(\phpbb\event\data $event)
 	{
 		$permissions = $event['permissions'];
-		$permissions['a_sm_settings']	= array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
-		$permissions['a_sm_manage_blocks']	= array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
-		$permissions['a_sm_manage_menus']	= array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
+		$permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
+		$permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
+		$permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
 		$event['permissions'] = $permissions;
 	}
 
@@ -193,13 +193,13 @@ 
 	 */
 	public function set_startpage(\phpbb\event\data $event)
 	{
-		if ($this->user->page['page_name'] == 'index.' . $this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
+		if ($this->user->page['page_name'] == 'index.'.$this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
 		{
 			$method = $this->config['sitemaker_startpage_method'];
 			$this->is_startpage = true;
 
 			$controller_dir = explode('\\', get_class($controller_object));
-			$controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles';
+			$controller_style_dir = 'ext/'.$controller_dir[0].'/'.$controller_dir[1].'/styles';
 			$this->template->set_style(array($controller_style_dir, 'styles'));
 
 			$arguments = explode('/', $this->config['sitemaker_startpage_params']);
@@ -220,7 +220,7 @@ 
 	 */
 	public function add_viewonline_location(\phpbb\event\data $event)
 	{
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0)
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0)
 		{
 			$event['location'] = $this->translator->lang('FORUM_INDEX');
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');

services/forum/query_builder.php

Spacing +6 added lines, -6 removed lines

@@ -202,12 +202,12 @@ 
 			$this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time';
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
 				'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
-				'ON'	=> 'tt.user_id = ' . $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
+				'ON'	=> 'tt.user_id = '.$this->user->data['user_id'].' AND t.topic_id = tt.topic_id'
 			);
 
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
 				'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
-				'ON'	=> 'ft.user_id = ' . $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
+				'ON'	=> 'ft.user_id = '.$this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
 			);
 		}
 
@@ -226,7 +226,7 @@ 
 	{
 		if ($unix_start_time && $unix_stop_time)
 		{
-			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time";
+			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time";
 		}
 
 		return $this;
@@ -258,7 +258,7 @@ 
 	 */
 	public function set_sorting($sort_key, $sort_dir = 'DESC')
 	{
-		$this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir;
+		$this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir;
 
 		return $this;
 	}
@@ -319,7 +319,7 @@ 
 	{
 		if (!empty($column_id))
 		{
-			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id;
+			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id;
 		}
 	}
 
@@ -330,7 +330,7 @@ 
 	{
 		if ($check_visibility)
 		{
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . time();
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.time();
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.');
 		}
 	}

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 > ' . $this->user->data['user_lastvisit'],
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
 			),
 		);
 

services/util.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
 	 */
 	public function get_default_avatar()
 	{
-		return '<img src="' . $this->get_theme_path() . '/images/no_avatar.gif" alt="" />';
+		return '<img src="'.$this->get_theme_path().'/images/no_avatar.gif" alt="" />';
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	public function get_theme_path()
 	{
 		$web_path = $this->get_web_path();
-		return "{$web_path}styles/" . rawurlencode($this->user->style['style_path']) . '/theme';
+		return "{$web_path}styles/".rawurlencode($this->user->style['style_path']).'/theme';
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	public function get_web_path()
 	{
 		// Determine board url - we may need it later
-		$board_url = generate_board_url() . '/';
+		$board_url = generate_board_url().'/';
 
 		$corrected_path = $this->path_helper->get_web_root_path();
 		return (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;

services/tree/display.php

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