Ok, this actually works now.
[squirrelmail.git] / functions / mailbox_display.php
index a4823676e6bab7fa0a30aff1fcb57c89c9a23a4a..30880ec99867ae6bdbd5db014b547bb5893e2b3b 100644 (file)
       for ($i=1; $i <= count($index_order); $i++) {
          switch ($index_order[$i]) {
             case 1: # checkbox
-               echo "   <td width=1% bgcolor=$hlt_color align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."$checked></TD>\n";
+               echo "   <td 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$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end</td>\n";
+               echo "   <td 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$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end</center></td>\n";
+               echo "   <td nowrap 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";
                    if (! isset($search_stuff)) { $search_stuff = ''; }
                echo "<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0$search_stuff\"";
                do_hook("subject_link");
-               echo ">$flag$subject$flag_end</a>$bold_end</td>\n";
+              
+              $title = get_html_translation_table(HTML_SPECIALCHARS);
+              $title = array_flip($title);
+              $title = strtr($msg['SUBJECT'], $title);
+              $title = str_replace('"', "''", $title);
+
+               echo " title=\"$title\">$flag$subject$flag_end</a>$bold_end</td>\n";
                break;
             case 5: # flags
                $stuff = false;
-               echo "   <td bgcolor=$hlt_color align=center width=1% nowrap><b><small>\n";
+               echo "   <td bgcolor=$hlt_color align=center nowrap><b><small>\n";
                if (isset($msg['FLAG_ANSWERED']) && 
                    $msg['FLAG_ANSWERED'] == true) {
                   echo "A\n";
                echo "</small></b></td>\n";
                break;
             case 6: # size
-               echo "   <td bgcolor=$hlt_color width=1%>$bold$fontstr".show_readable_size($msg['SIZE'])."$fontstr_end$bold_end</td>\n";
+               echo "   <td bgcolor=$hlt_color>$bold$fontstr".show_readable_size($msg['SIZE'])."$fontstr_end$bold_end</td>\n";
                break;
          }
       }
       global $message_highlight_list;
       global $auto_expunge;
 
-     if ($auto_expunge == true) sqimap_mailbox_expunge($imapConnection, $mailbox, false);
+      if ($auto_expunge == true) sqimap_mailbox_expunge($imapConnection, $mailbox, false);
       sqimap_mailbox_select($imapConnection, $mailbox);
 
+      $issent = ($mailbox == $sent_folder);
       if (!$use_cache) {
          // if it's sorted
          if ($numMessages >= 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;
-               }
+               $id = range(1, $numMessages);
             } else {
                // if it's not sorted
                if ($startMessage + ($show_num - 1) < $numMessages) {
                      $startMessage = 1;
                }
 
-
                $real_startMessage = $numMessages - $startMessage + 1;
-               $real_endMessage = $numMessages - $startMessage - $show_num;
+               $real_endMessage = $numMessages - $startMessage - $show_num + 2;
                if ($real_endMessage <= 0)
                   $real_endMessage = 1;
+               $id = array_reverse(range($real_endMessage, $real_startMessage));
+            }
 
-               $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++;
-               }
+            $msgs_list = sqimap_get_small_header_list($imapConnection, $id, $issent);
+            $flags = sqimap_get_flags_list($imapConnection, $id, $issent);
+            foreach ($msgs_list as $hdr) {
+               $from[] = $hdr->from;
+               $date[] = $hdr->date;
+               $subject[] = $hdr->subject;
+               $to[] = $hdr->to;
+               $priority[] = $hdr->priority;
+               $cc[] = $hdr->cc;
+               $size[] = $hdr->size;
+               $type[] = $hdr->type0;
             }
          }
 
          session_unregister("msgs");
          if (($sort == 0) || ($sort == 1))
             $msort = array_cleave ($msgs, 'TIME_STAMP');
-         if (($sort == 2) || ($sort == 3))
+         elseif (($sort == 2) || ($sort == 3))
             $msort = array_cleave ($msgs, 'FROM-SORT');
-         if (($sort == 4) || ($sort == 5))
+         elseif (($sort == 4) || ($sort == 5))
             $msort = array_cleave ($msgs, 'SUBJECT-SORT');
