Update mod/salmon.php

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 085201fc44e213bcf56db63e0d89322746400563..6e0ea0caf2019d720e55ceeef5019fffc39bf898 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file mod/wallmessage.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @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\Logger;
 use Friendica\Core\Renderer;
@@ -9,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'])) : '');
 
-       $recipient = (($a->argc > 1) ? Strings::escapeTags($a->argv[1]) : '');
+       $recipient = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(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;
        }
@@ -56,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']);
@@ -78,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;
        }