Completed
Pull Request — master (#26)
by Daniel
18:51 queued 15:30
created
services/forum/query_builder.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -202,12 +202,12 @@  discard block
 block discarded – undo
202 202
 			$this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time';
203 203
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
204 204
 				'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
205
-				'ON'	=> 'tt.user_id = ' . $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
205
+				'ON'	=> 'tt.user_id = '.$this->user->data['user_id'].' AND t.topic_id = tt.topic_id'
206 206
 			);
207 207
 
208 208
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
209 209
 				'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
210
-				'ON'	=> 'ft.user_id = ' . $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
210
+				'ON'	=> 'ft.user_id = '.$this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
211 211
 			);
212 212
 		}
213 213
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	{
227 227
 		if ($unix_start_time && $unix_stop_time)
228 228
 		{
229
-			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time";
229
+			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time";
230 230
 		}
231 231
 
232 232
 		return $this;
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 	 */
259 259
 	public function set_sorting($sort_key, $sort_dir = 'DESC')
260 260
 	{
261
-		$this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir;
261
+		$this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir;
262 262
 
263 263
 		return $this;
264 264
 	}
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 	{
320 320
 		if (!empty($column_id))
321 321
 		{
322
-			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id;
322
+			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id;
323 323
 		}
324 324
 	}
325 325
 
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 	{
331 331
 		if ($check_visibility)
332 332
 		{
333
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . time();
333
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.time();
334 334
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.');
335 335
 		}
336 336
 	}
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
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 		// @codeCoverageIgnoreStart
64 64
 		if (!function_exists('validate_config_vars'))
65 65
 		{
66
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
66
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
67 67
 		}
68 68
 		// @codeCoverageIgnoreEnd
69 69
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		// @codeCoverageIgnoreStart
86 86
 		if (!function_exists('validate_config_vars'))
87 87
 		{
88
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
88
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
89 89
 		}
90 90
 		// @codeCoverageIgnoreEnd
91 91
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 		$vars['append'] = $this->append_field($vars);
174 174
 
175 175
 		$type = explode(':', $vars['type']);
176
-		$method = 'prep_' . $type[0] . '_field_for_display';
176
+		$method = 'prep_'.$type[0].'_field_for_display';
177 177
 
178 178
 		if (is_callable(array($this, $method)))
179 179
 		{
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		$l_explain = '';
218 218
 		if (!empty($vars['explain']))
219 219
 		{
220
-			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'] . '_EXPLAIN');
220
+			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'].'_EXPLAIN');
221 221
 		}
222 222
 
223 223
 		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.
blocks/forum_topics.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	{
142 142
 		$this->set_display_fields();
143 143
 
144
-		$view = 'S_' . strtoupper($this->settings['template']);
144
+		$view = 'S_'.strtoupper($this->settings['template']);
145 145
 		$post_data = $this->get_post_data($topic_data);
146 146
 		$topic_data = array_values($topic_data);
147 147
 
@@ -189,10 +189,10 @@  discard block
 block discarded – undo
189 189
 				'VIEWS'				=> $row['topic_views'],
190 190
 				'S_UNREAD_TOPIC'	=> $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']),
191 191
 
192
-				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id"),
193
-				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"),
194
-				'U_NEW_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;view=unread") . '#unread',
195
-				'U_LAST_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;p=" . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
192
+				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id"),
193
+				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"),
194
+				'U_NEW_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;view=unread").'#unread',
195
+				'U_LAST_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;p=".$row['topic_last_post_id']).'#p'.$row['topic_last_post_id'],
196 196
 			));
197 197
 			unset($topic_data[$i], $post_data[$topic_id]);
198 198
 		}
Please login to merge, or discard this patch.
blocks/member_menu.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
 				'USER_POSTS'	=> $this->user->data['user_posts'],
69 69
 				'NEW_POSTS'		=> $this->get_new_posts_count(),
70 70
 
71
-				'U_PROFILE'		=> append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile&amp;u=' . $this->user->data['user_id']),
72
-				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=newposts'),
73
-				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=egosearch'),
74
-				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'i=pm&amp;folder=inbox'),
75
-				'U_LOGOUT'		=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'mode=logout', true, $this->user->session_id),
71
+				'U_PROFILE'		=> append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile&amp;u='.$this->user->data['user_id']),
72
+				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=newposts'),
73
+				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=egosearch'),
74
+				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'i=pm&amp;folder=inbox'),
75
+				'U_LOGOUT'		=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'mode=logout', true, $this->user->session_id),
76 76
 				'U_MCP' 		=> $this->get_mcp_url(),
77 77
 				'U_ACP'			=> $this->get_acp_url(),
78 78
 			));
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	protected function get_mcp_url()
101 101
 	{
102
-		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, false, true, $this->user->session_id) : '';
102
+		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, false, true, $this->user->session_id) : '';
103 103
 	}
104 104
 
105 105
 	/**
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 */
108 108
 	protected function get_acp_url()
109 109
 	{
110
-		return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path . 'adm/index.' . $this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '';
110
+		return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path.'adm/index.'.$this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '';
111 111
 	}
112 112
 
