satanasov / phpbbgallery

core/moderate.php

Braces +2 added lines, -4 removed lines

@@ -85,8 +85,7 @@ 
 			{
 				$mod_array[] = 0;
 			}
-		}
-		else
+		} else
 		{
 			$mod_array = array($album);
 		}
@@ -162,8 +161,7 @@ 
 			$this->template->assign_vars(array(
 				'TOTAL_PAGES' => $this->lang->lang('PAGE_TITLE_NUMBER', $page + 1),
 			));
-		}
-		else
+		} else
 		{
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(

core/controller/moderate.php

Spacing +7 added lines, -7 removed lines

@@ -260,7 +260,7 @@ 
 			}
 			else
 			{
-				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
+				$s_hidden_fields = '<input type="hidden" name="action[' . $action . ']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
 				foreach ($approve_ary as $id => $var)
 				{
@@ -361,7 +361,7 @@ 
 			}
 			else
 			{
-				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
+				$s_hidden_fields = '<input type="hidden" name="action[' . $action . ']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
 				foreach ($report_ary as $var)
 				{
@@ -583,7 +583,7 @@ 
 			case 'reports_close':
 				if (confirm_box(true))
 				{
-					$back_link =  $this->helper->route('phpbbgallery_core_moderate_image', array('image_id' => $image_id));
+					$back_link = $this->helper->route('phpbbgallery_core_moderate_image', array('image_id' => $image_id));
 					$this->report->close_reports_by_image($image_id);
 					$message = $this->language->lang('WAITING_REPORTED_DONE', 1);
 					$this->url->meta_refresh(3, $back_link);
@@ -679,7 +679,7 @@ 
 				'REPORT_TIME'	=> $this->user->format_date($var['report_time']),
 				'REPORT_NOTE'	=> $var['report_note'],
 				'STATUS'		=> $var['report_status'],
-				'MANAGER'		=> $var['report_manager'] != 0 ?  $this->user_loader->get_username($var['report_manager'], 'full') : false,
+				'MANAGER'		=> $var['report_manager'] != 0 ? $this->user_loader->get_username($var['report_manager'], 'full') : false,
 			));
 		}
 		return $this->helper->render('gallery/moderate_image_overview.html', $this->language->lang('GALLERY'));
@@ -804,7 +804,7 @@ 
 		$image_data = $this->image->get_image_data($image_id);
 		$album_id = $image_data['image_album_id'];
 		//$user_id = $image_data['image_user_id'];
-		$album_data =  $this->album->get_info($album_id);
+		$album_data = $this->album->get_info($album_id);
 		$album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id));
 		$image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id));
 		$album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login');
@@ -852,7 +852,7 @@ 
 		$image_data = $this->image->get_image_data($image_id);
 		$album_id = $image_data['image_album_id'];
 		//$user_id = $image_data['image_user_id'];
-		$album_data =  $this->album->get_info($album_id);
+		$album_data = $this->album->get_info($album_id);
 		$album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id));
 		$image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id));
 		$album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login');
@@ -868,7 +868,7 @@ 
 			$image_id_ary = array($image_id);
 			$this->image->lock_images($image_id_ary, $album_data['album_id']);
 			// To DO - add notification
-			$message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE',1));
+			$message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE', 1));
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
 		}

Braces +17 added lines, -34 removed lines

@@ -149,8 +149,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_', $album['album_id'], $album['album_user_id']))
@@ -211,8 +210,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_status', $album['album_id'], $album['album_user_id']))
@@ -257,8 +255,7 @@ 
 					$this->url->meta_refresh(3, $back_link);
 					trigger_error($message);
 				}
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
@@ -307,8 +304,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_', $album['album_id'], $album['album_user_id']))
@@ -358,8 +354,7 @@ 
 				$message = $this->language->lang('WAITING_REPORTED_DONE', count($report_ary));
 				$this->url->meta_refresh(3, $back_link);
 				trigger_error($message);
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
@@ -379,8 +374,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_report', $album['album_id'], $album['album_user_id']))
@@ -470,8 +464,7 @@ 
 					$this->url->meta_refresh(3, $back_link);
 					trigger_error($message);
 				}
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = '<input type="hidden" name="select_action" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
@@ -492,8 +485,7 @@ 
 						'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
 					));
 					return $this->helper->render('gallery/mcp_body.html', $this->language->lang('GALLERY'));
