diff options
| -rw-r--r-- | apps/remoteStorage/appinfo/webfinger.php | 12 | ||||
| -rwxr-xr-x | apps/user_webfinger/webfinger.php | 13 |
2 files changed, 9 insertions, 16 deletions
diff --git a/apps/remoteStorage/appinfo/webfinger.php b/apps/remoteStorage/appinfo/webfinger.php index 1cb2d45ee7a..5d481f315f8 100644 --- a/apps/remoteStorage/appinfo/webfinger.php +++ b/apps/remoteStorage/appinfo/webfinger.php @@ -1,8 +1,8 @@ <?php if(OC_User::userExists(WF_USER)) { ?> - <Link - rel="remoteStorage" - template="<?php echo WF_BASEURL; ?>/apps/remoteStorage/WebDAV.php/<?php echo WF_USER; ?>/remoteStorage/{category}/" - api="WebDAV" - auth="<?php echo WF_BASEURL; ?>/?app=remoteStorage&getfile=auth.php&userid=<?php echo WF_USER; ?>"> - </Link> + { + "rel":"remoteStorage", + "template":"<?php echo WF_BASEURL; ?>/apps/remoteStorage/WebDAV.php/<?php echo WF_USER; ?>/remoteStorage/{category}/", + "api":"WebDAV", + "auth":"<?php echo WF_BASEURL; ?>/?app=remoteStorage&getfile=auth.php&userid=<?php echo WF_USER; ?>" + } <?php } ?> diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php index 4ea9b80c98c..e75c546c2cb 100755 --- a/apps/user_webfinger/webfinger.php +++ b/apps/user_webfinger/webfinger.php @@ -1,6 +1,6 @@ <?php 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 @@ -55,14 +55,7 @@ if(empty($id)) { define('WF_USER', $userName); define('WF_ID', $id); define('WF_BASEURL', $baseAddress); -echo "<"; -?> -?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 +echo "{\"links\":["; $apps = OC_Appconfig::getApps(); foreach($apps as $app) { if(OCP\App::isEnabled($app)) { @@ -71,5 +64,5 @@ foreach($apps as $app) { } } } +echo "]}"; ?> -</XRD> |