Merge pull request #3421 from annando/1705-diaspora-comment

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index b5330c7b330bcfebdf64c51446432ebfb1baf8b5..dcef73ffb252d96a1a7412d7e031aae4477d2837 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -199,7 +199,7 @@ function ping_init(App $a)
                $cachekey = "ping_init:".local_user();
                $ev = Cache::get($cachekey);
                if (is_null($ev)) {
-                       $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event`
+                       $ev = qu("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()),
@@ -212,7 +212,7 @@ function ping_init(App $a)
                }
 
                if (dbm::is_result($ev)) {
-                       $all_events = intval($ev[0]['total']);
+                       $all_events = count($ev);
 
                        if ($all_events) {
                                $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d');
@@ -305,8 +305,18 @@ function ping_init(App $a)
 
                // sort notifications by $[]['date']
                $sort_function = function($a, $b) {
-                       $adate = date($a['date']);
-                       $bdate = date($b['date']);
+                       $adate = strtotime($a['date']);
+                       $bdate = strtotime($b['date']);
+
+                       // Unseen messages are kept at the top
+                       // The value 31536000 means one year. This should be enough :-)
+                       if (!$a['seen']) {
+                               $adate += 31536000;
+                       }
+                       if (!$b['seen']) {
+                               $bdate += 31536000;
+                       }
+
                        if ($adate == $bdate) {
                                return 0;
                        }