blitze / phpBB-ext-sitemaker

blocks/whois.php

Spacing +1 added lines, -1 removed lines

@@ -105,6 +105,6 @@
 	 */
 	private function get_viewonline_url()
 	{
-		return ($this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$this->phpbb_root_path}viewonline." . $this->php_ext) : '';
+		return ($this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$this->phpbb_root_path}viewonline.".$this->php_ext) : '';
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 		if ($data['TOTAL_USERS_ONLINE'])
 		{
 			list($l_online_users, $online_userlist, $l_online_record) = array_values($data);
-		}
-		else
+		} else
 		{
 			$item_id = 0;
 			$item = 'forum';

services/forum/query_builder.php

Spacing +8 added lines, -8 removed lines

@@ -165,7 +165,7 @@ 
 			$this->store['sql_array']['SELECT'][] = 'ws.notify_status';
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
 				'FROM'	=> array($keys[$type]['table'] => 'ws'),
-				'ON'	=> $keys[$type]['cond'] . ' AND ws.user_id = ' . (int) $this->user->data['user_id'],
+				'ON'	=> $keys[$type]['cond'].' AND ws.user_id = '.(int) $this->user->data['user_id'],
 			);
 		}
 
@@ -184,7 +184,7 @@ 
 			$this->store['sql_array']['SELECT'][] = 'bm.topic_id as bookmarked';
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
 				'FROM'	=> array(BOOKMARKS_TABLE => 'bm'),
-				'ON'	=> 'bm.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = bm.topic_id'
+				'ON'	=> 'bm.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = bm.topic_id'
 			);
 		}
 
@@ -205,12 +205,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 = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
+				'ON'	=> 'tt.user_id = '.(int) $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 = ' . (int) $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
+				'ON'	=> 'ft.user_id = '.(int) $this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
 			);
 		}
 
@@ -229,7 +229,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;
@@ -268,7 +268,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;
 	}
@@ -336,7 +336,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;
 		}
 	}
 
@@ -348,7 +348,7 @@ 
 	{
 		if ($check_visibility)
 		{
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . (int) $this->time();
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.(int) $this->time();
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', array_map('intval', $this->ex_fid_ary), 't.');
 		}
 	}

blocks/wordgraph.php

Spacing +6 added lines, -6 removed lines

@@ -110,8 +110,8 @@ 
 			$this->ptemplate->assign_block_vars('wordgraph', array(
 				'WORD'			=> $this->show_word($word, $words_array[$word], $settings['show_word_count']),
 				'WORD_SIZE'		=> $settings['min_word_size'] + (($words_array[$word] - $params['min_count']) * $params['size_step']),
-				'WORD_COLOR'	=> $r . $g . $b,
-				'WORD_URL'		=> append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords=' . urlencode($word)),
+				'WORD_COLOR'	=> $r.$g.$b,
+				'WORD_URL'		=> append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords='.urlencode($word)),
 			));
 		}
 	}
@@ -188,8 +188,8 @@ 
 				AND m.word_id = l.word_id
 				AND m.post_id = p.post_id
 				AND t.topic_id = p.topic_id
-				AND t.topic_time <= ' . time() . '
-				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_map('intval', array_keys($this->auth->acl_getf('!f_read', true))), 't.') .
+				AND t.topic_time <= ' . time().'
+				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_map('intval', array_keys($this->auth->acl_getf('!f_read', true))), 't.').
 				$sql_where,
 			'GROUP_BY'	=> 'l.word_text, l.word_count',
 			'ORDER_BY'	=> 'l.word_count DESC'
@@ -206,7 +206,7 @@ 
 		if ($exclude_words)
 		{
 			$exclude_words = array_filter(explode(',', str_replace(' ', '', strtolower($exclude_words))));
-			$sql_where = (sizeof($exclude_words)) ? ' AND ' . $this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
+			$sql_where = (sizeof($exclude_words)) ? ' AND '.$this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
 		}
 
 		return $sql_where;
@@ -220,6 +220,6 @@ 
 	 */
 	private function show_word($word, $count, $show_count)
 	{
-		return censor_text(($show_count) ? $word . '(' . $count . ')' : $word);
+		return censor_text(($show_count) ? $word.'('.$count.')' : $word);
 	}
 }

services/blocks/admin_bar.php

Spacing +6 added lines, -6 removed lines

@@ -115,7 +115,7 @@ 
 		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);
 		}
 
@@ -195,7 +195,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();
@@ -208,7 +208,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,
 			));
 		}
 	}
