From eb40d51dda1f4b3d2f69d13926df0bd2c05940a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 2 Oct 2019 18:32:23 +0200 Subject: [PATCH 1/3] Update dav.php --- htdocs/admin/dav.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php index cb3f7ab2072..90b82421702 100644 --- a/htdocs/admin/dav.php +++ b/htdocs/admin/dav.php @@ -123,7 +123,9 @@ else { print ''; $tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : ''); - print $form->textwithpicto($langs->trans($key), $tooltiphelp); + $label = $langs->trans($key); + if ($key == 'DAV_RESTICT_ON_IP') $label = $langs->trans("RESTRICT_ON_IP"); + print $form->textwithpicto($label, $tooltiphelp); print ''; if ($key == 'DAV_ALLOW_PRIVATE_DIR') { From fe0f1902095666302292aa1e204e51e7613e2194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 2 Oct 2019 18:49:05 +0200 Subject: [PATCH 2/3] Update dav.php --- htdocs/admin/dav.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php index 90b82421702..53971743b20 100644 --- a/htdocs/admin/dav.php +++ b/htdocs/admin/dav.php @@ -168,6 +168,9 @@ print "
"; // Define $urlwithroot $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file +if ($_SERVER['HTTPS'] == 'on' || $_SERVER['REQUEST_SCHEME'] == 'https') { + $urlwithroot = str_replace('http://', 'https://', $urlwithroot); +} //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current From 1a32a3b7f123210719283e4e9fc204716cc9dd41 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Oct 2019 14:21:22 +0200 Subject: [PATCH 3/3] Update dav.php --- htdocs/admin/dav.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php index 53971743b20..90b82421702 100644 --- a/htdocs/admin/dav.php +++ b/htdocs/admin/dav.php @@ -168,9 +168,6 @@ print "
"; // Define $urlwithroot $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file -if ($_SERVER['HTTPS'] == 'on' || $_SERVER['REQUEST_SCHEME'] == 'https') { - $urlwithroot = str_replace('http://', 'https://', $urlwithroot); -} //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current