Permalink
Browse files

Extended and corrected the error messages

  • Loading branch information...
1 parent 3e82613 commit bab8ceb10e7aaf8c3cf4606ddb36425895c0569a exe-cutor committed May 6, 2005
Showing with 3 additions and 4 deletions.
  1. +3 −4 auth/shibboleth/index.php
@@ -12,22 +12,21 @@
if ($CFG->auth == 'shibboleth' and !empty($CFG->auth_shib_only)) {
if (empty($CFG->shib_user_attribute)) {
- error('Shibboleth authentication (shib_user_attribute) is not set up correctly');
+ error('Shibboleth authentication (\'shib_user_attribute\') is not set up correctly. You probably haven\'t yet configured the Shibboleth authentication. Please consult the README in moodle/auth/shibboleth for further instructions on how to set up Shibboleth authentication.');
}
if (empty($_SERVER[$CFG->shib_user_attribute])) {
- error('Shibboleth authentication is not set up correctly (could not find $_SERVER[\''.$CFG->shib_user_attribute.'\'])');
+ error('Shibboleth authentication is not set up correctly (could not find $_SERVER[\''.$CFG->shib_user_attribute.'\']) or your moodle/auth/shibboleth/index.php is not protected by Shibboleth. Please consult the README in moodle/auth/shibboleth for further instructions on how to set up Shibboleth authentication.');
}
}
-/// If we can find some Shibboleth information, save it in session and return to main login page
+/// If we can find the Shibboleth attribute, save it in session and return to main login page
if (!empty($_SERVER[$CFG->shib_user_attribute])) { // Shibboleth auto-login
$frm->username = $_SERVER[$CFG->shib_user_attribute];
$frm->password = substr(base64_encode($_SERVER[$CFG->shib_user_attribute]),0,8);
// The random password consists of the first 8 letters of the base 64 encoded user ID
// This password is never used unless the user account is converted to manual
-
/// Check if the user has actually submitted login data to us
if ($user = authenticate_user_login($frm->username, $frm->password)) {

0 comments on commit bab8ceb

Please sign in to comment.