X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwallmessage.php;h=3f9d24ac35cffd65b1b3b19fd2c754a852b86672;hb=cfac13790bc1948697b76b9a6134b61c7bb3173b;hp=e5b482a65e94ed4eb3f9a1e09187e6a2421a0c3b;hpb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;p=friendica.git

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index e5b482a65e..3f9d24ac35 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,45 +26,38 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Mail;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Util\Strings;
 
 function wallmessage_post(App $a) {
 
 	$replyto = Profile::getMyURL();
 	if (!$replyto) {
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
-	$subject   = (!empty($_REQUEST['subject'])   ? Strings::escapeTags(trim($_REQUEST['subject']))   : '');
-	$body      = (!empty($_REQUEST['body'])      ? Strings::escapeHtml(trim($_REQUEST['body'])) : '');
+	$subject   = trim($_REQUEST['subject'] ?? '');
+	$body      = Strings::escapeHtml(trim($_REQUEST['body'] ?? ''));
 
-	$recipient = (($a->argc > 1) ? Strings::escapeTags($a->argv[1]) : '');
+	$recipient = ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : '');
 	if ((! $recipient) || (! $body)) {
 		return;
 	}
 
-	$r = q("select * from user where nickname = '%s' limit 1",
-		DBA::escape($recipient)
-	);
-
-	if (! DBA::isResult($r)) {
-		Logger::log('wallmessage: no recipient');
+	$user = User::getByNickname($recipient);
+	if (empty($r)) {
+		Logger::notice('wallmessage: no recipient');
 		return;
 	}
 
-	$user = $r[0];
-
-	if (! intval($user['unkmail'])) {
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+	if (!$user['unkmail']) {
+		notice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
-	$r = q("select count(*) as total from mail where uid = %d and created > UTC_TIMESTAMP() - INTERVAL 1 day and unknown = 1",
-			intval($user['uid'])
-	);
-
-	if ($r[0]['total'] > $user['cntunkmail']) {
+	$total = DBA::count('mail', ["`uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 1 DAY AND `unknown`", $user['uid']]);
+	if ($total > $user['cntunkmail']) {
 		notice(DI::l10n()->t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
 		return;
 	}
@@ -73,19 +66,17 @@ function wallmessage_post(App $a) {
 
 	switch ($ret) {
 		case -1:
-			notice(DI::l10n()->t('No recipient selected.') . EOL);
+			notice(DI::l10n()->t('No recipient selected.'));
 			break;
 		case -2:
-			notice(DI::l10n()->t('Unable to check your home location.') . EOL);
+			notice(DI::l10n()->t('Unable to check your home location.'));
 			break;
 		case -3:
-			notice(DI::l10n()->t('Message could not be sent.') . EOL);
+			notice(DI::l10n()->t('Message could not be sent.'));
 			break;
 		case -4:
-			notice(DI::l10n()->t('Message collection failure.') . EOL);
+			notice(DI::l10n()->t('Message collection failure.'));
 			break;
-		default:
-			info(DI::l10n()->t('Message sent.') . EOL);
 	}
 
 	DI::baseUrl()->redirect('profile/'.$user['nickname']);
@@ -95,39 +86,32 @@ function wallmessage_post(App $a) {
 function wallmessage_content(App $a) {
 
 	if (!Profile::getMyURL()) {
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
-	$recipient = (($a->argc > 1) ? $a->argv[1] : '');
+	$recipient = ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : '');
 
 	if (!$recipient) {
-		notice(DI::l10n()->t('No recipient.') . EOL);
+		notice(DI::l10n()->t('No recipient.'));
 		return;
 	}
 
-	$r = q("select * from user where nickname = '%s' limit 1",
-		DBA::escape($recipient)
-	);
+	$user = User::getByNickname($recipient);
 
-	if (! DBA::isResult($r)) {
-		notice(DI::l10n()->t('No recipient.') . EOL);
-		Logger::log('wallmessage: no recipient');
+	if (empty($user)) {
+		notice(DI::l10n()->t('No recipient.'));
+		Logger::notice('wallmessage: no recipient');
 		return;
 	}
 
-	$user = $r[0];
-
-	if (!intval($user['unkmail'])) {
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+	if (!$user['unkmail']) {
+		notice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
-	$r = q("select count(*) as total from mail where uid = %d and created > UTC_TIMESTAMP() - INTERVAL 1 day and unknown = 1",
-			intval($user['uid'])
-	);
-
-	if ($r[0]['total'] > $user['cntunkmail']) {
+	$total = DBA::count('mail', ["`uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 1 DAY AND `unknown`", $user['uid']]);
+	if ($total > $user['cntunkmail']) {
 		notice(DI::l10n()->t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
 		return;
 	}