X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Flistcommands%2Ftemplates%2Fdefault%2Fmailout.tpl;h=45bd84d083aaa87182c641cbc86abb33f44d5252;hp=d9cbea058d746ba31e9f8e0a8344277e88f153e5;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=3ba5c6063eb9282838b862d4f206266d0034e905

diff --git a/plugins/listcommands/templates/default/mailout.tpl b/plugins/listcommands/templates/default/mailout.tpl
index d9cbea05..45bd84d0 100644
--- 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-2018 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,14 +55,14 @@ 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="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>