satanasov / phpbbgallery

core/event/main_listener.php

Spacing +2 added lines, -2 removed lines

@@ -122,13 +122,13 @@
 		}
 		if ($recent)
 		{
-			$block_name	= $this->language->lang('RECENT_IMAGES');
+			$block_name = $this->language->lang('RECENT_IMAGES');
 			$u_block = ' ';
 			$this->gallery_search->recent($this->gallery_config->get('rrc_profile_items'), -1, $event['member']['user_id'], 'rrc_profile_display', $block_name, $u_block);
 		}
 		if ($random)
 		{
-			$block_name	= $this->language->lang('RANDOM_IMAGES');
+			$block_name = $this->language->lang('RANDOM_IMAGES');
 			$u_block = ' ';
 			$this->gallery_search->random($this->gallery_config->get('rrc_profile_items'), $event['member']['user_id'], 'rrc_profile_display', $block_name, $u_block);
 		}

Braces +1 added lines, -2 removed lines

@@ -146,8 +146,7 @@
 					'U_GALLERY_IMAGES_ALLOW'	=> true,
 					'U_GALLERY_IMAGES'	=> $user_info['user_images'],
 				));
-			}
-			else
+			} else
 			{
 				$this->template->assign_vars(array(
 					'U_GALLERY_IMAGES_ALLOW'	=> true,

core/comment.php

Indentation +9 added lines, -9 removed lines

@@ -183,10 +183,10 @@ 
 	}
 
 	/**
-	* Delete comments
-	*
-	* @param	mixed	$comment_ids	Array or integer with comment_id we delete.
-	*/
+	 * Delete comments
+	 *
+	 * @param	mixed	$comment_ids	Array or integer with comment_id we delete.
+	 */
 	public function delete_comments($comment_ids)
 	{
 		$comment_ids = $this->cast_mixed_int2array($comment_ids);
@@ -216,11 +216,11 @@ 
 	}
 
 	/**
-	* Delete comments for given image_ids
-	*
-	* @param	mixed	$image_ids		Array or integer with image_id where we delete the comments.
-	* @param	bool	$reset_stats	Shall we also reset the statistics? We can save that query, when the images are deleted anyway.
-	*/
+	 * Delete comments for given image_ids
+	 *
+	 * @param	mixed	$image_ids		Array or integer with image_id where we delete the comments.
+	 * @param	bool	$reset_stats	Shall we also reset the statistics? We can save that query, when the images are deleted anyway.
+	 */
 	public function delete_images($image_ids, $reset_stats = false)
 	{
 		$image_ids = $this->cast_mixed_int2array($image_ids);

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 			'comment_time'			=> time(),
 		);
 
-		$this->db->sql_query('INSERT INTO ' .$this->comments_table .' ' . $this->db->sql_build_array('INSERT', $data));
+		$this->db->sql_query('INSERT INTO ' . $this->comments_table . ' ' . $this->db->sql_build_array('INSERT', $data));
 		$newest_comment_id = (int) $this->db->sql_nextid();
 		$this->config->inc('num_comments', 1);
 

Braces +1 added lines, -2 removed lines

@@ -244,8 +244,7 @@
 		if (is_array($ids))
 		{
 			return array_map('intval', $ids);
-		}
-		else
+		} else
 		{
 			return array((int) $ids);
 		}

core/notification.php

Indentation +18 added lines, -18 removed lines

@@ -95,11 +95,11 @@ 
 	}
 
 	/**
-	* Remove images from watch-list
-	*
-	* @param	mixed	$image_ids		Array or integer with image_id where we delete from the watch-list.
-	* @param	mixed	$user_ids		If not set, it uses the currents user_id
-	*/
+	 * Remove images from watch-list
+	 *
+	 * @param	mixed	$image_ids		Array or integer with image_id where we delete from the watch-list.
+	 * @param	mixed	$user_ids		If not set, it uses the currents user_id
+	 */
 	public function remove($image_ids, $user_ids = false)
 	{
 		$image_ids = self::cast_mixed_int2array($image_ids);
@@ -112,11 +112,11 @@ 
 	}
 
 	/**
-	* Remove albums from watch-list
-	*
-	* @param	mixed	$album_ids		Array or integer with album_id where we delete from the watch-list.
-	* @param	mixed	$user_ids		If not set, it uses the currents user_id
-	*/
+	 * Remove albums from watch-list
+	 *
+	 * @param	mixed	$album_ids		Array or integer with album_id where we delete from the watch-list.
+	 * @param	mixed	$user_ids		If not set, it uses the currents user_id
+	 */
 	public function remove_albums($album_ids, $user_ids = false)
 	{
 		$album_ids = self::cast_mixed_int2array($album_ids);
@@ -129,10 +129,10 @@ 
 	}
 
 	/**
-	* Delete given image_ids from watch-list
-	*
-	* @param	mixed	$image_ids		Array or integer with image_id where we delete from watch-list.
-	*/
+	 * Delete given image_ids from watch-list
+	 *
+	 * @param	mixed	$image_ids		Array or integer with image_id where we delete from watch-list.
+	 */
 	public function delete_images($image_ids)
 	{
 		$image_ids = self::cast_mixed_int2array($image_ids);
@@ -144,10 +144,10 @@ 
 
 
 	/**
-	* Delete given album_ids from watch-list
-	*
-	* @param	mixed	$album_ids		Array or integer with album_id where we delete from watch-list.
-	*/
+	 * Delete given album_ids from watch-list
+	 *
+	 * @param	mixed	$album_ids		Array or integer with album_id where we delete from watch-list.
+	 */
 	public function delete_albums($album_ids)
 	{
 		$album_ids = self::cast_mixed_int2array($album_ids);

Braces +1 added lines, -2 removed lines

@@ -244,8 +244,7 @@
 		if (is_array($ids))
 		{
 			return array_map('intval', $ids);
-		}
-		else
+		} else
 		{
 			return array((int) $ids);
 		}

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;

core/auth/auth.php

Spacing +15 added lines, -15 removed lines

@@ -12,21 +12,21 @@ 
 
 class auth
 {
-	const SETTING_PERMISSIONS	= -39839;
-	const PERSONAL_ALBUM		= -3;
+	const SETTING_PERMISSIONS = -39839;
+	const PERSONAL_ALBUM = -3;
 	const OWN_ALBUM				= -2;
-	const PUBLIC_ALBUM			= 0;
+	const PUBLIC_ALBUM = 0;
 
 	const ACCESS_ALL			= 0;
-	const ACCESS_REGISTERED		= 1;
-	const ACCESS_NOT_FOES		= 2;
-	const ACCESS_FRIENDS		= 3;
-	const ACCESS_SPECIAL_FRIENDS	= 4;
+	const ACCESS_REGISTERED = 1;
+	const ACCESS_NOT_FOES = 2;
+	const ACCESS_FRIENDS = 3;
+	const ACCESS_SPECIAL_FRIENDS = 4;
 
 	// ACL - slightly different
-	const ACL_NO		= 0;
-	const ACL_YES		= 1;
-	const ACL_NEVER		= 2;
+	const ACL_NO = 0;
+	const ACL_YES = 1;
+	const ACL_NEVER = 2;
 
 	static protected $_permission_i = array('i_view', 'i_watermark', 'i_upload', 'i_approve', 'i_edit', 'i_delete', 'i_report', 'i_rate');
 	static protected $_permission_c = array('c_read', 'c_post', 'c_edit', 'c_delete');
@@ -167,17 +167,17 @@ 
 			$sql_select .= " MAX($permission) as $permission,";
 		}
 
-		$this->_auth_data[self::OWN_ALBUM]				= new \phpbbgallery\core\auth\set();
+		$this->_auth_data[self::OWN_ALBUM] = new \phpbbgallery\core\auth\set();
 		$this->_auth_data_never[self::OWN_ALBUM]		= new \phpbbgallery\core\auth\set();
 		$this->_auth_data[self::PERSONAL_ALBUM]			= new \phpbbgallery\core\auth\set();
-		$this->_auth_data_never[self::PERSONAL_ALBUM]	= new \phpbbgallery\core\auth\set();
+		$this->_auth_data_never[self::PERSONAL_ALBUM] = new \phpbbgallery\core\auth\set();
 
 		foreach ($albums as $album)
 		{
 			if ($album['album_user_id'] == self::PUBLIC_ALBUM)
 			{
-				$this->_auth_data[$album['album_id']]		= new \phpbbgallery\core\auth\set();
-				$this->_auth_data_never[$album['album_id']]	= new \phpbbgallery\core\auth\set();
+				$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
+				$this->_auth_data_never[$album['album_id']] = new \phpbbgallery\core\auth\set();
 			}
 		}
 
@@ -355,7 +355,7 @@ 
 
 		$zebra = null;
 
-		$albums = array();//@todo $this->cache->obtain_album_list();
+		$albums = array(); //@todo $this->cache->obtain_album_list();
 		foreach ($albums as $album)
 		{
 			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM))# || ($album['album_user_id'] == $user_id))

