Passed
Pull Request — master (#346)
by
unknown
03:22
created
exif/language/it/info_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.
exif/event/exif_listener.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		$this->user = $user;
71 71
 		$this->gallery_config = $gallery_config;
72 72
 		$this->gallery_auth = $gallery_auth;
73
-		$this->gallery_url	= $gallery_url;
73
+		$this->gallery_url = $gallery_url;
74 74
 		$this->gallery_user = $gallery_user;
75 75
 	}
76 76
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 			{
84 84
 				$this->user->add_lang_ext('phpbbgallery/exif', 'info_exif');
85 85
 
86
-				$return_ary['vars']['IMAGE_SETTINGS']['disp_exifdata'] = array('lang' => 'DISP_EXIF_DATA',		'validate' => 'bool',	'type' => 'radio:yes_no');
86
+				$return_ary['vars']['IMAGE_SETTINGS']['disp_exifdata'] = array('lang' => 'DISP_EXIF_DATA', 'validate' => 'bool', 'type' => 'radio:yes_no');
87 87
 				$event['return_ary'] = $return_ary;
88 88
 			}
89 89
 		}
Please login to merge, or discard this patch.
exif/language/bg/info_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'			=> 'Camera-model',
31 31
 	'EXIF_DATE'					=> 'Image taken on',
32 32
 	'EXIF_EXPOSURE'				=> 'Shutter speed',
33
-	'EXIF_EXPOSURE_EXP'			=> '%s Sec',// 'EXIF_EXPOSURE' unit
33
+	'EXIF_EXPOSURE_EXP'			=> '%s Sec', // 'EXIF_EXPOSURE' unit
34 34
 	'EXIF_EXPOSURE_BIAS'		=> 'Exposure bias',
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'		=> 'Exposure program',
37 37
 	'EXIF_EXPOSURE_PROG_0'		=> 'Not defined',
38 38
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manual',
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	'EXIF_FLASH_CASE_93'		=> 'Flash fired, auto mode, return light not detected, red-eye reduction mode',
73 73
 	'EXIF_FLASH_CASE_95'		=> 'Flash fired, auto mode, return light detected, red-eye reduction mode',
74 74
 	'EXIF_FOCAL'				=> 'Focus length',
75
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
75
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
76 76
 	'EXIF_ISO'					=> 'ISO speed rating',
77 77
 	'EXIF_METERING_MODE'		=> 'Metering mode',
78 78
 	'EXIF_METERING_MODE_0'		=> 'Unknown',
Please login to merge, or discard this patch.
exif/language/en/info_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'			=> 'Camera-model',
31 31
 	'EXIF_DATE'					=> 'Image taken on',
32 32
 	'EXIF_EXPOSURE'				=> 'Shutter speed',
33
-	'EXIF_EXPOSURE_EXP'			=> '%s Sec',// 'EXIF_EXPOSURE' unit
33
+	'EXIF_EXPOSURE_EXP'			=> '%s Sec', // 'EXIF_EXPOSURE' unit
34 34
 	'EXIF_EXPOSURE_BIAS'		=> 'Exposure bias',
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'		=> 'Exposure program',
37 37
 	'EXIF_EXPOSURE_PROG_0'		=> 'Not defined',
38 38
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manual',
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	'EXIF_FLASH_CASE_93'		=> 'Flash fired, auto mode, return light not detected, red-eye reduction mode',
73 73
 	'EXIF_FLASH_CASE_95'		=> 'Flash fired, auto mode, return light detected, red-eye reduction mode',
74 74
 	'EXIF_FOCAL'				=> 'Focus length',
75
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
75
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
76 76
 	'EXIF_ISO'					=> 'ISO speed rating',
77 77
 	'EXIF_METERING_MODE'		=> 'Metering mode',
78 78
 	'EXIF_METERING_MODE_0'		=> 'Unknown',
Please login to merge, or discard this patch.
exif/language/fr/info_exif.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	'EXIF_CAM_MODEL'			=> 'Modèle d’appareil photo',
32 32
 	'EXIF_DATE'					=> 'Image prise le',
