Update usages of User::updatePassword

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 06b3720f730c12783b17d2ac6250bf1705ec56db..780230b8c700e479dfc28744b41877ddb9b88f40 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -20,10 +20,10 @@ function wallmessage_post(App $a) {
                return;
        }
 
-       $subject   = ((x($_REQUEST,'subject'))   ? Strings::removeTags(trim($_REQUEST['subject']))   : '');
-       $body      = ((x($_REQUEST,'body'))      ? Strings::escapeHtml(trim($_REQUEST['body'])) : '');
+       $subject   = (!empty($_REQUEST['subject'])   ? Strings::escapeTags(trim($_REQUEST['subject']))   : '');
+       $body      = (!empty($_REQUEST['body'])      ? Strings::escapeHtml(trim($_REQUEST['body'])) : '');
 
-       $recipient = (($a->argc > 1) ? Strings::removeTags($a->argv[1]) : '');
+       $recipient = (($a->argc > 1) ? Strings::escapeTags($a->argv[1]) : '');
        if ((! $recipient) || (! $body)) {
                return;
        }
@@ -125,20 +125,20 @@ function wallmessage_content(App $a) {
 
        $tpl = Renderer::getMarkupTemplate('wallmessage.tpl');
        $o = Renderer::replaceMacros($tpl, [
-               '$header' => L10n::t('Send Private Message'),
-               '$subheader' => L10n::t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.', $user['username']),
-               '$to' => L10n::t('To:'),
-               '$subject' => L10n::t('Subject:'),
-               '$recipname' => $user['username'],
-               '$nickname' => $user['nickname'],
-               '$subjtxt' => ((x($_REQUEST, 'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-               '$text' => ((x($_REQUEST, 'body')) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : ''),
-               '$readonly' => '',
-               '$yourmessage' => L10n::t('Your message:'),
-               '$parent' => '',
-               '$upload' => L10n::t('Upload photo'),
-               '$insert' => L10n::t('Insert web link'),
-               '$wait' => L10n::t('Please wait')
+               '$header'     => L10n::t('Send Private Message'),
+               '$subheader'  => L10n::t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.', $user['username']),
+               '$to'         => L10n::t('To:'),
+               '$subject'    => L10n::t('Subject:'),
+               '$recipname'  => $user['username'],
+               '$nickname'   => $user['nickname'],
+               '$subjtxt'    => defaults($_REQUEST, 'subject', ''),
+               '$text'       => defaults($_REQUEST, 'body', ''),
+               '$readonly'   => '',
+               '$yourmessage'=> L10n::t('Your message:'),
+               '$parent'     => '',
+               '$upload'     => L10n::t('Upload photo'),
+               '$insert'     => L10n::t('Insert web link'),
+               '$wait'       => L10n::t('Please wait')
        ]);
 
        return $o;