-				}
-				else
+				} else
 				{
 					confirm_box(false, $this->language->lang('QUEUES_A_' . strtoupper($action) . '2_CONFIRM'), $s_hidden_fields);
 				}
@@ -508,8 +500,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_', $album['album_id'], $album['album_user_id']))
@@ -583,8 +574,7 @@ 
 					$message = $this->language->lang('WAITING_REPORTED_DONE', 1);
 					$this->url->meta_refresh(3, $back_link);
 					trigger_error($message);
-				}
-				else
+				} else
 				{
 					$s_hidden_fields = '<input type="hidden" name="action" value="reports_close" />';
 					confirm_box(false, $this->language->lang('REPORT_A_CLOSE2_CONFIRM'), $s_hidden_fields);
@@ -621,13 +611,11 @@ 
 			{
 				$select_select .= '<option value="images_approve">' . $this->language->lang('QUEUE_A_APPROVE') . '</option>';
 				$select_select .= '<option value="images_lock">' . $this->language->lang('QUEUE_A_LOCK') . '</option>';
-			}
-			else if ($image_data['image_status'] == 1)
+			} else if ($image_data['image_status'] == 1)
 			{
 				$select_select .= '<option value="images_unapprove">' . $this->language->lang('QUEUE_A_UNAPPROVE') . '</option>';
 				$select_select .= '<option value="images_lock">' . $this->language->lang('QUEUE_A_LOCK') . '</option>';
-			}
-			else
+			} else
 			{
 				$select_select .= '<option value="images_approve">' . $this->language->lang('QUEUE_A_APPROVE') . '</option>';
 				$select_select .= '<option value="images_unapprove">' . $this->language->lang('QUEUE_A_UNAPPROVE') . '</option>';
@@ -646,8 +634,7 @@ 
 			if ($open_report)
 			{
 				$select_select .= '<option value="reports_close">' . $this->language->lang('REPORT_A_CLOSE') . '</option>';
-			}
-			else
+			} else
 			{
 				$select_select .= '<option value="reports_open">' . $this->language->lang('REPORT_A_OPEN') . '</option>';
 			}