Braces +22 added lines, -41 removed lines

@@ -130,9 +130,7 @@ 
 		{
 			$this->unserialize_auth_data($cached_permissions);
 			return;
-		}
-
-		else if ($user_id != $this->user->user_id)
+		} else if ($user_id != $this->user->user_id)
 		{
 			$this->user->set_user_id($user_id);
 			$cached_permissions = $this->user->get_data('user_permissions');
@@ -252,8 +250,7 @@ 
 			if (!isset($acl_array[$key]))
 			{
 				$acl_array[$key] = $key . '::' . $a_id;
-			}
-			else
+			} else
 			{
 				$acl_array[$key] .= ':' . $a_id;
 			}
@@ -302,8 +299,7 @@ 
 				if ($data[$permission] == self::ACL_NEVER)
 				{
 					$this->_auth_data_never[$album_id]->set_bit(self::$_permissions_flipped[$permission], true);
-				}
-				else if ($data[$permission] == self::ACL_YES)
+				} else if ($data[$permission] == self::ACL_YES)
 				{
 					$this->_auth_data[$album_id]->set_bit(self::$_permissions_flipped[$permission], true);
 					if (substr($permission, 0, 2) == 'm_')
@@ -311,8 +307,7 @@ 
 						$this->_auth_data[$album_id]->set_bit(self::$_permissions_flipped['m_'], true);
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->_auth_data[$album_id]->set_count($permission, $data[$permission]);
 			}
@@ -358,17 +353,17 @@ 
 		$albums = array();//@todo $this->cache->obtain_album_list();
 		foreach ($albums as $album)
 		{
-			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM))# || ($album['album_user_id'] == $user_id))
+			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM)) {
+				# || ($album['album_user_id'] == $user_id))
 			{
 				continue;
 			}
-			else if ($user_id == ANONYMOUS)
+			} else if ($user_id == ANONYMOUS)
 			{
 				// Level 1: No guests
 				$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 				continue;
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_NOT_FOES)
+			} else if ($album['album_auth_access'] == self::ACCESS_NOT_FOES)
 			{
 				if ($zebra == null)
 				{
@@ -380,8 +375,7 @@ 
 					$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 					continue;
 				}
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_SPECIAL_FRIENDS)
+			} else if ($album['album_auth_access'] == self::ACCESS_SPECIAL_FRIENDS)
 			{
 				if ($zebra == null)
 				{
@@ -393,8 +387,7 @@ 
 					$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 					continue;
 				}
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_FRIENDS)
+			} else if ($album['album_auth_access'] == self::ACCESS_FRIENDS)
 			{
 				if ($zebra == null)
 				{
@@ -428,21 +421,18 @@ 
 			if ($row['foe'])
 			{
 				$zebra['foe'][] = (int) $row['user_id'];
-			}
-			else
+			} else
 			{
 				if (isset($row['bff']))
 				{
 					if ($row['bff'])
 					{
 						$zebra['bff'][] = (int) $row['user_id'];
-					}
-					else
+					} else
 					{
 						$zebra['friend'][] = (int) $row['user_id'];
 					}
-				}
-				else
+				} else
 				{
 					$zebra['friend'][] = (int) $row['user_id'];
 				}
@@ -487,16 +477,13 @@ 
 			if (in_array($album_author, $zebra_array['foe']))
 			{
 				$state = 1;
-			}
-			else if (in_array($album_author, $zebra_array['friend']))
+			} else if (in_array($album_author, $zebra_array['friend']))
 			{
 				$state = 3;
-			}
-			else if (in_array($album_author, $zebra_array['bff']))
+			} else if (in_array($album_author, $zebra_array['bff']))
 			{
 				$state = 4;
-			}
-			else
+			} else
 			{
 				$state = 2;
 			}
@@ -543,12 +530,10 @@ 
 		if (is_array($user_ids))
 		{
 			$sql_where = 'WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_ids));
-		}
-		else if ($user_ids == 'all')
+		} else if ($user_ids == 'all')
 		{
 			$sql_where = '';
-		}
-		else
+		} else
 		{
 			$sql_where = 'WHERE user_id = ' . (int) $user_ids;
 		}
@@ -617,8 +602,7 @@ 
 			if ($this->user->is_user($u_id))
 			{
 				$p_id = self::OWN_ALBUM;
-			}
-			else
+			} else
 			{
 				if (!isset($this->_auth_data[$a_id]))
 				{
@@ -700,12 +684,10 @@ 
 			if ($this->user->is_user($album['album_user_id']))
 			{
 				$a_id = self::OWN_ALBUM;
-			}
-			else if ($album['album_user_id'] > self::PUBLIC_ALBUM)
+			} else if ($album['album_user_id'] > self::PUBLIC_ALBUM)
 			{
 				$a_id = self::PERSONAL_ALBUM;
-			}
-			else
+			} else
 			{
 				$a_id = $album['album_id'];
 			}
@@ -755,8 +737,7 @@ 
 		if ($album_data['album_user_id'] != 0)
 		{
 			$sql = 'SELECT * FROM ' . $this->table_permissions . ' WHERE ' . $this->db->sql_in_set('perm_system', array(-2, -3));
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT * FROM ' . $this->table_permissions . ' WHERE perm_album_id = ' . (int) $album_id;
 		}

Indentation +53 added lines, -53 removed lines

