Merge remote-tracking branch 'upstream/develop' into item-view

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index c6e32a9314c4544f701ecf89c4ac081bd4cda609..762d0a0f8187f0d6a1b4eda6cbc8924df5360633 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -133,7 +133,7 @@ function ping_init(App $a)
                        exit();
                }
 
-               $notifs = ping_get_notifications(local_user());
+               $notifications = ping_get_notifications(local_user());
 
                $condition = ["`unseen` AND `uid` = ? AND NOT `origin` AND (`vid` != ? OR `vid` IS NULL)",
                        local_user(), Verb::getID(Activity::FOLLOW)];
@@ -177,15 +177,15 @@ function ping_init(App $a)
                $intros1 = q(
                        "SELECT  `intro`.`id`, `intro`.`datetime`,
                        `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
-                       FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-                       WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0",
+                       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(
                        "SELECT `intro`.`id`, `intro`.`datetime`,
                        `contact`.`name`, `contact`.`url`, `contact`.`photo`
-                       FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-                       WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
+                       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())
                );
 
@@ -263,8 +263,8 @@ function ping_init(App $a)
                $data['birthdays']        = $birthdays;
                $data['birthdays-today']  = $birthdays_today;
 
-               if (DBA::isResult($notifs)) {
-                       foreach ($notifs as $notif) {
+               if (DBA::isResult($notifications)) {
+                       foreach ($notifications as $notif) {
                                if ($notif['seen'] == 0) {
                                        $sysnotify_count ++;
                                }
@@ -277,30 +277,44 @@ function ping_init(App $a)
                                $notif = [
                                        'id'      => 0,
                                        'href'    => DI::baseUrl() . '/notifications/intros/' . $intro['id'],
-                                       'name'    => $intro['name'],
+                                       'name'    => BBCode::convert($intro['name']),
                                        'url'     => $intro['url'],
                                        'photo'   => $intro['photo'],
                                        'date'    => $intro['datetime'],
                                        'seen'    => false,
                                        'message' => DI::l10n()->t('{0} wants to be your friend'),
                                ];
-                               $notifs[] = $notif;
+                               $notifications[] = $notif;
                        }
                }
 
                if (DBA::isResult($regs)) {
-                       foreach ($regs as $reg) {
+                       if (count($regs) <= 1 || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+                               foreach ($regs as $reg) {
+                                       $notif = [
+                                               'id'      => 0,
+                                               'href'    => DI::baseUrl() . '/admin/users/pending',
+                                               'name'    => $reg['name'],
+                                               'url'     => $reg['url'],
+                                               'photo'   => $reg['micro'],
+                                               'date'    => $reg['created'],
+                                               'seen'    => false,
+                                               'message' => DI::l10n()->t('{0} requested registration'),
+                                       ];
+                                       $notifications[] = $notif;
+                               }
+                       } else {
                                $notif = [
                                        'id'      => 0,
-                                       'href'    => DI::baseUrl() . '/admin/users/',
-                                       'name'    => $reg['name'],
-                                       'url'     => $reg['url'],
-                                       'photo'   => $reg['micro'],
-                                       'date'    => $reg['created'],
+                                       'href'    => DI::baseUrl() . '/admin/users/pending',
+                                       'name'    => $regs[0]['name'],
+                                       'url'     => $regs[0]['url'],
+                                       'photo'   => $regs[0]['micro'],
+                                       'date'    => $regs[0]['created'],
                                        'seen'    => false,
-                                       'message' => DI::l10n()->t('{0} requested registration'),
+                                       'message' => DI::l10n()->t('{0} and %d others requested registration', count($regs) - 1),
                                ];
-                               $notifs[] = $notif;
+                               $notifications[] = $notif;
                        }
                }
 
@@ -323,28 +337,17 @@ function ping_init(App $a)
                        }
                        return ($adate < $bdate) ? 1 : -1;
                };
-               usort($notifs, $sort_function);
-
-               if (DBA::isResult($notifs)) {
-                       foreach ($notifs as $notif) {
-                               $contact = Contact::getByURL($notif['url'], false, ['micro']);
-                               $notif['photo'] = Contact::getMicro($contact, $notif['photo']);
-
-                               $local_time = DateTimeFormat::local($notif['date']);
-
-                               $notifications[] = [
-                                       'id'        => $notif['id'],
-                                       'href'      => $notif['href'],
-                                       'name'      => $notif['name'],
-                                       'url'       => $notif['url'],
-                                       'photo'     => $notif['photo'],
-                                       'date'      => Temporal::getRelativeDate($notif['date']),
-                                       'message'   => $notif['message'],
-                                       'seen'      => $notif['seen'],
-                                       'timestamp' => strtotime($local_time)
-                               ];
+               usort($notifications, $sort_function);
+
+               array_walk($notifications, function (&$notification) {
+                       if (empty($notification['photo'])) {
+                               $contact = Contact::getByURL($notification['url'], false, ['micro', 'id', 'avatar']);
+                               $notification['photo'] = Contact::getMicro($contact, $notification['photo']);
                        }
-               }
+
+                       $notification['timestamp'] = DateTimeFormat::local($notification['date']);
+                       $notification['date'] = Temporal::getRelativeDate($notification['date']);
+               });
        }
 
        $sysmsgs = [];