@@ -725,8 +712,7 @@ 
 			$message = $this->language->lang('WAITING_APPROVED_IMAGE', 1);
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$this->template->assign_vars(array(
 				'S_NOTIFY_POSTER'			=> $show_notify,
@@ -775,8 +761,7 @@ 
 			$message = sprintf($this->language->lang('WAITING_UNAPPROVED_IMAGE', 1));
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$s_hidden_fields = '';
 			confirm_box(false, 'QUEUE_A_UNAPPROVE2', $s_hidden_fields);
@@ -817,8 +802,7 @@ 
 			$this->album->update_info($moving_target);
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$category_select = $this->album->get_albumbox(false, 'moving_target', $album_id, 'm_move', $album_id);
 			$this->template->assign_vars(array(
@@ -862,8 +846,7 @@ 
 			$message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE',1));
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$s_hidden_fields = '';
 			confirm_box(false, 'QUEUE_A_LOCK2', $s_hidden_fields);

core/image/image.php

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', (int) $num_images);
 			$this->gallery_config->inc('num_comments', (int) $num_comments);
-		}
-		else
+		} else
 		{
 			$this->gallery_config->dec('num_images', (int) $num_images);
 			$this->gallery_config->dec('num_comments', (int) $num_comments);

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

exif/exif.php

Spacing +14 added lines, -14 removed lines

@@ -17,7 +17,7 @@ 
 	/**
 	* Default value for new users
 	*/
-	const DEFAULT_DISPLAY	= true;
+	const DEFAULT_DISPLAY = true;
 
 	/**
 	* phpBB will treat the time from the Exif data like UTC.
@@ -26,13 +26,13 @@ 
 	*
 	* Offset must be set in seconds.
 	*/
-	const TIME_OFFSET	= 0;
+	const TIME_OFFSET = 0;
 
 	/**
 	* Constants for the status of the Exif data.
 	*/
-	const UNAVAILABLE	= 0;
-	const AVAILABLE		= 1;
+	const UNAVAILABLE = 0;
+	const AVAILABLE = 1;
 	const UNKNOWN		= 2;
 	const DBSAVED		= 3;
 
@@ -44,28 +44,28 @@ 
 	/**
 	* Exif data array with all allowed groups and keys.
 	*/
-	public $data		= array();
+	public $data = array();
 
 	/**
 	* Filtered data array. We don't have empty or invalid values here.
 	*/
-	public $prepared_data	= array();
+	public $prepared_data = array();
 
 	/**
 	* Does the image have exif data?
 	* Values see constant declaration at the beginning of the class.
 	*/
-	public $status		= 2;
+	public $status = 2;
 
 	/**
 	* Full data array, but serialized to a string
 	*/
-	public $serialized	= '';
+	public $serialized = '';
 
 	/**
 	* Full link to the image-file
 	*/
-	public $file		= '';
+	public $file = '';
 
 	/**
 	* Original status of the Exif data.
@@ -75,7 +75,7 @@ 
 	/**
 	* Image-ID, just needed to update the Exif status
 	*/
-	public $image_id	= false;
+	public $image_id = false;
 
 	/**
 	* Constructor
@@ -206,7 +206,7 @@ 
 			}
 			else if ($num)
 			{
-				$exif_exposure = ' 1/' . $den / $num ;
+				$exif_exposure = ' 1/' . $den / $num;
 			}
 			if ($exif_exposure)
 			{
@@ -249,7 +249,7 @@ 
 		}
 		if (isset($this->data["EXIF"]["ExposureBiasValue"]))
 		{
-			list($num,$den) = explode("/", $this->data["EXIF"]["ExposureBiasValue"]);
+			list($num, $den) = explode("/", $this->data["EXIF"]["ExposureBiasValue"]);
 			if ($den)
 			{
 				if (($num / $den) == 0)
@@ -323,12 +323,12 @@ 
 	* 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(
+	static private $allowed_groups = array(
 		'EXIF',
 		'IFD0',
 	);
 
-	static private $allowed_keys		= array(
+	static private $allowed_keys = array(
 		'DateTimeOriginal',
 		'FocalLength',
 		'ExposureTime',

Braces +5 added lines, -10 removed lines

@@ -110,8 +110,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();
 		}
@@ -137,8 +136,7 @@ 
 				if (!in_array($key, self::$allowed_groups))
 				{
 					unset($this->data[$key]);
-				}
-				else
+				} else
 				{
 					foreach ($this->data[$key] as $subkey => $array)
 					{
@@ -152,8 +150,7 @@ 
 
 			$this->serialized = serialize($this->data);
 			$this->status = self::DBSAVED;
-		}
-		else
+		} else
 		{
 			$this->status = self::UNAVAILABLE;
 		}
@@ -203,8 +200,7 @@ 
 			if (($num > $den) && $den)
 			{
 				$exif_exposure = $num / $den;
-			}
-			else if ($num)
+			} else if ($num)
 			{
 				$exif_exposure = ' 1/' . $den / $num ;
 			}
@@ -255,8 +251,7 @@ 
 				if (($num / $den) == 0)
 				{
 					$exif_exposure_bias = 0;
-				}
-				else
+				} else
 				{
 					$exif_exposure_bias = $this->data["EXIF"]["ExposureBiasValue"];
 				}

Indentation +51 added lines, -51 removed lines

@@ -15,74 +15,74 @@ 
 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		= '';
 
 	/**
-	* Original status of the Exif data.
-	*/
+	 * Original status of the Exif data.
+	 */
 	public $orig_status = null;
 
 	/**
-	* 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)
@@ -98,11 +98,11 @@ 
 	}
 
 	/**
-	* Interpret 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
-	*/
+	 * Interpret 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;
@@ -118,8 +118,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))
@@ -165,8 +165,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;
@@ -273,11 +273,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 Exif's 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 Exif's are displayed in.
+	 */
 	public function send_to_template($expand_view = true, $block = 'exif_value')
 	{
 		$this->prepare_data();
@@ -301,8 +301,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))
@@ -320,9 +320,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',

