satanasov / phpbbgallery

exif/event/exif_listener.php

Indentation +10 added lines, -10 removed lines

@@ -36,16 +36,16 @@
 	}
 
 	/**
-	* Constructor
-	* NOTE: The parameters of this method must match in order and type with
-	* the dependencies defined in the services.yml file for this service.
-	*
-	* @param \phpbb\user					$user			User object
-	* @param \phpbbgallery\core\config		$gallery_config	Core gallery config object
-	* @param \phpbbgallery\core\auth\auth	$gallery_auth	Core gallery auth object
-	* @param \phpbbgallery\core\url			$gallery_url	Core gallery url object
-	* @param \phpbbgallery\core\user		$gallery_user	Core gallery user wraper
-	*/
+	 * Constructor
+	 * NOTE: The parameters of this method must match in order and type with
+	 * the dependencies defined in the services.yml file for this service.
+	 *
+	 * @param \phpbb\user					$user			User object
+	 * @param \phpbbgallery\core\config		$gallery_config	Core gallery config object
+	 * @param \phpbbgallery\core\auth\auth	$gallery_auth	Core gallery auth object
+	 * @param \phpbbgallery\core\url			$gallery_url	Core gallery url object
+	 * @param \phpbbgallery\core\user		$gallery_user	Core gallery user wraper
+	 */
 
 	public function __construct(\phpbb\user $user, \phpbbgallery\core\config $gallery_config, \phpbbgallery\core\auth\auth $gallery_auth, \phpbbgallery\core\url $gallery_url, \phpbbgallery\core\user $gallery_user)
 	{

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

Indentation +12 added lines, -12 removed lines

@@ -140,10 +140,10 @@ 
 	}
 
 	/**
-	* Delete reports for given report_ids
-	*
-	* @param	mixed	$report_ids		Array or integer with report_id.
-	*/
+	 * Delete reports for given report_ids
+	 *
+	 * @param	mixed	$report_ids		Array or integer with report_id.
+	 */
 	public function delete($report_ids)
 	{
 		$report_ids = self::cast_mixed_int2array($report_ids);
@@ -163,10 +163,10 @@ 
 
 
 	/**
-	* Delete reports for given image_ids
-	*
-	* @param	mixed	$image_ids		Array or integer with image_id.
-	*/
+	 * Delete reports for given image_ids
+	 *
+	 * @param	mixed	$image_ids		Array or integer with image_id.
+	 */
 	public function delete_images($image_ids)
 	{
 		$image_ids = self::cast_mixed_int2array($image_ids);
@@ -194,10 +194,10 @@ 
 
 
 	/**
-	* Delete reports for given album_ids
-	*
-	* @param	mixed	$album_ids		Array or integer with album_id.
-	*/
+	 * Delete reports for given album_ids
+	 *
+	 * @param	mixed	$album_ids		Array or integer with album_id.
+	 */
 	public function delete_albums($album_ids)
 	{
 		$album_ids = self::cast_mixed_int2array($album_ids);

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);
 		}

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	protected $reports_table;
 
 	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)
@@ -363,7 +363,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),

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')));

Indentation +64 added lines, -64 removed lines

