Adding full locale names. Enabled ukrainian and russian-ukrainian

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index b1194317eaa99a4e7c1a13df71d2d514f9ae1dd6..9fcefb9ceb46aa91c9fa360a341d9840abb6c56b 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -3,7 +3,7 @@
 /**
  * read_body.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file is used for reading the msgs array and displaying
@@ -490,7 +490,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
     global $base_uri, $draft_folder, $where, $what, $color, $sort,
            $startMessage, $PHP_SELF, $save_as_draft, $uid_support,
            $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox,
-           $delete_move_next_t, $delete_move_next_b;
+           $data_dir, $username, $delete_prev_next_display;
 
     $topbar_delimiter = ' | ';
     $double_delimiter = '    ';
@@ -552,7 +552,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
         }
 
         $nav_row .= $prev_link . $up_link . $topbar_delimiter . $next_link;
-        $nav_row .= $double_delimiter . '<a href="'.$url.'">'._("View Message").'</a>';
+        $nav_row .= $double_delimiter . '[<a href="'.$url.'">'._("View Message").'</a>]';
 
     // Prev/Next links for regular messages
     } else if ( !(isset($where) && isset($what)) ) {
@@ -577,7 +577,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
 
         // Only bother with Delete & Prev and Delete & Next IF
         // we have UID support, and top display is enabled.
-        if ( $uid_support && $delete_move_next_t == 'on' ) {
+        if ( $uid_support && $delete_prev_next_display == 1 ) {
             $del_prev_link = _("Delete & Prev");
             if ($prev >= 0) {
                 $uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
@@ -586,7 +586,6 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
                        '&amp;delete_id='.$passed_id;
                 $del_prev_link = '<a href="'.$uri.'">'.$del_prev_link.'</a>';       
             }
-            $del_prev_link .= $topbar_delimiter;
 
             $del_next_link = _("Delete & Next");
             if ($next >= 0) {
@@ -596,15 +595,11 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
                        '&amp;delete_id='.$passed_id;
                 $del_next_link = '<a href="'.$uri.'">'.$del_next_link.'</a>';
             }
-            $del_next_link .= $topbar_delimiter;
-        } else {
-            $del_prev_link = '';
-            $del_next_link = '';
         }
 
-        $nav_row .= $prev_link.$topbar_delimiter 
-                    .$del_prev_link.$del_next_link 
-                    .$next_link;
+        $nav_row .= '['.$prev_link.$topbar_delimiter.$next_link.']';
+        if ( isset($del_prev_link) && isset($del_next_link) )
+            $nav_row .= $double_delimiter.'['.$del_prev_link.$topbar_delimiter.$del_next_link.']';
     }
 
     // Start with Search Results or Message List link.
@@ -618,7 +613,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
         $msgs_str  = _("Message List");
     }
     $nav_row .= $double_delimiter .
-                '<a href="' . $msgs_url . '">' . $msgs_str . '</a>';
+                '[<a href="' . $msgs_url . '">' . $msgs_str . '</a>]';
 
     $nav_row .= '</small></td></tr>';
 
@@ -643,22 +638,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
         $menu_row .= $topbar_delimiter;
     }
 
-    $delete_link = _("Delete");
-    if (!(isset($passed_ent_id) && $passed_ent_id)) {
-        $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox .
-                  '&amp;message=' . $passed_id . '&amp;';
-
-        if ($where && $what) {
-            $delete_url .= 'where=' . urlencode($where) . '&amp;what=' . urlencode($what);
-        } else {
-            $delete_url .= 'sort=' . $sort . '&amp;startMessage=' . $startMessage;
-        }
-        $delete_link = '<a href="' . $delete_url . '">' . $delete_link . '</a>';
-    }
-    $menu_row .= $delete_link;
-
     $comp_action_uri = $comp_uri . '&amp;smaction=reply';
-    $menu_row .= $topbar_delimiter;
     $menu_row .= makeComposeLink($comp_action_uri, _("Reply"));
 
     $comp_action_uri = $comp_uri . '&amp;smaction=reply_all';
@@ -676,6 +656,24 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
         $menu_row .= makeComposeLink($comp_action_uri, _("Forward as Attachment"));
     }
 
+    $delete_link = _("Delete");
+    if (!(isset($passed_ent_id) && $passed_ent_id)) {
+        $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox .
+                  '&amp;message=' . $passed_id . '&amp;';
+
+        if ($where && $what) {
+            $delete_url .= 'where=' . urlencode($where) . '&amp;what=' . urlencode($what);
+        } else {
+            $delete_url .= 'sort=' . $sort . '&amp;startMessage=' . $startMessage;
+        }
+        $delete_link = '<a href="' . $delete_url . '">' . $delete_link . '</a>';
+        $delete_link .= '&nbsp;(<a href="' . $delete_url.'&amp;bypass_trash=1">'
+                        ._("Bypass Trash").'</a>)';
+        
+    }
+    $menu_row .= $topbar_delimiter.$delete_link;
+
+
     // Add top move link
     $menu_row .= '</small></td><td align="right">';
     if (!(isset($passed_ent_id) && $passed_ent_id)) {
@@ -777,7 +775,7 @@ if ( sqgetGlobalVar('startMessage', $temp) ) {
 }
 
 /* end of get globals */
-global $uid_support, $sqimap_capabilities, $auto_expunge, $lastTargetMailbox;
+global $uid_support, $sqimap_capabilities, $lastTargetMailbox;
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $mbx_response   = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
@@ -787,11 +785,9 @@ $mbx_response   = sqimap_mailbox_select($imapConnection, $mailbox, false, false,
  * but only if delete_id was set
  */
 if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) {
-//    sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
+    sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
 
-//    if ($auto_expunge) {
-//        sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-//    }    
+    sqimap_mailbox_expunge_dmn($delete_id);
 }
 
 /**
@@ -801,17 +797,15 @@ if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) {
 if ( sqgetGlobalVar('move_id', $move_id, SQ_POST) &&
      sqgetGlobalVar('targetMailbox', $targetMailbox, SQ_POST) ) {
     // Move message
-//    sqimap_messages_copy($imapConnection, $move_id, $move_id, $targetMailbox);
-//    sqimap_messages_flag($imapConnection, $move_id, $move_id, 'Deleted', true);
+    sqimap_messages_copy($imapConnection, $move_id, $move_id, $targetMailbox);
+    sqimap_messages_flag($imapConnection, $move_id, $move_id, 'Deleted', true);
 
-//    if ($auto_expunge) {
-//        sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-//    }
+    sqimap_mailbox_expunge_dmn($move_id);
 
-//    if ($targetMailbox != $lastTargetMailbox) {
-//        $lastTargetMailbox = $targetMailbox;
-//        sqsession_register('lastTargetMailbox' , $lastTargetMailbox);
-//    }
+    if ($targetMailbox != $lastTargetMailbox) {
+        $lastTargetMailbox = $targetMailbox;
+        sqsession_register('lastTargetMailbox' , $lastTargetMailbox);
+    }
 }
 
 
@@ -955,12 +949,7 @@ if (($attachment_common_show_images) &&
     }
 }
 
-// If a bar at the bottom is also wanted, print menu bar again,
-// only upside down.
-if ($delete_move_next_b != 'off') {
-    formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, FALSE);
-}
-
+formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, FALSE);
 
 do_hook('read_body_bottom');
 do_hook('html_bottom');