From f0c292e77b697bd89a529244cb23e886e5481d40 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 May 2019 14:39:40 +0200 Subject: [PATCH] remove the caldav and event app and make calendar the default app --- Zotlabs/Lib/Apps.php | 5 ++--- Zotlabs/Module/Cdav.php | 19 +------------------ Zotlabs/Update/_1234.php | 26 ++++++++++++++++++++++++++ app/{caldav.apd => calendar.apd} | 6 +++--- app/events.apd | 6 ------ app/events.png | Bin 4118 -> 0 bytes boot.php | 2 +- 7 files changed, 33 insertions(+), 31 deletions(-) create mode 100644 Zotlabs/Update/_1234.php rename app/{caldav.apd => calendar.apd} (59%) delete mode 100644 app/events.apd delete mode 100644 app/events.png diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index fefc6639d..69996b49d 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -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'), diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php index 9e6997c05..aa3321644 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 = '' . t('CalDAV App') . ' (' . t('Not Installed') . '):
'; - $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); } diff --git a/Zotlabs/Update/_1234.php b/Zotlabs/Update/_1234.php new file mode 100644 index 000000000..b1b3b0c4e --- /dev/null +++ b/Zotlabs/Update/_1234.php @@ -0,0 +1,26 @@ +Mh5=KJ?A0000XbVXQnQ*U*0V`TtnbaZe!FE46oZEay=E^T#lX=7+% zY-}!LdTD0kUH||OEJ;K`RCt{2oO^5>MV`k$)jd6)vE%qfG9Ev2kl2BQm^=umAs(=FUZgd~tZP$JW;&$7-=%KH0>eEB85U=TGw-;L;t1_>NhRSwOcKgWcB0d938&lQ0lkLO`P zyW=l^q3)i0065puf>vIR&@?xqFDgp*>|xO35y!5%X62)gK3ez6E3X{RRhBCPg%CF> zrYVE{{la>t78LN!M<0EA2{a7MNQ5i>evVyp4Z5!11Y9NprCd;S?wp9Ww$e9k8p7*k zVBbDuG>RM^b|dxOwyDcBDLbytbCp6|VYl$zgar ze0Kfy4Eg=SG|m5UBg@qqC}F#Kp@~!)TPDt?c3SC zdv{fHb933ojT?J&mE+bATmVo~Qi5rkL~?XpgzY||KSHFHIqcJDJ0V8f$M1y@XdVxX z7B6P^?%kNCc?ZyvQ^#>Zpb$bdG&BT@ii+@hy$nU8d^0eRtGEPm-I*r{v(iW()9w{T zLGyT+HEWjD^ryHWFlQ^=(9kef2%#=oycmGkB)BuK!Wwq67}Z3p%+hEnC5B;;@Ap$u zQUWgb!Z{NtrTj5KZEY<8vCC+Ilcu?ixFkXuB~>>~gb>s(Uk*^x*w}bwuJ6v7Kq16! z0F{-MBb{#sS}(?h|uX;f5JQd3jILk~a9wF?$Fk|#}*wxdVc`^hJK^6|%*hQaH<{AHT< z*-11^6A4rVgVv*;0Gk|+I|*(G3>Fm^!Yi)ll^=5 z^2YY<{ABfN{_EwJleGzmL?V2;e?NQo>|xKxAG3eoKECH+qW}&_G}(~ z?6JhNUv1sWGfzJ~?sC!H-Hl-wXd^p~H0`tQ4bwzbRhBPb&YLYQ{!l1%9dOXmKy1iq z4OA569)Q}pa{=cBo(hL4E-B%$#~C;K=D=RC>&(G(^`g(3zv4UGxuH@PU z3z&P=RrL4wC+eLFhxw~nvqq+W2JI7!xHA%%am5uVih^Mne+xXD1r0#%1SSlKZWxaD zpQ+ou)K*u`o}H9m7+)eR+*n`F=f{tuX14((!>qWC46~r~Hy1F{4 zUiho8#??M+S7OGe@s0KMNGa8sGiTnEZJ)E&z{bYLD}@lAg^LyexjWF7_MPtPqP4Y^ zKknSgueNSYl&@L4mV58JFJs$O7o{o#fsm|y@rFtDEZ3{Hre-8>nhyZGvKdF#1R93% zV~@wf+$;@+s%v+$ zt(Hq>;DkuDfVzZf5xp zelTYHv>ivLDI5+b1rp*7?Lrb|Qc8pnEFRg@SFc;QE~^g&vL;Xnu@Io7xHu~VV&PP( zcG$4<4}YL36ylcpdj9u!zZ8CL~FYr2up0%&}@T0B<@SPgWZE$Rm$b3n4T&2BfsC zjOyxYX3v?!4_B?Cskxc;8#eI%haXaR-F1n2(P)&nfBV~X0T~?R@<1TjIuqBz3AE3G zloFrM$C4#W5JKD<3Wb6=L{6EjHrz@jqknpUZj+Yq9~6z?RQoLs;W9-K;oU%<6$AEm}s?ZJ#;83f6L01 z$rUpAauyk>)A*}!*pc=LAs|lR%$YMOFE2+?l;+1Df86h6OxYTdMG!Y2y6)J3Y<>N8 z{(IXtq8XwvFcM4Lv|$6gKKdx}?20R{VCAj10^@66Vjaw6NE~RNRc4K4_3G6~DT^YJ z$QmbO%gTrdA*vDvWN657yFH(L!rO1X#Y?~V1vl2$bLCZ6Q63C({Ma!L9z4jA!-pBN z$@BaDYiRptB0qN}Q1V%zl@4oZSxOIz)i`n+;UvtBp76JS3i0^qB$Tp2P%tW(h3 z+$^4a^2xm6;o)~fq0sePwruGdtG|w?u$1zzfrML;4S`E*0~_=ZBEH&s>r z`{$p3o*6S{(B0eXcny?{L_S&%AEv9blb)U)hK7a+l$TRcQ9)&8CFQ|%&%qvX!FHeN zxbkdoFK@i@MnY3Ps!C&1Q(C<=Irg#?^z`)b!V51Di^Yb75YP1V^sH}bX-Tr2jtOjN zXgIDY%AA*9ei?+I_xyRs)wfxNRyLc+S(C`MA)`%n|biyK?V3fUDxm1 zvSmxZy^bRS4a2xs2$7Qk$pzy@QO4B1ER00zA0`!jeSPfQxswk+{1D)*5aNkVn>KCB z)K^CY3L#d(Xb8(RO%!GP*)JJ?YE1CHjB8eES?W5dD9UKwes5p%NGDB7Nnc+dCr_T_ z{rBIeqoad(#QL1i=c`@6e*KsWzEc7h!^jQ?%1X)-i4L~m~|9UUF)+qaMQ z_V%PY<>lo}pFW+owziV~{{CrzYXYk^P2-DW$1PnV3iQ! z-!e_(aS4nc@y!kd0>WCG0LseB66eC-H|*cP9~k)*4`9};S)#qYefiyY-(3jwrPd#p zz(^#rLsIy*bry?ZycwY3x!6kLQMTt0MncXRUONqjyZLX3RLT3K01 zdwaVU3+b`+UN3&XKXD(6#V9N+q^PJ! zUbt}K_DpRi(!d$2s>-~)JTW{xOlfH;LqkL8x}JE^_YFb_G)=?r_a`iPety2VaN$D6 zBgl!Y@F~ME#JO|lC@CpPgw4NinrBC9kR%>xkU)2)`V$fO??Q-wc<;UU)Y{rwQBY9e zXfOPIfv)SEI(3SHfdRo7-%n2%(r;*JSZ%hE=(8uorqEgE3RaI3FJ@?#mX@OA3 zXCh5aO(mvj&M^!lNo#doSB8g&wP-Y|#bPm!uInCM*FA<|B$8>Gs%e_mRh3d&Nij`R z1r#ZzBBfLS;@5<#ODTmI`N5pTBO!!oU4;-b9&R_|$xswUk6#T{Rdq#C3`J3NRaJG5 z$D^yNYG|4k(=<)@dc85f-ychP2U1E?Rn^ulTeb|2#f$47-boTBga_~fnk{)UB-M6R zY*#BK9c83I#*=Bg8n&yI^msCWm@OZ(rKprLyYEv{$2^$?CJ7coA(=!qXK$&3N9T>hbE%yC{U0@GeJVto`wNz6oEChfCpVJeAs0#ixU0mH3^O@vEE z;6#WMoJw5kG`4GBB0rfLl`XzC1b$aB_4|P?F-4$DOcCf3Qv|xi6oD==MW9RkKl;wH Uc;!!cPyhe`07*qoM6N<$g8gya_y7O^ diff --git a/boot.php b/boot.php index df8308a70..67a7216ff 100755 --- a/boot.php +++ b/boot.php @@ -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__ );