satanasov / phpbbgallery

exif/exif.php

Spacing +14 added lines, -14 removed lines

@@ -17,7 +17,7 @@ 
 	/**
 	* Default value for new users
 	*/
-	const DEFAULT_DISPLAY	= true;
+	const DEFAULT_DISPLAY = true;
 
 	/**
 	* phpBB will treat the time from the Exif data like UTC.
@@ -26,13 +26,13 @@ 
 	*
 	* Offset must be set in seconds.
 	*/
-	const TIME_OFFSET	= 0;
+	const TIME_OFFSET = 0;
 
 	/**
 	* Constants for the status of the Exif data.
 	*/
-	const UNAVAILABLE	= 0;
-	const AVAILABLE		= 1;
+	const UNAVAILABLE = 0;
+	const AVAILABLE = 1;
 	const UNKNOWN		= 2;
 	const DBSAVED		= 3;
 
@@ -44,33 +44,33 @@ 
 	/**
 	* Exif data array with all allowed groups and keys.
 	*/
-	public $data		= array();
+	public $data = array();
 
 	/**
 	* Filtered data array. We don't have empty or invalid values here.
 	*/
-	public $prepared_data	= array();
+	public $prepared_data = array();
 
 	/**
 	* Does the image have exif data?
 	* Values see constant declaration at the beginning of the class.
 	*/
-	public $status		= 2;
+	public $status = 2;
 
 	/**
 	* Full data array, but serialized to a string
 	*/
-	public $serialized	= '';
+	public $serialized = '';
 
 	/**
 	* Full link to the image-file
 	*/
-	public $file		= '';
+	public $file = '';
 
 	/**
 	* Image-ID, just needed to update the Exif status
 	*/
-	public $image_id	= false;
+	public $image_id = false;
 
 	/**
 	* Constructor
@@ -201,7 +201,7 @@ 
 			}
 			else if ($num)
 			{
-				$exif_exposure = ' 1/' . $den / $num ;
+				$exif_exposure = ' 1/' . $den / $num;
 			}
 			if ($exif_exposure)
 			{
@@ -244,7 +244,7 @@ 
 		}
 		if (isset($this->data["EXIF"]["ExposureBiasValue"]))
 		{
-			list($num,$den) = explode("/", $this->data["EXIF"]["ExposureBiasValue"]);
+			list($num, $den) = explode("/", $this->data["EXIF"]["ExposureBiasValue"]);
 			if ($den)
 			{
 				if (($num / $den) == 0)
@@ -318,12 +318,12 @@ 
 	* There are lots of possible Exif Groups and Values.
 	* But you will never heard of the missing ones. so we just allow the most common ones.
 	*/
-	static private $allowed_groups		= array(
+	static private $allowed_groups = array(
 		'EXIF',
 		'IFD0',
 	);
 
-	static private $allowed_keys		= array(
+	static private $allowed_keys = array(
 		'DateTimeOriginal',
 		'FocalLength',
 		'ExposureTime',

Braces +5 added lines, -10 removed lines

@@ -105,8 +105,7 @@ 
 		if ($this->status == self::DBSAVED)
 		{
 			$this->data = unserialize($data);
-		}
-		else if (($this->status == self::AVAILABLE) || ($this->status == self::UNKNOWN))
+		} else if (($this->status == self::AVAILABLE) || ($this->status == self::UNKNOWN))
 		{
 			$this->read();
 		}
@@ -132,8 +131,7 @@ 
 				if (!in_array($key, self::$allowed_groups))
 				{
 					unset($this->data[$key]);
-				}
-				else
+				} else
 				{
 					foreach ($this->data[$key] as $subkey => $array)
 					{
@@ -147,8 +145,7 @@ 
 
 			$this->serialized = serialize($this->data);
 			$this->status = self::DBSAVED;
-		}
-		else
+		} else
 		{
 			$this->status = self::UNAVAILABLE;
 		}
@@ -198,8 +195,7 @@ 
 			if (($num > $den) && $den)
 			{
 				$exif_exposure = $num / $den;
-			}
-			else if ($num)
+			} else if ($num)
 			{
 				$exif_exposure = ' 1/' . $den / $num ;
 			}
@@ -250,8 +246,7 @@ 
 				if (($num / $den) == 0)
 				{
 					$exif_exposure_bias = 0;
-				}
-				else
+				} else
 				{
 					$exif_exposure_bias = $this->data["EXIF"]["ExposureBiasValue"];
 				}

exif/event/exif_listener.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 		$this->user = $user;
 		$this->gallery_config = $gallery_config;
 		$this->gallery_auth = $gallery_auth;
