blitze / phpBB-ext-sitemaker

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

services/menus/display.php

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 			$this->find_parents($data, $row['parent_id']);
 		}
 	}
-	*/
+	 */
 
 	/**
 	 * @param array $data

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
 	 * @param string $handle
 	 * @return void
 	 */
-	public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
+	public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
 	{
 		$this->set_current_item($data);
 		$this->prepare_items($data['items']);
@@ -85,10 +85,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));
 		}
 	}
 
@@ -156,12 +156,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);
 	}
 
 	/**
@@ -203,7 +203,7 @@ 
 
 			$is_current_item = $this->is_current_item($row);
 			$is_parent = $this->is_parent_of_current_item($row);
-			$this_depth	= $this->parental_depth[$row['parent_id']] + 1;
+			$this_depth = $this->parental_depth[$row['parent_id']] + 1;
 			$leaf = $this->get_leaf_node($row, $is_current_item, $is_parent);
 
 			$this->parental_depth[$row[$this->pk]] = $this_depth;
@@ -284,7 +284,7 @@ 
 	 * @param int $repeat
 	 * @return void
 	 */
-	protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat)
+	protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat)
 	{
 		for ($i = 0; $i < $repeat; $i++)
 		{

event/startpage.php

Spacing +2 added lines, -2 removed lines

@@ -120,13 +120,13 @@
 	 */
 	public function set_startpage()
 	{
-		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']);

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');
 		$event['permissions'] = $permissions;
 	}
 
@@ -79,7 +79,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 +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 <= ' . $this->time();
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.$this->time();
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.');
 		}
 	}

services/blocks/admin_bar.php

Spacing +8 added lines, -8 removed lines

@@ -106,13 +106,13 @@ 
 	public function set_javascript_data($route, $style_id)
 	{
 		$board_url = generate_board_url();
-		$ajax_url = $board_url . ((!$this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '');
+		$ajax_url = $board_url.((!$this->config['enable_mod_rewrite']) ? '/app.'.$this->php_ext : '');
 
 		$is_default_route = $u_default_route = false;
 		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);
 		}
 
@@ -128,7 +128,7 @@ 
 			'UA_SCRIPT_PATH'	=> $this->user->page['root_script_path'],
 			'UA_WEB_ROOT_PATH'	=> $this->util->get_web_path(),
 			'UA_FILEMANAGER'	=> $this->can_use_filemanager(),
-			'UA_RF_ACCESS_KEY'	=> sha1($this->user->data['user_form_salt'] . 'filemanager'),
+			'UA_RF_ACCESS_KEY'	=> sha1($this->user->data['user_form_salt'].'filemanager'),
 
 			'U_VIEW_DEFAULT'	=> $u_default_route,
 		));
@@ -163,7 +163,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();
@@ -176,7 +176,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,
 			));
 		}
 	}
@@ -211,11 +211,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;
@@ -232,7 +232,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;

acp/settings_module.php

Spacing +6 added lines, -6 removed lines

@@ -83,7 +83,7 @@ 
 		$this->mapper_factory = $phpbb_container->get('blitze.sitemaker.mapper.factory');
 		$this->trigger_errors = $trigger_errors;
 
-		$this->filemanager_config_file = $this->phpbb_root_path . 'ext/blitze/sitemaker/styles/all/theme/vendor/ResponsiveFilemanager/filemanager/config/config.' . $this->php_ext;
+		$this->filemanager_config_file = $this->phpbb_root_path.'ext/blitze/sitemaker/styles/all/theme/vendor/ResponsiveFilemanager/filemanager/config/config.'.$this->php_ext;
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 			$this->save_filemanager_settings();
 			$this->save_config_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));
 		}
 
 		add_form_key($form_key);
@@ -139,7 +139,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))
@@ -217,7 +217,7 @@ 
 			$path = dirname($path);
 			$name = basename($path);
 
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
 		}
 		ksort($layouts);
 
@@ -280,7 +280,7 @@ 
 	protected function type_cast_filemanager_config_value($curr_val, &$value)
 	{
 		$type = gettype($curr_val);
-		switch($type)
+		switch ($type)
 		{
 			case 'string':
 				$value = "'$value'";
@@ -307,7 +307,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;

controller/upload.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
 		}
 		else
 		{
-			$this->set_file_permissions($upload_dir . $file->get('realname'));
+			$this->set_file_permissions($upload_dir.$file->get('realname'));
 			$json_data['location'] = $file->get('realname');
 		}
 
@@ -89,7 +89,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 = '';
@@ -108,7 +108,7 @@ 
 	 */
 	protected function get_file()
 	{
-		$upload_dir = $this->phpbb_root_path . 'images/sitemaker_uploads/source/';
+		$upload_dir = $this->phpbb_root_path.'images/sitemaker_uploads/source/';
 
 		$file = $this->files_factory->get('files.upload')
 			->set_disallowed_content(array())

Braces +1 added lines, -2 removed lines

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