satanasov / phpbbgallery

core/log.php

Indentation +3 added lines, -3 removed lines

@@ -106,9 +106,9 @@
 	}
 
 	/**
-	* Delete logs
-	* @param	array	$mark	Logs selected for deletion
-	**/
+	 * Delete logs
+	 * @param	array	$mark	Logs selected for deletion
+	 **/
 	public function delete_logs($mark)
 	{
 		$sql = 'DELETE FROM ' . $this->log_table . ' WHERE ' . $this->db->sql_in_set('log_id', $mark);

core/cache.php

Indentation +12 added lines, -12 removed lines

@@ -17,12 +17,12 @@ 
 	private $phpbb_db;
 
 	/**
-	* cache constructor.
-	* @param \phpbb\cache\service $cache
-	* @param \phpbb\db\driver\driver_interface $db
-	* @param $albums_table
-	* @param $images_table
-	*/
+	 * cache constructor.
+	 * @param \phpbb\cache\service $cache
+	 * @param \phpbb\db\driver\driver_interface $db
+	 * @param $albums_table
+	 * @param $images_table
+	 */
 	public function __construct(\phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db,
 								$albums_table, $images_table)
 	{
@@ -153,18 +153,18 @@ 
 	}
 
 	/**
-	* Destroy images cache - if we had updated image information or we want other set - we will have to destroy cache
-	*/
+	 * Destroy images cache - if we had updated image information or we want other set - we will have to destroy cache
+	 */
 	public function destroy_images()
 	{
 		$this->phpbb_cache->destroy('_images');
 	}
 
 	/**
-	* Destroy album cache
-	* Basicly some tests fail due album cache not destroyed ...
-	* So lets try it now?
-	*/
+	 * Destroy album cache
+	 * Basicly some tests fail due album cache not destroyed ...
+	 * So lets try it now?
+	 */
 	public function destroy_albums()
 	{
 		$this->phpbb_cache->destroy('_albums');

core/ucp/settings_module.php

Indentation +11 added lines, -11 removed lines

@@ -92,12 +92,12 @@ 
 			$additional_settings = array();
 
 			/**
-			* Event set personal settings
-			*
-			* @event phpbbgallery.core.ucp.set_settings_submit
-			* @var	array	additional_settings		array of additional settings
-			* @since 1.2.0
-			*/
+			 * Event set personal settings
+			 *
+			 * @event phpbbgallery.core.ucp.set_settings_submit
+			 * @var	array	additional_settings		array of additional settings
+			 * @since 1.2.0
+			 */
 			$vars = array('additional_settings');
 			extract($this->dispatcher->trigger_event('phpbbgallery.core.ucp.set_settings_submit', compact($vars)));
 
@@ -118,11 +118,11 @@ 
 		}
 
 		/**
-		* Event no submit personal settings
-		*
-		* @event phpbbgallery.core.ucp.set_settings_nosubmit
-		* @since 1.2.0
-		*/
+		 * Event no submit personal settings
+		 *
+		 * @event phpbbgallery.core.ucp.set_settings_nosubmit
+		 * @since 1.2.0
+		 */
 		$this->dispatcher->dispatch('phpbbgallery.core.ucp.set_settings_nosubmit');
 
 		$this->template->assign_vars(array(

core/ucp/main_module.php

Indentation +11 added lines, -11 removed lines

@@ -389,10 +389,10 @@ 
 			generate_text_for_storage($album_data['album_desc'], $album_data['album_desc_uid'], $album_data['album_desc_bitfield'], $album_data['album_desc_options'], $request->variable('desc_parse_bbcode', false), $request->variable('desc_parse_urls', false), $request->variable('desc_parse_smilies', false));
 
 			/**
-			* borrowed from phpBB3
-			* @author: phpBB Group
-			* @location: acp_forums->manage_forums
-			*/
+			 * borrowed from phpBB3
+			 * @author: phpBB Group
+			 * @location: acp_forums->manage_forums
+			 */
 			// Parent should always be filled otherwise we use initialise_album()
 			if ($album_data['parent_id'])
 			{
@@ -833,13 +833,13 @@ 
 			}
 
 			/**
-			* Event delete user albums
-			*
-			* @event phpbbgallery.core.ucp.delete_album
-			* @var	int		album_id			Album ID
-			* @var	array	deleted_albums		Deleted album IDs
-			* @since 1.2.0
-			*/
+			 * Event delete user albums
+			 *
+			 * @event phpbbgallery.core.ucp.delete_album
+			 * @var	int		album_id			Album ID
+			 * @var	array	deleted_albums		Deleted album IDs
+			 * @since 1.2.0
+			 */
 			$vars = array('album_id', 'deleted_albums');
 			extract($phpbb_dispatcher->trigger_event('phpbbgallery.core.ucp.delete_album', compact($vars)));
 

core/url.php

Indentation +22 added lines, -22 removed lines

@@ -13,23 +13,23 @@ 
 class url
 {
 	/**
-	* Path from the gallery root, back to phpbb's root
-	*/
+	 * Path from the gallery root, back to phpbb's root
+	 */
 	private $phpbb_root_path = '../';
 
 	/**
-	* Path from the phpbb root, into admin's root
-	*/
+	 * Path from the phpbb root, into admin's root
+	 */
 	private $phpbb_admin_path = 'adm/';
 
 	/**
-	* Path from the phpbb root, into gallery's file root
-	*/
+	 * Path from the phpbb root, into gallery's file root
+	 */
 	private $phpbb_gallery_file_path = 'files/phpbbgallery/';
 
 	/**
-	* Path from the phpbb root, into gallery's root
-	*/
+	 * Path from the phpbb root, into gallery's root
+	 */
 	private $phpbb_gallery_path = 'gallery/';
 
 	const IMAGE_PATH = 'images/';
@@ -223,16 +223,16 @@ 
 	}
 
 	/**
-	* Creates beautiful relative path from ugly relative path
-	* Resolves .. (up directory)
-	*
-	* @author	bantu		based on phpbb_own_realpath() by Chris Smith
-	* @license	http://opensource.org/licenses/gpl-license.php GNU Public License
-	*
-	* @param	string		ugly path e.g. "../community/../gallery/"
-	* @param	bool		is it a full url, so we need to fix teh http:// at the beginning?
-	* @return	string		beautiful path e.g. "../gallery/"
-	*/
+	 * Creates beautiful relative path from ugly relative path
+	 * Resolves .. (up directory)
+	 *
+	 * @author	bantu		based on phpbb_own_realpath() by Chris Smith
+	 * @license	http://opensource.org/licenses/gpl-license.php GNU Public License
+	 *
+	 * @param	string		ugly path e.g. "../community/../gallery/"
+	 * @param	bool		is it a full url, so we need to fix teh http:// at the beginning?
+	 * @return	string		beautiful path e.g. "../gallery/"
+	 */
 	static public function beautiful_path($path, $is_full_url = false)
 	{
 		// Remove any repeated slashes
@@ -274,10 +274,10 @@ 
 	}
 
 	/**
-	* Custom meta_refresh implementation
-	* @param	int		$time	Time in seconds.
-	* @param	string	$route	Route generated by $helper->route
-	*/
+	 * Custom meta_refresh implementation
+	 * @param	int		$time	Time in seconds.
+	 * @param	string	$route	Route generated by $helper->route
+	 */
 	public function meta_refresh($time, $route)
 	{
 		// For XHTML compatibility we change back & to &

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);
@@ -153,21 +153,21 @@ 
 						$file_link = $gallery_url->path('upload') . $image_filename;
 
 						/**
-						* 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 overside images
-							*/
+							 * Resize overside images
+							 */
 							if ($gallery_config->get('allow_resize'))
 							{
 								$image_tools->resize_image($gallery_config->get('max_width'), $gallery_config->get('max_height'));
@@ -180,13 +180,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

@@ -89,11 +89,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)
@@ -106,11 +106,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)));
@@ -120,11 +120,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)));
@@ -134,11 +134,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)));
@@ -148,12 +148,12 @@ 
 	}
 
 	/**
-	* Delete unwanted and obsolent personal galleries.
-	*
-	* @param	array	$unwanted_pegas		User IDs we want to delete the pegas.
-	* @param	array	$obsolent_pegas		User IDs we want to delete the pegas.
-	* @return	array	Language keys for the success messages.
-	*/
+	 * Delete unwanted and obsolent personal galleries.
+	 *
+	 * @param	array	$unwanted_pegas		User IDs we want to delete the pegas.
+	 * @param	array	$obsolent_pegas		User IDs we want to delete the pegas.
+	 * @return	array	Language keys for the success messages.
+	 */
 	public function delete_pegas($unwanted_pegas, $obsolent_pegas)
 	{
 
@@ -284,8 +284,8 @@ 
 	}
 
 	/**
-	*
-	*/
+	 *
+	 */
 	public function prune($pattern)
 	{
 		$sql_where = '';
@@ -329,8 +329,8 @@ 
 	}
 
 	/**
-	*
-	*/
+	 *
+	 */
 	public function lang_prune_pattern($pattern)
 	{
 		if (isset($pattern['image_album_id']))

core/acp/permissions_module.php

Indentation +12 added lines, -12 removed lines

@@ -41,8 +41,8 @@ 
 		$action = $request->variable('action', '');
 
 		/**
-		* All our beautiful permissions
-		*/
+		 * All our beautiful permissions
+		 */
 		if (!isset($permissions))
 		{
 			$permissions = new \stdClass();
@@ -698,12 +698,12 @@ 
 			$coal = $gallery_cache->get('albums');
 
 			/**
-			* Grab the permissions
-			*
-			* includes/acp/acp_permissions.php says:
-			* // We obtain and check $_POST['setting'][$ug_id][$forum_id] directly and not using request_var() because request_var()
-			* // currently does not support the amount of dimensions required. ;)
-			*/
+			 * Grab the permissions
+			 *
+			 * includes/acp/acp_permissions.php says:
+			 * // We obtain and check $_POST['setting'][$ug_id][$forum_id] directly and not using request_var() because request_var()
+			 * // currently does not support the amount of dimensions required. ;)
+			 */
 			//		$auth_settings = request_var('setting', array(0 => array(0 => array('' => 0))));
 			$requests = $request->variable('setting', array(0 => array(0 => array('' => 0))));
 			$p_mask_count = 0;
@@ -757,8 +757,8 @@ 
 				}
 			}
 			/**
-			* Inherit the permissions
-			*/
+			 * Inherit the permissions
+			 */
 			$inherit = $request->variable('setting', array(0 => array('' => 0)));
 			foreach ($inherit as $c_mask => $v_sets)
 			{
@@ -988,8 +988,8 @@ 
 	}
 
 	/**
-	* Handles copying permissions from one album to others
-	*/
+	 * Handles copying permissions from one album to others
+	 */
 	function copy_album_permissions()
 	{
 		global $cache, $db, $template, $user, $table_prefix, $phpbb_dispatcher, $table_name, $users_table, $phpbb_container;

core/controller/image.php

Indentation +198 added lines, -198 removed lines

@@ -125,51 +125,51 @@ 
 	protected $profile_fields_data;
 	protected $can_receive_pm_list;
 
-    /**
-     * Constructor
-     *
-     * @param \phpbb\request\request $request
-     * @param \phpbb\auth\auth $auth Gallery auth object
-     * @param \phpbb\config\config $config Config object
-     * @param \phpbb\controller\helper $helper Controller helper object
-     * @param \phpbb\db\driver\driver|\phpbb\db\driver\driver_interface $db Database object
-     * @param \phpbb\event\dispatcher $dispatcher Event dispatcher object
-     * @param \phpbb\pagination $pagination Pagination object
-     * @param \phpbb\template\template $template Template object
-     * @param \phpbb\user $user User object
-     * @param manager $cpf_manager
-     * @param \phpbb\language\language $language
-     * @param \phpbbgallery\core\album\display $display Albums display object
-     * @param \phpbbgallery\core\album\loader $loader Albums display object
-     * @param \phpbbgallery\core\album\album $album
-     * @param \phpbbgallery\core\image\image $image
-     * @param \phpbbgallery\core\auth\auth $gallery_auth
-     * @param \phpbbgallery\core\user $gallery_user
-     * @param \phpbbgallery\core\config $gallery_config
-     * @param \phpbbgallery\core\auth\level $auth_level Gallery auth level object
-     * @param \phpbbgallery\core\url $url
-     * @param \phpbbgallery\core\misc $misc
-     * @param \phpbbgallery\core\comment $comment
-     * @param \phpbbgallery\core\report $report
-     * @param \phpbbgallery\core\notification\helper $notification_helper
-     * @param \phpbbgallery\core\log $gallery_log
-     * @param \phpbbgallery\core\moderate $moderate
-     * @param \phpbbgallery\core\rating $gallery_rating
-     * @param \phpbbgallery\core\block $block
-     * @param ContainerInterface $phpbb_container
-     * @param string $albums_table Gallery albums table
-     * @param string $images_table Gallery images table
-     * @param string $users_table Gallery users table
-     * @param                                                           $table_comments
-     * @param                                                           $phpbb_root_path
-     * @param                                                           $php_ext
-     * @internal param \phpbbgallery\core\comment $gallery_comment Gallery comment class
-     */
+	/**
+	 * Constructor
+	 *
+	 * @param \phpbb\request\request $request
+	 * @param \phpbb\auth\auth $auth Gallery auth object
+	 * @param \phpbb\config\config $config Config object
+	 * @param \phpbb\controller\helper $helper Controller helper object
+	 * @param \phpbb\db\driver\driver|\phpbb\db\driver\driver_interface $db Database object
+	 * @param \phpbb\event\dispatcher $dispatcher Event dispatcher object
+	 * @param \phpbb\pagination $pagination Pagination object
+	 * @param \phpbb\template\template $template Template object
+	 * @param \phpbb\user $user User object
+	 * @param manager $cpf_manager
+	 * @param \phpbb\language\language $language
+	 * @param \phpbbgallery\core\album\display $display Albums display object
+	 * @param \phpbbgallery\core\album\loader $loader Albums display object
+	 * @param \phpbbgallery\core\album\album $album
+	 * @param \phpbbgallery\core\image\image $image
+	 * @param \phpbbgallery\core\auth\auth $gallery_auth
+	 * @param \phpbbgallery\core\user $gallery_user
+	 * @param \phpbbgallery\core\config $gallery_config
+	 * @param \phpbbgallery\core\auth\level $auth_level Gallery auth level object
+	 * @param \phpbbgallery\core\url $url
+	 * @param \phpbbgallery\core\misc $misc
+	 * @param \phpbbgallery\core\comment $comment
+	 * @param \phpbbgallery\core\report $report
+	 * @param \phpbbgallery\core\notification\helper $notification_helper
+	 * @param \phpbbgallery\core\log $gallery_log
+	 * @param \phpbbgallery\core\moderate $moderate
+	 * @param \phpbbgallery\core\rating $gallery_rating
+	 * @param \phpbbgallery\core\block $block
+	 * @param ContainerInterface $phpbb_container
+	 * @param string $albums_table Gallery albums table
+	 * @param string $images_table Gallery images table
+	 * @param string $users_table Gallery users table
+	 * @param                                                           $table_comments
+	 * @param                                                           $phpbb_root_path
+	 * @param                                                           $php_ext
+	 * @internal param \phpbbgallery\core\comment $gallery_comment Gallery comment class
+	 */
 	public function __construct(\phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\config\config $config,
 		\phpbb\controller\helper $helper, \phpbb\db\driver\driver_interface $db,
 		\phpbb\event\dispatcher $dispatcher, \phpbb\pagination $pagination,
 		\phpbb\template\template $template, \phpbb\user $user, \phpbb\profilefields\manager $cpf_manager,
-        \phpbb\language\language $language, \phpbbgallery\core\album\display $display,
+		\phpbb\language\language $language, \phpbbgallery\core\album\display $display,
 		\phpbbgallery\core\album\loader $loader, \phpbbgallery\core\album\album $album,
 		\phpbbgallery\core\image\image $image, \phpbbgallery\core\auth\auth $gallery_auth,
 		\phpbbgallery\core\user $gallery_user, \phpbbgallery\core\config $gallery_config,
@@ -428,15 +428,15 @@ 
 		$image_data = $this->data;
 
 		/**
-		* Event view image
-		*
-		* @event phpbbgallery.core.viewimage
-		* @var	int		image_id		id of the image we are viewing
-		* @var	array	image_data		All the data related to the image
-		* @var	array	album_data		All the data related to the album image is part of
-		* @var	string	page_title		Page title
-		* @since 1.2.0
-		*/
+		 * Event view image
+		 *
+		 * @event phpbbgallery.core.viewimage
+		 * @var	int		image_id		id of the image we are viewing
+		 * @var	array	image_data		All the data related to the image
+		 * @var	array	album_data		All the data related to the album image is part of
+		 * @var	string	page_title		Page title
+		 * @since 1.2.0
+		 */
 		$vars = array('image_id', 'image_data', 'album_data', 'page_title');
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.viewimage', compact($vars)));
 
@@ -444,7 +444,7 @@ 
 
 		$this->users_id_array[$this->data['image_user_id']] = $this->data['image_user_id'];
 
-        $this->load_users_data();
+		$this->load_users_data();
 
 		$this->users_data_array[$this->data['image_user_id']]['username'] = ($this->data['image_username']) ? $this->data['image_username'] : $this->language->lang('GUEST');
 		$this->template->assign_vars(array(
@@ -499,8 +499,8 @@ 
 			unset($rating);
 		}
 		/**
-		* Posting comment
-		*/
+		 * Posting comment
+		 */
 		$comments_disabled = (!$this->gallery_config->get('allow_comments') || ($this->gallery_config->get('comment_user_control') && !$image_data['image_allow_comments']));
 		if (!$comments_disabled && $this->gallery_auth->acl_check('c_post', $album_id, $album_data['album_user_id']) && ($album_data['album_status'] != $this->block->get_album_status_locked()) && (($image_data['image_status'] != $this->block->get_image_status_locked()) || $this->gallery_auth->acl_check('m_status', $album_id, $album_data['album_user_id'])))
 		{
@@ -585,13 +585,13 @@ 
 			$this->template->assign_var('S_COMMENTS_DISABLED', true);
 		}
 
-        /**
-         * Listing comment
-         */
-        if (($this->gallery_config->get('allow_comments') && $this->gallery_auth->acl_check('c_read', $album_id, $album_data['album_user_id'])) /*&& (time() > ($album_data['contest_start'] + $album_data['contest_end']))*/)
-        {
-            $this->display_comments($image_id, $this->data, $album_id, $album_data, ($page - 1) * $this->gallery_config->get('items_per_page'), $this->gallery_config->get('items_per_page'));
-        }
+		/**
+		 * Listing comment
+		 */
+		if (($this->gallery_config->get('allow_comments') && $this->gallery_auth->acl_check('c_read', $album_id, $album_data['album_user_id'])) /*&& (time() > ($album_data['contest_start'] + $album_data['contest_end']))*/)
+		{
+			$this->display_comments($image_id, $this->data, $album_id, $album_data, ($page - 1) * $this->gallery_config->get('items_per_page'), $this->gallery_config->get('items_per_page'));
+		}
 		return $this->helper->render('gallery/viewimage_body.html', $page_title);
 	}
 	protected function display_comments($image_id, $image_data, $album_id, $album_data, $start, $limit)
@@ -625,7 +625,7 @@ 
 				$this->users_id_array[$row['comment_user_id']] = $row['comment_user_id'];
 				if ($row['comment_edit_count'] > 0)
 				{
-                    $this->users_id_array[$row['comment_edit_user_id']] = $row['comment_edit_user_id'];
+					$this->users_id_array[$row['comment_edit_user_id']] = $row['comment_edit_user_id'];
 				}
 			}
 			$this->db->sql_freeresult($result);
@@ -655,43 +655,43 @@ 
 
 
 				// Let's deply new profile
-                $poster_id = $row['comment_user_id'];
-
-                if ($row['comment_edit_count'] > 0)
-                {
-                    $edit_info = ($row['comment_edit_count'] == 1) ? $this->language->lang('IMAGE_EDITED_TIME_TOTAL') : $this->language->lang('IMAGE_EDITED_TIMES_TOTAL');
-                    $edit_info = sprintf($edit_info, get_username_string('full', $row['comment_edit_user_id'], $this->users_data_array[$row['comment_edit_user_id']]['username'], $this->users_data_array[$row['comment_edit_user_id']]['user_colour']), $this->user->format_date($row['comment_edit_time'], false, true), $row['comment_edit_count']);
-                }
-                $user_deleted = (isset($this->users_data_array[$poster_id]) ? false : true);
-                // End signature parsing, only if needed
-                if ($this->users_data_array[$poster_id]['sig'] && empty($this->users_data_array[$poster_id]['sig_parsed']))
-                {
-                    $parse_flags = ($this->users_data_array[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
-                    $user_cache[$poster_id]['sig'] = generate_text_for_display($this->users_data_array[$poster_id]['sig'], $this->users_data_array[$poster_id]['sig_bbcode_uid'], $this->users_data_array[$poster_id]['sig_bbcode_bitfield'],  $parse_flags, true);
-                    $user_cache[$poster_id]['sig_parsed'] = true;
-                }
-
-                $cp_row = array();
-                //CPF
-                if ($this->config['load_cpf_viewtopic'])
-                {
-                    $cp_row = (isset($this->profile_fields_data[$poster_id])) ? $this->cpf_manager->generate_profile_fields_template_data($this->profile_fields_data[$poster_id]) : array();
-                }
-                $can_receive_pm = (
-                    // They must be a "normal" user
-                    $this->users_data_array[$poster_id]['user_type'] != USER_IGNORE &&
-                    // They must not be deactivated by the administrator
-                    ($this->users_data_array[$poster_id]['user_type'] != USER_INACTIVE || $this->users_data_array[$poster_id]['user_inactive_reason'] != INACTIVE_MANUAL) &&
-                    // They must be able to read PMs
-                    in_array($poster_id, $this->can_receive_pm_list) &&
-                    // They must allow users to contact via PM
-                    (($this->auth->acl_gets('a_', 'm_') || $this->auth->acl_getf_global('m_')) || $this->users_data_array[$poster_id]['allow_pm'])
-                );
-                $u_pm = '';
-                if ($this->config['allow_privmsg'] && $this->auth->acl_get('u_sendpm') && $can_receive_pm)
-                {
-                    $u_pm = append_sid("{$this->phpbb_root_path}ucp.$this->php_ext", 'i=pm&mode=compose');
-                }
+				$poster_id = $row['comment_user_id'];
+
+				if ($row['comment_edit_count'] > 0)
+				{
+					$edit_info = ($row['comment_edit_count'] == 1) ? $this->language->lang('IMAGE_EDITED_TIME_TOTAL') : $this->language->lang('IMAGE_EDITED_TIMES_TOTAL');
+					$edit_info = sprintf($edit_info, get_username_string('full', $row['comment_edit_user_id'], $this->users_data_array[$row['comment_edit_user_id']]['username'], $this->users_data_array[$row['comment_edit_user_id']]['user_colour']), $this->user->format_date($row['comment_edit_time'], false, true), $row['comment_edit_count']);
+				}
+				$user_deleted = (isset($this->users_data_array[$poster_id]) ? false : true);
+				// End signature parsing, only if needed
+				if ($this->users_data_array[$poster_id]['sig'] && empty($this->users_data_array[$poster_id]['sig_parsed']))
+				{
+					$parse_flags = ($this->users_data_array[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+					$user_cache[$poster_id]['sig'] = generate_text_for_display($this->users_data_array[$poster_id]['sig'], $this->users_data_array[$poster_id]['sig_bbcode_uid'], $this->users_data_array[$poster_id]['sig_bbcode_bitfield'],  $parse_flags, true);
+					$user_cache[$poster_id]['sig_parsed'] = true;
+				}
+
+				$cp_row = array();
+				//CPF
+				if ($this->config['load_cpf_viewtopic'])
+				{
+					$cp_row = (isset($this->profile_fields_data[$poster_id])) ? $this->cpf_manager->generate_profile_fields_template_data($this->profile_fields_data[$poster_id]) : array();
+				}
+				$can_receive_pm = (
+					// They must be a "normal" user
+					$this->users_data_array[$poster_id]['user_type'] != USER_IGNORE &&
+					// They must not be deactivated by the administrator
+					($this->users_data_array[$poster_id]['user_type'] != USER_INACTIVE || $this->users_data_array[$poster_id]['user_inactive_reason'] != INACTIVE_MANUAL) &&
+					// They must be able to read PMs
+					in_array($poster_id, $this->can_receive_pm_list) &&
+					// They must allow users to contact via PM
+					(($this->auth->acl_gets('a_', 'm_') || $this->auth->acl_getf_global('m_')) || $this->users_data_array[$poster_id]['allow_pm'])
+				);
+				$u_pm = '';
+				if ($this->config['allow_privmsg'] && $this->auth->acl_get('u_sendpm') && $can_receive_pm)
+				{
+					$u_pm = append_sid("{$this->phpbb_root_path}ucp.$this->php_ext", 'i=pm&mode=compose');
+				}
 
 				$comment_row = array(
 					'U_COMMENT'		=> $this->helper->route('phpbbgallery_core_image', array('image_id'	=> $image_id)) . '#comment_' . $row['comment_id'],
@@ -704,10 +704,10 @@ 
 					'U_EDIT'		=> ($this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']) || ($this->gallery_auth->acl_check('c_edit', $album_id, $album_data['album_user_id']) && ($row['comment_user_id'] == $this->user->data['user_id']) && $this->user->data['is_registered'])) ? $this->helper->route('phpbbgallery_core_comment_edit', array('image_id'	=> $image_id, 'comment_id'	=> $row['comment_id'])) : '',
 					'U_INFO'		=> ($this->auth->acl_get('a_')) ? $this->url->append_sid('mcp', 'mode=whois&ip=' . $row['comment_user_ip']) : '',
 
-                    'POSTER_FULL'		=> get_username_string('full', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
-                    'POSTER_COLOUR'		=> get_username_string('colour', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
-                    'POSTER_USERNAME'	=> get_username_string('username', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
-                    'U_POSTER'			=> get_username_string('profile', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
+					'POSTER_FULL'		=> get_username_string('full', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
+					'POSTER_COLOUR'		=> get_username_string('colour', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
+					'POSTER_USERNAME'	=> get_username_string('username', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
+					'U_POSTER'			=> get_username_string('profile', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
 
 					'SIGNATURE'			=> ($row['comment_signature'] && !$user_deleted) ? generate_text_for_display($this->users_data_array[$poster_id]['sig'], $row['comment_uid'], $row['comment_bitfield'], 7) : '',
 					'RANK_TITLE'		=> $user_deleted ? '' : $this->users_data_array[$poster_id]['rank_title'],
@@ -725,60 +725,60 @@ 
 					'ONLINE_IMG'		=> ($poster_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? '' : ($user_deleted ? '' : (($this->users_data_array[$poster_id]['online']) ? $this->user->img('icon_user_online', 'ONLINE') : $this->user->img('icon_user_offline', 'OFFLINE'))),
 					'S_ONLINE'			=> ($poster_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? false : ($user_deleted ? '' : (($this->users_data_array[$poster_id]['online']) ? true : false)),
 
-                    'S_CUSTOM_FIELDS'	=> (isset($cp_row['row']) && count($cp_row['row'])) ? true : false,
-                );
-                if (isset($cp_row['row']) && count($cp_row['row']))
-                {
-                    $comment_row = array_merge($comment_row, $cp_row['row']);
-                }
+					'S_CUSTOM_FIELDS'	=> (isset($cp_row['row']) && count($cp_row['row'])) ? true : false,
+				);
+				if (isset($cp_row['row']) && count($cp_row['row']))
+				{
+					$comment_row = array_merge($comment_row, $cp_row['row']);
+				}
 				$this->template->assign_block_vars('commentrow', $comment_row);
 
-                $contact_fields = array(
-                    array(
-                        'ID'		=> 'pm',
-                        'NAME' 		=> $this->language->lang('SEND_PRIVATE_MESSAGE'),
-                        'U_CONTACT'	=> $u_pm,
-                    ),
-                    array(
-                        'ID'		=> 'email',
-                        'NAME'		=> $this->language->lang('SEND_EMAIL'),
-                        'U_CONTACT'	=> $this->users_data_array[$poster_id]['email'],
-                    ),
-                    array(
-                        'ID'		=> 'jabber',
-                        'NAME'		=> $this->language->lang('JABBER'),
-                        'U_CONTACT'	=> $this->users_data_array[$poster_id]['jabber'],
-                    ),
-                );
-
-                foreach ($contact_fields as $field)
-                {
-                    if ($field['U_CONTACT'])
-                    {
-                        $this->template->assign_block_vars('commentrow.contact', $field);
-                    }
-                }
-
-                if (!empty($cp_row['blockrow']))
-                {
-                    foreach ($cp_row['blockrow'] as $field_data)
-                    {
-                        if ($field_data['S_PROFILE_CONTACT'])
-                        {
-                            $this->template->assign_block_vars('commentrow.contact', array(
-                                'ID'		=> $field_data['PROFILE_FIELD_IDENT'],
-                                'NAME'		=> $field_data['PROFILE_FIELD_NAME'],
-                                'U_CONTACT'	=> $field_data['PROFILE_FIELD_CONTACT'],
-                            ));
-                        }
-                        else
-                        {
-                            $this->template->assign_block_vars('commentrow.custom_fields', $field_data);
-                        }
-
-
-                    }
-                }
+				$contact_fields = array(
+					array(
+						'ID'		=> 'pm',
+						'NAME' 		=> $this->language->lang('SEND_PRIVATE_MESSAGE'),
+						'U_CONTACT'	=> $u_pm,
+					),
+					array(
+						'ID'		=> 'email',
+						'NAME'		=> $this->language->lang('SEND_EMAIL'),
+						'U_CONTACT'	=> $this->users_data_array[$poster_id]['email'],
+					),
+					array(
+						'ID'		=> 'jabber',
+						'NAME'		=> $this->language->lang('JABBER'),
+						'U_CONTACT'	=> $this->users_data_array[$poster_id]['jabber'],
+					),
+				);
+
+				foreach ($contact_fields as $field)
+				{
+					if ($field['U_CONTACT'])
+					{
+						$this->template->assign_block_vars('commentrow.contact', $field);
+					}
+				}
+
+				if (!empty($cp_row['blockrow']))
+				{
+					foreach ($cp_row['blockrow'] as $field_data)
+					{
+						if ($field_data['S_PROFILE_CONTACT'])
+						{
+							$this->template->assign_block_vars('commentrow.contact', array(
+								'ID'		=> $field_data['PROFILE_FIELD_IDENT'],
+								'NAME'		=> $field_data['PROFILE_FIELD_NAME'],
+								'U_CONTACT'	=> $field_data['PROFILE_FIELD_CONTACT'],
+							));
+						}
+						else
+						{
+							$this->template->assign_block_vars('commentrow.custom_fields', $field_data);
+						}
+
+
+					}
+				}
 
 			}
 			//$this->db->sql_freeresult($result);
@@ -1219,48 +1219,48 @@ 
 	}
 
 	protected function load_users_data()
-    {
-
-        $sql = $this->db->sql_build_query('SELECT', array(
-            'SELECT'	=> 'u.*, gu.personal_album_id, gu.user_images',
-            'FROM'		=> array(USERS_TABLE => 'u'),
-
-            'LEFT_JOIN'	=> array(
-                array(
-                    'FROM'	=> array($this->table_users => 'gu'),
-                    'ON'	=> 'gu.user_id = u.user_id'
-                ),
-            ),
-
-            'WHERE'		=> $this->db->sql_in_set('u.user_id', $this->users_id_array),
-        ));
-        $result = $this->db->sql_query($sql);
-
-        while ($row = $this->db->sql_fetchrow($result))
-        {
-            $this->gallery_user->add_user_to_cache($this->users_data_array, $row);
-        }
-        $this->db->sql_freeresult($result);
-
-
-        // Load CPF's
-        $profile_fields_tmp = $this->cpf_manager->grab_profile_fields_data($this->users_id_array);
-        foreach ($profile_fields_tmp as $profile_user_id => $profile_fields)
-        {
-            $this->profile_fields_data[$profile_user_id] = array();
-            foreach ($profile_fields as $used_ident => $profile_field)
-            {
-                if ($profile_field['data']['field_show_on_vt'])
-                {
-                    $this->profile_fields_data[$profile_user_id][$used_ident] = $profile_field;
-                }
-            }
-        }
-        unset($profile_fields_tmp);
-
-        // Get the list of users who can receive private messages
-        $this->can_receive_pm_list = $this->auth->acl_get_list(array_keys($this->users_data_array), 'u_readpm');
-        $this->can_receive_pm_list = (empty($this->can_receive_pm_list) || !isset($this->can_receive_pm_list[0]['u_readpm'])) ? array() : $this->can_receive_pm_list[0]['u_readpm'];
-
-    }
+	{
+
+		$sql = $this->db->sql_build_query('SELECT', array(
+			'SELECT'	=> 'u.*, gu.personal_album_id, gu.user_images',
+			'FROM'		=> array(USERS_TABLE => 'u'),
+
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array($this->table_users => 'gu'),
+					'ON'	=> 'gu.user_id = u.user_id'
+				),
+			),
+
+			'WHERE'		=> $this->db->sql_in_set('u.user_id', $this->users_id_array),
+		));
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$this->gallery_user->add_user_to_cache($this->users_data_array, $row);
+		}
+		$this->db->sql_freeresult($result);
+
+
+		// Load CPF's
+		$profile_fields_tmp = $this->cpf_manager->grab_profile_fields_data($this->users_id_array);
+		foreach ($profile_fields_tmp as $profile_user_id => $profile_fields)
+		{
+			$this->profile_fields_data[$profile_user_id] = array();
+			foreach ($profile_fields as $used_ident => $profile_field)
+			{
+				if ($profile_field['data']['field_show_on_vt'])
+				{
+					$this->profile_fields_data[$profile_user_id][$used_ident] = $profile_field;
+				}
+			}
+		}
+		unset($profile_fields_tmp);
+
+		// Get the list of users who can receive private messages
+		$this->can_receive_pm_list = $this->auth->acl_get_list(array_keys($this->users_data_array), 'u_readpm');
+		$this->can_receive_pm_list = (empty($this->can_receive_pm_list) || !isset($this->can_receive_pm_list[0]['u_readpm'])) ? array() : $this->can_receive_pm_list[0]['u_readpm'];
+
+	}
 }