X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwallmessage.php;h=cbf53b45d62c39548040409fe465cf3a0a4278f8;hb=215c6ecc14b799dc5359fd933275d9307ccd35ed;hp=5e08420ecb109f6cd16767574f51815982038c9e;hpb=103535d6206e9f2c2260d0554ecc41d31baaf9dd;p=friendica.git

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 5e08420ecb..cbf53b45d6 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,26 +1,45 @@
 <?php
 /**
- * @file mod/wallmessage.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Mail;
 use Friendica\Model\Profile;
+use Friendica\Util\Strings;
 
 function wallmessage_post(App $a) {
 
 	$replyto = Profile::getMyURL();
 	if (!$replyto) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		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,14 +49,14 @@ function wallmessage_post(App $a) {
 	);
 
 	if (! DBA::isResult($r)) {
-		logger('wallmessage: no recipient');
+		Logger::log('wallmessage: no recipient');
 		return;
 	}
 
 	$user = $r[0];
 
 	if (! intval($user['unkmail'])) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
@@ -46,7 +65,7 @@ function wallmessage_post(App $a) {
 	);
 
 	if ($r[0]['total'] > $user['cntunkmail']) {
-		notice(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
+		notice(DI::l10n()->t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
 		return;
 	}
 
@@ -54,36 +73,34 @@ function wallmessage_post(App $a) {
 
 	switch ($ret) {
 		case -1:
-			notice(L10n::t('No recipient selected.') . EOL);
+			notice(DI::l10n()->t('No recipient selected.'));
 			break;
 		case -2:
-			notice(L10n::t('Unable to check your home location.') . EOL);
+			notice(DI::l10n()->t('Unable to check your home location.'));
 			break;
 		case -3:
-			notice(L10n::t('Message could not be sent.') . EOL);
+			notice(DI::l10n()->t('Message could not be sent.'));
 			break;
 		case -4:
-			notice(L10n::t('Message collection failure.') . EOL);
+			notice(DI::l10n()->t('Message collection failure.'));
 			break;
-		default:
-			info(L10n::t('Message sent.') . EOL);
 	}
 
-	goaway('profile/'.$user['nickname']);
+	DI::baseUrl()->redirect('profile/'.$user['nickname']);
 }
 
 
 function wallmessage_content(App $a) {
 
 	if (!Profile::getMyURL()) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
 	$recipient = (($a->argc > 1) ? $a->argv[1] : '');
 
 	if (!$recipient) {
-		notice(L10n::t('No recipient.') . EOL);
+		notice(DI::l10n()->t('No recipient.'));
 		return;
 	}
 
@@ -92,15 +109,15 @@ function wallmessage_content(App $a) {
 	);
 
 	if (! DBA::isResult($r)) {
-		notice(L10n::t('No recipient.') . EOL);
-		logger('wallmessage: no recipient');
+		notice(DI::l10n()->t('No recipient.'));
+		Logger::log('wallmessage: no recipient');
 		return;
 	}
 
 	$user = $r[0];
 
 	if (!intval($user['unkmail'])) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
@@ -109,33 +126,33 @@ function wallmessage_content(App $a) {
 	);
 
 	if ($r[0]['total'] > $user['cntunkmail']) {
-		notice(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
+		notice(DI::l10n()->t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
 		return;
 	}
 
-	$tpl = get_markup_template('wallmsg-header.tpl');
-	$a->page['htmlhead'] .= replace_macros($tpl, [
-		'$baseurl' => System::baseUrl(true),
+	$tpl = Renderer::getMarkupTemplate('wallmsg-header.tpl');
+	DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+		'$baseurl' => DI::baseUrl()->get(true),
 		'$nickname' => $user['nickname'],
-		'$linkurl' => L10n::t('Please enter a link URL:')
+		'$linkurl' => DI::l10n()->t('Please enter a link URL:')
 	]);
 
-	$tpl = get_markup_template('wallmessage.tpl');
-	$o = replace_macros($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'])) : ''),
-		'$readonly' => '',
-		'$yourmessage' => L10n::t('Your message:'),
-		'$parent' => '',
-		'$upload' => L10n::t('Upload photo'),
-		'$insert' => L10n::t('Insert web link'),
-		'$wait' => L10n::t('Please wait')
+	$tpl = Renderer::getMarkupTemplate('wallmessage.tpl');
+	$o = Renderer::replaceMacros($tpl, [
+		'$header'     => DI::l10n()->t('Send Private Message'),
+		'$subheader'  => DI::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'         => DI::l10n()->t('To:'),
+		'$subject'    => DI::l10n()->t('Subject:'),
+		'$recipname'  => $user['username'],
+		'$nickname'   => $user['nickname'],
+		'$subjtxt'    => $_REQUEST['subject'] ?? '',
+		'$text'       => $_REQUEST['body'] ?? '',
+		'$readonly'   => '',
+		'$yourmessage'=> DI::l10n()->t('Your message:'),
+		'$parent'     => '',
+		'$upload'     => DI::l10n()->t('Upload photo'),
+		'$insert'     => DI::l10n()->t('Insert web link'),
+		'$wait'       => DI::l10n()->t('Please wait')
 	]);
 
 	return $o;