@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | /** |
18 | 18 | * Default value for new users |
19 | 19 | */ |
20 | - const DEFAULT_DISPLAY = true; |
|
20 | + const DEFAULT_DISPLAY = true; |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * phpBB will treat the time from the Exif data like UTC. |
@@ -26,13 +26,13 @@ discard block |
||
26 | 26 | * |
27 | 27 | * Offset must be set in seconds. |
28 | 28 | */ |
29 | - const TIME_OFFSET = 0; |
|
29 | + const TIME_OFFSET = 0; |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * Constants for the status of the Exif data. |
33 | 33 | */ |
34 | - const UNAVAILABLE = 0; |
|
35 | - const AVAILABLE = 1; |
|
34 | + const UNAVAILABLE = 0; |
|
35 | + const AVAILABLE = 1; |
|
36 | 36 | const UNKNOWN = 2; |
37 | 37 | const DBSAVED = 3; |
38 | 38 | |
@@ -44,33 +44,33 @@ discard block |
||
44 | 44 | /** |
45 | 45 | * Exif data array with all allowed groups and keys. |
46 | 46 | */ |
47 | - public $data = array(); |
|
47 | + public $data = array(); |
|
48 | 48 | |
49 | 49 | /** |
50 | 50 | * Filtered data array. We don't have empty or invalid values here. |
51 | 51 | */ |
52 | - public $prepared_data = array(); |
|
52 | + public $prepared_data = array(); |
|
53 | 53 | |
54 | 54 | /** |
55 | 55 | * Does the image have exif data? |
56 | 56 | * Values see constant declaration at the beginning of the class. |
57 | 57 | */ |
58 | - public $status = 2; |
|
58 | + public $status = 2; |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Full data array, but serialized to a string |
62 | 62 | */ |
63 | - public $serialized = ''; |
|
63 | + public $serialized = ''; |
|
64 | 64 | |
65 | 65 | /** |
66 | 66 | * Full link to the image-file |
67 | 67 | */ |
68 | - public $file = ''; |
|
68 | + public $file = ''; |
|
69 | 69 | |
70 | 70 | /** |
71 | 71 | * Image-ID, just needed to update the Exif status |
72 | 72 | */ |
73 | - public $image_id = false; |
|
73 | + public $image_id = false; |
|
74 | 74 | |
75 | 75 | /** |
76 | 76 | * Constructor |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | } |
202 | 202 | else if ($num) |
203 | 203 | { |
204 | - $exif_exposure = ' 1/' . $den / $num ; |
|
204 | + $exif_exposure = ' 1/' . $den / $num; |
|
205 | 205 | } |
206 | 206 | if ($exif_exposure) |
207 | 207 | { |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | } |
245 | 245 | if (isset($this->data["EXIF"]["ExposureBiasValue"])) |
246 | 246 | { |
247 | - list($num,$den) = explode("/", $this->data["EXIF"]["ExposureBiasValue"]); |
|
247 | + list($num, $den) = explode("/", $this->data["EXIF"]["ExposureBiasValue"]); |
|
248 | 248 | if ($den) |
249 | 249 | { |
250 | 250 | if (($num / $den) == 0) |
@@ -318,12 +318,12 @@ discard block |
||
318 | 318 | * There are lots of possible Exif Groups and Values. |
319 | 319 | * But you will never heard of the missing ones. so we just allow the most common ones. |
320 | 320 | */ |
321 | - static private $allowed_groups = array( |
|
321 | + static private $allowed_groups = array( |
|
322 | 322 | 'EXIF', |
323 | 323 | 'IFD0', |
324 | 324 | ); |
325 | 325 | |
326 | - static private $allowed_keys = array( |
|
326 | + static private $allowed_keys = array( |
|
327 | 327 | 'DateTimeOriginal', |
328 | 328 | 'FocalLength', |
329 | 329 | 'ExposureTime', |
@@ -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', |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | const LOCKED = 2; |
23 | 23 | |
24 | 24 | public function __construct(\phpbbgallery\core\log $gallery_log, \phpbbgallery\core\auth\auth $gallery_auth, \phpbb\user $user, |
25 | - \phpbb\language\language $language, \phpbb\db\driver\driver_interface $db, \phpbb\user_loader $user_loader, |
|
25 | + \phpbb\language\language $language, \phpbb\db\driver\driver_interface $db, \phpbb\user_loader $user_loader, |
|
26 | 26 | \phpbbgallery\core\album\album $album, \phpbb\template\template $template, \phpbb\controller\helper $helper, |
27 | 27 | \phpbbgallery\core\config $gallery_config, \phpbb\pagination $pagination, \phpbbgallery\core\notification\helper $notification_helper, |
28 | 28 | $images_table, $reports_table) |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | 'REPORT_TIME' => $this->user->format_date($VAR['report_time']), |
322 | 322 | )); |
323 | 323 | unset($album_tmp); |
324 | - $reported_images_count ++; |
|
324 | + $reported_images_count++; |
|
325 | 325 | } |
326 | 326 | $this->template->assign_vars(array( |
327 | 327 | 'TOTAL_IMAGES_REPORTED' => $status == 1 ? $this->language->lang('WAITING_REPORTED_IMAGE', (int) $count) : $this->language->lang('WAITING_REPORTED_DONE', (int) $count), |
@@ -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 |