Fix missing/wrong IHandleUserSessions usages

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 6e0ea0caf2019d720e55ceeef5019fffc39bf898..2b4b8d2a505ba1f630ac0aac73cd1777be682ed7 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,20 +27,21 @@ use Friendica\DI;
 use Friendica\Model\Mail;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
 function wallmessage_post(App $a) {
 
        $replyto = Profile::getMyURL();
        if (!$replyto) {
-               notice(DI::l10n()->t('Permission denied.'));
+               DI::sysmsg()->addNotice(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 = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(DI::args()->getArgv()[1]) : '');
+       $recipient = ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : '');
        if ((! $recipient) || (! $body)) {
                return;
        }
@@ -52,13 +53,13 @@ function wallmessage_post(App $a) {
        }
 
        if (!$user['unkmail']) {
-               notice(DI::l10n()->t('Permission denied.'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
-       $total = DBA::count('mail', ["`uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 1 DAY AND `unknown`", $user['uid']]);
+       $total = DBA::count('mail', ["`uid` = ? AND `created` > ? AND `unknown`", $user['uid'], DateTimeFormat::utc('now - 1 day')]);
        if ($total > $user['cntunkmail']) {
-               notice(DI::l10n()->t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
                return;
        }
 
@@ -66,16 +67,16 @@ function wallmessage_post(App $a) {
 
        switch ($ret) {
                case -1:
-                       notice(DI::l10n()->t('No recipient selected.'));
+                       DI::sysmsg()->addNotice(DI::l10n()->t('No recipient selected.'));
                        break;
                case -2:
-                       notice(DI::l10n()->t('Unable to check your home location.'));
+                       DI::sysmsg()->addNotice(DI::l10n()->t('Unable to check your home location.'));
                        break;
                case -3:
-                       notice(DI::l10n()->t('Message could not be sent.'));
+                       DI::sysmsg()->addNotice(DI::l10n()->t('Message could not be sent.'));
                        break;
                case -4:
-                       notice(DI::l10n()->t('Message collection failure.'));
+                       DI::sysmsg()->addNotice(DI::l10n()->t('Message collection failure.'));
                        break;
        }
 
@@ -86,33 +87,33 @@ function wallmessage_post(App $a) {
 function wallmessage_content(App $a) {
 
        if (!Profile::getMyURL()) {
-               notice(DI::l10n()->t('Permission denied.'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
        $recipient = ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : '');
 
        if (!$recipient) {
-               notice(DI::l10n()->t('No recipient.'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('No recipient.'));
                return;
        }
 
        $user = User::getByNickname($recipient);
 
        if (empty($user)) {
-               notice(DI::l10n()->t('No recipient.'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('No recipient.'));
                Logger::notice('wallmessage: no recipient');
                return;
        }
 
        if (!$user['unkmail']) {
-               notice(DI::l10n()->t('Permission denied.'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
-       $total = DBA::count('mail', ["`uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 1 DAY AND `unknown`", $user['uid']]);
+       $total = DBA::count('mail', ["`uid` = ? AND `created` > ? AND `unknown`", $user['uid'], DateTimeFormat::utc('now - 1 day')]);
        if ($total > $user['cntunkmail']) {
-               notice(DI::l10n()->t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
                return;
        }