friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

poco should now be spec compliant

Browse source
This commit is contained in:
Friendika 2011-10-27 04:38:33 -07:00
parent abe96155b4
commit ea0ab6fbac
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/template_processor.php
View file

@ -170,12 +170,12 @@
#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s); #$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
$s = $this->_build_nodes($s); $s = $this->_build_nodes($s);
$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s); $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
if ($s==Null) $this->_preg_error(); if ($s==Null) $this->_preg_error();
// remove comments block // remove comments block
$s = preg_replace('/{#[^#]*#}/', "" , $s); $s = preg_replace('/{#[^#]*#}/', "" , $s);
// replace strings recursively (limit to 10 loops) // replace strings recursively (limit to 10 loops)
$os = ""; $count=0; $os = ""; $count=0;
while($os!=$s && $count<10){ while($os!=$s && $count<10){

4
mod/poco.php
View file

@ -76,7 +76,7 @@ function poco_init(&$a) {
'id' => false, 'id' => false,
'displayName' => false, 'displayName' => false,
'urls' => false, 'urls' => false,
'preferredName' => false, 'preferredUsername' => false,
'photos' => false 'photos' => false
); );
@ -114,7 +114,7 @@ function poco_init(&$a) {
if($format === 'xml') { if($format === 'xml') {
header('Content-type: text/xml'); header('Content-type: text/xml');
echo replace_macros(get_markup_template('poco_xml.tpl',array_xmlify(array('$response' => $ret)))); echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
http_status_exit(500); http_status_exit(500);
} }
if($format === 'json') { if($format === 'json') {

4
view/poco_entry_xml.tpl
View file

@ -1,7 +1,7 @@
<entry> <entry>
{{ if $entry.id }}<id>$entry.id</id>{{ endif }} {{ if $entry.id }}<id>$entry.id</id>{{ endif }}
{{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }} {{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }}
{{ if $entry.preferredName }}<preferredName>$entry.preferredName</preferredName>{{ endif }} {{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }}
{{ if $entry.urls }}<urls><value>$entry.urls.value</value><type>$entry.urls.type</type></urls>{{ endif }} {{ if $entry.urls }}<urls><value>$entry.urls.value</value><type>$entry.urls.type</type></urls>{{ endif }}
{{ if $entry.photos }}<photos><value>$entry.photos.value</value><type><$entry.photos.type></type></photos>{{ endif }} {{ if $entry.photos }}<photos><value>$entry.photos.value</value><type>$entry.photos.type</type></photos>{{ endif }}
</entry> </entry>

12
view/poco_xml.tpl
View file

@ -3,12 +3,16 @@
{{ if $response.sorted }}<sorted>$response.sorted</sorted>{{ endif }} {{ if $response.sorted }}<sorted>$response.sorted</sorted>{{ endif }}
{{ if $response.filtered }}<filtered>$response.filtered</filtered>{{ endif }} {{ if $response.filtered }}<filtered>$response.filtered</filtered>{{ endif }}
{{ if $response.updatedSince }}<updatedSince>$response.updatedSince</updatedSince>{{ endif }} {{ if $response.updatedSince }}<updatedSince>$response.updatedSince</updatedSince>{{ endif }}
{{ if $response.startIndex }}<startIndex>$response.startIndex</startIndex>{{ endif }} <startIndex>$response.startIndex</startIndex>
{{ if $response.itemsPerPage }}<itemsPerPage>$response.itemsPerPage</itemsPerPage>{{ endif }} <itemsPerPage>$response.itemsPerPage</itemsPerPage>
{{ if $response.totalResults }}<totalResults>$response.totalResults</totalResults>{{ endif }} <totalResults>$response.totalResults</totalResults>
{{ if $response.totalResults }}
{{ for $response.entry as $entry }} {{ for $response.entry as $entry }}
{{ inc poco_entry_xml.tpl }}{{ endinc }} {{ inc poco_entry_xml.tpl }}{{ endinc }}
{{ endfor }} {{ endfor }}
{{ else }}
<entry></entry>
{{ endif }}
</response> </response>