Completed
Push — master ( be40cf...311379 )
by Daniel
08:20
created
services/menus/action/add_menu.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 
21 21
 		/** @type \blitze\sitemaker\model\menus\entity\menu $entity */
22 22
 		$entity = $menu_mapper->create_entity(array(
23
-			'menu_name' => $this->user->lang('MENU') . '-' . mt_rand(1000, 9999),
23
+			'menu_name' => $this->user->lang('MENU').'-'.mt_rand(1000, 9999),
24 24
 		));
25 25
 
26 26
 		$entity = $menu_mapper->save($entity);
Please login to merge, or discard this patch.
services/profilefields.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
 		if (!function_exists('phpbb_show_profile'))
47 47
 		{
48
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
48
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
49 49
 		}
50 50
 	}
51 51
 
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 	public function get_all_fields()
56 56
 	{
57 57
 		$sql = 'SELECT l.lang_name, f.field_ident
58
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
59
-			WHERE l.lang_id = ' . $this->user->get_iso_lang_id() . '
58
+			FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f
59
+			WHERE l.lang_id = ' . $this->user->get_iso_lang_id().'
60 60
 				AND f.field_active = 1
61 61
 				AND f.field_no_view = 0
62 62
 				AND f.field_hide = 0
Please login to merge, or discard this patch.
services/userlist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,11 +45,11 @@
 block discarded – undo
45 45
 			$curr_key = (int) array_search($settings['current_user'], $userlist);
46 46
 
47 47
 			// Remove the invalid user from the list
48
-			$new_list = str_replace($settings['current_user'] . ',', '', $settings['userlist'] . ',');
48
+			$new_list = str_replace($settings['current_user'].',', '', $settings['userlist'].',');
49 49
 			$new_list = trim($new_list, ',');
50 50
 
51 51
 			$new_userlist = self::_get_userlist($new_list);
52
-			$current_user =& $new_userlist[$curr_key - 1];
52
+			$current_user = & $new_userlist[$curr_key - 1];
53 53
 			$settings['current_user'] = (int) $current_user;
54 54
 			$settings['userlist'] = trim($new_list);
55 55
 			$settings['last_changed'] = 0;
Please login to merge, or discard this patch.
services/groups.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	public function get_users_groups()
36 36
 	{
37 37
 		$sql = 'SELECT group_id
38
-			FROM ' . USER_GROUP_TABLE . '
38
+			FROM ' . USER_GROUP_TABLE.'
39 39
 			WHERE user_id = ' . (int) $this->user->data['user_id'];
40 40
 		$result = $this->db->sql_query($sql);
41 41
 
@@ -78,13 +78,13 @@  discard block
 block discarded – undo
78 78
 		$sql = $this->_get_group_sql($mode);
79 79
 		$result = $this->db->sql_query($sql);
80 80
 
81
-		$options = '<option value="0">' . $this->user->lang('ALL') . '</option>';
81
+		$options = '<option value="0">'.$this->user->lang('ALL').'</option>';
82 82
 		while ($row = $this->db->sql_fetchrow($result))
83 83
 		{
84 84
 			$group_name = $this->_get_group_name($row);
85 85
 			$group_class = $this->_get_group_class($row['group_type']);
86 86
 			$selected_option = $this->_get_selected_option($row['group_id'], $selected);
87
-			$options .= '<option' . $group_class . ' value="' . $row['group_id'] . '"' . $selected_option . '>' . $group_name . '</option>';
87
+			$options .= '<option'.$group_class.' value="'.$row['group_id'].'"'.$selected_option.'>'.$group_name.'</option>';
88 88
 		}
89 89
 		$this->db->sql_freeresult($result);
90 90
 
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 	private function _get_group_sql($mode)
99 99
 	{
100 100
 		return 'SELECT group_id, group_name, group_type 
101
-			FROM ' . GROUPS_TABLE .
102
-			(($mode === 'special') ? ' WHERE group_type = ' . GROUP_SPECIAL : '') . '
101
+			FROM ' . GROUPS_TABLE.
102
+			(($mode === 'special') ? ' WHERE group_type = '.GROUP_SPECIAL : '').'
103 103
 			ORDER BY group_type DESC, group_name ASC';
104 104
 	}
105 105
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 */
110 110
 	private function _get_group_name(array $row)
111 111
 	{
112
-		return ($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang('G_' . $row['group_name']) : ucfirst($row['group_name']);
112
+		return ($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang('G_'.$row['group_name']) : ucfirst($row['group_name']);
113 113
 	}
114 114
 
115 115
 	/**
Please login to merge, or discard this patch.
services/blocks/admin_bar.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
 	public function set_javascript_data($route, $style_id)
97 97
 	{
98 98
 		$board_url = generate_board_url();
99
-		$ajax_url = $board_url . ((!$this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '');
99
+		$ajax_url = $board_url.((!$this->config['enable_mod_rewrite']) ? '/app.'.$this->php_ext : '');
100 100
 
101 101
 		$is_default_route = $u_default_route = false;
102 102
 		if ($this->config['sitemaker_default_layout'])
103 103
 		{
104 104
 			$is_default_route = ($this->config['sitemaker_default_layout'] === $route) ? true : false;
105
-			$u_default_route .= $board_url . '/' . $this->config['sitemaker_default_layout'];
105
+			$u_default_route .= $board_url.'/'.$this->config['sitemaker_default_layout'];
106 106
 			$u_default_route = reapply_sid($u_default_route);
107 107
 		}
108 108
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 			list($controller_service, $controller_method) = explode(':', $controller);
150 150
 			$controller_params	= $symfony_request->attributes->get('_route_params');
151 151
 			$controller_object	= $this->phpbb_container->get($controller_service);
152
-			$controller_class	= get_class($controller_object);
152
+			$controller_class = get_class($controller_object);
153 153
 
154 154
 			$r = new \ReflectionMethod($controller_class, $controller_method);
155 155
 			$class_params = $r->getParameters();
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 				'CONTROLLER_METHOD'	=> $controller_method,
163 163
 				'CONTROLLER_PARAMS'	=> $controller_arguments,
164 164
 				'S_IS_STARTPAGE'	=> $this->is_startpage($controller_service, $controller_arguments),
165
-				'UA_EXTENSION'		=> $namespace . '/' . $extension,
165
+				'UA_EXTENSION'		=> $namespace.'/'.$extension,
166 166
 			));
167 167
 		}
168 168
 	}
@@ -197,11 +197,11 @@  discard block
 block discarded – undo
197 197
 	{
198 198
 		$routes_ary = $this->get_routes();
199 199
 
200
-		$options = '<option value="">' . $this->user->lang('SELECT') . '</option>';
200
+		$options = '<option value="">'.$this->user->lang('SELECT').'</option>';
201 201
 		foreach ($routes_ary as $route)
202 202
 		{
203 203
 			$selected = ($route == $current_route) ? ' selected="selected"' : '';
204
-			$options .= '<option value="' . $route . '"' . $selected . '>' . $route . '</option>';
204
+			$options .= '<option value="'.$route.'"'.$selected.'>'.$route.'</option>';
205 205
 		}
206 206
 
207 207
 		return $options;
@@ -215,10 +215,10 @@  discard block
 block discarded – undo
215 215
 	 */
216 216
 	public function get_excluded_position_options(array $ex_positions)
217 217
 	{
218
-		$options = '<option value=""' . ((!sizeof($ex_positions)) ? ' selected="selected"' : '') . '>' . $this->user->lang('NONE') . '</option>';
218
+		$options = '<option value=""'.((!sizeof($ex_positions)) ? ' selected="selected"' : '').'>'.$this->user->lang('NONE').'</option>';
219 219
 		foreach ($ex_positions as $position)
220 220
 		{
221
-			$options .= '<option value="' . $position . '" selected="selected">' . $position . '</option>';
221
+			$options .= '<option value="'.$position.'" selected="selected">'.$position.'</option>';
222 222
 		}
223 223
 
224 224
 		return $options;
Please login to merge, or discard this patch.
services/blocks/cfg_fields.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,12 +35,12 @@  discard block
 block discarded – undo
35 35
 	public function build_multi_select(array $option_ary, $selected_items, $field)
36 36
 	{
37 37
 		$selected_items = $this->ensure_array($selected_items);
38
-		$html = '<select id="' . $field . '" name="config[' . $field . '][]" multiple="multiple">';
38
+		$html = '<select id="'.$field.'" name="config['.$field.'][]" multiple="multiple">';
39 39
 		foreach ($option_ary as $value => $title)
40 40
 		{
41 41
 			$title = $this->user->lang($title);
42 42
 			$selected = $this->get_selected_option($value, $selected_items);
43
-			$html .= '<option value="' . $value . '"' . $selected . '>' . $title . '</option>';
43
+			$html .= '<option value="'.$value.'"'.$selected.'>'.$title.'</option>';
44 44
 		}
45 45
 		$html .= '</select>';
46 46
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 		{
100 100
 			$title = $this->user->lang($title);
101 101
 			$selected = $this->get_selected_option($value, $selected_item, 'checked');
102
-			$html .= '<label><input type="radio" name="config[' . $key . ']" value="' . $value . '"' . $selected . ' class="radio" /> ' . $title . '</label><br />';
102
+			$html .= '<label><input type="radio" name="config['.$key.']" value="'.$value.'"'.$selected.' class="radio" /> '.$title.'</label><br />';
103 103
 		}
104 104
 
105 105
 		return $html;
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	public function build_hidden($value, $field)
116 116
 	{
117
-		return '<input type="hidden" name="config[' . $field . ']" value="' . $value . '" />';
117
+		return '<input type="hidden" name="config['.$field.']" value="'.$value.'" />';
118 118
 	}
119 119
 
120 120
 	/**
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 	 */
155 155
 	protected function get_selected_option($needle, array $haystack, $type = 'selected')
156 156
 	{
157
-		return (in_array($needle, $haystack)) ? ' ' . $type . '="' . $type . '"' : '';
157
+		return (in_array($needle, $haystack)) ? ' '.$type.'="'.$type.'"' : '';
158 158
 	}
159 159
 
160 160
 	/**
@@ -167,12 +167,12 @@  discard block
 block discarded – undo
167 167
 	 */
168 168
 	protected function get_checkbox_column(array $row, array $selected_items, $field, $column_count, $column_class)
169 169
 	{
170
-		$column = '<div class="' . $column_class . $field . '-checkbox" id="' . $field . '-col-' . $column_count . '">';
170
+		$column = '<div class="'.$column_class.$field.'-checkbox" id="'.$field.'-col-'.$column_count.'">';
171 171
 		foreach ($row as $value => $title)
172 172
 		{
173 173
 			$title = $this->user->lang($title);
174 174
 			$selected = $this->get_selected_option($value, $selected_items, 'checked');
175
-			$column .= '<label><input type="checkbox" name="config[' . $field . '][]" value="' . $value . '"' . $selected . ' accesskey="' . $field . '" class="checkbox" /> ' . $title . '</label><br />';
175
+			$column .= '<label><input type="checkbox" name="config['.$field.'][]" value="'.$value.'"'.$selected.' accesskey="'.$field.'" class="checkbox" /> '.$title.'</label><br />';
176 176
 		}
177 177
 		$column .= '</div>';
178 178
 
Please login to merge, or discard this patch.
services/blocks/cfg_handler.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 		if (!function_exists('build_cfg_template'))
64 64
 		{
65
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext); // @codeCoverageIgnore
65
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext); // @codeCoverageIgnore
66 66
 		}
67 67
 
68 68
 		// We fake this class as it is needed by the build_cfg_template function
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 		// @codeCoverageIgnoreStart
84 84
 		if (!function_exists('validate_config_vars'))
85 85
 		{
86
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
86
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
87 87
 		}
88 88
 		// @codeCoverageIgnoreEnd
89 89
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 		$vars['append'] = $this->append_field($vars);
172 172
 
173 173
 		$type = explode(':', $vars['type']);
174
-		$method = 'prep_' . $type[0] . '_field_for_display';
174
+		$method = 'prep_'.$type[0].'_field_for_display';
175 175
 
176 176
 		if (is_callable(array($this, $method)))
177 177
 		{
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 		$l_explain = '';
216 216
 		if (!empty($vars['explain']))
217 217
 		{
218
-			$l_explain = (isset($vars['lang_explain'])) ? $this->user->lang($vars['lang_explain']) : $this->user->lang($vars['lang'] . '_EXPLAIN');
218
+			$l_explain = (isset($vars['lang_explain'])) ? $this->user->lang($vars['lang_explain']) : $this->user->lang($vars['lang'].'_EXPLAIN');
219 219
 		}
220 220
 
221 221
 		return $l_explain;
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 	{
318 318
 		$this->prep_checkbox_field_for_display($vars, $type, $field);
319 319
 
320
-		$vars['method'] ='build_multi_select';
320
+		$vars['method'] = 'build_multi_select';
321 321
 	}
322 322
 
323 323
 	/**
Please login to merge, or discard this patch.
exception/base.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,10 +100,10 @@
 block discarded – undo
100 100
 		foreach ($message_portions as &$message)
101 101
 		{
102 102
 			// Attempt to translate each portion
103
-			$translated_message = $user->lang('EXCEPTION_' . $message);
103
+			$translated_message = $user->lang('EXCEPTION_'.$message);
104 104
 
105 105
 			// Check if translating did anything
106
-			if ($translated_message !== 'EXCEPTION_' . $message)
106
+			if ($translated_message !== 'EXCEPTION_'.$message)
107 107
 			{
108 108
 				// It did, so replace message with the translated version
109 109
 				$message = $translated_message;
Please login to merge, or discard this patch.
blocks/featured_member.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -141,10 +141,10 @@  discard block
 block discarded – undo
141 141
 	private function get_user_data($change_user)
142 142
 	{
143 143
 		$sql = 'SELECT user_id, username, user_colour, user_avatar, user_avatar_type, user_avatar_height, user_avatar_width, user_regdate, user_lastvisit, user_birthday, user_posts, user_rank
144
-			FROM ' . USERS_TABLE . '
144
+			FROM ' . USERS_TABLE.'
145 145
 			WHERE ' . $this->db->sql_in_set('user_type', array(USER_NORMAL, USER_FOUNDER));
146 146
 
147
-		$method = 'query_' . $this->settings['qtype'];
147
+		$method = 'query_'.$this->settings['qtype'];
148 148
 
149 149
 		if (is_callable(array($this, $method)))
150 150
 		{
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 	 */
169 169
 	private function query_featured(&$sql, $change_user)
170 170
 	{
171
-		$sql .= ' AND user_id = ' . userlist::get_user_id($this->settings, $change_user);
171
+		$sql .= ' AND user_id = '.userlist::get_user_id($this->settings, $change_user);
172 172
 	}
173 173
 
174 174
 	/**
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 	private function change_user()
204 204
 	{
205 205
 		$change = false;
206
-		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 ' . self::$rotations[$this->settings['rotation']]))
206
+		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 '.self::$rotations[$this->settings['rotation']]))
207 207
 		{
208 208
 			$this->settings['last_changed'] = time();
209 209
 			$change = true;
@@ -220,8 +220,8 @@  discard block
 block discarded – undo
220 220
 		$rotation = $this->settings['rotation'];
221 221
 
222 222
 		$this->ptemplate->assign_vars(array(
223
-			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->user->lang('QTYPE_' . strtoupper($query_type)) : '',
224
-			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->user->lang(strtoupper($rotation) . '_MEMBER') : '',
223
+			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->user->lang('QTYPE_'.strtoupper($query_type)) : '',
224
+			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->user->lang(strtoupper($rotation).'_MEMBER') : '',
225 225
 		));
226 226
 	}
227 227
 
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 	 */
232 232
 	private function get_settings(array $bdata)
233 233
 	{
234
-		$cached_settings = $this->cache->get('pt_block_data_' . $bdata['bid']);
234
+		$cached_settings = $this->cache->get('pt_block_data_'.$bdata['bid']);
235 235
 		$settings = ($cached_settings && $cached_settings['hash'] === $bdata['hash']) ? $cached_settings : $bdata['settings'];
236 236
 		$settings['hash'] = $bdata['hash'];
237 237
 
@@ -251,8 +251,8 @@  discard block
 block discarded – undo
251 251
 			$sql_data = array(
252 252
 				'settings'	=> json_encode($settings)
253 253
 			);
254
-			$this->db->sql_query('UPDATE ' . $this->blocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE bid = ' . (int) $bid);
255
-			$this->cache->put('pt_block_data_' . $bid, $this->settings);
254
+			$this->db->sql_query('UPDATE '.$this->blocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE bid = '.(int) $bid);
255
+			$this->cache->put('pt_block_data_'.$bid, $this->settings);
256 256
 		}
257 257
 	}
258 258
 
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 			'RANK_TITLE'		=> $rank['title'],
306 306
 			'RANK_IMG'			=> $rank['img'],
307 307
 			'U_PROFILE'			=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
308
-			'U_SEARCH_USER'		=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id={$row['user_id']}&amp;sr=posts"),
308
+			'U_SEARCH_USER'		=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id={$row['user_id']}&amp;sr=posts"),
309 309
 		));
310 310
 
311 311
 		return $tpl_data;
Please login to merge, or discard this patch.