removing gettext function. there is no human readable string

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index cce333f2d497c2596e7cb14894439053bf9cac9c..33aa3049c320a432187aadd5ce3c1a32bc545a34 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -282,7 +282,7 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
                 if ($use_icons && $icon_theme != 'none') {
                     $td_str = "<b><small>";
                     if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true) {
-                        $td_str .= _('<IMG SRC="' . SM_PATH . 'images/themes/' . $icon_theme . '/flagged.gif" border="0" height="10" width="10"> ');
+                        $td_str .= '<IMG SRC="' . SM_PATH . 'images/themes/' . $icon_theme . '/flagged.gif" border="0" height="10" width="10"> ';
                     }
                     if ($default_use_priority) {
                         if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) {
@@ -800,6 +800,23 @@ function mail_message_listing_beginning ($imapConnection,
                          '<input type="hidden" name="startMessage" value="'.htmlspecialchars($start_msg).'">'.
                   '<input type="hidden" name="location" value="'.$location.'">';
 
+    /* build thread sorting links */
+    if ($allow_thread_sort == TRUE) {
+      if ($thread_sort_messages == 1 ) {
+        $set_thread = 2;
+        $thread_name = _("Unthread View");
+      } elseif ($thread_sort_messages == 0) {
+        $set_thread = 1;
+        $thread_name = _("Thread View");
+      }
+      $thread_link_str = '<small>[<a href="' . $source_url . '?sort='
+           . $sort . '&start_messages=1&set_thread=' . $set_thread
+           . '&mailbox=' . urlencode($mailbox) . '">' . $thread_name
+           . '</a>]</small>';
+    }
+    else
+        $thread_link_str ='';
+
     /*
      * This is the beginning of the message list table.
      * It wraps around all messages
@@ -815,7 +832,8 @@ function mail_message_listing_beginning ($imapConnection,
           <td>
             <table bgcolor="<?php echo $color[4]; ?>" border="0" width="100%" cellpadding="1"  cellspacing="0">
               <tr>
-                <td align="left"><small><?php echo $paginator; ?></small></td>
+                <td align="left"><small><?php echo $paginator; ?><?php echo $thread_link_str; ?></small></td>
+                <td align="center"></td>
                 <td align="right"><small><?php echo $msg_cnt_str; ?></small></td>
               </tr>
             </table>
@@ -830,16 +848,15 @@ function mail_message_listing_beginning ($imapConnection,
                     
                     // display flag buttons only if supported
                     if ($show_flag_buttons && $mbxresponse != NULL && 
-                        strpos($mbxresponse['PERMANENTFLAGS'], '\Flagged') !== FALSE) {
-                        echo getButton('SUBMIT', 'markFlagged',_("Flag"));
-                        echo '&nbsp;';
+                      strpos($mbxresponse['PERMANENTFLAGS'], '\\Flagged') !== FALSE) {
                         echo getButton('SUBMIT', 'markUnflagged',_("Unflag"));
+                        echo getButton('SUBMIT', 'markFlagged',_("Flag"));
                         echo '&nbsp;';
                     }
-                    echo getButton('SUBMIT', 'markRead',_("Read"));
-                    echo '&nbsp;';
                     echo getButton('SUBMIT', 'markUnread',_("Unread"));
+                    echo getButton('SUBMIT', 'markRead',_("Read"));
                     echo '&nbsp;';
+
                     echo getButton('SUBMIT', 'attache',_("Forward"));
                     echo '&nbsp;';
                     echo getButton('SUBMIT', 'delete',_("Delete"));
@@ -854,22 +871,9 @@ function mail_message_listing_beginning ($imapConnection,
                 </td>
                 <td align="right">
                   <small><?php
-                    /* draws thread sorting links */
-                    if ($allow_thread_sort == TRUE) {
-                      if ($thread_sort_messages == 1 ) {
-                        $set_thread = 2;
-                        $thread_name = _("Unthread View");
-                      } elseif ($thread_sort_messages == 0) {
-                        $set_thread = 1;
-                        $thread_name = _("Thread View");
-                      }
-                      echo '&nbsp;&nbsp;<small>[<a href="' . $source_url . '?sort='
-                           . $sort . '&start_messages=1&set_thread=' . $set_thread
-                           . '&mailbox=' . urlencode($mailbox) . '">' . $thread_name
-                           . '</a>]</small>';
-                    }
+                    //echo $thread_link_str;   //previous behaviour
                     getMbxList($imapConnection);  
-                    echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n";   
+                    echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n";
                   ?></small>
                 </td>
               </tr>
@@ -1054,12 +1058,7 @@ function get_selectall_link($start_msg, $sort, $mailbox) {
                     .  '&amp;what=' . urlencode($what);
         }
         $result .= "\">";
-
-        if (isset($checkall) && ($checkall == '1')) {
-            $result .= _("Unselect All");
-        } else {
-            $result .= _("Select All");
-        }
+        $result .= _("All");
         $result .= "</A>\n";
     }
 
@@ -1372,8 +1371,14 @@ function getMbxList($imapConnection, $boxes = 0) {
     echo '         </SELECT></TT>&nbsp;';
 }
 
-function getButton($type, $name, $value) {
-    return '<INPUT TYPE="'.$type.'" NAME="'.$name.'" VALUE="'.$value . '" style="padding: 0px; margin: 0px">';
+function getButton($type, $name, $value, $js = '', $enabled = TRUE) {
+    $disabled = ( $enabled ? '' : 'disabled ' );
+    $js = ( $js ? $js.' ' : '' );
+    return '<INPUT '.$disabled.$js.
+               'TYPE="'.$type.
+             '" NAME="'.$name.
+            '" VALUE="'.$value .
+            '" style="padding: 0px; margin: 0px">';
 }
 
 function getSmallStringCell($string, $align) {