From b8234a1cb8d6603bf527fa12f6be9062b35efa8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= Date: Sat, 4 Aug 2012 08:46:11 +0000 Subject: [PATCH] Move friendica-specific parts into an own subdirectory --- dav/dav.php | 2 +- .../FriendicaACLPlugin.inc.php | 0 .../calendar.friendica.fnk.php | 0 dav/{ => friendica}/database-init.inc.php | 0 ...v_caldav_backend_virtual_friendica.inc.php | 0 ..._carddav_backend_virtual_friendica.inc.php | 0 .../dav_friendica_auth.inc.php | 0 .../dav_friendica_principal.inc.php | 0 dav/{ => friendica}/layout.fnk.php | 2 +- dav/{ => friendica}/main.php | 36 +++++++++---------- dav/{ => friendica}/wdcal.css | 0 11 files changed, 20 insertions(+), 20 deletions(-) rename dav/{ => friendica}/FriendicaACLPlugin.inc.php (100%) rename dav/{ => friendica}/calendar.friendica.fnk.php (100%) rename dav/{ => friendica}/database-init.inc.php (100%) rename dav/{ => friendica}/dav_caldav_backend_virtual_friendica.inc.php (100%) rename dav/{ => friendica}/dav_carddav_backend_virtual_friendica.inc.php (100%) rename dav/{ => friendica}/dav_friendica_auth.inc.php (100%) rename dav/{ => friendica}/dav_friendica_principal.inc.php (100%) rename dav/{ => friendica}/layout.fnk.php (99%) rename dav/{ => friendica}/main.php (89%) rename dav/{ => friendica}/wdcal.css (100%) diff --git a/dav/dav.php b/dav/dav.php index 05916d01f..40040dfe2 100644 --- a/dav/dav.php +++ b/dav/dav.php @@ -8,5 +8,5 @@ $_v = explode(".", phpversion()); if ($_v[0] > 5 || ($_v[0] == 5 && $_v[1] >= 3)) { - require(__DIR__ . "/main.php"); + require(__DIR__ . "/friendica/main.php"); } \ No newline at end of file diff --git a/dav/FriendicaACLPlugin.inc.php b/dav/friendica/FriendicaACLPlugin.inc.php similarity index 100% rename from dav/FriendicaACLPlugin.inc.php rename to dav/friendica/FriendicaACLPlugin.inc.php diff --git a/dav/calendar.friendica.fnk.php b/dav/friendica/calendar.friendica.fnk.php similarity index 100% rename from dav/calendar.friendica.fnk.php rename to dav/friendica/calendar.friendica.fnk.php diff --git a/dav/database-init.inc.php b/dav/friendica/database-init.inc.php similarity index 100% rename from dav/database-init.inc.php rename to dav/friendica/database-init.inc.php diff --git a/dav/dav_caldav_backend_virtual_friendica.inc.php b/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php similarity index 100% rename from dav/dav_caldav_backend_virtual_friendica.inc.php rename to dav/friendica/dav_caldav_backend_virtual_friendica.inc.php diff --git a/dav/dav_carddav_backend_virtual_friendica.inc.php b/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php similarity index 100% rename from dav/dav_carddav_backend_virtual_friendica.inc.php rename to dav/friendica/dav_carddav_backend_virtual_friendica.inc.php diff --git a/dav/dav_friendica_auth.inc.php b/dav/friendica/dav_friendica_auth.inc.php similarity index 100% rename from dav/dav_friendica_auth.inc.php rename to dav/friendica/dav_friendica_auth.inc.php diff --git a/dav/dav_friendica_principal.inc.php b/dav/friendica/dav_friendica_principal.inc.php similarity index 100% rename from dav/dav_friendica_principal.inc.php rename to dav/friendica/dav_friendica_principal.inc.php diff --git a/dav/layout.fnk.php b/dav/friendica/layout.fnk.php similarity index 99% rename from dav/layout.fnk.php rename to dav/friendica/layout.fnk.php index 597e773d2..5b65ec244 100644 --- a/dav/layout.fnk.php +++ b/dav/friendica/layout.fnk.php @@ -17,7 +17,7 @@ function wdcal_addRequiredHeaders() $a->page['htmlhead'] .= '' . "\r\n"; $a->page['htmlhead'] .= '' . "\r\n"; - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; $a->page['htmlhead'] .= '' . "\r\n"; $a->page['htmlhead'] .= '' . "\r\n"; diff --git a/dav/main.php b/dav/friendica/main.php similarity index 89% rename from dav/main.php rename to dav/friendica/main.php index c36d00840..602bda6d7 100644 --- a/dav/main.php +++ b/dav/friendica/main.php @@ -26,27 +26,27 @@ function dav_module() function dav_include_files() { - require_once (__DIR__ . "/SabreDAV/lib/Sabre/autoload.php"); + require_once (__DIR__ . "/../SabreDAV/lib/Sabre/autoload.php"); - require_once (__DIR__ . "/common/calendar.fnk.php"); - require_once (__DIR__ . "/common/calendar_rendering.fnk.php"); + require_once (__DIR__ . "/../common/calendar.fnk.php"); + require_once (__DIR__ . "/../common/calendar_rendering.fnk.php"); - require_once (__DIR__ . "/common/dav_caldav_backend_common.inc.php"); - require_once (__DIR__ . "/common/dav_caldav_backend_private.inc.php"); - require_once (__DIR__ . "/common/dav_caldav_backend_virtual.inc.php"); - require_once (__DIR__ . "/common/dav_caldav_root.inc.php"); - require_once (__DIR__ . "/common/dav_user_calendars.inc.php"); - require_once (__DIR__ . "/common/dav_caldav_calendar_virtual.inc.php"); - require_once (__DIR__ . "/common/dav_caldav_calendar_private.inc.php"); + require_once (__DIR__ . "/../common/dav_caldav_backend_common.inc.php"); + require_once (__DIR__ . "/../common/dav_caldav_backend_private.inc.php"); + require_once (__DIR__ . "/../common/dav_caldav_backend_virtual.inc.php"); + require_once (__DIR__ . "/../common/dav_caldav_root.inc.php"); + require_once (__DIR__ . "/../common/dav_user_calendars.inc.php"); + require_once (__DIR__ . "/../common/dav_caldav_calendar_virtual.inc.php"); + require_once (__DIR__ . "/../common/dav_caldav_calendar_private.inc.php"); - require_once (__DIR__ . "/common/dav_carddav_root.inc.php"); - require_once (__DIR__ . "/common/dav_carddav_backend_common.inc.php"); - require_once (__DIR__ . "/common/dav_carddav_backend_virtual.inc.php"); - require_once (__DIR__ . "/common/dav_carddav_backend_private.inc.php"); - require_once (__DIR__ . "/common/dav_user_addressbooks.inc.php"); + require_once (__DIR__ . "/../common/dav_carddav_root.inc.php"); + require_once (__DIR__ . "/../common/dav_carddav_backend_common.inc.php"); + require_once (__DIR__ . "/../common/dav_carddav_backend_virtual.inc.php"); + require_once (__DIR__ . "/../common/dav_carddav_backend_private.inc.php"); + require_once (__DIR__ . "/../common/dav_user_addressbooks.inc.php"); - require_once (__DIR__ . "/common/wdcal_configuration.php"); - require_once (__DIR__ . "/common/wdcal_backend.inc.php"); + require_once (__DIR__ . "/../common/wdcal_configuration.php"); + require_once (__DIR__ . "/../common/wdcal_backend.inc.php"); require_once (__DIR__ . "/dav_friendica_principal.inc.php"); require_once (__DIR__ . "/dav_friendica_auth.inc.php"); @@ -54,7 +54,7 @@ function dav_include_files() require_once (__DIR__ . "/dav_caldav_backend_virtual_friendica.inc.php"); require_once (__DIR__ . "/FriendicaACLPlugin.inc.php"); - require_once (__DIR__ . "/common/wdcal_edit.inc.php"); + require_once (__DIR__ . "/../common/wdcal_edit.inc.php"); require_once (__DIR__ . "/calendar.friendica.fnk.php"); require_once (__DIR__ . "/layout.fnk.php"); } diff --git a/dav/wdcal.css b/dav/friendica/wdcal.css similarity index 100% rename from dav/wdcal.css rename to dav/friendica/wdcal.css