satanasov / phpbbgallery

core/controller/comment.php

Indentation +2 added lines, -2 removed lines

@@ -825,8 +825,8 @@
 		generate_smilies('inline', 0);
 
 		/**
-		* Rating-System: now you can comment and rate in one form
-		*/
+		 * Rating-System: now you can comment and rate in one form
+		 */
 		$s_user_rated = false;
 		if ($this->gallery_config->get('allow_rates'))
 		{

Spacing +10 added lines, -10 removed lines

@@ -197,8 +197,8 @@ 
 			include_once($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
 		}
 
-		$bbcode_status	= ($this->config['allow_bbcode']) ? true : false;
-		$smilies_status	= ($this->config['allow_smilies']) ? true : false;
+		$bbcode_status = ($this->config['allow_bbcode']) ? true : false;
+		$smilies_status = ($this->config['allow_smilies']) ? true : false;
 		$img_status		= ($bbcode_status) ? true : false;
 		$url_status		= ($this->config['allow_post_links']) ? true : false;
 		$flash_status	= false;
@@ -305,7 +305,7 @@ 
 			}
 
 			$message_parser = new \parse_message();
-			$message_parser->message	= utf8_normalize_nfc($comment_plain);
+			$message_parser->message = utf8_normalize_nfc($comment_plain);
 			if ($message_parser->message)
 			{
 				$message_parser->parse(true, true, true, true, false, true, true, true);
@@ -464,8 +464,8 @@ 
 			include_once($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext);
 		}
 
-		$bbcode_status	= ($this->config['allow_bbcode']) ? true : false;
-		$smilies_status	= ($this->config['allow_smilies']) ? true : false;
+		$bbcode_status = ($this->config['allow_bbcode']) ? true : false;
+		$smilies_status = ($this->config['allow_smilies']) ? true : false;
 		$img_status		= ($bbcode_status) ? true : false;
 		$url_status		= ($this->config['allow_post_links']) ? true : false;
 		$flash_status	= false;
@@ -678,8 +678,8 @@ 
 			include_once($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext);
 		}
 
-		$bbcode_status	= ($this->config['allow_bbcode']) ? true : false;
-		$smilies_status	= ($this->config['allow_smilies']) ? true : false;
+		$bbcode_status = ($this->config['allow_bbcode']) ? true : false;
+		$smilies_status = ($this->config['allow_smilies']) ? true : false;
 		$img_status		= ($bbcode_status) ? true : false;
 		$url_status		= ($this->config['allow_post_links']) ? true : false;
 		$flash_status	= false;
@@ -759,7 +759,7 @@ 
 			'IMAGE_NAME'			=> $image_data['image_name'],
 
 			'S_SIGNATURE_CHECKED'	=> (isset($sig_checked) && $sig_checked) ? ' checked="checked"' : '',
-			'S_ALBUM_ACTION'		=> append_sid($this->url->path('full') . 'comment/' . (int) $image_id . '/edit/'. (int) $comment_id),
+			'S_ALBUM_ACTION'		=> append_sid($this->url->path('full') . 'comment/' . (int) $image_id . '/edit/' . (int) $comment_id),
 		));
 
 		if ($submit && !$error)
@@ -808,8 +808,8 @@ 
 			include_once($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext);
 		}
 
-		$bbcode_status	= ($this->config['allow_bbcode']) ? true : false;
-		$smilies_status	= ($this->config['allow_smilies']) ? true : false;
+		$bbcode_status = ($this->config['allow_bbcode']) ? true : false;
+		$smilies_status = ($this->config['allow_smilies']) ? true : false;
 		$img_status		= ($bbcode_status) ? true : false;
 		$url_status		= ($this->config['allow_post_links']) ? true : false;
 		$flash_status	= false;

Braces +11 added lines, -22 removed lines

