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/data.php

Spacing +5 added lines, -5 removed lines

@@ -84,7 +84,7 @@ 
 			$this->store['topic'][$row['topic_id']] = $row;
 
 			$this->store['tracking'][$row['forum_id']]['topic_list'][] = $row['topic_id'];
-			$this->store['tracking'][$row['forum_id']]['mark_time'] =& $row['forum_mark_time'];
+			$this->store['tracking'][$row['forum_id']]['mark_time'] = & $row['forum_mark_time'];
 			$this->store['post_ids']['first'][] = $row['topic_first_post_id'];
 			$this->store['post_ids']['last'][] = $row['topic_last_post_id'];
 		}
@@ -319,10 +319,10 @@ 
 	private function _get_attachment_sql($allowed_extensions, $exclude_in_message, $order_by)
 	{
 		return 'SELECT *
-			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('post_msg_id', $this->store['attachments']) .
-				(($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', $this->store['attachments']).
+				(($exclude_in_message) ? ' AND in_message = 0' : '').
+				(sizeof($allowed_extensions) ? ' AND '.$this->db->sql_in_set('extension', $allowed_extensions) : '').'
 			ORDER BY ' . $order_by;
 	}
 }

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;

exception/base.php

Spacing +2 added lines, -2 removed lines

@@ -100,10 +100,10 @@
 		foreach ($message_portions as &$message)
 		{
 			// Attempt to translate each portion
-			$translated_message = $user->lang('EXCEPTION_' . $message);
+			$translated_message = $user->lang('EXCEPTION_'.$message);
 
 			// Check if translating did anything
-			if ($translated_message !== 'EXCEPTION_' . $message)
+			if ($translated_message !== 'EXCEPTION_'.$message)
 			{
 				// It did, so replace message with the translated version
 				$message = $translated_message;

blocks/forum_topics.php

Spacing +4 added lines, -4 removed lines

@@ -139,7 +139,7 @@ 
 	{
 		$this->set_display_fields();
 
-		$view = 'S_' . strtoupper($this->settings['template']);
+		$view = 'S_'.strtoupper($this->settings['template']);
 		$post_data = $this->get_post_data($topic_data);
 		$topic_data = array_values($topic_data);
 
@@ -164,7 +164,7 @@ 
 	{
 		for ($i = 0, $size = sizeof($topic_data); $i < $size; $i++)
 		{
-			$row =& $topic_data[$i];
+			$row = & $topic_data[$i];
 			$forum_id = $row['forum_id'];
 			$topic_id = $row['topic_id'];
 
@@ -179,8 +179,8 @@ 
 				'VIEWS'				=> $row['topic_views'],
 				'S_UNREAD_TOPIC'	=> $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']),
 
-				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id"),
-				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"),
+				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id"),
+				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"),
 			);
 
 			$this->ptemplate->assign_block_vars('topicrow', $tpl_ary);