* Moved load_prefs.php and display_page.php (or whatever it is called) into

[squirrelmail.git] / src / left_main.php

diff --git a/src/left_main.php b/src/left_main.php
index 2eb3af7138e742d9830a8d689f5770dda1277d6d..324f0a8098aac905d1c9f9f2f32c74cb88f825bc 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -11,14 +11,9 @@
     **/
 
    include('../src/validate.php');
-   include ("../functions/i18n.php");
-   include("../functions/strings.php");
-   include("../config/config.php");
    include("../functions/array.php");
    include("../functions/imap.php");
-   include("../functions/page_header.php");
    include("../functions/plugin.php");
-   include("../src/load_prefs.php");
 
    // open a connection on the imap port (143)
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
@@ -35,10 +30,10 @@
       $mailboxURL = urlencode($real_box);
       
       $unseen = 0;
-      
+
       if (($unseen_notify == 2 && $real_box == "INBOX") ||
           $unseen_notify == 3) {
-         $unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
+         $unseen = sqimap_unseen_messages($imapConnection, $real_box);
          if ($unseen_type == 1 && $unseen > 0) {
             $unseen_string = "($unseen)";
             $unseen_found = true;
@@ -93,12 +88,12 @@
             $numMessages = sqimap_get_num_messages($imapConnection, $real_box);
 
          if ($numMessages > 0)
-        {
+         {
             $urlMailbox = urlencode($real_box);
             $line .= "\n<small>\n";
             $line .= " &nbsp; (<B><A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A></B>)";
             $line .= "\n</small>\n";
-        }
+         }
       }
       $line .= "</NOBR>";
       return $line;
@@ -156,14 +151,12 @@
 
          if (in_array('noselect', $boxes[$i]['flags'])) {
             $line .= "<FONT COLOR=\"$color[10]\">";
-            if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
-                $line .= str_replace(' ', '&nbsp;', $regs[1]);
+            if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
+                $line .= str_replace(' ', '&nbsp;', $mailbox);
                 if (isset($boxes[$i]['parent']))
-                    $line .= FoldLink($boxes[$i]['unformatted'], 
-                        $boxes[$i]['parent']);
+                    $line .= FoldLink($boxes[$i]['unformatted'], $boxes[$i]['parent']);
                 elseif ($collapse_folders)
                     $line .= '<tt>&nbsp;</tt>&nbsp;';
-                $line .= str_replace(' ', '&nbsp;', $regs[2]);
             }
             $line .= '</FONT>';
          } else {