@@ -213,8 +213,7 @@ 
 		if (isset($album_data['contest_start']))
 		{
 			$s_hide_comment_input = (time() < ($album_data['contest_start'] + $album_data['contest_end'])) ? true : false;
-		}
-		else
+		} else
 		{
 			$s_hide_comment_input = false;
 		}
@@ -338,14 +337,12 @@ 
 				$this->notification_helper->notify('new_comment', $data);
 				//$phpbb_gallery_notification->send_notification('image', $image_id, $image_data['image_name']);
 				$message .= $this->language->lang('COMMENT_STORED') . '<br />';
-			}
-			else if ($this->misc->display_captcha('comment'))
+			} else if ($this->misc->display_captcha('comment'))
 			{
 				$s_captcha_hidden_fields = ($captcha->is_solved()) ? build_hidden_fields($captcha->get_hidden_fields()) : '';
 			}
 			$sig_checked = ($this->auth->acl_get('u_sig') && isset($_POST['attach_sig']));
-		}
-		else
+		} else
 		{
 			if ($comment_id != 0)
 			{
@@ -439,8 +436,7 @@ 
 			$comment_data = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 			$image_id = (int) $comment_data['comment_image_id'];
-		}
-		else
+		} else
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -451,8 +447,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
+		} else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -485,8 +480,7 @@ 
 		if (isset($album_data['contest_start']))
 		{
 			$s_hide_comment_input = (time() < ($album_data['contest_start'] + $album_data['contest_end'])) ? true : false;
-		}
-		else
+		} else
 		{
 			$s_hide_comment_input = false;
 		}
@@ -578,8 +572,7 @@ 
 					$this->gallery_log->add_log('moderator', 'c_edit', $image_data['image_album_id'], $image_data['image_id'], array('LOG_GALLERY_COMMENT_EDITED', $image_data['image_name']));
 				}
 			}
-		}
-		else
+		} else
 		{
 			$sig_checked = (bool) $comment_data['comment_signature'];
 
@@ -653,8 +646,7 @@ 
 			$comment_data = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 			$image_id = (int) $comment_data['comment_image_id'];
-		}
-		else
+		} else
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -665,8 +657,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
+		} else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -731,15 +722,13 @@ 
 
 			$message = $this->language->lang('DELETED_COMMENT') . '<br />';
 			$submit = true;
-		}
-		else
+		} else
 		{
 			if (isset($_POST['cancel']))
 			{
 				$message = $this->language->lang('DELETED_COMMENT_NOT') . '<br />';
 				$submit = true;
-			}
-			else
+			} else
 			{
 				confirm_box(false, 'DELETE_COMMENT2', $s_hidden_fields);
 			}

core/migrations/release_1_2_0_add_bbcode.php

Braces +2 added lines, -4 removed lines

@@ -53,8 +53,7 @@ 
 				{
 					$bbcode_id = NUM_CORE_BBCODES + 1;
 				}
-			}
-			else
+			} else
 			{
 				$bbcode_id = NUM_CORE_BBCODES + 1;
 			}
@@ -63,8 +62,7 @@ 
 			if ($this->config['enable_mod_rewrite'])
 			{
 				$url .= 'gallery/image/';
-			}
-			else
+			} else
 			{
 				$url .= 'app.php/gallery/image/';
 			}

core/migrations/release_1_2_0.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
 			if (isset(self::$is_dynamic[$name]))
 			{
 				$config->set('phpbb_gallery_' . $name, $value, true);
-			}
-			else
+			} else
 			{
 				$config->set('phpbb_gallery_' . $name, $value);
 			}

core/migrations/release_1_2_0_create_filesystem.php

Braces +1 added lines, -2 removed lines

@@ -89,8 +89,7 @@
 			if (is_dir($file))
 			{
 				$this->recursiveRemoveDirectory($file);
-			}
-			else
+			} else
 			{
 				unlink($file);
 			}

core/ext.php

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_image');
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_comment');
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_report');
-				}
-				catch (\phpbb\notification\exception $e)
+				} catch (\phpbb\notification\exception $e)
 				{
 					// continue
 				}

