X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=8c28e7474422bc6f7808a78fcae29b66fd504833;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=a7a2755c5ed1712fbba664bf81dc56850fb74472;hpb=e6202defd1d499def6ae509c95ad09b7b8d6aeca;p=friendica.git
diff --git a/mod/ping.php b/mod/ping.php
index a7a2755c5e..8c28e74744 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,23 +1,21 @@
- ";
-
- $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
-
- if(local_user()){
+ $xmlhead = "<"."?xml version='1.0' encoding='UTF-8' ?".">";
+ if (local_user()){
// Different login session than the page that is calling us.
-
- if(intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
- echo '1';
+ if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
+ $data = array("invalid" => 1);
+ header("Content-type: text/xml");
+ echo xml::from_array(array("result" => $data), $xml);
killme();
}
@@ -30,10 +28,13 @@ function ping_init(&$a) {
$dislikes = array();
$friends = array();
$posts = array();
+ $regs = array();
+ $mails = array();
$home = 0;
$network = 0;
- $network_group = array();
+ $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`,
@@ -41,18 +42,19 @@ function ping_init(&$a) {
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())
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$arr = array('items' => $r);
call_hooks('network_ping', $arr);
foreach ($r as $it) {
- if($it['wall'])
+ if ($it['wall'])
$home ++;
else
$network ++;
@@ -78,27 +80,22 @@ function ping_init(&$a) {
if ($it['parent']!=$it['id']) {
$comments[] = $it;
} else {
- if(! $it['wall'])
+ if (!$it['wall'])
$posts[] = $it;
}
}
}
}
- if ( $network )
- {
- # Find out how unseen network posts are spread across groups
- $sql = "SELECT g.id, g.name, count(i.id) count " .
- "FROM `group` g, group_member gm, item i " .
- "WHERE g.uid = %d " .
- "AND i.uid = %d " .
- "AND i.unseen AND i.visible " .
- "AND NOT i.deleted " .
- "AND i.`contact-id` = gm.`contact-id` " .
- "AND gm.gid = g.id GROUP BY g.id";
- #echo '' . $sql . '';
- $network_group = q($sql, intval(local_user()), intval(local_user()));
- #echo '';
+ if ($network) {
+ if (intval(feature_enabled(local_user(),'groups'))) {
+ // Find out how unseen network posts are spread across groups
+ $groups_unseen = groups_count_unseen();
+ }
+
+ if (intval(feature_enabled(local_user(),'forumlist_widget'))) {
+ $forums_unseen = ForumManager::count_unseen_items();
+ }
}
$intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`,
@@ -117,8 +114,6 @@ function ping_init(&$a) {
$intro = count($intros1) + count($intros2);
$intros = $intros1+$intros2;
-
-
$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
$mails = q("SELECT * FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -129,7 +124,7 @@ function ping_init(&$a) {
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)
+ if ($regs)
$register = $regs[0]['total'];
} else {
$register = "0";
@@ -151,23 +146,23 @@ function ping_init(&$a) {
dbesc(datetime_convert('UTC','UTC','now'))
);
- if($ev && count($ev)) {
+ if (dbm::is_result($ev)) {
$all_events = intval($ev[0]['total']);
- if($all_events) {
+ if ($all_events) {
$str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d');
foreach($ev as $x) {
$bd = false;
- if($x['type'] === 'birthday') {
+ if ($x['type'] === 'birthday') {
$birthdays ++;
$bd = true;
}
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
$events_today ++;
@@ -176,119 +171,102 @@ function ping_init(&$a) {
}
}
+ $data = array();
+ $data["intro"] = $intro;
+ $data["mail"] = $mail;
+ $data["net"] = $network;
+ $data["home"] = $home;
- /**
- * return xml from notification array
- *
- * @param array $n Notification array:
- * 'href' => notification link
- * 'name' => subject name
- * 'url' => subject url
- * 'photo' => subject photo
- * 'date' => notification date
- * 'seen' => bool true/false
- * 'message' => notification message. "{0}" will be replaced by subject name
- **/
- function xmlize($n){
- $n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO);
-
- $n['message'] = html_entity_decode($n['message'], ENT_COMPAT | ENT_HTML401, "UTF-8");
- $n['name'] = html_entity_decode($n['name'], ENT_COMPAT | ENT_HTML401, "UTF-8");
+ if ($register!=0)
+ $data["register"] = $register;
- // Are the nofications calles from the regular process or via the friendica app?
- $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
-
- $a = get_app();
+ $groups = array();
- if ($a->is_friendica_app() OR !$regularnotifications)
- $n['message'] = str_replace("{0}", $n['name'], $n['message']);
-
- $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
-
- call_hooks('ping_xmlize', $n);
- $notsxml = '%s'."\n";
- return sprintf ( $notsxml,
- xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
- xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
- xmlify($n['message'])
- );
+ if (dbm::is_result($groups_unseen)) {
+ $count = 0;
+ foreach ($groups_unseen as $it)
+ if ($it['count'] > 0) {
+ $count++;
+ $groups[$count.":group"] = $it['count'];
+ $groups[$count.":@attributes"] = array("id" => $it['id']);
+ }
+ $data["groups"] = $groups;
}
- echo "$intro
- $mail
- $network
- $home\r\n";
- if ($register!=0) echo "$register";
- if ( count($network_group) ) {
- echo '';
- foreach ($network_group as $it) {
- echo '' . $it['count'] . "";
- }
- echo "";
+ $forums = array();
+
+ if (dbm::is_result($forums_unseen)) {
+ $count = 0;
+ foreach ($forums_unseen as $it)
+ if ($it['count'] > 0) {
+ $count++;
+ $forums[$count.":forum"] = $it['count'];
+ $forums[$count.":@attributes"] = array("id" => $it['id']);
+ }
+ $data["forums"] = $forums;
}
- echo "$all_events
- $all_events_today
- $events
- $events_today
- $birthdays
- $birthdays_today\r\n";
+ $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(count($notifs) && (! $sysnotify)) {
- foreach($notifs as $zz) {
- if($zz['seen'] == 0)
+ if (dbm::is_result($notifs) && !$sysnotify) {
+ foreach ($notifs as $zz) {
+ if ($zz['seen'] == 0)
$sysnotify ++;
}
}
- echo ' ';
-
// merge all notification types in one array
- if ($intro>0){
+ if (dbm::is_result($intros)) {
foreach ($intros as $i) {
$n = array(
'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
'name' => $i['name'],
- 'url' => $i['url'],
+ 'url' => $i['url'],
'photo' => $i['photo'],
'date' => $i['datetime'],
'seen' => false,
- 'message' => t("{0} wants to be your friend"),
+ 'message' => t("{0} wants to be your friend"),
);
$notifs[] = $n;
}
}
-
- if ($mail>0){
+
+ if (dbm::is_result($mails)) {
foreach ($mails as $i) {
$n = array(
'href' => $a->get_baseurl().'/message/'.$i['id'],
'name' => $i['from-name'],
- 'url' => $i['from-url'],
+ 'url' => $i['from-url'],
'photo' => $i['from-photo'],
'date' => $i['created'],
'seen' => false,
- 'message' => t("{0} sent you a message"),
+ 'message' => t("{0} sent you a message"),
);
$notifs[] = $n;
}
}
-
- if ($register>0){
+
+ if (dbm::is_result($regs)) {
foreach ($regs as $i) {
$n = array(
'href' => $a->get_baseurl().'/admin/users/',
'name' => $i['name'],
- 'url' => $i['url'],
+ 'url' => $i['url'],
'photo' => $i['micro'],
'date' => $i['created'],
'seen' => false,
- 'message' => t("{0} requested registration"),
+ 'message' => t("{0} requested registration"),
);
$notifs[] = $n;
}
}
+
// sort notifications by $[]['date']
$sort_function = function($a, $b) {
$adate = date($a['date']);
@@ -300,34 +278,69 @@ function ping_init(&$a) {
};
usort($notifs, $sort_function);
- if(count($notifs)) {
+ if (dbm::is_result($notifs)) {
+
+ // Are the nofications calles from the regular process or via the friendica app?
+ $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
+
+ $count = 0;
foreach($notifs as $n) {
- echo xmlize($n);
+ $count++;
+ if ($a->is_friendica_app() OR !$regularnotifications)
+ $n['message'] = str_replace("{0}", $n['name'], $n['message']);
+
+ $notifications[$count.":note"] = $n['message'];
+
+ $contact = get_contact_details_by_url($n['url']);
+ if (isset($contact["micro"]))
+ $n['photo'] = proxy_url($contact["micro"], false, PROXY_SIZE_MICRO);
+ else
+ $n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO);
+
+ $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
+
+ call_hooks('ping_xmlize', $n);
+
+ $notifications[$count.":@attributes"] = array("id" => $n["id"],
+ "href" => $n['href'],
+ "name" => $n['name'],
+ "url" => $n['url'],
+ "photo" => $n['photo'],
+ "date" => relative_date($n['date']),
+ "seen" => $n['seen'],
+ "timestamp" => strtotime($local_time));
+
}
}
-
- echo " ";
+ $data["notif"] = $notifications;
+ $data["@attributes"] = array("count" => $sysnotify + $intro + $mail + $register);
}
- echo " ";
- if(x($_SESSION,'sysmsg')){
+ $sysmsg = array();
+
+ if (x($_SESSION,'sysmsg')){
+ $count = 0;
foreach ($_SESSION['sysmsg'] as $m){
- echo "".xmlify($m)."";
+ $count++;
+ $sysmsg[$count.":notice"] = $m;
}
unset($_SESSION['sysmsg']);
}
- if(x($_SESSION,'sysmsg_info')){
+
+ if (x($_SESSION,'sysmsg_info')){
+ $count = 0;
foreach ($_SESSION['sysmsg_info'] as $m){
- echo "".xmlify($m)."";
+ $count++;
+ $sysmsg[$count.":info"] = $m;
}
unset($_SESSION['sysmsg_info']);
}
- echo " ";
- echo"
- ";
+ $data["sysmsgs"] = $sysmsg;
+ header("Content-type: text/xml");
+ echo xml::from_array(array("result" => $data), $xml);
killme();
}
@@ -363,7 +376,7 @@ function ping_get_notifications($uid) {
$quit = true;
else
$offset += 50;
-
+
foreach ($r AS $notification) {
if (is_null($notification["visible"]))
@@ -381,12 +394,16 @@ function ping_get_notifications($uid) {
// Replace the name with {0} but ensure to make that only once
// The {0} is used later and prints the name in bold.
- $pos = strpos($notification["message"],$notification['name']);
+ if ($notification['name'] != "")
+ $pos = strpos($notification["message"],$notification['name']);
+ else
+ $pos = false;
+
if ($pos !== false)
$notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"]));
$notification['href'] = $a->get_baseurl() . '/notify/view/' . $notification['id'];
-
+
if ($notification["visible"] AND !$notification["spam"] AND
!$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
$result[$notification["parent"]] = $notification;
@@ -395,6 +412,6 @@ function ping_get_notifications($uid) {
} while ((count($result) < 50) AND !$quit);
-
+
return($result);
}