Move SimpleSAML_Utilities::isAdmin() to SimpleSAML_Utils_Auth::isAdmin()....

Move SimpleSAML_Utilities::isAdmin() to SimpleSAML_Utils_Auth::isAdmin(). Deprecate the former and stop using it.

lib/SimpleSAML/Utilities.php

@@ -1335,15 +1335,10 @@ class SimpleSAML_Utilities {
 
 
 	/**
-	 * Check whether the current user is a admin user.
-	 *
-	 * @return bool  TRUE if the current user is a admin user, FALSE if not.
+	 * @deprecated This function will be removed in SSP 2.0. Please use SimpleSAML_Utils_Auth::isAdmin() instead.
 	 */
 	public static function isAdmin() {
-
-		$session = SimpleSAML_Session::getSessionFromRequest();
-
-		return $session->isValid('admin') || $session->isValid('login-admin');
+		return SimpleSAML_Utils_Auth::isAdmin();
 	}
 
 
@@ -1372,7 +1367,7 @@ class SimpleSAML_Utilities {
 	 */
 	public static function requireAdmin() {
 
-		if (self::isAdmin()) {
+		if (SimpleSAML_Utils_Auth::isAdmin()) {
 			return;
 		}
 

lib/SimpleSAML/Utils/Auth.php

+<?php
+
+
+/**
+ * Auth-related utility methods.
+ *
+ * @package SimpleSAMLphp
+ */
+class SimpleSAML_Utils_Auth
+{
+
+    /**
+     * Check whether the current user is admin.
+     *
+     * @return boolean True if the current user is an admin user, false otherwise.
+     *
+     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
+     */
+    public static function isAdmin()
+    {
+        $session = SimpleSAML_Session::getSessionFromRequest();
+        return $session->isValid('admin') || $session->isValid('login-admin');
+    }
+}
\ No newline at end of file

modules/core/www/frontpage_auth.php

@@ -10,7 +10,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
 	SimpleSAML_Utilities::requireAdmin();
 }
 $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
-$isadmin = SimpleSAML_Utilities::isAdmin();
+$isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
 

modules/core/www/frontpage_config.php

@@ -11,7 +11,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
 	SimpleSAML_Utilities::requireAdmin();
 }
 $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
-$isadmin = SimpleSAML_Utilities::isAdmin();
+$isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
 $warnings = array();

modules/core/www/frontpage_federation.php

@@ -11,7 +11,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
 	SimpleSAML_Utilities::requireAdmin();
 }
 $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
-$isadmin = SimpleSAML_Utilities::isAdmin();
+$isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
 

modules/core/www/frontpage_welcome.php

@@ -10,7 +10,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
 	SimpleSAML_Utilities::requireAdmin();
 }
 $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
-$isadmin = SimpleSAML_Utilities::isAdmin();
+$isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
 

modules/statistics/lib/AccessCheck.php

@@ -28,7 +28,7 @@ class sspmod_statistics_AccessCheck {
 			return;
 		}
 
-		if (SimpleSAML_Utilities::isAdmin()) {
+		if (SimpleSAML_Utils_Auth::isAdmin()) {
 			// User logged in as admin. OK.
 			SimpleSAML_Logger::debug('Statistics auth - logged in as admin, access granted');
 			return;