Passed
Pull Request — master (#294)
by
unknown
14:52
created
core/album/album.php 1 patch
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -222,8 +222,7 @@  discard block
 block discarded – undo
222 222
 			{
223 223
 				$padding .= '   ';
224 224
 				$padding_store[$row['parent_id']] = $padding;
225
-			}
226
-			else if ($row['left_id'] > $right + 1)
225
+			} else if ($row['left_id'] > $right + 1)
227 226
 			{
228 227
 				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
229 228
 			}
@@ -249,15 +248,13 @@  discard block
 block discarded – undo
249 248
 			if (($select_id == $this->gallery_auth->get_setting_permissions()) && !$row['album_user_id'])
250 249
 			{
251 250
 				$list = true;
252
-			}
253
-			else if (!$row['album_user_id'])
251
+			} else if (!$row['album_user_id'])
254 252
 			{
255 253
 				if ($this->gallery_auth->acl_check('a_list', $row['album_id'], $row['album_user_id']) || defined('IN_ADMIN'))
256 254
 				{
257 255
 					$list = true;
258 256
 				}
259
-			}
260
-			else if (!$ignore_personals)
257
+			} else if (!$ignore_personals)
261 258
 			{
262 259
 				if ($row['album_user_id'] == $this->user->data['user_id'])
263 260
 				{
@@ -268,16 +265,14 @@  discard block
 block discarded – undo
268 265
 						if ($requested_permission)
269 266
 						{
270 267
 							$requested_own = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_own_album());
271
-						}
272
-						else
268
+						} else
273 269
 						{
274 270
 							$requested_own = false; // We need the negated version of true here
275 271
 						}
276 272
 					}
277 273
 					$list = (!$list) ? $access_own : $list;
278 274
 					$disabled = (!$disabled) ? $requested_own : $disabled;
279
-				}
280
-				else if ($row['album_user_id'])
275
+				} else if ($row['album_user_id'])
281 276
 				{
282 277
 					if (!$c_access_personal)
283 278
 					{
@@ -286,8 +281,7 @@  discard block
 block discarded – undo
286 281
 						if ($requested_permission)
287 282
 						{
288 283
 							$requested_personal = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_personal_album());
289
-						}
290
-						else
284
+						} else
291 285
 						{
292 286
 							$requested_personal = false; // We need the negated version of true here
293 287
 						}
@@ -299,8 +293,7 @@  discard block
 block discarded – undo
299 293
 			if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($album_user_id != $row['album_user_id']))
300 294
 			{
301 295
 				$list = false;
302
-			}
303
-			else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
296
+			} else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
304 297
 			{
305 298
 				$disabled = true;
306 299
 			}
@@ -318,8 +311,7 @@  discard block
 block discarded – undo
318 311
 			$gallery_albumbox = "<select name='$select_name' id='$select_name'>";
319 312
 			$gallery_albumbox .= $album_list;
320 313
 			$gallery_albumbox .= '</select>';
321
-		}
322
-		else
314
+		} else
323 315
 		{
324 316
 			$gallery_albumbox = $album_list;
325 317
 		}
@@ -388,8 +380,7 @@  discard block
 block discarded – undo
388 380
 				'album_last_user_colour' => $row['image_user_colour'],
389 381
 				'album_last_user_id'     => $row['image_user_id'],
390 382
 			);
