Making delete button, when viewing a message, consider which page was viewed before

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index e9205e261f29392047fba1769fc0dc851f8b6d40..53b67c41e73466ee7c7699abcf2f73fa7da490c9 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -197,8 +197,8 @@ function printMessageInfo($aMsg) {
     }
     // If Sent, prefix with To: but only if not Sent folder
     if ($bHandleAsSent ^ $bSentFolder) {
-        $senderName = _("To:") . ' ' . $senderName;
-        $senderAddress = _("To:") . ' ' . $senderAddress;
+        $senderName = _("To") . ': ' . $senderName;
+        $senderAddress = _("To") . ': ' . $senderAddress;
     }
 
     // this is a column property which can apply to multiple columns. Do not use vars for one column
@@ -300,7 +300,7 @@ function printMessageInfo($aMsg) {
     $sSubject = str_replace(' ', ' ', decodeHeader($sSubject));
     $subject = processSubject($sSubject, $iIndent);
 
-    echo html_tag( 'tr','','','','VALIGN="top"') . "\n";
+    echo html_tag( 'tr','','','','valign="top"') . "\n";
 
     if (sizeof($index_order)) {
         foreach ($index_order as $index_order_part) {
@@ -771,7 +771,7 @@ function get_sorted_msgs_list($imapConnection,&$aMailbox,&$error) {
         if ($aRes === false) {
             $error = '<b><small><center><font color=red>' .
                 _("Thread sorting is not supported by your IMAP server.") . '<br />' .
-                _("Please report this to the system administrator.") .
+                _("Please contact your system administrator and report this error.") .
                 '</center></small></b>';
             $aMailbox['SORT'] -= SQSORT_THREAD;
         } else {
@@ -785,7 +785,7 @@ function get_sorted_msgs_list($imapConnection,&$aMailbox,&$error) {
         if ($id === false) {
             $error =  '<b><small><center><font color=red>' .
                 _("Server-side sorting is not supported by your IMAP server.") . '<br />' .
-                _("Please report this to the system administrator.") .
+                _("Please contact your system administrator and report this error.") .
                 '</center></small></b>';
         } else {
             $aMailbox['UIDSET'][$iSetIndx] = $id;
@@ -1189,24 +1189,24 @@ function mail_message_listing_beginning ($imapConnection,
     // display flag buttons only if supported
     if ($show_flag_buttons  &&
         in_array('\\flagged',$aMailbox['PERMANENTFLAGS'], true) ) {
-        $button_str .= getButton('SUBMIT', 'markUnflagged', _("Unflag"));
-        $button_str .= getButton('SUBMIT', 'markFlagged',   _("Flag"));
+        $button_str .= getButton('submit', 'markUnflagged', _("Unflag"));
+        $button_str .= getButton('submit', 'markFlagged',   _("Flag"));
         $button_str .= "&nbsp;\n";
     }
     if (in_array('\\seen',$aMailbox['PERMANENTFLAGS'], true)) {
-        $button_str .= getButton('SUBMIT', 'markUnread', _("Unread"));
-        $button_str .= getButton('SUBMIT', 'markRead',   _("Read"));
+        $button_str .= getButton('submit', 'markUnread', _("Unread"));
+        $button_str .= getButton('submit', 'markRead',   _("Read"));
         $button_str .= "&nbsp;\n";
     }
-    $button_str .= getButton('SUBMIT', 'attache',_("Forward")) .
+    $button_str .= getButton('submit', 'attache',_("Forward")) .
                    "&nbsp;\n";
     if (in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) {
-        $button_str .= getButton('SUBMIT', 'delete',_("Delete"));
+        $button_str .= getButton('submit', 'delete',_("Delete"));
         $button_str .= '<input type="checkbox" name="bypass_trash" />' . _("Bypass Trash");
         $button_str .= "&nbsp;\n";
     }
     if (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY') {
-        $button_str .= getButton('SUBMIT', 'expungeButton',_("Expunge"))  .'&nbsp;' . _("mailbox") . "\n";
+        $button_str .= getButton('submit', 'expungeButton',_("Expunge"))  .'&nbsp;' . _("mailbox") . "\n";
         $button_str .= '&nbsp;';
     }
 ?>
@@ -1240,7 +1240,7 @@ function mail_message_listing_beginning ($imapConnection,
                         <select name="targetMailbox">
                             <?php echo sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)), 0, $boxes); ?>
                         </select></tt>&nbsp;
-                        <?php echo getButton('SUBMIT', 'moveButton',_("Move")); ?>
+                        <?php echo getButton('submit', 'moveButton',_("Move")); ?>
                     </small>
                 <?php
                 }
@@ -1745,8 +1745,8 @@ function truncateWithEntities($subject, $trim_at)
         return $subject;
 
     if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
-        function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
-        return $languages[$squirrelmail_language]['XTRA_CODE']('strimwidth', $subject, $trim_val);
+        function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_strimwidth')) {
+        return call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_strimwidth', $subject, $trim_val);
     }
 
     return substr_replace($subject, '...', $trim_val);
@@ -1867,11 +1867,8 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar
                 !in_array($aUid[0],$aMailbox['UIDSET'][$aMailbox['SETINDEX']])) {
                 break;
             }
-            // What kind of hook is this, can it be removed? Disabled for now because it can invalidate the cache
-            //if (!boolean_hook_function('move_messages_button_action', NULL, 1)) {
-                $aUpdatedMsgs = sqimap_msgs_list_delete($imapConnection, $mailbox, $aUid,$bypass_trash);
-                $bExpunge = true;
-            //}
+            $aUpdatedMsgs = sqimap_msgs_list_delete($imapConnection, $mailbox, $aUid,$bypass_trash);
+            $bExpunge = true;
             break;
           case 'unsetDeleted':
           case 'setSeen':
@@ -1899,6 +1896,10 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar
                 $aMailbox['FORWARD_SESSION'] = $composesession;
             }
             break;
+          default:
+            // Hook for plugin buttons
+            do_hook_function('mailbox_display_button_action', $aUid);
+            break;
         }
         /**
          * Updates messages is an array containing the result of the untagged
@@ -2047,4 +2048,4 @@ function attachSelectedMessages($imapConnection,$aMsgHeaders) {
 }
 
 // vim: et ts=4
-?>
+?>
\ No newline at end of file