fsf changes, meant to be rebased on upstream

[squirrelmail.git] / plugins / listcommands / templates / default / mailout.tpl

diff --git a/plugins/listcommands/templates/default/mailout.tpl b/plugins/listcommands/templates/default/mailout.tpl
index 6b6d2d23ab133b2f50c14fc8c2e3742e98d3791e..9a1c5435ffbf6c3634f2a98a855f39f41e70105d 100644 (file)
--- a/plugins/listcommands/templates/default/mailout.tpl
+++ b/plugins/listcommands/templates/default/mailout.tpl
@@ -10,7 +10,7 @@
   *                 configured (an array of list addresses, 
   *                 keyed by an ID number)
   *
-  * @copyright © 1999-2007 The SquirrelMail Project Team
+  * @copyright 1999-2022 The SquirrelMail Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License
   * @version $Id$
   * @package plugins
@@ -41,8 +41,10 @@ extract($t);
     echo '<select name="identity" id="identity">';
     
     foreach($idents as $nr=>$data) {
-        echo '<option value="' . $nr . '">' .
-            htmlspecialchars(
+        echo '<option '
+           . ($identity == $nr ? ' selected="selected" ' : '')
+           . 'value="' . $nr . '">'
+           . sm_encode_html_special_chars(
                     $data['full_name'].' <'.
                     $data['email_address'] . '>') .
             "</option>\n";                 
@@ -53,15 +55,15 @@ extract($t);
 } else {
 
     echo _("From:");
-    echo htmlspecialchars($idents[0]['full_name'].' <'.$idents[0]['email_address'].'>');
+    echo sm_encode_html_special_chars($idents[0]['full_name'].' <'.$idents[0]['email_address'].'>');
 }
 ?>
 <br /><br />
-<input type="hidden" name="send_to" value="<?php echo htmlspecialchars($send_to); ?>" />
-<input type="hidden" name="subject" value="<?php echo htmlspecialchars($subject); ?>" />
-<input type="hidden" name="body" value="<?php echo htmlspecialchars($body); ?>" />
-<input type="hidden" name="mailbox" value="<?php echo htmlspecialchars($mailbox); ?>" />
-<input type="submit" name="send" value="<?php echo _("Send Mail"); ?>" />
+<input type="hidden" name="send_to" value="<?php echo sm_encode_html_special_chars($send_to); ?>" />
+<input type="hidden" name="subject" value="<?php echo sm_encode_html_special_chars($subject); ?>" />
+<input type="hidden" name="body" value="<?php echo sm_encode_html_special_chars($body); ?>" />
+<input type="hidden" name="mailbox" value="<?php echo sm_encode_html_special_chars($mailbox); ?>" />
+<input type="submit" name="send1" value="<?php echo _("Send Mail"); ?>" />
 <br />
 </form>