@@ -13,94 +13,94 @@ 
 class upload
 {
 	/**
-	* @var \phpbb\user
-	*/
+	 * @var \phpbb\user
+	 */
 	protected $user;
 
 	/**
-	* @var \phpbb\language\language
-	*/
+	 * @var \phpbb\language\language
+	 */
 	protected $language;
 
 	/**
-	* @var \phpbb\db\driver\driver_interface
-	*/
+	 * @var \phpbb\db\driver\driver_interface
+	 */
 	protected $db;
 
 	/**
-	* @var \phpbb\event\dispatcher_interface
-	*/
+	 * @var \phpbb\event\dispatcher_interface
+	 */
 	protected $phpbb_dispatcher;
 
 	/**
-	* @var \phpbb\request\request
-	*/
+	 * @var \phpbb\request\request
+	 */
 	protected $request;
 
 	/**
-	* @var \phpbb\files\upload
-	*/
+	 * @var \phpbb\files\upload
+	 */
 	protected $file_upload;
 
 	/**
-	* @var \phpbbgallery\core\image\image
-	*/
+	 * @var \phpbbgallery\core\image\image
+	 */
 	protected $gallery_image;
 
 	/**
-	* @var \phpbbgallery\core\config
-	*/
+	 * @var \phpbbgallery\core\config
+	 */
 	protected $gallery_config;
 
 	/**
-	* @var \phpbbgallery\core\url
-	*/
+	 * @var \phpbbgallery\core\url
+	 */
 	protected $gallery_url;
 
 	/**
-	* @var \phpbbgallery\core\block
-	*/
+	 * @var \phpbbgallery\core\block
+	 */
 	protected $block;
 
 	/**
-	* @var \phpbbgallery\core\file\file
-	*/
+	 * @var \phpbbgallery\core\file\file
+	 */
 	protected $tools;
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	protected $images_table;
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	protected $root_path;
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	protected $php_ext;
 
 	/**
-	* Number of Files per Directory
-	*
-	* If this constant is set to a value >0 the gallery will create a new directory,
-	* when the current directory has more files in it than set here.
-	*/
+	 * Number of Files per Directory
+	 *
+	 * If this constant is set to a value >0 the gallery will create a new directory,
+	 * when the current directory has more files in it than set here.
+	 */
 	const NUM_FILES_PER_DIR = 0;
 
 	/**
-	* Objects: phpBB Upload, 2 Files and Image-Functions
-	*/
+	 * Objects: phpBB Upload, 2 Files and Image-Functions
+	 */
 	private $upload = null;
 	private $file = null;
 	private $zip_file = null;
 	//private $tools = null;
 
 	/**
-	* Basic variables...
-	*/
+	 * Basic variables...
+	 */
 	public $loaded_files = 0;
 	public $uploaded_files = 0;
 	public $errors = array();
@@ -228,8 +228,8 @@ 
 	}
 
 	/**
-	* Upload a zip file and save the images into the import/ directory.
-	*/
+	 * Upload a zip file and save the images into the import/ directory.
+	 */
 	public function upload_zip()
 	{
 		if (!class_exists('compress_zip'))
@@ -377,14 +377,14 @@ 
 		$file_link = $this->gallery_url->path('upload') . $this->image_data[$image_id]['image_filename'];
 
 		/**
-		* Event upload image before
-		*
-		* @event phpbbgallery.core.upload.update_image_before
-		* @var	array	additional_sql_data		array of additional settings
-		* @var	array	image_data				array of image_data
-		* @var	string	file_link				link to file
-		* @since 1.2.0
-		*/
+		 * Event upload image before
+		 *
+		 * @event phpbbgallery.core.upload.update_image_before
+		 * @var	array	additional_sql_data		array of additional settings
+		 * @var	array	image_data				array of image_data
+		 * @var	string	file_link				link to file
+		 * @since 1.2.0
+		 */
 		$vars = array('additional_sql_data', 'image_data', 'file_link');
 		extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.upload.update_image_before', compact($vars)));
 
@@ -392,12 +392,12 @@ 
 		if (!$this->prepare_file_update($image_id))
 		{
 			/**
-			* Event upload image update
-			*
-			* @event phpbbgallery.core.upload.update_image_nofilechange
-			* @var	array	additional_sql_data		array of additional settings
-			* @since 1.2.0
-			*/
+			 * Event upload image update
+			 *
+			 * @event phpbbgallery.core.upload.update_image_nofilechange
+			 * @var	array	additional_sql_data		array of additional settings
+			 * @since 1.2.0
+			 */
 			$vars = array('additional_sql_data');
 			extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.upload.update_image_nofilechange', compact($vars)));
 		}
@@ -415,8 +415,8 @@ 
 	}
 
 	/**
-	* Prepare file on upload: rotate and resize
-	*/
+	 * Prepare file on upload: rotate and resize
+	 */
 	public function prepare_file()
 	{
 		$upload_dir = $this->get_current_upload_dir();
@@ -446,13 +446,13 @@ 
 		$file = $this->file;
 
 		/**
-		* Event upload image update
-		*
-		* @event phpbbgallery.core.upload.prepare_file_before
-		* @var	array	additional_sql_data		array of additional settings
-		* @var	array	file					File object
-		* @since 1.2.0
-		*/
+		 * Event upload image update
+		 *
+		 * @event phpbbgallery.core.upload.prepare_file_before
+		 * @var	array	additional_sql_data		array of additional settings
+		 * @var	array	file					File object
+		 * @since 1.2.0
+		 */
 		$vars = array('additional_sql_data', 'file');
 		extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.upload.prepare_file_before', compact($vars)));
 
@@ -804,8 +804,8 @@ 
 	}
 
 	/**
-	* Generate some kind of check so users only complete the uplaod for their images
-	*/
+	 * Generate some kind of check so users only complete the uplaod for their images
+	 */
 	public function generate_hidden_fields()
 	{
 		$checks = array();

core/contest.php

Indentation +15 added lines, -15 removed lines

@@ -34,18 +34,18 @@ 
 	const NUM_IMAGES = 3;
 
 	/**
-	* There are different modes to calculate who won the contest.
-	* This value should be one of the constant-names below.
-	*/
+	 * There are different modes to calculate who won the contest.
+	 * This value should be one of the constant-names below.
+	 */
 	static public $mode = self::MODE_AVERAGE;
 
 	/**
-	* The image with the highest average wins.
-	*/
+	 * The image with the highest average wins.
+	 */
 	const MODE_AVERAGE = 1;
 	/**
-	* The image with the highest number of total points wins.
-	*/
+	 * The image with the highest number of total points wins.
+	 */
 	const MODE_SUM = 2;
 
 	public function __construct(\phpbb\db\driver\driver_interface $db,
@@ -59,14 +59,14 @@ 
 	}
 
 	/**
-	* Get the contest row from the table
-	*
-	* @param	int		$id				ID of the contest or album, depending on second parameter
-	* @param	string	$mode			contest or album ID to get the contest.
-	* @param	bool	$throw_error	Shall we throw an error if the contest was not found?
-	*
-	* @return	mixed	Either the array or boolean false if contest does not exist
-	*/
+	 * Get the contest row from the table
+	 *
+	 * @param	int		$id				ID of the contest or album, depending on second parameter
+	 * @param	string	$mode			contest or album ID to get the contest.
+	 * @param	bool	$throw_error	Shall we throw an error if the contest was not found?
+	 *
+	 * @return	mixed	Either the array or boolean false if contest does not exist
+	 */
 	public function get_contest($id, $mode = 'contest', $throw_error = true)
 	{
 		$sql = 'SELECT *

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);
 		}

