From 8426f0e6cb8f1325f76089f2dd99c05c2089f476 Mon Sep 17 00:00:00 2001 From: torvista Date: Sat, 18 Aug 2018 23:45:20 +0200 Subject: [PATCH 1/3] Main url auto-filled field was hardcoded as http: easy to overlook this when running installer via https. This sets protocol to be the same as the installer page. --- htdocs/install/inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 88dbc76f9a6..c1581d37392 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -566,7 +566,7 @@ function detect_dolibarr_main_url_root() $dolibarr_main_url_root = $_SERVER["SERVER_URL"] . $_SERVER["DOCUMENT_URI"]; } // If SCRIPT_URI, SERVER_URL, DOCUMENT_URI not defined (Ie: Apache 2.0.44 for Windows) else { - $proto = 'http'; + $proto = ( (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http'; if (!empty($_SERVER["HTTP_HOST"])) { $serverport = $_SERVER["HTTP_HOST"]; } else { From 710ce6a9f7e364a5299607c3656de8a5c255baaa Mon Sep 17 00:00:00 2001 From: torvista Date: Sun, 19 Aug 2018 00:09:34 +0200 Subject: [PATCH 2/3] Add description to database prefix field to avoid confusion when not specifying a database prefix. --- htdocs/install/fileconf.php | 6 +++--- htdocs/langs/en_US/install.lang | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 26f4043ffe9..064982d1441 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -172,7 +172,7 @@ if (! empty($force_install_message)) ?> @@ -200,7 +200,7 @@ if (! empty($force_install_message)) trans("Examples").":
"; ?> @@ -382,7 +382,7 @@ if (! empty($force_install_message)) } ?> > - trans("DatabasePrefix"); ?> + trans("DatabasePrefixDescription"); ?> diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang index 629ac022331..e8a89657b6a 100644 --- a/htdocs/langs/en_US/install.lang +++ b/htdocs/langs/en_US/install.lang @@ -50,13 +50,14 @@ ServerPortDescription=Database server port. Keep empty if unknown. DatabaseServer=Database server DatabaseName=Database name DatabasePrefix=Database table prefix +DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_. AdminLogin=User account for the Dolibarr database owner. PasswordAgain=Retype password confirmation AdminPassword=Password for Dolibarr database owner. CreateDatabase=Create database CreateUser=Create user account or grant user account permission on the Dolibarr database DatabaseSuperUserAccess=Database server - Superuser access -CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.
In this case, you must fill in the user name and password for the superuser account at the bottom of this page. +CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.
In this case, you must also fill in the user name and password for the superuser account at the bottom of this page. CheckToCreateUser=Check the box if:
the database user account does not yet exist and so must be created, or
if the user account exists but the database does not exist and permissions must be granted.
In this case, you must enter the user account and password and also the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist. DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist. KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended) From 872273ef95b6ee3b574e14eaba017390aec5c8c9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 29 Aug 2018 21:46:39 +0200 Subject: [PATCH 3/3] Update fileconf.php --- htdocs/install/fileconf.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 064982d1441..d0fd9b7ecf8 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -200,7 +200,8 @@ if (! empty($force_install_message)) trans("Examples").":
"; ?>
  • http://localhost/
    • -
  • https://www.myserver.com:8180/dolibarr
    • +
  • http://www.myserver.com:8180/dolibarr
    • +
  • https://www.myvirtualfordolibarr.com/