Merge pull request #6432 from annando/deleted-pending

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 5ea75727a1152d6d3f12943dcb7b5b9eb684fcbc..18b126cce560f30b4011c86c9b7004a2f093c38e 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -22,8 +22,6 @@ use Friendica\Util\Temporal;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\XML;
 
-require_once 'include/enotify.php';
-
 /**
  * @brief Outputs the counts and the lists of various notifications
  *
@@ -66,14 +64,7 @@ function ping_init(App $a)
                $format = 'json';
        }
 
-       $tags          = [];
-       $comments      = [];
-       $likes         = [];
-       $dislikes      = [];
-       $friends       = [];
-       $posts         = [];
        $regs          = [];
-       $mails         = [];
        $notifications = [];
 
        $intro_count    = 0;
@@ -150,25 +141,21 @@ function ping_init(App $a)
                }
 
                if ($network_count) {
-                       if (intval(Feature::isEnabled(local_user(), 'groups'))) {
-                               // Find out how unseen network posts are spread across groups
-                               $group_counts = Group::countUnseen();
-                               if (DBA::isResult($group_counts)) {
-                                       foreach ($group_counts as $group_count) {
-                                               if ($group_count['count'] > 0) {
-                                                       $groups_unseen[] = $group_count;
-                                               }
+                       // Find out how unseen network posts are spread across groups
+                       $group_counts = Group::countUnseen();
+                       if (DBA::isResult($group_counts)) {
+                               foreach ($group_counts as $group_count) {
+                                       if ($group_count['count'] > 0) {
+                                               $groups_unseen[] = $group_count;
                                        }
                                }
                        }
 
-                       if (intval(Feature::isEnabled(local_user(), 'forumlist_widget'))) {
-                               $forum_counts = ForumManager::countUnseenItems();
-                               if (DBA::isResult($forum_counts)) {
-                                       foreach ($forum_counts as $forum_count) {
-                                               if ($forum_count['count'] > 0) {
-                                                       $forums_unseen[] = $forum_count;
-                                               }
+                       $forum_counts = ForumManager::countUnseenItems();
+                       if (DBA::isResult($forum_counts)) {
+                               foreach ($forum_counts as $forum_count) {
+                                       if ($forum_count['count'] > 0) {
+                                               $forums_unseen[] = $forum_count;
                                        }
                                }
                        }
@@ -192,7 +179,7 @@ function ping_init(App $a)
                $intro_count = count($intros1) + count($intros2);
                $intros = $intros1 + $intros2;
 
-               $myurl = System::baseUrl() . '/profile/' . $a->user['nickname'] ;
+               $myurl = System::baseUrl() . '/profile/' . $a->user['nickname'];
                $mails = q(
                        "SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
                        WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -221,7 +208,7 @@ function ping_init(App $a)
                                DBA::escape(DateTimeFormat::utcNow())
                        );
                        if (DBA::isResult($ev)) {
-                               Cache::set($cachekey, $ev, CACHE_HOUR);
+                               Cache::set($cachekey, $ev, Cache::HOUR);
                        }
                }
 
@@ -288,22 +275,6 @@ function ping_init(App $a)
                        }
                }
 
-               if (DBA::isResult($mails)) {
-                       foreach ($mails as $mail) {
-                               $notif = [
-                                       'id'      => 0,
-                                       'href'    => System::baseUrl() . '/message/' . $mail['id'],
-                                       'name'    => $mail['from-name'],
-                                       'url'     => $mail['from-url'],
-                                       'photo'   => $mail['from-photo'],
-                                       'date'    => $mail['created'],
-                                       'seen'    => false,
-                                       'message' => L10n::t('{0} sent you a message'),
-                               ];
-                               $notifs[] = $notif;
-                       }
-               }
-
                if (DBA::isResult($regs)) {
                        foreach ($regs as $reg) {
                                $notif = [
@@ -377,12 +348,12 @@ function ping_init(App $a)
        $sysmsgs = [];
        $sysmsgs_info = [];
 
-       if (x($_SESSION, 'sysmsg')) {
+       if (!empty($_SESSION['sysmsg'])) {
                $sysmsgs = $_SESSION['sysmsg'];
                unset($_SESSION['sysmsg']);
        }
 
-       if (x($_SESSION, 'sysmsg_info')) {
+       if (!empty($_SESSION['sysmsg_info'])) {
                $sysmsgs_info = $_SESSION['sysmsg_info'];
                unset($_SESSION['sysmsg_info']);
        }
@@ -390,7 +361,7 @@ function ping_init(App $a)
        if ($format == 'json') {
                $data['groups'] = $groups_unseen;
                $data['forums'] = $forums_unseen;
-               $data['notify'] = $sysnotify_count + $intro_count + $mail_count + $register_count;
+               $data['notify'] = $sysnotify_count + $intro_count + $register_count;
                $data['notifications'] = $notifications;
                $data['sysmsgs'] = [
                        'notice' => $sysmsgs,
@@ -433,8 +404,6 @@ function ping_get_notifications($uid)
        $order   = "DESC";
        $quit    = false;
 
-       $a = get_app();
-
        do {
                $r = q(
                        "SELECT `notify`.*, `item`.`visible`, `item`.`deleted`
@@ -487,7 +456,7 @@ function ping_get_notifications($uid)
 
                        if ($notification["visible"]
                                && !$notification["deleted"]
-                               && !(x($result, $notification["parent"]) && !empty($result[$notification["parent"]]))
+                               && empty($result[$notification["parent"]])
                        ) {
                                // Should we condense the notifications or show them all?
                                if (PConfig::get(local_user(), 'system', 'detailed_notif')) {
@@ -511,8 +480,8 @@ function ping_get_notifications($uid)
  * @param array $notifs          Complete list of notification
  * @param array $sysmsgs         List of system notice messages
  * @param array $sysmsgs_info    List of system info messages
- * @param int   $groups_unseen   Number of unseen group items
- * @param int   $forums_unseen   Number of unseen forum items
+ * @param array $groups_unseen   List of unseen group messages
+ * @param array $forums_unseen   List of unseen forum messages
  *
  * @return array XML-transform ready data array
  */