Passed
Pull Request — master (#326)
by
unknown
04:30
created
core/ucp/main_module.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 		$phpbb_gallery_url = $phpbb_container->get('phpbbgallery.core.url');
31 31
 		$phpbb_gallery_url->_include('functions_display', 'phpbb');
32 32
 
33
-		$phpbb_ext_gallery_core_album =$phpbb_container->get('phpbbgallery.core.album');
33
+		$phpbb_ext_gallery_core_album = $phpbb_container->get('phpbbgallery.core.album');
34 34
 
35 35
 		$phpbb_ext_gallery_core_auth = $phpbb_container->get('phpbbgallery.core.auth');
36 36
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
 	function initialise_album()
156 156
 	{
157
-		global $cache, $db,  $user, $phpbb_ext_gallery_core_auth, $phpbb_ext_gallery_core_album, $phpbb_ext_gallery_config, $albums_table, $phpbb_ext_gallery_user;
157
+		global $cache, $db, $user, $phpbb_ext_gallery_core_auth, $phpbb_ext_gallery_core_album, $phpbb_ext_gallery_config, $albums_table, $phpbb_ext_gallery_user;
158 158
 		global $request, $users_table, $phpbb_container;
159 159
 
160 160
 		// we will have to initialise $phpbb_ext_gallery_user
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
 
449 449
 		$this->language = $phpbb_container->get('language');
450 450
 
451
-		$phpbb_gallery_url->_include(array('bbcode','message_parser'), 'phpbb');
451
+		$phpbb_gallery_url->_include(array('bbcode', 'message_parser'), 'phpbb');
452 452
 
453 453
 		$album_id = $request->variable('album_id', 0);
454 454
 		$phpbb_ext_gallery_core_album->check_user($album_id);
@@ -837,7 +837,7 @@  discard block
 block discarded – undo
837 837
 				$sql = 'UPDATE ' . $albums_table . "
838 838
 					SET right_id = right_id - $delete_id
839 839
 					WHERE right_id > $right_id
840
-						AND album_user_id = ". (int) $user->data['user_id'];
840
+						AND album_user_id = " . (int) $user->data['user_id'];
841 841
 				$db->sql_query($sql);
842 842
 			}
843 843
 
@@ -1021,9 +1021,9 @@  discard block
 block discarded – undo
1021 1021
 		$db->sql_freeresult($result);
1022 1022
 
1023 1023
 		// Subscribed images
1024
-		$start				= $request->variable('start', 0);
1025
-		$images_per_page	= $phpbb_ext_gallery_config->get('items_per_page');
1026
-		$total_images		= 0;
1024
+		$start = $request->variable('start', 0);
1025
+		$images_per_page = $phpbb_ext_gallery_config->get('items_per_page');
1026
+		$total_images = 0;
1027 1027
 
1028 1028
 		$sql = 'SELECT COUNT(image_id) as images
1029 1029
 			FROM ' . $watch_table . '
Please login to merge, or discard this patch.
core/language/de/gallery_acp.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@
 block discarded – undo
159 159
 	'GALLERY_RESYNC_ALBUMS_TO_CPF_EXPLAIN'  => 'Diese Aktion wird alle persönlichen Alben auf dem Toplevel als kontaktbasierte selbsterstellt Profilfelder resynchronisieren . <br> WARNUNG! Dies kann beim Vorhandensein sehr vieler solcher Alben sehr lange dauern!',
160 160
 	'GALLERY_RESYNC_ALBUMS_TO_CPF_CONFIRM' => 'Bist Du sicher, dass Du den Resync aller persönlichen Alben auf dem Toplevel als kontaktbasierte selbsterstellte Profilfelder durchführen willst?',
161 161
 	'GALLERY_STATS'                        => 'Galerie Statistik',
162
-	'GALLERY_VERSION'                      => 'Version der phpBB Gallery',//ja mit ll und y, da es sich um den MOD-Namen handelt
162
+	'GALLERY_VERSION'                      => 'Version der phpBB Gallery', //ja mit ll und y, da es sich um den MOD-Namen handelt
163 163
 	'GD_VERSION'                           => 'GD Version optimieren',
164 164
 	'GENERAL_ALBUM_SETTINGS'               => 'Allgemeine Albumseinstellungen',
165 165
 	'GIF_ALLOWED'                          => 'Es ist erlaubt GIF-Dateien hochzuladen',
Please login to merge, or discard this patch.
core/user.php 1 patch
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -202,8 +202,7 @@  discard block
 block discarded – undo
202 202
 		if (isset($this->data[$key]))
203 203
 		{
204 204
 			return $this->data[$key];
205
-		}
206
-		else if ($default && $this->get_default_value($key) !== null)
205
+		} else if ($default && $this->get_default_value($key) !== null)
207 206
 		{
208 207
 			return $this->get_default_value($key);
209 208
 		}
@@ -401,12 +400,10 @@  discard block
 block discarded – undo
401 400
 		if (is_array($user_ids) && !empty($user_ids))
402 401
 		{
403 402
 			$sql_where = 'WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_ids));
404
-		}
405
-		else if ($user_ids == 'all')
403
+		} else if ($user_ids == 'all')
406 404
 		{
407 405
 			$sql_where = '';
408
-		}
409
-		else
406
+		} else
410 407
 		{
411 408
 			$sql_where = 'WHERE user_id = ' . (int) $user_ids;
412 409
 		}
@@ -437,8 +434,7 @@  discard block
 block discarded – undo
437 434
 					{
438 435
 						// While incrementing, the images might be lower than 0.
439 436
 						$validated_data[$name] = (int) $value;
440
-					}
441
-					else
437
+					} else
442 438
 					{
443 439
 						$validated_data[$name] = max(0, (int) $value);
444 440
 					}
@@ -584,8 +580,7 @@  discard block
 block discarded – undo
584 580
 					'warnings'            => 0,
585 581
 					'allow_pm'            => 0,
586 582
 				);
587
-			}
588
-			else
583
+			} else
589 584
 			{
590 585
 				$user_sig = '';
591 586
 				// We add the signature to every posters entry because enable_sig is post dependent
@@ -631,8 +626,7 @@  discard block
 block discarded – undo
631 626
 				if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email'))
632 627
 				{
633 628
 					$user_cache[$user_id]['email'] = ($this->config['board_email_form'] && $this->config['email_enable']) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=email&amp;u=$user_id") : (($this->config['board_hide_emails'] && !$this->auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']);
634
-				}
635
-				else
629
+				} else
636 630
 				{
637 631
 					$user_cache[$user_id]['email'] = '';
638 632
 				}
@@ -645,8 +639,7 @@  discard block
 block discarded – undo
645 639
 						if ($diff == 0)
646 640
 						{
647 641
 							$diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
648
-						}
649
-						else
642
+						} else
650 643
 						{
651 644
 							$diff = ($diff < 0) ? 1 : 0;
652 645
 						}
Please login to merge, or discard this patch.