friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:CatoTH/friendica-addons

pull/76/merge
Tobias Hößl 2012-08-04 10:48:42 +02:00
parent 9b1de8593f b8234a1cb8
commit 8751d2221b
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dav/dav.php
View File

@ -8,5 +8,5 @@
$_v = explode(".", phpversion()); $_v = explode(".", phpversion());
if ($_v[0] > 5 || ($_v[0] == 5 && $_v[1] >= 3)) { if ($_v[0] > 5 || ($_v[0] == 5 && $_v[1] >= 3)) {
require(__DIR__ . "/main.php"); require(__DIR__ . "/friendica/main.php");
} }

0
dav/FriendicaACLPlugin.inc.php → dav/friendica/FriendicaACLPlugin.inc.php
View File

0
dav/calendar.friendica.fnk.php → dav/friendica/calendar.friendica.fnk.php
View File

0
dav/database-init.inc.php → dav/friendica/database-init.inc.php
View File

0
dav/dav_caldav_backend_virtual_friendica.inc.php → dav/friendica/dav_caldav_backend_virtual_friendica.inc.php
View File

0
dav/dav_carddav_backend_virtual_friendica.inc.php → dav/friendica/dav_carddav_backend_virtual_friendica.inc.php
View File

0
dav/dav_friendica_auth.inc.php → dav/friendica/dav_friendica_auth.inc.php
View File

0
dav/dav_friendica_principal.inc.php → dav/friendica/dav_friendica_principal.inc.php
View File

2
dav/layout.fnk.php → dav/friendica/layout.fnk.php
View File

@ -17,7 +17,7 @@ function wdcal_addRequiredHeaders()
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/dav/timepicker/timePicker.css' . '" media="all" />' . "\r\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/dav/timepicker/timePicker.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/dav/timepicker/jquery.timePicker.min.js"></script>' . "\r\n"; $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/dav/timepicker/jquery.timePicker.min.js"></script>' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/dav/wdcal.css' . '" media="all" />' . "\r\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/dav/friendica/wdcal.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/dav/common/wdcal.js"></script>' . "\r\n"; $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/dav/common/wdcal.js"></script>' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/dav/wdcal/css/calendar.css' . '" media="all" />' . "\r\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/dav/wdcal/css/calendar.css' . '" media="all" />' . "\r\n";

36
dav/main.php → dav/friendica/main.php
View File

@ -26,27 +26,27 @@ function dav_module()
function dav_include_files() 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.fnk.php");
require_once (__DIR__ . "/common/calendar_rendering.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_common.inc.php");
require_once (__DIR__ . "/common/dav_caldav_backend_private.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_backend_virtual.inc.php");
require_once (__DIR__ . "/common/dav_caldav_root.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_user_calendars.inc.php");
require_once (__DIR__ . "/common/dav_caldav_calendar_virtual.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_calendar_private.inc.php");
require_once (__DIR__ . "/common/dav_carddav_root.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_common.inc.php");
require_once (__DIR__ . "/common/dav_carddav_backend_virtual.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_carddav_backend_private.inc.php");
require_once (__DIR__ . "/common/dav_user_addressbooks.inc.php"); require_once (__DIR__ . "/../common/dav_user_addressbooks.inc.php");
require_once (__DIR__ . "/common/wdcal_configuration.php"); require_once (__DIR__ . "/../common/wdcal_configuration.php");
require_once (__DIR__ . "/common/wdcal_backend.inc.php"); require_once (__DIR__ . "/../common/wdcal_backend.inc.php");
require_once (__DIR__ . "/dav_friendica_principal.inc.php"); require_once (__DIR__ . "/dav_friendica_principal.inc.php");
require_once (__DIR__ . "/dav_friendica_auth.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__ . "/dav_caldav_backend_virtual_friendica.inc.php");
require_once (__DIR__ . "/FriendicaACLPlugin.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__ . "/calendar.friendica.fnk.php");
require_once (__DIR__ . "/layout.fnk.php"); require_once (__DIR__ . "/layout.fnk.php");
} }

0
dav/wdcal.css → dav/friendica/wdcal.css
View File