Fixed max value check, improved request value fetching

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index db5bc044611c20926c8de055bde728053aaa0285..5399129d43e8cc2b2a8bc76f276ffa78ddcd31eb 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.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
  *
@@ -22,7 +22,7 @@
 use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -175,20 +175,20 @@ function ping_init(App $a)
                        }
                }
 
-               $intros1 = q(
+               $intros1 = DBA::toArray(DBA::p(
                        "SELECT  `intro`.`id`, `intro`.`datetime`,
-                       `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
-                       FROM `intro` INNER JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-                       WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`fid` != 0",
-                       intval(local_user())
-               );
-               $intros2 = q(
+                       `contact`.`name`, `contact`.`url`, `contact`.`photo`
+                       FROM `intro` INNER JOIN `contact` ON `intro`.`suggest-cid` = `contact`.`id`
+                       WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`suggest-cid` != 0",
+                       local_user()
+               ));
+               $intros2 = DBA::toArray(DBA::p(
                        "SELECT `intro`.`id`, `intro`.`datetime`,
                        `contact`.`name`, `contact`.`url`, `contact`.`photo`
                        FROM `intro` INNER JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-                       WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`fid` = 0 OR `intro`.`fid` IS NULL)",
-                       intval(local_user())
-               );
+                       WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`suggest-cid` = 0 OR `intro`.`suggest-cid` IS NULL)",
+                       local_user()
+               ));
 
                $intro_count = count($intros1) + count($intros2);
                $intros = $intros1 + $intros2;
@@ -196,7 +196,7 @@ function ping_init(App $a)
                $myurl = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
                $mail_count = DBA::count('mail', ["`uid` = ? AND NOT `seen` AND `from-url` != ?", local_user(), $myurl]);
 
-               if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && is_site_admin()) {
+               if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && $a->isSiteAdmin()) {
                        $regs = Friendica\Model\Register::getPending();
 
                        if (DBA::isResult($regs)) {
@@ -207,7 +207,7 @@ function ping_init(App $a)
                $cachekey = "ping_init:".local_user();
                $ev = DI::cache()->get($cachekey);
                if (is_null($ev)) {
-                       $ev = DBA::selectToArray('event', ['type', 'start', 'adjust'],
+                       $ev = DBA::selectToArray('event', ['type', 'start'],
                                ["`uid` = ? AND `start` < ? AND `finish` > ? AND NOT `ignore`",
                                local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utcNow()]);
                        if (DBA::isResult($ev)) {
@@ -397,17 +397,17 @@ function ping_get_notifications($uid)
        $quit    = false;
 
        do {
-               $r = q(
+               $r = DBA::toArray(DBA::p(
                        "SELECT `notify`.*, `post`.`visible`, `post`.`deleted`
                        FROM `notify` LEFT JOIN `post` ON `post`.`uri-id` = `notify`.`uri-id`
-                       WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
-                       AND NOT (`notify`.`type` IN (%d, %d))
-                       AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",
-                       intval($uid),
-                       intval(Notification\Type::INTRO),
-                       intval(Notification\Type::MAIL),
-                       intval($offset)
-               );
+                       WHERE `notify`.`uid` = ? AND `notify`.`msg` != ''
+                       AND NOT (`notify`.`type` IN (?, ?))
+                       AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT ?, 50",
+                       $uid,
+                       Notification\Type::INTRO,
+                       Notification\Type::MAIL,
+                       $offset
+               ));
 
                if (!$r && !$seen) {
                        $seen = true;