exif/language/it/exif.php

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@ 
 	'EXIF_CAM_MODEL'			=> 'Modello Camera',
 	'EXIF_DATE'					=> 'Immagine scattata il',
 	'EXIF_EXPOSURE'				=> 'Velocita\' otturatore',
-	'EXIF_EXPOSURE_EXP'			=> '%s Sec',// 'EXIF_EXPOSURE' unit
+	'EXIF_EXPOSURE_EXP'			=> '%s Sec', // 'EXIF_EXPOSURE' unit
 	'EXIF_EXPOSURE_BIAS'		=> 'Inclinazione di esposizione',
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV',// 'EXIF_EXPOSURE_BIAS' unit
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV', // 'EXIF_EXPOSURE_BIAS' unit
 	'EXIF_EXPOSURE_PROG'		=> 'Programma di esposizione',
 	'EXIF_EXPOSURE_PROG_0'		=> 'Non definito',
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manuale',
@@ -72,7 +72,7 @@ 
 	'EXIF_FLASH_CASE_93'		=> 'Il flash e\' scattato, modalita\' automatica, luce di ritorno non rilevata, modalita\' riduzione occhi rossi',
 	'EXIF_FLASH_CASE_95'		=> 'Il flash e\' scattato, modalita\' automatica, luce di ritorno rilevata, modalita\' riduzione occhi rossi',
 	'EXIF_FOCAL'				=> 'Lunghezza di Focus',
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
 	'EXIF_ISO'					=> 'Valore di velocita\' ISO',
 	'EXIF_METERING_MODE'		=> 'Modalita\' di metratura',
 	'EXIF_METERING_MODE_0'		=> 'Sconosciuta',

acpcleanup/acp/main_module.php

Braces +4 added lines, -8 removed lines

@@ -223,14 +223,12 @@ 
 			}
 
 			trigger_error($message_string . adm_back_link($this->u_action));
