harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

appify cdav stuff. WARNING: if you use caldav or carddav from a client or the webinterface you will need to enable those apps to make things work again

Browse Source
This commit is contained in:
Mario Vavti 2018-09-15 10:10:43 +02:00
parent ab611e9ef3
commit 7856f5882b
1 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Zotlabs/Module/Cdav.php
View File

@ -1,6 +1,9 @@
<?php <?php
namespace Zotlabs\Module; namespace Zotlabs\Module;
use App;
use Zotlabs\Lib\Apps;
require_once('include/event.php'); require_once('include/event.php');
require_once('include/auth.php'); require_once('include/auth.php');
@ -126,8 +129,18 @@ class Cdav extends \Zotlabs\Web\Controller {
$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . 'CalDAV/CardDAV'); $auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . 'CalDAV/CardDAV');
if (local_channel()) { if (local_channel()) {
logger('loggedin'); logger('loggedin');
$channel = \App::get_channel();
if((argv(1) == 'calendars') && (!Apps::system_app_installed(local_channel(), 'CalDAV'))) {
killme();
}
if((argv(1) == 'addressbooks') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) {
killme();
}
$channel = App::get_channel();
$auth->setCurrentUser($channel['channel_address']); $auth->setCurrentUser($channel['channel_address']);
$auth->channel_id = $channel['channel_id']; $auth->channel_id = $channel['channel_id'];
$auth->channel_hash = $channel['channel_hash']; $auth->channel_hash = $channel['channel_hash'];
@ -161,12 +174,15 @@ class Cdav extends \Zotlabs\Web\Controller {
$nodes = [ $nodes = [
// /principals // /principals
new \Sabre\CalDAV\Principal\Collection($principalBackend), new \Sabre\CalDAV\Principal\Collection($principalBackend),
// /calendars // /calendars
new \Sabre\CalDAV\CalendarRoot($principalBackend, $caldavBackend), new \Sabre\CalDAV\CalendarRoot($principalBackend, $caldavBackend),
// /addressbook // /addressbook
new \Sabre\CardDAV\AddressBookRoot($principalBackend, $carddavBackend), new \Sabre\CardDAV\AddressBookRoot($principalBackend, $carddavBackend)
]; ];
// The object tree needs in turn to be passed to the server class // The object tree needs in turn to be passed to the server class
$server = new \Sabre\DAV\Server($nodes); $server = new \Sabre\DAV\Server($nodes);
@ -204,7 +220,15 @@ class Cdav extends \Zotlabs\Web\Controller {
if(! local_channel()) if(! local_channel())
return; return;
$channel = \App::get_channel(); if((argv(1) === 'calendar') && (! Apps::system_app_installed(local_channel(), 'CalDAV'))) {
return;
}
if((argv(1) === 'addressbook') && (! Apps::system_app_installed(local_channel(), 'CardDAV'))) {
return;
}
$channel = App::get_channel();
$principalUri = 'principals/' . $channel['channel_address']; $principalUri = 'principals/' . $channel['channel_address'];
if(!cdav_principal($principalUri)) if(!cdav_principal($principalUri))
@ -807,7 +831,25 @@ class Cdav extends \Zotlabs\Web\Controller {
if(!local_channel()) if(!local_channel())
return; return;
$channel = \App::get_channel(); if((argv(1) === 'calendar') && (! Apps::system_app_installed(local_channel(), 'CalDAV'))) {
//Do not display any associated widgets at this point
App::$pdl = '';
$o = '<b>CalDAV App (Not Installed):</b><br>';
$o .= t('CalDAV capable calendar');
return $o;
}
if((argv(1) === 'addressbook') && (! Apps::system_app_installed(local_channel(), 'CardDAV'))) {
//Do not display any associated widgets at this point
App::$pdl = '';
$o = '<b>CardDAV App (Not Installed):</b><br>';
$o .= t('CalDAV capable addressbook');
return $o;
}
$channel = App::get_channel();
$principalUri = 'principals/' . $channel['channel_address']; $principalUri = 'principals/' . $channel['channel_address'];
$pdo = \DBA::$dba->db; $pdo = \DBA::$dba->db;
@ -874,7 +916,7 @@ class Cdav extends \Zotlabs\Web\Controller {
$o .= replace_macros(get_markup_template('cdav_calendar.tpl'), [ $o .= replace_macros(get_markup_template('cdav_calendar.tpl'), [
'$sources' => $sources, '$sources' => $sources,
'$color' => $color, '$color' => $color,
'$lang' => \App::$language, '$lang' => App::$language,
'$first_day' => $first_day, '$first_day' => $first_day,
'$prev' => t('Previous'), '$prev' => t('Previous'),
'$next' => t('Next'), '$next' => t('Next'),