Merge pull request #10899 from annando/profile-photo

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 3ab1529a08cfc1a104857805d6955cdf7632dabb..2143f73af283181f4bb09f5c7dc4bf1edec9df0a 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -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;
@@ -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)) {
@@ -219,7 +219,7 @@ function ping_init(App $a)
                        $all_events = count($ev);
 
                        if ($all_events) {
-                               $str_now = DateTimeFormat::timezoneNow($a->getTimeZone(), 'Y-m-d');
+                               $str_now = DateTimeFormat::localNow('Y-m-d');
                                foreach ($ev as $x) {
                                        $bd = false;
                                        if ($x['type'] === 'birthday') {
@@ -228,7 +228,7 @@ function ping_init(App $a)
                                        } else {
                                                $events ++;
                                        }
-                                       if (DateTimeFormat::convert($x['start'], ((intval($x['adjust'])) ? $a->getTimeZone() : 'UTC'), 'UTC', 'Y-m-d') === $str_now) {
+                                       if (DateTimeFormat::local($x['start'], 'Y-m-d') === $str_now) {
                                                $all_events_today ++;
                                                if ($bd) {
                                                        $birthdays_today ++;
@@ -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;