X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=ad1d4019f0f7131e1234506ca1710557f41c9e45;hb=dd0a1cf586fc37fe9a3d84af277c7504136a3bf9;hp=b5330c7b330bcfebdf64c51446432ebfb1baf8b5;hpb=df28f99caa7770235ce0e4f3901c7e9a77f70478;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index b5330c7b33..ad1d4019f0 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,11 +1,15 @@
 <?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');
+require_once('include/enotify.php');
 
 /**
  * @brief Outputs the counts and the lists of various notifications
@@ -199,7 +203,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 +216,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 +309,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;
 			}
@@ -316,10 +330,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']);
 				}
 
@@ -420,7 +434,7 @@ function ping_get_notifications($uid)
 			intval($offset)
 		);
 
-		if (!$r AND !$seen) {
+		if (!$r && !$seen) {
 			$seen = true;
 			$seensql = "";
 			$order = "DESC";
@@ -460,12 +474,12 @@ function ping_get_notifications($uid)
 
 			$notification["href"] = App::get_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);
 }