Merge pull request #2970 from Hypolite/improvement/ping-php-json

ping.php: Ensure data structure consistency

js/main.js

@@ -92,7 +92,6 @@
 		/* event from comment textarea button popups */
 		/* insert returned bbcode at cursor position or replace selected text */
 		$("body").on("fbrowser.image.comment", function(e, filename, bbcode, id) {
-			console.log("on", id);
 			$.colorbox.close();
 			var textarea = document.getElementById("comment-edit-text-" +id);
 			var start = textarea.selectionStart;
@@ -117,7 +116,6 @@
 			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
 			$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
 			input.val(val);
-			//console.log(id);
 		});
 
 		/* setup field_richtext */
@@ -277,8 +275,6 @@
 				$("#nav-notifications-linkmenu").removeClass("on");
 			}
 
-			console.log(data.sysmsgs);
-
 			$(data.sysmsgs.notice).each(function(key, message){
 				$.jGrowl(message, {sticky: true, theme: 'notice'});
 			});
@@ -692,8 +688,6 @@
 		// page number
 		infinite_scroll.pageno+=1;
 
-		console.log('Loading page ' + infinite_scroll.pageno);
-
 		// get the raw content from the next page and insert this content
 		// right before "#conversation-end"
 		$.get('network?mode=raw' + infinite_scroll.reload_uri + '&page=' + infinite_scroll.pageno, function(data) {

mod/ping.php

@@ -6,14 +6,88 @@ require_once('include/group.php');
 require_once('mod/proxy.php');
 require_once('include/xml.php');
 
-function ping_init(&$a) {
+/**
-
+ * @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';
 	}
 
+	$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()) {
@@ -37,27 +111,11 @@ function ping_init(&$a) {
 		}
 
 		$notifs = ping_get_notifications(local_user());
-		$sysnotify_count = 0; // we will update this in a moment
 
-		$tags     = array();
+		$items_unseen = q("SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
-		$comments = array();
-		$likes    = array();
-		$dislikes = array();
-		$friends  = array();
-		$posts    = array();
-		$regs     = array();
-		$mails    = array();
-
-		$home_count = 0;
-		$network_count = 0;
-		$register_count = 0;
-		$groups_unseen = array();
-		$forums_unseen = array();
-
-		$r = 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`
+				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`
-				FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
+				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
@@ -65,13 +123,12 @@ function ping_init(&$a) {
 			intval(local_user()), intval(local_user())
 		);
 
-		if (dbm::is_result($r)) {
+		if (dbm::is_result($items_unseen)) {
-
+			$arr = array('items' => $items_unseen);
-			$arr = array('items' => $r);
 			call_hooks('network_ping', $arr);
 
-			foreach ($r as $it) {
+			foreach ($items_unseen as $item) {
-				if ($it['wall']) {
+				if ($item['wall']) {
 					$home_count++;
 				} else {
 					$network_count++;
@@ -129,20 +186,15 @@ function ping_init(&$a) {
 		$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");
+			$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_count = $regs[0]['total'];
 			}
 		}
 
-		$all_events = 0;
+		$ev = q("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event`
-		$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()),
@@ -175,7 +227,6 @@ function ping_init(&$a) {
 			}
 		}
 
-		$data = array();
 		$data['intro']    = $intro_count;
 		$data['mail']     = $mail_count;
 		$data['net']      = $network_count;
@@ -337,8 +388,8 @@ function ping_init(&$a) {
  * @param int $uid User id
  * @return array Associative array of notifications
  */
-function ping_get_notifications($uid) {
+function ping_get_notifications($uid)
-
+{
 	$result  = array();
 	$offset  = 0;
 	$seen    = false;
@@ -419,39 +470,42 @@ function ping_get_notifications($uid) {
  * @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_count, $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) {
+	foreach($notifs as $key => $notif) {
-		$notifications[$key . ":note"] = $n['message'];
+		$notifications[$key . ':note'] = $notif['message'];
 
-		$notifications[$key . ":@attributes"] = array(
+		$notifications[$key . ':@attributes'] = array(
-			"id" => $n["id"],
+			'id'        => $notif['id'],
-			"href" => $n['href'],
+			'href'      => $notif['href'],
-			"name" => $n['name'],
+			'name'      => $notif['name'],
-			"url" => $n['url'],
+			'url'       => $notif['url'],
-			"photo" => $n['photo'],
+			'photo'     => $notif['photo'],
-			"date" => $n['date'],
+			'date'      => $notif['date'],
-			"seen" => $n['seen'],
+			'seen'      => $notif['seen'],
-			"timestamp" => $n['timestamp']
+			'timestamp' => $notif['timestamp']
 		);
 	}
 
 	$sysmsg = array();
 	foreach ($sysmsgs as $key => $m){
-		$sysmsg[$key . ":notice"] = $m;
+		$sysmsg[$key . ':notice'] = $m;
 	}
 	foreach ($sysmsgs_info as $key => $m){
-		$sysmsg[$key . ":info"] = $m;
+		$sysmsg[$key . ':info'] = $m;
 	}
 
-	$data["notif"] = $notifications;
+	$data['notif'] = $notifications;
-	$data["@attributes"] = array("count" => $sysnotify_count + $data["intro"] + $data["mail"] + $data["register"]);
+	$data['@attributes'] = array('count' => $sysnotify_count + $data['intro'] + $data['mail'] + $data['register']);
-	$data["sysmsgs"] = $sysmsg;
+	$data['sysmsgs'] = $sysmsg;
 
-	if ($data["register"] == 0) {
+	if ($data['register'] == 0) {
-		unset($data["register"]);
+		unset($data['register']);
 	}
 
 	$groups = array();