From 0ea9af3d7da0d35570de645124f44350bca23397 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 10 Aug 2016 22:51:03 +0200 Subject: [PATCH] Ping is now using a standard routine to generate the xml. --- include/xml.php | 20 +++-- mod/ping.php | 209 +++++++++++++++++++++++------------------------- 2 files changed, 114 insertions(+), 115 deletions(-) diff --git a/include/xml.php b/include/xml.php index f45d6cade0..3bb376abaf 100644 --- a/include/xml.php +++ b/include/xml.php @@ -61,6 +61,18 @@ class xml { 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 (!isset($element) OR !is_array($value)) continue; @@ -78,14 +90,6 @@ class xml { 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)) $element = $xml->addChild($key, xmlify($value), $namespace); elseif (is_array($value)) { diff --git a/mod/ping.php b/mod/ping.php index f2e57430d2..4f939eaa0c 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -4,22 +4,16 @@ require_once('include/bbcode.php'); require_once('include/ForumManager.php'); require_once('include/group.php'); require_once("mod/proxy.php"); +require_once('include/xml.php'); function ping_init(&$a) { - header("Content-type: text/xml"); - - echo " - "; - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - - if(local_user()){ - + 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)); killme(); } @@ -51,14 +45,14 @@ function ping_init(&$a) { intval(local_user()), intval(local_user()) ); - if(dbm::is_result($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 ++; @@ -84,20 +78,20 @@ function ping_init(&$a) { if ($it['parent']!=$it['id']) { $comments[] = $it; } else { - if(! $it['wall']) + if (!$it['wall']) $posts[] = $it; } } } } - if($network) { - if(intval(feature_enabled(local_user(),'groups'))) { + 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'))) { + if (intval(feature_enabled(local_user(),'forumlist_widget'))) { $forums_unseen = ForumManager::count_unseen_items(); } } @@ -128,7 +122,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"; @@ -150,23 +144,23 @@ function ping_init(&$a) { dbesc(datetime_convert('UTC','UTC','now')) ); - if(dbm::is_result($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 ++; @@ -175,92 +169,58 @@ 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){ + if ($register!=0) + $data["register"] = $register; - $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); + $groups = array(); - $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"); - - // 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 = '%s'."\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 - $mail - $network - $home\r\n"; - if ($register!=0) echo "$register"; - - if ( dbm::is_result($groups_unseen) ) { - echo ''; + if (dbm::is_result($groups_unseen)) { + $count = 0; foreach ($groups_unseen as $it) - if ($it['count'] > 0) - echo ''.$it['count'].""; - - echo ""; + if ($it['count'] > 0) { + $count++; + $groups[$count.":group"] = $it['count']; + $groups[$count.":@attributes"] = array("id" => $it['id']); + } + $data["groups"] = $groups; } - if ( dbm::is_result($forums_unseen) ) { - echo ''; + $forums = array(); + + if (dbm::is_result($forums_unseen)) { + $count = 0; foreach ($forums_unseen as $it) - if ($it['count'] > 0) - echo ''.$it['count'].""; - - echo ""; + 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 (dbm::is_result($notifs) && (! $sysnotify)) { + if (dbm::is_result($notifs) && !$sysnotify) { foreach ($notifs as $zz) { - if($zz['seen'] == 0) + if ($zz['seen'] == 0) $sysnotify ++; } } - echo ' '; - // merge all notification types in one array - if ( dbm::is_result($intros) ) { + if (dbm::is_result($intros)) { foreach ($intros as $i) { $n = array( '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) { $n = array( '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) { $n = array( 'href' => $a->get_baseurl().'/admin/users/', @@ -316,34 +276,69 @@ function ping_init(&$a) { }; 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) { - 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)); killme(); }