From 7af2f95f1eae98ebd964b197e8601a6fad7a63fe Mon Sep 17 00:00:00 2001
From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 27 Jun 2002 09:15:36 +0000
Subject: [PATCH 1/1] r2l by Yoav

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3017 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/options.php              |  1 -
 plugins/delete_move_next/setup.php | 22 ++++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/functions/options.php b/functions/options.php
index 653dfc0b..d2caed53 100644
--- a/functions/options.php
+++ b/functions/options.php
@@ -421,4 +421,3 @@ function OptionSubmit( $name ) {
 }
 
 ?>
-)
diff --git a/plugins/delete_move_next/setup.php b/plugins/delete_move_next/setup.php
index 4cb6172c..fdaf954b 100644
--- a/plugins/delete_move_next/setup.php
+++ b/plugins/delete_move_next/setup.php
@@ -158,9 +158,10 @@ function delete_move_next_read($currloc) {
 	/* Base is illegal within documents 
         * $location = get_location();
         * echo "<base href=\"$location/\">" . */
-        echo '<table cellspacing=0 width="100%" border=0 cellpadding=2>'.
-             '<tr>'.
-                 "<td bgcolor=\"$color[9]\" width=\"100%\" align=center><small>";
+        echo html_tag( 'table', '', '', '', 'cellspacing="0" width="100%" border="0" cellpadding="2"' ) .
+             html_tag( 'tr' ) .
+             html_tag( 'td', '', 'center', $color[9], 'width="100%"' ) .
+                 '<small>';
     
         if ($prev > 0) {
             echo "<a href=\"read_body.php?passed_id=$prev&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0\">" . _("Previous") . "</A>&nbsp;|&nbsp;\n";
@@ -228,8 +229,8 @@ function delete_move_next_moveNextForm($next) {
            $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
            $imapConnection;
 
-    echo '<tr>'.
-         "<td bgcolor=\"$color[9]\" width=\"100%\" align=\"center\">".
+    echo html_tag( 'tr' ) .
+         html_tag( 'td', '', 'center', $color[9], 'width="100%"' ) .
            '<form action="read_body.php" method="post"><small>'.
             "<input type=\"hidden\" name=\"passed_id\" value=\"$next\">".
             "<input type=\"hidden\" name=\"mailbox\" value=\"".urldecode($urlMailbox)."\">".
@@ -254,8 +255,8 @@ function delete_move_next_moveRightMainForm() {
            $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
            $imapConnection;
 
-    echo '<tr>' .      
-            "<td bgcolor=\"$color[9]\" width=\"100%\" align=\"center\">".
+    echo html_tag( 'tr' ) .
+         html_tag( 'td', '', 'center', $color[9], 'width="100%"' ) .
             '<form action="right_main.php" method="post"><small>' .
             "<input type=\"hidden\" name=\"mailbox\" value=\"".urldecode($urlMailbox)."\">".
             "<input type=\"hidden\" name=\"sort\" value=\"$sort\">".
@@ -301,9 +302,10 @@ function delete_move_next_display_inside() {
         $delete_move_next_t, $delete_move_next_formATtop,
         $delete_move_next_b, $delete_move_next_formATbottom;
     
-    echo "<tr><td align=right valign=top>\n".
-         _("Delete/Move/Next Buttons:") . "</td>\n".
-         "<td><input type=checkbox name=delete_move_next_ti";
+    echo html_tag( 'tr' ) .
+         html_tag( 'td', _("Delete/Move/Next Buttons:"), 'right', '', 'valign="top"' ) . "\n" .
+         html_tag( 'td', '', 'left' ) .
+         '<input type=checkbox name=delete_move_next_ti';
          
     if ($delete_move_next_t == 'on') {
         echo " checked";
-- 
2.25.1