Change all code in the repository to use the new admin helper functions.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1467 44740490-163a-0410-bde0-09ae8108e29a

modules/cron/www/croninfo.php

@@ -11,11 +11,7 @@ require_once('_include.php');
 $config = SimpleSAML_Configuration::getInstance();
 $session = SimpleSAML_Session::getInstance();
 
-if (!isset($session) || !$session->isValid('login-admin') ) {
-	SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-		array('RelayState' => SimpleSAML_Utilities::selfURL())
-	);
-}
+SimpleSAML_Utilities::requireAdmin();
 
 $cronconfig = SimpleSAML_Configuration::getConfig('module_cron.php');
 

modules/ldapstatus/www/index.php

@@ -34,7 +34,7 @@ if (array_key_exists('orgtest', $_REQUEST)) {
 		if (isset($orgs[$_REQUEST['orgtest']]) && array_key_exists('adminAccess', $orgs[$_REQUEST['orgtest']]))
 			$allowedusers = array_merge($allowedusers, $orgs[$_REQUEST['orgtest']]['adminAccess']);
 	
-		if ($session->isValid('login-admin') ) {
+		if (SimpleSAML_Utilities::isAdmin()) {
 			// User logged in as admin. OK.
 			SimpleSAML_Logger::debug('LDAPStatus auth - logged in as admin, access granted');
 			
@@ -64,9 +64,7 @@ if (array_key_exists('orgtest', $_REQUEST)) {
 			
 		} else {
 			// If authsource is not defined, init admin login.
-			SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-				array('RelayState' => SimpleSAML_Utilities::selfURL())
-			);
+			SimpleSAML_Utilities::requireAdmin();
 		}
 
 		
@@ -86,22 +84,14 @@ if (array_key_exists('orgtest', $_REQUEST)) {
 		
 		
 		
-// 		if (!$session->isValid('login-admin') ) {
-// 			SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-// 				array('RelayState' => SimpleSAML_Utilities::selfURL())
-// 			);
-// 		}
+// 		SimpleSAML_Utilities::requireAdmin();
 		$isAdmin = TRUE;
 	}
 
 } else {
 
 	// Require admin access to overview page...
-	if (!$session->isValid('login-admin') ) {
-		SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-			array('RelayState' => SimpleSAML_Utilities::selfURL())
-		);
-	}
+	SimpleSAML_Utilities::requireAdmin();
 	$isAdmin = TRUE;
 
 }

modules/logpeek/www/index.php

@@ -4,11 +4,7 @@
 $config = SimpleSAML_Configuration::getInstance();
 $session = SimpleSAML_Session::getInstance();
 
-if (!$session->isValid('login-admin') ) {
-	SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-		array('RelayState' => SimpleSAML_Utilities::selfURL())
-	);
-}
+SimpleSAML_Utilities::requireAdmin();
 
 
 $logpeekconfig = SimpleSAML_Configuration::getConfig('module_logpeek.php');

modules/memcacheMonitor/www/memcachestat.php

@@ -78,11 +78,7 @@ try {
 	$session = SimpleSAML_Session::getInstance();
 
 	/* Make sure that the user has admin access rights. */
-	if (!isset($session) || !$session->isValid('login-admin') ) {
-		SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-		                               array('RelayState' => SimpleSAML_Utilities::selfURL())
-		                               );
-	}
+	SimpleSAML_Utilities::requireAdmin();
 
 
 	$formats = array(

modules/statistics/www/showstats.php

@@ -12,7 +12,7 @@ $useridattr = $statconfig->getString('useridattr', 'eduPersonPrincipalName');
 
 if ($protected) {
 
-	if ($session->isValid('login-admin') ) {
+	if (SimpleSAML_Utilities::isAdmin()) {
 		// User logged in as admin. OK.
 		SimpleSAML_Logger::debug('Statistics auth - logged in as admin, access granted');
 		
@@ -41,9 +41,7 @@ if ($protected) {
 		
 	} else {
 		// If authsource is not defined, init admin login.
-		SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-			array('RelayState' => SimpleSAML_Utilities::selfURL())
-		);
+		SimpleSAML_Utilities::requireAdmin();
 	}
 }
 

www/admin/config.php

@@ -152,11 +152,7 @@ $config = SimpleSAML_Configuration::getInstance();
 $session = SimpleSAML_Session::getInstance();
 
 /* Check if the user is logged in with admin access. */
-if (!$session->isValid('login-admin') ) {
-	SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-		array('RelayState' => SimpleSAML_Utilities::selfURL())
-	);
-}
+SimpleSAML_Utilities::requireAdmin();
 
 /* Find config directories. */
 $configDir = $config->getBaseDir() . 'config/';

www/admin/metadata.php

@@ -8,11 +8,7 @@ $session = SimpleSAML_Session::getInstance();
 
 
 /* Check if valid local session exists.. */
-if (!isset($session) || !$session->isValid('login-admin') ) {
-	SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-		array('RelayState' => SimpleSAML_Utilities::selfURL())
-	);
-}
+SimpleSAML_Utilities::requireAdmin();
 
 
 try {

www/admin/phpinfo.php

@@ -8,11 +8,7 @@ try {
 	$session = SimpleSAML_Session::getInstance();
 
 	/* Make sure that the user has admin access rights. */
-	if (!isset($session) || !$session->isValid('login-admin') ) {
-		SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-		                               array('RelayState' => SimpleSAML_Utilities::selfURL())
-		                               );
-	}
+	SimpleSAML_Utilities::requireAdmin();
 	phpinfo();
 
 } catch(Exception $e) {

www/example-simple/hostnames.php

@@ -7,11 +7,7 @@ $config = SimpleSAML_Configuration::getInstance();
 $session = SimpleSAML_Session::getInstance();
 
 /* Check if valid local session exists.. */
-if (!isset($session) || !$session->isValid('login-admin') ) {
-	SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-		array('RelayState' => SimpleSAML_Utilities::selfURL())
-	);
-}
+SimpleSAML_Utilities::requireAdmin();
 
 
 

