Revision: 2001
Author: olavmrk
Date: Wed Nov 18 00:15:52 2009
Log: UserPass(Org)Base: Add support for presetting the username and
organization.
http://code.google.com/p/simplesamlphp/source/detail?r=2001
Modified:
/trunk/modules/core/www/loginuserpass.php
/trunk/modules/core/www/loginuserpassorg.php
=======================================
--- /trunk/modules/core/www/loginuserpass.php Wed Apr 22 00:02:13 2009
+++ /trunk/modules/core/www/loginuserpass.php Wed Nov 18 00:15:52 2009
@@ -20,6 +20,8 @@
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 @@
$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)) {
=======================================
--- /trunk/modules/core/www/loginuserpassorg.php Tue May 5 00:30:23 2009
+++ /trunk/modules/core/www/loginuserpassorg.php Wed Nov 18 00:15:52 2009
@@ -18,6 +18,8 @@
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('organization', $_REQUEST)) {
$organization = $_REQUEST['organization'];
+} elseif (isset($state['core:organization'])) {
+ $organization = (string)$state['core:organization'];
} else {
$organization = '';
}
--
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to [email protected].
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=.
