UserPass(Org)Base: Add support for presetting the username and organization.

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

modules/core/www/loginuserpass.php

@@ -20,6 +20,8 @@ $state = SimpleSAML_Auth_State::loadState($authStateId, sspmod_core_Auth_UserPas
 
 if (array_key_exists('username', $_REQUEST)) {
 	$username = $_REQUEST['username'];
+} elseif (isset($state['core:username'])) {
+	$username = (string)$state['core:username'];
 } else {
 	$username = '';
 }
@@ -30,7 +32,7 @@ if (array_key_exists('password', $_REQUEST)) {
 	$password = '';
 }
 
-if (!empty($username) || !empty($password)) {
+if (!empty($_REQUEST['username']) || !empty($password)) {
 	/* Either username or password set - attempt to log in. */
 
 	if (array_key_exists('forcedUsername', $state)) {

modules/core/www/loginuserpassorg.php

@@ -18,6 +18,8 @@ $organizations = sspmod_core_Auth_UserPassOrgBase::listOrganizations($authStateI
 
 if (array_key_exists('username', $_REQUEST)) {
 	$username = $_REQUEST['username'];
+} elseif (isset($state['core:username'])) {
+	$username = (string)$state['core:username'];
 } else {
 	$username = '';
 }
@@ -30,6 +32,8 @@ if (array_key_exists('password', $_REQUEST)) {
 
 if (array_key_exists('organization', $_REQUEST)) {
 	$organization = $_REQUEST['organization'];
+} elseif (isset($state['core:organization'])) {
+	$organization = (string)$state['core:organization'];
 } else {
 	$organization = '';
 }