added patch from tcabot for a pure HTML method of selecting all messages
[squirrelmail.git] / functions / mailbox_display.php
index 77b3c526957d81b871cbebb8ed0fe6f831d96f4e..baa59f69e5f34f366acdbb19b93e88f41ccdbd00 100644 (file)
    $mailbox_display_php = true;
 
    function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, $where, $what) {
+      global $checkall;
       global $color, $msgs, $msort;
-               global $sent_folder;
+      global $sent_folder;
       global $message_highlight_list;
       global $index_order;
 
-               $msg = $msgs[$key];
+      $msg = $msgs[$key];
 
       $senderName = sqimap_find_displayable_name($msg["FROM"]);
       $urlMailbox = urlencode($mailbox);
       $subject = trim($msg["SUBJECT"]);
       if ($subject == "")
          $subject = _("(no subject)");
-    
+
       echo "<TR>\n";
-      
+
       if ($msg["FLAG_FLAGGED"] == true) { $flag = "<font color=$color[2]>"; $flag_end = "</font>"; }
       if ($msg["FLAG_SEEN"] == false) { $bold = "<b>"; $bold_end = "</b>"; }
-               if ($mailbox == $sent_folder) { $italic = "<i>"; $italic_end = "</i>"; }
-      
+      if ($mailbox == $sent_folder) { $italic = "<i>"; $italic_end = "</i>"; }
+
       for ($i=0; $i < count($message_highlight_list); $i++) {
          if (trim($message_highlight_list[$i]["value"]) != "") {
             if ($message_highlight_list[$i]["match_type"] == "to_cc") {
             } else if (strpos("^^".strtolower($msg[strtoupper($message_highlight_list[$i]["match_type"])]),strtolower($message_highlight_list[$i]["value"]))) {
                $hlt_color = $message_highlight_list[$i]["color"];
                continue;
-            }   
+            }
          }
-      }   
-      
+      }
+
       if (!$hlt_color)
          $hlt_color = $color[4];
 
          $search_stuff = "&where=".urlencode($where)."&what=".urlencode($what);
       }
 
