lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9267 from torvista/develop

Browse Source 
Installer: set protocol of autofill of main url to match installer protocol
This commit is contained in:
Laurent Destailleur 2018-08-29 21:47:31 +02:00 committed by GitHub
commit 2cf37f621c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/install/fileconf.php
View File

@ -172,7 +172,7 @@ if (! empty($force_install_message))
?> ?>
<ul> <ul>
<li>/var/lib/dolibarr/documents</li> <li>/var/lib/dolibarr/documents</li>
<li>C:/My Documents/dolibarr/</li> <li>C:/My Documents/dolibarr/documents</li>
</ul> </ul>
</td> </td>
</tr> </tr>
@ -201,6 +201,7 @@ if (! empty($force_install_message))
<ul> <ul>
<li>http://localhost/</li> <li>http://localhost/</li>
<li>http://www.myserver.com:8180/dolibarr</li> <li>http://www.myserver.com:8180/dolibarr</li>
<li>https://www.myvirtualfordolibarr.com/</li>
</ul> </ul>
</td> </td>
</tr> </tr>
@ -382,7 +383,7 @@ if (! empty($force_install_message))
} ?> } ?>
> >
</td> </td>
<td class="comment"><?php echo $langs->trans("DatabasePrefix"); ?></td> <td class="comment"><?php echo $langs->trans("DatabasePrefixDescription"); ?></td>
</tr> </tr>
<tr class="hidesqlite"> <tr class="hidesqlite">

2
htdocs/install/inc.php
View File

@ -566,7 +566,7 @@ function detect_dolibarr_main_url_root()
$dolibarr_main_url_root = $_SERVER["SERVER_URL"] . $_SERVER["DOCUMENT_URI"]; $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) } // If SCRIPT_URI, SERVER_URL, DOCUMENT_URI not defined (Ie: Apache 2.0.44 for Windows)
else { else {
$proto = 'http'; $proto = ( (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
if (!empty($_SERVER["HTTP_HOST"])) { if (!empty($_SERVER["HTTP_HOST"])) {
$serverport = $_SERVER["HTTP_HOST"]; $serverport = $_SERVER["HTTP_HOST"];
} else { } else {

3
htdocs/langs/en_US/install.lang
View File

@ -50,13 +50,14 @@ ServerPortDescription=Database server port. Keep empty if unknown.
DatabaseServer=Database server DatabaseServer=Database server
DatabaseName=Database name DatabaseName=Database name
DatabasePrefix=Database table prefix DatabasePrefix=Database table prefix
DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
AdminLogin=User account for the Dolibarr database owner. AdminLogin=User account for the Dolibarr database owner.
PasswordAgain=Retype password confirmation PasswordAgain=Retype password confirmation
AdminPassword=Password for Dolibarr database owner. AdminPassword=Password for Dolibarr database owner.
CreateDatabase=Create database CreateDatabase=Create database
CreateUser=Create user account or grant user account permission on the Dolibarr database CreateUser=Create user account or grant user account permission on the Dolibarr database
DatabaseSuperUserAccess=Database server - Superuser access DatabaseSuperUserAccess=Database server - Superuser access
CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>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.<br>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:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist. CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> 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. 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) KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)