Don't show logout reasons more than once if user was successfully deauthenticated

diff --git a/horde/login.php b/horde/login.php
index 913afc6..086bfb7 100644 (file)
--- a/horde/login.php
+++ b/horde/login.php
@@ -109,6 +109,19 @@ if ($vars->url) {
 if (!($logout_reason = $auth->getError())) {;
     $logout_reason = $vars->logout_reason;
 }
+
+switch ($logout_reason) {
+case Horde_Auth::REASON_SESSION:
+case Horde_Core_Auth_Application::REASON_SESSIONIP:
+case Horde_Core_Auth_Application::REASON_BROWSER:
+case Horde_Auth::REASON_LOGOUT:
+    /* Don't show these logout reasons more than once. */
+    if (!$is_auth) {
+        $logout_reason = null;
+    }
+    break;
+}
+
 if ($logout_reason) {
     if ($is_auth) {
         try {