Merge pull request #3769 from annando/show-forum-posts

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 1e1e7d8489e7fc63d635dc0587e2b57a2ba81fce..59fa52121411429ae6acff8bb90f8b9743d4badd 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,10 +1,16 @@
 <?php
-require_once("include/datetime.php");
+
+use Friendica\App;
+use Friendica\Core\System;
+
+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');
+require_once('include/enotify.php');
 
 /**
  * @brief Outputs the counts and the lists of various notifications
@@ -175,10 +181,10 @@ function ping_init(App $a)
                );
 
                $intro_count = count($intros1) + count($intros2);
-               $intros = $intros1+$intros2;
+               $intros = $intros1 + $intros2;
 
-               $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
-               $mails = q("SELECT * FROM `mail`
+               $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' ",
                        intval(local_user()),
                        dbesc($myurl)
@@ -189,21 +195,29 @@ function ping_init(App $a)
                        $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
                                FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
                                WHERE `contact`.`self` = 1");
-                       if ($regs) {
+
+                       if (dbm::is_result($regs)) {
                                $register_count = $regs[0]['total'];
                        }
                }
 
-               $ev = q("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 = q("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');
@@ -252,7 +266,7 @@ function ping_init(App $a)
                if (dbm::is_result($intros)) {
                        foreach ($intros as $intro) {
                                $notif = array(
-                                       'href'    => $a->get_baseurl() . '/notifications/intros/' . $intro['id'],
+                                       'href'    => System::baseUrl() . '/notifications/intros/' . $intro['id'],
                                        'name'    => $intro['name'],
                                        'url'     => $intro['url'],
                                        'photo'   => $intro['photo'],
@@ -267,7 +281,7 @@ function ping_init(App $a)
                if (dbm::is_result($mails)) {
                        foreach ($mails as $mail) {
                                $notif = array(
-                                       'href'    => $a->get_baseurl() . '/message/' . $mail['id'],
+                                       'href'    => System::baseUrl() . '/message/' . $mail['id'],
                                        'name'    => $mail['from-name'],
                                        'url'     => $mail['from-url'],
                                        'photo'   => $mail['from-photo'],
@@ -282,7 +296,7 @@ function ping_init(App $a)
                if (dbm::is_result($regs)) {
                        foreach ($regs as $reg) {
                                $notif = array(
-                                       'href'    => $a->get_baseurl() . '/admin/users/',
+                                       'href'    => System::baseUrl() . '/admin/users/',
                                        'name'    => $reg['name'],
                                        'url'     => $reg['url'],
                                        'photo'   => $reg['micro'],
@@ -296,8 +310,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;
                        }
@@ -307,10 +331,10 @@ function ping_init(App $a)
 
                if (dbm::is_result($notifs)) {
                        // Are the nofications called from the regular process or via the friendica app?
-                       $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
+                       $regularnotifications = (intval($_GET['uid']) && intval($_GET['_']));
 
                        foreach ($notifs as $notif) {
-                               if ($a->is_friendica_app() OR !$regularnotifications) {
+                               if ($a->is_friendica_app() || !$regularnotifications) {
                                        $notif['message'] = str_replace("{0}", $notif['name'], $notif['message']);
                                }
 
@@ -411,7 +435,7 @@ function ping_get_notifications($uid)
                        intval($offset)
                );
 
-               if (!$r AND !$seen) {
+               if (!$r && !$seen) {
                        $seen = true;
                        $seensql = "";
                        $order = "DESC";
@@ -449,14 +473,14 @@ function ping_get_notifications($uid)
                                );
                        }
 
-                       $notification["href"] = $a->get_baseurl() . "/notify/view/" . $notification["id"];
+                       $notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"];
 
-                       if ($notification["visible"] AND !$notification["spam"] AND
-                               !$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
+                       if ($notification["visible"] && !$notification["spam"] &&
+                               !$notification["deleted"] && !is_array($result[$notification["parent"]])) {
                                $result[$notification["parent"]] = $notification;
                        }
                }
-       } while ((count($result) < 50) AND !$quit);
+       } while ((count($result) < 50) && !$quit);
 
        return($result);
 }