-		}
-		else if ($delete || $prune || (isset($_POST['cancel'])))
+		} else if ($delete || $prune || (isset($_POST['cancel'])))
 		{
 			if (isset($_POST['cancel']))
 			{
 				trigger_error($user->lang['CLEAN_GALLERY_ABORT'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-			else
+			} else
 			{
 				$clean_gallery_confirm = $user->lang['CONFIRM_CLEAN'];
 				if ($missing_sources)
@@ -261,8 +259,7 @@ 
 						if (in_array($row['album_user_id'], $personals_bad))
 						{
 							$personals_bad_names[] = $row['album_name'];
-						}
-						else
+						} else
 						{
 							$missing_personals_names[] = $row['album_name'];
 						}
@@ -280,8 +277,7 @@ 
 				if ($prune && empty($prune_pattern))
 				{
 					trigger_error($user->lang['CLEAN_PRUNE_NO_PATTERN'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-				else if ($prune && $prune_pattern)
+				} else if ($prune && $prune_pattern)
 				{
 					$clean_gallery_confirm = $user->lang('CONFIRM_PRUNE', $core_cleanup->lang_prune_pattern($prune_pattern)) . '<br />' . $clean_gallery_confirm;
 				}

core/album/display.php

Spacing +6 added lines, -6 removed lines

@@ -96,7 +96,7 @@ 
 
 		$sql = 'SELECT a2.*
 			FROM ' . $this->table_albums . ' a1
-			LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition .') AND a2.album_user_id = ' . (int) $branch_user_id .'
+			LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition . ') AND a2.album_user_id = ' . (int) $branch_user_id . '
 			WHERE a1.album_id = ' . (int) $album_id . '
 				AND a1.album_user_id = ' . (int) $branch_user_id . '
 			ORDER BY a2.left_id ' . (($order == 'descending') ? 'ASC' : 'DESC');
@@ -179,9 +179,9 @@ 
 			'ALBUM_ID' 		=> $album_data['album_id'],
 			'ALBUM_NAME'	=> $album_data['album_name'],
 			'ALBUM_DESC'	=> generate_text_for_display($album_data['album_desc'], $album_data['album_desc_uid'], $album_data['album_desc_bitfield'], $album_data['album_desc_options']),
-			'ALBUM_CONTEST_START'	=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '',
-			'ALBUM_CONTEST_RATING'	=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '',
-			'ALBUM_CONTEST_END'		=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '',
+			'ALBUM_CONTEST_START'	=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '',
+			'ALBUM_CONTEST_RATING'	=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '',
+			'ALBUM_CONTEST_END'		=> ($album_data['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '',
 			'U_VIEW_ALBUM'	=> $this->helper->route('phpbbgallery_core_album', array('album_id' => (int) $album_data['album_id'])),
 		));
 
@@ -696,9 +696,9 @@ 
 				// phpbb_ext_gallery_core_image::generate_link('thumbnail', $phpbb_ext_gallery->config->get('link_thumbnail'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				$lastimage_uc_thumbnail = $row['album_image'] ? generate_board_url() . '/' . $row['album_image'] : $this->helper->route('phpbbgallery_core_image_file_mini', array('image_id' => $row['album_last_image_id']));
 				// phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-				$lastimage_uc_name = '';//@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
+				$lastimage_uc_name = ''; //@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				// phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-				$lastimage_uc_icon = '';//@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
+				$lastimage_uc_icon = ''; //@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 			}
 			else
 			{

Braces +15 added lines, -25 removed lines

@@ -226,8 +226,7 @@ 
 					SET album_parents = '" . $this->db->sql_escape($album_data['album_parents']) . "'
 					WHERE parent_id = " . (int) $album_data['parent_id'];
 				$this->db->sql_query($sql);
-			}
-			else
+			} else
 			{
 				$album_parents = @unserialize($album_data['album_parents']);
 			}
@@ -296,16 +295,14 @@ 
 			if (!empty($row['user_id']))
 			{
 				$album_moderators[$a_id][] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
-			}
-			else
+			} else
 			{
 				$group_name = (($row['group_type'] == GROUP_SPECIAL) ? $this->language->lang('G_' . $row['group_name']) : $row['group_name']);
 
 				if ($this->user->data['user_id'] != ANONYMOUS && !$this->auth->acl_get('u_viewprofile'))
 				{
 					$album_moderators[$a_id][] = '<span' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . '>' . $group_name . '</span>';
-				}
-				else
+				} else
 				{
 					$album_moderators[$a_id][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . ' href="' . append_sid($this->root_path . 'memberlist.' . $this->php_ext, 'mode=group&amp;g=' . $row['group_id']) . '">' . $group_name . '</a>';
 				}
@@ -349,8 +346,7 @@ 
 			}
 			$root_data = array('album_id' => (int) \phpbbgallery\core\block::PUBLIC_ALBUM);
 			$sql_where = 'a.album_user_id = ' . (int) \phpbbgallery\core\block::PUBLIC_ALBUM;
-		}
-		else if ($root_data == 'personal')
+		} else if ($root_data == 'personal')
 		{
 			if ($mark_read == 'albums')
 			{
@@ -368,8 +364,7 @@ 
 				{
 					$sql_where .= ' AND u.username_clean NOT ' . $this->db->sql_like_expression(chr($i) . $this->db->any_char);
 				}
-			}
-			else if ($first_char)
+			} else if ($first_char)
 			{
 				$sql_where .= ' AND u.username_clean ' . $this->db->sql_like_expression(substr($first_char, 0, 1) . $this->db->any_char);
 			}
@@ -413,8 +408,7 @@ 
 					'phpbbgallery_core_search_recent_page',),
 					'params' => array()), 'pagination', 'page', $num_pegas, $limit, $start
 			);*/
-		}
-		else
+		} else
 		{
 			$sql_where = 'a.left_id > ' . $root_data['left_id'] . ' AND a.left_id < ' . $root_data['right_id'] . ' AND a.album_user_id = ' . $root_data['album_user_id'];
 		}