-		$this->gallery_url	= $gallery_url;
+		$this->gallery_url = $gallery_url;
 		$this->gallery_user = $gallery_user;
 	}
 
@@ -65,7 +65,7 @@ 
 			{
 				$this->user->add_lang_ext('phpbbgallery/exif', 'exif');
 
-				$return_ary['vars']['IMAGE_SETTINGS']['disp_exifdata'] = array('lang' => 'DISP_EXIF_DATA',		'validate' => 'bool',	'type' => 'radio:yes_no');
+				$return_ary['vars']['IMAGE_SETTINGS']['disp_exifdata'] = array('lang' => 'DISP_EXIF_DATA', 'validate' => 'bool', 'type' => 'radio:yes_no');
 				$event['return_ary'] = $return_ary;
 			}
 		}

Braces +1 added lines, -2 removed lines

@@ -146,8 +146,7 @@
 
 			$event['additional_sql_data'] = $additional_sql_data;
 			unset($exif);
-		}
-		else
+		} else
 		{
 			$additional_sql_data = $event['additional_sql_data'];
 			$additional_sql_data['image_exif_data'] = '';

exif/language/en/exif.php

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@ 
 	'EXIF_CAM_MODEL'			=> 'Camera-model',
 	'EXIF_DATE'					=> 'Image taken on',
 	'EXIF_EXPOSURE'				=> 'Shutter speed',
-	'EXIF_EXPOSURE_EXP'			=> '%s Sec',// 'EXIF_EXPOSURE' unit
+	'EXIF_EXPOSURE_EXP'			=> '%s Sec', // 'EXIF_EXPOSURE' unit
 	'EXIF_EXPOSURE_BIAS'		=> 'Exposure bias',
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV',// 'EXIF_EXPOSURE_BIAS' unit
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV', // 'EXIF_EXPOSURE_BIAS' unit
 	'EXIF_EXPOSURE_PROG'		=> 'Exposure program',
 	'EXIF_EXPOSURE_PROG_0'		=> 'Not defined',
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manual',
@@ -72,7 +72,7 @@ 
 	'EXIF_FLASH_CASE_93'		=> 'Flash fired, auto mode, return light not detected, red-eye reduction mode',
 	'EXIF_FLASH_CASE_95'		=> 'Flash fired, auto mode, return light detected, red-eye reduction mode',
 	'EXIF_FOCAL'				=> 'Focus length',
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
 	'EXIF_ISO'					=> 'ISO speed rating',
 	'EXIF_METERING_MODE'		=> 'Metering mode',
 	'EXIF_METERING_MODE_0'		=> 'Unknown',

exif/language/ru/exif.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@ 
 	'EXIF_CAM_MODEL'			=> 'Модель камеры',
 	'EXIF_DATE'					=> 'Изображение заснято',
 	'EXIF_EXPOSURE'				=> 'Выдержка',
-	'EXIF_EXPOSURE_EXP'			=> '%s сек',// 'EXIF_EXPOSURE' unit
+	'EXIF_EXPOSURE_EXP'			=> '%s сек', // 'EXIF_EXPOSURE' unit
 	'EXIF_EXPOSURE_BIAS'		=> 'Корректировка выдержки',
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s LW',// 'EXIF_EXPOSURE_BIAS' unit
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s LW', // 'EXIF_EXPOSURE_BIAS' unit
 	'EXIF_EXPOSURE_PROG'		=> 'Программа экспозиции',
 	'EXIF_EXPOSURE_PROG_0'		=> 'Неопределенно',
 	'EXIF_EXPOSURE_PROG_1'		=> 'Вручную',
@@ -73,7 +73,7 @@ 
 	'EXIF_FLASH_CASE_93'		=> 'Вспышка сработала, авторежим, нет отражателя вспышки, подавление эффекта красных глаз',
 	'EXIF_FLASH_CASE_95'		=> 'Вспышка сработала, авторежим, отражатель вспышки сработал, подавление эффекта красных глаз',
 	'EXIF_FOCAL'				=> 'Фокусное расстояние',
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
 	'EXIF_ISO'					=> 'ISO-чувствительность',
 	'EXIF_METERING_MODE'		=> 'Метод выдержки и измерения',
 	'EXIF_METERING_MODE_0'		=> 'Неизвестно',

exif/language/de/exif.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@ 
 	'EXIF_CAM_MODEL'			=> 'Kamera-Modell',
 	'EXIF_DATE'					=> 'Bild aufgenommen am',
 	'EXIF_EXPOSURE'				=> 'Belichtungszeit',
-	'EXIF_EXPOSURE_EXP'			=> '%s Sek',// 'EXIF_EXPOSURE' unit
+	'EXIF_EXPOSURE_EXP'			=> '%s Sek', // 'EXIF_EXPOSURE' unit
 	'EXIF_EXPOSURE_BIAS'		=> 'Belichtungskorrektur',
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s LW',// 'EXIF_EXPOSURE_BIAS' unit
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s LW', // 'EXIF_EXPOSURE_BIAS' unit
 	'EXIF_EXPOSURE_PROG'		=> 'Belichtungsprogramm',
 	'EXIF_EXPOSURE_PROG_0'		=> 'Nicht definiert',
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manuell',
@@ -73,7 +73,7 @@ 
 	'EXIF_FLASH_CASE_93'		=> 'Blitz wurde ausgelöst, Automodus, kein Messblitz-Licht zurückgeworfen, Rote-Augen-Reduzierung',
 	'EXIF_FLASH_CASE_95'		=> 'Blitz wurde ausgelöst, Automodus, Messblitz-Licht zurückgeworfen, Rote-Augen-Reduzierung',
 	'EXIF_FOCAL'				=> 'Brennweite',
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
 	'EXIF_ISO'					=> 'ISO-Empfindlichkeit',
 	'EXIF_METERING_MODE'		=> 'Belichtungs- Messmethode',
 	'EXIF_METERING_MODE_0'		=> 'Unbekannt',

exif/language/fr/exif.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@ 
 	'EXIF_CAM_MODEL'			=> 'Modèle d’appareil photo',
 	'EXIF_DATE'					=> 'Image prise le',
 	'EXIF_EXPOSURE'				=> 'Vitesse d’obturation',
-	'EXIF_EXPOSURE_EXP'			=> '%s Sec',// 'EXIF_EXPOSURE' unit
+	'EXIF_EXPOSURE_EXP'			=> '%s Sec', // 'EXIF_EXPOSURE' unit
 	'EXIF_EXPOSURE_BIAS'		=> 'Angle d’exposition',
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV',// 'EXIF_EXPOSURE_BIAS' unit
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV', // 'EXIF_EXPOSURE_BIAS' unit
 	'EXIF_EXPOSURE_PROG'		=> 'Programme d’exposition',
 	'EXIF_EXPOSURE_PROG_0'		=> 'Non défini',
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manuel',
@@ -73,7 +73,7 @@ 
 	'EXIF_FLASH_CASE_93'		=> 'Flash déclenché, mode automatique, avec retour de lumière non détecté, yeux rouges réduits',
 	'EXIF_FLASH_CASE_95'		=> 'Flash déclenché, mode automatique, avec retour de lumière détecté, yeux rouges réduits',
 	'EXIF_FOCAL'				=> 'Longueur de focale',
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
 	'EXIF_ISO'					=> 'Sensibilité ISO',
 	'EXIF_METERING_MODE'		=> 'Mode de mesure',
 	'EXIF_METERING_MODE_0'		=> 'Inconnu',

core/report.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 	const LOCKED = 2;
 
 	public function __construct(\phpbbgallery\core\log $gallery_log, \phpbbgallery\core\auth\auth $gallery_auth, \phpbb\user $user,
-		\phpbb\language\language $language, \phpbb\db\driver\driver_interface $db,	\phpbb\user_loader $user_loader,
+		\phpbb\language\language $language, \phpbb\db\driver\driver_interface $db, \phpbb\user_loader $user_loader,
 		\phpbbgallery\core\album\album $album, \phpbb\template\template $template, \phpbb\controller\helper $helper,
 		\phpbbgallery\core\config $gallery_config, \phpbb\pagination $pagination, \phpbbgallery\core\notification\helper $notification_helper,
 		$images_table, $reports_table)
@@ -321,7 +321,7 @@ 
 				'REPORT_TIME'	=> $this->user->format_date($VAR['report_time']),
 			));
 			unset($album_tmp);
