Assorted fixes

modules/authYubiKey/www/yubikeylogin.php

@@ -15,14 +15,8 @@ if (!array_key_exists('AuthState', $_REQUEST)) {
 $authStateId = $_REQUEST['AuthState'];
 
 if (array_key_exists('otp', $_REQUEST)) {
-    $otp = $_REQUEST['otp'];
-} else {
-    $otp = '';
-}
-
-if (!empty($otp)) {
     // attempt to log in
-    $errorCode = \SimpleSAML\Module\authYubiKey\Auth\Source\YubiKey::handleLogin($authStateId, $otp);
+    $errorCode = \SimpleSAML\Module\authYubiKey\Auth\Source\YubiKey::handleLogin($authStateId, $_REQUEST['otp']);
 } else {
     $errorCode = null;
 }

modules/core/www/loginuserpass.php

@@ -11,85 +11,87 @@
 
 // Retrieve the authentication state
 if (!array_key_exists('AuthState', $_REQUEST)) {
-	throw new \SimpleSAML\Error\BadRequest('Missing AuthState parameter.');
+    throw new \SimpleSAML\Error\BadRequest('Missing AuthState parameter.');
 }
 $authStateId = $_REQUEST['AuthState'];
 $state = \SimpleSAML\Auth\State::loadState($authStateId, \SimpleSAML\Module\core\Auth\UserPassBase::STAGEID);
 
 $source = \SimpleSAML\Auth\Source::getById($state[\SimpleSAML\Module\core\Auth\UserPassBase::AUTHID]);
-if ($source === NULL) {
-	throw new \Exception('Could not find authentication source with id ' . $state[\SimpleSAML\Module\core\Auth\UserPassBase::AUTHID]);
+if ($source === null) {
+    throw new \Exception('Could not find authentication source with id '.$state[\SimpleSAML\Module\core\Auth\UserPassBase::AUTHID]);
 }
 
 
 if (array_key_exists('username', $_REQUEST)) {
-	$username = $_REQUEST['username'];
-} elseif ($source->getRememberUsernameEnabled() && array_key_exists($source->getAuthId() . '-username', $_COOKIE)) {
-	$username = $_COOKIE[$source->getAuthId() . '-username'];
+    $username = $_REQUEST['username'];
+} elseif ($source->getRememberUsernameEnabled() && array_key_exists($source->getAuthId().'-username', $_COOKIE)) {
+    $username = $_COOKIE[$source->getAuthId().'-username'];
 } elseif (isset($state['core:username'])) {
-	$username = (string)$state['core:username'];
+    $username = (string) $state['core:username'];
 } else {
-	$username = '';
+    $username = '';
 }
 
 if (array_key_exists('password', $_REQUEST)) {
-	$password = $_REQUEST['password'];
+    $password = $_REQUEST['password'];
 } else {
-	$password = '';
+    $password = '';
 }
 
-$errorCode = NULL;
-$errorParams = NULL;
+$errorCode = null;
+$errorParams = null;
 
 if (!empty($_REQUEST['username']) || !empty($password)) {
-	// Either username or password set - attempt to log in
+    // Either username or password set - attempt to log in
 
-	if (array_key_exists('forcedUsername', $state)) {
-		$username = $state['forcedUsername'];
-	}
+    if (array_key_exists('forcedUsername', $state)) {
+        $username = $state['forcedUsername'];
+    }
 
-	if ($source->getRememberUsernameEnabled()) {
-		$sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();
-		$params = $sessionHandler->getCookieParams();
-		$params['expire'] = time();
-		$params['expire'] += (isset($_REQUEST['remember_username']) && $_REQUEST['remember_username'] == 'Yes' ? 31536000 : -300);
-        \SimpleSAML\Utils\HTTP::setCookie($source->getAuthId() . '-username', $username, $params, FALSE);
-	}
+    if ($source->getRememberUsernameEnabled()) {
+        $sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();
+        $params = $sessionHandler->getCookieParams();
+        $params['expire'] = time();
+        $params['expire'] += (isset($_REQUEST['remember_username']) && $_REQUEST['remember_username'] == 'Yes' ? 31536000 : -300);
+        \SimpleSAML\Utils\HTTP::setCookie($source->getAuthId().'-username', $username, $params, false);
+    }
 
     if ($source->isRememberMeEnabled()) {
         if (array_key_exists('remember_me', $_REQUEST) && $_REQUEST['remember_me'] === 'Yes') {
-            $state['RememberMe'] = TRUE;
+            $state['RememberMe'] = true;
             $authStateId = \SimpleSAML\Auth\State::saveState($state, \SimpleSAML\Module\core\Auth\UserPassBase::STAGEID);
         }
     }
 
-	try {
-		\SimpleSAML\Module\core\Auth\UserPassBase::handleLogin($authStateId, $username, $password);
-	} catch (\SimpleSAML\Error\Error $e) {
-		/* Login failed. Extract error code and parameters, to display the error. */
-		$errorCode = $e->getErrorCode();
-		$errorParams = $e->getParameters();
-	}
+    try {
+        \SimpleSAML\Module\core\Auth\UserPassBase::handleLogin($authStateId, $username, $password);
+    } catch (\SimpleSAML\Error\Error $e) {
+        /* Login failed. Extract error code and parameters, to display the error. */
+        $errorCode = $e->getErrorCode();
+        $errorParams = $e->getParameters();
+    }
 }
 
 $globalConfig = \SimpleSAML\Configuration::getInstance();
 $t = new \SimpleSAML\XHTML\Template($globalConfig, 'core:loginuserpass.php');
 $t->data['stateparams'] = array('AuthState' => $authStateId);
 if (array_key_exists('forcedUsername', $state)) {
-	$t->data['username'] = $state['forcedUsername'];
-	$t->data['forceUsername'] = TRUE;
-	$t->data['rememberUsernameEnabled'] = FALSE;
-	$t->data['rememberUsernameChecked'] = FALSE;
+    $t->data['username'] = $state['forcedUsername'];
+    $t->data['forceUsername'] = true;
+    $t->data['rememberUsernameEnabled'] = false;
+    $t->data['rememberUsernameChecked'] = false;
     $t->data['rememberMeEnabled'] = $source->isRememberMeEnabled();
     $t->data['rememberMeChecked'] = $source->isRememberMeChecked();
 } else {
-	$t->data['username'] = $username;
-	$t->data['forceUsername'] = FALSE;
-	$t->data['rememberUsernameEnabled'] = $source->getRememberUsernameEnabled();
-	$t->data['rememberUsernameChecked'] = $source->getRememberUsernameChecked();
+    $t->data['username'] = $username;
+    $t->data['forceUsername'] = false;
+    $t->data['rememberUsernameEnabled'] = $source->getRememberUsernameEnabled();
+    $t->data['rememberUsernameChecked'] = $source->getRememberUsernameChecked();
     $t->data['rememberMeEnabled'] = $source->isRememberMeEnabled();
     $t->data['rememberMeChecked'] = $source->isRememberMeChecked();
-	if (isset($_COOKIE[$source->getAuthId() . '-username'])) $t->data['rememberUsernameChecked'] = TRUE;
+    if (isset($_COOKIE[$source->getAuthId().'-username'])) {
+        $t->data['rememberUsernameChecked'] = true;
+    }
 }
 $t->data['links'] = $source->getLoginLinks();
 $t->data['errorcode'] = $errorCode;
@@ -97,11 +99,10 @@ $t->data['errorcodes'] = SimpleSAML\Error\ErrorCodes::getAllErrorCodeMessages();
 $t->data['errorparams'] = $errorParams;
 
 if (isset($state['SPMetadata'])) {
-	$t->data['SPMetadata'] = $state['SPMetadata'];
+    $t->data['SPMetadata'] = $state['SPMetadata'];
 } else {
-	$t->data['SPMetadata'] = NULL;
+    $t->data['SPMetadata'] = null;
 }
 
 $t->show();
 exit();
-

modules/core/www/loginuserpassorg.php

@@ -52,7 +52,7 @@ if (array_key_exists('organization', $_REQUEST)) {
 $errorCode = null;
 $errorParams = null;
 if ($organizations === null || !empty($organization)) {
-    if (!empty($username) && !empty($password)) {
+    if (!empty($username) || !empty($password)) {
 
         if ($source->getRememberUsernameEnabled()) {
             $sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();

modules/discopower/www/style.css

@@ -2,75 +2,72 @@
 
 }
 .inlinesearch {
-	float: right;
-	margin: 0em 3px .5em 1em;
+    float: right;
+    margin: 0em 3px .5em 1em;
 	
-/*	padding: .3em;*/
+/*  padding: .3em;*/
 }
 .inlinesearch p {
-	font-size: 94%;
-	color: #aaa;
+    font-size: 94%;
+    color: #aaa;
 
 }
 .inlinesearch input {
-	background-image:url('../../resources/icons/silk/magnifier.png');
-	background-repeat:no-repeat;
-	background-position:center left;
-	border: 1px solid #ccc;
-	padding: 2px 2px 2px 20px;
-	margin: 0px 2px 0px 0px;
+    background-image:url('../../resources/icons/silk/magnifier.png');
+    background-repeat:no-repeat;
+    background-position:center left;
+    border: 1px solid #ccc;
+    padding: 2px 2px 2px 20px;
+    margin: 0px 2px 0px 0px;
 }
 .inlinesearch * {
-	margin: 0px; 
-	padding: 0px;
+    margin: 0px; 
+    padding: 0px;
 }
 div.metalist {
-	clear: both;
-	list-style: none;
-	margin: 1em 2px .5em 2px;
-	padding: 0px;
+    clear: both;
+    list-style: none;
+    margin: 1em 2px .5em 2px;
+    padding: 0px;
 }
 a.metaentry {
-	display: block;
-	border: 1px solid #ccc;
-	margin: 0px 0px -1px 0px;
-	padding: .2em 1em .2em 20px;
-	cursor: pointer;
-	cursor: hand;
+    display: block;
+    border: 1px solid #ccc;
+    margin: 0px 0px -1px 0px;
+    padding: .2em 1em .2em 20px;
+    cursor: pointer;
+    cursor: hand;
 }
 a.metaentry.favourite {
-	background-image:url('../../resources/icons/silk/heart.png');
-	background-repeat:no-repeat;
-	background-position:center left;
+    background-image:url('../../resources/icons/silk/heart.png');
+    background-repeat:no-repeat;
+    background-position:center left;
 
 }
 a.metaentry:hover {
-	border: 1px solid #ccc;
-	background: #eee;
-
-	background-image:url('../../resources/icons/silk/star.png');
-	background-repeat:no-repeat;
-	background-position:center left;
+    border: 1px solid #ccc;
+    background: #eee;
+    background-image:url('../../resources/icons/silk/star.png');
+    background-repeat:no-repeat;
+    background-position:center left;
 }
 a.metaentry img.entryicon {
-	display: none;
+    display: none;
 }
 a.metaentry:hover img.entryicon {
-	display: inline;
-	top: 0px;
-	bottom: 0px;
-	clear: both; 
-	float: right; 
-	margin: 1em; 
-	padding: 3px; 
-	border: 1px solid #999;
+    display: inline;
+    top: 0px;
+    bottom: 0px;
+    clear: both; 
+    float: right; 
+    margin: 1em; 
+    padding: 3px; 
+    border: 1px solid #999;
 }
 
 div.favourite {
-
-	margin: 1em 0px;
-	padding: 1em;
-	border: 1px solid #ccc;
-	background-color: #eee;
-
+    margin: 1em 0px;
+    padding: 1em;
+    border: 1px solid #ccc;
+    background-color: #eee;
 }

modules/memcacheMonitor/www/memcachestat.php

 <?php
 
-function tdate($input) {
-	return date(DATE_RFC822, $input); 
+function tdate($input)
+{
+    return date(DATE_RFC822, $input); 
 }
 
-function hours($input) {
-	if ($input < 60) return number_format($input, 2) . ' sec';
-	if ($input < 60*60) return number_format(($input/60),2) . ' min';
-	if ($input < 24*60*60) return number_format(($input/(60*60)),2) . ' hours';
-	return number_format($input/(24*60*60),2) . ' days';
-	
+function hours($input)
+{
+    if ($input < 60) {
+        return number_format($input, 2).' sec';
+    }
+    if ($input < 60 * 60) {
+        return number_format(($input / 60), 2).' min';
+    }
+    if ($input < 24 * 60 * 60) {
+        return number_format(($input / (60 * 60)), 2).' hours';
+    }
+    return number_format($input / (24 * 60 * 60), 2).' days';
 }
 
-function humanreadable($input) {
-	$output = "";
-	$input = abs($input);
+function humanreadable($input)
+{
+    $output = "";
+    $input = abs($input);
 	
-	if ($input >= (1024*1024*1024*1024*1024*1024*1024*100)) {
-		$output = sprintf("%5ldEi", $input / (1024*1024*1024*1024*1024*1024) );		
-	} else if ($input >= (1024*1024*1024*1024*1024*1024*10)) {
-		$output = sprintf("%5.1fEi", $input / (1024.0*1024.0*1024.0*1024.0*1024.0*1024.0) );		
-	} else if ($input >= (1024*1024*1024*1024*1024*1024)) {
-		$output = sprintf("%5.2fEi", $input / (1024.0*1024.0*1024.0*1024.0*1024.0*1024.0) );	
-
-
-	} else if ($input >= (1024*1024*1024*1024*1024*100)) {
-		$output = sprintf("%5ldPi", $input / (1024*1024*1024*1024*1024) );		
-	} else if ($input >= (1024*1024*1024*1024*1024*10)) {
-		$output = sprintf("%5.1fPi", $input / (1024.0*1024.0*1024.0*1024.0*1024.0) );		
-	} else if ($input >= (1024*1024*1024*1024*1024)) {
-		$output = sprintf("%5.2fPi", $input / (1024.0*1024.0*1024.0*1024.0*1024.0) );	
-		
-	} else if ($input >= (1024*1024*1024*1024*100)) {
-		$output = sprintf("%5ldTi", $input / (1024*1024*1024*1024) );
-	} else if ($input >= (1024*1024*1024*1024*10)) {
-		$output = sprintf("%5.1fTi", $input / (1024.0*1024.0*1024.0*1024.0) );	
-	} else if ($input >= (1024*1024*1024*1024)) {
-		$output = sprintf("%5.2fTi", $input / (1024.0*1024.0*1024.0*1024.0) );
-
-
-	} else if ($input >= (1024*1024*1024*100)) {
-		$output = sprintf("%5ldGi", $input / (1024*1024*1024) );		
-	} else if ($input >= (1024*1024*1024*10)) {
-		$output = sprintf("%5.1fGi", $input / (1024.0*1024.0*1024.0) );		
-	} else if ($input >= (1024*1024*1024)) {
-		$output = sprintf("%5.2fGi", $input / (1024.0*1024.0*1024.0) );	
-		
-	} else if ($input >= (1024*1024*100)) {
-		$output = sprintf("%5ldMi", $input / (1024*1024) );
-	} else if ($input >= (1024*1024*10)) {
-		$output = sprintf("%5.1fM", $input / (1024.0*1024.0) );	
-	} else if ($input >= (1024*1024)) {
-		$output = sprintf("%5.2fMi", $input / (1024.0*1024.0) );		
-		
-	} else if ($input >= (1024 * 100)) {
-		$output = sprintf("%5ldKi", $input / (1024) );
-	} else if ($input >= (1024 * 10)) {
-		$output = sprintf("%5.1fKi", $input / 1024.0 );
-	} else if ($input >= (1024)) {
-		$output = sprintf("%5.2fKi", $input / 1024.0 );
-		
-	} else {
-		$output = sprintf("%5ld", $input );
-	}
-
-	return $output;
+    if ($input >= (1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 100)) {
+        $output = sprintf("%5ldEi", $input / (1024 * 1024 * 1024 * 1024 * 1024 * 1024));		
+    } else if ($input >= (1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 10)) {
+        $output = sprintf("%5.1fEi", $input / (1024.0 * 1024.0 * 1024.0 * 1024.0 * 1024.0 * 1024.0));		
+    } else if ($input >= (1024 * 1024 * 1024 * 1024 * 1024 * 1024)) {
+        $output = sprintf("%5.2fEi", $input / (1024.0 * 1024.0 * 1024.0 * 1024.0 * 1024.0 * 1024.0));	
+    } else if ($input >= (1024 * 1024 * 1024 * 1024 * 1024 * 100)) {
+        $output = sprintf("%5ldPi", $input / (1024 * 1024 * 1024 * 1024 * 1024));		
+    } else if ($input >= (1024 * 1024 * 1024 * 1024 * 1024 * 10)) {
+        $output = sprintf("%5.1fPi", $input / (1024.0 * 1024.0 * 1024.0 * 1024.0 * 1024.0));		
+    } else if ($input >= (1024 * 1024 * 1024 * 1024 * 1024)) {
+        $output = sprintf("%5.2fPi", $input / (1024.0 * 1024.0 * 1024.0 * 1024.0 * 1024.0));	
+    } else if ($input >= (1024 * 1024 * 1024 * 1024 * 100)) {
+        $output = sprintf("%5ldTi", $input / (1024 * 1024 * 1024 * 1024));
+    } else if ($input >= (1024 * 1024 * 1024 * 1024 * 10)) {
+        $output = sprintf("%5.1fTi", $input / (1024.0 * 1024.0 * 1024.0 * 1024.0));	
+    } else if ($input >= (1024 * 1024 * 1024 * 1024)) {
+        $output = sprintf("%5.2fTi", $input / (1024.0 * 1024.0 * 1024.0 * 1024.0));
+    } else if ($input >= (1024 * 1024 * 1024 * 100)) {
+        $output = sprintf("%5ldGi", $input / (1024 * 1024 * 1024));		
+    } else if ($input >= (1024 * 1024 * 1024 * 10)) {
+        $output = sprintf("%5.1fGi", $input / (1024.0 * 1024.0 * 1024.0));		
+    } else if ($input >= (1024 * 1024 * 1024)) {
+        $output = sprintf("%5.2fGi", $input / (1024.0 * 1024.0 * 1024.0));	
+    } else if ($input >= (1024 * 1024 * 100)) {
+        $output = sprintf("%5ldMi", $input / (1024 * 1024));
+    } else if ($input >= (1024 * 1024 * 10)) {
+        $output = sprintf("%5.1fM", $input / (1024.0 * 1024.0));	
+    } else if ($input >= (1024 * 1024)) {
+        $output = sprintf("%5.2fMi", $input / (1024.0 * 1024.0));		
+    } else if ($input >= (1024 * 100)) {
+        $output = sprintf("%5ldKi", $input / 1024);
+    } else if ($input >= (1024 * 10)) {
+        $output = sprintf("%5.1fKi", $input / 1024.0);
+    } else if ($input >= (1024)) {
+        $output = sprintf("%5.2fKi", $input / 1024.0);
+    } else {
+        $output = sprintf("%5ld", $input);
+    }
+
+    return $output;
 }
 
 $config = \SimpleSAML\Configuration::getInstance();
@@ -73,26 +73,25 @@ $config = \SimpleSAML\Configuration::getInstance();
 \SimpleSAML\Utils\Auth::requireAdmin();
 
 $formats = array(
-	'bytes' => 'humanreadable',
-	'bytes_read' => 'humanreadable',
-	'bytes_written' => 'humanreadable',
-	'limit_maxbytes' => 'humanreadable',
-	'time' => 'tdate',
-	'uptime' => 'hours',
+    'bytes' => 'humanreadable',
+    'bytes_read' => 'humanreadable',
+    'bytes_written' => 'humanreadable',
+    'limit_maxbytes' => 'humanreadable',
+    'time' => 'tdate',
+    'uptime' => 'hours',
 );
 
 $statsraw = \SimpleSAML\Memcache::getStats();
 
 $stats = $statsraw;
 
-foreach($stats AS $key => &$entry) {
-	if (array_key_exists($key, $formats)) {
-		$func = $formats[$key];
-		foreach($entry AS $k => $val) {
-			$entry[$k] = $func($val);
-		}
-	}
-
+foreach ($stats as $key => &$entry) {
+    if (array_key_exists($key, $formats)) {
+        $func = $formats[$key];
+        foreach ($entry as $k => $val) {
+            $entry[$k] = $func($val);
+        }
+    }
 }
 
 $t = new \SimpleSAML\XHTML\Template($config, 'memcacheMonitor:memcachestat.tpl.php');

modules/oauth/config-template/module_oauth.php

@@ -22,3 +22,4 @@ $config = array(
     'auth' => 'default-sp',
     'useridattr', 'user',
 );
+

modules/oauth/hooks/hook_cron.php

@@ -31,3 +31,4 @@ function oauth_hook_cron(&$croninfo)
         $croninfo['summary'][] = $message;
     }
 }
+

modules/statistics/lib/Statistics/FieldPresentation/Entity.php

@@ -13,7 +13,7 @@ class Entity extends Base
         foreach ($this->fields as $field) {
             if (array_key_exists($field, $metadata)) {
                 if (array_key_exists('name', $metadata[$field])) {
-                    $translation[$field] = $this->template->t($metadata[$field]['name'], array(), false);
+                    $translation[$field] = $this->template->t($metadata[$field]['name']);
                 }
             }
         }