Changes in delete_move_next

Fernando Gozalo <[email protected]> Sat, 20 Feb 2010 16:29:11 +0100

Newsgroups	gmane.mail.squirrelmail.devel
Message-ID	<[email protected]>

Hi,

I'm using the latest squirrelmail snapshot. I think the modification of 
the plugin delete_move_next put the condition

	if ($delete_move_next_show_unread == 'on')

in a wrong place.

I attach a patch.

Regards,
Fernando.

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev

-----
squirrelmail-devel mailing list
Posting guidelines: http://squirrelmail.org/postingguidelines
List address: [email protected]
List archives: http://news.gmane.org/gmane.mail.squirrelmail.devel
List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-devel

delete_move_next.diff (text/plain, 1.7 KB)

--- plugins/delete_move_next/setup.original.php	2010-02-20 15:58:17.447971000 +0100
+++ plugins/delete_move_next/setup.php	2010-02-20 16:09:00.541265000 +0100
@@ -198,15 +198,15 @@
             }
         }
         if ($next > 0){
-            echo "<a href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;unread_id=$passed_id&amp;smtoken=" . sm_generate_security_token() . "\">" . _("Unread &amp; Next") . "</a>";
             if ($delete_move_next_show_unread == 'on') {
-                echo "&nbsp;|&nbsp;<a href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;delete_id=$passed_id&amp;smtoken=" . sm_generate_security_token() . "\">" . _("Delete &amp; Next") . "</a>";
+                echo "<a href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;unread_id=$passed_id&amp;smtoken=" . sm_generate_security_token() . "\">" . _("Unread &amp; Next") . "</a>" . "&nbsp;|&nbsp;";
             }
+            echo "<a href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;delete_id=$passed_id&amp;smtoken=" . sm_generate_security_token() . "\">" . _("Delete &amp; Next") . "</a>";
         } else {
-            echo _("Delete &amp; Next");
             if ($delete_move_next_show_unread == 'on') {
-                echo "&nbsp;|&nbsp;" . _("Unread &amp; Next");
+                echo _("Unread &amp; Next") . "&nbsp;|&nbsp;";
             }
+            echo _("Delete &amp; Next");
         }
         echo '</small></td></tr>';