+               if ($checkall == 1) 
+                       $checked = " checked";
+               else
+                       $checked = "";
+      
       for ($i=1; $i <= count($index_order); $i++) {
          switch ($index_order[$i]) {
             case 1: # checkbox
                echo "   <td bgcolor=$hlt_color>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0$search_stuff\">$flag$subject$flag_end</a>$bold_end</td>\n";
                break;
             case 5: # flags
-               if ($msg["FLAG_ANSWERED"] == true) echo "   <td bgcolor=$hlt_color width=1%><b><small>A</small></b></td>\n";
-               elseif (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) echo "   <td bgcolor=$hlt_color width=1%><b><small><font color=$color[1]>!</font></small></b></td>\n";
-               else    echo "   <td bgcolor=$hlt_color width=1%>&nbsp;</td>\n";
+               $stuff = false;
+               echo "   <td bgcolor=$hlt_color width=1% nowrap><b><small>\n";
+               if ($msg["FLAG_ANSWERED"] == true) {
+                  echo "A\n";
+                  $stuff = true;
+               }
+               if ($msg["TYPE0"] == "multipart") {
+                  echo "+\n";
+                  $stuff = true;
+               }
+               if (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) {
+                  echo "<font color=$color[1]>!</font>\n";
+                  $stuff = true;
+               }
+               if ($msg["FLAG_DELETED"]) {
+                  echo "<font color=\"$color[1]\">D</font>\n";
+                  $stuff = true;
+               }
+
+               if (!$stuff) echo "&nbsp;\n";
+               echo "</small></b></td>\n";
                break;
-            case 6: # size   
+            case 6: # size
+               echo "   <td bgcolor=$hlt_color width=1%>$bold".show_readable_size($msg['SIZE'])."$bold_end</td>\n";
                break;
          }
       }
     **/
    function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color,$show_num, $use_cache) {
       global $msgs, $msort;
-               global $sent_folder;
+      global $sent_folder;
       global $message_highlight_list;
       global $auto_expunge;
 
-      if ($auto_expunge) {
-         sqimap_mailbox_expunge($imapConnection, $mailbox);
-         sqimap_mailbox_select($imapConnection, $mailbox);
-      }
+      sqimap_mailbox_expunge($imapConnection, $mailbox, false);
+      sqimap_mailbox_select($imapConnection, $mailbox);
 
       if (!$use_cache) {
+         // if it's sorted
          if ($numMessages >= 1) {
-            for ($q = 0; $q < $numMessages; $q++) {
-                                       if ($mailbox == $sent_folder)
-                       $hdr = sqimap_get_small_header ($imapConnection, $q+1, true);
-                                       else
-                       $hdr = sqimap_get_small_header ($imapConnection, $q+1, false);
-                                               
-                                       $from[$q] = $hdr->from;
-                                       $date[$q] = $hdr->date;
-                                       $subject[$q] = $hdr->subject;
-               $to[$q] = $hdr->to;
-               $priority[$q] = $hdr->priority;
-               $cc[$q] = $hdr->cc;
-
-               $flags[$q] = sqimap_get_flags ($imapConnection, $q+1);
+            if ($sort < 6) {
+               for ($q = 0; $q < $numMessages; $q++) {
+                  if($mailbox == $sent_folder)
+                     $hdr = sqimap_get_small_header ($imapConnection, $q+1, true);
+                  else
+                     $hdr = sqimap_get_small_header ($imapConnection, $q+1, false);
+                       
+                  $from[$q] = $hdr->from;
+                  $date[$q] = $hdr->date;
+                  $subject[$q] = $hdr->subject;
+                  $to[$q] = $hdr->to;
+                  $priority[$q] = $hdr->priority;
+                  $cc[$q] = $hdr->cc;
+                  $size[$q] = $hdr->size;
+                  $type[$q] = $hdr->type0;
+                  $flags[$q] = sqimap_get_flags ($imapConnection, $q+1);
+                  $id[$q] = $q + 1;
+               }
+            } else {
+               // if it's not sorted
+               if ($startMessage + ($show_num - 1) < $numMessages) {
+                  $endMessage = $startMessage + ($show_num-1);
+               } else {
+                  $endMessage = $numMessages;
+               }
+
+               if ($endMessage < $startMessage) {
+                  $startMessage = $startMessage - $show_num;
+                  if ($startMessage < 1)
+                     $startMessage = 1;
+               }
+
+
+               $real_startMessage = $numMessages - $startMessage + 1;
+               $real_endMessage = $numMessages - $startMessage - $show_num;
+               if ($real_endMessage <= 0)
+                  $real_endMessage = 1;
+
+               $j = 0;
+               for ($q = $real_startMessage; $q >= $real_endMessage; $q--) {
+                  if($mailbox == $sent_folder)
+                     $hdr = sqimap_get_small_header ($imapConnection, $q, true);
+                  else
+                     $hdr = sqimap_get_small_header ($imapConnection, $q, false);
+
+                  $from[$j] = $hdr->from;
+                  $date[$j] = $hdr->date;
+                  $subject[$j] = $hdr->subject;
+                  $to[$j] = $hdr->to;
+                  $priority[$j] = $hdr->priority;
+                  $cc[$j] = $hdr->cc;
+                  $size[$j] = $hdr->size;
+                  $type[$j] = $hdr->type0;
+                  $flags[$j] = sqimap_get_flags ($imapConnection, $q);
+                  $id[$j] = $q;
+                  $j++;
+               }
             }
          }
-   
+
          $j = 0;
-         while ($j < $numMessages) {
+         if ($sort == 6) {
+            $end = $startMessage + $show_num - 1;
+         } else {
+            $end = $numMessages;
+         }
+         while ($j < $end) {
             $date[$j] = ereg_replace("  ", " ", $date[$j]);
             $tmpdate = explode(" ", trim($date[$j]));
-   
+
             $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate);
             $messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]);
-            $messages[$j]["ID"] = $j+1;
+            $messages[$j]["ID"] = $id[$j];
             $messages[$j]["FROM"] = decodeHeader($from[$j]);
             $messages[$j]["FROM-SORT"] = strtolower(sqimap_find_displayable_name(decodeHeader($from[$j])));
             $messages[$j]["SUBJECT"] = decodeHeader($subject[$j]);
             $messages[$j]["SUBJECT-SORT"] = strtolower(decodeHeader($subject[$j]));
             $messages[$j]["TO"] = decodeHeader($to[$j]);
-                               $messages[$j]["PRIORITY"] = $priority[$j];
+            $messages[$j]["PRIORITY"] = $priority[$j];
             $messages[$j]["CC"] = $cc[$j];
+            $messages[$j]["SIZE"] = $size[$j];
+            $messages[$j]["TYPE0"] = $type[$j];
 
             # fix SUBJECT-SORT to remove Re:
-            if (substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "re:" ||
-                substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "aw:")
-               $messages[$j]["SUBJECT-SORT"] = trim(substr($messages[$j]["SUBJECT-SORT"], 3));    
-   
+            $re_abbr = # Add more here!
+               "vedr|sv|" .    # Danish
+               "re|aw";        # English
+            if (eregi("^($re_abbr):[ ]*(.*)$", $messages[$j]['SUBJECT-SORT'], $regs))
+               $messages[$j]['SUBJECT-SORT'] = $regs[2];
+
             $num = 0;
             while ($num < count($flags[$j])) {
                if ($flags[$j][$num] == "Deleted") {
                   $messages[$j]["FLAG_DELETED"] = true;
                }
-               else if ($flags[$j][$num] == "Answered") {
+               elseif ($flags[$j][$num] == "Answered") {
                   $messages[$j]["FLAG_ANSWERED"] = true;
                }
-               else if ($flags[$j][$num] == "Seen") {
+               elseif ($flags[$j][$num] == "Seen") {
                   $messages[$j]["FLAG_SEEN"] = true;
                }
-               else if ($flags[$j][$num] == "Flagged") {
+               elseif ($flags[$j][$num] == "Flagged") {
                   $messages[$j]["FLAG_FLAGGED"] = true;
                }
                $num++;
             }
             $j++;
          }
-      
-         /** Find and remove the ones that are deleted */
-         $i = 0;
-         $j = 0;
-         while ($j < $numMessages) {
-            if ($messages[$j]["FLAG_DELETED"] == true) {
+
+         /* Only ignore messages flagged as deleted if we are using a
+          * trash folder or auto_expunge */
+         if (($move_to_trash || $auto_expunge) && $sort != 6)
+         {
+            /** Find and remove the ones that are deleted */
+            $i = 0;
+            $j = 0;
+            while ($j < $numMessages) {
+               if ($messages[$j]["FLAG_DELETED"] == true) {
+                  $j++;
+                  continue;
+               }
+               $msgs[$i] = $messages[$j];
+
+               $i++;
                $j++;
-               continue;
             }
-            $msgs[$i] = $messages[$j];
-   
-            $i++;
-            $j++;
+            $numMessages = $i;
+         } else {
+            $msgs = $messages;
          }
-         $numMessages = $i;
       }         
 
       // There's gotta be messages in the array for it to sort them.
-      if (($numMessages > 0) && (!$use_cache)) {
+      if ($numMessages > 0 && ! $use_cache) {
          /** 0 = Date (up)      4 = Subject (up)
           ** 1 = Date (dn)      5 = Subject (dn)
           ** 2 = Name (up)
             $msort = array_cleave ($msgs, "FROM-SORT");
          if (($sort == 4) || ($sort == 5))
             $msort = array_cleave ($msgs, "SUBJECT-SORT");
-
-         if(($sort % 2) == 1) {
-            asort($msort);
-         } else {
-            arsort($msort);
+         if ($sort == 6)
+            $msort = $msgs;
+
+         if ($sort < 6) {
+            if($sort % 2) {
+               asort($msort);
+            } else {
+               arsort($msort);
+            }
          }
          session_register("msort");
       }
    // generic function to convert the msgs array into an HTML table
    function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) {
       global $folder_prefix, $sent_folder;
-               global $imapServerAddress;
-      global $index_order;
-
+      global $imapServerAddress;
+      global $index_order, $real_endMessage, $real_startMessage;
+      
       // if cache isn't already set, do it now
       if (!session_is_registered("msgs"))
          session_register("msgs");
       if (!session_is_registered("msort"))
          session_register("msort");
 
-
       if ($startMessage + ($show_num - 1) < $numMessages) {
          $endMessage = $startMessage + ($show_num-1);
       } else {
          $endMessage = $numMessages;
       }
-      
+
       if ($endMessage < $startMessage) {
          $startMessage = $startMessage - $show_num;
          if ($startMessage < 1)
             $startMessage = 1;
       }
-      
+
       $nextGroup = $startMessage + $show_num;
       $prevGroup = $startMessage - $show_num;
       $urlMailbox = urlencode($mailbox);
 
       do_hook("mailbox_index_before");
-      /** This is the beginning of the message list table.  It wraps around all messages */
-      echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=0>";
 
+      $Message = '';
       if ($startMessage < $endMessage) {
-         echo "<TR BGCOLOR=\"$color[4]\"><TD>";
-         echo "<CENTER>". _("Viewing messages") ." <B>$startMessage</B> ". _("to") ." <B>$endMessage</B> ($numMessages " . _("total") . ")</CENTER>\n";
-         echo "</TD></TR>\n";
-      } else if ($startMessage == $endMessage) {
-         echo "<TR BGCOLOR=\"$color[4]\"><TD>";
-         echo "<CENTER>". _("Viewing message") ." <B>$startMessage</B> ($numMessages " . _("total") . ")</CENTER>\n";
-         echo "</TD></TR>\n";
+         $Message = _("Viewing messages") ." <B>$startMessage</B> ". _("to") ." <B>$endMessage</B> ($numMessages " . _("total") . ")\n";
+      } elseif ($startMessage == $endMessage) {
+         $Message = _("Viewing message") ." <B>$startMessage</B> ($numMessages " . _("total") . ")\n";
       }
 
-      echo "<TR BGCOLOR=\"$color[4]\"><TD>";
+      $More = '';
+      if ($sort == 6) {
+         $use = 0;
+      } else {
+         $use = 1;
+      }
       if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
-         echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A> | \n";
-         echo "<A HREF=\"right_main.php?use_mailbox_cache=1&&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
+         $More = "<A HREF=\"right_main.php?use_mailbox_cache=$use&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A> | \n";
+         $More .= "<A HREF=\"right_main.php?use_mailbox_cache=$use&&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
       }
-      else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
-         echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A> | \n";
-         echo "<FONT COLOR=\"$color[9]\">"._("Next")."</FONT>\n";
+      elseif (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
+         $More = "<A HREF=\"right_main.php?use_mailbox_cache=$use&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A> | \n";
+         $More .= "<FONT COLOR=\"$color[9]\">"._("Next")."</FONT>\n";
+      }
+      elseif (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
+         $More = "<FONT COLOR=\"$color[9]\">"._("Previous")."</FONT> | \n";
+         $More .= "<A HREF=\"right_main.php?use_mailbox_cache=$use&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
+      }
+
+      mail_message_listing_beginning($imapConnection,
+         "move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage",
+          $mailbox, $sort, $Message, $More, $startMessage);
+
+      $groupNum = $startMessage % ($show_num - 1);
+      $real_startMessage = $startMessage;
+      if ($sort == 6) {
+         if ($endMessage - $startMessage < $show_num - 1) {
+            $endMessage = $endMessage - $startMessage + 1;
+            $startMessage = 1;
+         } else if ($startMessage > $show_num) {
+            $endMessage = $show_num;
+            $startMessage = 1;
+         }
+      }
+
+      $endVar = $endMessage + 1;
+
+      // loop through and display the info for each message.
+      $t = 0; // $t is used for the checkbox number
+      if ($numMessages == 0) { // if there's no messages in this folder
+         echo "<TR><TD BGCOLOR=\"$color[4]\" COLSPAN=" . count($index_order);
+         echo "><CENTER><BR><B>". _("THIS FOLDER IS EMPTY") ."</B><BR>&nbsp;</CENTER></TD></TR>";
+      } else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different.
+         if ($sort != 6)
+            $i = $startMessage;
+         else
+            $i = 1;
+         reset($msort);
+         do {
+            $key = key($msort);
+            next($msort);
+            $k++;
+         } while (isset ($key) && ($k < $i));
+         printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0);
+      } else {
+         $i = $startMessage;
+
+         reset($msort);
+         do {
+            $key = key($msort);
+            next($msort);
+            $k++;
+         } while (isset ($key) && ($k < $i));
+
+         do {
+            printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0);
+            $key = key($msort);
+            $t++;
+            $i++;
+            next($msort);
+         } while ($i && $i < $endVar);
       }
-      else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
-         echo "<FONT COLOR=\"$color[9]\">"._("Previous")."</FONT> | \n";
-         echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
+      echo "</TABLE>";
+
+      echo "</td></tr>\n";
+
+      echo "<TR BGCOLOR=\"$color[4]\"><TD>";
+               echo "<table width=100% cellpadding=0 cellspacing=0 border=0><tr><td>";
+               echo "$More</td><td align=right>\n";
+               if (!$startMessage) $startMessage=1;
+      if ( $checkall == "1")
+         echo "\n<A HREF=\"right_main.php?mailbox=$mailbox&startMessage=$startMessage&sort=$sort\">" . _("Unselect All") . "</A>\n";
+      else
+         echo "\n<A HREF=\"right_main.php?mailbox=$mailbox&startMessage=$startMessage&sort=$sort&checkall=1\">" . _("Select All") . "</A>\n";
+
+               echo "</td></tr></table>";
+               echo "</td></tr>";
+      echo "</table>"; /** End of message-list table */
+
+      do_hook("mailbox_index_after");
+   }
+
+   /* Displays the standard message list header.
+    * To finish the table, you need to do a "</table></table>";
+    * $moveURL is the URL to submit the delete/move form to
+    * $mailbox is the current mailbox
+    * $sort is the current sorting method (-1 for no sorting available [searches])
+    * $Message is a message that is centered on top of the list
+    * $More is a second line that is left aligned
+    */
+   function mail_message_listing_beginning($imapConnection, $moveURL,
+       $mailbox = '', $sort = -1, $Message = '', $More = '', $startmessage = 1)
+   {
+      global $color, $index_order, $auto_expunge, $move_to_trash;
+               global $checkall;
+               $urlMailbox = urlencode($mailbox);
+
+         /** This is the beginning of the message list table.  It wraps around all messages */
+      echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=0>";
+
+      if ($Message)
+      {
+         echo "<TR BGCOLOR=\"$color[4]\"><TD align=center>$Message</td></tr>\n";
       }
-      echo "</TD></TR>\n";
+
+      echo "<TR BGCOLOR=\"$color[4]\"><TD>";
+               echo "<table width=100% cellpadding=0 cellspacing=0 border=0><tr><td>";
+               echo "$More</td><td align=right>\n";
+               if (!$startMessage) $startMessage=1;
+      if ( $checkall == "1")
+         echo "\n<A HREF=\"right_main.php?mailbox=$mailbox&startMessage=$startMessage&sort=$sort\">" . _("Unselect All") . "</A>\n";
+      else
+         echo "\n<A HREF=\"right_main.php?mailbox=$mailbox&startMessage=$startMessage&sort=$sort&checkall=1\">" . _("Select All") . "</A>\n";
+
+               echo "</td></tr></table>";
+               echo "</td></tr>";
 
       /** The delete and move options */
       echo "<TR><TD BGCOLOR=\"$color[0]\">";
 
-      echo "\n\n\n<FORM name=messageList method=post action=\"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage\">";
-      do_hook("mailbox_form_before");
+      echo "\n\n\n<FORM name=messageList method=post action=\"$moveURL\">\n";
       echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=100%>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=60% ALIGN=LEFT VALIGN=CENTER>\n";
+
+
       echo "         <NOBR><SMALL>". _("Move selected to:") ."</SMALL>";
       echo "         <TT><SMALL><SELECT NAME=\"targetMailbox\">";
 
       $boxes = sqimap_mailbox_list($imapConnection);
       for ($i = 0; $i < count($boxes); $i++) {
-                       if ($boxes[$i]["flags"][0] != "noselect" && $boxes[$i]["flags"][1] != "noselect" && $boxes[$i]["flags"][2] != "noselect") {
-               $box = $boxes[$i]["unformatted"];
-               $box2 = replace_spaces($boxes[$i]["formatted"]);
-               echo "         <OPTION VALUE=\"$box\">$box2\n";
-                       }       
+         if ($boxes[$i]["flags"][0] != "noselect" &&
+            $boxes[$i]["flags"][1] != "noselect" &&
+            $boxes[$i]["flags"][2] != "noselect") {
+            $box = $boxes[$i]["unformatted"];
+            $box2 = replace_spaces($boxes[$i]["formatted"]);
+            echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
+    }
       }
       echo "         </SELECT></SMALL></TT>";
       echo "         <SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"". _("Move") ."\"></SMALL></NOBR>\n";
-
       echo "      </TD>\n";
       echo "      <TD WIDTH=40% ALIGN=RIGHT>\n";
+      if (! $move_to_trash && ! $auto_expunge) {
+         echo "         <NOBR><SMALL><INPUT TYPE=SUBMIT NAME=\"expungeButton\" VALUE=\"". _("Expunge") ."\">&nbsp;". _("mailbox") ."</SMALL></NOBR>&nbsp;&nbsp;\n";
+      }
       echo "         <NOBR><SMALL><INPUT TYPE=SUBMIT VALUE=\"". _("Delete") ."\">&nbsp;". _("checked messages") ."</SMALL></NOBR>\n";
-      echo "      </TD>";
+      echo "      </TD>\n";
       echo "   </TR>\n";
 
-      echo "</TABLE>\n\n\n";
+      echo "</TABLE>\n";
+      do_hook("mailbox_form_before");
       echo "</TD></TR>";
 
       echo "<TR><TD BGCOLOR=\"$color[0]\">";
       echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[0]\">";
       echo "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
 
+      $urlMailbox=urlencode($mailbox);
+
+      // Print the headers
       for ($i=1; $i <= count($index_order); $i++) {
          switch ($index_order[$i]) {
             case 1: # checkbox
+            case 5: # flags
                echo "   <TD WIDTH=1%><B>&nbsp;</B></TD>";
                break;
+               
             case 2: # from
-                       if ($mailbox == $sent_folder)
-                       echo "   <TD WIDTH=30%><B>". _("To") ."</B>";
-                       else
-                       echo "   <TD WIDTH=30%><B>". _("From") ."</B>";
+               if ($mailbox == $sent_folder)
+                  echo "   <TD WIDTH=30%><B>". _("To") ."</B>";
+               else
+                    echo "   <TD WIDTH=30%><B>". _("From") ."</B>";
          
                if ($sort == 2)
                   echo "   <A HREF=\"right_main.php?newsort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
-               else if ($sort == 3)
+               elseif ($sort == 3)
                   echo "   <A HREF=\"right_main.php?newsort=2&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
-               else
+               elseif ($sort != -1)
                   echo "   <A HREF=\"right_main.php?newsort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
                break;
+               
             case 3: # date
                echo "   <TD nowrap WIDTH=1%><B>". _("Date") ."</B>";
                if ($sort == 0)
                   echo "   <A HREF=\"right_main.php?newsort=1&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
-               else if ($sort == 1)
-                  echo "   <A HREF=\"right_main.php?newsort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
-               else
+               elseif ($sort == 1)
+                  echo "   <A HREF=\"right_main.php?newsort=6&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
+               elseif ($sort == 6)
+                  echo "   <A HREF=\"right_main.php?newsort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
+               elseif ($sort != -1)
                   echo "   <A HREF=\"right_main.php?newsort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
                break;
+               
             case 4: # subject
                echo "   <TD WIDTH=%><B>". _("Subject") ."</B>\n";
                if ($sort == 4)
                  echo "   <A HREF=\"right_main.php?newsort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
-               else if ($sort == 5)
+               elseif ($sort == 5)
                   echo "   <A HREF=\"right_main.php?newsort=4&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
-               else
+               elseif ($sort != -1)
                   echo "   <A HREF=\"right_main.php?newsort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
                break;
-            case 5: # flags
-               echo "   <TD WIDTH=1%>&nbsp;</TD>\n";
-               break;
+               
             case 6: # size   
-               echo "   <TD WIDTH=1%>Size</TD>\n";
+               echo "   <TD WIDTH=1%><b>" . _("Size")."</b></TD>\n";
                break;
          }
       }
-      echo "</TR>";
-
-
-      
-      // loop through and display the info for each message.
-      $t = 0; // $t is used for the checkbox number
-      if ($numMessages == 0) { // if there's no messages in this folder
-         echo "<TR><TD BGCOLOR=\"$color[4]\" COLSPAN=5><CENTER><BR><B>". _("THIS FOLDER IS EMPTY") ."</B><BR>&nbsp;</CENTER></TD></TR>";
-      } else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different.
-         $i = $startMessage;
-         reset($msort);
-         do {
-            $key = key($msort);
-            next($msort);
-            $k++;
-         } while (isset ($key) && ($k < $i));
-         printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0);
-      } else {
-         $i = $startMessage;
-         reset($msort);
-         do {
-            $key = key($msort);
-            next($msort);
-            $k++;
-         } while (isset ($key) && ($k < $i));
-
-                  do {
-            printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0);
-            $key = key($msort);
-            $t++;
-            $i++;
-            next($msort);
-         } while ($i < ($endMessage+1));
-      }
-      echo "</FORM></TABLE>";
-
-      echo "</TABLE>\n";
-      echo "</TD></TR>\n";
-
-      echo "<TR BGCOLOR=\"$color[4]\"><TD>";
-      if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
-         echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A> | \n";
-         echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
-      }
-      else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
-         echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A> | \n";
-         echo "<FONT COLOR=\"$color[9]\">" . _("Next") . "</FONT>\n";
-      }
-      else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
-         echo "<FONT COLOR=\"$color[9]\">" . _("Previous"). "</FONT> | \n";
-         echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
-      }
-      echo "</TD></TR></table>"; /** End of message-list table */
-
-      do_hook("mailbox_index_after");
+      echo "</TR>\n";
    }
 ?>