1 files changed, 51 insertions, 10 deletions

diff --git a/mod/ping.php b/mod/ping.php
index 924f9ff76..973ecb03f 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,5 +1,5 @@
 <?php
-
+require_once("include/datetime.php");
 
 
 function ping_init(&$a) {
@@ -7,6 +7,7 @@ function ping_init(&$a) {
 	if(! local_user())
 		xml_status(0);
 
+	
 	$r = q("SELECT COUNT(*) AS `total` FROM `item` 
 		WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d AND `wall` = 0 ",
 		intval(local_user())
@@ -19,30 +20,70 @@ function ping_init(&$a) {
 	);
 	$home = $r[0]['total'];
 
-	$r = q("SELECT COUNT(*) AS `total` FROM `intro` 
-		WHERE `uid` = %d  AND `blocked` = 0 AND `ignore` = 0 ",
+	$intros = q("SELECT COUNT(`intro`.`id`) AS `total`, `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 ",
 		intval(local_user())
 	);
-	$intro = $r[0]['total'];
+	$intro = $intros[0]['total'];
 
 	$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
-	$r = q("SELECT COUNT(*) AS `total` FROM `mail`
+	$mails = q("SELECT *,  COUNT(*) AS `total` FROM `mail`
 		WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
 		intval(local_user()),
 		dbesc($myurl)
 	);
-	$mail = $r[0]['total'];
-
+	$mail = $mails[0]['total'];
+	
 	if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
-		$r = q("SELECT COUNT(*) AS `total` FROM `register`");
-		$register = $r[0]['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");
+		$register = $regs[0]['total'];
 	} else {
 		$register = "0";
 	}
 
+
+	$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>';
+
+	
 	
 	header("Content-type: text/xml");
-	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home><register>$register</register></result>\r\n";
+	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
+		<result>
+			<intro>$intro</intro>
+			<mail>$mail</mail>
+			<net>$network</net>
+			<home>$home</home>";
+	if ($register!=0) echo "<register>$register</register>";
+	
+	echo '	<notif count="'.($mail+$intro+$register).'">';
+	if ($intro>0){
+		foreach ($intros as $i) { 
+			echo sprintf ( $notsxml, 
+				$a->get_baseurl().'/notification/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend")
+			);
+		};
+	}
+	if ($mail>0){
+		foreach ($mails as $i) { 
+			echo sprintf ( $notsxml,
+				$a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), t("{0} sent you a message")
+			);
+		};
+	}
+	if ($register>0){
+		foreach ($regs as $i) { 
+			echo sprintf ( $notsxml,
+				$a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), t("{0} requested registration")
+			);
+		};
+	}
+
+
+	echo "  </notif>
+		</result>
+	";
 
 	killme();
 }