33 33
 	'EXIF_EXPOSURE'				=> 'Vitesse d’obturation',
34
-	'EXIF_EXPOSURE_EXP'			=> '%s Sec',// 'EXIF_EXPOSURE' unit
34
+	'EXIF_EXPOSURE_EXP'			=> '%s Sec', // 'EXIF_EXPOSURE' unit
35 35
 	'EXIF_EXPOSURE_BIAS'		=> 'Angle d’exposition',
36
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV',// 'EXIF_EXPOSURE_BIAS' unit
36
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV', // 'EXIF_EXPOSURE_BIAS' unit
37 37
 	'EXIF_EXPOSURE_PROG'		=> 'Programme d’exposition',
38 38
 	'EXIF_EXPOSURE_PROG_0'		=> 'Non défini',
39 39
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manuel',
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	'EXIF_FLASH_CASE_93'		=> 'Flash déclenché, mode automatique, avec retour de lumière non détecté, yeux rouges réduits',
74 74
 	'EXIF_FLASH_CASE_95'		=> 'Flash déclenché, mode automatique, avec retour de lumière détecté, yeux rouges réduits',
75 75
 	'EXIF_FOCAL'				=> 'Longueur de focale',
76
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
76
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
77 77
 	'EXIF_ISO'					=> 'Sensibilité ISO',
78 78
 	'EXIF_METERING_MODE'		=> 'Mode de mesure',
79 79
 	'EXIF_METERING_MODE_0'		=> 'Inconnu',
Please login to merge, or discard this patch.
exif/language/ru/info_exif.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	'EXIF_CAM_MODEL'			=> 'Модель камеры',
32 32
 	'EXIF_DATE'					=> 'Изображение заснято',
33 33
 	'EXIF_EXPOSURE'				=> 'Выдержка',
34
-	'EXIF_EXPOSURE_EXP'			=> '%s сек',// 'EXIF_EXPOSURE' unit
34
+	'EXIF_EXPOSURE_EXP'			=> '%s сек', // 'EXIF_EXPOSURE' unit
35 35
 	'EXIF_EXPOSURE_BIAS'		=> 'Корректировка выдержки',
36
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s LW',// 'EXIF_EXPOSURE_BIAS' unit
36
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s LW', // 'EXIF_EXPOSURE_BIAS' unit
37 37
 	'EXIF_EXPOSURE_PROG'		=> 'Программа экспозиции',
38 38
 	'EXIF_EXPOSURE_PROG_0'		=> 'Неопределенно',
39 39
 	'EXIF_EXPOSURE_PROG_1'		=> 'Вручную',
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	'EXIF_FLASH_CASE_93'		=> 'Вспышка сработала, авторежим, нет отражателя вспышки, подавление эффекта красных глаз',
74 74
 	'EXIF_FLASH_CASE_95'		=> 'Вспышка сработала, авторежим, отражатель вспышки сработал, подавление эффекта красных глаз',
75 75
 	'EXIF_FOCAL'				=> 'Фокусное расстояние',
76
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
76
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
77 77
 	'EXIF_ISO'					=> 'ISO-чувствительность',
78 78
 	'EXIF_METERING_MODE'		=> 'Метод выдержки и измерения',
79 79
 	'EXIF_METERING_MODE_0'		=> 'Неизвестно',
Please login to merge, or discard this patch.
exif/language/de/info_exif.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	'EXIF_CAM_MODEL'			=> 'Kamera-Modell',
32 32
 	'EXIF_DATE'					=> 'Bild aufgenommen am',
33 33
 	'EXIF_EXPOSURE'				=> 'Belichtungszeit',
34
-	'EXIF_EXPOSURE_EXP'			=> '%s Sek',// 'EXIF_EXPOSURE' unit
34
+	'EXIF_EXPOSURE_EXP'			=> '%s Sek', // 'EXIF_EXPOSURE' unit
35 35
 	'EXIF_EXPOSURE_BIAS'		=> 'Belichtungskorrektur',
