push changes

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 055066de0df03f66b79438c6f236c694de279827..297d8e44b6723e746e9c413499390f95e93eb235 100755 (executable)
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -23,6 +23,4 @@ OCP\App::addNavigationEntry( array(
   'name' => $l->t('Calendar')));
 OCP\App::registerPersonal('calendar', 'settings');
 OC_Search::registerProvider('OC_Search_Provider_Calendar');
-if(!file_exists(OC::$SERVERROOT.'/remote/caldav.php')){
-       file_put_contents(OC::$SERVERROOT.'/remote/caldav.php', file_get_contents(OC::$APPSROOT . '/apps/calendar/appinfo/remote.php'));
-}
\ No newline at end of file
+OCP\CONFIG::setAppValue('core', 'caldav', '/apps/calendar/appinfo/remote.php');
\ No newline at end of file

diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index 32b454ee90ca27e2c2a1187338a65b41d248199a..7ff6a2fbbe2b3cbc00111bac59adb9d7f8258dbe 100755 (executable)
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -5,10 +5,6 @@
  * later.
  * See the COPYING-README file.
  */
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
-require_once('../lib/base.php');
-
 OCP\App::checkAppEnabled('calendar');
 
 // Backends
@@ -24,7 +20,7 @@ $nodes = array(
 
 // Fire up server
 $server = new Sabre_DAV_Server($nodes);
-$server->setBaseUri(OC::$WEBROOT.'/remote/caldav.php');
+$server->setBaseUri($baseuri);
 // Add plugins
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
 $server->addPlugin(new Sabre_CalDAV_Plugin());

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index c8c1d779daef6013ad4d291568e73f08f76ccc0f..216e89d5c09db39ea70f3b52641b588b1570079d 100755 (executable)
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -25,6 +25,4 @@ OCP\App::addNavigationEntry( array(
 OCP\App::registerPersonal('contacts','settings');
 OCP\Util::addscript('contacts', 'loader');
 OC_Search::registerProvider('OC_Search_Provider_Contacts');
-if(!file_exists(OC::$SERVERROOT.'/remote/carddav.php')){
-       file_put_contents(OC::$SERVERROOT.'/remote/carddav.php', file_get_contents(OC::$APPSROOT . '/apps/contacts/appinfo/remote.php'));
-}
\ No newline at end of file
+OCP\CONFIG::setAppValue('core', 'carddav', '/apps/contacts/appinfo/remote.php');
\ No newline at end of file

diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 804c560e3d0414c15d067cba22ad61754b100505..13b90745ae76926c12690ff0ecf4f40861199fcc 100755 (executable)
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -19,9 +19,6 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
-require_once('../lib/base.php');
 
 OCP\App::checkAppEnabled('contacts');
 

diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 3f4e1705fb0b06eec4f3fc84d01eb6ca96637934..2cc2d48602cb20661dd71b9c946cb76c5f13e378 100755 (executable)
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -1,6 +1,4 @@
 <?php
-
-
 $l=OC_L10N::get('files');
 
 OCP\App::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
@@ -9,6 +7,4 @@ OCP\App::registerAdmin('files','admin');
 OCP\App::addNavigationEntry( array( "id" => "files_index", "order" => 0, "href" => OCP\Util::linkTo( "files", "index.php" ), "icon" => OCP\Util::imagePath( "core", "places/home.svg" ), "name" => $l->t("Files") ));
 
 OC_Search::registerProvider('OC_Search_Provider_File');
-if(!file_exists(OC::$SERVERROOT.'/remote/webdav.php')){
-       file_put_contents(OC::$SERVERROOT.'/remote/webdav.php', file_get_contents(OC::$APPSROOT . '/apps/files/appinfo/remote.php'));
-}
\ No newline at end of file
+OCP\CONFIG::setAppValue('core', 'webdav', '/apps/files/appinfo/remote.php');
\ No newline at end of file

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 3ac0023fb848faa41fdd027e780fc077269d5c2e..6d54a4baed21e1b47f322edd1cc7c303976d2be5 100644 (file)
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -23,10 +23,6 @@
  *
  */
 
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
-require_once('../lib/base.php');
-
 // only need filesystem apps
 $RUNTIME_APPTYPES=array('filesystem','authentication');
 

diff --git a/remote.php b/remote.php
new file mode 100644 (file)
index 0000000..e11b72e
--- /dev/null
+++ b/remote.php
@@ -0,0 +1,12 @@
+<?php
+$RUNTIME_NOSETUPFS = true;
+//$RUNTIME_NOAPPS = TRUE;
+require_once('lib/base.php');
+$file = OCP\CONFIG::getAppValue('core', $_GET['service']);
+if(is_null($file)){
+       header('HTTP/1.0 404 Not Found');
+       exit;
+}
+$baseuri = OC::$WEBROOT . '/remote.php?service=' . $_GET['service'] . '&amp;p=';
+parse_str($_GET['p'], $_GET);
+require_once(OC::$APPSROOT . $file);
\ No newline at end of file