X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=59fa52121411429ae6acff8bb90f8b9743d4badd;hb=ab60641e3ba731aca42ab510bdf9c2411db6aab4;hp=b5330c7b330bcfebdf64c51446432ebfb1baf8b5;hpb=4d30f2b292ec0b77de13cae3c622df84f84aa54f;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index b5330c7b33..59fa521214 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,11 +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
@@ -113,7 +118,7 @@ function ping_init(App $a)
 
 		$notifs = ping_get_notifications(local_user());
 
-		$items_unseen = qu("SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
+		$items_unseen = q("SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
 				`item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
 				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`
 				FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id` = `item`.`parent`
@@ -162,13 +167,13 @@ function ping_init(App $a)
 			}
 		}
 
-		$intros1 = qu("SELECT  `intro`.`id`, `intro`.`datetime`,
+		$intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`,
 			`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
 			FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
 			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0",
 			intval(local_user())
 		);
-		$intros2 = qu("SELECT `intro`.`id`, `intro`.`datetime`,
+		$intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`,
 			`contact`.`name`, `contact`.`url`, `contact`.`photo`
 			FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
 			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
@@ -178,8 +183,8 @@ function ping_init(App $a)
 		$intro_count = count($intros1) + count($intros2);
 		$intros = $intros1 + $intros2;
 
-		$myurl = App::get_baseurl() . '/profile/' . $a->user['nickname'] ;
-		$mails = qu("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` 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)
@@ -187,7 +192,7 @@ function ping_init(App $a)
 		$mail_count = count($mails);
 
 		if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
-			$regs = qu("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
+			$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");
 
@@ -199,7 +204,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 = 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()),
@@ -212,7 +217,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');
@@ -261,7 +266,7 @@ function ping_init(App $a)
 		if (dbm::is_result($intros)) {
 			foreach ($intros as $intro) {
 				$notif = array(
-					'href'    => App::get_baseurl() . '/notifications/intros/' . $intro['id'],
+					'href'    => System::baseUrl() . '/notifications/intros/' . $intro['id'],
 					'name'    => $intro['name'],
 					'url'     => $intro['url'],
 					'photo'   => $intro['photo'],
@@ -276,7 +281,7 @@ function ping_init(App $a)
 		if (dbm::is_result($mails)) {
 			foreach ($mails as $mail) {
 				$notif = array(
-					'href'    => App::get_baseurl() . '/message/' . $mail['id'],
+					'href'    => System::baseUrl() . '/message/' . $mail['id'],
 					'name'    => $mail['from-name'],
 					'url'     => $mail['from-url'],
 					'photo'   => $mail['from-photo'],
@@ -291,7 +296,7 @@ function ping_init(App $a)
 		if (dbm::is_result($regs)) {
 			foreach ($regs as $reg) {
 				$notif = array(
-					'href'    => App::get_baseurl() . '/admin/users/',
+					'href'    => System::baseUrl() . '/admin/users/',
 					'name'    => $reg['name'],
 					'url'     => $reg['url'],
 					'photo'   => $reg['micro'],
@@ -305,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;
 			}
@@ -316,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']);
 				}
 
@@ -409,7 +424,7 @@ function ping_get_notifications($uid)
 	$a = get_app();
 
 	do {
-		$r = qu("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
+		$r = q("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
 			FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
 			WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
 			AND NOT (`notify`.`type` IN (%d, %d))
@@ -420,7 +435,7 @@ function ping_get_notifications($uid)
 			intval($offset)
 		);
 
-		if (!$r AND !$seen) {
+		if (!$r && !$seen) {
 			$seen = true;
 			$seensql = "";
 			$order = "DESC";
@@ -458,14 +473,14 @@ function ping_get_notifications($uid)
 				);
 			}
 
-			$notification["href"] = App::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);
 }