Bugfix. Single '|' removed.

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index d297debbd461faadb77e3db695c9aa1c4858e076..e8523344f152819de184121693000864e83d07c2 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -71,7 +71,7 @@
          $italic_end = '';
       }
       if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'])
-      { 
+      {
          $fontstr = "<font color=\"$color[9]\">"; 
          $fontstr_end = '</font>'; 
       }
@@ -123,8 +123,15 @@
                    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 " title=\"" . urlencode($msg['SUBJECT']) . 
-                 "\">$flag$subject$flag_end</a>$bold_end</td>\n";
+
+               if ($subject != $msg['SUBJECT']) {
+                  $title = get_html_translation_table(HTML_SPECIALCHARS);
+                  $title = array_flip($title);
+                  $title = strtr($msg['SUBJECT'], $title);
+                  $title = str_replace('"', "''", $title);
+                  echo " title=\"$title\"";
+               }
+               echo ">$flag$subject$flag_end</a>$bold_end</td>\n";
                break;
             case 5: # flags
                $stuff = false;
@@ -134,6 +141,10 @@
                   echo "A\n";
                   $stuff = true;
                }
+               if (ereg('(5)',substr($msg['PRIORITY'],0,1))) {
+                  echo "<font color=$color[8]>v</font>\n";
+                  $stuff = true;
+               }
                if ($msg['TYPE0'] == 'multipart') {
                   echo "+\n";
                   $stuff = true;
@@ -334,7 +345,7 @@
       global $folder_prefix, $sent_folder;
       global $imapServerAddress;
       global $index_order, $real_endMessage, $real_startMessage, $checkall;
-      
+
       // if cache isn't already set, do it now
       if (!session_is_registered('msgs'))
          session_register('msgs');
@@ -366,30 +377,58 @@
          $Message = _("Viewing message") ." <B>$startMessage</B> ($numMessages " . _("total") . ")\n";
       }
 
-      $More = '';
       if ($sort == 6) {
          $use = 0;
       } else {
          $use = 1;
       }
+      $lMore = '';
+      $rMore = '';
       if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
-         $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";
+         $lMore = "<A HREF=\"right_main.php?use_mailbox_cache=$use&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") . '</A>';
+         $rMore = "<A HREF=\"right_main.php?use_mailbox_cache=$use&&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\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";
+         $lMore = "<A HREF=\"right_main.php?use_mailbox_cache=$use&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") . '</A>';
+         $rMore = "<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";
+         $lMore = "<FONT COLOR=\"$color[9]\">"._("Previous") . '</FONT>';
+         $rMore = "<A HREF=\"right_main.php?use_mailbox_cache=$use&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
+      }
+      if( $lMore <> '' )
+       $lMore .= ' | ';
+
+      // Page selector block. Following code computes page links.
+      $mMore = '';
+      if( getPref($data_dir, $username, 'page_selector') && $numMessages > $show_num ) {
+
+        $j = intval( $numMessages / $show_num );
+        if( $numMessages % $show_num <> 0 )
+                $j++;
+        $startMessage = min( $startMessage, $numMessages );
+        for( $i = 0; $i < $j; $i++ ) {
+
+                $start = ( ( $i * $show_num ) + 1 );
+
+                if( $startMessage >= $start &&
+                $startMessage < $start + $show_num ) {
+                $mMore .= '<b>' . ($i+1) . '</b> ';
+                } else {
+                $mMore .= "<a href=\"right_main.php?use_mailbox_cache=$use_mailbox_cache&startMessage=$start" .
+                        "&mailbox=$mailbox\" TARGET=\"right\">" .
+                        ($i+1) .
+                        '</a> ';
+                }
+        }
+        $mMore .= ' | ';
       }
 
       if (! isset($msg))
-          $msg = "";
+          $msg = '';
       mail_message_listing_beginning($imapConnection,
          "move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage",
-          $mailbox, $sort, $Message, $More, $startMessage);
+          $mailbox, $sort, $Message, $lMore . $mMore . $rMore, $startMessage);
 
       $groupNum = $startMessage % ($show_num - 1);
       $real_startMessage = $startMessage;
@@ -448,13 +487,11 @@
 
       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";
+      echo "$lMore$mMore$rMore</td><td align=right>\n";
       if (!$startMessage) $startMessage=1;
       ShowSelectAllLink($startMessage, $sort);
 
-      echo '</td></tr></table>';
-      echo '</td></tr>';
-      echo '</table>'; /** End of message-list table */
+      echo '</td></tr></table></td></tr></table>'; /** End of message-list table */
 
       do_hook('mailbox_index_after');
    }
@@ -486,13 +523,12 @@
       echo "$More</td><td align=right>\n";
       ShowSelectAllLink($startMessage, $sort);
 
-      echo '</td></tr></table>';
-      echo '</td></tr>';
+      echo '</td></tr></table></td></tr>';
 
       /** The delete and move options */
       echo "<TR><TD BGCOLOR=\"$color[0]\">";
 
-      echo "\n\n\n<FORM name=messageList method=post action=\"$moveURL\">\n";
+      echo "\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";