@@ -502,10 +496,12 @@ 
 				continue;
 			}
 
-			if (false)//@todo !$this->gallery_auth->acl_check('a_list', $album_id, $row['album_user_id']))
+			if (false) {
+				//@todo !$this->gallery_auth->acl_check('a_list', $album_id, $row['album_user_id']))
 			{
 				// if the user does not have permissions to list this album, skip everything until next branch
 				$right_id = $row['right_id'];
+			}
 				continue;
 			}
 
@@ -530,8 +526,7 @@ 
 				$album_rows[$parent_id]['album_type_last_image'] = $row['album_type'];
 				$album_rows[$parent_id]['album_contest_marked'] = $row['contest_marked'];
 				$album_rows[$parent_id]['orig_album_last_image_time'] = $row['album_last_image_time'];
-			}
-			else if ($row['album_type'])
+			} else if ($row['album_type'])
 			{
 				$subalbums[$parent_id][$album_id]['display'] = ($row['display_on_index']) ? true : false;
 				$subalbums[$parent_id][$album_id]['name'] = $row['album_name'];
@@ -573,16 +568,14 @@ 
 				{
 					$this->misc->markread('all');
 					$message = $this->language->lang('RETURN_INDEX', '<a href="' . $redirect . '">', '</a>');
-				}
-				else
+				} else
 				{
 					$this->misc->markread('albums', $album_ids);
 					$message = $this->language->lang('RETURN_ALBUM', '<a href="' . $redirect . '">', '</a>');
 				}
 				meta_refresh(3, $redirect);
 				trigger_error($this->language->lang('ALBUMS_MARKED') . '<br /><br />' . $message);
-			}
-			else
+			} else
 			{
 				$message = $this->language->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
 				meta_refresh(3, $redirect);
@@ -660,8 +653,7 @@ 
 							'name'		=> $subalbum_row['name'],
 							'unread'	=> $subalbum_unread,
 						);
-					}
-					else
+					} else
 					{
 						unset($subalbums[$album_id][$subalbum_id]);
 					}
@@ -674,8 +666,7 @@ 
 
 				$l_subalbums = (sizeof($subalbums[$album_id]) == 1) ? $this->language->lang('SUBALBUM') : $this->language->lang('SUBALBUMS');
 				$folder_image = ($album_unread) ? 'forum_unread_subforum' : 'forum_read_subforum';
-			}
-			else
+			} else
 			{
 				$folder_alt = ($album_unread) ? 'NEW_IMAGES' : 'NO_NEW_IMAGES';
 				$folder_image = ($album_unread) ? 'forum_unread' : 'forum_read';
@@ -701,8 +692,7 @@ 
 				$lastimage_uc_name = '';//@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				// phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				$lastimage_uc_icon = '';//@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-			}
-			else
+			} else
 			{
 				$lastimage_time = $lastimage_album_type = $lastimage_contest_marked = 0;
 				$lastimage_uc_fake_thumbnail = $lastimage_uc_fake_thumbnail_url = $lastimage_uc_thumbnail = $lastimage_uc_name = $lastimage_uc_icon = '';

core/controller/album.php

Braces +8 added lines, -16 removed lines

@@ -142,8 +142,7 @@ 
 		try
 		{
 			$this->loader->load($album_id);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			throw new \phpbb\exception\http_exception(404, 'ALBUM_NOT_EXIST');
 		}
@@ -203,8 +202,7 @@ 
 					'phpbbgallery_core_album_upload',
 					array('album_id' => (int) $album_id)
 				));
-			}
-			else
+			} else
 			{
 				if ($album_data['contest_start'] + $album_data['contest_rating'] > time())
 				{
@@ -261,8 +259,7 @@ 
 		{
 			$image_status_check = '';
 			$image_counter = $album_data['album_images_real'];
-		}
-		else
+		} else
 		{
 			$image_status_check = " AND (image_status <> " . (int) \phpbbgallery\core\block::STATUS_UNAPPROVED . " OR image_user_id = $user_id)";
 
@@ -279,8 +276,7 @@ 
 		if (in_array($sort_key, array('r', 'ra')))
 		{
 			$sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'ASC' : 'DESC');
-		}
-		else
+		} else
 		{
 			$sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
 		}
