From 61c58014c13824a3dafff96a8539b6327b3830b2 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 26 Nov 2008 03:39:33 +0000
Subject: [PATCH] MINOR Formatting in Permission::checkMember()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66736 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 security/Permission.php | 131 ++++++++++++++++++++--------------------
 1 file changed, 66 insertions(+), 65 deletions(-)

diff --git a/security/Permission.php b/security/Permission.php
index 7e4fd7316..ce91e6ee6 100755
--- a/security/Permission.php
+++ b/security/Permission.php
@@ -124,76 +124,77 @@ class Permission extends DataObject {
 		$perms_list = self::get_declared_permissions_list();
 		$memberID = (is_object($member)) ? $member->ID : $member; 
 
-		if(self::$declared_permissions && is_array($perms_list) &&
-				!in_array($code, $perms_list)) {
-			//user_error("Permission '$code' has not been declared. Use " .
-			//					 "Permission::declare_permissions() to add this permission",
-			//					 E_USER_WARNING);
+		/*
+		if(self::$declared_permissions && is_array($perms_list) && !in_array($code, $perms_list)) {
+			user_error(
+				"Permission '$code' has not been declared. Use " .
+				"Permission::declare_permissions() to add this permission",
+				E_USER_WARNING
+			);
 		}
-
+		*/
+		
 		$groupList = self::groupList($memberID);
-		if($groupList) {
-			$groupCSV = implode(", ", $groupList);
+		if(!$groupList) return false;
+		
+		$groupCSV = implode(", ", $groupList);
 
-			// Arg component
-			switch($arg) {
-				case "any":
-					$argClause = "";
-					break;
-				case "all":
-					$argClause = " AND Arg = -1";
-					break;
-				default:
-					if(is_numeric($arg)) {
-						$argClause = "AND Arg IN (-1, $arg) ";
-					} else {
-						user_error("Permission::checkMember: bad arg '$arg'",
-											E_USER_ERROR);
-					}
-			}
-			
-			if(is_array($code)) $SQL_codeList = "'" . implode("', '", Convert::raw2sql($code)) . "'";
-			else $SQL_codeList = "'" . Convert::raw2sql($code) . "'";
-			
-			$SQL_code = Convert::raw2sql($code);
-			
-			$adminFilter = (self::$admin_implies_all)
-				?  ",'ADMIN'"
-				: '';
-
-			// Raw SQL for efficiency
-			$permission = DB::query("
-					SELECT ID
-					FROM Permission
-					WHERE (
-						Code IN ($SQL_codeList $adminFilter)
-						AND Type = " . self::GRANT_PERMISSION . "
-						AND GroupID IN ($groupCSV)
-						$argClause
-					)
-				")->value();
-				
-			if($permission)
-				return $permission;
-
-
-			// Strict checking disabled?
-			if(!self::$strict_checking || !$strict) {
-				$hasPermission = DB::query("
-					SELECT COUNT(*) 
-					FROM Permission 
-					WHERE (
-						(Code IN '$SQL_code')' 
-						AND (Type = " . self::GRANT_PERMISSION . ")
-					)
-				")->value();
-				if(!$hasPermission) {
-					return true;
+		// Arg component
+		switch($arg) {
+			case "any":
+				$argClause = "";
+				break;
+			case "all":
+				$argClause = " AND Arg = -1";
+				break;
+			default:
+				if(is_numeric($arg)) {
+					$argClause = "AND Arg IN (-1, $arg) ";
+				} else {
+					user_error("Permission::checkMember: bad arg '$arg'", E_USER_ERROR);
 				}
-			}
-
-			return false;
 		}
+		
+		if(is_array($code)) {
+			$SQL_codeList = "'" . implode("', '", Convert::raw2sql($code)) . "'";
+		} else {
+			$SQL_codeList = "'" . Convert::raw2sql($code) . "'";
+		}
+		
+		$SQL_code = Convert::raw2sql($code);
+		
+		$adminFilter = (self::$admin_implies_all) ?  ",'ADMIN'" : '';
+
+		// Raw SQL for efficiency
+		$permission = DB::query("
+			SELECT ID
+			FROM Permission
+			WHERE (
+				Code IN ($SQL_codeList $adminFilter)
+				AND Type = " . self::GRANT_PERMISSION . "
+				AND GroupID IN ($groupCSV)
+				$argClause
+			)
+		")->value();
+		
+		if($permission) return $permission;
+
+
+		// Strict checking disabled?
+		if(!self::$strict_checking || !$strict) {
+			$hasPermission = DB::query("
+				SELECT COUNT(*) 
+				FROM Permission 
+				WHERE (
+					(Code IN '$SQL_code')' 
+					AND (Type = " . self::GRANT_PERMISSION . ")
+				)
+			")->value();
+			
+			if(!$hasPermission) return true;
+		}
+
+		return false;
 	}