X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fping.php;h=17180c74ee98dc0bdcdbe454ec4eeb7af2befd91;hb=74479c4020499e6aa7866b5478366932b723c515;hp=35a9b45206fdb260e49eb26efd5dfb116392b3e1;hpb=9c2c4839968169a191084d6d2b0d629d82430e67;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index 35a9b45206..17180c74ee 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,5 +1,8 @@
 <?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');
@@ -199,7 +202,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,11 +215,11 @@ 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');
-				foreach ($ev as $x) {
+				foreach($ev as $x) {
 					$bd = false;
 					if ($x['type'] === 'birthday') {
 						$birthdays ++;
@@ -305,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;
 			}
@@ -486,7 +499,7 @@ function ping_get_notifications($uid)
 function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
 {
 	$notifications = array();
-	foreach ($notifs as $key => $notif) {
+	foreach($notifs as $key => $notif) {
 		$notifications[$key . ':note'] = $notif['message'];
 
 		$notifications[$key . ':@attributes'] = array(