Some more "q" calls and deprecated logging replaced

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 8a74f852c28fd8905a2357b46b77254f23f0cff7..3ab1529a08cfc1a104857805d6955cdf7632dabb 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -194,13 +194,7 @@ function ping_init(App $a)
                $intros = $intros1 + $intros2;
 
                $myurl = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
-               $mails = q(
-                       "SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
-                       WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
-                       intval(local_user()),
-                       DBA::escape($myurl)
-               );
-               $mail_count = count($mails);
+               $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()) {
                        $regs = Friendica\Model\Register::getPending();
@@ -213,14 +207,9 @@ function ping_init(App $a)
                $cachekey = "ping_init:".local_user();
                $ev = DI::cache()->get($cachekey);
                if (is_null($ev)) {
-                       $ev = q(
-                               "SELECT type, start, adjust FROM `event`
-                               WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
-                               ORDER BY `start` ASC ",
-                               intval(local_user()),
-                               DBA::escape(DateTimeFormat::utc('now + 7 days')),
-                               DBA::escape(DateTimeFormat::utcNow())
-                       );
+                       $ev = DBA::selectToArray('event', ['type', 'start', 'adjust'],
+                               ["`uid` = ? AND `start` < ? AND `finish` > ? AND NOT `ignore`",
+                               local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utcNow()]);
                        if (DBA::isResult($ev)) {
                                DI::cache()->set($cachekey, $ev, Duration::HOUR);
                        }
@@ -445,21 +434,17 @@ function ping_get_notifications($uid)
                                $notification["message"] = $notification["msg_cache"];
                        } else {
                                $notification["name"] = strip_tags(BBCode::convert($notification["name"]));
-                               $notification["message"] = Notification::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
-
-                               q(
-                                       "UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
-                                       DBA::escape($notification["name"]),
-                                       DBA::escape($notification["message"]),
-                                       intval($notification["id"])
-                               );
+                               $notification["message"] = \Friendica\Navigation\Notifications\Entity\Notify::formatMessage($notification["name"], BBCode::toPlaintext($notification["msg"]));
+
+                               // @todo Replace this with a call of the Notify model class
+                               DBA::update('notify', ['name_cache' => $notification["name"], 'msg_cache' => $notification["message"]], ['id' => $notification["id"]]);
                        }
 
                        $notification["href"] = DI::baseUrl() . "/notification/" . $notification["id"];
 
                        if ($notification["visible"]
                                && !$notification["deleted"]
-                               && empty($result[$notification['parent']])
+                               && empty($result['p:' . $notification['parent']])
                        ) {
                                // Should we condense the notifications or show them all?
                                if (($notification['verb'] != Activity::POST) || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {