Fixed some bugs in folder deleting

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

index 6fe9ef48a464b8726be99ca23c240240c0cfccba..3d48d1ba6afecc9fab3ec46b6f22d05a1f737b35 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -19,20 +19,29 @@
        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/mailbox.php");
-   include("../functions/mailbox_display.php");
-   include("../functions/display_messages.php");
-
     /////////////////////////////////////////////////////////////////////////////////
     //
     // incoming variables from URL:
@@ -49,7 +58,7 @@
     /////////////////////////////////////////////////////////////////////////////////
  
     // open a connection on the imap port (143)
-   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
+   $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0);
  
     /** If it was a successful login, lets load their preferences **/
     include("../src/load_prefs.php");
@@ -65,18 +74,14 @@
        exit;
     }
  
-   // switch to the mailbox, and get the number of messages in it.
-   selectMailbox($imapConnection, $mailbox, $numMessages);
-
-   // Display the header at the top of the page
+   sqimap_mailbox_select($imapConnection, $mailbox);
+   $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
     displayPageHeader($color, $mailbox);
  
-   // Get the list of messages for this mailbox
     showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color);
  
     // close the connection
-   fputs($imapConnection, "1 logout\n");
-   fclose($imapConnection);
+   sqimap_logout ($imapConnection);
  ?>
  </FONT>
  </BODY>