Indentation +19 added lines, -19 removed lines

@@ -24,11 +24,11 @@ 
 	];
 
 	/**
-	* Single enable step that installs any included migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single enable step that installs any included migrations
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	function enable_step($old_state)
 	{
 		switch ($old_state)
@@ -62,11 +62,11 @@ 
 	}
 
 	/**
-	* Single disable step that does nothing
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single disable step that does nothing
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	function disable_step($old_state)
 	{
 		switch ($old_state)
@@ -97,11 +97,11 @@ 
 	}
 
 	/**
-	* Single purge step that reverts any included and installed migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single purge step that reverts any included and installed migrations
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	function purge_step($old_state)
 	{
 		$extensions = $this->container->get('ext.manager');
@@ -124,10 +124,10 @@ 
 		{
 			case '': // Empty means nothing has run yet
 				/**
-				* @todo Remove this try/catch condition once purge_notifications is fixed
-				* in the core to work with disabled extensions without fatal errors.
-				* https://tracker.phpbb.com/browse/PHPBB3-12435
-				*/
+				 * @todo Remove this try/catch condition once purge_notifications is fixed
+				 * in the core to work with disabled extensions without fatal errors.
+				 * https://tracker.phpbb.com/browse/PHPBB3-12435
+				 */
 				try
 				{
 					// Purge board rules notifications

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 		{
 			$this->container->get('user')->add_lang_ext('phpbbgallery/core', 'install_gallery');
 			$error_msg = sprintf($this->container->get('user')->lang(
-				'GALLERY_SUB_EXT_UNINSTALL', implode('<br />', $disabled_sub_exts),count($disabled_sub_exts)));
+				'GALLERY_SUB_EXT_UNINSTALL', implode('<br />', $disabled_sub_exts), count($disabled_sub_exts)));
 			trigger_error($error_msg, E_USER_WARNING);
 		}
 

core/config.php

Braces +2 added lines, -4 removed lines

@@ -147,8 +147,7 @@ 
 			if (isset($this->config['phpbb_gallery_' . $option]))
 			{
 				$config_ary[$option] = $this->config['phpbb_gallery_' . $option];
-			}
-			else
+			} else
 			{
 				$config_ary[$option] = $default;
 			}
@@ -161,8 +160,7 @@ 
 		if (isset($this->config['phpbb_gallery_' . $key]))
 		{
 			return $this->config['phpbb_gallery_' . $key];
-		}
-		else
+		} else
 		{
 			return $this->configs_array[$key];
 		}

core/album/loader.php

Indentation +13 added lines, -13 removed lines

