fixed bugs in next/previous

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

index d6db5c5ea62c6333e0c524b7f94b674ec7432387..c896fd7139122728ddb8bc2cb6e3be869689f3a8 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -1,4 +1,4 @@
-<?
+<?php
     /**
      **  left_main.php
      **
@@ -31,8 +31,8 @@
     echo "<HTML>";
  
     function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $color, $move_to_trash) {
+               global $folder_prefix;
        require ("../config/config.php");
-      global $PHPSESSID;
  
        $mailboxURL = urlencode($real_box);
        sqimap_mailbox_select ($imapConnection, $real_box);
@@ -44,16 +44,16 @@
  
        $special_color = false;
        for ($i = 0; $i < count($special_folders); $i++) {
-         if (($special_folders[$i] == $real_box) && ($use_special_folder_color == true))
+         if (((substr($real_box, strlen($folder_prefix), strlen($special_folders[$i])) == $special_folders[$i]) || ($real_box == $special_folders[0])) && ($use_special_folder_color == true))
              $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>";
        }
@@ -65,10 +65,10 @@
           $line .= "&nbsp;<small>($numUnseen)</small>";
        }
  
-      if (($move_to_trash == true) && (trim($real_box) == $trash_folder)) {
+      if (($move_to_trash == true) && (substr($real_box, strlen($folder_prefix), strlen($trash_folder)) == $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";
        }
  
@@ -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);