satanasov / phpbbgallery

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

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 = [];
 
 						/**
-						* 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)));
 

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 outputted
-				* @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 outputted
+				 * @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']);

Spacing +8 added lines, -8 removed lines

@@ -383,7 +383,7 @@ 
 				* @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
+				extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.image.generate_link', compact($vars))); //@todo: Correctly identify the event
 			break;
 		}
 
@@ -406,7 +406,7 @@ 
 
 		$num_images = $num_comments = 0;
 		$sql = 'SELECT SUM(image_comments) as comments
-			FROM ' . $this->table_images .'
+			FROM ' . $this->table_images . '
 			WHERE image_status ' . (($readd) ? '=' : '<>') . ' ' . (int) \phpbbgallery\core\block::STATUS_UNAPPROVED . '
 				AND ' . $this->db->sql_in_set('image_id', $image_id_ary) . '
 			GROUP BY image_user_id';
@@ -415,7 +415,7 @@ 
 		$this->db->sql_freeresult($result);
 
 		$sql = 'SELECT COUNT(image_id) images, image_user_id
-			FROM ' . $this->table_images .' 
+			FROM ' . $this->table_images . ' 
 			WHERE image_status ' . (($readd) ? '=' : '<>') . ' ' . (int) \phpbbgallery\core\block::STATUS_UNAPPROVED . '
 				AND ' . $this->db->sql_in_set('image_id', $image_id_ary) . '
 			GROUP BY image_user_id';
@@ -455,7 +455,7 @@ 
 			return;
 		}
 
-		$sql = 'SELECT * FROM ' . $this->table_images .' WHERE image_id = ' . (int) $image_id;
+		$sql = 'SELECT * FROM ' . $this->table_images . ' WHERE image_id = ' . (int) $image_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
@@ -515,14 +515,14 @@ 
 	{
 		self::handle_counter($image_id_ary, false);
 
-		$sql = 'UPDATE ' . $this->table_images .' 
+		$sql = 'UPDATE ' . $this->table_images . ' 
 			SET image_status = ' . (int) \phpbbgallery\core\block::STATUS_UNAPPROVED . '
 			WHERE image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . '
 				AND ' . $this->db->sql_in_set('image_id', $image_id_ary);
 		$this->db->sql_query($sql);
 
 		$sql = 'SELECT image_id, image_name
-			FROM ' . $this->table_images .' 
+			FROM ' . $this->table_images . ' 
 			WHERE image_status <> ' . (int) \phpbbgallery\core\block::STATUS_ORPHAN . '
 				AND ' . $this->db->sql_in_set('image_id', $image_id_ary);
 		$result = $this->db->sql_query($sql);
@@ -684,14 +684,14 @@ 
 			'U_USER_IP'		=> $show_ip && $this->gallery_auth->acl_check('m_status', $image_data['image_album_id'], $image_data['album_user_id']) ? $image_data['image_user_ip'] : false,
 
 			'S_IMAGE_REPORTED'		=> $image_data['image_reported'],
-			'U_IMAGE_REPORTED'		=> '',//($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&amp;album_id={$image_data['image_album_id']}&amp;option_id=" . $image_data['image_reported']) : '',
+			'U_IMAGE_REPORTED'		=> '', //($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&amp;album_id={$image_data['image_album_id']}&amp;option_id=" . $image_data['image_reported']) : '',
 			'S_STATUS_APPROVED'		=> ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_APPROVED) ? true : false,
 			'S_STATUS_UNAPPROVED'	=> ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_UNAPPROVED) ? true : false,
 			'S_STATUS_UNAPPROVED_ACTION'	=> ($this->gallery_auth->acl_check('m_status', $image_data['image_album_id'], $image_data['album_user_id']) && $image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->helper->route('phpbbgallery_core_moderate_image_approve', array('image_id' => (int) $image_data['image_id'])) : '',
 			'S_STATUS_LOCKED'		=> ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_LOCKED) ? true : false,
 
 			'U_REPORT'	=> ($this->gallery_auth->acl_check('m_report', $image_data['image_album_id'], $image_data['album_user_id']) && $image_data['image_reported']) ? '123'/*$this->url->append_sid('mcp', "mode=report_details&amp;album_id={$image_data['image_album_id']}&amp;option_id=" . $image_data['image_reported'])*/ : '',
-			'U_STATUS'	=> '',//($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&amp;album_id={$image_data['image_album_id']}&amp;option_id=" . $image_data['image_id']) : '',
+			'U_STATUS'	=> '', //($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&amp;album_id={$image_data['image_album_id']}&amp;option_id=" . $image_data['image_id']) : '',
 			'L_STATUS'	=> ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->language->lang('APPROVE_IMAGE') : (($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_APPROVED) ? $this->language->lang('CHANGE_IMAGE_STATUS') : $this->language->lang('UNLOCK_IMAGE')),
 		));
 	}

core/controller/album.php

Spacing +3 added lines, -3 removed lines

@@ -354,7 +354,7 @@ 
 			$album_user_id = $image_data['album_user_id'];
 
 			//@todo: $rating = new phpbb_gallery_image_rating($image_data['image_id'], $image_data, $image_data);
-			$image_data['rating'] = '0';//@todo: $rating->get_image_rating(false, false);
+			$image_data['rating'] = '0'; //@todo: $rating->get_image_rating(false, false);
 			//@todo: unset($rating);
 
 			$s_user_allowed = (($image_data['image_user_id'] == $this->user->data['user_id']) && ($album_status != (int) \phpbbgallery\core\block::ALBUM_LOCKED));
@@ -412,14 +412,14 @@ 
 
 				'U_USER_IP'                  => $show_ip && $this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) ? $image_data['image_user_ip'] : false,
 				'S_IMAGE_REPORTED'           => $image_data['image_reported'],
-				'U_IMAGE_REPORTED'           => '',//($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported']) : '',
+				'U_IMAGE_REPORTED'           => '', //($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported']) : '',
 				'S_STATUS_APPROVED'          => ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_APPROVED) ? true : false,
 				'S_STATUS_UNAPPROVED'        => ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_UNAPPROVED) ? true : false,
 				'S_STATUS_UNAPPROVED_ACTION' => ($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) && $image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->helper->route('phpbbgallery_core_moderate_image_approve', array('image_id' => $image_data['image_id'])) : '',
 				'S_STATUS_LOCKED'            => ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_LOCKED) ? true : false,
 
 				'U_REPORT' => ($this->auth->acl_check('m_report', $image_data['image_album_id'], $album_user_id) && $image_data['image_reported']) ? '123'/*$this->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported'])*/ : '',
-				'U_STATUS' => '',//($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_id']) : '',
+				'U_STATUS' => '', //($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_id']) : '',
 				'L_STATUS' => ($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->language->lang('APPROVE_IMAGE') : (($image_data['image_status'] == (int) \phpbbgallery\core\block::STATUS_APPROVED) ? $this->language->lang('CHANGE_IMAGE_STATUS') : $this->language->lang('UNLOCK_IMAGE')),
 
 				'S_CONTEST_RANK' => $image_data['image_contest_rank'],