@@ -40,12 +40,12 @@ 
 	}
 
 	/**
-	* Load the data of an album
-	*
-	* @param	int		$album_id
-	* @return	bool	True if the album was loaded
-	* @throws	\OutOfBoundsException	if the album does not exist
-	*/
+	 * Load the data of an album
+	 *
+	 * @param	int		$album_id
+	 * @return	bool	True if the album was loaded
+	 * @throws	\OutOfBoundsException	if the album does not exist
+	 */
 	public function load($album_id)
 	{
 		$sql_array = array(
@@ -107,13 +107,13 @@ 
 	}
 
 	/**
-	* Check whether the album_user is the user who wants to do something
-	*
-	* @param	int		$album_id
-	* @param	mixed	$user_id	If false the current user will be compared
-	* @return	bool	True if the user is the owner of the album
-	* @throws	\DomainException	if the user is not the owner of the album
-	*/
+	 * Check whether the album_user is the user who wants to do something
+	 *
+	 * @param	int		$album_id
+	 * @param	mixed	$user_id	If false the current user will be compared
+	 * @return	bool	True if the user is the owner of the album
+	 * @throws	\DomainException	if the user is not the owner of the album
+	 */
 	public function validate_owner($album_id, $user_id = false)
 	{
 		$album_id = (int) $album_id;

core/album/manage.php

Spacing +7 added lines, -7 removed lines

@@ -166,7 +166,7 @@ 
 			}
 			else
 			{
-				$contest_data['contest_start'] = gmmktime((int) $m[4], (int) $m[5], 0, (int) $m[2], (int) $m[3], (int) $m[1]) - $time->getOffset();// - $offset;
+				$contest_data['contest_start'] = gmmktime((int) $m[4], (int) $m[5], 0, (int) $m[2], (int) $m[3], (int) $m[1]) - $time->getOffset(); // - $offset;
 			}
 			if (!preg_match('#(\\d{4})-(\\d{1,2})-(\\d{1,2}) (\\d{1,2}):(\\d{2})#', $contest_data['contest_rating'], $m))
 			{
@@ -175,7 +175,7 @@ 
 			}
 			else if (!$start_date_error)
 			{
-				$contest_data['contest_rating'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset;
+				$contest_data['contest_rating'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset(); //- $offset;
 			}
 			if (!preg_match('#(\\d{4})-(\\d{1,2})-(\\d{1,2}) (\\d{1,2}):(\\d{2})#', $contest_data['contest_end'], $m))
 			{
@@ -184,7 +184,7 @@ 
 			}
 			else if (!$start_date_error)
 			{
-				$contest_data['contest_end'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset;
+				$contest_data['contest_end'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset(); //- $offset;
 			}
 			if (!$start_date_error && !$date_error)
 			{
@@ -710,7 +710,7 @@ 
 					$album_data = $this->gallery_album->get_info($album_id);
 
 					$sql = 'UPDATE ' . $this->albums_table . ' 
-						SET parent_id = ' . (int) $subalbums_to_id .'
+						SET parent_id = ' . (int) $subalbums_to_id . '
 						WHERE parent_id = ' . (int) $album_id . '
 							AND album_user_id = ' . (int) $this->user_id;
 					$this->db->sql_query($sql);
@@ -738,13 +738,13 @@ 
 		// Resync tree
 		$sql = 'UPDATE ' . $this->albums_table . '  
 			SET right_id = right_id - ' . (int) $diff . '
-			WHERE left_id < ' . (int) $album_data['right_id'] . ' AND right_id > ' . (int) $album_data['right_id']. '
+			WHERE left_id < ' . (int) $album_data['right_id'] . ' AND right_id > ' . (int) $album_data['right_id'] . '
 				AND album_user_id = ' . (int) $this->user_id;
 		$this->db->sql_query($sql);
 
 		$sql = 'UPDATE ' . $this->albums_table . ' 
 			SET left_id = left_id - ' . (int) $diff . ', right_id = right_id - ' . (int) $diff . '
-			WHERE left_id > ' . (int) $album_data['right_id']. '
+			WHERE left_id > ' . (int) $album_data['right_id'] . '
 				AND album_user_id = ' . (int) $this->user_id;
 		$this->db->sql_query($sql);
 
@@ -1037,7 +1037,7 @@ 
 		// Now do the dirty job
 		$sql = 'UPDATE ' . $this->albums_table . ' 
 			SET left_id = left_id + CASE
-				WHEN left_id BETWEEN ' . (int) $move_up_left . ' AND ' . (int) $move_up_right . ' THEN -' .(int) $diff_up . '
+				WHEN left_id BETWEEN ' . (int) $move_up_left . ' AND ' . (int) $move_up_right . ' THEN -' . (int) $diff_up . '
 				ELSE ' .(int) $diff_down . '
 			END,
 			right_id = right_id + CASE

Indentation +27 added lines, -27 removed lines

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

Braces +26 added lines, -52 removed lines

@@ -216,8 +216,7 @@ 
 			if ($this->user->data['user_timezone'] == '')
 			{
 				$timezone = 'UTC';
-			}
-			else
+			} else
 			{
 				$timezone = $this->user->data['user_timezone'];
 			}
@@ -229,8 +228,7 @@ 
 			{
 				$errors[] = sprintf($this->language->lang('CONTEST_START_INVALID'), $contest_data['contest_start']);
 				$start_date_error = true;
-			}
-			else
+			} else
 			{
 				$contest_data['contest_start'] = gmmktime((int) $m[4], (int) $m[5], 0, (int) $m[2], (int) $m[3], (int) $m[1]) - $time->getOffset();// - $offset;
 			}
@@ -238,8 +236,7 @@ 
 			{
 				$errors[] = sprintf($this->language->lang('CONTEST_RATING_INVALID'), $contest_data['contest_rating']);
 				$date_error = true;
-			}
-			else if (!$start_date_error)
+			} else if (!$start_date_error)
 			{
 				$contest_data['contest_rating'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset;
 			}
@@ -247,8 +244,7 @@ 
 			{
 				$errors[] = sprintf($this->language->lang('CONTEST_END_INVALID'), $contest_data['contest_end']);
 				$date_error = true;
-			}
-			else if (!$start_date_error)
+			} else if (!$start_date_error)
 			{
 				$contest_data['contest_end'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset;
 			}
@@ -336,8 +332,7 @@ 
 
 					$album_data_sql['left_id'] = $row['right_id'];
 					$album_data_sql['right_id'] = $row['right_id'] + 1;
-				}
-				else
+				} else
 				{
 					$sql = 'UPDATE ' . $this->albums_table . ' 
 						SET left_id = left_id + 2, right_id = right_id + 2
@@ -354,8 +349,7 @@ 
 					$album_data_sql['left_id'] = $row['left_id'] + 1;
 					$album_data_sql['right_id'] = $row['left_id'] + 2;
 				}
-			}
-			else
+			} else
 			{
 				if (!$add_on_top)
 				{
@@ -368,8 +362,7 @@ 
 
 					$album_data_sql['left_id'] = $row['right_id'] + 1;
 					$album_data_sql['right_id'] = $row['right_id'] + 2;
-				}
-				else
+				} else
 				{
 					$sql = 'UPDATE ' . $this->albums_table . ' 
 						SET left_id = left_id + 2, right_id = right_id + 2
@@ -402,8 +395,7 @@ 
 				$this->db->sql_query($sql);
 			}
 			$this->gallery_log->add_log('admin', 'add', $album_data['album_id'], 0, array('LOG_ALBUM_ADD', $album_data['album_name']));
