Updates a draft if saved again, instead of creating a second draft.

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index b8bf19ab492d77119bff1f4b1becccb8f68445b6..03ea014f9f4cee72fbe697d0c147d153ec41954a 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -11,13 +11,13 @@
     **  $Id$
     **/
 
-   include('../src/validate.php');
-   include('../functions/imap.php');
-   include('../functions/date.php');
-   include('../functions/array.php');
-   include('../functions/mime.php');
-   include('../functions/mailbox_display.php');
-   include('../functions/display_messages.php');
+   require_once('../src/validate.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/date.php');
+   require_once('../functions/array.php');
+   require_once('../functions/mime.php');
+   require_once('../functions/mailbox_display.php');
+   require_once('../functions/display_messages.php');
 
    /////////////////////////////////////////////////////////////////////////////////
    //
@@ -58,22 +58,29 @@
    displayPageHeader($color, $mailbox);
 
    do_hook('right_main_after_header');
-   
-   if (isset($just_logged_in) && $just_logged_in == 1 && 
-       strlen(trim($motd)) > 0) {
-      echo "<center><br>\n";
-      echo "<table width=70% cellpadding=0 cellspacing=0 border=0><tr><td bgcolor=\"$color[9]\">\n";
-      echo "<table width=100% cellpadding=5 cellspacing=1 border=0><tr><td bgcolor=\"$color[4]\">\n";
-      echo "$motd\n";
-      echo "</td></tr></table>\n";
-      echo "</td></tr></table>\n";
-      echo "</center><br>\n";
+
+   if (isset($note))
+      echo "<CENTER><B>$note</B></CENTER><BR>\n";
+
+   if ($just_logged_in == true) {
+      $just_logged_in = false;
+
+      if (strlen(trim($motd)) > 0) {
+         echo "<br><table align=center width=70% cellpadding=0 cellspacing=3 border=0 bgcolor=\"$color[9]\">" .
+              '<tr><td>' .
+              "<table width=100% cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
+              "<tr><td align=center>$motd";
+         do_hook('motd');
+         echo '</td></tr>' .
+              '</table>' .
+              '</td></tr></table>';
+      }
    }
 
-       if (isset($newsort)) {
-               $sort = $newsort;
-               session_register('sort');
-       }       
+    if (isset($newsort)) {
+        $sort = $newsort;
+        session_register('sort');
+    }
 
    // Check to see if we can use cache or not.  Currently the only time when you wont use it is
    //    when a link on the left hand frame is used.  Also check to make sure we actually have the
@@ -87,13 +94,13 @@
          unset($msgs);
       if (session_is_registered('msort'))
          unset($msort);
-               if (session_is_registered('numMessages'))
-                       unset($numMessages);
+        if (session_is_registered('numMessages'))
+            unset($numMessages);
 
-       $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
+    $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
 
       showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
-      
+
       if (session_is_registered('msgs') && isset($msgs))
          session_register('msgs');
       if (session_is_registered('msort') && isset($msort))