391
-		}
392
-		else
383
+		} else
393 384
 		{
394 385
 			// No approved image, so we clear the columns
395 386
 			$sql_ary = array(
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_EXPAIN'  => '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.
exif/language/it/exif.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
 	'EXIF_CAM_MODEL'			=> 'Modello Camera',
31 31
 	'EXIF_DATE'					=> 'Immagine scattata il',
32 32
 	'EXIF_EXPOSURE'				=> 'Velocita\' otturatore',
33
-	'EXIF_EXPOSURE_EXP'			=> '%s Sec',// 'EXIF_EXPOSURE' unit
33
+	'EXIF_EXPOSURE_EXP'			=> '%s Sec', // 'EXIF_EXPOSURE' unit
34 34
 	'EXIF_EXPOSURE_BIAS'		=> 'Inclinazione di esposizione',
35
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV',// 'EXIF_EXPOSURE_BIAS' unit
35
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV', // 'EXIF_EXPOSURE_BIAS' unit
36 36
 	'EXIF_EXPOSURE_PROG'		=> 'Programma di esposizione',
37 37
 	'EXIF_EXPOSURE_PROG_0'		=> 'Non definito',
38 38
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manuale',
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	'EXIF_FLASH_CASE_93'		=> 'Il flash e\' scattato, modalita\' automatica, luce di ritorno non rilevata, modalita\' riduzione occhi rossi',
73 73
 	'EXIF_FLASH_CASE_95'		=> 'Il flash e\' scattato, modalita\' automatica, luce di ritorno rilevata, modalita\' riduzione occhi rossi',
74 74
 	'EXIF_FOCAL'				=> 'Lunghezza di Focus',
75
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
75
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
76 76
 	'EXIF_ISO'					=> 'Valore di velocita\' ISO',
77 77
 	'EXIF_METERING_MODE'		=> 'Modalita\' di metratura',
78 78
 	'EXIF_METERING_MODE_0'		=> 'Sconosciuta',
Please login to merge, or discard this patch.
core/language/it/gallery_acp.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
28 28
 	'ACP_GALLERY_OVERVIEW_EXPLAIN'	=> 'Qui trovi alcune statistiche sulla tua galleria.',
29 29
  
30 30
    // File dirs states
31
-    'ACP_FILES_DIR_STATE'           => '<strong>./files/</strong> state',
32
-    'ACP_CORE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/</strong> state',
33
-    'ACP_SOURCE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/source/</strong> state',
34
-    'ACP_MEDIUM_DIR_STATE'    => '<strong>./files/phpbbgallery/core/meduim/</strong> state',
35
-    'ACP_MINI_DIR_STATE'    => '<strong>./files/phpbbgallery/core/mini/</strong> state',
31
+	'ACP_FILES_DIR_STATE'           => '<strong>./files/</strong> state',
32
+	'ACP_CORE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/</strong> state',
33
+	'ACP_SOURCE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/source/</strong> state',
34
+	'ACP_MEDIUM_DIR_STATE'    => '<strong>./files/phpbbgallery/core/meduim/</strong> state',
35
+	'ACP_MINI_DIR_STATE'    => '<strong>./files/phpbbgallery/core/mini/</strong> state',
36 36
 
37 37
 	'ADD_ALBUM_ON_TOP'				=> 'Aggiungi album in cima',
38 38
 	'ADD_PERMISSIONS'				=> 'Aggiungi Permessi',
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 	'PERMISSION_I_EDIT'				=> 'Può modificare le sue immagini',
246 246
 	'PERMISSION_I_LOCK'				=> 'Può bloccare immagini',
247 247
 	'PERMISSION_I_RATE'				=> 'Può votare immagini',
248
-    'PERMISSION_I_RATE_EXPLAIN'		=> 'Gli ospiti e le immagini caricate non possono <strong>mai</strong> votare le immagini.',	
248
+	'PERMISSION_I_RATE_EXPLAIN'		=> 'Gli ospiti e le immagini caricate non possono <strong>mai</strong> votare le immagini.',	
249 249
 	'PERMISSION_I_REPORT'			=> 'Può segnalare immagini',
250 250
 	'PERMISSION_I_UNLIMITED'		=> 'Può caricare immagini illimitate',
251 251
 	'PERMISSION_I_UPLOAD'			=> 'Può caricare immagini',
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 	'UC_LINK_NEXT'					=> 'Prossima Immagine',
373 373
 	'UC_LINK_NEWTAB'				=> 'Aperto in una nuova scheda',
374 374
 	'UC_LINK_NONE'					=> 'Nessun Link',
375
-    'UC_LINK_SHADOWBOX'             => 'Apri Shadowbox-Plugin',
375
+	'UC_LINK_SHADOWBOX'             => 'Apri Shadowbox-Plugin',
376 376
 	'UC_THUMBNAIL'					=> 'Anteprima',
377 377
 	'UC_THUMBNAIL_EXP'				=> 'Usato anche per il BBCode.',
378 378
 	'UNLOCKED'						=> 'Sbloccato',
Please login to merge, or discard this patch.
core/language/it/gallery.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -364,8 +364,8 @@
 block discarded – undo
364 364
 
365 365
 	'QUICK_MOD'	=> 'Seleziona azione di moderazione',
366 366
 	'WRONG_FILESIZE'	=> 'L’immagine è più grande del limite!',
367
-    'UNREAD_IMAGES'		=> 'Immagini non viste',
368
-    'NO_UNREAD_IMAGES'	=> 'Nessuna immagine non vista',
367
+	'UNREAD_IMAGES'		=> 'Immagini non viste',
368
+	'NO_UNREAD_IMAGES'	=> 'Nessuna immagine non vista',
369 369
 
370 370
 	// Versions 1.2.1 addiotions
371 371
 	'GALLERY_DROP'		=> 'Lascia qui le tue immagini',
Please login to merge, or discard this patch.