From: Jan <jan@horde.org>
Date: Mon, 5 Jul 2010 16:45:43 +0000 (+0100)
Subject: We only want to redirect to the alternate logout screen if this was an intended logout.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=70b4825ed77a6552531f3ebf3087239aeb8f55a1;p=horde.git

We only want to redirect to the alternate logout screen if this was an intended logout.
---

diff --git a/horde/login.php b/horde/login.php
index 72f537f4a..012d6e3ec 100644
--- a/horde/login.php
+++ b/horde/login.php
@@ -155,8 +155,10 @@ if ($error_reason) {
     Horde::logMessage($entry, 'NOTICE');
     $registry->clearAuth();
 
-    /* Redirect the user on logout if redirection is enabled. */
-    if (!empty($conf['auth']['redirect_on_logout'])) {
+    /* Redirect the user on logout if redirection is enabled and this is an
+     * an intended logout. */
+    if ($error_reason == Horde_Auth::REASON_LOGOUT &&
+        !empty($conf['auth']['redirect_on_logout'])) {
         $logout_url = new Horde_Url($conf['auth']['redirect_on_logout'], true);
         if (!isset($_COOKIE[session_name()])) {
             $logout_url->add(session_name(), session_id());