113 113
 	/**
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 				POSTS_TABLE		=> 'p',
121 121
 			),
122 122
 			'WHERE'		=> array(
123
-				't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'],
123
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
124 124
 			),
125 125
 		);
126 126
 
Please login to merge, or discard this patch.
services/util.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 */
104 104
 	public function get_default_avatar()
105 105
 	{
106
-		return '<img src="' . $this->get_theme_path() . '/images/no_avatar.gif" alt="" />';
106
+		return '<img src="'.$this->get_theme_path().'/images/no_avatar.gif" alt="" />';
107 107
 	}
108 108
 
109 109
 	/**
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	public function get_theme_path()
114 114
 	{
115 115
 		$web_path = $this->get_web_path();
116
-		return "{$web_path}styles/" . rawurlencode($this->user->style['style_path']) . '/theme';
116
+		return "{$web_path}styles/".rawurlencode($this->user->style['style_path']).'/theme';
117 117
 	}
118 118
 
119 119
 	/**
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 	public function get_web_path()
124 124
 	{
125 125
 		// Determine board url - we may need it later
126
-		$board_url = generate_board_url() . '/';
126
+		$board_url = generate_board_url().'/';
127 127
 
128 128
 		$corrected_path = $this->path_helper->get_web_root_path();
129 129
 		return (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;
Please login to merge, or discard this patch.
services/tree/display.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	{
80 80
 		$sql = "SELECT *
81 81
 			FROM $this->items_table
82
-			WHERE $this->pk = " . (int) $node_id ;
82
+			WHERE $this->pk = ".(int) $node_id;
83 83
 		$result = $this->db->sql_query($sql);
84 84
 		$row = $this->db->sql_fetchrow($result);
85 85
 		$this->db->sql_freeresult($result);
@@ -108,8 +108,8 @@  discard block
 block discarded – undo
108 108
 					$this->items_table => 'i'
109 109
 				),
110 110
 				'WHERE'		=> array(
111
-					'i.depth ' . (($max_depth) ? " BETWEEN $start AND " . ($start + $max_depth) : ' >= ' . $start),
112
-					(($this->sql_where) ? 'i.' . $this->sql_where : ''),
111
+					'i.depth '.(($max_depth) ? " BETWEEN $start AND ".($start + $max_depth) : ' >= '.$start),
112
+					(($this->sql_where) ? 'i.'.$this->sql_where : ''),
113 113
 				),
114 114
 				'ORDER_BY'	=> 'i.left_id ASC',
115 115
 			),
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	 * @param \phpbb\template\twig\twig $template
156 156
 	 * @param string $handle
157 157
 	 */
158
-	public function display_list(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
158
+	public function display_list(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
159 159
 	{
160 160
 		$prev_depth = 0;
161 161
 		$parental_depth = array(0 => -1);
@@ -164,10 +164,10 @@  discard block
 block discarded – undo
164 164
 		for ($i = 0, $size = sizeof($data); $i < $size; $i++)
165 165
 		{
166 166
 			$row 		= $data[$i];
167
-			$this_depth	= $parental_depth[$row['parent_id']] + 1;
168
-			$repeat		= abs($prev_depth - $this_depth);
167
+			$this_depth = $parental_depth[$row['parent_id']] + 1;
168
+			$repeat = abs($prev_depth - $this_depth);
169 169
 
170
-			$tpl_data	= array(
170
+			$tpl_data = array(
171 171
 				'PREV_DEPTH'	=> $prev_depth,
172 172
 				'THIS_DEPTH'	=> $this_depth,
173 173
 				'NUM_KIDS'		=> $this->count_descendants($row),
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 
178 178
 			for ($j = 0; $j < $repeat; $j++)
179 179
 			{
180
-				$template->assign_block_vars($handle . '.close', array());
180
+				$template->assign_block_vars($handle.'.close', array());
181 181
 			}
182 182
 
183 183
 			$prev_depth = $this_depth;
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 
187 187
 		for ($i = 0; $i < $prev_depth; $i++)
188 188
 		{
189
-			$template->assign_block_vars('close_' . $handle, array());
189
+			$template->assign_block_vars('close_'.$handle, array());
190 190
 		}
191 191
 	}
192 192
 
@@ -225,10 +225,10 @@  discard block
 block discarded – undo
225 225
 			}
226 226
 
227 227
 			$right = $row['right_id'];
228
-			$title = $padding . '&#x251c;&#x2500; ' . $row[$title_column];
228
+			$title = $padding.'&#x251c;&#x2500; '.$row[$title_column];
229 229
 			$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
230 230
 
231
-			$return_options .= '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
231
+			$return_options .= '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
232 232
 			$return_data[$row[$this->pk]] = $title;
233 233
 		}
234 234
 
Please login to merge, or discard this patch.
services/icon_picker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 				'@blitze_sitemaker/assets/icons/picker.min.js',
51 51
 			),
52 52
 			'css'	=> array(
53
-				defined('IN_ADMIN') ? $this->util->get_web_path() . 'assets/css/font-awesome.min.css' : '',
53
+				defined('IN_ADMIN') ? $this->util->get_web_path().'assets/css/font-awesome.min.css' : '',
54 54
 				'@blitze_sitemaker/vendor/jquery-ui/themes/smoothness/jquery-ui.min.css',
55 55
 				'@blitze_sitemaker/assets/icons/picker.min.css',
56 56
 			)
Please login to merge, or discard this patch.