Browse Source

remove the caldav and event app and make calendar the default app

master
Mario Vavti 1 year ago
parent
commit
f0c292e77b
7 changed files with 33 additions and 31 deletions
  1. +2
    -3
      Zotlabs/Lib/Apps.php
  2. +1
    -18
      Zotlabs/Module/Cdav.php
  3. +26
    -0
      Zotlabs/Update/_1234.php
  4. +3
    -3
      app/calendar.apd
  5. +0
    -6
      app/events.apd
  6. BIN
      app/events.png
  7. +1
    -1
      boot.php

+ 2
- 3
Zotlabs/Lib/Apps.php View File

@@ -70,7 +70,7 @@ class Apps {
'Channel Home',
'View Profile',
'Photos',
'Events',
'Calendar',
'Directory',
'Search',
'Help',
@@ -342,7 +342,7 @@ class Apps {
'Channel Home' => t('Channel Home'),
'View Profile' => t('View Profile'),
'Photos' => t('Photos'),
'Events' => t('Events'),
'Calendar' => t('Calendar'),
'Directory' => t('Directory'),
'Help' => t('Help'),
'Mail' => t('Mail'),
@@ -363,7 +363,6 @@ class Apps {
'Privacy Groups' => t('Privacy Groups'),
'Notifications' => t('Notifications'),
'Order Apps' => t('Order Apps'),
'CalDAV' => t('CalDAV'),
'CardDAV' => t('CardDAV'),
'Channel Sources' => t('Channel Sources'),
'Guest Access' => t('Guest Access'),


+ 1
- 18
Zotlabs/Module/Cdav.php View File

@@ -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);
}


+ 26
- 0
Zotlabs/Update/_1234.php View File

@@ -0,0 +1,26 @@
<?php

namespace Zotlabs\Update;

class _1234 {

function run() {
q("START TRANSACTION");

$r = q("DELETE FROM app WHERE app_name = '%s' OR app_name = '%s'",
dbesc('Events'),
dbesc('CalDAV')
);

if($r) {
q("COMMIT");
return UPDATE_SUCCESS;
}

q("ROLLBACK");
return UPDATE_FAILED;

}

}

app/caldav.apd → app/calendar.apd View File

@@ -1,6 +1,6 @@
version: 2
version: 1
url: $baseurl/cdav/calendar, $baseurl/settings/calendar
requires: local_channel
name: CalDAV
name: Calendar
photo: icon:calendar
categories: Productivity, Personal
categories: Productivity, nav_featured_app

+ 0
- 6
app/events.apd View File

@@ -1,6 +0,0 @@
version: 2
url: $baseurl/events, $baseurl/settings/events
requires: local_channel
name: Events
photo: icon:calendar
categories: nav_featured_app, Productivity

BIN
app/events.png View File

Before After
Width: 80  |  Height: 80  |  Size: 4.0 KiB

+ 1
- 1
boot.php View File

@@ -53,7 +53,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '4.1.2' );
define ( 'ZOT_REVISION', '6.0a' );

define ( 'DB_UPDATE_VERSION', 1233 );
define ( 'DB_UPDATE_VERSION', 1234 );

define ( 'PROJECT_BASE', __DIR__ );



Loading…
Cancel
Save