From 0d68049bcac243ecd27b0007be9ee2867efbdfdd Mon Sep 17 00:00:00 2001 From: Unrud Date: Wed, 12 Apr 2017 21:38:04 +0200 Subject: InfCloud: Allow empty passwords --- radicale_web/web/infcloud/main.js | 4 +-- radicale_web/web/infcloud/webdav_protocol.js | 40 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/radicale_web/web/infcloud/main.js b/radicale_web/web/infcloud/main.js index 06ac773..3687f64 100644 --- a/radicale_web/web/infcloud/main.js +++ b/radicale_web/web/infcloud/main.js @@ -788,7 +788,7 @@ function loadConfig() // check username and password against the server and create config from globalNetworkCheckSettings if(typeof globalNetworkCheckSettings!='undefined' && globalNetworkCheckSettings!=null) { - if(globalLoginUsername=='' || globalLoginPassword=='') + if(globalLoginUsername=='') { $('#LoginPage').fadeTo(500, 1, function(){if(typeof globalDemoMode=='undefined') $('[data-type="system_username"]').focus()}); $('#LoginLoader').fadeOut(1200); @@ -824,7 +824,7 @@ function loadConfig() // load the configuration XML(s) from the network if(typeof globalNetworkAccountSettings!='undefined' && globalNetworkAccountSettings!=null) { - if(globalLoginUsername=='' || globalLoginPassword=='') + if(globalLoginUsername=='') { $('#LoginPage').fadeTo(500, 1, function(){if(typeof globalDemoMode=='undefined') $('[data-type="system_username"]').focus()}); $('#LoginLoader').fadeOut(1200); diff --git a/radicale_web/web/infcloud/webdav_protocol.js b/radicale_web/web/infcloud/webdav_protocol.js index 9b8a595..93ce885 100644 --- a/radicale_web/web/infcloud/webdav_protocol.js +++ b/radicale_web/web/infcloud/webdav_protocol.js @@ -105,7 +105,7 @@ function netCheckAndCreateConfiguration(configurationURL) }, timeout: configurationURL.timeOut, beforeSend: function(req){ - if(globalSettings.usejqueryauth.value!=true && globalLoginUsername!='' && globalLoginPassword!='') + if(globalSettings.usejqueryauth.value!=true && globalLoginUsername!='') req.setRequestHeader('Authorization', basicAuth(globalLoginUsername,globalLoginPassword)); req.setRequestHeader('X-client', globalXClientHeader); req.setRequestHeader('Depth', '0'); @@ -193,7 +193,7 @@ function netLoadConfiguration(configurationURL) }, timeout: configurationURL.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && globalLoginUsername!='' && globalLoginPassword!='') + if(globalSettings.usejqueryauth.value!=true && globalLoginUsername!='') req.setRequestHeader('Authorization', basicAuth(globalLoginUsername,globalLoginPassword)); req.setRequestHeader('X-client', globalXClientHeader); }, @@ -380,7 +380,7 @@ function netSaveProperty(inputCollection, hrefProperty, inputProperty, inputValu }, timeout: inputCollection.timeOut, beforeSend: function(req){ - if(globalSettings.usejqueryauth.value!=true && inputCollection.userAuth.userName!='' && inputCollection.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && inputCollection.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(inputCollection.userAuth.userName, inputCollection.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); @@ -658,7 +658,7 @@ function DAVresourceDelegation(inputResource, index, lastIndex) timeout: inputResource.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && inputResource.userAuth.userName!='' && inputResource.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && inputResource.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(inputResource.userAuth.userName, inputResource.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); @@ -1074,7 +1074,7 @@ function netFindResource(inputResource, inputResourceIndex, forceLoad, indexR, l }, timeout: inputResource.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && inputResource.userAuth.userName!='' && inputResource.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && inputResource.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(inputResource.userAuth.userName,inputResource.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); @@ -1840,7 +1840,7 @@ function netLoadResource(inputResource, inputHref, hrefMode, inputResourceIndex, }, timeout: inputResource.timeOut, beforeSend: function(req){ - if(globalSettings.usejqueryauth.value!=true && inputResource.userAuth.userName!='' && inputResource.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && inputResource.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(inputResource.userAuth.userName, inputResource.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); @@ -1925,7 +1925,7 @@ function netSaveSettings(inputResource, inputSettings, isFormSave, collectionLoa }, timeout: inputResource.timeOut, beforeSend: function(req){ - if(globalSettings.usejqueryauth.value!=true && inputResource.userAuth.userName!='' && inputResource.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && inputResource.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(inputResource.userAuth.userName, inputResource.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); @@ -2063,7 +2063,7 @@ function deleteVcalendarFromCollection(inputUID,inputForm, putMode) timeout: resourceSettings.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='' && resourceSettings.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(resourceSettings.userAuth.userName, resourceSettings.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); @@ -2200,7 +2200,7 @@ function moveVcalendarToCollection(accountUID, inputUID, inputEtag, inputVcalend timeout: resourceSettings.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='' && resourceSettings.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(resourceSettings.userAuth.userName, resourceSettings.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); @@ -2365,7 +2365,7 @@ function putVcalendarToCollection(accountUID, inputUID, inputEtag, inputVcalenda beforeSend: function(req) { req.setRequestHeader('Prefer', 'return=representation'); - if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='' && resourceSettings.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(resourceSettings.userAuth.userName, resourceSettings.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); @@ -3018,7 +3018,7 @@ function CalDAVnetLoadCollection(inputCollection, forceLoad, allSyncMode, recurs }, timeout: inputCollection.timeOut, beforeSend: function(req){ - if(globalSettings.usejqueryauth.value!=true && inputCollection.userAuth.userName!='' && inputCollection.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && inputCollection.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(inputCollection.userAuth.userName, inputCollection.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); @@ -3318,7 +3318,7 @@ function netLoadCalendar(inputCollection, vcalendarList, syncReportSupport, rem }, timeout: inputCollection.timeOut, beforeSend: function(req){ - if(globalSettings.usejqueryauth.value!=true && inputCollection.userAuth.userName!='' && inputCollection.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && inputCollection.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(inputCollection.userAuth.userName, inputCollection.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); @@ -3525,7 +3525,7 @@ function netLoadCalendarSubscription(inputResource, inputCollection, recursiveIt crossDomain: false, timeout: 30000, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && inputResource.userAuth.userName!='' && inputResource.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && inputResource.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(inputResource.userAuth.userName, inputResource.userAuth.userPassword)); }, username: (globalSettings.usejqueryauth.value==true ? inputResource.userAuth.userName : null), @@ -3699,7 +3699,7 @@ function unlockCollection(inputContactObj) }, timeout: resourceSettings.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='' && resourceSettings.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(resourceSettings.userAuth.userName,resourceSettings.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); // req.setRequestHeader('Depth', '0'); @@ -3947,7 +3947,7 @@ function lockAndPerformToCollection(inputContactObj, inputFilterUID, inputPerfor timeout: resourceSettings.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='' && resourceSettings.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(resourceSettings.userAuth.userName,resourceSettings.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); req.setRequestHeader('Depth', '0'); @@ -4140,7 +4140,7 @@ function putVcardToCollection(inputContactObjArr, inputFilterUID, recursiveMode, beforeSend: function(req) { req.setRequestHeader('Prefer', 'return=representation'); - if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='' && resourceSettings.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(resourceSettings.userAuth.userName,resourceSettings.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); if(lockToken!=null && inputContactObj.withoutLockTocken!=true) @@ -4317,7 +4317,7 @@ function moveVcardToCollection(inputContactObj, inputFilterUID) timeout: resourceSettings.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='' && resourceSettings.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(resourceSettings.userAuth.userName,resourceSettings.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); if(lockToken!=null) @@ -4413,7 +4413,7 @@ function deleteVcardFromCollection(inputContactObj, inputFilterUID, recursiveMod }, timeout: resourceSettings.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='' && resourceSettings.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && resourceSettings.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(resourceSettings.userAuth.userName,resourceSettings.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); if(lockToken!=null) @@ -4705,7 +4705,7 @@ function CardDAVnetLoadCollection(inputCollection, forceLoad, forceLoadNextConta }, timeout: inputCollection.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && inputCollection.userAuth.userName!='' && inputCollection.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && inputCollection.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(inputCollection.userAuth.userName,inputCollection.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); req.setRequestHeader('Depth', '1'); @@ -4907,7 +4907,7 @@ function netLoadAddressbook(inputCollection, vcardList, syncReportSupport, force }, timeout: inputCollection.timeOut, beforeSend: function(req) { - if(globalSettings.usejqueryauth.value!=true && inputCollection.userAuth.userName!='' && inputCollection.userAuth.userPassword!='') + if(globalSettings.usejqueryauth.value!=true && inputCollection.userAuth.userName!='') req.setRequestHeader('Authorization', basicAuth(inputCollection.userAuth.userName,inputCollection.userAuth.userPassword)); req.setRequestHeader('X-client', globalXClientHeader); req.setRequestHeader('Depth', '0'); -- cgit