Passed
Pull Request — master (#326)
by
unknown
04:30
created
core/auth/level.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -14,27 +14,27 @@  discard block
 block discarded – undo
14 14
 {
15 15
 
16 16
 	/**
17
-	* Gallery Auth Object
18
-	* @var \phpbbgallery\core\auth\auth
19
-	*/
17
+	 * Gallery Auth Object
18
+	 * @var \phpbbgallery\core\auth\auth
19
+	 */
20 20
 	protected $auth;
21 21
 
22 22
 	/**
23
-	* Config Object
24
-	* @var \phpbb\config\config
25
-	*/
23
+	 * Config Object
24
+	 * @var \phpbb\config\config
25
+	 */
26 26
 	protected $config;
27 27
 
28 28
 	/**
29
-	* Template Object
30
-	* @var \phpbb\template\template
31
-	*/
29
+	 * Template Object
30
+	 * @var \phpbb\template\template
31
+	 */
32 32
 	protected $template;
33 33
 
34 34
 	/**
35
-	* User Object
36
-	* @var \phpbb\user
37
-	*/
35
+	 * User Object
36
+	 * @var \phpbb\user
37
+	 */
38 38
 	protected $user;
39 39
 
40 40
 	/**
@@ -62,17 +62,17 @@  discard block
 block discarded – undo
62 62
 	}
63 63
 
64 64
 	/**
65
-	* User authorization levels output
66
-	*
67
-	* @param	int		$album_id		The current album the user is in.
68
-	* @param	int		$album_status	The albums status bit.
69
-	* @param	int		$album_user_id	The user-id of the album owner. Saves us a call to the cache if it is set.
70
-	* @return		null
71
-	*
72
-	* borrowed from phpBB3
73
-	* @author: phpBB Group
74
-	* @function: gen_forum_auth_level
75
-	*/
65
+	 * User authorization levels output
66
+	 *
67
+	 * @param	int		$album_id		The current album the user is in.
68
+	 * @param	int		$album_status	The albums status bit.
69
+	 * @param	int		$album_user_id	The user-id of the album owner. Saves us a call to the cache if it is set.
70
+	 * @return		null
71
+	 *
72
+	 * borrowed from phpBB3
73
+	 * @author: phpBB Group
74
+	 * @function: gen_forum_auth_level
75
+	 */
76 76
 	public function display($album_id, $album_status, $album_user_id = -1)
77 77
 	{
78 78
 		$locked = ($album_status == ITEM_LOCKED && !$this->auth->acl_check('m_', $album_id, $album_user_id)) ? true : false;
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.