@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | $this->user = $user; |
53 | 53 | $this->gallery_config = $gallery_config; |
54 | 54 | $this->gallery_auth = $gallery_auth; |
55 | - $this->gallery_url = $gallery_url; |
|
55 | + $this->gallery_url = $gallery_url; |
|
56 | 56 | $this->gallery_user = $gallery_user; |
57 | 57 | } |
58 | 58 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | { |
66 | 66 | $this->user->add_lang_ext('phpbbgallery/exif', 'exif'); |
67 | 67 | |
68 | - $return_ary['vars']['IMAGE_SETTINGS']['disp_exifdata'] = array('lang' => 'DISP_EXIF_DATA', 'validate' => 'bool', 'type' => 'radio:yes_no'); |
|
68 | + $return_ary['vars']['IMAGE_SETTINGS']['disp_exifdata'] = array('lang' => 'DISP_EXIF_DATA', 'validate' => 'bool', 'type' => 'radio:yes_no'); |
|
69 | 69 | $event['return_ary'] = $return_ary; |
70 | 70 | } |
71 | 71 | } |
@@ -30,9 +30,9 @@ discard block |
||
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 |
||
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', |
@@ -31,9 +31,9 @@ discard block |
||
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 |
||
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' => 'Неизвестно', |
@@ -31,9 +31,9 @@ discard block |
||
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 |
||
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', |
@@ -31,9 +31,9 @@ discard block |
||
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 |
||
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', |
@@ -279,7 +279,7 @@ discard block |
||
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 |
||
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 |
||
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); |
@@ -190,9 +190,9 @@ |
||
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 |
@@ -158,7 +158,7 @@ discard block |
||
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 |
||
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 | { |
@@ -23,13 +23,13 @@ discard block |
||
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 |
||
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 |