projects / squirrelmail.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
made $sent_folder global so that the 'from' column would now be named 'to'
[squirrelmail.git] / functions / mailbox_display.php
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 3beb51cf62bda48e245769f0ec7581338d24badb..23c08e1719a29461b14d5b0aafe97759261cb31d 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -11,6 +11,7 @@
    $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 $message_highlight_list;
@@ -29,6 +30,7 @@
       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 ($msg["FLAG_DELETED"]) { $fontstr = "<font color=\"$color[9]\">"; $fontstr_end = "</font>"; }
 
       for ($i=0; $i < count($message_highlight_list); $i++) {
          if (trim($message_highlight_list[$i]["value"]) != "") {
@@ -50,6 +52,11 @@
       if ($where && $what) {
          $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]) {
@@ -57,17 +64,17 @@
                echo "   <td width=1% bgcolor=$hlt_color align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."$checked></TD>\n";
                break;
             case 2: # from
-               echo "   <td width=30% bgcolor=$hlt_color>$italic$bold$flag$senderName$flag_end$bold_end$italic_end</td>\n";
+               echo "   <td width=30% bgcolor=$hlt_color>$italic$bold$flag$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end</td>\n";
                break;
             case 3: # date
-               echo "   <td nowrap width=1% bgcolor=$hlt_color><center>$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end</center></td>\n";
+               echo "   <td nowrap width=1% bgcolor=$hlt_color><center>$bold$flag$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end</center></td>\n";
                break;
             case 4: # subject
                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
                $stuff = false;
-               echo "   <td bgcolor=$hlt_color width=1% nowrap><b><small>\n";
+               echo "   <td bgcolor=$hlt_color align=center width=1% nowrap><b><small>\n";
                if ($msg["FLAG_ANSWERED"] == true) {
                   echo "A\n";
                   $stuff = true;
@@ -89,7 +96,7 @@
                echo "</small></b></td>\n";
                break;
             case 6: # size
-               echo "   <td bgcolor=$hlt_color width=1%>$bold".show_readable_size($msg['SIZE'])."$bold_end</td>\n";
+               echo "   <td bgcolor=$hlt_color width=1%>$bold$fontstr".show_readable_size($msg['SIZE'])."$fontstr_end$bold_end</td>\n";
                break;
          }
       }
@@ -107,7 +114,7 @@
       global $message_highlight_list;
       global $auto_expunge;
 
-      sqimap_mailbox_expunge($imapConnection, $mailbox);
+     if ($auto_expunge == true) sqimap_mailbox_expunge($imapConnection, $mailbox, false);
       sqimap_mailbox_select($imapConnection, $mailbox);
 
       if (!$use_cache) {
@@ -279,7 +286,7 @@
    function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) {
       global $folder_prefix, $sent_folder;
       global $imapServerAddress;
-      global $index_order, $real_endMessage, $real_startMessage;
+      global $index_order, $real_endMessage, $real_startMessage, $checkall;
       
       // if cache isn't already set, do it now
       if (!session_is_registered("msgs"))
@@ -333,7 +340,7 @@
 
       mail_message_listing_beginning($imapConnection,
          "move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage",
-          $mailbox, $sort, $Message, $More);
+          $mailbox, $sort, $Message, $More, $startMessage);
 
       $groupNum = $startMessage % ($show_num - 1);
       $real_startMessage = $startMessage;
@@ -388,10 +395,17 @@
 
       echo "</td></tr>\n";
 
-      if ($More)
-      {
-         echo "<TR BGCOLOR=\"$color[4]\"><TD>$More</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=$real_startMessage&sort=$sort\">" . _("Unselect All") . "</A>\n";
+      else
+         echo "\n<A HREF=\"right_main.php?mailbox=$mailbox&startMessage=$real_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");
@@ -406,10 +420,11 @@
     * $More is a second line that is left aligned
     */
    function mail_message_listing_beginning($imapConnection, $moveURL,
-       $mailbox = '', $sort = -1, $Message = '', $More = '')
+       $mailbox = '', $sort = -1, $Message = '', $More = '', $startMessage = 1)
    {
       global $color, $index_order, $auto_expunge, $move_to_trash;
-               $urlMailbox = urlencode($mailbox);
+      global $checkall, $sent_folder;
+      $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>";
@@ -419,10 +434,16 @@
          echo "<TR BGCOLOR=\"$color[4]\"><TD align=center>$Message</td></tr>\n";
       }
 
-      if ($More)
-      {
-         echo "<TR BGCOLOR=\"$color[4]\"><TD>$More</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 ( $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]\">";
@@ -431,6 +452,8 @@
       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\">";
 
@@ -440,7 +463,7 @@
             $boxes[$i]["flags"][1] != "noselect" &&
             $boxes[$i]["flags"][2] != "noselect") {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
+            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
             echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
     }
       }
@@ -485,6 +508,7 @@
                   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";
                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";
+               echo "</TD>";
                break;
                
             case 3: # date
@@ -497,6 +521,7 @@
                   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";
+               echo "</TD>";
                break;
                
             case 4: # subject
@@ -507,6 +532,7 @@
                   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";
                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";
+               echo "</TD>";
                break;
                
             case 6: # size   
Unnamed repository; edit this file 'description' to name the repository.