-		}
-		else
+		} else
 		{
 			$row = $this->gallery_album->get_info($album_data_sql['album_id']);
 			$reset_marked_images = false;
@@ -414,22 +406,19 @@ 
 				// Changing a contest to category? No!
 				$errors[] = $this->language->lang('ALBUM_WITH_CONTEST_NO_TYPE_CHANGE');
 				return $errors;
-			}
-			else if ($row['album_type'] != (int) \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
+			} else if ($row['album_type'] != (int) \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
 			{
 				// Changing a album to contest? No!
 				// Changing a category to contest? No!
 				$errors[] = $this->language->lang('ALBUM_NO_TYPE_CHANGE_TO_CONTEST');
 				return $errors;
-			}
-			else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD)
+			} else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD)
 			{
 				// Changing a category to a album? Yes!
 				// Reset the data (you couldn't upload directly in a cat, you must use a album)
 				$album_data_sql['album_images'] = $album_data_sql['album_images_real'] = $album_data_sql['album_last_image_id'] = $album_data_sql['album_last_user_id'] = $album_data_sql['album_last_image_time'] = $album_data_sql['album_contest'] = 0;
 				$album_data_sql['album_last_username'] = $album_data_sql['album_last_user_colour'] = $album_data_sql['album_last_image_name'] = '';
-			}
-			else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT)
+			} else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT)
 			{
 				// Changing a album to a category? Yes!
 				// we're turning a uploadable album into a non-uploadable album
@@ -440,22 +429,18 @@ 
 					if ($to_album_id)
 					{
 						$errors = $this->move_album_content($album_data_sql['album_id'], $to_album_id);
-					}
-					else
+					} else
 					{
 						return array($this->language->lang('NO_DESTINATION_ALBUM'));
 					}
