From bcda46eda3b3b9208609bc5a9497632aa0dabfa9 Mon Sep 17 00:00:00 2001
From: Florian Hülsmann <fh@cbix.de>
Date: Wed, 28 Mar 2012 16:07:50 +0200
Subject: webfinger installation creates symlink in document root

---
 apps/user_webfinger/appinfo/install.php | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'apps/user_webfinger/appinfo')

diff --git a/apps/user_webfinger/appinfo/install.php b/apps/user_webfinger/appinfo/install.php
index f570a3a249b..9ba953a4e60 100644
--- a/apps/user_webfinger/appinfo/install.php
+++ b/apps/user_webfinger/appinfo/install.php
@@ -3,4 +3,34 @@ $appInfoDir = __DIR__;
 $thisAppDir = dirname($appInfoDir);
 $appsDir = dirname($thisAppDir);
 $ownCloudDir = dirname($appsDir);
-@symlink($thisAppDir, $ownCloudDir.'/.well-known');
+$docRoot = $_SERVER['DOCUMENT_ROOT'];
+if(file_exists($docRoot . '/.well-known/host-meta')) {
+	OC_Log::write(
+		'user_webfinger',
+		$docRoot . "/.well-known already exists; installation aborted",
+		OC_Log::ERROR
+	);
+} else {
+	if(@symlink($thisAppDir, $docRoot . '/.well-known')) {
+		OC_Log::write(
+			'user_webfinger',
+			"Webfinger symlink created at " . $docRoot . "/.well-known",
+			OC_Log::INFO
+		);
+	} else {
+		if(@symlink($thisAppDir, $ownCloudDir . '/.well-known')) {
+			OC_Log::write(
+				'user_webfinger',
+				"Couldn't create webfinger symlink in document root, linked to " . $ownCloudDir . "/.well-known instead",
+				OC_Log::WARN
+			);
+		} else {
+			OC_Log::write(
+				'user_webfinger',
+				"Couldn't create webfinger symlink, either check write permissions or create the link manually!",
+				OC_Log::ERROR
+			);
+		}
+	}
+}
+?>
-- 
cgit v1.2.3


From 34a0128ddf01a44302f89a1dfa14bb9565a8ae47 Mon Sep 17 00:00:00 2001
From: Florian Hülsmann <fh@cbix.de>
Date: Wed, 28 Mar 2012 16:12:34 +0200
Subject: whitespace indentation fix

---
 apps/user_webfinger/appinfo/install.php | 52 ++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'apps/user_webfinger/appinfo')

diff --git a/apps/user_webfinger/appinfo/install.php b/apps/user_webfinger/appinfo/install.php
index 9ba953a4e60..775141dce41 100644
--- a/apps/user_webfinger/appinfo/install.php
+++ b/apps/user_webfinger/appinfo/install.php
@@ -5,32 +5,32 @@ $appsDir = dirname($thisAppDir);
 $ownCloudDir = dirname($appsDir);
 $docRoot = $_SERVER['DOCUMENT_ROOT'];
 if(file_exists($docRoot . '/.well-known/host-meta')) {
-	OC_Log::write(
-		'user_webfinger',
-		$docRoot . "/.well-known already exists; installation aborted",
-		OC_Log::ERROR
-	);
+    OC_Log::write(
+        'user_webfinger',
+        $docRoot . "/.well-known already exists; installation aborted",
+        OC_Log::ERROR
+    );
 } else {
-	if(@symlink($thisAppDir, $docRoot . '/.well-known')) {
-		OC_Log::write(
-			'user_webfinger',
-			"Webfinger symlink created at " . $docRoot . "/.well-known",
-			OC_Log::INFO
-		);
-	} else {
-		if(@symlink($thisAppDir, $ownCloudDir . '/.well-known')) {
-			OC_Log::write(
-				'user_webfinger',
-				"Couldn't create webfinger symlink in document root, linked to " . $ownCloudDir . "/.well-known instead",
-				OC_Log::WARN
-			);
-		} else {
-			OC_Log::write(
-				'user_webfinger',
-				"Couldn't create webfinger symlink, either check write permissions or create the link manually!",
-				OC_Log::ERROR
-			);
-		}
-	}
+    if(@symlink($thisAppDir, $docRoot . '/.well-known')) {
+        OC_Log::write(
+            'user_webfinger',
+            "Webfinger symlink created at " . $docRoot . "/.well-known",
+            OC_Log::INFO
+        );
+    } else {
+        if(@symlink($thisAppDir, $ownCloudDir . '/.well-known')) {
+            OC_Log::write(
+                'user_webfinger',
+                "Couldn't create webfinger symlink in document root, linked to " . $ownCloudDir . "/.well-known instead",
+                OC_Log::WARN
+            );
+        } else {
+            OC_Log::write(
+                'user_webfinger',
+                "Couldn't create webfinger symlink, either check write permissions or create the link manually!",
+                OC_Log::ERROR
+            );
+        }
+    }
 }
 ?>
