[SM-CVS] CVS: squirrelmail/src read_body.php,1.303,1.304

[Erin S. <ebu...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4243/src

Modified Files:
	read_body.php 
Log Message:
Move over the options for DMN.
I cheated here - I took away all the top bottom crap and just said
yes or no do you want Delete & Prev and Delete & Next links.

To the translation team - spank me with a paddle, I changed a string.
I tried to avoid it, but the option string just wasn't right for core..




Index: read_body.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/read_body.php,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -w -r1.303 -r1.304
--- read_body.php	28 Jan 2004 01:09:34 -0000	1.303
+++ read_body.php	28 Jan 2004 04:10:26 -0000	1.304
@@ -490,7 +490,7 @@
     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;
 
     $topbar_delimiter = ' | ';
     $double_delimiter = '    ';
@@ -577,7 +577,8 @@
 
         // 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' ) {
+        $delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_display', 1);
+        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.
@@ -955,12 +956,7 @@
     }
 }
 
-// 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);
-}
-
 
 do_hook('read_body_bottom');
 do_hook('html_bottom');