diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-01-12 09:53:23 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-01-12 09:53:23 +0100 |
| commit | 8b6b042ffde9490c24a1689919dbc6678381239c (patch) | |
| tree | 1b5f30630887c44dcde93beaff08db3d199496ca /settings | |
| parent | 3317dd0a8e2ca265172d53a16f9241f3351aa3b8 (diff) | |
| download | nextcloud-server-8b6b042ffde9490c24a1689919dbc6678381239c.tar.gz nextcloud-server-8b6b042ffde9490c24a1689919dbc6678381239c.zip | |
Add config switch to disable the .well-known URL check
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/admin.php | 1 | ||||
| -rw-r--r-- | settings/js/admin.js | 4 | ||||
| -rw-r--r-- | settings/templates/admin.php | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/settings/admin.php b/settings/admin.php index d484d6a1e48..25db05d99ac 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -75,6 +75,7 @@ $template->assign('showLog', $showLog); $template->assign('readOnlyConfigEnabled', OC_Helper::isReadOnlyConfigEnabled()); $template->assign('isLocaleWorking', OC_Util::isSetLocaleWorking()); $template->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking()); +$template->assign('checkForWorkingWellKnownSetup', $config->getSystemValue('check_for_working_wellknown_setup', true)); $template->assign('has_fileinfo', OC_Util::fileInfoLoaded()); $template->assign('backgroundjobs_mode', $appConfig->getValue('core', 'backgroundjobs_mode', 'ajax')); $template->assign('cron_log', $config->getSystemValue('cron_log', true)); diff --git a/settings/js/admin.js b/settings/js/admin.js index 48dfdc88246..6660bfe9b48 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -168,8 +168,8 @@ $(document).ready(function(){ // run setup checks then gather error messages $.when( OC.SetupChecks.checkWebDAV(), - OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', oc_defaults.docPlaceholderUrl), - OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav/', oc_defaults.docPlaceholderUrl), + OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === 'true'), + OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === 'true'), OC.SetupChecks.checkSetup(), OC.SetupChecks.checkGeneric() ).then(function(check1, check2, check3, check4, check5) { diff --git a/settings/templates/admin.php b/settings/templates/admin.php index a66851743e6..539e4b94b8b 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -177,7 +177,7 @@ if ($_['cronErrors']) { ?> </ul> -<div id="postsetupchecks"> +<div id="postsetupchecks" data-check-wellknown="<?php if($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>"> <div class="loading"></div> <ul class="errors hidden"></ul> <ul class="warnings hidden"></ul> |