diff options
| author | Max Kostikov <max@kostikov.co> | 2019-05-09 19:40:47 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-05-09 19:40:47 +0200 |
| commit | b9b65d7dfbf0d5532c93bd7395b5dbbcb8c1b68f (patch) | |
| tree | 7983e0b72be6bbd924af694cde0e1482264cf247 /Zotlabs/Module | |
| parent | 1545c78d05cee05de18d191169fd577a3fd9842d (diff) | |
| parent | f0c292e77b697bd89a529244cb23e886e5481d40 (diff) | |
| download | volse-hubzilla-b9b65d7dfbf0d5532c93bd7395b5dbbcb8c1b68f.tar.gz volse-hubzilla-b9b65d7dfbf0d5532c93bd7395b5dbbcb8c1b68f.tar.bz2 volse-hubzilla-b9b65d7dfbf0d5532c93bd7395b5dbbcb8c1b68f.zip | |
Merge branch 'dev' into 'dev'
remove the caldav and event app and make calendar the default app
See merge request hubzilla/core!1643
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Cdav.php | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php index 5888356d7..ed8a641b8 100644 --- a/Zotlabs/Module/Cdav.php +++ b/Zotlabs/Module/Cdav.php @@ -133,10 +133,6 @@ class Cdav extends Controller { logger('loggedin'); - if((argv(1) == 'calendars') && (!Apps::system_app_installed(local_channel(), 'CalDAV'))) { - killme(); - } - if((argv(1) == 'addressbooks') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) { killme(); } @@ -221,10 +217,6 @@ class Cdav extends Controller { if(! local_channel()) return; - if((argv(1) === 'calendar') && (! Apps::system_app_installed(local_channel(), 'CalDAV'))) { - return; - } - if((argv(1) === 'addressbook') && (! Apps::system_app_installed(local_channel(), 'CardDAV'))) { return; } @@ -847,15 +839,6 @@ class Cdav extends Controller { if(!local_channel()) return; - if((argv(1) === 'calendar') && (! Apps::system_app_installed(local_channel(), 'CalDAV'))) { - //Do not display any associated widgets at this point - App::$pdl = ''; - - $o = '<b>' . t('CalDAV App') . ' (' . t('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 = ''; @@ -884,7 +867,7 @@ class Cdav extends Controller { } if(argv(1) === 'calendar') { - nav_set_selected('CalDAV'); + nav_set_selected('Calendar'); $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); $calendars = $caldavBackend->getCalendarsForUser($principalUri); } |