From 36acebf6198ef65b2889209ae8f3ac64ae150ae9 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Thu, 19 May 2022 16:06:34 -0400 Subject: re-add accountSettings parameter --- README-stackrpms.md | 1 + infcloud.spec | 5 ++++- radicale_infcloud/web/config.js | 3 ++- radicale_infcloud/web/webdav_protocol.js | 13 ++++++------- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README-stackrpms.md b/README-stackrpms.md index 738fe47..7532fa6 100644 --- a/README-stackrpms.md +++ b/README-stackrpms.md @@ -55,3 +55,4 @@ Relevant config options for radicale (file `/etc/radicale/config`) include: 2022-05-19 Version 0.13.1-stackrpms1.0 * added feature "perUserAdditionalResources" * added English (24h) localization option +* re-add settingsAccount which is useful after all diff --git a/infcloud.spec b/infcloud.spec index f63b4ab..78d7ecc 100644 --- a/infcloud.spec +++ b/infcloud.spec @@ -2,7 +2,7 @@ %define pname RadicaleInfCloud Name: infcloud Version: 0.13.1 -Release: 1stackrpms1.0%{?dist} +Release: 1stackrpms1.1%{?dist} Summary: Rich web client for carddav and caldav BuildArch: noarch @@ -43,5 +43,8 @@ ln -s %{_sysconfdir}/%{name}/cache.manifest %{buildroot}%{_datadir}/%{name}/radi %doc README-stackrpms.md %changelog +* Thu May 19 2022 B. Stack - 0.13.1-1stackrpms1.1 +- Improve patches + * Tue May 17 2022 B. Stack - 0.13.1-1 - Initial rpm built diff --git a/radicale_infcloud/web/config.js b/radicale_infcloud/web/config.js index 0dd9056..096adbe 100644 --- a/radicale_infcloud/web/config.js +++ b/radicale_infcloud/web/config.js @@ -125,7 +125,7 @@ var globalEnableDevelBuilds=true; // globalAccountSettings // globalNetworkCheckSettings // globalNetworkAccountSettings (available in auth module only) -// - settingsAccount DISABLED by stackrpms branch. This is totally ignored now. +// - settingsAccount // NOTE: server support for custom DAV properties is REQUIRED! // This option sets the account where the client properties such as: // loaded collections, enabled collections, ... are saved during @@ -352,6 +352,7 @@ var globalNetworkCheckSettings={ timeOut: 90000, lockTimeOut: 10000, checkContentType: true, + settingsAccount: true, delegation: true, additionalResources: [], hrefLabel: null, diff --git a/radicale_infcloud/web/webdav_protocol.js b/radicale_infcloud/web/webdav_protocol.js index d64139c..285c0b7 100644 --- a/radicale_infcloud/web/webdav_protocol.js +++ b/radicale_infcloud/web/webdav_protocol.js @@ -18,7 +18,6 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -// 2022-05-19 Stackrpms by removing all globalSettings.settingsAccount checks (but particularly at lines 1047, 1144, 1359), the "additionalResources" will load now. // VersionCheck (check for new version) function netVersionCheck() @@ -525,7 +524,7 @@ function DAVresourceDelegation(inputResource, index, lastIndex) var delegationXML=''; if(typeof inputResource.extendedDelegation!='undefined' && inputResource.extendedDelegation) { - if(inputResource.href.indexOf(globalLoginUsername)!=-1 && (globalSettings.settingstype.value=='' || globalSettings.settingstype.value==null || (globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null && globalSettings.settingstype.value=='principal-URL'))) + if(inputResource.href.indexOf(globalLoginUsername)!=-1 && inputResource.settingsAccount && (globalSettings.settingstype.value=='' || globalSettings.settingstype.value==null || (globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null && globalSettings.settingstype.value=='principal-URL'))) settingsXML = ''; delegationXML=''+settingsXML+''; } @@ -590,7 +589,7 @@ function DAVresourceDelegation(inputResource, index, lastIndex) }); } - if(typeof inputResource.extendedDelegation!='undefined' && inputResource.extendedDelegation && !settingsLoaded && inputResource.href.indexOf(globalLoginUsername)!=-1 && (globalSettings.settingstype.value=='' || globalSettings.settingstype.value==null || (globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null && globalSettings.settingstype.value=='principal-URL'))) + if(typeof inputResource.extendedDelegation!='undefined' && inputResource.extendedDelegation && !settingsLoaded && inputResource.href.indexOf(globalLoginUsername)!=-1 && inputResource.settingsAccount && (globalSettings.settingstype.value=='' || globalSettings.settingstype.value==null || (globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null && globalSettings.settingstype.value=='principal-URL'))) { var settings=$(xml.responseXML).children().filterNsNode('multistatus').children().filterNsNode('response').children().filterNsNode('propstat').children().filterNsNode('prop').children().filterNsNode('settings').text(); if(settings!='') @@ -1071,7 +1070,7 @@ function netFindResource(inputResource, inputResourceIndex, forceLoad, indexR, l var uidBase=tmp[1]+inputResource.userAuth.userName+'@'+tmp[2]; var uidFull=tmp[1]+inputResource.userAuth.userName+'@'+tmp[2]+tmp[3]; // for the error handler var settingsXML=''; - if(inputResource.href.indexOf(globalLoginUsername)!=-1 && (globalSettings.settingstype.value=='' || globalSettings.settingstype.value==null || (globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null && globalSettings.settingstype.value=='principal-URL'))) + if(inputResource.href.indexOf(globalLoginUsername)!=-1 && inputResource.settingsAccount && (globalSettings.settingstype.value=='' || globalSettings.settingstype.value==null || (globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null && globalSettings.settingstype.value=='principal-URL'))) settingsXML=''; var baseHref=tmp[1]+tmp[2]; @@ -1168,7 +1167,7 @@ function netFindResource(inputResource, inputResourceIndex, forceLoad, indexR, l if(isAvaible('CardDavMATE') && !globalCardDAVInitLoad) handleCardDAVError(false, inputResource); - if(!settingsLoaded && inputResource.href.indexOf(globalLoginUsername)!=-1 && (globalSettings.settingstype.value=='' || globalSettings.settingstype.value==null || (globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null && globalSettings.settingstype.value=='principal-URL'))) + if(!settingsLoaded && inputResource.href.indexOf(globalLoginUsername)!=-1 && inputResource.settingsAccount && (globalSettings.settingstype.value=='' || globalSettings.settingstype.value==null || (globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null && globalSettings.settingstype.value=='principal-URL'))) { var settings=$(xml.responseXML).children().filterNsNode('multistatus').children().filterNsNode('response').children().filterNsNode('propstat').children().filterNsNode('prop').children().filterNsNode('settings').text(); if(settings!='') @@ -1381,7 +1380,7 @@ function netLoadResource(inputResource, inputHref, hrefMode, inputResourceIndex, } var settingsXML=''; - if(inputResource.href.indexOf(globalLoginUsername)!=-1 && globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null) + if(inputResource.href.indexOf(globalLoginUsername)!=-1 && inputResource.settingsAccount && globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null) if((globalSettings.settingstype.value=='addressbook-home-set' && inputResource.abhref==inputHref) || (globalSettings.settingstype.value=='calendar-home-set' && inputResource.cahref==inputHref) || (globalSettings.settingstype.value=='principal-URL'&& ((isAvaible('CardDavMATE')&&globalCardDAVResourceSync) || (isAvaible('CalDavZAP')&&globalCalDAVResourceSync)))) settingsXML=''; @@ -1404,7 +1403,7 @@ function netLoadResource(inputResource, inputHref, hrefMode, inputResourceIndex, isHrefSet=false; var calendarNo=0; var resultTimestamp=new Date().getTime(); - if(!settingsLoaded && inputResource.href.indexOf(globalLoginUsername)!=-1 && globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null) + if(!settingsLoaded && inputResource.href.indexOf(globalLoginUsername)!=-1 && inputResource.settingsAccount && globalSettings.settingstype.value!='' && globalSettings.settingstype.value!=null) { if((globalSettings.settingstype.value=='addressbook-home-set' && inputResource.abhref==inputHref) || (globalSettings.settingstype.value=='calendar-home-set' && inputResource.cahref==inputHref)) { -- cgit