friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Ping is now using a standard routine to generate the xml.

This commit is contained in:
Michael Vogel 2016-08-10 22:51:03 +02:00
parent dbab4db754
commit 0ea9af3d7d
2 changed files with 114 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/xml.php
View File

@ -61,6 +61,18 @@ class xml {
continue; continue;
} }
$element_parts = explode(":", $key);
if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
$namespace = $namespaces[$element_parts[0]];
elseif (isset($namespaces[""])) {
$namespace = $namespaces[""];
} else
$namespace = NULL;
// Remove undefined namespaces from the key
if ((count($element_parts) > 1) AND is_null($namespace))
$key = $element_parts[1];
if (substr($key, 0, 11) == "@attributes") { if (substr($key, 0, 11) == "@attributes") {
if (!isset($element) OR !is_array($value)) if (!isset($element) OR !is_array($value))
continue; continue;
@ -78,14 +90,6 @@ class xml {
continue; continue;
} }
$element_parts = explode(":", $key);
if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
$namespace = $namespaces[$element_parts[0]];
elseif (isset($namespaces[""]))
$namespace = $namespaces[""];
else
$namespace = NULL;
if (!is_array($value)) if (!is_array($value))
$element = $xml->addChild($key, xmlify($value), $namespace); $element = $xml->addChild($key, xmlify($value), $namespace);
elseif (is_array($value)) { elseif (is_array($value)) {

209
mod/ping.php
View File

@ -4,22 +4,16 @@ require_once('include/bbcode.php');
require_once('include/ForumManager.php'); require_once('include/ForumManager.php');
require_once('include/group.php'); require_once('include/group.php');
require_once("mod/proxy.php"); require_once("mod/proxy.php");
require_once('include/xml.php');
function ping_init(&$a) { function ping_init(&$a) {
header("Content-type: text/xml"); if (local_user()){
echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
<result>";
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
if(local_user()){
// Different login session than the page that is calling us. // Different login session than the page that is calling us.
if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
if(intval($_GET['uid']) && intval($_GET['uid']) != local_user()) { $data = array("invalid" => 1);
echo '<invalid>1</invalid></result>'; header("Content-type: text/xml");
echo xml::from_array(array("result" => $data));
killme(); killme();
} }
@ -51,14 +45,14 @@ function ping_init(&$a) {
intval(local_user()), intval(local_user()) intval(local_user()), intval(local_user())
); );
if(dbm::is_result($r)) { if (dbm::is_result($r)) {
$arr = array('items' => $r); $arr = array('items' => $r);
call_hooks('network_ping', $arr); call_hooks('network_ping', $arr);
foreach ($r as $it) { foreach ($r as $it) {
if($it['wall']) if ($it['wall'])
$home ++; $home ++;
else else
$network ++; $network ++;
@ -84,20 +78,20 @@ function ping_init(&$a) {
if ($it['parent']!=$it['id']) { if ($it['parent']!=$it['id']) {
$comments[] = $it; $comments[] = $it;
} else { } else {
if(! $it['wall']) if (!$it['wall'])
$posts[] = $it; $posts[] = $it;
} }
} }
} }
} }
if($network) { if ($network) {
if(intval(feature_enabled(local_user(),'groups'))) { if (intval(feature_enabled(local_user(),'groups'))) {
// Find out how unseen network posts are spread across groups // Find out how unseen network posts are spread across groups
$groups_unseen = groups_count_unseen(); $groups_unseen = groups_count_unseen();
} }
if(intval(feature_enabled(local_user(),'forumlist_widget'))) { if (intval(feature_enabled(local_user(),'forumlist_widget'))) {
$forums_unseen = ForumManager::count_unseen_items(); $forums_unseen = ForumManager::count_unseen_items();
} }
} }
@ -128,7 +122,7 @@ function ping_init(&$a) {
if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){ 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) if ($regs)
$register = $regs[0]['total']; $register = $regs[0]['total'];
} else { } else {
$register = "0"; $register = "0";
@ -150,23 +144,23 @@ function ping_init(&$a) {
dbesc(datetime_convert('UTC','UTC','now')) dbesc(datetime_convert('UTC','UTC','now'))
); );
if(dbm::is_result($ev)) { if (dbm::is_result($ev)) {
$all_events = intval($ev[0]['total']); $all_events = intval($ev[0]['total']);
if($all_events) { if ($all_events) {
$str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d'); $str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d');
foreach($ev as $x) { foreach($ev as $x) {
$bd = false; $bd = false;
if($x['type'] === 'birthday') { if ($x['type'] === 'birthday') {
$birthdays ++; $birthdays ++;
$bd = true; $bd = true;
} }
else { else {
$events ++; $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 ++; $all_events_today ++;
if($bd) if ($bd)
$birthdays_today ++; $birthdays_today ++;
else else
$events_today ++; $events_today ++;
@ -175,92 +169,58 @@ function ping_init(&$a) {
} }
} }
$data = array();
$data["intro"] = $intro;
$data["mail"] = $mail;
$data["net"] = $network;
$data["home"] = $home;
/** if ($register!=0)
* return xml from notification array $data["register"] = $register;
*
* @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){
$contact = get_contact_details_by_url($n['url']); $groups = array();
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);
$n['message'] = html_entity_decode($n['message'], ENT_COMPAT | ENT_HTML401, "UTF-8"); if (dbm::is_result($groups_unseen)) {
$n['name'] = html_entity_decode($n['name'], ENT_COMPAT | ENT_HTML401, "UTF-8"); $count = 0;
// Are the nofications calles from the regular process or via the friendica app?
$regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
$a = get_app();
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 = '<note id="%d" href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" timestamp="%s" >%s</note>'."\n";
return sprintf ( $notsxml, intval($n['id']),
xmlify($n['href']), xmlify(xmlify($n['name'])), xmlify($n['url']), xmlify($n['photo']),
xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
xmlify($n['message'])
);
}
echo "<intro>$intro</intro>
<mail>$mail</mail>
<net>$network</net>
<home>$home</home>\r\n";
if ($register!=0) echo "<register>$register</register>";
if ( dbm::is_result($groups_unseen) ) {
echo '<groups>';
foreach ($groups_unseen as $it) foreach ($groups_unseen as $it)
if ($it['count'] > 0) if ($it['count'] > 0) {
echo '<group id="'.$it['id'].'">'.$it['count']."</group>"; $count++;
$groups[$count.":group"] = $it['count'];
echo "</groups>"; $groups[$count.":@attributes"] = array("id" => $it['id']);
}
$data["groups"] = $groups;
} }
if ( dbm::is_result($forums_unseen) ) { $forums = array();
echo '<forums>';
if (dbm::is_result($forums_unseen)) {
$count = 0;
foreach ($forums_unseen as $it) foreach ($forums_unseen as $it)
if ($it['count'] > 0) if ($it['count'] > 0) {
echo '<forum id="'.$it['id'].'">'.$it['count']."</forum>"; $count++;
$forums[$count.":forum"] = $it['count'];
echo "</forums>"; $forums[$count.":@attributes"] = array("id" => $it['id']);
}
$data["forums"] = $forums;
} }
echo "<all-events>$all_events</all-events> $data["all-events"] = $all_events;
<all-events-today>$all_events_today</all-events-today> $data["all-events-today"] = $all_events_today;
<events>$events</events> $data["events"] = $events;
<events-today>$events_today</events-today> $data["events-today"] = $events_today;
<birthdays>$birthdays</birthdays> $data["birthdays"] = $birthdays;
<birthdays-today>$birthdays_today</birthdays-today>\r\n"; $data["birthdays-today"] = $birthdays_today;
if (dbm::is_result($notifs) && (! $sysnotify)) { if (dbm::is_result($notifs) && !$sysnotify) {
foreach ($notifs as $zz) { foreach ($notifs as $zz) {
if($zz['seen'] == 0) if ($zz['seen'] == 0)
$sysnotify ++; $sysnotify ++;
} }
} }
echo ' <notif count="'. ($sysnotify + $intro + $mail + $register) .'">';
// merge all notification types in one array // merge all notification types in one array
if ( dbm::is_result($intros) ) { if (dbm::is_result($intros)) {
foreach ($intros as $i) { foreach ($intros as $i) {
$n = array( $n = array(
'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'], 'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
@ -275,7 +235,7 @@ function ping_init(&$a) {
} }
} }
if ( dbm::is_result($mails) ) { if (dbm::is_result($mails)) {
foreach ($mails as $i) { foreach ($mails as $i) {
$n = array( $n = array(
'href' => $a->get_baseurl().'/message/'.$i['id'], 'href' => $a->get_baseurl().'/message/'.$i['id'],
@ -290,7 +250,7 @@ function ping_init(&$a) {
} }
} }
if ( dbm::is_result($regs) ) { if (dbm::is_result($regs)) {
foreach ($regs as $i) { foreach ($regs as $i) {
$n = array( $n = array(
'href' => $a->get_baseurl().'/admin/users/', 'href' => $a->get_baseurl().'/admin/users/',
@ -316,34 +276,69 @@ function ping_init(&$a) {
}; };
usort($notifs, $sort_function); usort($notifs, $sort_function);
if( dbm::is_result($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) { 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));
} }
} }
$data["notif"] = $notifications;
echo " </notif>"; $data["@attributes"] = array("count" => $sysnotify + $intro + $mail + $register);
} }
echo " <sysmsgs>";
if(x($_SESSION,'sysmsg')){ $sysmsg = array();
if (x($_SESSION,'sysmsg')){
$count = 0;
foreach ($_SESSION['sysmsg'] as $m){ foreach ($_SESSION['sysmsg'] as $m){
echo "<notice>".xmlify($m)."</notice>"; $count++;
$sysmsg[$count.":notice"] = $m;
} }
unset($_SESSION['sysmsg']); unset($_SESSION['sysmsg']);
} }
if(x($_SESSION,'sysmsg_info')){
if (x($_SESSION,'sysmsg_info')){
$count = 0;
foreach ($_SESSION['sysmsg_info'] as $m){ foreach ($_SESSION['sysmsg_info'] as $m){
echo "<info>".xmlify($m)."</info>"; $count++;
$sysmsg[$count.":info"] = $m;
} }
unset($_SESSION['sysmsg_info']); unset($_SESSION['sysmsg_info']);
} }
echo " </sysmsgs>"; $data["sysmsgs"] = $sysmsg;
echo"</result>
";
header("Content-type: text/xml");
echo xml::from_array(array("result" => $data));
killme(); killme();
} }