aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-07-25 16:54:39 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-07-25 16:54:39 +0200
commit99ab06bad3eb8b4c20e70c255d9d4b168c137dde (patch)
tree41b7f8bdac592346e8319a38db4f2d15e31964f8 /mod
parent5fb2b522f47a362debae7ee0c3bcb3b23f36bac6 (diff)
downloadvolse-hubzilla-99ab06bad3eb8b4c20e70c255d9d4b168c137dde.tar.gz
volse-hubzilla-99ab06bad3eb8b4c20e70c255d9d4b168c137dde.tar.bz2
volse-hubzilla-99ab06bad3eb8b4c20e70c255d9d4b168c137dde.zip
js to open close popup nav menu and to populate notification menu via ping.
Update mod/ping to return details about messages and intros
Diffstat (limited to 'mod')
-rw-r--r--mod/ping.php45
1 files changed, 37 insertions, 8 deletions
diff --git a/mod/ping.php b/mod/ping.php
index 7c31f00c9..e7f366095 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,23 +20,51 @@ 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'];
+
+
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></result>\r\n";
+ echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
+ <result>
+ <intro>$intro</intro>
+ <mail>$mail</mail>
+ <net>$network</net>
+ <home>$home</home>
+ <notif count=\"".($mail+$intro)."\">";
+ if ($intro>0){
+ foreach ($intros as $i) {
+ echo sprintf ('<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>',
+ $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) {
+ var_dump($i);
+ echo sprintf ('<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>',
+ $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")
+ );
+ };
+ }
+
+ echo " </notif>
+ </result>
+ ";
killme();
}