36
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s LW',// 'EXIF_EXPOSURE_BIAS' unit
36
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s LW', // 'EXIF_EXPOSURE_BIAS' unit
37 37
 	'EXIF_EXPOSURE_PROG'		=> 'Belichtungsprogramm',
38 38
 	'EXIF_EXPOSURE_PROG_0'		=> 'Nicht definiert',
39 39
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manuell',
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	'EXIF_FLASH_CASE_93'		=> 'Blitz wurde ausgelöst, Automodus, kein Messblitz-Licht zurückgeworfen, Rote-Augen-Reduzierung',
74 74
 	'EXIF_FLASH_CASE_95'		=> 'Blitz wurde ausgelöst, Automodus, Messblitz-Licht zurückgeworfen, Rote-Augen-Reduzierung',
75 75
 	'EXIF_FOCAL'				=> 'Brennweite',
76
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
76
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
77 77
 	'EXIF_ISO'					=> 'ISO-Empfindlichkeit',
78 78
 	'EXIF_METERING_MODE'		=> 'Belichtungs- Messmethode',
79 79
 	'EXIF_METERING_MODE_0'		=> 'Unbekannt',
Please login to merge, or discard this patch.
core/ext.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
 		{
112 112
 			$this->container->get('user')->add_lang_ext('phpbbgallery/core', 'install_gallery');
113 113
 			$error_msg = sprintf($this->container->get('user')->lang(
114
-				'GALLERY_SUB_EXT_UNINSTALL', implode('<br />', $disabled_sub_exts),count($disabled_sub_exts)));
114
+				'GALLERY_SUB_EXT_UNINSTALL', implode('<br />', $disabled_sub_exts), count($disabled_sub_exts)));
115 115
 			trigger_error($error_msg, E_USER_WARNING);
116 116
 		}
117 117
 
Please login to merge, or discard this patch.
core/acp/config_module.php 1 patch
Spacing   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -339,90 +339,90 @@  discard block
 block discarded – undo
