From: Philippe M. <phi...@us...> - 2002-02-09 19:18:30
|
Update of /cvsroot/squirrelmail/squirrelmail/src In directory usw-pr-cvs1:/tmp/cvs-serv9032/src Modified Files: compose.php Log Message: Confirmation checkbox moved Index: compose.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/compose.php,v retrieving revision 1.194 retrieving revision 1.195 diff -u -w -r1.194 -r1.195 --- compose.php 9 Feb 2002 18:47:03 -0000 1.194 +++ compose.php 9 Feb 2002 19:18:27 -0000 1.195 @@ -482,6 +482,7 @@ if ($em != '') { echo htmlspecialchars(' <' . $em . '>') . "\n"; } + echo '</option>'; } echo '</select>' . "\n" . ' </TD>' . "\n" . @@ -556,8 +557,16 @@ if ($location_of_buttons == 'bottom') { showComposeButtonRow(); } else { - echo ' <TR><TD> </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 ' <INPUT TYPE=SUBMIT NAME=send VALUE="' . _("Send") . '"></TD></TR>' . "\n"; } /* This code is for attachments */ @@ -571,6 +580,7 @@ ' 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 @@ echo '<INPUT TYPE=hidden NAME=mailbox VALUE="' . htmlspecialchars($mailbox) . "\">\n" . '</FORM>'; - do_hook("compose_bottom"); + do_hook('compose_bottom'); echo '</BODY></HTML>' . "\n"; } @@ -634,14 +644,6 @@ "<option value=3".($mailprio=='3'?' selected':'').'>'. _("Normal") .'</option>'. "<option value=5".($mailprio=='5'?' selected':'').'>'. _("Low").'</option>'. "</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'); |