blitze / phpBB-ext-sitemaker

event/listener.php

Spacing +5 added lines, -5 removed lines

@@ -112,8 +112,8 @@ 
 	public function load_permission_language(\phpbb\event\data $event)
 	{
 		$permissions = $event['permissions'];
-		$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_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;
 	}
 
@@ -192,13 +192,13 @@ 
 	 */
 	public function set_startpage(\phpbb\event\data $event)
 	{
-		if ($this->user->page['page_name'] == 'index.' . $this->php_ext && !$this->startpage && ($controller_object = $this->get_startpage_controller()) !== false)
+		if ($this->user->page['page_name'] == 'index.'.$this->php_ext && !$this->startpage && ($controller_object = $this->get_startpage_controller()) !== false)
 		{
 			$method = $this->config['sitemaker_startpage_method'];
 			$this->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']);
@@ -219,7 +219,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->user->lang('FORUM_INDEX');
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');

services/forum/query_builder.php

Spacing +10 added lines, -10 removed lines

@@ -142,7 +142,7 @@ 
 
 		if (in_array($topic_type, array(POST_STICKY, POST_ANNOUNCE)))
 		{
-			$this->store['sql_array']['WHERE'][] = '(t.topic_time_limit > 0 AND (t.topic_time + t.topic_time_limit) < ' . time() . ')';
+			$this->store['sql_array']['WHERE'][] = '(t.topic_time_limit > 0 AND (t.topic_time + t.topic_time_limit) < '.time().')';
 		}
 
 		return $this;
@@ -160,13 +160,13 @@ 
 			$this->store['sql_array']['SELECT'][] = 'tw.notify_status';
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
 				'FROM'	=> array(TOPICS_WATCH_TABLE => 'tw'),
-				'ON'	=> 'tw.user_id = ' . $this->user->data['user_id'] . ' AND t.topic_id = tw.topic_id'
+				'ON'	=> 'tw.user_id = '.$this->user->data['user_id'].' AND t.topic_id = tw.topic_id'
 			);
 
 			$this->store['sql_array']['SELECT'][] = 'fw.notify_status';
 			$this->store['sql_array']['LEFT JOIN'][] = array(
 				'FROM'	=> array(FORUMS_WATCH_TABLE => 'fw'),
-				'ON'	=> '(fw.forum_id = f.forum_id AND fw.user_id = ' . $this->user->data['user_id'] . ')',
+				'ON'	=> '(fw.forum_id = f.forum_id AND fw.user_id = '.$this->user->data['user_id'].')',
 			);
 		}
 
@@ -185,7 +185,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 = ' . $this->user->data['user_id'] . ' AND t.topic_id = bm.topic_id'
+				'ON'	=> 'bm.user_id = '.$this->user->data['user_id'].' AND t.topic_id = bm.topic_id'
 			);
 		}
 
@@ -206,12 +206,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'
 			);
 		}
 
@@ -230,7 +230,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;
@@ -262,7 +262,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;
 	}
@@ -323,7 +323,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;
 		}
 	}
 
@@ -334,7 +334,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.');
 		}
 	}

services/menus/action/add_menu.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 		/** @type \blitze\sitemaker\model\menus\entity\menu $entity */
 		$entity = $menu_mapper->create_entity(array(
-			'menu_name' => $this->user->lang('MENU') . '-' . mt_rand(1000, 9999),
+			'menu_name' => $this->user->lang('MENU').'-'.mt_rand(1000, 9999),
 		));
 
 		$entity = $menu_mapper->save($entity);

services/profilefields.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 
 		if (!function_exists('phpbb_show_profile'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
 		}
 	}
 
