Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
This commit is contained in:
commit
3819529d86
@ -324,6 +324,18 @@ foreach($configfileparameters as $key => $value)
|
||||
print "<td>";
|
||||
if ($newkey == 'dolibarr_main_db_pass') print preg_replace('/./i','*',${$newkey});
|
||||
else if ($newkey == 'dolibarr_main_url_root' && preg_match('/__auto__/',${$newkey})) print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT');
|
||||
else if ($newkey == 'dolibarr_main_document_root_alt')
|
||||
{
|
||||
$tmparray=explode(',',${$newkey});
|
||||
$i=0;
|
||||
foreach($tmparray as $value2)
|
||||
{
|
||||
if ($i > 0) print ', ';
|
||||
print $value2;
|
||||
if (! is_readable($value2)) print ' '.img_warning($langs->trans("ErrorCantReadDirr"));
|
||||
++$i;
|
||||
}
|
||||
}
|
||||
else print ${$newkey};
|
||||
if ($newkey == 'dolibarr_main_url_root' && $newkey != DOL_MAIN_URL_ROOT) print ' (currently overwritten by autodetected value: '.DOL_MAIN_URL_ROOT.')';
|
||||
print "</td>";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user