projects / squirrelmail.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
claimed a task for myself
[squirrelmail.git] / src / left_main.php
diff --git a/src/left_main.php b/src/left_main.php
index d6db5c5ea62c6333e0c524b7f94b674ec7432387..c8bc624aa7411bed2e8ed2e7e22318c46236c61b 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  left_main.php
     **
@@ -30,50 +30,50 @@
 
    echo "<HTML>";
 
-   function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $color, $move_to_trash) {
-      require ("../config/config.php");
-      global $PHPSESSID;
+   function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $unseen) {
+               global $folder_prefix, $trash_folder, $sent_folder;
+               global $color, $move_to_sent, $move_to_trash;
 
       $mailboxURL = urlencode($real_box);
-      sqimap_mailbox_select ($imapConnection, $real_box);
-      $unseen = sqimap_unseen_messages($imapConnection, $numUnseen);
+               if($real_box=="INBOX") {
+             $unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
+               }
 
       echo "<NOBR>";
-      if ($unseen)
+      if ($unseen > 0)
          $line .= "<B>";
 
       $special_color = false;
-      for ($i = 0; $i < count($special_folders); $i++) {
-         if (($special_folders[$i] == $real_box) && ($use_special_folder_color == true))
-            $special_color = true;
-      }
+               if ((strtolower($real_box) == "inbox") ||
+                   (($real_box == $trash_folder) && ($move_to_trash)) ||
+                        (($real_box == $sent_folder) && ($move_to_sent)))
+                       $special_color = true;
 
       if ($special_color == true) {
-         $line .= "<a href=\"right_main.php?PHPSESSID=$PHPSESSID&sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\"><FONT COLOR=\"$color[11]\">";
+         $line .= "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\"><FONT COLOR=\"$color[11]\">";
          $line .= replace_spaces($mailbox);
          $line .= "</font></a>";
       } else {
-         $line .= "<a href=\"right_main.php?PHPSESSID=$PHPSESSID&sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+         $line .= "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
          $line .= replace_spaces($mailbox);
          $line .= "</font></a>";
       }
 
-      if ($unseen)
+      if ($unseen > 0)
          $line .= "</B>";
 
-      if ($numUnseen > 0) {
-         $line .= "&nbsp;<small>($numUnseen)</small>";
+      if ($unseen > 0) {
+         $line .= "&nbsp;<small>($unseen)</small>";
       }
 
-      if (($move_to_trash == true) && (trim($real_box) == $trash_folder)) {
+      if (($move_to_trash == true) && ($real_box == $trash_folder)) {
          $urlMailbox = urlencode($real_box);
          $line .= "<small>";
-         $line .= "&nbsp;&nbsp;&nbsp;&nbsp;(<B><A HREF=\"empty_trash.php?PHPSESSID=$PHPSESSID&numMessages=$numMessages&mailbox=$urlMailbox\" TARGET=right style=\"text-decoration:none\">"._("purge")."</A></B>)";
+         $line .= "&nbsp;&nbsp;&nbsp;&nbsp;(<B><A HREF=\"empty_trash.php?numMessages=$numMessages&mailbox=$urlMailbox\" TARGET=right style=\"text-decoration:none\">"._("purge")."</A></B>)";
          $line .= "</small></a>\n";
       }
-
-      echo "</NOBR>";
       return $line;
+      echo "</NOBR>";
    }
 
    // open a connection on the imap port (143)
@@ -85,7 +85,7 @@
    if (isset($left_refresh) && ($left_refresh != "None") && ($left_refresh != "")) {
       echo "<META HTTP-EQUIV=\"Expires\" CONTENT=\"Thu, 01 Dec 1994 16:00:00 GMT\">";
       echo "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">"; 
-      echo "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php?PHPSESSID=$PHPSESSID\">";
+      echo "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php\">";
    }
    
    echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\">";
@@ -95,7 +95,7 @@
    echo "<FONT SIZE=4><B><CENTER>";
    echo _("Folders") . "</B><BR></FONT>";
 
-   echo "<small>(<A HREF=\"../src/left_main.php?PHPSESSID=$PHPSESSID\" TARGET=\"left\">";
+   echo "<small>(<A HREF=\"../src/left_main.php\" TARGET=\"left\">";
    echo _("refresh folder list");
    echo "</A>)</small></CENTER><BR>";
    $delimeter = sqimap_get_delimiter($imapConnection);
@@ -115,10 +115,10 @@
             $line .= replace_spaces(readShortMailboxName($mailbox, $delimeter));
             $line .= "</FONT>";
          } else {
-            $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $color, $move_to_trash);
+            $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
          }
       } else {
-         $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $color, $move_to_trash);
+         $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
       }
       echo "$line<BR>";
    }
Unnamed repository; edit this file 'description' to name the repository.