satanasov / phpbbgallery

exif/exif.php

Indentation +49 added lines, -49 removed lines

@@ -15,69 +15,69 @@ 
 class exif
 {
 	/**
-	* Default value for new users
-	*/
+	 * Default value for new users
+	 */
 	const DEFAULT_DISPLAY	= true;
 
 	/**
-	* phpBB will treat the time from the Exif data like UTC.
-	* If your images were taken with an other timezone, you can insert an offset here.
-	* The offset is than added to the timestamp before it is converted into the users time.
-	*
-	* Offset must be set in seconds.
-	*/
+	 * phpBB will treat the time from the Exif data like UTC.
+	 * If your images were taken with an other timezone, you can insert an offset here.
+	 * The offset is than added to the timestamp before it is converted into the users time.
+	 *
+	 * Offset must be set in seconds.
+	 */
 	const TIME_OFFSET	= 0;
 
 	/**
-	* Constants for the status of the Exif data.
-	*/
+	 * Constants for the status of the Exif data.
+	 */
 	const UNAVAILABLE	= 0;
 	const AVAILABLE		= 1;
 	const UNKNOWN		= 2;
 	const DBSAVED		= 3;
 
 	/**
-	* Is the function available?
-	*/
+	 * Is the function available?
+	 */
 	static public $function_exists = null;
 
 	/**
-	* Exif data array with all allowed groups and keys.
-	*/
+	 * Exif data array with all allowed groups and keys.
+	 */
 	public $data		= array();
 
 	/**
-	* Filtered data array. We don't have empty or invalid values here.
-	*/
+	 * Filtered data array. We don't have empty or invalid values here.
+	 */
 	public $prepared_data	= array();
 
 	/**
-	* Does the image have exif data?
-	* Values see constant declaration at the beginning of the class.
-	*/
+	 * Does the image have exif data?
+	 * Values see constant declaration at the beginning of the class.
+	 */
 	public $status		= 2;
 
 	/**
-	* Full data array, but serialized to a string
-	*/
+	 * Full data array, but serialized to a string
+	 */
 	public $serialized	= '';
 
 	/**
-	* Full link to the image-file
-	*/
+	 * Full link to the image-file
+	 */
 	public $file		= '';
 
 	/**
-	* Image-ID, just needed to update the Exif status
-	*/
+	 * Image-ID, just needed to update the Exif status
+	 */
 	public $image_id	= false;
 
 	/**
-	* Constructor
-	*
-	* @param	string	$file		Full link to the image-file
-	* @param	mixed	$image_id	False or integer
-	*/
+	 * Constructor
+	 *
+	 * @param	string	$file		Full link to the image-file
+	 * @param	mixed	$image_id	False or integer
+	 */
 	public function __construct($file, $image_id = false)
 	{
 		if (self::$function_exists === null)
@@ -93,11 +93,11 @@ 
 	}
 
 	/**
-	* Intepret the values from the database, and read the data if we don't have it.
-	*
-	* @param	int		$status		Value of a status constant (see beginning of the class)
-	* @param	mixed	$data		Either an empty string or the serialized array of the Exif from the database
-	*/
+	 * Intepret the values from the database, and read the data if we don't have it.
+	 *
+	 * @param	int		$status		Value of a status constant (see beginning of the class)
+	 * @param	mixed	$data		Either an empty string or the serialized array of the Exif from the database
+	 */
 	public function interpret($status, $data)
 	{
 		$this->orig_status = $status;
@@ -113,8 +113,8 @@ 
 	}
 
 	/**
-	* Read Exif data from the image
-	*/
+	 * Read Exif data from the image
+	 */
 	public function read()
 	{
 		if (!self::$function_exists || !$this->file || !file_exists($this->file))
@@ -160,8 +160,8 @@ 
 	}
 
 	/**
-	* Validate and prepare the data, so we can send it into the template.
-	*/
+	 * Validate and prepare the data, so we can send it into the template.
+	 */
 	private function prepare_data()
 	{
 		global $user;
@@ -268,11 +268,11 @@ 
 	}
 
 	/**
-	* Sends the Exif into the template
-	*
-	* @param	bool	$expand_view	Shall we expand the Exif data on page view or collapse?
-	* @param	string	$block			Name of the template loop the Exifs are displayed in.
-	*/
+	 * Sends the Exif into the template
+	 *
+	 * @param	bool	$expand_view	Shall we expand the Exif data on page view or collapse?
+	 * @param	string	$block			Name of the template loop the Exifs are displayed in.
+	 */
 	public function send_to_template($expand_view = true, $block = 'exif_value')
 	{
 		$this->prepare_data();
@@ -296,8 +296,8 @@ 
 	}
 
 	/**
-	* Save the new Exif status in the database
-	*/
+	 * Save the new Exif status in the database
+	 */
 	public function set_status()
 	{
 		if (!$this->image_id || ($this->orig_status == $this->status))
@@ -315,9 +315,9 @@ 
 	}
 
 	/**
-	* 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.
-	*/
+	 * 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(
 		'EXIF',
 		'IFD0',

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

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)
 	{

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'] = '';

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

core/upload.php

Indentation +36 added lines, -36 removed lines

@@ -13,24 +13,24 @@ 
 class upload
 {
 	/**
-	* 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();
@@ -158,8 +158,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'))
@@ -307,14 +307,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)));
 
@@ -322,12 +322,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)));
 		}
@@ -345,8 +345,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();
@@ -376,13 +376,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)));
 
@@ -729,8 +729,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();

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

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 *

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

Indentation +49 added lines, -49 removed lines

@@ -13,41 +13,41 @@ 
 class rating
 {
 	/**
-	* 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
@@ -154,8 +154,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'));
@@ -230,8 +230,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)
@@ -245,14 +245,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')) &&
@@ -261,25 +261,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]))
@@ -355,10 +355,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))
@@ -389,11 +389,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))

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

core/image/image.php

Indentation +41 added lines, -41 removed lines

@@ -190,13 +190,13 @@ 
 		}
 
 		/**
-		* Event delete images
-		*
-		* @event phpbbgallery.core.image.delete_images
-		* @var	array	images			array of the image ids we are deleting
-		* @var	array	filenames		array of the image filenames
-		* @since 1.2.0
-		*/
+		 * Event delete images
+		 *
+		 * @event phpbbgallery.core.image.delete_images
+		 * @var	array	images			array of the image ids we are deleting
+		 * @var	array	filenames		array of the image filenames
+		 * @since 1.2.0
+		 */
 		$vars = array('images', 'filenames');
 		extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.image.delete_images', compact($vars)));
 
@@ -256,11 +256,11 @@ 
 	}
 
 	/**
-	* Get the real filenames, so we can load/delete/edit the image-file.
-	*
-	* @param	mixed		$images		Array or integer with the image_id(s)
-	* @return	array		Format: $image_id => $filename
-	*/
+	 * Get the real filenames, so we can load/delete/edit the image-file.
+	 *
+	 * @param	mixed		$images		Array or integer with the image_id(s)
+	 * @return	array		Format: $image_id => $filename
+	 */
 	public function get_filenames($images)
 	{
 		if (empty($images))
@@ -375,13 +375,13 @@ 
 				$tpl = '{CONTENT}';
 
 				/**
-				* Event generate link
-				*
-				* @event phpbbgallery.core.image.generate_link
-				* @var	string	mode	type of link
-				* @var	string	tpl		html to be outputed
-				* @since 1.2.0
-				*/
+				 * Event generate link
+				 *
+				 * @event phpbbgallery.core.image.generate_link
+				 * @var	string	mode	type of link
+				 * @var	string	tpl		html to be outputed
+				 * @since 1.2.0
+				 */
 				$vars = array('mode', 'tpl');
 				extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.image.generate_link', compact($vars)));//@todo: Correctly identify the event
 			break;
@@ -391,12 +391,12 @@ 
 	}
 
 	/**
-	* Handle user- & total image_counter
-	*
-	* @param	array	$image_id_ary	array with the image_ids which changed their status
-	* @param	bool	$add			are we adding or removing the images
-	* @param	bool	$readd			is it possible that there are images which aren't really changed
-	*/
+	 * Handle user- & total image_counter
+	 *
+	 * @param	array	$image_id_ary	array with the image_ids which changed their status
+	 * @param	bool	$add			are we adding or removing the images
+	 * @param	bool	$readd			is it possible that there are images which aren't really changed
+	 */
 	public function handle_counter($image_id_ary, $add, $readd = false)
 	{
 		if (empty($image_id_ary))
@@ -467,11 +467,11 @@ 
 	}
 
 	/**
-	* Approve image
-	* @param (array)	$image_id_ary	The image ID array to be approved
-	* @param (int)		$album_id	The album image is approved to (just save some queries for log)
-	* return 0 on success
-	*/
+	 * Approve image
+	 * @param (array)	$image_id_ary	The image ID array to be approved
+	 * @param (int)		$album_id	The album image is approved to (just save some queries for log)
+	 * return 0 on success
+	 */
 	public function approve_images($image_id_ary, $album_id)
 	{
 		$sql = 'SELECT image_id, image_name, image_user_id
@@ -507,10 +507,10 @@ 
 	}
 
 	/**
-	* UnApprove image
-	* @param (array)	$image_id_ary	The image ID array to be unapproved
-	* @param (int)		$album_id	The album image is approved to (just save some queries for log)
-	*/
+	 * UnApprove image
+	 * @param (array)	$image_id_ary	The image ID array to be unapproved
+	 * @param (int)		$album_id	The album image is approved to (just save some queries for log)
+	 */
 	public function unapprove_images($image_id_ary, $album_id)
 	{
 		self::handle_counter($image_id_ary, false);
@@ -563,10 +563,10 @@ 
 	}
 
 	/**
-	* Lock images
-	* @param (array)	$image_id_ary	Array of images we want to lock
-	* @param (int)		$album_id		Album id, so we can log the action
-	*/
+	 * Lock images
+	 * @param (array)	$image_id_ary	Array of images we want to lock
+	 * @param (int)		$album_id		Album id, so we can log the action
+	 */
 	public function lock_images($image_id_ary, $album_id)
 	{
 		self::handle_counter($image_id_ary, false);
@@ -590,9 +590,9 @@ 
 	}
 
 	/**
-	* Get last image id
-	* Return (int) image_id
-	**/
+	 * Get last image id
+	 * Return (int) image_id
+	 **/
 	public function get_last_image()
 	{
 		$this->gallery_auth->load_user_premissions($this->user->data['user_id']);

Braces +2 added lines, -4 removed lines

@@ -363,8 +363,7 @@ 
 				{
 					$url = $this->url->append_sid('image_page', "album_id=$album_id&image_id=$next_image{$additional_parameters}");
 					$tpl = '<a href="{IMAGE_URL}" title="{IMAGE_NAME}">{CONTENT}</a>';
-				}
-				else
+				} else
 				{
 					$tpl = '{CONTENT}';
 				}
@@ -440,8 +439,7 @@ 
 		{
 			$this->gallery_config->inc('num_images', $num_images);
 			$this->gallery_config->inc('num_comments', $num_comments);
-		}
-		else
+		} else
 		{
 			$this->gallery_config->dec('num_images', $num_images);
 			$this->gallery_config->dec('num_comments', $num_comments);

core/controller/file.php

Indentation +23 added lines, -23 removed lines

@@ -98,12 +98,12 @@ 
 	}
 
 	/**
-	* Image File Controller
-	*	Route: gallery/image/{image_id}/source
-	*
-	* @param	int		$image_id
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-	*/
+	 * Image File Controller
+	 *	Route: gallery/image/{image_id}/source
+	 *
+	 * @param	int		$image_id
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
 	public function source($image_id)
 	{
 		$this->auth->load_user_premissions($this->user->data['user_id']);
@@ -155,12 +155,12 @@ 
 	}
 
 	/**
-	* Image File Controller
-	*	Route: gallery/image/{image_id}/medium
-	*
-	* @param	int		$image_id
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-	*/
+	 * Image File Controller
+	 *	Route: gallery/image/{image_id}/medium
+	 *
+	 * @param	int		$image_id
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
 	public function medium($image_id)
 	{
 
@@ -190,12 +190,12 @@ 
 	}
 
 	/**
-	* Image File Controller
-	*	Route: gallery/image/{image_id}/mini
-	*
-	* @param	int		$image_id
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-	*/
+	 * Image File Controller
+	 *	Route: gallery/image/{image_id}/mini
+	 *
+	 * @param	int		$image_id
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
 	public function mini($image_id)
 	{
 		$this->path = $this->path_mini;
@@ -354,11 +354,11 @@ 
 	}
 
 	/**
-	* Image File Controller
-	*	Route: gallery/image/{image_id}/x
-	*
-	* @return \Symfony\Component\HttpFoundation\BinaryFileResponseResponse A Symfony Response object
-	*/
+	 * Image File Controller
+	 *	Route: gallery/image/{image_id}/x
+	 *
+	 * @return \Symfony\Component\HttpFoundation\BinaryFileResponseResponse A Symfony Response object
+	 */
 	public function display()
 	{
 		$this->tool->set_last_modified($this->gallery_user->get_data('user_permissions_changed'));

Braces +2 added lines, -4 removed lines

@@ -234,8 +234,7 @@ 
 			$this->data['image_filemissing'] = 0;
 			$this->data['image_filemissing'] = 0;
 			$this->data['album_watermark'] = 0;
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT *
 				FROM ' . $this->table_images . ' i
@@ -398,8 +397,7 @@ 
 			{
 				$response->headers->set('expires', '-1');
 			}
-		}
-		else
+		} else
 		{
 			$response->headers->set('Content-Disposition', 'inline; ' . $this->tool->header_filename(htmlspecialchars_decode($this->tool->image_name)) . '.' . ($this->tool->image_type == 'jpeg' ? 'jpg' : $this->tool->image_type));
 			if ($this->tool->is_ie_greater7($this->user->browser))

core/controller/upload.php

Braces +6 added lines, -12 removed lines

@@ -249,8 +249,7 @@ 
 					'last_image'	=> end($process->images),
 				);
 				$this->notification_helper->new_image($data);