core/rating.php

Spacing +2 added lines, -2 removed lines

@@ -158,7 +158,7 @@ 
 	*/
 	public function display_box()
 	{
-		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT);//@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
+		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT); //@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
 
 		switch (self::MODE_SELECT)//@todo: phpbb_ext_gallery_core_config::get('rating_mode'))
 		{
@@ -201,7 +201,7 @@ 
 	 */
 	public function get_image_rating($user_rating = false, $display_contest_end = true)
 	{
-		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT);//@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
+		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT); //@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
 
 		switch (self::MODE_SELECT)//@todo: phpbb_ext_gallery_core_config::get('rating_mode'))
 		{

Braces +3 added lines, -6 removed lines

@@ -216,8 +216,7 @@ 
 						return $this->language->lang('CONTEST_RATING_HIDDEN');
 					}
 					return $this->language->lang('CONTEST_RESULT_HIDDEN', $this->user->format_date(($this->album_data('contest_start') + $this->album_data('contest_end')), false, true));
-				}
-				else
+				} else
 				{
 					if ($user_rating)
 					{
@@ -364,8 +363,7 @@ 
 		if (is_array($image_ids))
 		{
 			$image_ids = array_map('intval', $image_ids);
-		}
-		else
+		} else
 		{
 			$image_ids = (int) $image_ids;
 		}
@@ -399,8 +397,7 @@ 
 		if (is_array($image_ids))
 		{
 			$image_ids = array_map('intval', $image_ids);
-		}
-		else
+		} else
 		{
 			$image_ids = (int) $image_ids;
 		}

Indentation +69 added lines, -69 removed lines

