From a0806688f738897a0881d7ff31140d8feb748ee7 Mon Sep 17 00:00:00 2001 From: Guy Halse <guy@tenet.ac.za> Date: Wed, 12 Oct 2016 12:31:54 +0200 Subject: [PATCH] Fix a cosmetic exception when using loginuserpassorg.php When using ldap:LDAPMulti, SimpleSAMLphp generates an exception: SimpleSAML_Error_Exception: Error 8 - Undefined index: rememberMeEnabled Backtrace: 4 /srv/simplesamlphp-1.14.8/www/_include.php:83 (SimpleSAML_error_handler) 3 /srv/simplesamlphp-1.14.8/modules/core/templates/loginuserpass.php:107 (require) 2 /srv/simplesamlphp-1.14.8/lib/SimpleSAML/XHTML/Template.php:577 (SimpleSAML_XHTML_Template::show) 1 /srv/simplesamlphp-1.14.8/modules/core/www/loginuserpassorg.php:95 (require) 0 /srv/simplesamlphp-1.14.8/www/module.php:137 (N/A) This is because the loginuserpass.php template (which is used by both loginuserpass.php and loginuserpassorg.php) refers to $this->data['rememberMeEnabled'], but that variable is only defined when you make use of loginuserpass.php. Since these don't appear to be relevant to loginuserpassorg.php, this patch simply sets these to false (the default value), so that they're no longer undefined. --- modules/core/www/loginuserpassorg.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/core/www/loginuserpassorg.php b/modules/core/www/loginuserpassorg.php index 800a83a60..23db59831 100644 --- a/modules/core/www/loginuserpassorg.php +++ b/modules/core/www/loginuserpassorg.php @@ -77,6 +77,8 @@ $t->data['username'] = $username; $t->data['forceUsername'] = FALSE; $t->data['rememberUsernameEnabled'] = $source->getRememberUsernameEnabled(); $t->data['rememberUsernameChecked'] = $source->getRememberUsernameChecked(); +$t->data['rememberMeEnabled'] = false; +$t->data['rememberMeChecked'] = false; if (isset($_COOKIE[$source->getAuthId() . '-username'])) $t->data['rememberUsernameChecked'] = TRUE; $t->data['errorcode'] = $errorCode; $t->data['errorparams'] = $errorParams; -- GitLab