From 5f88285363998fb004d40f538dc47b1f7e0a56c8 Mon Sep 17 00:00:00 2001
From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 27 Oct 2006 04:26:54 +0000
Subject: [PATCH] logout_error hook should be able to override login link too

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11939 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/display_messages.php     | 13 +++++++------
 templates/default/error_logout.tpl |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 07efba1c..e2f80b31 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -58,7 +58,13 @@ function logout_error( $errString, $errTitle = '' ) {
 
     $base_uri = sqm_baseuri();
 
-    list($junk, $errString, $errTitle) = do_hook('logout_error', $errString, $errTitle);
+    $login_link = array (
+                            'URI'   => $base_uri . 'src/login.php',
+                            'FRAME' => $frame_top
+                        );
+                        
+    list($junk, $errString, $errTitle, $login_link) 
+        = do_hook('logout_error', $errString, $errTitle, $login_link);
 
     if ( $errTitle == '' ) {
         $errTitle = $errString;
@@ -94,11 +100,6 @@ function logout_error( $errString, $errTitle = '' ) {
                             _("By the SquirrelMail Project Team")."<br />\n";
     }
 
-    $login_link = array (
-                            'URL'   => $base_uri . 'src/login.php',
-                            'FRAME' => $frame_top
-                        );
-                        
     $oTemplate->assign('logo_str', $logo_str);
     $oTemplate->assign('sm_attribute_str', $sm_attribute_str);
     $oTemplate->assign('login_link', $login_link);
diff --git a/templates/default/error_logout.tpl b/templates/default/error_logout.tpl
index 93abdae8..9ca0608b 100644
--- a/templates/default/error_logout.tpl
+++ b/templates/default/error_logout.tpl
@@ -11,7 +11,7 @@
  *                          if any
  *      $login_link   - Array containing details needed to generate link to login
  *                      page.  Elements are:
- *                          $login_link['URL']   - URL target for link
+ *                          $login_link['URI']   - URI target for link
  *                          $login_link['FRAME'] - Frame target for link
  *      $errorMessage - Translated string containing error message to be
  *                      displayed.
@@ -56,7 +56,7 @@ extract ($t);
     </tr>
     <tr>
      <td class="error_header">
-      <?php echo '<a href="'.$login_link['URL'].'" target="'.$login_link['FRAME'].'">'. _("Go to the login page") .'</a>'; ?>
+      <?php echo '<a href="'.$login_link['URI'].'" target="'.$login_link['FRAME'].'">'. _("Go to the login page") .'</a>'; ?>
      </td>
     </tr>
    </table>
@@ -64,4 +64,4 @@ extract ($t);
  </tr>
 </table>
 </div>
-</div>
\ No newline at end of file
+</div>
-- 
2.25.1