X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsignout.php;h=fca146a85f0bbddc300432a4a7786a6c9990d4d9;hb=28bfb4038865c04a9bfa07549e12d2bb97ec8a90;hp=94f287625d55ea3e6fd001655825a7ed507c2e85;hpb=d68323ff96429e9d788a5144aaf8aa1afffc494c;p=squirrelmail.git

diff --git a/src/signout.php b/src/signout.php
index 94f28762..fca146a8 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -3,15 +3,16 @@
 /**
  * signout.php -- cleans up session and logs the user out
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  *  Cleans up after the user. Resets cookies and terminates session.
  *
  * $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -39,13 +40,9 @@ if (!isset($frame_top)) {
 
 /* If a user hits reload on the last page, $base_uri isn't set
  * because it was deleted with the session. */
-if (!isset($_SESSION['base_uri'])) {
-    if (!function_exists('sqm_baseuri')){
-        require_once(SM_PATH . 'functions/display_messages.php');
-    }
+if (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
+    require_once(SM_PATH . 'functions/display_messages.php');
     $base_uri = sqm_baseuri();
-} else {
-    $base_uri = $_SESSION['base_uri'];
 }
 
 do_hook('logout');
@@ -74,13 +71,14 @@ if ($signout_page) {
 link="<?php echo $color[7] ?>" vlink="<?php echo $color[7] ?>"
 alink="<?php echo $color[7] ?>">
 <br><br>
-<?
-do_hook('logout_above_text');
+<?php
+$plugin_message = concat_hook_function('logout_above_text');
 echo
 html_tag( 'table',
     html_tag( 'tr',
          html_tag( 'th', _("Sign Out"), 'center' ) ,
     '', $color[0], 'width="100%"' ) .
+    $plugin_message .
     html_tag( 'tr',
          html_tag( 'td', _("You have been successfully signed out.") .
              '<br><a href="login.php" target="' . $frame_top . '">' .