X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fmailbox_display.php;h=35ee5d4aef4715b392706ea191270591d6a5b6b5;hb=98a9cc036b3aa09a5798963754e011c4bdfaf4fc;hp=cce333f2d497c2596e7cb14894439053bf9cac9c;hpb=20ad4fdd31197811bf33a6d835725739e8f3469c;p=squirrelmail.git

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index cce333f2..35ee5d4a 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -831,15 +831,14 @@ 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', 'markUnflagged',_("Un"));
                         echo getButton('SUBMIT', 'markFlagged',_("Flag"));
                         echo ' ';
-                        echo getButton('SUBMIT', 'markUnflagged',_("Unflag"));
-                        echo ' ';
                     }
+                    echo getButton('SUBMIT', 'markUnread',_("Un"));
                     echo getButton('SUBMIT', 'markRead',_("Read"));
                     echo ' ';
-                    echo getButton('SUBMIT', 'markUnread',_("Unread"));
-                    echo ' ';
+
                     echo getButton('SUBMIT', 'attache',_("Forward"));
                     echo ' ';
                     echo getButton('SUBMIT', 'delete',_("Delete"));
@@ -1054,12 +1053,7 @@ function get_selectall_link($start_msg, $sort, $mailbox) {
                     .  '&what=' . urlencode($what);
         }
         $result .= "\">";
-
-        if (isset($checkall) && ($checkall == '1')) {
-            $result .= _("Unselect All");
-        } else {
-            $result .= _("Select All");
-        }
+        $result .= _("All");
         $result .= "</A>\n";
     }
 
@@ -1372,8 +1366,13 @@ 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, $enabled = TRUE) {
+    $disabled = ( $enabled ? '' : 'disabled ' );
+    return '<INPUT '.$disabled.
+               'TYPE="'.$type.
+             '" NAME="'.$name.
+            '" VALUE="'.$value .
+            '" style="padding: 0px; margin: 0px">';
 }
 
 function getSmallStringCell($string, $align) {