X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwallmessage.php;h=d93104644ed6462426b2dbb3afec7517f35b76d3;hb=1938ec3ebecd71c806d1cddf2400786a649a8c40;hp=5606b6feede6a6ed35c26f5512ae5cf7cb403303;hpb=413424064c30c3b799f03ed728ab0a3f8f5eb424;p=friendica.git

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 5606b6feed..d93104644e 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -4,10 +4,13 @@
  */
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Mail;
 use Friendica\Model\Profile;
+use Friendica\Util\Strings;
 
 function wallmessage_post(App $a) {
 
@@ -17,10 +20,10 @@ function wallmessage_post(App $a) {
 		return;
 	}
 
-	$subject   = ((x($_REQUEST,'subject'))   ? notags(trim($_REQUEST['subject']))   : '');
-	$body      = ((x($_REQUEST,'body'))      ? escape_tags(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) ? notags($a->argv[1]) : '');
+	$recipient = (($a->argc > 1) ? Strings::escapeTags($a->argv[1]) : '');
 	if ((! $recipient) || (! $body)) {
 		return;
 	}
@@ -30,7 +33,7 @@ function wallmessage_post(App $a) {
 	);
 
 	if (! DBA::isResult($r)) {
-		logger('wallmessage: no recipient');
+		Logger::log('wallmessage: no recipient');
 		return;
 	}
 
@@ -69,7 +72,7 @@ function wallmessage_post(App $a) {
 			info(L10n::t('Message sent.') . EOL);
 	}
 
-	goaway('profile/'.$user['nickname']);
+	$a->internalRedirect('profile/'.$user['nickname']);
 }
 
 
@@ -93,7 +96,7 @@ function wallmessage_content(App $a) {
 
 	if (! DBA::isResult($r)) {
 		notice(L10n::t('No recipient.') . EOL);
-		logger('wallmessage: no recipient');
+		Logger::log('wallmessage: no recipient');
 		return;
 	}
 
@@ -113,30 +116,23 @@ function wallmessage_content(App $a) {
 		return;
 	}
 
-	$tpl = get_markup_template('wallmsg-header.tpl');
-	$a->page['htmlhead'] .= replace_macros($tpl, [
+	$tpl = Renderer::getMarkupTemplate('wallmsg-header.tpl');
+	$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
 		'$baseurl' => System::baseUrl(true),
 		'$nickname' => $user['nickname'],
 		'$linkurl' => L10n::t('Please enter a link URL:')
 	]);
 
-	$tpl = get_markup_template('wallmsg-end.tpl');
-	$a->page['end'] .= replace_macros($tpl, [
-		'$baseurl' => System::baseUrl(true),
-		'$nickname' => $user['nickname'],
-		'$linkurl' => L10n::t('Please enter a link URL:')
-	]);
-
-	$tpl = get_markup_template('wallmessage.tpl');
-	$o = replace_macros($tpl, [
+	$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')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+		'$subjtxt' => (!empty($_REQUEST['subject']) ? strip_tags($_REQUEST['subject']) : ''),
+		'$text' => (!empty($_REQUEST['body']) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : ''),
 		'$readonly' => '',
 		'$yourmessage' => L10n::t('Your message:'),
 		'$parent' => '',