-- 
cgit v1.2.3


From 5161758921efb5bb50e579d8e6debfa93e595a7d Mon Sep 17 00:00:00 2001
From: Florian Hülsmann <fh@cbix.de>
Date: Fri, 30 Mar 2012 21:35:09 +0200
Subject: create static host-meta instead of symlink and .htaccess

---
 apps/user_webfinger/appinfo/install.php | 57 ++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 29 deletions(-)

(limited to 'apps/user_webfinger/appinfo')

diff --git a/apps/user_webfinger/appinfo/install.php b/apps/user_webfinger/appinfo/install.php
index 775141dce41..678d57ae8f2 100644
--- a/apps/user_webfinger/appinfo/install.php
+++ b/apps/user_webfinger/appinfo/install.php
@@ -4,33 +4,32 @@ $thisAppDir = dirname($appInfoDir);
 $appsDir = dirname($thisAppDir);
 $ownCloudDir = dirname($appsDir);
 $docRoot = $_SERVER['DOCUMENT_ROOT'];
-if(file_exists($docRoot . '/.well-known/host-meta')) {
-    OC_Log::write(
-        'user_webfinger',
-        $docRoot . "/.well-known already exists; installation aborted",
-        OC_Log::ERROR
-    );
-} else {
-    if(@symlink($thisAppDir, $docRoot . '/.well-known')) {
-        OC_Log::write(
-            'user_webfinger',
-            "Webfinger symlink created at " . $docRoot . "/.well-known",
-            OC_Log::INFO
-        );
-    } else {
-        if(@symlink($thisAppDir, $ownCloudDir . '/.well-known')) {
-            OC_Log::write(
-                'user_webfinger',
-                "Couldn't create webfinger symlink in document root, linked to " . $ownCloudDir . "/.well-known instead",
-                OC_Log::WARN
-            );
-        } else {
-            OC_Log::write(
-                'user_webfinger',
-                "Couldn't create webfinger symlink, either check write permissions or create the link manually!",
-                OC_Log::ERROR
-            );
-        }
-    }
+try {
+    $webRoot = substr(realpath($ownCloudDir), strlen(realpath($docRoot)));
+} catch(Exception $e) {
+    // some servers fail on realpath(), let's try it the unsecure way:
+    $webRoot = substr($ownCloudDir, strlen($docRoot));
 }
-?>
+$serverName = $_SERVER['SERVER_NAME'];
+$lrddTmpl = 'http';
+if(isset($_SERVER['HTTPS'])) {
+    $lrddTmpl .= 's';
+}
+$lrddTmpl .= '://' . $serverName . $webRoot . '/apps/user_webfinger/webfinger.php?q={uri}';
+$hostMetaPath = $docRoot . '/.well-known/host-meta';
+$hostMetaContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<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\">" . $serverName . "</hm:Host>
+    <Link rel=\"lrdd\" template=\"" . $lrddTmpl . "\">
+        <Title>Resource Descriptor</Title>
+    </Link>
+</XRD>";
+@mkdir(dirname($hostMetaPath));
+$hostMeta = fopen($hostMetaPath, 'w');
+if(!$hostMeta) {
+    die("Could not open " . $hostMetaPath . " for writing, please check permissions!");
+}
+if(!fwrite($hostMeta, $hostMetaContents, strlen($hostMetaContents))) {
+    die("Could not write to " . $hostMetaPath . ", please check permissions!");
+}
+fclose($hostMeta);
-- 
cgit v1.2.3


From f9f91a08b47c0a086c43966b1ecdf87185ceef83 Mon Sep 17 00:00:00 2001
From: Florian Hülsmann <fh@cbix.de>
Date: Sat, 31 Mar 2012 02:42:41 +0200
Subject: webfinger reimplementation started

---
 apps/remoteStorage/appinfo/info.xml      |  2 +-
 apps/remoteStorage/appinfo/webfinger.php |  6 ++++
 apps/user_webfinger/.htaccess            |  3 --
 apps/user_webfinger/appinfo/info.xml     |  6 ++--
 apps/user_webfinger/host-meta            |  1 -
 apps/user_webfinger/host-meta.php        | 16 ---------
 apps/user_webfinger/webfinger.php        | 57 +++++++++++++++++++++++---------
 7 files changed, 52 insertions(+), 39 deletions(-)
 create mode 100644 apps/remoteStorage/appinfo/webfinger.php
 delete mode 100644 apps/user_webfinger/.htaccess
 delete mode 100644 apps/user_webfinger/host-meta
 delete mode 100644 apps/user_webfinger/host-meta.php

(limited to 'apps/user_webfinger/appinfo')

diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml
index 121587795db..1ab55e8c094 100644
--- a/apps/remoteStorage/appinfo/info.xml
+++ b/apps/remoteStorage/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>remoteStorage</id>
 	<name>remoteStorage compatibility</name>
 	<description>Enables your users to use ownCloud as their remote storage for unhosted applications.</description>
-	<version>0.5</version>
+	<version>0.6</version>
 	<licence>AGPL or MIT</licence>
 	<author>Michiel de Jong</author>
 	<require>2</require>
diff --git a/apps/remoteStorage/appinfo/webfinger.php b/apps/remoteStorage/appinfo/webfinger.php
new file mode 100644
index 00000000000..bb3fe1681b3
--- /dev/null
+++ b/apps/remoteStorage/appinfo/webfinger.php
@@ -0,0 +1,6 @@
+    <Link
+        rel="remoteStorage"
+        template="<?php echo WF_ROOT; ?>/apps/remoteStorage/WebDAV.php/<?php echo WF_USER; ?>/remoteStorage/{category}/"
+        api="WebDAV"
+        auth="<?php echo WF_ROOT; ?>/apps/remoteStorage/auth.php/<?php echo WF_USER; ?>">
+    </Link>
diff --git a/apps/user_webfinger/.htaccess b/apps/user_webfinger/.htaccess
deleted file mode 100644
index 4d4d2e9c58f..00000000000
--- a/apps/user_webfinger/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-RewriteEngine On
-RewriteBase /
-RewriteRule host-meta$ \/\.well-known\/host-meta\.php [L]
diff --git a/apps/user_webfinger/appinfo/info.xml b/apps/user_webfinger/appinfo/info.xml
index 55cf2cf2201..d47fb723a3a 100644
--- a/apps/user_webfinger/appinfo/info.xml
+++ b/apps/user_webfinger/appinfo/info.xml
@@ -2,9 +2,9 @@
 <info>
 	<id>user_webfinger</id>
 	<name>Webfinger</name>
-	<description>Provide WebFinger for all users so they get a user address like user@owncloudinstance which can be used for unhosted applications. If you don't run ownCloud in the root of your domain, for instance if you run it on example.com/owncloud/, then make sure you link example.com/.well-known/ to example.com/owncloud/apps/user_webfinger/ - by running something like "ln -s /var/www/owncloud/apps/user_webfinger /var/www/.well-known". Only enable this app if you run this ownCloud installation on a public web address, not if you run it on an intranet or on localhost.</description>
-	<version>0.2</version>
+	<description>Provide WebFinger for all users so they get a user address like user@owncloudinstance which can be used for external applications. Other apps can provide information for webfinger requests, such as remoteStorage compatibility.</description>
+	<version>0.3</version>
 	<licence>AGPL or MIT</licence>
-	<author>Michiel de Jong</author>
+	<author>Michiel de Jong, Florian Hülsmann</author>
 	<require>2</require>
 </info>
diff --git a/apps/user_webfinger/host-meta b/apps/user_webfinger/host-meta
deleted file mode 100644
index dfaf3636145..00000000000
--- a/apps/user_webfinger/host-meta
+++ /dev/null
@@ -1 +0,0 @@
-please run 'a2enmod rewrite' on your server, set 'AllowOverride All' for /var/www in /etc/apache2/sites-enabled/000-default or equivalent, and then run '/etc/init.d/apache2 restart'
diff --git a/apps/user_webfinger/host-meta.php b/apps/user_webfinger/host-meta.php
deleted file mode 100644
index ac577cf9a0c..00000000000
--- a/apps/user_webfinger/host-meta.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-if($_SERVER['SCRIPT_NAME'] == '/.well-known/host-meta.php') {
-	header("Access-Control-Allow-Origin: *");
-} else {
-	header('Please-first: activate');
-}
-header("Content-Type: application/xrd+xml");
-echo "<";
-?>
-?xml version="1.0" encoding="UTF-8"?>
-<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>
-	<Link rel="lrdd" template="http<?php echo (isset($_SERVER['HTTPS'])?'s':''); ?>://<?php echo $_SERVER['SERVER_NAME'] ?>/.well-known/webfinger.php?q={uri}">
-	</Link>
-</XRD>
-
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index 5c2a24aa070..ecbfeed8e4b 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -1,41 +1,68 @@
 <?php
-if($_SERVER['SCRIPT_NAME'] == '/.well-known/webfinger.php') {
-	header("Access-Control-Allow-Origin: *");
-} else {
-	header('Please-first: activate');
-}
+header("Access-Control-Allow-Origin: *");
 header("Content-Type: application/xrd+xml");
 
+/**
+ * To include your app in the webfinger XML, add a new script with file name
+ * 'webfinger.php' to /apps/yourapp/appinfo/, which prints out the XML parts
+ * to be included. That script can make use of the constants WF_USER (e. g.
+ * "user"), WF_ADDRESS ("user@host") and WF_ROOT ("https://host/owncloud").
+ * An example could look like this:
+ * 
+ * <Link
+ * 	rel="myProfile"
+ * 	type="text/html"
+ * 	href="<?php echo WF_ROOT; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>">
+ * </Link>
+ *
+ '* but can also use complex database queries to generate the webfinger result
+ **/
 // calculate the documentroot
 // modified version of the one in lib/base.php that takes the .well-known symlink into account
-$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
+/*$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
 $SERVERROOT=str_replace("\\",'/',dirname(dirname(dirname(dirname(__FILE__)))));
 $SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT));
 $WEBROOT=substr($SUBURI,0,-34);
+*/
+require_once('../../lib/base.php');
 
+$id = $_GET['q'];
 if($_GET['q']) {
 	$bits = explode('@', $_GET['q']);
 	$userName = $bits[0];
 } else {
+	$id = '';
 	$userName = '';
 }
 if(substr($userName, 0, 5) == 'acct:') {
 	$userName = substr($userName, 5);
 }
 if(isset($_SERVER['HTTPS'])) {
-	$baseAddress = 'https://'.$_SERVER['SERVER_NAME'].'/apps/remoteStorage/';
+	$baseAddress = 'https://';
 } else {
-	$baseAddress = 'http://'.$_SERVER['SERVER_NAME'].'/apps/remoteStorage/';
+	$baseAddress = 'http://';
 }
+$baseAddress .= $_SERVER['SERVER_NAME'].OC::$WEBROOT;
+define('WF_USER', $userName);
+define('WF_ADDRESS', $id);
+define('WF_ROOT', $baseAddress);
 echo "<";
 ?>
 ?xml version="1.0" encoding="UTF-8"?>
 <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>
-	<Link
-		rel="remoteStorage"
-		template="<?php echo $baseAddress ?>WebDAV.php/<?php echo $userName ?>/remoteStorage/{category}/"
-		api="WebDAV"
-		auth="<?php echo $baseAddress; ?>auth.php/<?php echo $userName ?>"
-	></Link>
+	<hm:Host xmlns="http://host-meta.net/xrd/1.0"><?php echo $_SERVER['SERVER_NAME']; ?></hm:Host>
+    <Subject>acct:<?php echo $userName . '@' . $_SERVER['SERVER_NAME'] ?></Subject>
+<?php
+$apps = OC_Appconfig::getApps();
+foreach($apps as $app) {
+	//echo "checking $app...\n";
+	if(OC_App::isEnabled($app)) {
+		//echo "is enabled\n";
+		if(is_file(OC::$APPSROOT . '/apps/' . $app . '/appinfo/webfinger.php')) {
+			//echo "has webfinger.php\n";
+			require($app . '/appinfo/webfinger.php');
+		}
+	}
+}
+?>
 </XRD>
-- 
cgit v1.2.3


From 33c1fa6e28bb592de8d81089b6d09ede928c9071 Mon Sep 17 00:00:00 2001
From: Florian Hülsmann <fh@cbix.de>
Date: Mon, 2 Apr 2012 17:12:52 +0200
Subject: webfinger protocol compatible + minor changes

---
 apps/remoteStorage/appinfo/webfinger.php |  4 ++--
 apps/user_webfinger/appinfo/install.php  | 18 +++++++++++++++++-
 apps/user_webfinger/webfinger.php        | 31 +++++++++++++++++--------------
 3 files changed, 36 insertions(+), 17 deletions(-)

(limited to 'apps/user_webfinger/appinfo')

diff --git a/apps/remoteStorage/appinfo/webfinger.php b/apps/remoteStorage/appinfo/webfinger.php
index bb3fe1681b3..7c0ab846057 100644
--- a/apps/remoteStorage/appinfo/webfinger.php
+++ b/apps/remoteStorage/appinfo/webfinger.php
@@ -1,6 +1,6 @@
     <Link
         rel="remoteStorage"
-        template="<?php echo WF_ROOT; ?>/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"
-        auth="<?php echo WF_ROOT; ?>/apps/remoteStorage/auth.php/<?php echo WF_USER; ?>">
+        auth="<?php echo WF_BASEURL; ?>/apps/remoteStorage/auth.php/<?php echo WF_USER; ?>">
     </Link>
diff --git a/apps/user_webfinger/appinfo/install.php b/apps/user_webfinger/appinfo/install.php
index 678d57ae8f2..c8d9a427425 100644
--- a/apps/user_webfinger/appinfo/install.php
+++ b/apps/user_webfinger/appinfo/install.php
@@ -1,4 +1,8 @@
 <?php
+$hostMetaHeader = array(
+	'Access-Control-Allow-Origin' => '*',
+	'Content-Type' => 'application/xml+xrd'
+);
 $appInfoDir = __DIR__;
 $thisAppDir = dirname($appInfoDir);
 $appsDir = dirname($thisAppDir);
@@ -17,6 +21,7 @@ if(isset($_SERVER['HTTPS'])) {
 }
 $lrddTmpl .= '://' . $serverName . $webRoot . '/apps/user_webfinger/webfinger.php?q={uri}';
 $hostMetaPath = $docRoot . '/.well-known/host-meta';
+$hostMetaDir = $docRoot . '/.well-known';
 $hostMetaContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <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\">" . $serverName . "</hm:Host>
@@ -24,7 +29,7 @@ $hostMetaContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
         <Title>Resource Descriptor</Title>
     </Link>
 </XRD>";
-@mkdir(dirname($hostMetaPath));
+@mkdir($hostMetaDir);
 $hostMeta = fopen($hostMetaPath, 'w');
 if(!$hostMeta) {
     die("Could not open " . $hostMetaPath . " for writing, please check permissions!");
@@ -33,3 +38,14 @@ if(!fwrite($hostMeta, $hostMetaContents, strlen($hostMetaContents))) {
     die("Could not write to " . $hostMetaPath . ", please check permissions!");
 }
 fclose($hostMeta);
+
+// write custom headers into .htaccess:
+$htaccess = fopen($hostMetaDir . '/.htaccess', 'w');
+//TODO: check compatibility!
+fwrite($htaccess, "<filesMatch \"^host-meta$\">
+<ifModule mod_headers.c>\n");
+foreach($hostMetaHeader as $header => $value) {
+	fwrite($htaccess, "Header set " . $header . " \"" . $value . "\"\n");
+}
+fwrite($htaccess, "</ifModule>\n</filesMatch>");
+fclose($htaccess);
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index ecbfeed8e4b..9ada473ca87 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -6,13 +6,13 @@ header("Content-Type: application/xrd+xml");
  * To include your app in the webfinger XML, add a new script with file name
  * 'webfinger.php' to /apps/yourapp/appinfo/, which prints out the XML parts
  * to be included. That script can make use of the constants WF_USER (e. g.
- * "user"), WF_ADDRESS ("user@host") and WF_ROOT ("https://host/owncloud").
+ * "user"), WF_ID (user@host) and WF_BASEURL (e. g. https://host/owncloud).
  * An example could look like this:
  * 
  * <Link
  * 	rel="myProfile"
  * 	type="text/html"
- * 	href="<?php echo WF_ROOT; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>">
+ * 	href="<?php echo WF_BASEURL; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>">
  * </Link>
  *
  '* but can also use complex database queries to generate the webfinger result
@@ -24,19 +24,25 @@ $SERVERROOT=str_replace("\\",'/',dirname(dirname(dirname(dirname(__FILE__)))));
 $SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT));
 $WEBROOT=substr($SUBURI,0,-34);
 */
-require_once('../../lib/base.php');
 
-$id = $_GET['q'];
+require_once('../../lib/base.php');
+$request = urldecode($_GET['q']);
 if($_GET['q']) {
-	$bits = explode('@', $_GET['q']);
-	$userName = $bits[0];
+	$reqParts = explode('@', $request);
+	$userName = $reqParts[0];
+	$hostName = $reqParts[1];
 } else {
-	$id = '';
 	$userName = '';
+	$hostName = '';
 }
 if(substr($userName, 0, 5) == 'acct:') {
 	$userName = substr($userName, 5);
 }
+if($userName == "") {
+	$id = "";
+} else {
+	$id = $userName . '@' . $hostName;
+}
 if(isset($_SERVER['HTTPS'])) {
 	$baseAddress = 'https://';
 } else {
@@ -44,22 +50,19 @@ if(isset($_SERVER['HTTPS'])) {
 }
 $baseAddress .= $_SERVER['SERVER_NAME'].OC::$WEBROOT;
 define('WF_USER', $userName);
-define('WF_ADDRESS', $id);
-define('WF_ROOT', $baseAddress);
+define('WF_ID', $id);
+define('WF_BASEURL', $baseAddress);
 echo "<";
 ?>
 ?xml version="1.0" encoding="UTF-8"?>
 <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 $userName . '@' . $_SERVER['SERVER_NAME'] ?></Subject>
+    <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();
 foreach($apps as $app) {
-	//echo "checking $app...\n";
 	if(OC_App::isEnabled($app)) {
-		//echo "is enabled\n";
 		if(is_file(OC::$APPSROOT . '/apps/' . $app . '/appinfo/webfinger.php')) {
-			//echo "has webfinger.php\n";
 			require($app . '/appinfo/webfinger.php');
 		}
 	}
-- 
cgit v1.2.3