@@ -471,8 +467,7 @@ 
 				));
 				$this->url->meta_refresh(3, $back_link);
 				return $this->helper->render('gallery/message.html', $this->language->lang('GALLERY'));
-			}
-			else
+			} else
 			{
 				$this->notifications_helper->add_albums($album_id);
 				$this->template->assign_vars(array(
@@ -481,14 +476,12 @@ 
 				$this->url->meta_refresh(3, $back_link);
 				return $this->helper->render('gallery/message.html', $this->language->lang('GALLERY'));
 			}
-		}
-		else
+		} else
 		{
 			if ($this->notifications_helper->get_watched_album($album_id) == 1)
 			{
 				$lang = $this->language->lang('UNWATCH_ALBUM');
-			}
-			else
+			} else
 			{
 				$lang = $this->language->lang('WATCH_ALBUM');
 			}
@@ -520,8 +513,7 @@ 
 			if (!$this->user->data['is_registered'])
 			{
 				login_box();
-			}
-			else
+			} else
 			{
 				//return $this->error('NOT_AUTHORISED', 403);
 				trigger_error($this->language->lang('NOT_AUTHORISED'));

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'],

core/album/album.php

Braces +9 added lines, -18 removed lines

@@ -221,8 +221,7 @@ 
 			{
 				$padding .= '   ';
 				$padding_store[$row['parent_id']] = $padding;
-			}
-			else if ($row['left_id'] > $right + 1)
+			} else if ($row['left_id'] > $right + 1)
 			{
 				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
 			}
@@ -248,15 +247,13 @@ 
 			if (($select_id == $this->gallery_auth->get_setting_permissions()) && !$row['album_user_id'])
 			{
 				$list = true;
-			}
-			else if (!$row['album_user_id'])
+			} else if (!$row['album_user_id'])
 			{
 				if ($this->gallery_auth->acl_check('a_list', $row['album_id'], $row['album_user_id']) || defined('IN_ADMIN'))
 				{
 					$list = true;
 				}
-			}
-			else if (!$ignore_personals)
+			} else if (!$ignore_personals)
 			{
 				if ($row['album_user_id'] == $this->user->data['user_id'])
 				{
@@ -267,16 +264,14 @@ 
 						if ($requested_permission)
 						{
 							$requested_own = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_own_album());
-						}
-						else
+						} else
 						{
 							$requested_own = false; // We need the negated version of true here
 						}
 					}
 					$list = (!$list) ? $access_own : $list;
 					$disabled = (!$disabled) ? $requested_own : $disabled;
-				}
-				else if ($row['album_user_id'])
+				} else if ($row['album_user_id'])
 				{
 					if (!$c_access_personal)
 					{
@@ -285,8 +280,7 @@ 
 						if ($requested_permission)
 						{
 							$requested_personal = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_personal_album());
-						}
-						else
+						} else
 						{
 							$requested_personal = false; // We need the negated version of true here
 						}
@@ -298,8 +292,7 @@ 
 			if (($album_user_id != (int) \phpbbgallery\core\block::PUBLIC_ALBUM) && ($album_user_id != $row['album_user_id']))
 			{
 				$list = false;
-			}
-			else if (($album_user_id != (int) \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
+			} else if (($album_user_id != (int) \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
 			{
 				$disabled = true;
 			}
@@ -317,8 +310,7 @@ 
 			$gallery_albumbox = "<select name='$select_name' id='$select_name'>";
 			$gallery_albumbox .= $album_list;
 			$gallery_albumbox .= '</select>';
-		}
-		else
+		} else
 		{
 			$gallery_albumbox = $album_list;
 		}
@@ -387,8 +379,7 @@ 
 				'album_last_user_colour' => $row['image_user_colour'],
 				'album_last_user_id'     => $row['image_user_id'],
 			);
-		}
-		else
+		} else
 		{
 			// No approved image, so we clear the columns
 			$sql_ary = array(