From 33d8eacfe426af2b53cd2aec95a85082d9c00d40 Mon Sep 17 00:00:00 2001
From: exe-cutor <exe-cutor>
Date: Thu, 16 Feb 2006 09:05:11 +0000
Subject: [PATCH] Changed sequence of error messages. This makes more sense and
 should be better understandable from a user's point of view.

---
 auth/shibboleth/lib.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/auth/shibboleth/lib.php b/auth/shibboleth/lib.php
index 4a1ab72e56b..862e10415c8 100755
--- a/auth/shibboleth/lib.php
+++ b/auth/shibboleth/lib.php
@@ -11,15 +11,15 @@ function auth_user_login($username, $password) {
 /// If we are in the shibboleth directory then we trust the server var
     if (!empty($_SERVER[$pluginconfig->shib_user_attribute])) {
         return ($_SERVER[$pluginconfig->shib_user_attribute] == $username);
-    }    
-
-/// If we are not, then the server is probably set to not be Shibboleth-only
-/// and the user has used the normal login screen, so we redirect to the shibboleth
-/// directory for a proper check
-    redirect($CFG->wwwroot.'/auth/shibboleth/index.php');
-
-/// There's no point doing anything further here
-    exit;
+    } else {
+    /// If we are not, then the server is probably set to not be Shibboleth-only
+    /// and the user has used the normal login screen, so we redirect to the shibboleth
+    /// directory for a proper check
+        redirect($CFG->wwwroot.'/auth/shibboleth/index.php');
+    
+    /// There's no point doing anything further here
+        exit;
+    }
 }
 
 function auth_get_userinfo($username) {