Textarea should not use proprietary wrap attribute (#1512681). Original

[squirrelmail.git] / src / signout.php
diff --git a/src/signout.php b/src/signout.php

index 8706ed9656c218a2ab94cb98af894c6b82c75d8a..6e5fc5183802da03d8a78a2ca074770cc3058ce2 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -5,28 +5,24 @@
   *
   *  Cleans up after the user. Resets cookies and terminates session.
   *
- * @copyright &copy; 1999-2005 The SquirrelMail Project Team
+ * @copyright &copy; 1999-2006 The SquirrelMail Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License
   * @version $Id$
   * @package squirrelmail
   */
  
  /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
   */
-define('SM_PATH','../');
-
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/prefs.php');
-require_once(SM_PATH . 'functions/plugin.php');
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'functions/html.php');
+require('../include/init.php');
  
  /* Erase any lingering attachments */
  sqgetGlobalVar('compose_messages',  $compose_messages,  SQ_SESSION);
-foreach($compose_messages as $composeMessage) {
-    $composeMessage->purgeAttachments();
+
+if (!empty($compose_message) && is_array($compose_messages)) {
+    foreach($compose_messages as $composeMessage) {
+        $composeMessage->purgeAttachments();
+    }
  }
  
  if (!isset($frame_top)) {
@@ -36,7 +32,6 @@ 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 (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
-    require_once(SM_PATH . 'functions/display_messages.php');
      $base_uri = sqm_baseuri();
  }
  
@@ -53,7 +48,8 @@ if ($signout_page) {
  /* internal gettext functions will fail, if language is not set */
  set_up_language($squirrelmail_language, true, true);
  ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
  <html>
  <head>
  <?php
@@ -87,8 +83,7 @@ html_tag( 'table',
      html_tag( 'tr',
           html_tag( 'td', '<br />', 'center' ) ,
      '', $color[0] ) ,
-'center', $color[4], 'width="50%" cellpadding="2" cellspacing="0" border="0"' )
+'center', $color[4], 'width="50%" cellpadding="2" cellspacing="0" border="0"' );
  
+$oTemplate->display('footer.tpl');
  ?>
-</body>
-</html>