-			$reported_images_count ++;
+			$reported_images_count++;
 		}
 		$this->template->assign_vars(array(
 			'TOTAL_IMAGES_REPORTED' => $status == 1 ? $this->language->lang('WAITING_REPORTED_IMAGE', (int) $count) : $this->language->lang('WAITING_REPORTED_DONE', (int) $count),

Braces +3 added lines, -6 removed lines

@@ -249,8 +249,7 @@ 
 			{
 				$mod_array[] = 0;
 			}
-		}
-		else
+		} else
 		{
 			$mod_array = array($album);
 		}
@@ -340,8 +339,7 @@ 
 			$this->template->assign_vars(array(
 				'TOTAL_PAGES'				=> $this->language->lang('PAGE_TITLE_NUMBER', $page + 1),
 			));
-		}
-		else
+		} else
 		{
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(
@@ -396,8 +394,7 @@ 
 		if (is_array($ids))
 		{
 			return array_map('intval', $ids);
-		}
-		else
+		} else
 		{
 			return array((int) $ids);
 		}

core/upload.php

Spacing +3 added lines, -3 removed lines

@@ -279,7 +279,7 @@ 
 			include_once($this->root_path . 'includes/message_parser.' . $this->php_ext);
 		}
 		$message_parser = new \parse_message();
