Happy New Year

[squirrelmail.git] / plugins / listcommands / mailout.php

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index ecba67dc6f179d961c87b8484eed671fc9209216..02ac2a256f91d896ec472b2d8b72d392c59cd6dd 100644 (file)
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -3,7 +3,7 @@
 /**
  * mailout.php
  *
- * @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
@@ -26,6 +26,7 @@ sqgetGlobalVar('send_to', $send_to, SQ_GET);
 sqgetGlobalVar('subject', $subject, SQ_GET);
 sqgetGlobalVar('body',    $body,    SQ_GET);
 sqgetGlobalVar('action',  $action,  SQ_GET);
+sqgetGlobalVar('identity',  $identity,  SQ_GET);
 
 displayPageHeader($color, $mailbox);
 
@@ -40,13 +41,13 @@ switch ( $action ) {
         $out_string = _("This will send a message to %s requesting that you will be unsubscribed from this list. It will try to unsubscribe the adress below.");
         break;
     default:
-        error_box(sprintf(_("Unknown action: %s"),htmlspecialchars($action)));
+        error_box(sprintf(_("Unknown action: %s"),sm_encode_html_special_chars($action)));
         // display footer (closes html tags) and stop script execution
         $oTemplate->display('footer.tpl');
         exit;
 }
 
-$out_string = sprintf($out_string, '"' . htmlspecialchars($send_to) . '"');
+$out_string = sprintf($out_string, '"' . sm_encode_html_special_chars($send_to) . '"');
 $idents = get_identities();
 $fieldsdescr = listcommands_fieldsdescr();
 $fielddescr = $fieldsdescr[$action];
@@ -58,6 +59,7 @@ $oTemplate->assign('subject', $subject);
 $oTemplate->assign('body', $body);
 $oTemplate->assign('mailbox', $mailbox);
 $oTemplate->assign('idents', $idents);
+$oTemplate->assign('identity', $identity);
 
 $oTemplate->display('plugins/listcommands/mailout.tpl');
 $oTemplate->display('footer.tpl');