@@ -41,57 +41,57 @@ 
 	protected $acl_cache = array();
 
 	/**
-	* Cache object
-	* @var \phpbbgallery\core\cache
-	*/
+	 * Cache object
+	 * @var \phpbbgallery\core\cache
+	 */
 	protected $cache;
 
 	/**
-	* Database object
-	* @var \phpbb\db\driver\driver
-	*/
+	 * Database object
+	 * @var \phpbb\db\driver\driver
+	 */
 	protected $db;
 
 	/**
-	* Gallery user object
-	* @var \phpbbgallery\core\user
-	*/
+	 * Gallery user object
+	 * @var \phpbbgallery\core\user
+	 */
 	protected $user;
 
 	/**
-	* phpBB user object
-	* @var \phpbb\user
-	*/
+	 * phpBB user object
+	 * @var \phpbb\user
+	 */
 	protected $phpbb_user;
 
 	/**
-	* phpBB auth object
-	* @var \phpbb\auth\auth
-	*/
+	 * phpBB auth object
+	 * @var \phpbb\auth\auth
+	 */
 	protected $auth;
 
 	/**
-	* Gallery permissions table
-	* @var string
-	*/
+	 * Gallery permissions table
+	 * @var string
+	 */
 	protected $table_permissions;
 
 	/**
-	* Gallery permission roles table
-	* @var string
-	*/
+	 * Gallery permission roles table
+	 * @var string
+	 */
 	protected $table_roles;
 
 	/**
-	* Gallery users table
-	* @var string
-	*/
+	 * Gallery users table
+	 * @var string
+	 */
 	protected $table_users;
 
 	/**
-	* Gallery albums table
-	* @var string
-	*/
+	 * Gallery albums table
+	 * @var string
+	 */
 	protected $table_albums;
 
 	/**
@@ -339,8 +339,8 @@ 
 	}
 
 	/**
-	* Merge the NEVER-options into the YES-options by removing the YES, if it is set.
-	*/
+	 * Merge the NEVER-options into the YES-options by removing the YES, if it is set.
+	 */
 	protected function merge_acl_row()
 	{
 		foreach ($this->_auth_data as $album_id => $obj)
@@ -585,14 +585,14 @@ 
 	}
 
 	/**
-	* Get permission
-	*
-	* @param	string	$acl	One of the permissions, Exp: i_view
-	* @param	int		$a_id	The album_id, from which we want to have the permissions
-	* @param	int		$u_id	The user_id from the album-owner. If not specified we need to get it from the cache.
-	*
-	* @return	bool			Is the user allowed to do the $acl?
-	*/
+	 * Get permission
+	 *
+	 * @param	string	$acl	One of the permissions, Exp: i_view
+	 * @param	int		$a_id	The album_id, from which we want to have the permissions
+	 * @param	int		$u_id	The user_id from the album-owner. If not specified we need to get it from the cache.
+	 *
+	 * @return	bool			Is the user allowed to do the $acl?
+	 */
 	public function acl_check($acl, $a_id, $u_id = -1)
 	{
 		$bit = self::$_permissions_flipped[$acl];
@@ -655,12 +655,12 @@ 
 	}
 
 	/**
-	* Does the user have the permission for any album?
-	*
-	* @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
-	*
-	* @return	bool			Is the user allowed to do the $acl?
-	*/
+	 * Does the user have the permission for any album?
+	 *
+	 * @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
+	 *
+	 * @return	bool			Is the user allowed to do the $acl?
+	 */
 	public function acl_check_global($acl)
 	{
 		$bit = self::$_permissions_flipped[$acl];
@@ -692,16 +692,16 @@ 
 	}
 
 	/**
-	* Get albums by permission
-	*
-	* @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
-	* @param	string	$return			Type of the return value. array returns an array, else it's a string.
-	*									bool means it only checks whether the user has the permission anywhere.
-	* @param	bool	$display_in_rrc	Only return albums, that have the display_in_rrc-flag set.
-	* @param	bool	$display_pegas	Include personal galleries in the list.
-	*
-	* @return	mixed					$album_ids, either as list or array.
-	*/
+	 * Get albums by permission
+	 *
+	 * @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
+	 * @param	string	$return			Type of the return value. array returns an array, else it's a string.
+	 *									bool means it only checks whether the user has the permission anywhere.
+	 * @param	bool	$display_in_rrc	Only return albums, that have the display_in_rrc-flag set.
+	 * @param	bool	$display_pegas	Include personal galleries in the list.
+	 *
+	 * @return	mixed					$album_ids, either as list or array.
+	 */
 	public function acl_album_ids($acl, $return = 'array', $display_in_rrc = false, $display_pegas = true)
 	{
 		$bit = self::$_permissions_flipped[$acl];

core/acp/albums_module.php

Spacing +8 added lines, -8 removed lines

@@ -65,9 +65,9 @@ 
 
 		$action		= $request->variable('action', '');
 		$update		= (isset($_POST['update'])) ? true : false;
-		$album_id	= $request->variable('a', 0);
+		$album_id = $request->variable('a', 0);
 
-		$this->parent_id	= $request->variable('parent_id', 0);
+		$this->parent_id = $request->variable('parent_id', 0);
 		$album_data = $errors = array();
 		if ($update && !check_form_key($form_key))
 		{
@@ -81,10 +81,10 @@ 
 			switch ($action)
 			{
 				case 'delete':
-					$action_subalbums	= $request->variable('action_subalbums', '');
-					$subalbums_to_id	= $request->variable('subalbums_to_id', 0);
-					$action_images		= $request->variable('action_images', '');
-					$images_to_id		= $request->variable('images_to_id', 0);
+					$action_subalbums = $request->variable('action_subalbums', '');
+					$subalbums_to_id = $request->variable('subalbums_to_id', 0);
+					$action_images = $request->variable('action_images', '');
+					$images_to_id = $request->variable('images_to_id', 0);
 
 					$errors = $manage_albums->delete_album($album_id, $action_images, $action_subalbums, $images_to_id, $subalbums_to_id);
 
@@ -232,12 +232,12 @@ 
 						$acl_url = '&mode=manage&action=v_mask&album_id[]=' . $album_data['album_id'];
 
 						$message = ($action == 'add') ? $this->language->lang('ALBUM_CREATED') : $this->language->lang('ALBUM_UPDATED');
-						$message .= '<br /><br />' . sprintf($this->language->lang('REDIRECT_ACL'), '<a href="' . $phpbb_ext_gallery_core_url->append_sid('admin' , 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url) . '">', '</a>');
+						$message .= '<br /><br />' . sprintf($this->language->lang('REDIRECT_ACL'), '<a href="' . $phpbb_ext_gallery_core_url->append_sid('admin', 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url) . '">', '</a>');
 
 						// Redirect directly to permission settings screen
 						if ($action == 'add' && !$album_perm_from)
 						{
-							meta_refresh(5, $phpbb_ext_gallery_core_url->append_sid('admin' , 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url));
+							meta_refresh(5, $phpbb_ext_gallery_core_url->append_sid('admin', 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url));
 						}
 
 						trigger_error($message . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));

Braces +8 added lines, -16 removed lines

@@ -324,8 +324,7 @@ 
 					if (!$update)
 					{
 						$album_data = $row;
-					}
-					else
+					} else
 					{
 						$album_data['left_id'] = $row['left_id'];
 						$album_data['right_id'] = $row['right_id'];
@@ -333,8 +332,7 @@ 
 					if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
 					{
 						$contest_data = $phpbb_gallery_contest->get_contest($album_id, 'album');
-					}
-					else
+					} else
 					{
 						// Default values, 3 days later rate and 7 for the end of the contest
 						$contest_data = array(
@@ -356,8 +354,7 @@ 
 					/*
 					$album_data['album_password_confirm'] = $album_data['album_password'];
 					*/
-				}
-				else
+				} else
 				{
 					$this->page_title = 'CREATE_ALBUM';
 
@@ -494,8 +491,7 @@ 
 						'S_HAS_SUBALBUMS'		=> ($album_data['right_id'] - $album_data['left_id'] > 1) ? true : false,
 						'S_ALBUMS_LIST'			=> $albums_list,
 					));
-				}
-				else if ($uploadable_album_exists)
+				} else if ($uploadable_album_exists)
 				{
 					$template->assign_vars(array(
 						'S_MOVE_ALBUM_OPTIONS'		=> $phpbb_ext_gallery_core_album->get_albumbox(true, '', $album_data['parent_id'], false, $album_id, 0, (int) \phpbbgallery\core\block::TYPE_UPLOAD),
@@ -635,8 +631,7 @@ 
 		if (!$this->parent_id)
 		{
 			$navigation = $user->lang['GALLERY_INDEX'];
-		}
-		else
+		} else
 		{
 			$navigation = '<a href="' . $this->u_action . '">' . $user->lang['GALLERY_INDEX'] . '</a>';
 
@@ -646,8 +641,7 @@ 
 				if ($row['album_id'] == $this->parent_id)
 				{
 					$navigation .= ' -&gt; ' . $row['album_name'];
-				}
-				else
+				} else
 				{
 					$navigation .= ' -&gt; <a href="' . $this->u_action . '&amp;parent_id=' . $row['album_id'] . '">' . $row['album_name'] . '</a>';
 				}
@@ -678,8 +672,7 @@ 
 				if ($row['album_status'] == (int) \phpbbgallery\core\block::ALBUM_LOCKED)
 				{
 					$folder_image = '<img src="images/icon_folder_lock.gif" alt="' . $user->lang['LOCKED'] . '" />';
-				}
-				else
+				} else
 				{
 					$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $user->lang['SUBALBUM'] . '" />' : '<img src="images/icon_folder.gif" alt="' . $user->lang['FOLDER'] . '" />';
 				}
@@ -705,8 +698,7 @@ 
 				);
 			}
 			while ($row = $db->sql_fetchrow($result));
