From f93be510a358689d726bf50b5d6989159b05cda2 Mon Sep 17 00:00:00 2001
From: "Michiel@unhosted" <michiel@unhosted.org>
Date: Mon, 12 Sep 2011 14:15:19 +0200
Subject: [PATCH] check activation and make activation impossible by default
---
apps/user_webfinger/activate.php | 11 +++++++++--
apps/user_webfinger/host-meta.php | 6 +++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/apps/user_webfinger/activate.php b/apps/user_webfinger/activate.php
index 6302ca0fa7..547c8e54d3 100644
--- a/apps/user_webfinger/activate.php
+++ b/apps/user_webfinger/activate.php
@@ -1,11 +1,18 @@
<?php
+
+// comment out this line:
+ die("This feature is still experimental. Please comment out this line in the code, then try again\n");
+//
+
+
+
$ownCloudBaseUri = substr($_SERVER['REQUEST_URI'],0, -(strlen('/apps/user_webfinger/activate.php')));
$thisAppDir = __DIR__;
$appsDir = dirname($thisAppDir);
$ownCloudDir = dirname($appsDir);
try{
symlink($thisAppDir, $ownCloudDir.'/.well-known');
- echo "Webfinger should now work.";
+ echo "Webfinger should now work.\n";
} catch(Exception $e) {
- echo "Please create a file called '.well-known in the ownCloud root, give the web server user permission to change it, and retry;";
+ echo "Please create a file called '.well-known in the ownCloud root, give the web server user permission to change it, and retry.\n";
}
diff --git a/apps/user_webfinger/host-meta.php b/apps/user_webfinger/host-meta.php
index eec473e494..c37b7dd776 100644
--- a/apps/user_webfinger/host-meta.php
+++ b/apps/user_webfinger/host-meta.php
@@ -1,5 +1,9 @@
<?php
-header("Access-Control-Allow-Origin: *");
+if($_SERVER['SCRIPT_NAME'] == '/.well-known/host-meta.php') {
+ header("Access-Control-Allow-Origin: *");
+} else {
+ header('Please visit /apps/user_webfinger/activate.php first');
+}
header("Content-Type: application/xml+xrd");
echo "<";
?>
--
GitLab