From: Jakob Sack Date: Sat, 14 Apr 2012 10:52:17 +0000 (+0200) Subject: Remove useless, unmaintained dav.php X-Git-Tag: v4.0.0beta~291^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9b1d6246a91cf896b3f37920098ea4d0f6c6098a;p=nextcloud-server.git Remove useless, unmaintained dav.php --- diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php index 1fece8077ac..ea743674fe8 100644 --- a/apps/calendar/appinfo/app.php +++ b/apps/calendar/appinfo/app.php @@ -7,7 +7,6 @@ OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php'; OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php'; OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php'; OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser'); -OC_Hook::connect('OC_DAV', 'initialize', 'OC_Calendar_Hooks', 'initializeCalDAV'); OC_Util::addScript('calendar','loader'); OC_App::register( array( 'order' => 10, @@ -20,4 +19,4 @@ OC_App::addNavigationEntry( array( 'icon' => OC_Helper::imagePath( 'calendar', 'icon.svg' ), 'name' => $l->t('Calendar'))); OC_App::registerPersonal('calendar', 'settings'); -OC_Search::registerProvider('OC_Search_Provider_Calendar'); \ No newline at end of file +OC_Search::registerProvider('OC_Search_Provider_Calendar'); diff --git a/apps/calendar/lib/hooks.php b/apps/calendar/lib/hooks.php index 54f1680a36e..22e8d8e20f2 100644 --- a/apps/calendar/lib/hooks.php +++ b/apps/calendar/lib/hooks.php @@ -24,17 +24,4 @@ class OC_Calendar_Hooks{ return true; } - - /** - * @brief Adds the CardDAV resource to the DAV server - * @param paramters parameters from initialize-Hook - * @return array - */ - public static function initializeCalDAV($parameters){ - // We need a backend, the root node and the caldav plugin - $parameters['backends']['caldav'] = new OC_Connector_Sabre_CalDAV(); - $parameters['nodes'][] = new Sabre_CalDAV_CalendarRootNode($parameters['backends']['principal'], $parameters['backends']['caldav']); - $parameters['plugins'][] = new Sabre_CalDAV_Plugin(); - return true; - } } diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php index 0ff8fd29ef3..7e44219ce99 100644 --- a/apps/contacts/appinfo/app.php +++ b/apps/contacts/appinfo/app.php @@ -8,7 +8,6 @@ OC::$CLASSPATH['OC_Search_Provider_Contacts'] = 'apps/contacts/lib/search.php'; OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Contacts_Hooks', 'deleteUser'); OC_HOOK::connect('OC_Calendar', 'getEvents', 'OC_Contacts_Hooks', 'getBirthdayEvents'); OC_HOOK::connect('OC_Calendar', 'getSources', 'OC_Contacts_Hooks', 'getCalenderSources'); -OC_Hook::connect('OC_DAV', 'initialize', 'OC_Contacts_Hooks', 'initializeCardDAV'); OC_App::register( array( 'order' => 10, diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php index e09da20be86..b858c4a5a48 100644 --- a/apps/contacts/lib/hooks.php +++ b/apps/contacts/lib/hooks.php @@ -39,19 +39,6 @@ class OC_Contacts_Hooks{ return true; } - /** - * @brief Adds the CardDAV resource to the DAV server - * @param paramters parameters from initialize-Hook - * @return array - */ - static public function initializeCardDAV($parameters){ - // We need a backend, the root node and the carddav plugin - $parameters['backends']['carddav'] = new OC_Connector_Sabre_CardDAV(); - $parameters['nodes'][] = new Sabre_CardDAV_AddressBookRoot($parameters['backends']['principal'], $parameters['backends']['carddav']); - $parameters['plugins'][] = new Sabre_CardDAV_Plugin(); - return true; - } - static public function getCalenderSources($parameters) { $base_url = OC_Helper::linkTo('calendar', 'ajax/events.php').'?calendar_id='; foreach(OC_Contacts_Addressbook::all(OC_User::getUser()) as $addressbook) { diff --git a/dav.php b/dav.php deleted file mode 100644 index 78e2711aec8..00000000000 --- a/dav.php +++ /dev/null @@ -1,77 +0,0 @@ -. -* -*/ - -require_once('lib/base.php'); - -// Backends we always need (auth, principal and files) -$backends = array( - 'auth' => new OC_Connector_Sabre_Auth(), - 'principal' => new OC_Connector_Sabre_Principal() -); - -// Root nodes -$nodes = array( - new Sabre_CalDAV_Principal_Collection($backends['principal']) -); - -// Plugins -$plugins = array( - new Sabre_DAV_Auth_Plugin($backends['auth'],'ownCloud'), - new Sabre_DAVACL_Plugin(), - new Sabre_DAV_Browser_Plugin(false) // Show something in the Browser, but no upload -); - -// Load the plugins etc we need for usual file sharing -$backends['lock'] = new OC_Connector_Sabre_Locks(); -$plugins[] = new Sabre_DAV_Locks_Plugin($backends['lock']); -// Add a RESTful user directory -// /files/$username/ -if( OC_User::isLoggedIn()){ - $currentuser = OC_User::getUser(); - $files = new Sabre_DAV_SimpleCollection('files'); - foreach( OC_User::getUsers() as $username ){ - if( $username == $currentuser ){ - $public = new OC_Connector_Sabre_Directory('.'); - $files->addChild( new Sabre_DAV_SimpleCollection( $username, $public->getChildren())); - } - else{ - $files->addChild(new Sabre_DAV_SimpleCollection( $username )); - } - } - $nodes[] = $files; -} - -// Get the other plugins and nodes -OC_Hook::emit( 'OC_DAV', 'initialize', array( 'backends' => &$backends, 'nodes' => &$nodes, 'plugins' => &$plugins )); - -// Fire up server -$server = new Sabre_DAV_Server($nodes); -$server->setBaseUri(OC::$WEBROOT.'/dav.php'); - -// Load additional plugins -foreach( $plugins as &$plugin ){ - $server->addPlugin( $plugin ); -} unset( $plugin ); // Always do this after foreach with references! - -// And off we go! -$server->exec();