From 0c7f0aa3fa1b41f1e3a1ff15a1dbfa1a584608c3 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Fri, 11 May 2012 10:26:30 +0200
Subject: [PATCH] attempt to align the webfinger app with new public.php
 routing

---
 apps/user_webfinger/appinfo/app.php     | 1 +
 apps/user_webfinger/appinfo/install.php | 2 +-
 apps/user_webfinger/webfinger.php       | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/user_webfinger/appinfo/app.php b/apps/user_webfinger/appinfo/app.php
index f7b927df82a..ffdbe9263e0 100755
--- a/apps/user_webfinger/appinfo/app.php
+++ b/apps/user_webfinger/appinfo/app.php
@@ -3,3 +3,4 @@ OCP\App::register( array(
   'order' => 11,
   'id' => 'user_webfinger',
   'name' => 'Webfinger' ));
+OCP\CONFIG::setAppValue('core', 'public_webfinger', '/apps/user_webfinger/webfinger.php');
diff --git a/apps/user_webfinger/appinfo/install.php b/apps/user_webfinger/appinfo/install.php
index c8d9a427425..00a533e781b 100644
--- a/apps/user_webfinger/appinfo/install.php
+++ b/apps/user_webfinger/appinfo/install.php
@@ -19,7 +19,7 @@ $lrddTmpl = 'http';
 if(isset($_SERVER['HTTPS'])) {
     $lrddTmpl .= 's';
 }
-$lrddTmpl .= '://' . $serverName . $webRoot . '/apps/user_webfinger/webfinger.php?q={uri}';
+$lrddTmpl .= '://' . $serverName . $webRoot . '/public.php?service=webfinger&q={uri}';
 $hostMetaPath = $docRoot . '/.well-known/host-meta';
 $hostMetaDir = $docRoot . '/.well-known';
 $hostMetaContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index 307a1630019..4ea9b80c98c 100755
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -25,8 +25,6 @@ $SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT));
 $WEBROOT=substr($SUBURI,0,-34);
 */
 
-require_once('../../lib/base.php');
-
 $userName = '';
 $hostName = '';
 $request = strip_tags(urldecode($_GET['q']));
-- 
2.39.5