-		}
-		else if ($this->parent_id)
+		} else if ($this->parent_id)
 		{
 			$row = $phpbb_ext_gallery_core_album->get_info($this->parent_id);
 

Indentation +21 added lines, -21 removed lines

@@ -138,13 +138,13 @@ 
 					);
 
 					/**
-					* Event to send requested data
-					* @event phpbbgallery.core.acp.albums.request_data
-					* @var	string	action		Action we are taking
-					* @var	int		album_id	Album we are doing it to
-					* @var	array	album_data	Album data for the album
-					* @since 1.2.0
-					*/
+					 * Event to send requested data
+					 * @event phpbbgallery.core.acp.albums.request_data
+					 * @var	string	action		Action we are taking
+					 * @var	int		album_id	Album we are doing it to
+					 * @var	array	album_data	Album data for the album
+					 * @since 1.2.0
+					 */
 					$vars = array('action', 'album_id', 'album_data');
 					extract($phpbb_dispatcher->trigger_event('phpbbgallery.core.acp.albums.request_data', compact($vars)));
 
@@ -387,13 +387,13 @@ 
 						);
 
 						/**
-						* Event to send default data
-						*
-						* @event phpbbgallery.core.acp.albums.default_data
-						* @var	action	action		Action taken
-						* @var	array	album_data	Album data array
-						* @since 1.2.0
-						*/
+						 * Event to send default data
+						 *
+						 * @event phpbbgallery.core.acp.albums.default_data
+						 * @var	action	action		Action taken
+						 * @var	array	album_data	Album data array
+						 * @since 1.2.0
+						 */
 						$vars = array('action', 'album_data');
 						extract($phpbb_dispatcher->trigger_event('phpbbgallery.core.acp.albums.default_data', compact($vars)));
 
@@ -564,13 +564,13 @@ 
 				));
 
 				/**
-				* Event after assigning data to template
-				*
-				* @event phpbbgallery.core.acp.albums.send_to_template
-				* @var	action	action		Action taken
-				* @var	array	album_data	Album data array
-				* @since 1.2.0
-				*/
+				 * Event after assigning data to template
+				 *
+				 * @event phpbbgallery.core.acp.albums.send_to_template
+				 * @var	action	action		Action taken
+				 * @var	array	album_data	Album data array
+				 * @since 1.2.0
+				 */
 				$vars = array('action', 'album_data');
 				extract($phpbb_dispatcher->trigger_event('phpbbgallery.core.acp.albums.send_to_template', compact($vars)));
 

core/acp/config_module.php

Indentation +40 added lines, -40 removed lines

@@ -12,13 +12,13 @@ 
 class config_module
 {
 	/**
-	* This function is called, when the main() function is called.
-	* You can use this function to add your language files, check for a valid mode, unset config options and more.
-	*
-	* @param	int		$id		The ID of the module
-	* @param	string	$mode	The name of the mode we want to display
-	* @return	void
-	*/
+	 * This function is called, when the main() function is called.
+	 * You can use this function to add your language files, check for a valid mode, unset config options and more.
+	 *
+	 * @param	int		$id		The ID of the module
+	 * @param	string	$mode	The name of the mode we want to display
+	 * @return	void
+	 */
 	public function main($id, $mode)
 	{
 		// Check whether the mode is allowed.
@@ -263,33 +263,33 @@ 
 	}
 
 	/**
-	* Returns an array with the display_var array for the given mode
-	* The returned display must have the two keys title and vars
-	*		@key	string	title		The page title or lang key for the page title
-	*		@key	array	vars		An array of tupels, one foreach config option we display:
-	*					@key		The name of the config in the get_config_array() array.
-	*								If the key starts with 'legend' a new box is opened with the value being the title of this box.
-	*					@value		An array with several options:
-	*						@key lang		Description for the config value (can be a language key)
-	*						@key explain	Boolean whether the config has an explanation of not.
-	*										If true, <lang>_EXP (and <lang>_EXPLAIN) is displayed as explanation
-	*						@key validate	The config value can be validated as bool, int or string.
-	*										Additional a min and max value can be specified for integers
-	*										On strings the min and max value are the length of the string
-	*										If your config value shall not be casted, remove the validate-key.
-	*						@key type		The type of the config option:
-	*										- Radio buttons:		Either with "Yes and No" (radio:yes_no) or "Enabled and Disabled" (radio:enabled_disabled) as description
-	*										- Text/password field:	"text:<field-size>:<text-max-length>" and "password:<field-size>:<text-max-length>"
-	*										- Select:				"select" requires the key "function" or "method" to be set which provides the html code for the options
-	*										- Custom template:		"custom" requires the key "function" or "method" to be set which provides the html code
-	*						@key function/method	Required when using type select and custom
-	*						@key append		A language string that is appended after the config type (e.g. You can append 'px' to a pixel size field)
-	* This last parameter is optional
-	*		@key	string	tpl			Name of the template file we use to display the configs
-	*
-	* @param	string	$mode	The name of the mode we want to display
-	* @return	array		See description above
-	*/
+	 * Returns an array with the display_var array for the given mode
+	 * The returned display must have the two keys title and vars
+	 *		@key	string	title		The page title or lang key for the page title
+	 *		@key	array	vars		An array of tupels, one foreach config option we display:
+	 *					@key		The name of the config in the get_config_array() array.
+	 *								If the key starts with 'legend' a new box is opened with the value being the title of this box.
+	 *					@value		An array with several options:
+	 *						@key lang		Description for the config value (can be a language key)
+	 *						@key explain	Boolean whether the config has an explanation of not.
+	 *										If true, <lang>_EXP (and <lang>_EXPLAIN) is displayed as explanation
+	 *						@key validate	The config value can be validated as bool, int or string.
+	 *										Additional a min and max value can be specified for integers
+	 *										On strings the min and max value are the length of the string
+	 *										If your config value shall not be casted, remove the validate-key.
+	 *						@key type		The type of the config option:
+	 *										- Radio buttons:		Either with "Yes and No" (radio:yes_no) or "Enabled and Disabled" (radio:enabled_disabled) as description
+	 *										- Text/password field:	"text:<field-size>:<text-max-length>" and "password:<field-size>:<text-max-length>"
+	 *										- Select:				"select" requires the key "function" or "method" to be set which provides the html code for the options
+	 *										- Custom template:		"custom" requires the key "function" or "method" to be set which provides the html code
+	 *						@key function/method	Required when using type select and custom
+	 *						@key append		A language string that is appended after the config type (e.g. You can append 'px' to a pixel size field)
+	 * This last parameter is optional
+	 *		@key	string	tpl			Name of the template file we use to display the configs
+	 *
+	 * @param	string	$mode	The name of the mode we want to display
+	 * @return	array		See description above
+	 */
 	public function get_display_vars($mode)
 	{
 		global $phpbb_dispatcher;
@@ -297,12 +297,12 @@ 
 		$return_ary = $this->display_vars[$mode];
 
 		/**
-		* Event to send the display vars
-		* @event phpbbgallery.core.acp.config.get_display_vars
-		* @var	string	mode		Mode we are requesting for
-		* @var	array	return_ary	Array we are sending back
-		* @since 1.2.0
-		*/
+		 * Event to send the display vars
+		 * @event phpbbgallery.core.acp.config.get_display_vars
+		 * @var	string	mode		Mode we are requesting for
+		 * @var	array	return_ary	Array we are sending back
+		 * @since 1.2.0
+		 */
 		$vars = array('mode', 'return_ary');
 		extract($phpbb_dispatcher->trigger_event('phpbbgallery.core.acp.config.get_display_vars', compact($vars)));
 

Braces +4 added lines, -8 removed lines

@@ -226,8 +226,7 @@ 
 				if (is_array($langs_var))
 				{
 					$vars['append'] = ' ' . substr($this->language->lang($vars['append'], 0), 1);
-				}
-				else
+				} else
 				{
 					$vars['append'] = ' ' . $this->language->lang($vars['append']);
 				}
@@ -577,8 +576,7 @@ 
 		if ($key != 'link_imagepage')
 		{
 			$sort_order_options .= '<option' . (($value == 'image_page') ? ' selected="selected"' : '') . " value='image_page'>" . $this->language->lang('UC_LINK_IMAGE_PAGE') . '</option>';
-		}
-		else
+		} else
 		{
 			$sort_order_options .= '<option' . (($value == 'next') ? ' selected="selected"' : '') . " value='next'>" . $this->language->lang('UC_LINK_NEXT') . '</option>';
 		}
