Confirmation checkbox moved

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2396 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index b8036a66aee42526086a172ee814f8a0276da5f9..e499efe815841ce8933874e428ba00f928d5c567 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -482,6 +482,7 @@ function showInputForm () {
             if ($em != '') {
                 echo htmlspecialchars(' <' . $em . '>') . "\n";
             }
+            echo '</option>';
         }
         echo '</select>' . "\n" .
              '      </TD>' . "\n" .
@@ -556,8 +557,16 @@ function showInputForm () {
     if ($location_of_buttons == 'bottom') {
         showComposeButtonRow();
     } else {
-        echo '   <TR><TD>&nbsp;</TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT ' .
-             'NAME=send VALUE="' . _("Send") . '"></TD></TR>' . "\n";
+        echo '   <TR><TD COLSPAN=2 ALIGN=LEFT>';
+
+        $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
+        if ($default_use_mdn) {
+            if ($mdn_user_support) {
+                echo _("Confirm reading:").
+                    "<input type=\"checkbox\" name=\"request_mdn\" value=1>";
+            }
+        }
+        echo ' &nbsp; <INPUT TYPE=SUBMIT NAME=send VALUE="' . _("Send") . '"></TD></TR>' . "\n";
     }
 
     /* This code is for attachments */
@@ -571,6 +580,7 @@ function showInputForm () {
          ' value="' . _("Add") .'">' . "\n" .
          '     </TD>' . "\n" .
          '   </TR>' . "\n";
+
     if (count($attachments)) {
         $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
         echo '<tr><td bgcolor="' . $color[0] . '" align=right>' . "\n" .
@@ -596,7 +606,7 @@ function showInputForm () {
     echo '<INPUT TYPE=hidden NAME=mailbox VALUE="' . htmlspecialchars($mailbox) .
          "\">\n" .
          '</FORM>';
-    do_hook("compose_bottom");
+    do_hook('compose_bottom');
     echo '</BODY></HTML>' . "\n";
 }
 
@@ -636,14 +646,6 @@ function showComposeButtonRow()
              "</select>";
     }
 
-    $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
-    if ($default_use_mdn) {
-        if ($mdn_user_support) {
-            echo _("Confirm reading:").
-                "<input type=\"checkbox\" name=\"request_mdn\" value=1>";
-        }
-    }
-
     do_hook('compose_button_row');
 
     echo "   </TD></TR>\n\n";