move lrdd to jrd

This commit is contained in:
Michiel de Jong 2012-05-11 15:26:45 +02:00
parent b133f22d7f
commit 4c02a82f6c
2 changed files with 9 additions and 16 deletions

View File

@ -1,8 +1,8 @@
<?php if(OC_User::userExists(WF_USER)) { ?> <?php if(OC_User::userExists(WF_USER)) { ?>
<Link {
rel="remoteStorage" "rel":"remoteStorage",
template="<?php echo WF_BASEURL; ?>/apps/remoteStorage/WebDAV.php/<?php echo WF_USER; ?>/remoteStorage/{category}/" "template":"<?php echo WF_BASEURL; ?>/apps/remoteStorage/WebDAV.php/<?php echo WF_USER; ?>/remoteStorage/{category}/",
api="WebDAV" "api":"WebDAV",
auth="<?php echo WF_BASEURL; ?>/?app=remoteStorage&getfile=auth.php&userid=<?php echo WF_USER; ?>"> "auth":"<?php echo WF_BASEURL; ?>/?app=remoteStorage&getfile=auth.php&userid=<?php echo WF_USER; ?>"
</Link> }
<?php } ?> <?php } ?>

View File

@ -1,6 +1,6 @@
<?php <?php
header("Access-Control-Allow-Origin: *"); header("Access-Control-Allow-Origin: *");
header("Content-Type: application/xrd+xml"); header("Content-Type: application/xrd+json");
/** /**
* To include your app in the webfinger XML, add a new script with file name * To include your app in the webfinger XML, add a new script with file name
@ -55,14 +55,7 @@ if(empty($id)) {
define('WF_USER', $userName); define('WF_USER', $userName);
define('WF_ID', $id); define('WF_ID', $id);
define('WF_BASEURL', $baseAddress); define('WF_BASEURL', $baseAddress);
echo "<"; echo "{\"links\":[";
?>
?xml version="1.0" encoding="UTF-8"?>
<?php if(empty($id)) echo '<!-- Invalid URI: ' . str_replace('>', '/>', $request) . " -->\n"; ?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:hm="http://host-meta.net/xrd/1.0">
<hm:Host xmlns="http://host-meta.net/xrd/1.0"><?php echo $_SERVER['SERVER_NAME']; ?></hm:Host>
<Subject>acct:<?php echo $id ?></Subject>
<?php
$apps = OC_Appconfig::getApps(); $apps = OC_Appconfig::getApps();
foreach($apps as $app) { foreach($apps as $app) {
if(OCP\App::isEnabled($app)) { if(OCP\App::isEnabled($app)) {
@ -71,5 +64,5 @@ foreach($apps as $app) {
} }
} }
} }
echo "]}";
?> ?>
</XRD>