X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=146411206f601370312353ed07436fbcee96b48e;hb=f58d8f410885bb1895821cd0767bdf981629f0cd;hp=59fa52121411429ae6acff8bb90f8b9743d4badd;hpb=ab87f1215a28884c48fc89b130b8615e4e398702;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index 59fa521214..146411206f 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,16 +1,26 @@
 <?php
+/**
+ * @file include/ping.php
+ */
 
 use Friendica\App;
+use Friendica\Content\Feature;
+use Friendica\Content\ForumManager;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Addon;
+use Friendica\Core\Cache;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
+use Friendica\Util\XML;
 
-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');
+require_once 'mod/proxy.php';
+require_once 'include/enotify.php';
 
 /**
  * @brief Outputs the counts and the lists of various notifications
@@ -54,15 +64,15 @@ function ping_init(App $a)
 		$format = 'json';
 	}
 
-	$tags          = array();
-	$comments      = array();
-	$likes         = array();
-	$dislikes      = array();
-	$friends       = array();
-	$posts         = array();
-	$regs          = array();
-	$mails         = array();
-	$notifications = array();
+	$tags          = [];
+	$comments      = [];
+	$likes         = [];
+	$dislikes      = [];
+	$friends       = [];
+	$posts         = [];
+	$regs          = [];
+	$mails         = [];
+	$notifications = [];
 
 	$intro_count    = 0;
 	$mail_count     = 0;
@@ -70,8 +80,8 @@ function ping_init(App $a)
 	$network_count  = 0;
 	$register_count = 0;
 	$sysnotify_count = 0;
-	$groups_unseen  = array();
-	$forums_unseen  = array();
+	$groups_unseen  = [];
+	$forums_unseen  = [];
 
 	$all_events       = 0;
 	$all_events_today = 0;
@@ -80,7 +90,7 @@ function ping_init(App $a)
 	$birthdays        = 0;
 	$birthdays_today  = 0;
 
-	$data = array();
+	$data = [];
 	$data['intro']    = $intro_count;
 	$data['mail']     = $mail_count;
 	$data['net']      = $network_count;
@@ -94,11 +104,10 @@ function ping_init(App $a)
 	$data['birthdays']        = $birthdays;
 	$data['birthdays-today']  = $birthdays_today;
 
-	if (local_user()){
+	if (local_user()) {
 		// Different login session than the page that is calling us.
 		if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
-
-			$data = array('result' => array('invalid' => 1));
+			$data = ['result' => ['invalid' => 1]];
 
 			if ($format == 'json') {
 				if (isset($_GET['callback'])) {
@@ -111,14 +120,15 @@ function ping_init(App $a)
 				}
 			} else {
 				header("Content-type: text/xml");
-				echo xml::from_array($data, $xml);
+				echo XML::fromArray($data, $xml);
 			}
 			killme();
 		}
 
 		$notifs = ping_get_notifications(local_user());
 
-		$items_unseen = q("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`
@@ -126,12 +136,13 @@ function ping_init(App $a)
 				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
 				AND `item`.`contact-id` != %d
 				ORDER BY `item`.`created` DESC",
-			intval(local_user()), intval(local_user())
+			intval(local_user()),
+			intval(local_user())
 		);
 
-		if (dbm::is_result($items_unseen)) {
-			$arr = array('items' => $items_unseen);
-			call_hooks('network_ping', $arr);
+		if (DBM::is_result($items_unseen)) {
+			$arr = ['items' => $items_unseen];
+			Addon::callHooks('network_ping', $arr);
 
 			foreach ($items_unseen as $item) {
 				if ($item['wall']) {
@@ -143,10 +154,10 @@ function ping_init(App $a)
 		}
 
 		if ($network_count) {
-			if (intval(feature_enabled(local_user(), 'groups'))) {
+			if (intval(Feature::isEnabled(local_user(), 'groups'))) {
 				// Find out how unseen network posts are spread across groups
-				$group_counts = groups_count_unseen();
-				if (dbm::is_result($group_counts)) {
+				$group_counts = Group::countUnseen();
+				if (DBM::is_result($group_counts)) {
 					foreach ($group_counts as $group_count) {
 						if ($group_count['count'] > 0) {
 							$groups_unseen[] = $group_count;
@@ -155,10 +166,10 @@ function ping_init(App $a)
 				}
 			}
 
-			if (intval(feature_enabled(local_user(), 'forumlist_widget'))) {
-				$forum_counts = ForumManager::count_unseen_items();
-				if (dbm::is_result($forums_counts)) {
-					foreach ($forums_counts as $forum_count) {
+			if (intval(Feature::isEnabled(local_user(), 'forumlist_widget'))) {
+				$forum_counts = ForumManager::countUnseenItems();
+				if (DBM::is_result($forum_counts)) {
+					foreach ($forum_counts as $forum_count) {
 						if ($forum_count['count'] > 0) {
 							$forums_unseen[] = $forum_count;
 						}
@@ -167,13 +178,15 @@ function ping_init(App $a)
 			}
 		}
 
-		$intros1 = q("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 = q("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",
@@ -184,58 +197,62 @@ function ping_init(App $a)
 		$intros = $intros1 + $intros2;
 
 		$myurl = System::baseUrl() . '/profile/' . $a->user['nickname'] ;
-		$mails = q("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
+		$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)
 		);
 		$mail_count = count($mails);
 
-		if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
-			$regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
+		if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
+			$regs = q(
+				"SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`
 				FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
-				WHERE `contact`.`self` = 1");
+				WHERE `contact`.`self` = 1"
+			);
 
-			if (dbm::is_result($regs)) {
-				$register_count = $regs[0]['total'];
+			if (DBM::is_result($regs)) {
+				$register_count = count($regs);
 			}
 		}
 
 		$cachekey = "ping_init:".local_user();
 		$ev = Cache::get($cachekey);
 		if (is_null($ev)) {
-			$ev = q("SELECT 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()),
-				dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
-				dbesc(datetime_convert('UTC', 'UTC', 'now'))
+				dbesc(DateTimeFormat::utc('now + 7 days')),
+				dbesc(DateTimeFormat::utcNow())
 			);
-			if (dbm::is_result($ev)) {
+			if (DBM::is_result($ev)) {
 				Cache::set($cachekey, $ev, CACHE_HOUR);
 			}
 		}
 
-		if (dbm::is_result($ev)) {
+		if (DBM::is_result($ev)) {
 			$all_events = count($ev);
 
 			if ($all_events) {
-				$str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d');
-				foreach($ev as $x) {
+				$str_now = DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d');
+				foreach ($ev as $x) {
 					$bd = false;
 					if ($x['type'] === 'birthday') {
 						$birthdays ++;
 						$bd = true;
-					}
-					else {
+					} else {
 						$events ++;
 					}
-					if (datetime_convert('UTC', ((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'], 'Y-m-d') === $str_now) {
+					if (DateTimeFormat::convert($x['start'], ((intval($x['adjust'])) ? $a->timezone : 'UTC'), 'UTC', 'Y-m-d') === $str_now) {
 						$all_events_today ++;
-						if ($bd)
+						if ($bd) {
 							$birthdays_today ++;
-						else
+						} else {
 							$events_today ++;
+						}
 					}
 				}
 			}
@@ -254,7 +271,7 @@ function ping_init(App $a)
 		$data['birthdays']        = $birthdays;
 		$data['birthdays-today']  = $birthdays_today;
 
-		if (dbm::is_result($notifs)) {
+		if (DBM::is_result($notifs)) {
 			foreach ($notifs as $notif) {
 				if ($notif['seen'] == 0) {
 					$sysnotify_count ++;
@@ -263,53 +280,53 @@ function ping_init(App $a)
 		}
 
 		// merge all notification types in one array
-		if (dbm::is_result($intros)) {
+		if (DBM::is_result($intros)) {
 			foreach ($intros as $intro) {
-				$notif = array(
+				$notif = [
 					'href'    => System::baseUrl() . '/notifications/intros/' . $intro['id'],
 					'name'    => $intro['name'],
 					'url'     => $intro['url'],
 					'photo'   => $intro['photo'],
 					'date'    => $intro['datetime'],
 					'seen'    => false,
-					'message' => t('{0} wants to be your friend'),
-				);
+					'message' => L10n::t('{0} wants to be your friend'),
+				];
 				$notifs[] = $notif;
 			}
 		}
 
-		if (dbm::is_result($mails)) {
+		if (DBM::is_result($mails)) {
 			foreach ($mails as $mail) {
-				$notif = array(
+				$notif = [
 					'href'    => System::baseUrl() . '/message/' . $mail['id'],
 					'name'    => $mail['from-name'],
 					'url'     => $mail['from-url'],
 					'photo'   => $mail['from-photo'],
 					'date'    => $mail['created'],
 					'seen'    => false,
-					'message' => t('{0} sent you a message'),
-				);
+					'message' => L10n::t('{0} sent you a message'),
+				];
 				$notifs[] = $notif;
 			}
 		}
 
-		if (dbm::is_result($regs)) {
+		if (DBM::is_result($regs)) {
 			foreach ($regs as $reg) {
-				$notif = array(
+				$notif = [
 					'href'    => System::baseUrl() . '/admin/users/',
 					'name'    => $reg['name'],
 					'url'     => $reg['url'],
 					'photo'   => $reg['micro'],
 					'date'    => $reg['created'],
 					'seen'    => false,
-					'message' => t('{0} requested registration'),
-				);
+					'message' => L10n::t('{0} requested registration'),
+				];
 				$notifs[] = $notif;
 			}
 		}
 
 		// sort notifications by $[]['date']
-		$sort_function = function($a, $b) {
+		$sort_function = function ($a, $b) {
 			$adate = strtotime($a['date']);
 			$bdate = strtotime($b['date']);
 
@@ -329,7 +346,7 @@ function ping_init(App $a)
 		};
 		usort($notifs, $sort_function);
 
-		if (dbm::is_result($notifs)) {
+		if (DBM::is_result($notifs)) {
 			// Are the nofications called from the regular process or via the friendica app?
 			$regularnotifications = (intval($_GET['uid']) && intval($_GET['_']));
 
@@ -338,32 +355,32 @@ function ping_init(App $a)
 					$notif['message'] = str_replace("{0}", $notif['name'], $notif['message']);
 				}
 
-				$contact = get_contact_details_by_url($notif['url']);
+				$contact = Contact::getDetailsByURL($notif['url']);
 				if (isset($contact['micro'])) {
 					$notif['photo'] = proxy_url($contact['micro'], false, PROXY_SIZE_MICRO);
 				} else {
 					$notif['photo'] = proxy_url($notif['photo'], false, PROXY_SIZE_MICRO);
 				}
 
-				$local_time = datetime_convert('UTC', date_default_timezone_get(), $notif['date']);
+				$local_time = DateTimeFormat::local($notif['date']);
 
-				$notifications[] = array(
+				$notifications[] = [
 					'id'        => $notif['id'],
 					'href'      => $notif['href'],
 					'name'      => $notif['name'],
 					'url'       => $notif['url'],
 					'photo'     => $notif['photo'],
-					'date'      => relative_date($notif['date']),
+					'date'      => Temporal::getRelativeDate($notif['date']),
 					'message'   => $notif['message'],
 					'seen'      => $notif['seen'],
 					'timestamp' => strtotime($local_time)
-				);
+				];
 			}
 		}
 	}
 
-	$sysmsgs = array();
-	$sysmsgs_info = array();
+	$sysmsgs = [];
+	$sysmsgs_info = [];
 
 	if (x($_SESSION, 'sysmsg')) {
 		$sysmsgs = $_SESSION['sysmsg'];
@@ -380,12 +397,12 @@ function ping_init(App $a)
 		$data['forums'] = $forums_unseen;
 		$data['notify'] = $sysnotify_count + $intro_count + $mail_count + $register_count;
 		$data['notifications'] = $notifications;
-		$data['sysmsgs'] = array(
+		$data['sysmsgs'] = [
 			'notice' => $sysmsgs,
 			'info' => $sysmsgs_info
-		);
+		];
 
-		$json_payload = json_encode(array("result" => $data));
+		$json_payload = json_encode(["result" => $data]);
 
 		if (isset($_GET['callback'])) {
 			// JSONP support
@@ -400,7 +417,7 @@ function ping_init(App $a)
 		$data = ping_format_xml_data($data, $sysnotify_count, $notifications, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen);
 
 		header("Content-type: text/xml");
-		echo xml::from_array(array("result" => $data), $xml);
+		echo XML::fromArray(["result" => $data], $xml);
 	}
 
 	killme();
@@ -414,7 +431,7 @@ function ping_init(App $a)
  */
 function ping_get_notifications($uid)
 {
-	$result  = array();
+	$result  = [];
 	$offset  = 0;
 	$seen    = false;
 	$seensql = "NOT";
@@ -424,7 +441,8 @@ function ping_get_notifications($uid)
 	$a = get_app();
 
 	do {
-		$r = q("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))
@@ -446,7 +464,7 @@ function ping_get_notifications($uid)
 			$offset += 50;
 		}
 
-		foreach ($r AS $notification) {
+		foreach ($r as $notification) {
 			if (is_null($notification["visible"])) {
 				$notification["visible"] = true;
 			}
@@ -463,10 +481,11 @@ function ping_get_notifications($uid)
 				$notification["name"] = $notification["name_cache"];
 				$notification["message"] = $notification["msg_cache"];
 			} else {
-				$notification["name"] = strip_tags(bbcode($notification["name"]));
-				$notification["message"] = format_notification_message($notification["name"], strip_tags(bbcode($notification["msg"])));
+				$notification["name"] = strip_tags(BBCode::convert($notification["name"]));
+				$notification["message"] = format_notification_message($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
 
-				q("UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
+				q(
+					"UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
 					dbesc($notification["name"]),
 					dbesc($notification["message"]),
 					intval($notification["id"])
@@ -475,9 +494,17 @@ function ping_get_notifications($uid)
 
 			$notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"];
 
-			if ($notification["visible"] && !$notification["spam"] &&
-				!$notification["deleted"] && !is_array($result[$notification["parent"]])) {
-				$result[$notification["parent"]] = $notification;
+			if ($notification["visible"]
+				&& !$notification["spam"]
+				&& !$notification["deleted"]
+				&& !(x($result, $notification["parent"]) && is_array($result[$notification["parent"]]))
+			) {
+				// Should we condense the notifications or show them all?
+				if (PConfig::get(local_user(), 'system', 'detailed_notif')) {
+					$result[$notification["id"]] = $notification;
+				} else {
+					$result[$notification["parent"]] = $notification;
+				}
 			}
 		}
 	} while ((count($result) < 50) && !$quit);
@@ -489,22 +516,22 @@ function ping_get_notifications($uid)
  * @brief Backward-compatible XML formatting for ping.php output
  * @deprecated
  *
- * @param array $data The initial ping data array
- * @param int $sysnotify_count Number of unseen system notifications
- * @param array $notifs Complete list of notification
- * @param array $sysmsgs List of system notice messages
- * @param array $sysmsgs_info List of system info messages
- * @param int $groups_unseen Number of unseen group items
- * @param int $forums_unseen Number of unseen forum items
+ * @param array $data          The initial ping data array
+ * @param int   $sysnotify     Number of unseen system notifications
+ * @param array $notifs        Complete list of notification
+ * @param array $sysmsgs       List of system notice messages
+ * @param array $sysmsgs_info  List of system info messages
+ * @param int   $groups_unseen Number of unseen group items
+ * @param int   $forums_unseen Number of unseen forum items
  * @return array XML-transform ready data array
  */
 function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
 {
-	$notifications = array();
-	foreach($notifs as $key => $notif) {
+	$notifications = [];
+	foreach ($notifs as $key => $notif) {
 		$notifications[$key . ':note'] = $notif['message'];
 
-		$notifications[$key . ':@attributes'] = array(
+		$notifications[$key . ':@attributes'] = [
 			'id'        => $notif['id'],
 			'href'      => $notif['href'],
 			'name'      => $notif['name'],
@@ -513,39 +540,39 @@ function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_inf
 			'date'      => $notif['date'],
 			'seen'      => $notif['seen'],
 			'timestamp' => $notif['timestamp']
-		);
+		];
 	}
 
-	$sysmsg = array();
-	foreach ($sysmsgs as $key => $m){
+	$sysmsg = [];
+	foreach ($sysmsgs as $key => $m) {
 		$sysmsg[$key . ':notice'] = $m;
 	}
-	foreach ($sysmsgs_info as $key => $m){
+	foreach ($sysmsgs_info as $key => $m) {
 		$sysmsg[$key . ':info'] = $m;
 	}
 
 	$data['notif'] = $notifications;
-	$data['@attributes'] = array('count' => $sysnotify_count + $data['intro'] + $data['mail'] + $data['register']);
+	$data['@attributes'] = ['count' => $sysnotify_count + $data['intro'] + $data['mail'] + $data['register']];
 	$data['sysmsgs'] = $sysmsg;
 
 	if ($data['register'] == 0) {
 		unset($data['register']);
 	}
 
-	$groups = array();
+	$groups = [];
 	if (count($groups_unseen)) {
 		foreach ($groups_unseen as $key => $item) {
 			$groups[$key . ':group'] = $item['count'];
-			$groups[$key . ':@attributes'] = array('id' => $item['id']);
+			$groups[$key . ':@attributes'] = ['id' => $item['id']];
 		}
 		$data['groups'] = $groups;
 	}
 
-	$forums = array();
+	$forums = [];
 	if (count($forums_unseen)) {
 		foreach ($forums_unseen as $key => $item) {
-			$forums[$count . ':forum'] = $item['count'];
-			$forums[$count . ':@attributes'] = array('id' => $item['id']);
+			$forums[$key . ':forum'] = $item['count'];
+			$forums[$key . ':@attributes'] = ['id' => $item['id']];
 		}
 		$data['forums'] = $forums;
 	}