-         if ($sort == 6)
+         else // ($sort == 6)
             $msort = $msgs;
 
          if ($sort < 6) {
-            if($sort % 2) {
+            if ($sort % 2) {
                asort($msort);
             } else {
                arsort($msort);
             next($msort);
          } while ($i && $i < $endVar);
       }
-      echo '</TABLE>';
+      echo '</TABLE></FORM>';
 
       echo "</td></tr>\n";
 
       echo " 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 2: # from
                if ($mailbox == $sent_folder)
-                  echo '   <TD WIDTH="30%"><B>'. _("To") .'</B>';
+                  echo '   <TD WIDTH="25%"><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";
-               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";
-               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>";
+                    echo '   <TD WIDTH="25%"><B>'. _("From") .'</B>';
+              ShowSortButton($sort, $mailbox, 2, 3);
+               echo "</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";
-               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";
-               echo '</TD>';
+               echo '   <TD NOWRAP WIDTH="5%"><B>'. _("Date") .'</B>';
+              ShowSortButton($sort, $mailbox, 0, 1);
+               echo "</TD>\n";
                break;
                
             case 4: # subject
-               echo '   <TD><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";
-               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";
-               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>";
+               echo '   <TD><B>'. _("Subject") .'</B> ';
+              ShowSortButton($sort, $mailbox, 4, 5);
+               echo "</TD>\n";
                break;
                
-            case 6: # size   
-               echo '   <TD WIDTH="1%"><b>' . _("Size")."</b></TD>\n";
+            case 6: # size 
+               echo '   <TD WIDTH="5%"><b>' . _("Size")."</b></TD>\n";
                break;
          }
       }
       echo "</TR>\n";
    }
    
+   function ShowSortButton($sort, $mailbox, $Up, $Down) {
+      if ($sort != $Up && $sort != $Down) {
+         $img = 'sort_none.gif';
+         $which = $Up;
+      } elseif ($sort == $Up) {
+         $img = 'up_pointer.gif';
+        $which = $Down;
+      } else {
+         $img = 'down_pointer.gif';
+        $which = 6;
+      }
+      echo ' <a href="right_main.php?newsort=' . $which . 
+        '&startMessage=1&mailbox=' . urlencode($mailbox) . 
+        '"><IMG SRC="../images/' . $img . 
+        '" BORDER=0 WIDTH=12 HEIGHT=10></a>';
+   }
+   
    function ShowSelectAllLink($startMessage, $sort)
    {
        global $checkall, $PHP_SELF, $what, $where, $mailbox;
-       
-       echo "\n<A HREF=\"$PHP_SELF?mailbox=" . urlencode($mailbox) .
-           "&startMessage=$startMessage&sort=$sort&";
-       if ( isset($checkall) && $checkall == '1')
-           echo "checkall=0";
+
+       // This code is from Philippe Mingo <mingo@rotedic.com>
+    
+       ?>
+<script language="JavaScript">
+<!--
+function CheckAll() {
+  for (var i = 0; i < document.messageList.elements.length; i++) {
+    if( document.messageList.elements[i].name.substr( 0, 3 ) == 'msg') {
+      document.messageList.elements[i].checked =
+        !(document.messageList.elements[i].checked);
+    }
+  }
+}
+window.document.write('<a href="#" onClick="CheckAll();"><?php echo
+ _("Toggle All") ?></A>');
+//-->
+</script><noscript>
+<?PHP
+
+       echo "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox) .
+          "&startMessage=$startMessage&sort=$sort&checkall=";
+       if (isset($checkall) && $checkall == '1')
+           echo '0';
        else
-           echo "checkall=1";
+           echo '1';
        if (isset($where) && isset($what))
-           echo "&where=" . urlencode($where) . "&what=" . urlencode($what);
+           echo '&where=' . urlencode($where) . '&what=' . urlencode($what);
        echo "\">";
        if (isset($checkall) && $checkall == '1')
            echo _("Unselect All");
        else
            echo _("Select All");
-       echo "</A>\n";
+          
+       echo "</A>\n</noscript>\n";
    }
 
    function processSubject($subject)