-		$message_parser->message	= utf8_normalize_nfc($this->get_description());
+		$message_parser->message = utf8_normalize_nfc($this->get_description());
 		if ($message_parser->message)
 		{
 			$message_parser->parse(true, true, true, true, false, true, true, true);
@@ -334,7 +334,7 @@ 
 
 		$sql_ary = array_merge($sql_ary, $additional_sql_data);
 
-		$sql = 'UPDATE ' . $this->images_table. ' 
+		$sql = 'UPDATE ' . $this->images_table . ' 
 			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
 			WHERE image_id = ' . (int) $image_id;
 		$this->db->sql_query($sql);
@@ -452,7 +452,7 @@ 
 		// Rotate the image
 		if ($this->gallery_config->get('allow_rotate') && $this->get_rotating())
 		{
-			$this->tools->rotate_image($this->get_rotating(),$this->gallery_config->get('allow_resize'));
+			$this->tools->rotate_image($this->get_rotating(), $this->gallery_config->get('allow_resize'));
 			if ($this->tools->rotated)
 			{
 				$this->tools->write_image($this->tools->image_source, $this->gallery_config->get('jpg_quality'), true);

Braces +7 added lines, -14 removed lines

@@ -144,8 +144,7 @@ 
 			{
 				$this->zip_file = $this->file;
 				$this->upload_zip();
-			}
-			else
+			} else
 			{
 				$image_id = $this->prepare_file();
 				if ($image_id)
@@ -210,8 +209,7 @@ 
 			if (is_dir($current_dir . $file))
 			{
 				$this->read_zip_folder($current_dir . $file . '/');
-			}
-			else if (in_array(utf8_substr(strtolower($file), utf8_strrpos($file, '.') + 1), self::get_allowed_types(false, true)))
+			} else if (in_array(utf8_substr(strtolower($file), utf8_strrpos($file, '.') + 1), self::get_allowed_types(false, true)))
 			{
 				if (!$this->file_limit || ($this->uploaded_files < $this->file_limit))
 				{
@@ -231,23 +229,20 @@ 
 					{
 						$this->uploaded_files++;
 						$this->images[] = (int) $image_id;
-					}
-					else
+					} else
 					{
 						if ($this->file->error)
 						{
 							$this->new_error($this->language->lang('UPLOAD_ERROR', $this->file->get('uploadname'), implode('<br />&raquo; ', $this->file->error)));
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->quota_error();
 					@unlink($current_dir . $file);
 				}
 
-			}
-			else
+			} else
 			{
 				@unlink($current_dir . $file);
 			}
@@ -356,8 +351,7 @@ 
 		{
 			$this->file->clean_filename('unique_ext');
 			$this->file->move_file(substr($this->gallery_url->path('upload'), 0, -1), false, false, CHMOD_ALL);
-		}
-		else
+		} else
 		{
 			// Okay, this looks hacky, but what we do here is, we store the directory name in the filename.
 			// However phpBB strips directories form the filename, when moving, so we need to specify that again.
@@ -411,8 +405,7 @@ 
 					//$this->file->height = $this->tools->image_size['height'];
 					//$this->file->width = $this->tools->image_size['width'];
 				}
-			}
-			else
+			} else
 			{
 				$this->file->remove();
 				$this->new_error($this->language->lang('UPLOAD_ERROR', $this->file->get('uploadname'), $this->language->lang('UPLOAD_IMAGE_SIZE_TOO_BIG')));

core/contest.php

Spacing +3 added lines, -3 removed lines

@@ -190,9 +190,9 @@
 		$this->db->sql_freeresult($result);
 
 		$sql = 'UPDATE ' . $this->contest_table . '
-			SET contest_first = ' . (int) $first .',
-				contest_second = ' . (int) $second .',
-				contest_third = ' . (int) $third .'
+			SET contest_first = ' . (int) $first . ',
+				contest_second = ' . (int) $second . ',
+				contest_third = ' . (int) $third . '
 			WHERE contest_album_id = ' . (int) $album_id;
 		$this->db->sql_query($sql);
 

Braces +1 added lines, -2 removed lines

@@ -165,8 +165,7 @@
 			{
 				$this->resync($album_id);
 			}
-		}
-		else
+		} else
 		{
 			$this->resync((int) $album_ids);
 		}