Completed
Pull Request — master (#26)
by Daniel
10:26 queued 08:38
created
services/tree/display.php 1 patch
Spacing   +12 added lines, -12 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,7 +108,7 @@  discard block
 block discarded – undo
108 108
 					$this->items_table => 'i'
109 109
 				),
110 110
 				'WHERE'		=> array(
111
-					'i.depth ' . (($max_depth) ? ' BETWEEN ' . (int) $start . ' AND ' . (int) ($start + $max_depth) : ' >= ' . (int) $start),
111
+					'i.depth '.(($max_depth) ? ' BETWEEN '.(int) $start.' AND '.(int) ($start + $max_depth) : ' >= '.(int) $start),
112 112
 					$this->sql_where,
113 113
 				),
114 114
 				'ORDER_BY'	=> 'i.left_id ASC',
@@ -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,22 +164,22 @@  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),
174 174
 			);
175 175
 
176 176
 			$template->assign_block_vars($handle, array_merge($tpl_data, array_change_key_case($row, CASE_UPPER)));
177
-			$this->recursively_close_tags($repeat, $handle . '.close', $template);
177
+			$this->recursively_close_tags($repeat, $handle.'.close', $template);
178 178
 
179 179
 			$prev_depth = $this_depth;
180 180
 			$parental_depth[$row[$this->pk]] = $this_depth;
181 181
 		}
182
-		$this->recursively_close_tags($prev_depth, 'close_' . $handle, $template);
182
+		$this->recursively_close_tags($prev_depth, 'close_'.$handle, $template);
183 183
 	}
184 184
 
185 185
 	/**
@@ -188,11 +188,11 @@  discard block
 block discarded – undo
188 188
 	 * @param \phpbb\template\twig\twig $template
189 189
 	 * @return void
190 190
 	 */
191
-	protected function recursively_close_tags($repeat, $handle, \phpbb\template\twig\twig &$template)
191
+	protected function recursively_close_tags($repeat, $handle, \phpbb\template\twig\twig & $template)
192 192
 	{
193 193
 		for ($i = 0; $i < $repeat; $i++)
194 194
 		{
195
-			$template->assign_block_vars('close_' . $handle, array());
195
+			$template->assign_block_vars('close_'.$handle, array());
196 196
 		}
197 197
 	}
198 198
 
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 	 */
259 259
 	protected function get_padded_title($padding, $title)
260 260
 	{
261
-		return (($padding) ? $padding . '&#x2937; ' : '') . $title;
261
+		return (($padding) ? $padding.'&#x2937; ' : '').$title;
262 262
 	}
263 263
 
264 264
 	/**
@@ -270,6 +270,6 @@  discard block
 block discarded – undo
270 270
 	protected function get_html_option(array $row, array $selected_ids, $title)
271 271
 	{
272 272
 		$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
273
-		return '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
273
+		return '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
274 274
 	}
275 275
 }
Please login to merge, or discard this patch.
services/forum/query_builder.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 			$this->store['sql_array']['SELECT'][] = 'ws.notify_status';
166 166
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
167 167
 				'FROM'	=> array($keys[$type]['table'] => 'ws'),
168
-				'ON'	=> $keys[$type]['cond'] . ' AND ws.user_id = ' . (int) $this->user->data['user_id'],
168
+				'ON'	=> $keys[$type]['cond'].' AND ws.user_id = '.(int) $this->user->data['user_id'],
169 169
 			);
170 170
 		}
171 171
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 			$this->store['sql_array']['SELECT'][] = 'bm.topic_id as bookmarked';
185 185
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
186 186
 				'FROM'	=> array(BOOKMARKS_TABLE => 'bm'),
187
-				'ON'	=> 'bm.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = bm.topic_id'
187
+				'ON'	=> 'bm.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = bm.topic_id'
188 188
 			);
189 189
 		}
190 190
 
@@ -205,12 +205,12 @@  discard block
 block discarded – undo
205 205
 			$this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time';
206 206
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
207 207
 				'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
208
-				'ON'	=> 'tt.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
208
+				'ON'	=> 'tt.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = tt.topic_id'
209 209
 			);
210 210
 
211 211
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
212 212
 				'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
213
-				'ON'	=> 'ft.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
213
+				'ON'	=> 'ft.user_id = '.(int) $this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
214 214
 			);
215 215
 		}
216 216
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 	{
230 230
 		if ($unix_start_time && $unix_stop_time)
231 231
 		{
232
-			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time";
232
+			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time";
233 233
 		}
234 234
 
235 235
 		return $this;
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 	 */
269 269
 	public function set_sorting($sort_key, $sort_dir = 'DESC')
