Merge pull request #3483 from rabuzarus/20170522_-_frio_event_button_fix

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index cde03969f46b394e2091f0723da6168e9ff811ca..17180c74ee98dc0bdcdbe454ec4eeb7af2befd91 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,10 +1,14 @@
 <?php
-require_once("include/datetime.php");
+
+use Friendica\App;
+
+require_once('include/datetime.php');
 require_once('include/bbcode.php');
 require_once('include/ForumManager.php');
 require_once('include/group.php');
 require_once('mod/proxy.php');
 require_once('include/xml.php');
+require_once('include/cache.php');
 
 /**
  * @brief Outputs the counts and the lists of various notifications
@@ -195,16 +199,23 @@ function ping_init(App $a)
                        }
                }
 
-               $ev = qu("SELECT count(`event`.`id`) AS total, 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()),
-                       dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
-                       dbesc(datetime_convert('UTC', 'UTC', 'now'))
-               );
+               $cachekey = "ping_init:".local_user();
+               $ev = Cache::get($cachekey);
+               if (is_null($ev)) {
+                       $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()),
+                               dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
+                               dbesc(datetime_convert('UTC', 'UTC', 'now'))
+                       );
+                       if (dbm::is_result($ev)) {
+                               Cache::set($cachekey, $ev, CACHE_HOUR);
+                       }
+               }
 
                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');
@@ -297,8 +308,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;
                        }