Notification when saving a draft.

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index 636ff5b11001da5cf2be233dc467bdf2ffe0a7f4..1df827331a95a0f954199645b6de1fb9218afd77 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -8,40 +8,17 @@
     **  This is where the mailboxes are listed.  This controls most of what
     **  goes on in SquirrelMail.
     **
+    **  $Id$
     **/
 
+   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');
 
-   session_start();
-
-   if(!isset($logged_in)) {
-      echo _("You must login first.");
-      exit;
-   }
-   if(!isset($username) || !isset($key)) {
-      echo _("You need a valid user and password to access this page!");
-      exit;
-   }
-
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($date_php))
-      include("../functions/date.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($mime_php))
-      include("../functions/mime.php");
-   if (!isset($mailbox_display_php))
-      include("../functions/mailbox_display.php");
-   if (!isset($display_messages_php))
-      include("../functions/display_messages.php");
-?>
-<?php
    /////////////////////////////////////////////////////////////////////////////////
    //
    // incoming variables from URL:
@@ -60,60 +37,83 @@
    // open a connection on the imap port (143)
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
-   /** If it was a successful login, lets load their preferences **/
-   include("../src/load_prefs.php");
+   if (isset($newsort) && $newsort != $sort) {
+      setPref($data_dir, $username, 'sort', $newsort);
+   }
 
    // If the page has been loaded without a specific mailbox,
    //   send them to the inbox
    if (!isset($mailbox)) {
-      $mailbox = "INBOX";
-      $sort = $newsort = 0;
+      $mailbox = 'INBOX';
       $startMessage = 1;
    }
 
+   // compensate for the UW vulnerability
+   if ($imap_server_type == 'uw' && (strstr($mailbox, '../') !== false ||
+                                     substr($mailbox, 0, 1) == '/')) {
+      $mailbox = 'INBOX';
+   }
+
    sqimap_mailbox_select($imapConnection, $mailbox);
    displayPageHeader($color, $mailbox);
 
-   if ($just_logged_in == 1 && strlen(trim($motd)) > 0) {
-      echo "<center><br>";
-      echo "<table width=70% cellpadding=0 cellspacing=0 border=0><tr><td bgcolor=\"$color[9]\">";
-      echo "<table width=100% cellpadding=5 cellspacing=1 border=0><tr><td bgcolor=\"$color[4]\">";
-      echo "$motd";
-      echo "</td></tr></table>";
-      echo "</td></tr></table>";
-      echo "</center><br>";
+   do_hook('right_main_after_header');
+   
+   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) {
+?><br>
+<table align=center width=70% cellpadding=0 cellspacing=3 border=0
+bgcolor="<?PHP echo $color[9] ?>">
+<tr><td>
+  <table width=100% cellpadding=5 cellspacing=1 border=0 bgcolor="<?PHP
+    echo $color[4] ?>">
+    <tr><td align=center><?PHP 
+       echo $motd;
+       do_hook('motd');
+    ?></td></tr>
+  </table>
+</td></tr></table>
+<?PHP
+      }
    }
 
        if (isset($newsort)) {
                $sort = $newsort;
-               session_register("sort");
+               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
    //    array in the registered session data.  :)
-   if ($use_mailbox_cache && session_is_registered("msgs")) {
+   if (! isset($use_mailbox_cache))
+       $use_mailbox_cache = 0;
+   if ($use_mailbox_cache && session_is_registered('msgs')) {
       showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
    } else {
-      if (session_is_registered("msgs"))
+      if (session_is_registered('msgs'))
          unset($msgs);
-      if (session_is_registered("msort"))
+      if (session_is_registered('msort'))
          unset($msort);
-               if (session_is_registered("numMessages"))
+               if (session_is_registered('numMessages'))
                        unset($numMessages);
 
        $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))
-         session_register("msort");
-      session_register("numMessages");
+      if (session_is_registered('msgs') && isset($msgs))
+         session_register('msgs');
+      if (session_is_registered('msort') && isset($msort))
+         session_register('msort');
+      session_register('numMessages');
    }
 
-   // close the connection
+   do_hook('right_main_bottom');
    sqimap_logout ($imapConnection);
 ?>
 </FONT>