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

Fix install check

Browse Source
This commit is contained in:
Laurent Destailleur 2018-06-05 08:57:04 +02:00
parent 87d073b5cd
commit 7c82c74b6b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/install/check.php
View File

@ -252,8 +252,14 @@ if (! file_exists($conffile))
} }
else else
{ {
if (dol_is_dir($conffile))
{
print '<img src="../theme/eldy/img/tick.png" alt="Warning"> '.$langs->trans("ConfFileMustBeAFileNotADir",$conffiletoshow);
$allowinstall=0;
}
// File exists but can't be modified // File exists but can't be modified
if (!is_writable($conffile)) elseif (!is_writable($conffile))
{ {
if ($confexists) if ($confexists)
{ {

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

@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created. ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS). ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
ConfFileIsWritable=Configuration file <b>%s</b> is writable. ConfFileIsWritable=Configuration file <b>%s</b> is writable.
ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
ConfFileReload=Reload all information from configuration file. ConfFileReload=Reload all information from configuration file.
PHPSupportSessions=This PHP supports sessions. PHPSupportSessions=This PHP supports sessions.
PHPSupportPOSTGETOk=This PHP supports variables POST and GET. PHPSupportPOSTGETOk=This PHP supports variables POST and GET.