339 339
 			'vars'	=> array(
340 340
 				'' => array(),
341 341
 				'GALLERY_CONFIG'	=> array(
342
-					'items_per_page'		=> array('lang' => 'ITEMS_PER_PAGE',		'validate' => 'int',	'type' => 'text:7:3',		'explain' => true),
343
-					'allow_comments'		=> array('lang' => 'COMMENT_SYSTEM',		'validate' => 'bool',	'type' => 'radio:yes_no'),
344
-					'comment_user_control'	=> array('lang' => 'COMMENT_USER_CONTROL',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
345
-					'comment_length'		=> array('lang' => 'COMMENT_MAX_LENGTH',	'validate' => 'int',	'type' => 'text:7:5',		'append' => 'CHARACTERS'),
346
-					'allow_rates'			=> array('lang' => 'RATE_SYSTEM',			'validate' => 'bool',	'type' => 'radio:yes_no'),
347
-					'max_rating'			=> array('lang' => 'RATE_SCALE',			'validate' => 'int',	'type' => 'text:7:2'),
348
-					'allow_hotlinking'		=> array('lang' => 'HOTLINK_PREVENT',		'validate' => 'bool',	'type' => 'radio:yes_no'),
349
-					'hotlinking_domains'	=> array('lang' => 'HOTLINK_ALLOWED',		'validate' => 'string',	'type' => 'text:40:255',	'explain' => true),
342
+					'items_per_page'		=> array('lang' => 'ITEMS_PER_PAGE', 'validate' => 'int', 'type' => 'text:7:3', 'explain' => true),
343
+					'allow_comments'		=> array('lang' => 'COMMENT_SYSTEM', 'validate' => 'bool', 'type' => 'radio:yes_no'),
344
+					'comment_user_control'	=> array('lang' => 'COMMENT_USER_CONTROL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
345
+					'comment_length'		=> array('lang' => 'COMMENT_MAX_LENGTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'CHARACTERS'),
346
+					'allow_rates'			=> array('lang' => 'RATE_SYSTEM', 'validate' => 'bool', 'type' => 'radio:yes_no'),
347
+					'max_rating'			=> array('lang' => 'RATE_SCALE', 'validate' => 'int', 'type' => 'text:7:2'),
348
+					'allow_hotlinking'		=> array('lang' => 'HOTLINK_PREVENT', 'validate' => 'bool', 'type' => 'radio:yes_no'),
349
+					'hotlinking_domains'	=> array('lang' => 'HOTLINK_ALLOWED', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => true),
350 350
 				),
351 351
 
352 352
 				'ALBUM_SETTINGS'	=> array(
353
-					'album_display'			=> array('lang' => 'RRC_DISPLAY_OPTIONS',	'validate' => 'int',	'type' => 'custom',			'method' => 'rrc_display'),
354
-					'default_sort_key'		=> array('lang' => 'DEFAULT_SORT_METHOD',	'validate' => 'string',	'type' => 'custom',			'method' => 'sort_method_select'),
355
-					'default_sort_dir'		=> array('lang' => 'DEFAULT_SORT_ORDER',	'validate' => 'string',	'type' => 'custom',			'method' => 'sort_order_select'),
356
-					'album_images'			=> array('lang' => 'MAX_IMAGES_PER_ALBUM',	'validate' => 'int',	'type' => 'text:7:7',		'explain' => true),
357
-					'mini_thumbnail_disp'	=> array('lang' => 'DISP_FAKE_THUMB',		'validate' => 'bool',	'type' => 'radio:yes_no'),
358
-					'mini_thumbnail_size'	=> array('lang' => 'FAKE_THUMB_SIZE',		'validate' => 'int',	'type' => 'text:7:4',		'explain' => true,	'append' => 'PIXELS'),
353
+					'album_display'			=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'),
354
+					'default_sort_key'		=> array('lang' => 'DEFAULT_SORT_METHOD', 'validate' => 'string', 'type' => 'custom', 'method' => 'sort_method_select'),
355
+					'default_sort_dir'		=> array('lang' => 'DEFAULT_SORT_ORDER', 'validate' => 'string', 'type' => 'custom', 'method' => 'sort_order_select'),
356
+					'album_images'			=> array('lang' => 'MAX_IMAGES_PER_ALBUM', 'validate' => 'int', 'type' => 'text:7:7', 'explain' => true),
357
+					'mini_thumbnail_disp'	=> array('lang' => 'DISP_FAKE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no'),
358
+					'mini_thumbnail_size'	=> array('lang' => 'FAKE_THUMB_SIZE', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'),
359 359
 				),
360 360
 
361 361
 				'SEARCH_SETTINGS'	=> array(
362
-					'search_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS',	'validate' => 'int',	'type' => 'custom',			'method' => 'rrc_display'),
362
+					'search_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'),
363 363
 				),
364 364
 
365 365
 				'IMAGE_SETTINGS'	=> array(
366
-					'num_uploads'			=> array('lang' => 'UPLOAD_IMAGES',			'validate' => 'int',	'type' => 'text:7:2'),
367
-					'max_filesize'			=> array('lang' => 'MAX_FILE_SIZE',			'validate' => 'int',	'type' => 'text:12:9',		'append' => 'BYTES'),
368
-					'max_width'				=> array('lang' => 'MAX_WIDTH',				'validate' => 'int',	'type' => 'text:7:5',		'append' => 'PIXELS'),
369
-					'max_height'			=> array('lang' => 'MAX_HEIGHT',			'validate' => 'int',	'type' => 'text:7:5',		'append' => 'PIXELS'),
370
-					'allow_resize'			=> array('lang' => 'RESIZE_IMAGES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
371
-					'allow_rotate'			=> array('lang' => 'ROTATE_IMAGES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
372
-					'jpg_quality'			=> array('lang' => 'JPG_QUALITY',			'validate' => 'int',	'type' => 'text:7:5',		'explain' => true),
366
+					'num_uploads'			=> array('lang' => 'UPLOAD_IMAGES', 'validate' => 'int', 'type' => 'text:7:2'),
367
+					'max_filesize'			=> array('lang' => 'MAX_FILE_SIZE', 'validate' => 'int', 'type' => 'text:12:9', 'append' => 'BYTES'),
368
+					'max_width'				=> array('lang' => 'MAX_WIDTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'PIXELS'),
369
+					'max_height'			=> array('lang' => 'MAX_HEIGHT', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'PIXELS'),
370
+					'allow_resize'			=> array('lang' => 'RESIZE_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
371
+					'allow_rotate'			=> array('lang' => 'ROTATE_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
372
+					'jpg_quality'			=> array('lang' => 'JPG_QUALITY', 'validate' => 'int', 'type' => 'text:7:5', 'explain' => true),
373 373
 					//'medium_cache'			=> array('lang' => 'MEDIUM_CACHE',			'validate' => 'bool',	'type' => 'radio:yes_no'),
374
-					'medium_width'			=> array('lang' => 'RSZ_WIDTH',				'validate' => 'int',	'type' => 'text:7:4',		'append' => 'PIXELS'),
375
-					'medium_height'			=> array('lang' => 'RSZ_HEIGHT',			'validate' => 'int',	'type' => 'text:7:4',		'append' => 'PIXELS'),
376
-					'allow_gif'				=> array('lang' => 'GIF_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
377
-					'allow_jpg'				=> array('lang' => 'JPG_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
378
-					'allow_png'				=> array('lang' => 'PNG_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
379
-					'allow_webp'			=> array('lang' => 'WEBP_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
380
-					'allow_zip'				=> array('lang' => 'ZIP_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
381
-					'description_length'	=> array('lang' => 'IMAGE_DESC_MAX_LENGTH',	'validate' => 'int',	'type' => 'text:7:5',		'append' => 'CHARACTERS'),
382
-					'disp_nextprev_thumbnail'	=> array('lang' => 'DISP_NEXTPREV_THUMB','validate' => 'bool',	'type' => 'radio:yes_no'),
383
-					'disp_image_url'		=> array('lang' => 'VIEW_IMAGE_URL',		'validate' => 'bool',	'type' => 'radio:yes_no'),
374
+					'medium_width'			=> array('lang' => 'RSZ_WIDTH', 'validate' => 'int', 'type' => 'text:7:4', 'append' => 'PIXELS'),
375
+					'medium_height'			=> array('lang' => 'RSZ_HEIGHT', 'validate' => 'int', 'type' => 'text:7:4', 'append' => 'PIXELS'),
376
+					'allow_gif'				=> array('lang' => 'GIF_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
377
+					'allow_jpg'				=> array('lang' => 'JPG_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
378
+					'allow_png'				=> array('lang' => 'PNG_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
379
+					'allow_webp'			=> array('lang' => 'WEBP_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
380
+					'allow_zip'				=> array('lang' => 'ZIP_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
381
+					'description_length'	=> array('lang' => 'IMAGE_DESC_MAX_LENGTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'CHARACTERS'),
382
+					'disp_nextprev_thumbnail'	=> array('lang' => 'DISP_NEXTPREV_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no'),
383
+					'disp_image_url'		=> array('lang' => 'VIEW_IMAGE_URL', 'validate' => 'bool', 'type' => 'radio:yes_no'),
384 384
 				),
385 385
 
386 386
 				'THUMBNAIL_SETTINGS'	=> array(
387 387
 					//'thumbnail_cache'		=> array('lang' => 'THUMBNAIL_CACHE',		'validate' => 'bool',	'type' => 'radio:yes_no'),
388
-					'gdlib_version'			=> array('lang' => 'GD_VERSION',			'validate' => 'int',	'type' => 'custom',			'method' => 'gd_radio'),
389
-					'thumbnail_width'		=> array('lang' => 'THUMBNAIL_WIDTH',		'validate' => 'int',	'type' => 'text:7:3',		'append' => 'PIXELS'),
390
-					'thumbnail_height'		=> array('lang' => 'THUMBNAIL_HEIGHT',		'validate' => 'int',	'type' => 'text:7:3',		'append' => 'PIXELS'),
391
-					'thumbnail_quality'		=> array('lang' => 'THUMBNAIL_QUALITY',		'validate' => 'int',	'type' => 'text:7:3',		'explain' => true,	'append' => 'PERCENT'),
388
+					'gdlib_version'			=> array('lang' => 'GD_VERSION', 'validate' => 'int', 'type' => 'custom', 'method' => 'gd_radio'),
389
+					'thumbnail_width'		=> array('lang' => 'THUMBNAIL_WIDTH', 'validate' => 'int', 'type' => 'text:7:3', 'append' => 'PIXELS'),
390
+					'thumbnail_height'		=> array('lang' => 'THUMBNAIL_HEIGHT', 'validate' => 'int', 'type' => 'text:7:3', 'append' => 'PIXELS'),
391
+					'thumbnail_quality'		=> array('lang' => 'THUMBNAIL_QUALITY', 'validate' => 'int', 'type' => 'text:7:3', 'explain' => true, 'append' => 'PERCENT'),
392 392
 					//'thumbnail_infoline'	=> array('lang' => 'INFO_LINE',				'validate' => 'bool',	'type' => 'radio:yes_no'),
393 393
 				),
394 394
 
395 395
 				'WATERMARK_OPTIONS'	=> array(
396
-					'watermark_enabled'		=> array('lang' => 'WATERMARK_IMAGES',		'validate' => 'bool',	'type' => 'radio:yes_no'),
397
-					'watermark_source'		=> array('lang' => 'WATERMARK_SOURCE',		'validate' => 'string',	'type' => 'custom',			'explain' => true,	'method' => 'watermark_source'),
398
-					'watermark_height'		=> array('lang' => 'WATERMARK_HEIGHT',		'validate' => 'int',	'type' => 'text:7:4',		'explain' => true,	'append' => 'PIXELS'),
399
-					'watermark_width'		=> array('lang' => 'WATERMARK_WIDTH',		'validate' => 'int',	'type' => 'text:7:4',		'explain' => true,	'append' => 'PIXELS'),
400
-					'watermark_position'	=> array('lang' => 'WATERMARK_POSITION',	'validate' => '',		'type' => 'custom',			'method' => 'watermark_position'),
396
+					'watermark_enabled'		=> array('lang' => 'WATERMARK_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
397
+					'watermark_source'		=> array('lang' => 'WATERMARK_SOURCE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'watermark_source'),
398
+					'watermark_height'		=> array('lang' => 'WATERMARK_HEIGHT', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'),
399
+					'watermark_width'		=> array('lang' => 'WATERMARK_WIDTH', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'),
400
+					'watermark_position'	=> array('lang' => 'WATERMARK_POSITION', 'validate' => '', 'type' => 'custom', 'method' => 'watermark_position'),
401 401
 				),
402 402
 
403 403
 				'UC_LINK_CONFIG'	=> array(
404
-					'link_thumbnail'		=> array('lang' => 'UC_THUMBNAIL',			'validate' => 'string',	'type' => 'custom',			'explain' => true,	'method' => 'uc_select'),
405
-					'link_imagepage'		=> array('lang' => 'UC_IMAGEPAGE',			'validate' => 'string',	'type' => 'custom',			'explain' => true,	'method' => 'uc_select'),
406
-					'link_image_name'		=> array('lang' => 'UC_IMAGE_NAME',			'validate' => 'string',	'type' => 'custom',			'method' => 'uc_select'),
407
-					'link_image_icon'		=> array('lang' => 'UC_IMAGE_ICON',			'validate' => 'string',	'type' => 'custom',			'method' => 'uc_select'),
404
+					'link_thumbnail'		=> array('lang' => 'UC_THUMBNAIL', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'uc_select'),
405
+					'link_imagepage'		=> array('lang' => 'UC_IMAGEPAGE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'uc_select'),
406
+					'link_image_name'		=> array('lang' => 'UC_IMAGE_NAME', 'validate' => 'string', 'type' => 'custom', 'method' => 'uc_select'),
407
+					'link_image_icon'		=> array('lang' => 'UC_IMAGE_ICON', 'validate' => 'string', 'type' => 'custom', 'method' => 'uc_select'),
408 408
 				),
409 409
 
410 410
 				'RRC_GINDEX'	=> array(
411
-					'rrc_gindex_mode'		=> array('lang' => 'RRC_GINDEX_MODE',		'validate' => 'int',	'type' => 'custom',			'explain' => true,	'method' => 'rrc_modes'),
412
-					'rrc_gindex_comments'	=> array('lang' => 'RRC_GINDEX_COMMENTS',	'validate' => 'bool',	'type' => 'radio:yes_no'),
411
+					'rrc_gindex_mode'		=> array('lang' => 'RRC_GINDEX_MODE', 'validate' => 'int', 'type' => 'custom', 'explain' => true, 'method' => 'rrc_modes'),
412
+					'rrc_gindex_comments'	=> array('lang' => 'RRC_GINDEX_COMMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no'),
413 413
 					//'rrc_gindex_contests'	=> array('lang' => 'RRC_GINDEX_CONTESTS',	'validate' => 'int',	'type' => 'text:7:3'),
414
-					'rrc_gindex_display'	=> array('lang' => 'RRC_DISPLAY_OPTIONS',	'validate' => '',		'type' => 'custom',			'method' => 'rrc_display'),
415
-					'rrc_gindex_pegas'		=> array('lang' => 'RRC_GINDEX_PGALLERIES',	'validate' => 'bool',	'type' => 'radio:yes_no'),
414
+					'rrc_gindex_display'	=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => '', 'type' => 'custom', 'method' => 'rrc_display'),
415
+					'rrc_gindex_pegas'		=> array('lang' => 'RRC_GINDEX_PGALLERIES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
416 416
 				),
417 417
 
418 418
 				'PHPBB_INTEGRATION'	=> array(
419
-					'disp_gallery_icon'			=> array('lang' => 'DISP_GALLERY_ICON',				'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
420
-					'disp_total_images'			=> array('lang' => 'DISP_TOTAL_IMAGES',				'validate' => 'bool',	'type' => 'radio:yes_no'),
421
-					'profile_user_images'		=> array('lang' => 'DISP_USER_IMAGES_PROFILE',		'validate' => 'bool',	'type' => 'radio:yes_no'),
422
-					'profile_pega'				=> array('lang' => 'DISP_PERSONAL_ALBUM_PROFILE',	'validate' => 'bool',	'type' => 'radio:yes_no'),
423
-					'rrc_profile_mode'			=> array('lang' => 'RRC_PROFILE_MODE',				'validate' => 'int',	'type' => 'custom',			'explain' => true,	'method' => 'rrc_modes'),
424
-					'rrc_profile_items'			=> array('lang' => 'RRC_PROFILE_ITEMS',				'validate' => 'int',	'type' => 'text:7:3'),
425
-					'rrc_profile_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS',			'validate' => 'int',	'type' => 'custom',			'method' => 'rrc_display'),
419
+					'disp_gallery_icon'			=> array('lang' => 'DISP_GALLERY_ICON', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
420
+					'disp_total_images'			=> array('lang' => 'DISP_TOTAL_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
421
+					'profile_user_images'		=> array('lang' => 'DISP_USER_IMAGES_PROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no'),
422
+					'profile_pega'				=> array('lang' => 'DISP_PERSONAL_ALBUM_PROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no'),
423
+					'rrc_profile_mode'			=> array('lang' => 'RRC_PROFILE_MODE', 'validate' => 'int', 'type' => 'custom', 'explain' => true, 'method' => 'rrc_modes'),
424
+					'rrc_profile_items'			=> array('lang' => 'RRC_PROFILE_ITEMS', 'validate' => 'int', 'type' => 'text:7:3'),
425
+					'rrc_profile_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'),
426 426
 					//'rrc_profile_pegas'			=> array('lang' => 'RRC_GINDEX_PGALLERIES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
427 427
 					//'viewtopic_icon'			=> array('lang' => 'DISP_VIEWTOPIC_ICON',			'validate' => 'bool',	'type' => 'radio:yes_no'),
428 428
 					//'viewtopic_images'			=> array('lang' => 'DISP_VIEWTOPIC_IMAGES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
@@ -430,15 +430,15 @@  discard block
 block discarded – undo
430 430
 				),
431 431
 
432 432
 				'INDEX_SETTINGS'	=> array(
433
-					'pegas_index_album'		=> array('lang' => 'PERSONAL_ALBUM_INDEX',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
433
+					'pegas_index_album'		=> array('lang' => 'PERSONAL_ALBUM_INDEX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
434 434
 					//'pegas_index_random'	=> array('lang'	=> 'RANDOM_ON_INDEX',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
435
-					'pegas_index_rnd_count'	=> array('lang'	=> 'RANDOM_ON_INDEX_COUNT',	'validate' => 'int',	'type' => 'text:7:3'),
435
+					'pegas_index_rnd_count'	=> array('lang'	=> 'RANDOM_ON_INDEX_COUNT', 'validate' => 'int', 'type' => 'text:7:3'),
436 436
 					//'pegas_index_recent'	=> array('lang'	=> 'RECENT_ON_INDEX',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
437
-					'pegas_index_rct_count'	=> array('lang'	=> 'RECENT_ON_INDEX_COUNT',	'validate' => 'int',	'type' => 'text:7:3'),
438
-					'disp_login'			=> array('lang' => 'DISP_LOGIN',			'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
439
-					'disp_whoisonline'		=> array('lang' => 'DISP_WHOISONLINE',		'validate' => 'bool',	'type' => 'radio:yes_no'),
440
-					'disp_birthdays'		=> array('lang' => 'DISP_BIRTHDAYS',		'validate' => 'bool',	'type' => 'radio:yes_no'),
441
-					'disp_statistic'		=> array('lang' => 'DISP_STATISTIC',		'validate' => 'bool',	'type' => 'radio:yes_no'),
437
+					'pegas_index_rct_count'	=> array('lang'	=> 'RECENT_ON_INDEX_COUNT', 'validate' => 'int', 'type' => 'text:7:3'),
438
+					'disp_login'			=> array('lang' => 'DISP_LOGIN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
439
+					'disp_whoisonline'		=> array('lang' => 'DISP_WHOISONLINE', 'validate' => 'bool', 'type' => 'radio:yes_no'),
440
+					'disp_birthdays'		=> array('lang' => 'DISP_BIRTHDAYS', 'validate' => 'bool', 'type' => 'radio:yes_no'),
441
+					'disp_statistic'		=> array('lang' => 'DISP_STATISTIC', 'validate' => 'bool', 'type' => 'radio:yes_no'),
442 442
 				),
443 443
 			),
444 444
 		),
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
 		global $phpbb_container;
582 582
 		$this->language = $phpbb_container->get('language');
583 583
 
584
-		$sort_order_options = '';//phpbb_gallery_plugins::uc_select($value, $key);
584
+		$sort_order_options = ''; //phpbb_gallery_plugins::uc_select($value, $key);
585 585
 
586 586
 		if ($key != 'link_imagepage')
587 587
 		{
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
 		$sort_order_options .= '<option' . (($value == 'none') ? ' selected="selected"' : '') . " value='none'>" . $this->language->lang('UC_LINK_NONE') . '</option>';
596 596
 
597 597
 		return "<select name='config[$key]' id='$key'>$sort_order_options</select>"
598
-			. (($key == 'link_thumbnail') ? '<br /><input class="checkbox" type="checkbox" name="update_bbcode" id="update_bbcode" value="update_bbcode" /><label for="update_bbcode">' .  $this->language->lang('UPDATE_BBCODE') . '</label>' : '');
598
+			. (($key == 'link_thumbnail') ? '<br /><input class="checkbox" type="checkbox" name="update_bbcode" id="update_bbcode" value="update_bbcode" /><label for="update_bbcode">' . $this->language->lang('UPDATE_BBCODE') . '</label>' : '');
599 599
 	}
600 600
 
601 601
 	/**
Please login to merge, or discard this patch.