X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=d8eaa8126fd03f0aad9b5a079db905dab216b2c5;hb=3b23f89ca257f972aa9c7beffdd308b1fd1b37e6;hp=407ec4c229992b8e9f80e3c698b3f953ab3418ac;hpb=46ba1a46f5b7b84f6e94fdbdbe87c4f1f320c90f;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index 407ec4c229..d8eaa8126f 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,23 +1,108 @@
 <?php
-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');
-
-function ping_init(&$a) {
+/**
+ * @file include/ping.php
+ */
+use Friendica\App;
+use Friendica\Content\Feature;
+use Friendica\Content\ForumManager;
+use Friendica\Core\Cache;
+use Friendica\Core\System;
+use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Util\XML;
+
+require_once 'include/datetime.php';
+require_once 'include/bbcode.php';
+require_once 'mod/proxy.php';
+require_once 'include/enotify.php';
 
+/**
+ * @brief Outputs the counts and the lists of various notifications
+ *
+ * The output format can be controlled via the GET parameter 'format'. It can be
+ * - xml (deprecated legacy default)
+ * - json (outputs JSONP with the 'callback' GET parameter)
+ *
+ * Expected JSON structure:
+ * {
+ *		"result": {
+ *			"intro": 0,
+ *			"mail": 0,
+ *			"net": 0,
+ *			"home": 0,
+ *			"register": 0,
+ *			"all-events": 0,
+ *			"all-events-today": 0,
+ *			"events": 0,
+ *			"events-today": 0,
+ *			"birthdays": 0,
+ *			"birthdays-today": 0,
+ *			"groups": [ ],
+ *			"forums": [ ],
+ *			"notify": 0,
+ *			"notifications": [ ],
+ *			"sysmsgs": {
+ *				"notice": [ ],
+ *				"info": [ ]
+ *			}
+ *		}
+ *	}
+ *
+ * @param App $a The Friendica App instance
+ */
+function ping_init(App $a)
+{
 	$format = 'xml';
 
 	if (isset($_GET['format']) && $_GET['format'] == 'json') {
 		$format = 'json';
 	}
 
-	if (local_user()){
+	$tags          = array();
+	$comments      = array();
+	$likes         = array();
+	$dislikes      = array();
+	$friends       = array();
+	$posts         = array();
+	$regs          = array();
+	$mails         = array();
+	$notifications = array();
+
+	$intro_count    = 0;
+	$mail_count     = 0;
+	$home_count     = 0;
+	$network_count  = 0;
+	$register_count = 0;
+	$sysnotify_count = 0;
+	$groups_unseen  = array();
+	$forums_unseen  = array();
+
+	$all_events       = 0;
+	$all_events_today = 0;
+	$events           = 0;
+	$events_today     = 0;
+	$birthdays        = 0;
+	$birthdays_today  = 0;
+
+	$data = array();
+	$data['intro']    = $intro_count;
+	$data['mail']     = $mail_count;
+	$data['net']      = $network_count;
+	$data['home']     = $home_count;
+	$data['register'] = $register_count;
+
+	$data['all-events']       = $all_events;
+	$data['all-events-today'] = $all_events_today;
+	$data['events']           = $events;
+	$data['events-today']     = $events_today;
+	$data['birthdays']        = $birthdays;
+	$data['birthdays-today']  = $birthdays_today;
+
+	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));
 
 			if ($format == 'json') {
@@ -31,58 +116,44 @@ function ping_init(&$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());
-		$sysnotify = 0; // we will update this in a moment
-
-		$tags     = array();
-		$comments = array();
-		$likes    = array();
-		$dislikes = array();
-		$friends  = array();
-		$posts    = array();
-		$regs     = array();
-		$mails    = array();
-
-		$home = 0;
-		$network = 0;
-		$groups_unseen = array();
-		$forums_unseen = array();
-
-		$r = 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`
+				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`
+				FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id` = `item`.`parent`
 				WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
 				 `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($r)) {
-
-			$arr = array('items' => $r);
+		if (DBM::is_result($items_unseen)) {
+			$arr = array('items' => $items_unseen);
 			call_hooks('network_ping', $arr);
 
-			foreach ($r as $it) {
-				if ($it['wall']) {
-					$home++;
+			foreach ($items_unseen as $item) {
+				if ($item['wall']) {
+					$home_count++;
 				} else {
-					$network++;
+					$network_count++;
 				}
 			}
 		}
 
-		if ($network) {
-			if (intval(feature_enabled(local_user(),'groups'))) {
+		if ($network_count) {
+			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;
@@ -91,10 +162,10 @@ function ping_init(&$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;
 						}
@@ -103,85 +174,91 @@ function ping_init(&$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",
+			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",
+			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
 			intval(local_user())
 		);
 
-		$intro = count($intros1) + count($intros2);
-		$intros = $intros1+$intros2;
+		$intro_count = count($intros1) + count($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)
 		);
 		$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` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
-			if ($regs) {
-				$register = $regs[0]['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"
+			);
+
+			if (DBM::is_result($regs)) {
+				$register_count = count($regs);
 			}
-		} else {
-			$register = 0;
 		}
 
-		$all_events = 0;
-		$all_events_today = 0;
-		$events = 0;
-		$events_today = 0;
-		$birthdays = 0;
-		$birthdays_today = 0;
-
-		$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']);
+		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 = datetime_convert('UTC', $a->timezone, 'now', '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 (datetime_convert('UTC', ((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'], 'Y-m-d') === $str_now) {
 						$all_events_today ++;
-						if ($bd)
+						if ($bd) {
 							$birthdays_today ++;
-						else
+						} else {
 							$events_today ++;
+						}
 					}
 				}
 			}
 		}
 
-		$data = array();
-		$data['intro']    = $intro;
+		$data['intro']    = $intro_count;
 		$data['mail']     = $mail_count;
-		$data['net']      = $network;
-		$data['home']     = $home;
-		$data['register'] = $register;
+		$data['net']      = $network_count;
+		$data['home']     = $home_count;
+		$data['register'] = $register_count;
 
 		$data['all-events']       = $all_events;
 		$data['all-events-today'] = $all_events_today;
@@ -190,19 +267,19 @@ function ping_init(&$a) {
 		$data['birthdays']        = $birthdays;
 		$data['birthdays-today']  = $birthdays_today;
 
-		if (dbm::is_result($notifs) && !$sysnotify) {
+		if (DBM::is_result($notifs)) {
 			foreach ($notifs as $notif) {
 				if ($notif['seen'] == 0) {
-					$sysnotify ++;
+					$sysnotify_count ++;
 				}
 			}
 		}
 
 		// merge all notification types in one array
-		if (dbm::is_result($intros)) {
+		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'],
@@ -214,10 +291,10 @@ function ping_init(&$a) {
 			}
 		}
 
-		if (dbm::is_result($mails)) {
+		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'],
@@ -229,10 +306,10 @@ function ping_init(&$a) {
 			}
 		}
 
-		if (dbm::is_result($regs)) {
+		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'],
@@ -245,9 +322,19 @@ function ping_init(&$a) {
 		}
 
 		// sort notifications by $[]['date']
-		$sort_function = function($a, $b) {
-			$adate = date($a['date']);
-			$bdate = date($b['date']);
+		$sort_function = function ($a, $b) {
+			$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;
 			}
@@ -255,16 +342,16 @@ function ping_init(&$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']) 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']);
 				}
 
-				$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 {
@@ -291,12 +378,12 @@ function ping_init(&$a) {
 	$sysmsgs = array();
 	$sysmsgs_info = array();
 
-	if (x($_SESSION,'sysmsg')) {
+	if (x($_SESSION, 'sysmsg')) {
 		$sysmsgs = $_SESSION['sysmsg'];
 		unset($_SESSION['sysmsg']);
 	}
 
-	if (x($_SESSION,'sysmsg_info')) {
+	if (x($_SESSION, 'sysmsg_info')) {
 		$sysmsgs_info = $_SESSION['sysmsg_info'];
 		unset($_SESSION['sysmsg_info']);
 	}
@@ -304,7 +391,7 @@ function ping_init(&$a) {
 	if ($format == 'json') {
 		$data['groups'] = $groups_unseen;
 		$data['forums'] = $forums_unseen;
-		$data['notify'] = $sysnotify + $intro + $mail_count + $register;
+		$data['notify'] = $sysnotify_count + $intro_count + $mail_count + $register_count;
 		$data['notifications'] = $notifications;
 		$data['sysmsgs'] = array(
 			'notice' => $sysmsgs,
@@ -323,10 +410,10 @@ function ping_init(&$a) {
 		}
 	} else {
 		// Legacy slower XML format output
-		$data = ping_format_xml_data($data, $sysnotify, $notifications, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen);
+		$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(array("result" => $data), $xml);
 	}
 
 	killme();
@@ -338,19 +425,20 @@ function ping_init(&$a) {
  * @param int $uid User id
  * @return array Associative array of notifications
  */
-function ping_get_notifications($uid) {
-
-	$result = array();
-	$offset = 0;
-	$seen = false;
+function ping_get_notifications($uid)
+{
+	$result  = array();
+	$offset  = 0;
+	$seen    = false;
 	$seensql = "NOT";
-	$order = "DESC";
-	$quit = false;
+	$order   = "DESC";
+	$quit    = false;
 
 	$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))
@@ -361,7 +449,7 @@ function ping_get_notifications($uid) {
 			intval($offset)
 		);
 
-		if (!$r AND !$seen) {
+		if (!$r && !$seen) {
 			$seen = true;
 			$seensql = "";
 			$order = "DESC";
@@ -372,7 +460,7 @@ function ping_get_notifications($uid) {
 			$offset += 50;
 		}
 
-		foreach ($r AS $notification) {
+		foreach ($r as $notification) {
 			if (is_null($notification["visible"])) {
 				$notification["visible"] = true;
 			}
@@ -392,21 +480,30 @@ function ping_get_notifications($uid) {
 				$notification["name"] = strip_tags(bbcode($notification["name"]));
 				$notification["message"] = format_notification_message($notification["name"], strip_tags(bbcode($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"])
 				);
 			}
 
-			$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"]])) {
-				$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) AND !$quit);
+	} while ((count($result) < 50) && !$quit);
 
 	return($result);
 }
@@ -415,44 +512,47 @@ 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 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 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) {
+function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
+{
 	$notifications = array();
-	foreach($notifs as $key => $n) {
-		$notifications[$key . ":note"] = $n['message'];
-
-		$notifications[$key . ":@attributes"] = array(
-			"id" => $n["id"],
-			"href" => $n['href'],
-			"name" => $n['name'],
-			"url" => $n['url'],
-			"photo" => $n['photo'],
-			"date" => $n['date'],
-			"seen" => $n['seen'],
-			"timestamp" => $n['timestamp']
+	foreach ($notifs as $key => $notif) {
+		$notifications[$key . ':note'] = $notif['message'];
+
+		$notifications[$key . ':@attributes'] = array(
+			'id'        => $notif['id'],
+			'href'      => $notif['href'],
+			'name'      => $notif['name'],
+			'url'       => $notif['url'],
+			'photo'     => $notif['photo'],
+			'date'      => $notif['date'],
+			'seen'      => $notif['seen'],
+			'timestamp' => $notif['timestamp']
 		);
 	}
 
 	$sysmsg = array();
-	foreach ($sysmsgs as $key => $m){
-		$sysmsg[$key . ":notice"] = $m;
+	foreach ($sysmsgs as $key => $m) {
+		$sysmsg[$key . ':notice'] = $m;
 	}
-	foreach ($sysmsgs_info as $key => $m){
-		$sysmsg[$key . ":info"] = $m;
+	foreach ($sysmsgs_info as $key => $m) {
+		$sysmsg[$key . ':info'] = $m;
 	}
 
-	$data["notif"] = $notifications;
-	$data["@attributes"] = array("count" => $sysnotify + $data["intro"] + $data["mail"] + $data["register"]);
-	$data["sysmsgs"] = $sysmsg;
+	$data['notif'] = $notifications;
+	$data['@attributes'] = array('count' => $sysnotify_count + $data['intro'] + $data['mail'] + $data['register']);
+	$data['sysmsgs'] = $sysmsg;
 
-	if ($data["register"] == 0) {
-		unset($data["register"]);
+	if ($data['register'] == 0) {
+		unset($data['register']);
 	}
 
 	$groups = array();
@@ -474,4 +574,4 @@ function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_inf
 	}
 
 	return $data;
-}
\ No newline at end of file
+}