@@ -13,91 +13,91 @@ 
 class rating
 {
 	/**
-	* @var \phpbb\db\driver\driver_interface
-	*/
+	 * @var \phpbb\db\driver\driver_interface
+	 */
 	protected $db;
 
 	/**
-	* @var \phpbb\template\template
-	*/
+	 * @var \phpbb\template\template
+	 */
 	protected $template;
 
 	/**
-	* @var \phpbb\user
-	*/
+	 * @var \phpbb\user
+	 */
 	protected $user;
 
 	/**
-	* @var \phpbb\language\language
-	*/
+	 * @var \phpbb\language\language
+	 */
 	protected $language;
 
 	/**
-	* @var \phpbb\request\request
-	*/
+	 * @var \phpbb\request\request
+	 */
 	protected $request;
 
 	/**
-	* @var \phpbbgallery\core\config
-	*/
+	 * @var \phpbbgallery\core\config
+	 */
 	protected $gallery_config;
 
 	/**
-	* @var \phpbbgallery\core\auth\auth
-	*/
+	 * @var \phpbbgallery\core\auth\auth
+	 */
 	protected $gallery_auth;
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	protected $images_table;
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	protected $albums_table;
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	protected $rates_table;
 
 	/**
-	* The image ID we want to rate
-	*/
+	 * The image ID we want to rate
+	 */
 	public $image_id = 0;
 
 	/**
-	* Private objects with the values for the image/album from the database
-	*/
+	 * Private objects with the values for the image/album from the database
+	 */
 	private $image_data = null;
 	private $album_data = null;
 
 	/**
-	* Rating the user gave the image.
-	*/
+	 * Rating the user gave the image.
+	 */
 	public $user_rating = null;
 
 	/**
-	* Is rating currently possible?
-	* Might be blocked because of contest-settings.
-	*/
+	 * Is rating currently possible?
+	 * Might be blocked because of contest-settings.
+	 */
 	public $rating_enabled = false;
 
 	/**
-	* Classic-rating box with a dropdown.
-	*/
+	 * Classic-rating box with a dropdown.
+	 */
 	const MODE_SELECT = 1;
 
 	/**
-	* Rating with stars, like the old-system from youtube.
+	 * Rating with stars, like the old-system from youtube.
 	//@todo: const MODE_STARS = 2;
-	*/
+	 */
 
 	/**
-	* Simple thumbs up or down.
+	 * Simple thumbs up or down.
 	//@todo: const MODE_THUMB = 3;
-	*/
+	 */
 
 	/**
 	 * Constructor
@@ -204,8 +204,8 @@ 
 	}
 
 	/**
-	* Displays the box where the user can rate the image.
-	*/
+	 * Displays the box where the user can rate the image.
+	 */
 	public function display_box()
 	{
 		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT);//@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
@@ -280,8 +280,8 @@ 
 	}
 
 	/**
-	* Get rated value for a image
-	*/
+	 * Get rated value for a image
+	 */
 	private function get_image_rating_value()
 	{
 		/*if (phpbb_ext_gallery_core_contest::$mode == phpbb_ext_gallery_core_contest::MODE_SUM)
@@ -295,14 +295,14 @@ 
 	}
 
 	/**
-	* Is the user allowed to rate?
-	* Following statements must be true:
-	*	- User must have permissions.
-	*	- User is neither owner of the image nor guest.
-	*	- Album and image are not locked.
-	*
-	* @return	bool
-	*/
+	 * Is the user allowed to rate?
+	 * Following statements must be true:
+	 *	- User must have permissions.
+	 *	- User is neither owner of the image nor guest.
+	 *	- Album and image are not locked.
+	 *
+	 * @return	bool
+	 */
 	public function is_allowed()
 	{
 		return $this->gallery_auth->acl_check('i_rate', $this->album_data('album_id'), $this->album_data('album_user_id')) &&
@@ -311,25 +311,25 @@ 
 	}
 
 	/**
-	* Is the user able to rate?
-	* Following statements must be true:
-	*	- User must be allowed to rate
-	*	- If the image is in a contest, it must be in the rating timespan
-	*
-	* @return	bool
-	*/
+	 * Is the user able to rate?
+	 * Following statements must be true:
+	 *	- User must be allowed to rate
+	 *	- If the image is in a contest, it must be in the rating timespan
+	 *
+	 * @return	bool
+	 */
 	public function is_able()
 	{
 		return $this->is_allowed(); //&& phpbb_ext_gallery_core_contest::is_step('rate', $this->album_data(true));
 	}
 
 	/**
-	* Get rating from a user for a given image
-	*
-	* @param	int		$user_id
-	*
-	* @return	mixed	False if the user did not rate or is guest, otherwise int the points.
-	*/
+	 * Get rating from a user for a given image
+	 *
+	 * @param	int		$user_id
+	 *
+	 * @return	mixed	False if the user did not rate or is guest, otherwise int the points.
+	 */
 	public function get_user_rating($user_id)
 	{
 		if (isset($this->user_rating[$user_id]))
@@ -405,10 +405,10 @@ 
 	}
 
 	/**
-	* Recalculate the average image-rating and such stuff.
-	*
-	* @param	mixed	$image_ids	Array or integer with image_id where we recalculate the rating.
-	*/
+	 * Recalculate the average image-rating and such stuff.
+	 *
+	 * @param	mixed	$image_ids	Array or integer with image_id where we recalculate the rating.
+	 */
 	public function recalc_image_rating($image_ids)
 	{
 		if (is_array($image_ids))
@@ -439,11 +439,11 @@ 
 	}
 
 	/**
-	* Delete all ratings for given image_ids
-	*
-	* @param	mixed	$image_ids		Array or integer with image_id where we delete the rating.
-	* @param	bool	$reset_average	Shall we also reset the average? We can save that query, when the images are deleted anyway.
-	*/
+	 * Delete all ratings for given image_ids
+	 *
+	 * @param	mixed	$image_ids		Array or integer with image_id where we delete the rating.
+	 * @param	bool	$reset_average	Shall we also reset the average? We can save that query, when the images are deleted anyway.
+	 */
 	public function delete_ratings($image_ids, $reset_average = false)
 	{
 		if (is_array($image_ids))