-			}
-			else
+			} else
 			{
 				$target = array(
 					'album_id'	=>	$album_id,
@@ -355,8 +354,7 @@ 
 					{
 						$this->language->add_lang('ucp');
 						$error_array[] = $this->language->lang($result . '_USERNAME');
-					}
-					else
+					} else
 					{
 						$process->set_username($username);
 					}
@@ -375,8 +373,7 @@ 
 				if (!$process->uploaded_files)
 				{
 					$process->new_error($this->language->lang('UPLOAD_NO_FILE'));
-				}
-				else
+				} else
 				{
 					$mode = 'upload_edit';
 					// Remove submit, so we get the first screen of step 2.
@@ -422,8 +419,7 @@ 
 						if ($VAR == 'zip')
 						{
 							continue;
-						}
-						else
+						} else
 						{
 							$filetypes[] = $VAR;
 						}
@@ -523,8 +519,7 @@ 
 						'last_image'	=> end($process->images),
 					);
 					$this->notification_helper->new_image($data);
-				}
-				else
+				} else
 				{
 					$target = array(
 						'album_id'	=>	(int) $album_id,
@@ -591,8 +586,7 @@ 
 		if (file_exists($phpbbgallery_core_file) && is_writable($phpbbgallery_core_file) && file_exists($phpbbgallery_core_file_source) && is_writable($phpbbgallery_core_file_source) && file_exists($phpbbgallery_core_file_medium) && is_writable($phpbbgallery_core_file_medium) && file_exists($phpbbgallery_core_file_mini) && is_writable($phpbbgallery_core_file_mini))
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}