updated changelog, todo

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

index ddd01e4d2c87672f0a575b5fbe9d5d3e93759449..eaec8346a8e33286fc0da189fdf0525897dd0930 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -8,31 +8,36 @@
      **/
  
     if(!isset($logged_in)) {
-      echo _("You must ");
-      echo "<a href=\"login.php\">";
-      echo _("login");
-      echo "</a>";
-      echo _(" first.");
+      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");
  ?>
  <HTML>
  <FONT FACE="Arial,Helvetica">
  <?
-   include("../config/config.php");
-   include("../functions/imap.php");
-   include("../functions/strings.php");
-   include("../functions/date.php");
-   include("../functions/page_header.php");
-   include("../functions/array.php");
-   include("../functions/mime.php");
-   include("../functions/mailbox_display.php");
-   include("../functions/display_messages.php");
-
     /////////////////////////////////////////////////////////////////////////////////
     //
     // incoming variables from URL:
@@ -49,12 +54,11 @@
     /////////////////////////////////////////////////////////////////////////////////
  
     // open a connection on the imap port (143)
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0);
+   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
  
     /** If it was a successful login, lets load their preferences **/
     include("../src/load_prefs.php");
     echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
-   echo "<FONT FACE=\"Arial,Helvetica\">";
  
     // If the page has been loaded without a specific mailbox,
     //    just show a page of general info.