@@ -55,8 +55,8 @@ 
 	public function get_all_fields()
 	{
 		$sql = 'SELECT l.lang_name, f.field_ident
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
-			WHERE l.lang_id = ' . $this->user->get_iso_lang_id() . '
+			FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f
+			WHERE l.lang_id = ' . $this->user->get_iso_lang_id().'
 				AND f.field_active = 1
 				AND f.field_no_view = 0
 				AND f.field_hide = 0

services/userlist.php

Spacing +2 added lines, -2 removed lines

@@ -45,11 +45,11 @@
 			$curr_key = (int) array_search($settings['current_user'], $userlist);
 
 			// Remove the invalid user from the list
-			$new_list = str_replace($settings['current_user'] . ',', '', $settings['userlist'] . ',');
+			$new_list = str_replace($settings['current_user'].',', '', $settings['userlist'].',');
 			$new_list = trim($new_list, ',');
 
 			$new_userlist = self::_get_userlist($new_list);
-			$current_user =& $new_userlist[$curr_key - 1];
+			$current_user = & $new_userlist[$curr_key - 1];
 			$settings['current_user'] = (int) $current_user;
 			$settings['userlist'] = trim($new_list);
 			$settings['last_changed'] = 0;

services/groups.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 	public function get_users_groups()
 	{
 		$sql = 'SELECT group_id
-			FROM ' . USER_GROUP_TABLE . '
+			FROM ' . USER_GROUP_TABLE.'
 			WHERE user_id = ' . (int) $this->user->data['user_id'];
 		$result = $this->db->sql_query($sql);
 
@@ -78,13 +78,13 @@ 
 		$sql = $this->_get_group_sql($mode);
 		$result = $this->db->sql_query($sql);
 
-		$options = '<option value="0">' . $this->user->lang('ALL') . '</option>';
+		$options = '<option value="0">'.$this->user->lang('ALL').'</option>';
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$group_name = $this->_get_group_name($row);
 			$group_class = $this->_get_group_class($row['group_type']);
 			$selected_option = $this->_get_selected_option($row['group_id'], $selected);
-			$options .= '<option' . $group_class . ' value="' . $row['group_id'] . '"' . $selected_option . '>' . $group_name . '</option>';
+			$options .= '<option'.$group_class.' value="'.$row['group_id'].'"'.$selected_option.'>'.$group_name.'</option>';
 		}
 		$this->db->sql_freeresult($result);
 
@@ -98,8 +98,8 @@ 
 	private function _get_group_sql($mode)
 	{
 		return 'SELECT group_id, group_name, group_type 
-			FROM ' . GROUPS_TABLE .
-			(($mode === 'special') ? ' WHERE group_type = ' . GROUP_SPECIAL : '') . '
+			FROM ' . GROUPS_TABLE.
+			(($mode === 'special') ? ' WHERE group_type = '.GROUP_SPECIAL : '').'
 			ORDER BY group_type DESC, group_name ASC';
 	}
 
@@ -109,7 +109,7 @@ 
 	 */
 	private function _get_group_name(array $row)
 	{
-		return ($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang('G_' . $row['group_name']) : ucfirst($row['group_name']);
+		return ($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang('G_'.$row['group_name']) : ucfirst($row['group_name']);
 	}
 
 	/**

services/blocks/admin_bar.php

Spacing +8 added lines, -8 removed lines

@@ -96,13 +96,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);
 		}
 
@@ -149,7 +149,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();
@@ -162,7 +162,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,
 			));
 		}
 	}
@@ -197,11 +197,11 @@ 
 	{
 		$routes_ary = $this->get_routes();
 
-		$options = '<option value="">' . $this->user->lang('SELECT') . '</option>';
+		$options = '<option value="">'.$this->user->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;
@@ -215,10 +215,10 @@ 
 	 */
 	public function get_excluded_position_options(array $ex_positions)
 	{
-		$options = '<option value=""' . ((!sizeof($ex_positions)) ? ' selected="selected"' : '') . '>' . $this->user->lang('NONE') . '</option>';
+		$options = '<option value=""'.((!sizeof($ex_positions)) ? ' selected="selected"' : '').'>'.$this->user->lang('NONE').'</option>';
 		foreach ($ex_positions as $position)
 		{
-			$options .= '<option value="' . $position . '" selected="selected">' . $position . '</option>';
+			$options .= '<option value="'.$position.'" selected="selected">'.$position.'</option>';
 		}
 
 		return $options;

services/blocks/cfg_fields.php

Spacing +7 added lines, -7 removed lines

@@ -35,12 +35,12 @@ 
 	public function build_multi_select(array $option_ary, $selected_items, $field)
 	{
 		$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)
 		{
 			$title = $this->user->lang($title);
 			$selected = $this->get_selected_option($value, $selected_items);
-			$html .= '<option value="' . $value . '"' . $selected . '>' . $title . '</option>';
+			$html .= '<option value="'.$value.'"'.$selected.'>'.$title.'</option>';
 		}
 		$html .= '</select>';
 
@@ -99,7 +99,7 @@ 
 		{
 			$title = $this->user->lang($title);
 			$selected = $this->get_selected_option($value, $selected_item, 'checked');
-			$html .= '<label><input type="radio" name="config[' . $key . ']" value="' . $value . '"' . $selected . ' class="radio" /> ' . $title . '</label><br />';
+			$html .= '<label><input type="radio" name="config['.$key.']" value="'.$value.'"'.$selected.' class="radio" /> '.$title.'</label><br />';
 		}
 
 		return $html;
@@ -114,7 +114,7 @@ 
 	 */
 	public function build_hidden($value, $field)
 	{
-		return '<input type="hidden" name="config[' . $field . ']" value="' . $value . '" />';
+		return '<input type="hidden" name="config['.$field.']" value="'.$value.'" />';
 	}
 
 	/**
@@ -154,7 +154,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.'"' : '';
 	}
 
 	/**
@@ -167,12 +167,12 @@ 
 	 */
 	protected function get_checkbox_column(array $row, array $selected_items, $field, $column_count, $column_class)
 	{
-		$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->user->lang($title);
 			$selected = $this->get_selected_option($value, $selected_items, 'checked');
-			$column .= '<label><input type="checkbox" name="config[' . $field . '][]" value="' . $value . '"' . $selected . ' accesskey="' . $field . '" class="checkbox" /> ' . $title . '</label><br />';
+			$column .= '<label><input type="checkbox" name="config['.$field.'][]" value="'.$value.'"'.$selected.' accesskey="'.$field.'" class="checkbox" /> '.$title.'</label><br />';
 		}
 		$column .= '</div>';
 

services/blocks/cfg_handler.php

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
 
 		if (!function_exists('build_cfg_template'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext); // @codeCoverageIgnore
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext); // @codeCoverageIgnore
 		}
 
 		// We fake this class as it is needed by the build_cfg_template function
@@ -83,7 +83,7 @@ 
 		// @codeCoverageIgnoreStart
 		if (!function_exists('validate_config_vars'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
 		}
 		// @codeCoverageIgnoreEnd
 
@@ -171,7 +171,7 @@ 
 		$vars['append'] = $this->append_field($vars);
 
 		$type = explode(':', $vars['type']);
-		$method = 'prep_' . $type[0] . '_field_for_display';
+		$method = 'prep_'.$type[0].'_field_for_display';
 
 		if (is_callable(array($this, $method)))
 		{
@@ -215,7 +215,7 @@ 
 		$l_explain = '';
 		if (!empty($vars['explain']))
 		{
-			$l_explain = (isset($vars['lang_explain'])) ? $this->user->lang($vars['lang_explain']) : $this->user->lang($vars['lang'] . '_EXPLAIN');
+			$l_explain = (isset($vars['lang_explain'])) ? $this->user->lang($vars['lang_explain']) : $this->user->lang($vars['lang'].'_EXPLAIN');
 		}
 
 		return $l_explain;
@@ -317,7 +317,7 @@ 
 	{
 		$this->prep_checkbox_field_for_display($vars, $type, $field);
 
-		$vars['method'] ='build_multi_select';
+		$vars['method'] = 'build_multi_select';
 	}
 
 	/**