satanasov / phpbbgallery

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_permissions($this->user->data['user_id']);

core/controller/file.php

Indentation +23 added lines, -23 removed lines

@@ -104,12 +104,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_permissions($this->user->data['user_id']);
@@ -160,12 +160,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)
 	{
 
@@ -195,12 +195,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;
@@ -356,11 +356,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'));

core/search.php

Indentation +3 added lines, -3 removed lines

@@ -243,9 +243,9 @@
 	}
 
 	/**
-	* Get all recent images the user has access to
-	* return (int) $images_count
-	*/
+	 * Get all recent images the user has access to
+	 * return (int) $images_count
+	 */
 	public function recent_count()
 	{
 		$this->gallery_auth->load_user_permissions($this->user->data['user_id']);

acpimport/acp/main_module.php

Indentation +18 added lines, -18 removed lines

@@ -58,8 +58,8 @@ 
 			foreach ($images as $image_src)
 			{
 				/**
-				* Import the images
-				*/
+				 * Import the images
+				 */
 
 				$image_src = str_replace("{{$import_schema}}", "'", $image_src);
 				$image_src_full = $gallery_url->path('import') . utf8_decode($image_src);
@@ -160,21 +160,21 @@ 
 						$additional_sql_data = array();
 
 						/**
-						* Event to trigger before mass update
-						*
-						* @event phpbbgallery.acpimport.update_image_before
-						* @var	array	additional_sql_data		array of additional sql_data
-						* @var	string	file_link				String with real file link
-						* @since 1.2.0
-						*/
+						 * Event to trigger before mass update
+						 *
+						 * @event phpbbgallery.acpimport.update_image_before
+						 * @var	array	additional_sql_data		array of additional sql_data
+						 * @var	string	file_link				String with real file link
+						 * @since 1.2.0
+						 */
 						$vars = array('additional_sql_data', 'file_link');
 						extract($phpbb_dispatcher->trigger_event('phpbbgallery.acpimport.update_image_before', compact($vars)));
 
 						if (($filetype[0] > $gallery_config->get('max_width')) || ($filetype[1] > $gallery_config->get('max_height')))
 						{
 							/**
-							* Resize oversize images
-							*/
+							 * Resize oversize images
+							 */
 							if ($gallery_config->get('allow_resize'))
 							{
 								$image_tools->resize_image($gallery_config->get('max_width'), $gallery_config->get('max_height'));
@@ -187,13 +187,13 @@ 
 						$file_updated = (bool) $image_tools->resized;
 
 						/**
-						* Event to trigger before mass update
-						*
-						* @event phpbbgallery.acpimport.update_image
-						* @var	array	additional_sql_data		array of additional sql_data
-						* @var	bool	file_updated			is file resized
-						* @since 1.2.0
-						*/
+						 * Event to trigger before mass update
+						 *
+						 * @event phpbbgallery.acpimport.update_image
+						 * @var	array	additional_sql_data		array of additional sql_data
+						 * @var	bool	file_updated			is file resized
+						 * @since 1.2.0
+						 */
 						$vars = array('additional_sql_data', 'file_updated');
 						extract($phpbb_dispatcher->trigger_event('phpbbgallery.acpimport.update_image', compact($vars)));
 

acpcleanup/cleanup.php

Indentation +30 added lines, -30 removed lines

@@ -85,11 +85,11 @@ 
 	}
 
 	/**
-	* Delete source files without a database entry.
-	*
-	* @param	array	$filenames		An array of filenames
-	* @return	string	Language key for the success message.
-	*/
+	 * Delete source files without a database entry.
+	 *
+	 * @param	array	$filenames		An array of filenames
+	 * @return	string	Language key for the success message.
+	 */
 	public function delete_files($filenames)
 	{
 		foreach ($filenames as $file)
@@ -102,11 +102,11 @@ 
 	}
 
 	/**
-	* Delete images, where the source file is missing.
-	*
-	* @param	mixed	$image_ids		Either an array of integers or an integer.
-	* @return	string	Language key for the success message.
-	*/
+	 * Delete images, where the source file is missing.
+	 *
+	 * @param	mixed	$image_ids		Either an array of integers or an integer.
+	 * @return	string	Language key for the success message.
+	 */
 	public function delete_images($image_ids)
 	{
 		$this->log->add_log('admin', 'clean_deleteentries', 0, 0, array('LOG_CLEANUP_DELETE_ENTRIES', count($image_ids)));
@@ -116,11 +116,11 @@ 
 	}
 
 	/**
-	* Delete images, where the author is missing.
-	*
-	* @param	mixed	$image_ids		Either an array of integers or an integer.
-	* @return	string	Language key for the success message.
-	*/
+	 * Delete images, where the author is missing.
+	 *
+	 * @param	mixed	$image_ids		Either an array of integers or an integer.
+	 * @return	string	Language key for the success message.
+	 */
 	public function delete_author_images($image_ids)
 	{
 		$this->log->add_log('admin', 'clean_deletenoauthors', 0, 0, array('LOG_CLEANUP_DELETE_NO_AUTHOR', count($image_ids)));
@@ -130,11 +130,11 @@ 
 	}
 
 	/**
-	* Delete comments, where the author is missing.
-	*
-	* @param	mixed	$comment_ids	Either an array of integers or an integer.
-	* @return	string	Language key for the success message.
-	*/
+	 * Delete comments, where the author is missing.
+	 *
+	 * @param	mixed	$comment_ids	Either an array of integers or an integer.
+	 * @return	string	Language key for the success message.
+	 */
 	public function delete_author_comments($comment_ids)
 	{
 		$this->log->add_log('admin', 'clean_deletecna', 0, 0, array('LOG_CLEANUP_COMMENT_DELETE_NO_AUTHOR', count($comment_ids)));
@@ -144,12 +144,12 @@ 
 	}
 
 	/**
-	* Delete unwanted and obsolete personal galleries.
-	*
-	* @param	array	$unwanted_pegas		User IDs we want to delete the pegas.
-	* @param	array	$obsolete_pegas		User IDs we want to delete the pegas.
-	* @return	array	Language keys for the success messages.
-	*/
+	 * Delete unwanted and obsolete personal galleries.
+	 *
+	 * @param	array	$unwanted_pegas		User IDs we want to delete the pegas.
+	 * @param	array	$obsolete_pegas		User IDs we want to delete the pegas.
+	 * @return	array	Language keys for the success messages.
+	 */
 	public function delete_pegas($unwanted_pegas, $obsolete_pegas)
 	{
 
@@ -280,8 +280,8 @@ 
 	}
 
 	/**
-	*
-	*/
+	 *
+	 */
 	public function prune($pattern)
 	{
 		$sql_where = '';
@@ -325,8 +325,8 @@ 
 	}
 
 	/**
-	*
-	*/
+	 *
+	 */
 	public function lang_prune_pattern($pattern)
 	{
 		if (isset($pattern['image_album_id']))

core/album/manage.php

Indentation +27 added lines, -27 removed lines

@@ -817,8 +817,8 @@ 
 		$log_action = implode('_', array($log_action_images, $log_action_albums));
 
 		/**
-		* Log what we did
-		*/
+		 * Log what we did
+		 */
 		switch ($log_action)
 		{
 			case 'MOVE_IMAGES_MOVE_ALBUMS':
@@ -908,14 +908,14 @@ 
 		$this->gallery_notification->delete_albums($from_id);
 
 		/**
-		* Event related to moving album content
-		*
-		* @event phpbbgallery.core.album.manage.move_album_content
-		* @var	int	from_id		Album we are moving from
-		* @var	int	to_id		Album we are moving to
-		* @var	bool	sync	Should we sync the albums data
-		* @since 1.2.0
-		*/
+		 * Event related to moving album content
+		 *
+		 * @event phpbbgallery.core.album.manage.move_album_content
+		 * @var	int	from_id		Album we are moving from
+		 * @var	int	to_id		Album we are moving to
+		 * @var	bool	sync	Should we sync the albums data
+		 * @since 1.2.0
+		 */
 		$vars = array('from_id', 'to_id', 'sync');
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.album.manage.move_album_content', compact($vars)));
 
@@ -1017,12 +1017,12 @@ 
 		$this->gallery_config->set('num_comments', (int) $row['num_comments']);
 
 		/**
-		* Event delete album content
-		*
-		* @event phpbbgallery.core.album.manage.delete_album_content
-		* @var	int	album_id		Album we are deleting
-		* @since 1.2.0
-		*/
+		 * Event delete album content
+		 *
+		 * @event phpbbgallery.core.album.manage.delete_album_content
+		 * @var	int	album_id		Album we are deleting
+		 * @since 1.2.0
+		 */
 		$vars = array('album_id');
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.album.manage.delete_album_content', compact($vars)));
 
@@ -1045,11 +1045,11 @@ 
 	public function move_album_by($album_row, $action = 'move_up', $steps = 1)
 	{
 		/**
-		* Fetch all the siblings between the module's current spot
-		* and where we want to move it to. If there are less than $steps
-		* siblings between the current spot and the target then the
-		* module will move as far as possible
-		*/
+		 * Fetch all the siblings between the module's current spot
+		 * and where we want to move it to. If there are less than $steps
+		 * siblings between the current spot and the target then the
+		 * module will move as far as possible
+		 */
 		$sql = 'SELECT album_id, album_name, left_id, right_id
 			FROM ' . $this->albums_table . ' 
 			WHERE parent_id = ' . (int) $album_row['parent_id'] . '
@@ -1071,12 +1071,12 @@ 
 		}
 
 		/**
-		* $left_id and $right_id define the scope of the nodes that are affected by the move.
-		* $diff_up and $diff_down are the values to subtract or add to each node's left_id
-		* and right_id in order to move them up or down.
-		* $move_up_left and $move_up_right define the scope of the nodes that are moving
-		* up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
-		*/
+		 * $left_id and $right_id define the scope of the nodes that are affected by the move.
+		 * $diff_up and $diff_down are the values to subtract or add to each node's left_id
+		 * and right_id in order to move them up or down.
+		 * $move_up_left and $move_up_right define the scope of the nodes that are moving
+		 * up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
+		 */
 		if ($action == 'move_up')
 		{
 			$left_id = $target['left_id'];

core/auth/level.php

Indentation +23 added lines, -23 removed lines

@@ -14,27 +14,27 @@ 
 {
 
 	/**
-	* Gallery Auth Object
-	* @var \phpbbgallery\core\auth\auth
-	*/
+	 * Gallery Auth Object
+	 * @var \phpbbgallery\core\auth\auth
+	 */
 	protected $auth;
 
 	/**
-	* Config Object
-	* @var \phpbb\config\config
-	*/
+	 * Config Object
+	 * @var \phpbb\config\config
+	 */
 	protected $config;
 
 	/**
-	* Template Object
-	* @var \phpbb\template\template
-	*/
+	 * Template Object
+	 * @var \phpbb\template\template
+	 */
 	protected $template;
 
 	/**
-	* User Object
-	* @var \phpbb\user
-	*/
+	 * User Object
+	 * @var \phpbb\user
+	 */
 	protected $user;
 
 	/**
@@ -62,17 +62,17 @@ 
 	}
 
 	/**
-	* User authorization levels output
-	*
-	* @param	int		$album_id		The current album the user is in.
-	* @param	int		$album_status	The albums status bit.
-	* @param	int		$album_user_id	The user-id of the album owner. Saves us a call to the cache if it is set.
-	* @return		null
-	*
-	* borrowed from phpBB3
-	* @author: phpBB Group
-	* @function: gen_forum_auth_level
-	*/
+	 * User authorization levels output
+	 *
+	 * @param	int		$album_id		The current album the user is in.
+	 * @param	int		$album_status	The albums status bit.
+	 * @param	int		$album_user_id	The user-id of the album owner. Saves us a call to the cache if it is set.
+	 * @return		null
+	 *
+	 * borrowed from phpBB3
+	 * @author: phpBB Group
+	 * @function: gen_forum_auth_level
+	 */
 	public function display($album_id, $album_status, $album_user_id = -1)
 	{
 		$locked = ($album_status == ITEM_LOCKED && !$this->auth->acl_check('m_', $album_id, $album_user_id)) ? true : false;