www/index.php

@@ -8,14 +8,10 @@ $session = SimpleSAML_Session::getInstance();
 
 /* Check if valid local session exists.. */
 if ($config->getValue('admin.protectindexpage', false)) {
-	if (!isset($session) || !$session->isValid('login-admin') ) {
-		SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-			array('RelayState' => SimpleSAML_Utilities::selfURL())
-		);
-	}
+	SimpleSAML_Utilities::requireAdmin();
 }
-$loginurl = '/' . $config->getBaseURL() . 'auth/login-admin.php?RelayState=' . SimpleSAML_Utilities::selfURL();
-$isadmin = $session->isValid('login-admin');
+$loginurl = SimpleSAML_Utilities::getAdminLoginURL();
+$isadmin = SimpleSAML_Utilities::isAdmin();
 
 
 $warnings = array();

www/saml2/idp/metadata.php

@@ -12,11 +12,7 @@ if (!$config->getValue('enable.saml20-idp', false))
 
 /* Check if valid local session exists.. */
 if ($config->getValue('admin.protectmetadata', false)) {
-	if (!isset($session) || !$session->isValid('login-admin') ) {
-		SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-			array('RelayState' => SimpleSAML_Utilities::selfURL())
-		);
-	}
+	SimpleSAML_Utilities::requireAdmin();
 }
 
 

www/saml2/sp/metadata.php

@@ -13,11 +13,7 @@ if (!$config->getValue('enable.saml20-sp', false))
 
 /* Check if valid local session exists.. */
 if ($config->getValue('admin.protectmetadata', false)) {
-	if (!isset($session) || !$session->isValid('login-admin') ) {
-		SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-			array('RelayState' => SimpleSAML_Utilities::selfURL())
-		);
-	}
+	SimpleSAML_Utilities::requireAdmin();
 }
 
 try {
@@ -79,16 +75,12 @@ try {
 	}
 	
 	
-	$adminok = (isset($session) && $session->isValid('login-admin') );
-	$adminlogin = SimpleSAML_Utilities::addURLparameter(
-		'/' . $config->getBaseURL() . 'auth/login-admin.php', 
-		array('RelayState' => 
-			SimpleSAML_Utilities::addURLParameter(
-				SimpleSAML_Utilities::selfURLNoQuery(),
-				array('output' => 'xhtml')
-			)
-		)
-	);
+	$adminok = SimpleSAML_Utilities::isAdmin();
+	$adminlogin = SimpleSAML_Utilities::getAdminLoginURL(
+		SimpleSAML_Utilities::addURLParameter(
+			SimpleSAML_Utilities::selfURLNoQuery(),
+			array('output' => 'xhtml')
+		));
 	
 
 	$sentok = FALSE;

www/shib13/idp/metadata.php

@@ -12,11 +12,7 @@ if (!$config->getValue('enable.shib13-idp', false))
 
 /* Check if valid local session exists.. */
 if ($config->getValue('admin.protectmetadata', false)) {
-	if (!isset($session) || !$session->isValid('login-admin') ) {
-		SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-			array('RelayState' => SimpleSAML_Utilities::selfURL())
-		);
-	}
+	SimpleSAML_Utilities::requireAdmin();
 }
 
 

www/shib13/sp/metadata.php

@@ -13,11 +13,7 @@ if (!$config->getValue('enable.shib13-sp', false))
 
 /* Check if valid local session exists.. */
 if ($config->getValue('admin.protectmetadata', false)) {
-	if (!isset($session) || !$session->isValid('login-admin') ) {
-		SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-			array('RelayState' => SimpleSAML_Utilities::selfURL())
-		);
-	}
+	SimpleSAML_Utilities::requireAdmin();
 }