X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fwallmessage.php;h=ad8ca96675d638b5a3a80651843423af9339c9f3;hb=4f58c1a5fc6744a5a471e81fd528ac375d10d4b8;hp=72897c0657f77adc057bc738085d91d1bf9e79d2;hpb=2b161108fe6552ef2effb7b300553f0242b2e49e;p=friendica.git

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 72897c0657..ad8ca96675 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,38 +1,46 @@
 <?php
-
+/**
+ * @file mod/wallmessage.php
+ */
 use Friendica\App;
-
-require_once('include/message.php');
+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) {
 
-	$replyto = get_my_url();
-	if(! $replyto) {
-		notice( t('Permission denied.') . EOL);
+	$replyto = Profile::getMyURL();
+	if (!$replyto) {
+		notice(L10n::t('Permission denied.') . EOL);
 		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]) : '');
-	if((! $recipient) || (! $body)) {
+	$recipient = (($a->argc > 1) ? Strings::escapeTags($a->argv[1]) : '');
+	if ((! $recipient) || (! $body)) {
 		return;
 	}
 
 	$r = q("select * from user where nickname = '%s' limit 1",
-		dbesc($recipient)
+		DBA::escape($recipient)
 	);
 
-	if (! dbm::is_result($r)) {
-		logger('wallmessage: no recipient');
+	if (! DBA::isResult($r)) {
+		Logger::log('wallmessage: no recipient');
 		return;
 	}
 
 	$user = $r[0];
 
-	if(! intval($user['unkmail'])) {
-		notice( t('Permission denied.') . EOL);
+	if (! intval($user['unkmail'])) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -40,63 +48,62 @@ function wallmessage_post(App $a) {
 			intval($user['uid'])
 	);
 
-	if($r[0]['total'] > $user['cntunkmail']) {
-		notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
+	if ($r[0]['total'] > $user['cntunkmail']) {
+		notice(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
 		return;
 	}
 
-	$ret = send_wallmessage($user, $body, $subject, $replyto);
+	$ret = Mail::sendWall($user, $body, $subject, $replyto);
 
-	switch($ret){
+	switch ($ret) {
 		case -1:
-			notice( t('No recipient selected.') . EOL );
+			notice(L10n::t('No recipient selected.') . EOL);
 			break;
 		case -2:
-			notice( t('Unable to check your home location.') . EOL );
+			notice(L10n::t('Unable to check your home location.') . EOL);
 			break;
 		case -3:
-			notice( t('Message could not be sent.') . EOL );
+			notice(L10n::t('Message could not be sent.') . EOL);
 			break;
 		case -4:
-			notice( t('Message collection failure.') . EOL );
+			notice(L10n::t('Message collection failure.') . EOL);
 			break;
 		default:
-			info( t('Message sent.') . EOL );
+			info(L10n::t('Message sent.') . EOL);
 	}
 
-	goaway('profile/'.$user['nickname']);
-
+	$a->internalRedirect('profile/'.$user['nickname']);
 }
 
 
 function wallmessage_content(App $a) {
 
-	if(! get_my_url()) {
-		notice( t('Permission denied.') . EOL);
+	if (!Profile::getMyURL()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
 	$recipient = (($a->argc > 1) ? $a->argv[1] : '');
 
-	if(! $recipient) {
-		notice( t('No recipient.') . EOL);
+	if (!$recipient) {
+		notice(L10n::t('No recipient.') . EOL);
 		return;
 	}
 
 	$r = q("select * from user where nickname = '%s' limit 1",
-		dbesc($recipient)
+		DBA::escape($recipient)
 	);
 
-	if (! dbm::is_result($r)) {
-		notice( t('No recipient.') . EOL);
-		logger('wallmessage: no recipient');
+	if (! DBA::isResult($r)) {
+		notice(L10n::t('No recipient.') . EOL);
+		Logger::log('wallmessage: no recipient');
 		return;
 	}
 
 	$user = $r[0];
 
-	if(! intval($user['unkmail'])) {
-		notice( t('Permission denied.') . EOL);
+	if (!intval($user['unkmail'])) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -104,43 +111,35 @@ function wallmessage_content(App $a) {
 			intval($user['uid'])
 	);
 
-	if($r[0]['total'] > $user['cntunkmail']) {
-		notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
+	if ($r[0]['total'] > $user['cntunkmail']) {
+		notice(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, array(
-		'$baseurl' => $a->get_baseurl(true),
-		'$nickname' => $user['nickname'],
-		'$linkurl' => t('Please enter a link URL:')
-	));
-
-	$tpl = get_markup_template('wallmsg-end.tpl');
-	$a->page['end'] .= replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(true),
-		'$nickname' => $user['nickname'],
-		'$linkurl' => t('Please enter a link URL:')
-	));
-
-	$tpl = get_markup_template('wallmessage.tpl');
-	$o .= replace_macros($tpl,array(
-		'$header' => t('Send Private Message'),
-		'$subheader' => sprintf( 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' => t('To:'),
-		'$subject' => t('Subject:'),
-		'$recipname' => $user['username'],
+	$tpl = Renderer::getMarkupTemplate('wallmsg-header.tpl');
+	$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+		'$baseurl' => System::baseUrl(true),
 		'$nickname' => $user['nickname'],
-		'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-		'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
-		'$readonly' => '',
-		'$yourmessage' => t('Your message:'),
-		'$select' => $select,
-		'$parent' => '',
-		'$upload' => t('Upload photo'),
-		'$insert' => t('Insert web link'),
-		'$wait' => t('Please wait')
-	));
+		'$linkurl' => L10n::t('Please enter a link URL:')
+	]);
+
+	$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'    => $_REQUEST['subject'] ?? '',
+		'$text'       => $_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;
 }