Passed
Pull Request — master (#340)
by
unknown
02:34
created
core/upload.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 			include_once($this->root_path . 'includes/message_parser.' . $this->php_ext);
280 280
 		}
281 281
 		$message_parser = new \parse_message();
282
-		$message_parser->message	= utf8_normalize_nfc($this->get_description());
282
+		$message_parser->message = utf8_normalize_nfc($this->get_description());
283 283
 		if ($message_parser->message)
284 284
 		{
285 285
 			$message_parser->parse(true, true, true, true, false, true, true, true);
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 
335 335
 		$sql_ary = array_merge($sql_ary, $additional_sql_data);
336 336
 
337
-		$sql = 'UPDATE ' . $this->images_table. ' 
337
+		$sql = 'UPDATE ' . $this->images_table . ' 
338 338
 			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
339 339
 			WHERE image_id = ' . (int) $image_id;
340 340
 		$this->db->sql_query($sql);
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
 		// Rotate the image
453 453
 		if ($this->gallery_config->get('allow_rotate') && $this->get_rotating())
454 454
 		{
455
-			$this->tools->rotate_image($this->get_rotating(),$this->gallery_config->get('allow_resize'));
455
+			$this->tools->rotate_image($this->get_rotating(), $this->gallery_config->get('allow_resize'));
456 456
 			if ($this->tools->rotated)
457 457
 			{
458 458
 				$this->tools->write_image($this->tools->image_source, $this->gallery_config->get('jpg_quality'), true);
Please login to merge, or discard this patch.
core/contest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -190,9 +190,9 @@
 block discarded – undo
190 190
 		$this->db->sql_freeresult($result);
191 191
 
192 192
 		$sql = 'UPDATE ' . $this->contest_table . '
193
-			SET contest_first = ' . (int) $first .',
194
-				contest_second = ' . (int) $second .',
195
-				contest_third = ' . (int) $third .'
193
+			SET contest_first = ' . (int) $first . ',
194
+				contest_second = ' . (int) $second . ',
195
+				contest_third = ' . (int) $third . '
196 196
 			WHERE contest_album_id = ' . (int) $album_id;
197 197
 		$this->db->sql_query($sql);
198 198
 
Please login to merge, or discard this patch.
core/rating.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 	*/
159 159
 	public function display_box()
160 160
 	{
161
-		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT);//@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
161
+		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT); //@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
162 162
 
163 163
 		switch (self::MODE_SELECT)//@todo: phpbb_ext_gallery_core_config::get('rating_mode'))
164 164
 		{
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 	 */
202 202
 	public function get_image_rating($user_rating = false, $display_contest_end = true)
203 203
 	{
204
-		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT);//@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
204
+		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT); //@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
205 205
 
206 206
 		switch (self::MODE_SELECT)//@todo: phpbb_ext_gallery_core_config::get('rating_mode'))
207 207
 		{
Please login to merge, or discard this patch.
core/block.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -23,13 +23,13 @@  discard block
 block discarded – undo
23 23
 	 *
24 24
 	 * Constants defining some album properties
25 25
 	 */
26
-	const PUBLIC_ALBUM		= 0;
26
+	const PUBLIC_ALBUM = 0;
27 27
 
28
-	const TYPE_CAT			= 0;
29
-	const TYPE_UPLOAD		= 1;
28
+	const TYPE_CAT = 0;
29
+	const TYPE_UPLOAD = 1;
30 30
 	const TYPE_CONTEST		= 2;
31 31
 
32
-	const ALBUM_OPEN		= 0;
32
+	const ALBUM_OPEN = 0;
33 33
 	const ALBUM_LOCKED		= 1;
34 34
 
35 35
 	/**
@@ -58,22 +58,22 @@  discard block
 block discarded – undo
58 58
 	/**
59 59
 	 * Only visible for moderators.
60 60
 	 */
61
-	const STATUS_UNAPPROVED	= 0;
61
+	const STATUS_UNAPPROVED = 0;
62 62
 
63 63
 	/**
64 64
 	 * Visible for everyone with the i_view-permissions
65 65
 	 */
66
-	const STATUS_APPROVED	= 1;
66
+	const STATUS_APPROVED = 1;
67 67
 
68 68
 	/**
69 69
 	 * Visible for everyone with the i_view-permissions, but only moderators can comment.
70 70
 	 */
71
-	const STATUS_LOCKED		= 2;
71
+	const STATUS_LOCKED = 2;
72 72
 
73 73
 	/**
74 74
 	 * Orphan files are only visible for their author, because they're not yet ready uploaded.
75 75
 	 */
76
-	const STATUS_ORPHAN		= 3;
76
+	const STATUS_ORPHAN = 3;
77 77
 
78 78
 	/**
79 79
 	 * Constants regarding the image contest relation
Please login to merge, or discard this patch.
core/controller/file.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -316,7 +316,7 @@
 block discarded – undo
316 316
 
317 317
 	public function generate_image_src()
318 318
 	{
319
-		$this->image_src = $this->path  . $this->data['image_filename'];
319
+		$this->image_src = $this->path . $this->data['image_filename'];
320 320
 
321 321
 		if ($this->data['image_filemissing'] || !file_exists($this->path_source . $this->data['image_filename']))
322 322
 		{
Please login to merge, or discard this patch.
core/controller/comment.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -197,8 +197,8 @@  discard block
 block discarded – undo
197 197
 			include_once($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
198 198
 		}
199 199
 
200
-		$bbcode_status	= ($this->config['allow_bbcode']) ? true : false;
201
-		$smilies_status	= ($this->config['allow_smilies']) ? true : false;
200
+		$bbcode_status = ($this->config['allow_bbcode']) ? true : false;
201
+		$smilies_status = ($this->config['allow_smilies']) ? true : false;
202 202
 		$img_status		= ($bbcode_status) ? true : false;
203 203
 		$url_status		= ($this->config['allow_post_links']) ? true : false;
204 204
 		$flash_status	= false;
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 			}
306 306
 
307 307
 			$message_parser = new \parse_message();
308
-			$message_parser->message	= utf8_normalize_nfc($comment_plain);
308
+			$message_parser->message = utf8_normalize_nfc($comment_plain);
309 309
 			if ($message_parser->message)
310 310
 			{
311 311
 				$message_parser->parse(true, true, true, true, false, true, true, true);
@@ -464,8 +464,8 @@  discard block
 block discarded – undo
464 464
 			include_once($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext);
465 465
 		}
466 466
 
467
-		$bbcode_status	= ($this->config['allow_bbcode']) ? true : false;
468
-		$smilies_status	= ($this->config['allow_smilies']) ? true : false;
467
+		$bbcode_status = ($this->config['allow_bbcode']) ? true : false;
468
+		$smilies_status = ($this->config['allow_smilies']) ? true : false;
469 469
 		$img_status		= ($bbcode_status) ? true : false;
470 470
 		$url_status		= ($this->config['allow_post_links']) ? true : false;
471 471
 		$flash_status	= false;
@@ -678,8 +678,8 @@  discard block
 block discarded – undo
678 678
 			include_once($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext);
679 679
 		}
680 680
 
681
-		$bbcode_status	= ($this->config['allow_bbcode']) ? true : false;
682
-		$smilies_status	= ($this->config['allow_smilies']) ? true : false;
681
+		$bbcode_status = ($this->config['allow_bbcode']) ? true : false;
682
+		$smilies_status = ($this->config['allow_smilies']) ? true : false;
683 683
 		$img_status		= ($bbcode_status) ? true : false;
684 684
 		$url_status		= ($this->config['allow_post_links']) ? true : false;
685 685
 		$flash_status	= false;
@@ -759,7 +759,7 @@  discard block
 block discarded – undo
759 759
 			'IMAGE_NAME'			=> $image_data['image_name'],
760 760
 
761 761
 			'S_SIGNATURE_CHECKED'	=> (isset($sig_checked) && $sig_checked) ? ' checked="checked"' : '',
762
-			'S_ALBUM_ACTION'		=> append_sid($this->url->path('full') . 'comment/' . (int) $image_id . '/edit/'. (int) $comment_id),
762
+			'S_ALBUM_ACTION'		=> append_sid($this->url->path('full') . 'comment/' . (int) $image_id . '/edit/' . (int) $comment_id),
763 763
 		));
764 764
 
765 765
 		if ($submit && !$error)
@@ -808,8 +808,8 @@  discard block
 block discarded – undo
808 808
 			include_once($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext);
809 809
 		}
810 810
 
811
-		$bbcode_status	= ($this->config['allow_bbcode']) ? true : false;
812
-		$smilies_status	= ($this->config['allow_smilies']) ? true : false;
811
+		$bbcode_status = ($this->config['allow_bbcode']) ? true : false;
812
+		$smilies_status = ($this->config['allow_smilies']) ? true : false;
813 813
 		$img_status		= ($bbcode_status) ? true : false;
814 814
 		$url_status		= ($this->config['allow_post_links']) ? true : false;
815 815
 		$flash_status	= false;
Please login to merge, or discard this patch.
core/album/manage.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 			}
167 167
 			else
168 168
 			{
169
-				$contest_data['contest_start'] = gmmktime((int) $m[4], (int) $m[5], 0, (int) $m[2], (int) $m[3], (int) $m[1]) - $time->getOffset();// - $offset;
169
+				$contest_data['contest_start'] = gmmktime((int) $m[4], (int) $m[5], 0, (int) $m[2], (int) $m[3], (int) $m[1]) - $time->getOffset(); // - $offset;
170 170
 			}
171 171
 			if (!preg_match('#(\\d{4})-(\\d{1,2})-(\\d{1,2}) (\\d{1,2}):(\\d{2})#', $contest_data['contest_rating'], $m))
172 172
 			{
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			}
176 176
 			else if (!$start_date_error)
177 177
 			{
178
-				$contest_data['contest_rating'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset;
178
+				$contest_data['contest_rating'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset(); //- $offset;
179 179
 			}
180 180
 			if (!preg_match('#(\\d{4})-(\\d{1,2})-(\\d{1,2}) (\\d{1,2}):(\\d{2})#', $contest_data['contest_end'], $m))
181 181
 			{
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 			}
185 185
 			else if (!$start_date_error)
186 186
 			{
187
-				$contest_data['contest_end'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset;
187
+				$contest_data['contest_end'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset(); //- $offset;
188 188
 			}
189 189
 			if (!$start_date_error && !$date_error)
190 190
 			{
@@ -710,7 +710,7 @@  discard block
 block discarded – undo
710 710
 					$album_data = $this->gallery_album->get_info($album_id);
711 711
 
712 712
 					$sql = 'UPDATE ' . $this->albums_table . ' 
713
-						SET parent_id = ' . (int) $subalbums_to_id .'
713
+						SET parent_id = ' . (int) $subalbums_to_id . '
714 714
 						WHERE parent_id = ' . (int) $album_id . '
715 715
 							AND album_user_id = ' . (int) $this->user_id;
716 716
 					$this->db->sql_query($sql);
@@ -738,13 +738,13 @@  discard block
 block discarded – undo
738 738
 		// Resync tree
739 739
 		$sql = 'UPDATE ' . $this->albums_table . '  
740 740
 			SET right_id = right_id - ' . (int) $diff . '
741
-			WHERE left_id < ' . (int) $album_data['right_id'] . ' AND right_id > ' . (int) $album_data['right_id']. '
741
+			WHERE left_id < ' . (int) $album_data['right_id'] . ' AND right_id > ' . (int) $album_data['right_id'] . '
742 742
 				AND album_user_id = ' . (int) $this->user_id;
743 743
 		$this->db->sql_query($sql);
744 744
 
745 745
 		$sql = 'UPDATE ' . $this->albums_table . ' 
746 746
 			SET left_id = left_id - ' . (int) $diff . ', right_id = right_id - ' . (int) $diff . '
747
-			WHERE left_id > ' . (int) $album_data['right_id']. '
747
+			WHERE left_id > ' . (int) $album_data['right_id'] . '
748 748
 				AND album_user_id = ' . (int) $this->user_id;
749 749
 		$this->db->sql_query($sql);
750 750
 
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
 		// Now do the dirty job
1038 1038
 		$sql = 'UPDATE ' . $this->albums_table . ' 
1039 1039
 			SET left_id = left_id + CASE
1040
-				WHEN left_id BETWEEN ' . (int) $move_up_left . ' AND ' . (int) $move_up_right . ' THEN -' .(int) $diff_up . '
1040
+				WHEN left_id BETWEEN ' . (int) $move_up_left . ' AND ' . (int) $move_up_right . ' THEN -' . (int) $diff_up . '
1041 1041
 				ELSE ' .(int) $diff_down . '
1042 1042
 			END,
1043 1043
 			right_id = right_id + CASE
Please login to merge, or discard this patch.
core/file/file.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -294,13 +294,13 @@
 block discarded – undo
294 294
 
295 295
 		if (($this->image_size['height'] / $max_height) > ($this->image_size['width'] / $max_width))
296 296
 		{
297
-			$this->thumb_height	= $max_height;
298
-			$this->thumb_width	= round($max_width * (($this->image_size['width'] / $max_width) / ($this->image_size['height'] / $max_height)));
297
+			$this->thumb_height = $max_height;
298
+			$this->thumb_width = round($max_width * (($this->image_size['width'] / $max_width) / ($this->image_size['height'] / $max_height)));
299 299
 		}
300 300
 		else
301 301
 		{
302
-			$this->thumb_height	= round($max_height * (($this->image_size['height'] / $max_height) / ($this->image_size['width'] / $max_width)));
303
-			$this->thumb_width	= $max_width;
302
+			$this->thumb_height = round($max_height * (($this->image_size['height'] / $max_height) / ($this->image_size['width'] / $max_width)));
303
+			$this->thumb_width = $max_width;
304 304
 		}
305 305
 
306 306
 		$image_copy = (($this->gd_version == self::GDLIB1) ? @imagecreate($this->thumb_width, $this->thumb_height + $additional_height) : @imagecreatetruecolor($this->thumb_width, $this->thumb_height + $additional_height));
Please login to merge, or discard this patch.
core/event/main_listener.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,13 +122,13 @@
 block discarded – undo
122 122
 		}
123 123
 		if ($recent)
124 124
 		{
125
-			$block_name	= $this->language->lang('RECENT_IMAGES');
125
+			$block_name = $this->language->lang('RECENT_IMAGES');
126 126
 			$u_block = ' ';
127 127
 			$this->gallery_search->recent($this->gallery_config->get('rrc_profile_items'), -1, $event['member']['user_id'], 'rrc_profile_display', $block_name, $u_block);
128 128
 		}
129 129
 		if ($random)
130 130
 		{
131
-			$block_name	= $this->language->lang('RANDOM_IMAGES');
131
+			$block_name = $this->language->lang('RANDOM_IMAGES');
132 132
 			$u_block = ' ';
133 133
 			$this->gallery_search->random($this->gallery_config->get('rrc_profile_items'), $event['member']['user_id'], 'rrc_profile_display', $block_name, $u_block);
134 134
 		}
Please login to merge, or discard this patch.