-				}
-				else if ($album_data_sql['type_action'] == 'delete')
+				} else if ($album_data_sql['type_action'] == 'delete')
 				{
 					$errors = $this->delete_album_content($album_data_sql['album_id']);
-				}
-				else
+				} else
 				{
 					return array($this->language->lang('NO_ALBUM_ACTION'));
 				}
-			}
-			else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
+			} else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
 			{
 				// Changing a contest to contest? Yes!
 				// We need to check for the contest_data
@@ -483,8 +468,7 @@ 
 				if ($row['album_id'] != $album_data_sql['parent_id'])
 				{
 					$errors = $this->move_album($album_data_sql['album_id'], $album_data_sql['parent_id']);
-				}
-				else
+				} else
 				{
 					$album_data_sql['parent_id'] = $row['parent_id'];
 				}
@@ -627,13 +611,11 @@ 
 			if ($to_data['right_id'] > $from_data['right_id'])
 			{
 				$diff = '+ ' . ($to_data['right_id'] - $from_data['right_id'] - 1);
-			}
-			else
+			} else
 			{
 				$diff = '- ' . abs($to_data['right_id'] - $from_data['right_id'] - 1);
 			}
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT MAX(right_id) AS right_id
 				FROM ' . $this->albums_table . ' 
@@ -679,14 +661,12 @@ 
 		{
 			$log_action_images = 'IMAGES';
 			$errors = array_merge($errors, $this->delete_album_content($album_id));
-		}
-		else if ($action_images == 'move')
+		} else if ($action_images == 'move')
 		{
 			if (!$images_to_id)
 			{
 				$errors[] = $this->language->lang('NO_DESTINATION_ALBUM');
-			}
-			else
+			} else
 			{
 				$log_action_images = 'MOVE_IMAGES';
 
@@ -700,8 +680,7 @@ 
 				if (!$row)
 				{
 					$errors[] = $this->language->lang('NO_ALBUM');
-				}
-				else
+				} else
 				{
 					$images_to_name = $row['album_name'];
 					$errors = array_merge($errors, $this->move_album_content($album_id, $images_to_id));
@@ -735,14 +714,12 @@ 
 			$sql = 'DELETE FROM ' . $this->albums_table . ' 
 				WHERE ' . $this->db->sql_in_set('album_id', $album_ids);
 			$this->db->sql_query($sql);
-		}
-		else if ($action_subalbums == 'move')
+		} else if ($action_subalbums == 'move')
 		{
 			if (!$subalbums_to_id)
 			{
 				$errors[] = $this->language->lang('NO_DESTINATION_ALBUM');
-			}
-			else
+			} else
 			{
 				$log_action_albums = 'MOVE_ALBUMS';
 
@@ -756,8 +733,7 @@ 
 				if (!$row)
 				{
 					$errors[] = $this->language->lang('NO_ALBUM');
-				}
-				else
+				} else
 				{
 					$subalbums_to_name = $row['album_name'];
 
@@ -792,8 +768,7 @@ 
 			{
 				return $errors;
 			}
-		}
-		else
+		} else
 		{
 			$diff = 2;
 			$sql = 'DELETE FROM ' . $this->albums_table . '  
@@ -1087,8 +1062,7 @@ 
 
 			$move_up_left = $album_row['left_id'];
 			$move_up_right = $album_row['right_id'];
-		}
-		else
+		} else
 		{
 			$left_id = $album_row['left_id'];
 			$right_id = $target['right_id'];

core/search.php

Braces +3 added lines, -6 removed lines

@@ -149,8 +149,7 @@ 
 		if (!$sql_limit)
 		{
 			$result = $this->db->sql_query($sql);
-		}
-		else
+		} else
 		{
 			$result = $this->db->sql_query_limit($sql, $sql_limit);
 		}
