blitze / phpBB-ext-sitemaker

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;

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 +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 		}
 		else
 		{
-			$json_data['location'] = $user_dir . $file->get('realname');
+			$json_data['location'] = $user_dir.$file->get('realname');
 		}
 	}
 

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

services/filemanager/setup.php

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
 	 */
 	public function get_access_key()
 	{
-		return sha1($this->user->data['user_form_salt'] . 'filemanager');
+		return sha1($this->user->data['user_form_salt'].'filemanager');
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 */
 	public function get_upload_destination()
 	{
-		return $this->upload_dir . $this->get_user_dir();
+		return $this->upload_dir.$this->get_user_dir();
 	}
 
 	/**
@@ -120,9 +120,9 @@ 
 	protected function set_user_dir()
 	{
 		// if user does not have root access, they must have a directory
-		$this->user_dir = (!$this->auth->acl_get('a_sm_filemanager')) ? 'users/' . $this->user->data['username'] . '/' : '';
+		$this->user_dir = (!$this->auth->acl_get('a_sm_filemanager')) ? 'users/'.$this->user->data['username'].'/' : '';
 
-		$destination = $this->phpbb_root_path . $this->upload_dir . $this->user_dir;
+		$destination = $this->phpbb_root_path.$this->upload_dir.$this->user_dir;
 
 		if (!is_dir($destination))
 		{

services/icon_picker.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 				'@blitze_sitemaker/assets/icons/picker.min.js',
 			),
 			'css'	=> array_filter(array(
-				defined('IN_ADMIN') ? $this->util->get_web_path() . 'assets/css/font-awesome.min.css' : '',
+				defined('IN_ADMIN') ? $this->util->get_web_path().'assets/css/font-awesome.min.css' : '',
 				'@blitze_sitemaker/vendor/jquery-ui/themes/smoothness/jquery-ui.min.css',
 				'@blitze_sitemaker/assets/icons/picker.min.css',
 			))

cron/blocks_cleanup.php

Spacing +4 added lines, -4 removed lines

@@ -91,8 +91,8 @@ 
 	 */
 	private function clean_styles()
 	{
-		$routes_ary	= $this->manager->get_routes_per_style();
-		$style_ids	= $this->get_style_ids();
+		$routes_ary = $this->manager->get_routes_per_style();
+		$style_ids = $this->get_style_ids();
 
 		$routes = array();
 		foreach ($routes_ary as $style_id => $style_routes)
@@ -122,7 +122,7 @@ 
 
 		foreach ($routes as $route => $row)
 		{
-			$url = $board_url . '/' . $row['route'];
+			$url = $board_url.'/'.$row['route'];
 
 			// Route no longer exists => remove all blocks for route
 			if ($this->url_checker->exists($url) !== true)
@@ -185,7 +185,7 @@ 
 
 		if (sizeof($block_ids))
 		{
-			$this->db->sql_query('DELETE FROM ' . $this->cblocks_table . ' WHERE ' . $this->db->sql_in_set('block_id', $block_ids));
+			$this->db->sql_query('DELETE FROM '.$this->cblocks_table.' WHERE '.$this->db->sql_in_set('block_id', $block_ids));
 		}
 	}
 

services/menus/display.php

Spacing +5 added lines, -5 removed lines

@@ -75,10 +75,10 @@ 
 				$row['num_kids'] = $this->count_descendants($row);
 
 				$template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER));
-				$this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth));
+				$this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth));
 			}
 
-			$this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth));
+			$this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth));
 		}
 	}
 
@@ -115,12 +115,12 @@ 
 	 */
 	protected function get_current_path()
 	{
-		$curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
+		$curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
 		$curr_parts = explode('&', $this->user->page['query_string']);
 
 		sort($curr_parts);
 
-		return $curr_page . '?' . join('&', $curr_parts);
+		return $curr_page.'?'.join('&', $curr_parts);
 	}
 
 	/**
@@ -162,7 +162,7 @@ 
 
 			$is_current_item = $this->is_current_item($row);
 			$is_parent = $this->is_parent_of_current_item($row);
-			$this_depth	= $this->parental_depth[$row[$this->column_parent_id]] + 1;
+			$this_depth = $this->parental_depth[$row[$this->column_parent_id]] + 1;
 			$leaf = $this->get_leaf_node($row, $is_current_item, $is_parent);
 
 			$this->parental_depth[$row[$this->pk]] = $this_depth;

acp/menu_module.php

Spacing +5 added lines, -5 removed lines

@@ -97,7 +97,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';
@@ -151,7 +151,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);
 	}
@@ -163,11 +163,11 @@ 
 	protected function get_forums_string(array $forumslist)
 	{
 		$forum_url = $this->controller_helper->route('blitze_sitemaker_forum', array(), true, '', UrlGeneratorInterface::RELATIVE_PATH);
-		$text = $this->language->lang('FORUM') . '|' . $forum_url . "\n";
+		$text = $this->language->lang('FORUM').'|'.$forum_url."\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";
 		}
 

acp/settings_module.php

Spacing +4 added lines, -4 removed lines

@@ -153,7 +153,7 @@ 
 
 			$this->save_filemanager_settings($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);
 
@@ -306,7 +306,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;

Braces +1 added lines, -2 removed lines

@@ -283,8 +283,7 @@
 			unset($settings['image_watermark_coordinates']);
 
 			$this->filemanager->save($settings);
-		}
-		else
+		} else
 		{
 			$config['sm_filemanager'] = 0;
 		}