@@ -243,11 +243,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;
@@ -264,7 +264,7 @@ 
 		$options = '';
 		foreach ($ex_positions as $position)
 		{
-			$options .= '<option value="' . $position . '" selected="selected">' . $position . '</option>';
+			$options .= '<option value="'.$position.'" selected="selected">'.$position.'</option>';
 		}
 
 		return $options;

services/filemanager/settings.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 		$this->config_path = $config_path;
 		$this->php_ext = $php_ext;
 
-		$this->config_template = __DIR__ . '/default.config';
+		$this->config_template = __DIR__.'/default.config';
 	}
 
 	/**
@@ -109,6 +109,6 @@ 
 	 */
 	protected function get_config_file()
 	{
-		return $this->config_path . 'config.' . $this->php_ext;
+		return $this->config_path.'config.'.$this->php_ext;
 	}
 }

acp/settings_module.php

Spacing +4 added lines, -4 removed lines

@@ -153,7 +153,7 @@ 
 
 			$this->save_filemanager_settings();
 			$this->save_config_settings($settings);
-			$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));
 		}
 	}
 
@@ -176,7 +176,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))
@@ -245,7 +245,7 @@ 
 			$path = dirname($path);
 			$name = basename($path);
 
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
 		}
 		ksort($layouts);
 
@@ -301,7 +301,7 @@ 
 			$id = $entity->get_menu_id();
 			$name = $entity->get_menu_name();
 			$selected = ($id == $this->config['sm_navbar_menu']) ? ' selected="selected"' : '';
-			$options .= '<option value="' . $id . '"' . $selected . '>' . $name . '</option>';
+			$options .= '<option value="'.$id.'"'.$selected.'>'.$name.'</option>';
 		}
 
 		return $options;

acp/menu_module.php

Spacing +5 added lines, -5 removed lines

@@ -96,7 +96,7 @@ 
 			'MENU_ID'		=> $menu_id,
 			'ICON_PICKER'	=> $this->icon->picker(),
 			'T_PATH'		=> $this->phpbb_root_path,
-			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '') . '/',
+			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '').'/',
 		));
 
 		$this->tpl_name = 'acp_menu';
@@ -150,7 +150,7 @@ 
 		$vars = array('bulk_options', 'forumslist');
 		extract($this->phpbb_dispatcher->trigger_event('blitze.sitemaker.acp_add_bulk_menu_options', compact($vars)));
 
-		$bulk_options['FORUMS']	= $this->get_forums_string($forumslist);
+		$bulk_options['FORUMS'] = $this->get_forums_string($forumslist);
 
 		$this->template->assign_var('bulk_options', $bulk_options);
 	}
@@ -161,11 +161,11 @@ 
 	 */
 	protected function get_forums_string(array $forumslist)
 	{
-		$text = $this->language->lang('FORUM') . "|app.{$this->php_ext}/forum\n";
+		$text = $this->language->lang('FORUM')."|app.{$this->php_ext}/forum\n";
 		foreach ($forumslist as $forum_id => $row)
 		{
-			$text .= "\t" . str_replace('   ', "\t", $row['padding']);
-			$text .= $row['forum_name'] . '|';
+			$text .= "\t".str_replace('   ', "\t", $row['padding']);
+			$text .= $row['forum_name'].'|';
 			$text .= "viewforum.{$this->php_ext}?f=$forum_id\n";
 		}
 

controller/upload.php

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
 		{
 			$file->remove();
 			$json_data['message'] = implode('<br />', $file->error);
-		}
-		else
+		} else
 		{
 			$json_data['location'] = $user_dir . $file->get('realname');
 		}

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
 		}
 		else
 		{
-			$json_data['location'] = $user_dir . $file->get('realname');
+			$json_data['location'] = $user_dir.$file->get('realname');
 		}
 	}
 
@@ -97,7 +97,7 @@ 
 	 * @param \phpbb\files\filespec $file
 	 * @return void
 	 */
-	protected function set_filename(\phpbb\files\filespec &$file)
+	protected function set_filename(\phpbb\files\filespec & $file)
 	{
 		$mode = 'real';
 		$prefix = '';

event/listener.php

Spacing +4 added lines, -4 removed lines

@@ -68,9 +68,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');
 		$permissions['a_sm_filemanager']	= array('lang' => 'ACL_A_SM_FILEMANAGER', 'cat' => 'misc');
 		$permissions['u_sm_filemanager']	= array('lang' => 'ACL_U_SM_FILEMANAGER', 'cat' => 'misc');
 		$event['permissions'] = $permissions;
@@ -81,7 +81,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');