@@ -446,8 +445,7 @@ 
 				'BLOCK_NAME'	=> $block_name ? $block_name : '' ,
 				'U_BLOCK'	=> $u_block ? $u_block : $this->helper->route('phpbbgallery_core_search_egosearch'),
 			));
-		}
-		else
+		} else
 		{
 			$this->template->assign_block_vars('imageblock', array(
 				'BLOCK_NAME'	=>  $block_name ? $block_name : $this->language->lang('RECENT_IMAGES'),
@@ -505,8 +503,7 @@ 
 					'phpbbgallery_core_search_egosearch_page',),
 					'params' => array()), 'pagination', 'page', $count, $limit, $start
 			);
-		}
-		else
+		} else
 		{
 			$this->template->assign_vars(array(
 				'TOTAL_IMAGES'				=> $this->language->lang('VIEW_ALBUM_IMAGES', $count),

Spacing +3 added lines, -3 removed lines

@@ -314,7 +314,7 @@ 
 			$this->template->assign_block_vars('commentrow', array(
 				'COMMENT_ID'	=> (int) $var['comment_id'],
 				'U_DELETE'	=> ($this->gallery_auth->acl_check('m_comments', $album_tmp['album_id'], $album_tmp['album_user_id']) || ($this->gallery_auth->acl_check('c_delete', $album_tmp['album_id'], $album_tmp['album_user_id']) && ($var['comment_user_id'] == $this->user->data['user_id']) && $this->user->data['is_registered'])) ? $this->helper->route('phpbbgallery_core_comment_delete', array('image_id' => $var['comment_image_id'], 'comment_id' => $var['comment_id'])) : false,
-				'U_EDIT'	=> $this->gallery_auth->acl_check('c_edit', $album_tmp['album_id'], $album_tmp['album_user_id'])? $this->helper->route('phpbbgallery_core_comment_edit', array('image_id'	=> $var['comment_image_id'], 'comment_id'	=> $var['comment_id'])) : false,
+				'U_EDIT'	=> $this->gallery_auth->acl_check('c_edit', $album_tmp['album_id'], $album_tmp['album_user_id']) ? $this->helper->route('phpbbgallery_core_comment_edit', array('image_id'	=> $var['comment_image_id'], 'comment_id'	=> $var['comment_id'])) : false,
 				'U_QUOTE'	=> ($this->gallery_auth->acl_check('c_post', $album_tmp['album_id'], $album_tmp['album_user_id'])) ? $this->helper->route('phpbbgallery_core_comment_add', array('image_id'	=> $var['comment_image_id'], 'comment_id'	=> $var['comment_id'])) : false,
 				'U_COMMENT'	=> $this->helper->route('phpbbgallery_core_image', array('image_id' => $var['comment_image_id'])) . '#comment_' . $var['comment_id'],
 				'POST_AUTHOR_FULL'	=> (string) $this->user_loader->get_username($var['comment_user_id'], 'full'),
@@ -447,7 +447,7 @@ 
 		if ($user > 0)
 		{
 			$this->template->assign_block_vars('imageblock', array(
-				'BLOCK_NAME'	=> $block_name ? $block_name : '' ,
+				'BLOCK_NAME'	=> $block_name ? $block_name : '',
 				'U_BLOCK'	=> $u_block ? $u_block : $this->helper->route('phpbbgallery_core_search_egosearch'),
 			));
 		}
@@ -547,7 +547,7 @@ 
 		$this->db->sql_freeresult($result);
 		$count = $row['count'];
 		$sql_array['SELECT'] = '* , a.album_name, a.album_status, a.album_user_id, a.album_id';
-		$sql_array['LEFT_JOIN']	= array(
+		$sql_array['LEFT_JOIN'] = array(
 			array(
 				'FROM'		=> array($this->albums_table => 'a'),
 				'ON'		=> 'a.album_id = i.image_album_id',

Indentation +3 added lines, -3 removed lines

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