270 270
 	{
271
-		$this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir;
271
+		$this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir;
272 272
 
273 273
 		return $this;
274 274
 	}
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 	{
337 337
 		if (!empty($column_id))
338 338
 		{
339
-			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id;
339
+			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id;
340 340
 		}
341 341
 	}
342 342
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 	{
349 349
 		if ($check_visibility)
350 350
 		{
351
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . (int) $this->time();
351
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.(int) $this->time();
352 352
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', array_map('intval', $this->ex_fid_ary), 't.');
353 353
 		}
354 354
 	}
Please login to merge, or discard this patch.
blocks/wordgraph.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -110,8 +110,8 @@  discard block
 block discarded – undo
110 110
 			$this->ptemplate->assign_block_vars('wordgraph', array(
111 111
 				'WORD'			=> $this->show_word($word, $words_array[$word], $settings['show_word_count']),
112 112
 				'WORD_SIZE'		=> $settings['min_word_size'] + (($words_array[$word] - $params['min_count']) * $params['size_step']),
113
-				'WORD_COLOR'	=> $r . $g . $b,
114
-				'WORD_URL'		=> append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords=' . urlencode($word)),
113
+				'WORD_COLOR'	=> $r.$g.$b,
114
+				'WORD_URL'		=> append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords='.urlencode($word)),
115 115
 			));
116 116
 		}
117 117
 	}
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
 				AND m.word_id = l.word_id
189 189
 				AND m.post_id = p.post_id
190 190
 				AND t.topic_id = p.topic_id
191
-				AND t.topic_time <= ' . time() . '
192
-				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_map('intval', array_keys($this->auth->acl_getf('!f_read', true))), 't.') .
191
+				AND t.topic_time <= ' . time().'
192
+				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_map('intval', array_keys($this->auth->acl_getf('!f_read', true))), 't.').
193 193
 				$sql_where,
194 194
 			'GROUP_BY'	=> 'l.word_text, l.word_count',
195 195
 			'ORDER_BY'	=> 'l.word_count DESC'
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 		if ($exclude_words)
207 207
 		{
208 208
 			$exclude_words = array_filter(explode(',', str_replace(' ', '', strtolower($exclude_words))));
209
-			$sql_where = (sizeof($exclude_words)) ? ' AND ' . $this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
209
+			$sql_where = (sizeof($exclude_words)) ? ' AND '.$this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
210 210
 		}
211 211
 
212 212
 		return $sql_where;
@@ -220,6 +220,6 @@  discard block
 block discarded – undo
220 220
 	 */
221 221
 	private function show_word($word, $count, $show_count)
222 222
 	{
223
-		return censor_text(($show_count) ? $word . '(' . $count . ')' : $word);
223
+		return censor_text(($show_count) ? $word.'('.$count.')' : $word);
224 224
 	}
225 225
 }
Please login to merge, or discard this patch.
blocks/whats_new.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
 			$this->ptemplate->assign_block_vars('topicrow', array(
101 101
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
102
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id"),
102
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id"),
103 103
 			));
104 104
 			unset($topic_data[$i]);
105 105
 		}
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	{
141 141
 		return array(
142 142
 			'WHERE'		=> array(
143
-				't.topic_last_post_time > ' . (int) $this->user->data['user_lastvisit'],
143
+				't.topic_last_post_time > '.(int) $this->user->data['user_lastvisit'],
144 144
 				't.topic_moved_id = 0',
145 145
 			),
146 146
 		);
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 				POSTS_TABLE		=> 'p',
157 157
 			),
158 158
 			'WHERE'		=> array(
159
-				't.topic_id = p.topic_id AND p.post_time > ' . (int) $this->user->data['user_lastvisit'],
159
+				't.topic_id = p.topic_id AND p.post_time > '.(int) $this->user->data['user_lastvisit'],
160 160
 			),
161 161
 		);
162 162
 	}
Please login to merge, or discard this patch.