@@ -658,12 +656,10 @@ 
 		if ($value == 'image_page')
 		{
 			$bbcode_tpl = '<a href="' . $gallery_url . 'image/{NUMBER}"><img src="' . $gallery_url . 'image/{NUMBER}/mini" alt="{NUMBER}" /></a>';
-		}
-		else if ($value == 'image')
+		} else if ($value == 'image')
 		{
 			$bbcode_tpl = '<a href="' . $gallery_url . 'image/{NUMBER}/source"><img src="' . $gallery_url . 'image/{NUMBER}/mini" alt="{NUMBER}" /></a>';
-		}
-		else
+		} else
 		{
 			$bbcode_tpl = '<img src="' . $gallery_url . 'image/{NUMBER}/mini" alt="{NUMBER}" />';
 		}

Spacing +65 added lines, -65 removed lines

@@ -331,90 +331,90 @@ 
 			'vars'	=> array(
 				'' => array(),
 				'GALLERY_CONFIG'	=> array(
-					'items_per_page'		=> array('lang' => 'ITEMS_PER_PAGE',		'validate' => 'int',	'type' => 'text:7:3',		'explain' => true),
-					'allow_comments'		=> array('lang' => 'COMMENT_SYSTEM',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'comment_user_control'	=> array('lang' => 'COMMENT_USER_CONTROL',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-					'comment_length'		=> array('lang' => 'COMMENT_MAX_LENGTH',	'validate' => 'int',	'type' => 'text:7:5',		'append' => 'CHARACTERS'),
-					'allow_rates'			=> array('lang' => 'RATE_SYSTEM',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'max_rating'			=> array('lang' => 'RATE_SCALE',			'validate' => 'int',	'type' => 'text:7:2'),
-					'allow_hotlinking'		=> array('lang' => 'HOTLINK_PREVENT',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'hotlinking_domains'	=> array('lang' => 'HOTLINK_ALLOWED',		'validate' => 'string',	'type' => 'text:40:255',	'explain' => true),
+					'items_per_page'		=> array('lang' => 'ITEMS_PER_PAGE', 'validate' => 'int', 'type' => 'text:7:3', 'explain' => true),
+					'allow_comments'		=> array('lang' => 'COMMENT_SYSTEM', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'comment_user_control'	=> array('lang' => 'COMMENT_USER_CONTROL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+					'comment_length'		=> array('lang' => 'COMMENT_MAX_LENGTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'CHARACTERS'),
+					'allow_rates'			=> array('lang' => 'RATE_SYSTEM', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'max_rating'			=> array('lang' => 'RATE_SCALE', 'validate' => 'int', 'type' => 'text:7:2'),
+					'allow_hotlinking'		=> array('lang' => 'HOTLINK_PREVENT', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'hotlinking_domains'	=> array('lang' => 'HOTLINK_ALLOWED', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => true),
 				),
 
 				'ALBUM_SETTINGS'	=> array(
-					'album_display'			=> array('lang' => 'RRC_DISPLAY_OPTIONS',	'validate' => 'int',	'type' => 'custom',			'method' => 'rrc_display'),
-					'default_sort_key'		=> array('lang' => 'DEFAULT_SORT_METHOD',	'validate' => 'string',	'type' => 'custom',			'method' => 'sort_method_select'),
-					'default_sort_dir'		=> array('lang' => 'DEFAULT_SORT_ORDER',	'validate' => 'string',	'type' => 'custom',			'method' => 'sort_order_select'),
-					'album_images'			=> array('lang' => 'MAX_IMAGES_PER_ALBUM',	'validate' => 'int',	'type' => 'text:7:7',		'explain' => true),
-					'mini_thumbnail_disp'	=> array('lang' => 'DISP_FAKE_THUMB',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'mini_thumbnail_size'	=> array('lang' => 'FAKE_THUMB_SIZE',		'validate' => 'int',	'type' => 'text:7:4',		'explain' => true,	'append' => 'PIXELS'),
+					'album_display'			=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'),
+					'default_sort_key'		=> array('lang' => 'DEFAULT_SORT_METHOD', 'validate' => 'string', 'type' => 'custom', 'method' => 'sort_method_select'),
+					'default_sort_dir'		=> array('lang' => 'DEFAULT_SORT_ORDER', 'validate' => 'string', 'type' => 'custom', 'method' => 'sort_order_select'),
+					'album_images'			=> array('lang' => 'MAX_IMAGES_PER_ALBUM', 'validate' => 'int', 'type' => 'text:7:7', 'explain' => true),
+					'mini_thumbnail_disp'	=> array('lang' => 'DISP_FAKE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'mini_thumbnail_size'	=> array('lang' => 'FAKE_THUMB_SIZE', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'),
 				),
 
 				'SEARCH_SETTINGS'	=> array(
-					'search_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS',	'validate' => 'int',	'type' => 'custom',			'method' => 'rrc_display'),
+					'search_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'),
 				),
 
 				'IMAGE_SETTINGS'	=> array(
-					'num_uploads'			=> array('lang' => 'UPLOAD_IMAGES',			'validate' => 'int',	'type' => 'text:7:2'),
-					'max_filesize'			=> array('lang' => 'MAX_FILE_SIZE',			'validate' => 'int',	'type' => 'text:12:9',		'append' => 'BYTES'),
-					'max_width'				=> array('lang' => 'MAX_WIDTH',				'validate' => 'int',	'type' => 'text:7:5',		'append' => 'PIXELS'),
-					'max_height'			=> array('lang' => 'MAX_HEIGHT',			'validate' => 'int',	'type' => 'text:7:5',		'append' => 'PIXELS'),
-					'allow_resize'			=> array('lang' => 'RESIZE_IMAGES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'allow_rotate'			=> array('lang' => 'ROTATE_IMAGES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'jpg_quality'			=> array('lang' => 'JPG_QUALITY',			'validate' => 'int',	'type' => 'text:7:5',		'explain' => true),
+					'num_uploads'			=> array('lang' => 'UPLOAD_IMAGES', 'validate' => 'int', 'type' => 'text:7:2'),
+					'max_filesize'			=> array('lang' => 'MAX_FILE_SIZE', 'validate' => 'int', 'type' => 'text:12:9', 'append' => 'BYTES'),
+					'max_width'				=> array('lang' => 'MAX_WIDTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'PIXELS'),
+					'max_height'			=> array('lang' => 'MAX_HEIGHT', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'PIXELS'),
+					'allow_resize'			=> array('lang' => 'RESIZE_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'allow_rotate'			=> array('lang' => 'ROTATE_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'jpg_quality'			=> array('lang' => 'JPG_QUALITY', 'validate' => 'int', 'type' => 'text:7:5', 'explain' => true),
 					//'medium_cache'			=> array('lang' => 'MEDIUM_CACHE',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'medium_width'			=> array('lang' => 'RSZ_WIDTH',				'validate' => 'int',	'type' => 'text:7:4',		'append' => 'PIXELS'),
-					'medium_height'			=> array('lang' => 'RSZ_HEIGHT',			'validate' => 'int',	'type' => 'text:7:4',		'append' => 'PIXELS'),
-					'allow_gif'				=> array('lang' => 'GIF_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'allow_jpg'				=> array('lang' => 'JPG_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'allow_png'				=> array('lang' => 'PNG_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'allow_webp'				=> array('lang' => 'WEBP_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'allow_zip'				=> array('lang' => 'ZIP_ALLOWED',			'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'description_length'	=> array('lang' => 'IMAGE_DESC_MAX_LENGTH',	'validate' => 'int',	'type' => 'text:7:5',		'append' => 'CHARACTERS'),
-					'disp_nextprev_thumbnail'	=> array('lang' => 'DISP_NEXTPREV_THUMB','validate' => 'bool',	'type' => 'radio:yes_no'),
-					'disp_image_url'		=> array('lang' => 'VIEW_IMAGE_URL',		'validate' => 'bool',	'type' => 'radio:yes_no'),
+					'medium_width'			=> array('lang' => 'RSZ_WIDTH', 'validate' => 'int', 'type' => 'text:7:4', 'append' => 'PIXELS'),
+					'medium_height'			=> array('lang' => 'RSZ_HEIGHT', 'validate' => 'int', 'type' => 'text:7:4', 'append' => 'PIXELS'),
+					'allow_gif'				=> array('lang' => 'GIF_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'allow_jpg'				=> array('lang' => 'JPG_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'allow_png'				=> array('lang' => 'PNG_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'allow_webp'				=> array('lang' => 'WEBP_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'allow_zip'				=> array('lang' => 'ZIP_ALLOWED', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'description_length'	=> array('lang' => 'IMAGE_DESC_MAX_LENGTH', 'validate' => 'int', 'type' => 'text:7:5', 'append' => 'CHARACTERS'),
+					'disp_nextprev_thumbnail'	=> array('lang' => 'DISP_NEXTPREV_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'disp_image_url'		=> array('lang' => 'VIEW_IMAGE_URL', 'validate' => 'bool', 'type' => 'radio:yes_no'),
 				),
 
 				'THUMBNAIL_SETTINGS'	=> array(
 					//'thumbnail_cache'		=> array('lang' => 'THUMBNAIL_CACHE',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'gdlib_version'			=> array('lang' => 'GD_VERSION',			'validate' => 'int',	'type' => 'custom',			'method' => 'gd_radio'),
-					'thumbnail_width'		=> array('lang' => 'THUMBNAIL_WIDTH',		'validate' => 'int',	'type' => 'text:7:3',		'append' => 'PIXELS'),
-					'thumbnail_height'		=> array('lang' => 'THUMBNAIL_HEIGHT',		'validate' => 'int',	'type' => 'text:7:3',		'append' => 'PIXELS'),
-					'thumbnail_quality'		=> array('lang' => 'THUMBNAIL_QUALITY',		'validate' => 'int',	'type' => 'text:7:3',		'explain' => true,	'append' => 'PERCENT'),
+					'gdlib_version'			=> array('lang' => 'GD_VERSION', 'validate' => 'int', 'type' => 'custom', 'method' => 'gd_radio'),
+					'thumbnail_width'		=> array('lang' => 'THUMBNAIL_WIDTH', 'validate' => 'int', 'type' => 'text:7:3', 'append' => 'PIXELS'),
+					'thumbnail_height'		=> array('lang' => 'THUMBNAIL_HEIGHT', 'validate' => 'int', 'type' => 'text:7:3', 'append' => 'PIXELS'),
+					'thumbnail_quality'		=> array('lang' => 'THUMBNAIL_QUALITY', 'validate' => 'int', 'type' => 'text:7:3', 'explain' => true, 'append' => 'PERCENT'),
 					//'thumbnail_infoline'	=> array('lang' => 'INFO_LINE',				'validate' => 'bool',	'type' => 'radio:yes_no'),
 				),
 
 				'WATERMARK_OPTIONS'	=> array(
-					'watermark_enabled'		=> array('lang' => 'WATERMARK_IMAGES',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'watermark_source'		=> array('lang' => 'WATERMARK_SOURCE',		'validate' => 'string',	'type' => 'custom',			'explain' => true,	'method' => 'watermark_source'),
-					'watermark_height'		=> array('lang' => 'WATERMARK_HEIGHT',		'validate' => 'int',	'type' => 'text:7:4',		'explain' => true,	'append' => 'PIXELS'),
-					'watermark_width'		=> array('lang' => 'WATERMARK_WIDTH',		'validate' => 'int',	'type' => 'text:7:4',		'explain' => true,	'append' => 'PIXELS'),
-					'watermark_position'	=> array('lang' => 'WATERMARK_POSITION',	'validate' => '',		'type' => 'custom',			'method' => 'watermark_position'),
+					'watermark_enabled'		=> array('lang' => 'WATERMARK_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'watermark_source'		=> array('lang' => 'WATERMARK_SOURCE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'watermark_source'),
+					'watermark_height'		=> array('lang' => 'WATERMARK_HEIGHT', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'),
+					'watermark_width'		=> array('lang' => 'WATERMARK_WIDTH', 'validate' => 'int', 'type' => 'text:7:4', 'explain' => true, 'append' => 'PIXELS'),
+					'watermark_position'	=> array('lang' => 'WATERMARK_POSITION', 'validate' => '', 'type' => 'custom', 'method' => 'watermark_position'),
 				),
 
 				'UC_LINK_CONFIG'	=> array(
-					'link_thumbnail'		=> array('lang' => 'UC_THUMBNAIL',			'validate' => 'string',	'type' => 'custom',			'explain' => true,	'method' => 'uc_select'),
-					'link_imagepage'		=> array('lang' => 'UC_IMAGEPAGE',			'validate' => 'string',	'type' => 'custom',			'explain' => true,	'method' => 'uc_select'),
-					'link_image_name'		=> array('lang' => 'UC_IMAGE_NAME',			'validate' => 'string',	'type' => 'custom',			'method' => 'uc_select'),
-					'link_image_icon'		=> array('lang' => 'UC_IMAGE_ICON',			'validate' => 'string',	'type' => 'custom',			'method' => 'uc_select'),
+					'link_thumbnail'		=> array('lang' => 'UC_THUMBNAIL', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'uc_select'),
+					'link_imagepage'		=> array('lang' => 'UC_IMAGEPAGE', 'validate' => 'string', 'type' => 'custom', 'explain' => true, 'method' => 'uc_select'),
+					'link_image_name'		=> array('lang' => 'UC_IMAGE_NAME', 'validate' => 'string', 'type' => 'custom', 'method' => 'uc_select'),
+					'link_image_icon'		=> array('lang' => 'UC_IMAGE_ICON', 'validate' => 'string', 'type' => 'custom', 'method' => 'uc_select'),
 				),
 
 				'RRC_GINDEX'	=> array(
-					'rrc_gindex_mode'		=> array('lang' => 'RRC_GINDEX_MODE',		'validate' => 'int',	'type' => 'custom',			'explain' => true,	'method' => 'rrc_modes'),
-					'rrc_gindex_comments'	=> array('lang' => 'RRC_GINDEX_COMMENTS',	'validate' => 'bool',	'type' => 'radio:yes_no'),
+					'rrc_gindex_mode'		=> array('lang' => 'RRC_GINDEX_MODE', 'validate' => 'int', 'type' => 'custom', 'explain' => true, 'method' => 'rrc_modes'),
+					'rrc_gindex_comments'	=> array('lang' => 'RRC_GINDEX_COMMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no'),
 					//'rrc_gindex_contests'	=> array('lang' => 'RRC_GINDEX_CONTESTS',	'validate' => 'int',	'type' => 'text:7:3'),
-					'rrc_gindex_display'	=> array('lang' => 'RRC_DISPLAY_OPTIONS',	'validate' => '',		'type' => 'custom',			'method' => 'rrc_display'),
-					'rrc_gindex_pegas'		=> array('lang' => 'RRC_GINDEX_PGALLERIES',	'validate' => 'bool',	'type' => 'radio:yes_no'),
+					'rrc_gindex_display'	=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => '', 'type' => 'custom', 'method' => 'rrc_display'),
+					'rrc_gindex_pegas'		=> array('lang' => 'RRC_GINDEX_PGALLERIES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
 				),
 
 				'PHPBB_INTEGRATION'	=> array(
-					'disp_gallery_icon'			=> array('lang' => 'DISP_GALLERY_ICON',				'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-					'disp_total_images'			=> array('lang' => 'DISP_TOTAL_IMAGES',				'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'profile_user_images'		=> array('lang' => 'DISP_USER_IMAGES_PROFILE',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'profile_pega'				=> array('lang' => 'DISP_PERSONAL_ALBUM_PROFILE',	'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'rrc_profile_mode'			=> array('lang' => 'RRC_PROFILE_MODE',				'validate' => 'int',	'type' => 'custom',			'explain' => true,	'method' => 'rrc_modes'),
-					'rrc_profile_items'			=> array('lang' => 'RRC_PROFILE_ITEMS',				'validate' => 'int',	'type' => 'text:7:3'),
-					'rrc_profile_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS',			'validate' => 'int',	'type' => 'custom',			'method' => 'rrc_display'),
+					'disp_gallery_icon'			=> array('lang' => 'DISP_GALLERY_ICON', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+					'disp_total_images'			=> array('lang' => 'DISP_TOTAL_IMAGES', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'profile_user_images'		=> array('lang' => 'DISP_USER_IMAGES_PROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'profile_pega'				=> array('lang' => 'DISP_PERSONAL_ALBUM_PROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'rrc_profile_mode'			=> array('lang' => 'RRC_PROFILE_MODE', 'validate' => 'int', 'type' => 'custom', 'explain' => true, 'method' => 'rrc_modes'),
+					'rrc_profile_items'			=> array('lang' => 'RRC_PROFILE_ITEMS', 'validate' => 'int', 'type' => 'text:7:3'),
+					'rrc_profile_display'		=> array('lang' => 'RRC_DISPLAY_OPTIONS', 'validate' => 'int', 'type' => 'custom', 'method' => 'rrc_display'),
 					//'rrc_profile_pegas'			=> array('lang' => 'RRC_GINDEX_PGALLERIES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
 					//'viewtopic_icon'			=> array('lang' => 'DISP_VIEWTOPIC_ICON',			'validate' => 'bool',	'type' => 'radio:yes_no'),
 					//'viewtopic_images'			=> array('lang' => 'DISP_VIEWTOPIC_IMAGES',			'validate' => 'bool',	'type' => 'radio:yes_no'),
@@ -422,15 +422,15 @@ 
 				),
 
 				'INDEX_SETTINGS'	=> array(
-					'pegas_index_album'		=> array('lang' => 'PERSONAL_ALBUM_INDEX',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
+					'pegas_index_album'		=> array('lang' => 'PERSONAL_ALBUM_INDEX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 					//'pegas_index_random'	=> array('lang'	=> 'RANDOM_ON_INDEX',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-					'pegas_index_rnd_count'	=> array('lang'	=> 'RANDOM_ON_INDEX_COUNT',	'validate' => 'int',	'type' => 'text:7:3'),
+					'pegas_index_rnd_count'	=> array('lang'	=> 'RANDOM_ON_INDEX_COUNT', 'validate' => 'int', 'type' => 'text:7:3'),
 					//'pegas_index_recent'	=> array('lang'	=> 'RECENT_ON_INDEX',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-					'pegas_index_rct_count'	=> array('lang'	=> 'RECENT_ON_INDEX_COUNT',	'validate' => 'int',	'type' => 'text:7:3'),
-					'disp_login'			=> array('lang' => 'DISP_LOGIN',			'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-					'disp_whoisonline'		=> array('lang' => 'DISP_WHOISONLINE',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'disp_birthdays'		=> array('lang' => 'DISP_BIRTHDAYS',		'validate' => 'bool',	'type' => 'radio:yes_no'),
-					'disp_statistic'		=> array('lang' => 'DISP_STATISTIC',		'validate' => 'bool',	'type' => 'radio:yes_no'),
+					'pegas_index_rct_count'	=> array('lang'	=> 'RECENT_ON_INDEX_COUNT', 'validate' => 'int', 'type' => 'text:7:3'),
+					'disp_login'			=> array('lang' => 'DISP_LOGIN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+					'disp_whoisonline'		=> array('lang' => 'DISP_WHOISONLINE', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'disp_birthdays'		=> array('lang' => 'DISP_BIRTHDAYS', 'validate' => 'bool', 'type' => 'radio:yes_no'),
+					'disp_statistic'		=> array('lang' => 'DISP_STATISTIC', 'validate' => 'bool', 'type' => 'radio:yes_no'),
 				),
 			),
 		),
@@ -573,7 +573,7 @@ 
 		global $phpbb_container;
 		$this->language = $phpbb_container->get('language');
 
-		$sort_order_options = '';//phpbb_gallery_plugins::uc_select($value, $key);
+		$sort_order_options = ''; //phpbb_gallery_plugins::uc_select($value, $key);
 
 		if ($key != 'link_imagepage')
 		{
@@ -587,7 +587,7 @@ 
 		$sort_order_options .= '<option' . (($value == 'none') ? ' selected="selected"' : '') . " value='none'>" . $this->language->lang('UC_LINK_NONE') . '</option>';
 
 		return "<select name='config[$key]' id='$key'>$sort_order_options</select>"
-			. (($key == 'link_thumbnail') ? '<br /><input class="checkbox" type="checkbox" name="update_bbcode" id="update_bbcode" value="update_bbcode" /><label for="update_bbcode">' .  $this->language->lang('UPDATE_BBCODE') . '</label>' : '');
+			. (($key == 'link_thumbnail') ? '<br /><input class="checkbox" type="checkbox" name="update_bbcode" id="update_bbcode" value="update_bbcode" /><label for="update_bbcode">' . $this->language->lang('UPDATE_BBCODE') . '</label>' : '');
 	}
 
 	/**

core/acp/main_module.php

Braces +10 added lines, -20 removed lines

@@ -95,8 +95,7 @@ 
 				'U_SOURCE_DIR_STATE'	=>  $this->language->lang('NO_WRITE_ACCESS'),
 				'U_SOURCE_DIR_STATE_ERROR'	=> 1,
 			));
-		}
-		else
+		} else
 		{
 			$template->assign_vars(array(
 				'U_FILE_DIR_STATE'	=>  $this->language->lang('WRITE_ACCESS'),
@@ -109,15 +108,13 @@ 
 					'U_CORE_DIR_STATE'	=>  $this->language->lang('DIR_CREATED'),
 					'U_CORE_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else if (is_writable($phpbbgallery_core_file))
+			} else if (is_writable($phpbbgallery_core_file))
 			{
 				$template->assign_vars(array(
 					'U_CORE_DIR_STATE'	=>  $this->language->lang('WRITE_ACCESS'),
 					'U_CORE_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else
+			} else
 			{
 				$template->assign_vars(array(
 					'U_CORE_DIR_STATE'	=>  $this->language->lang('NO_WRITE_ACCESS'),
@@ -131,15 +128,13 @@ 
 					'U_MEDIUM_DIR_STATE'	=>  $this->language->lang('DIR_CREATED'),
 					'U_MEDIUM_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else if (is_writable($phpbbgallery_core_file_medium))
+			} else if (is_writable($phpbbgallery_core_file_medium))
 			{
 				$template->assign_vars(array(
 					'U_MEDIUM_DIR_STATE'	=>  $this->language->lang('WRITE_ACCESS'),
 					'U_MEDIUM_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else
+			} else
 			{
 				$template->assign_vars(array(
 					'U_MEDIUM_DIR_STATE'	=>  $this->language->lang('NO_WRITE_ACCESS'),
@@ -153,15 +148,13 @@ 
 					'U_MINI_DIR_STATE'	=>  $this->language->lang('DIR_CREATED'),
 					'U_MINI_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else if (is_writable($phpbbgallery_core_file_mini))
+			} else if (is_writable($phpbbgallery_core_file_mini))
 			{
 				$template->assign_vars(array(
 					'U_MINI_DIR_STATE'	=>  $this->language->lang('WRITE_ACCESS'),
 					'U_MINI_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else
+			} else
 			{
 				$template->assign_vars(array(
 					'U_MINI_DIR_STATE'	=>  $this->language->lang('NO_WRITE_ACCESS'),
@@ -175,15 +168,13 @@ 
 					'U_SOURCE_DIR_STATE'	=>  $this->language->lang('DIR_CREATED'),
 					'U_SOURCE_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else if (is_writable($phpbbgallery_core_file_source))
+			} else if (is_writable($phpbbgallery_core_file_source))
 			{
 				$template->assign_vars(array(
 					'U_SOURCE_DIR_STATE'	=>  $this->language->lang('WRITE_ACCESS'),
 					'U_SOURCE_DIR_STATE_ERROR'	=> 0,
 				));
-			}
-			else
+			} else
 			{
 				$template->assign_vars(array(
 					'U_SOURCE_DIR_STATE'	=>  $this->language->lang('NO_WRITE_ACCESS'),
@@ -282,8 +273,7 @@ 
 					'reset_album_id'	=> $album_id,
 				)));
 			}
-		}
-		else
+		} else
 		{
 			switch ($action)
 			{

core/acp/permissions_module.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 			'misc'	=> array('a_list', 'i_count', 'i_unlimited', 'a_count', 'a_unlimited', 'a_restrict'),
 		);
 		$permissions->p_masks[$gallery_auth::OWN_ALBUM] = array_merge($permissions->cats[$gallery_auth::OWN_ALBUM]['i'], $permissions->cats[$gallery_auth::OWN_ALBUM]['c'], $permissions->cats[$gallery_auth::OWN_ALBUM]['m'], $permissions->cats[$gallery_auth::OWN_ALBUM]['misc']);
-		$permissions->p_masks_anti[$gallery_auth::OWN_ALBUM] = array();// Note: we set i_view to 1 as default, so it's not needed on anti array('i_view');
+		$permissions->p_masks_anti[$gallery_auth::OWN_ALBUM] = array(); // Note: we set i_view to 1 as default, so it's not needed on anti array('i_view');
 
 		// Permissions for personal albums of other users
 		// Note: Do !NOT! hide the i_upload. It's used for the moving-permissions
@@ -1244,7 +1244,7 @@ 
 	{
 		global $user, $phpbb_container;
 
-		$phpbb_ext_gallery_core_auth =  $phpbb_container->get('phpbbgallery.core.auth');
+		$phpbb_ext_gallery_core_auth = $phpbb_container->get('phpbbgallery.core.auth');
 
 		$disabled = false;
 		// We submit a "wrong" array on the check (to make it more easy) so we convert it here

Indentation +12 added lines, -12 removed lines

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

Braces +17 added lines, -34 removed lines

@@ -110,8 +110,7 @@ 
 						if (!$submit)
 						{
 							$this->permissions_v_mask();
-						}
-						else
+						} else
 						{
 							$this->permissions_p_mask();
 						}
@@ -449,13 +448,11 @@ 
 		if (!sizeof($group_id) && !sizeof($user_id))
 		{
 			trigger_error('NO_VICTIM_SELECTED', E_USER_WARNING);
-		}
-		else if (sizeof($group_id))
+		} else if (sizeof($group_id))
 		{
 			$victim_mode = 'group';
 			$victim_id = $group_id;
-		}
-		else
+		} else
 		{
 			$victim_mode = 'user';
 			$victim_id = $user_id;
@@ -487,8 +484,7 @@ 
 				$victim_list[$row['group_id']] = $victim_row;
 			}
 			$db->sql_freeresult($result);
-		}
-		else
+		} else
 		{
 			// Get the user information
 			$sql = 'SELECT username, user_id, user_colour
@@ -571,12 +567,10 @@ 
 								if (isset($roles[$role_id][$permission]) && ($roles[$role_id][$permission] == $phpbb_ext_gallery_core_auth::ACL_YES))
 								{
 									$acl_s_yes++;
-								}
-								else if (isset($roles[$role_id][$permission]) && ($roles[$role_id][$permission] == $phpbb_ext_gallery_core_auth::ACL_NEVER))
+								} else if (isset($roles[$role_id][$permission]) && ($roles[$role_id][$permission] == $phpbb_ext_gallery_core_auth::ACL_NEVER))
 								{
 									$acl_s_never++;
-								}
-								else if (isset($roles[$role_id][$permission]) && ($roles[$role_id][$permission] == $phpbb_ext_gallery_core_auth::ACL_NO))
+								} else if (isset($roles[$role_id][$permission]) && ($roles[$role_id][$permission] == $phpbb_ext_gallery_core_auth::ACL_NO))
 								{
 									$acl_s_no++;
 								}
@@ -607,8 +601,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			$template->assign_block_vars('c_mask', array(
 				'C_MASK_ID'				=> $p_system,
@@ -686,13 +679,11 @@ 
 		if (!sizeof($group_id) && !sizeof($user_id))
 		{
 			trigger_error('NO_VICTIM_SELECTED', E_USER_WARNING);
-		}
-		else if (sizeof($group_id))
+		} else if (sizeof($group_id))
 		{
 			$victim_mode = 'group';
 			$victim_id = $group_id;
-		}
-		else
+		} else
 		{
 			$victim_mode = 'user';
 			$victim_id = $user_id;
@@ -741,8 +732,7 @@ 
 						if (substr($p_mask, -6, 6) == '_count')
 						{
 							$auth_settings[$c_mask][$v_mask][$p_mask] = $value;
-						}
-						else
+						} else
 						{
 							$auth_settings[$c_mask][$v_mask][$p_mask] = ($value == ACL_YES) ? $phpbb_ext_gallery_core_auth::ACL_YES : (($value == ACL_NEVER) ? $phpbb_ext_gallery_core_auth::ACL_NEVER : $phpbb_ext_gallery_core_auth::ACL_NO);
 							// Do we have moderators?
@@ -792,15 +782,13 @@ 
 								}
 								// We take all permissions of another c_mask, so:
 								break;
-							}
-							else
+							} else
 							{
 								// The chosen option was disabled: Hacking attempt?!
 								trigger_error('HACKING_ATTEMPT', E_USER_WARNING);
 							}
 						}
-					}
-					else if ($i_mask)
+					} else if ($i_mask)
 					{
 						// Inherit permissions of one [c_mask][v_mask]
 						$v_mask = (int) $v_mask;
@@ -821,8 +809,7 @@ 
 								}
 								$auth_settings[$c_mask][$v_mask] = $auth_settings[$ci_mask][$vi_mask];
 								$p_mask_storage[$auth_settings[$c_mask][$v_mask]]['usage'][] = array('c_mask' => $c_mask, 'v_mask' => $v_mask);
-							}
-							else
+							} else
 							{
 								// The chosen option was disabled: Hacking attempt?!
 								trigger_error('HACKING_ATTEMPT', E_USER_WARNING);
@@ -895,8 +882,7 @@ 
 						$victim_names[$row['group_id']] = $row['group_name'];
 					}
 					$db->sql_freeresult($result);
-				}
-				else
+				} else
 				{
 					// Get username's for the GALLERY_MODSCACHE_TABLE
 					$sql = 'SELECT user_id, username
@@ -962,8 +948,7 @@ 
 									'group_id'		=> $usage['v_mask'],
 									'group_name'	=> $victim_names[$usage['v_mask']],
 								);
-							}
-							else
+							} else
 							{
 								$sql_moderators[] = array(
 									'album_id'		=> $usage['c_mask'],
@@ -972,8 +957,7 @@ 
 								);
 							}
 						}
-					}
-					else
+					} else
 					{
 						$sql_permissions[] = array(
 							'perm_role_id'					=> $role_id,
@@ -1097,8 +1081,7 @@ 
 				$phpbb_ext_gallery_core_auth->set_user_permissions('all', '');
 
 				trigger_error($this->language->lang('COPY_PERMISSIONS_SUCCESSFUL') . adm_back_link($this->u_action));
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = array(
 					'submit'			=> $submit,