New: Show param to overwite lib path

This commit is contained in:
Laurent Destailleur 2011-09-07 14:50:18 +00:00
parent 8942771d28
commit 86ae2f4f22
2 changed files with 39 additions and 16 deletions

View File

@ -63,14 +63,18 @@ $configfileparameters=array(
'separator', 'separator',
'dolibarr_main_authentication', 'dolibarr_main_authentication',
'separator', 'separator',
'dolibarr_main_auth_ldap_login_attribute', '?dolibarr_main_auth_ldap_login_attribute',
'dolibarr_main_auth_ldap_host', '?dolibarr_main_auth_ldap_host',
'dolibarr_main_auth_ldap_port', '?dolibarr_main_auth_ldap_port',
'dolibarr_main_auth_ldap_version', '?dolibarr_main_auth_ldap_version',
'dolibarr_main_auth_ldap_dn', '?dolibarr_main_auth_ldap_dn',
'dolibarr_main_auth_ldap_admin_login', '?dolibarr_main_auth_ldap_admin_login',
'dolibarr_main_auth_ldap_admin_pass', '?dolibarr_main_auth_ldap_admin_pass',
'dolibarr_main_auth_ldap_debug' '?dolibarr_main_auth_ldap_debug',
'separator',
'?dolibarr_lib_ADODB_PATH',
'?dolibarr_lib_ODTPHP_PATH',
'?dolibarr_lib_ODTPHP_PATHTOPCLZIP'
); );
$configfilelib=array( $configfilelib=array(
// 'separator', // 'separator',
@ -98,7 +102,11 @@ $configfilelib=array(
'dolibarr_main_auth_ldap_dn', 'dolibarr_main_auth_ldap_dn',
'dolibarr_main_auth_ldap_admin_login', 'dolibarr_main_auth_ldap_admin_login',
'dolibarr_main_auth_ldap_admin_pass', 'dolibarr_main_auth_ldap_admin_pass',
'dolibarr_main_auth_ldap_debug' 'dolibarr_main_auth_ldap_debug',
'separator',
'dolibarr_lib_ADODB_PATH',
'dolibarr_lib_ODTPHP_PATH',
'dolibarr_lib_ODTPHP_PATHTOPCLZIP'
); );
$var=true; $var=true;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
@ -116,9 +124,23 @@ foreach($configfileparameters as $key)
if (empty($ignore)) if (empty($ignore))
{ {
$newkey = preg_replace('/^\?/','',$key);
if (preg_match('/^\?/',$key) && empty(${$newkey}))
{
$i++;
continue; // We discard parametes starting with ?
}
if ($newkey == 'separator' && $lastkeyshown == 'separator')
{
$i++;
continue;
}
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
if ($key == 'separator') if ($newkey == 'separator')
{ {
print '<td colspan="3">&nbsp;</td>'; print '<td colspan="3">&nbsp;</td>';
} }
@ -127,16 +149,17 @@ foreach($configfileparameters as $key)
// Label // Label
print "<td>".$configfilelib[$i].'</td>'; print "<td>".$configfilelib[$i].'</td>';
// Key // Key
print '<td>'.$key.'</td>'; print '<td>'.$newkey.'</td>';
// Value // Value
print "<td>"; print "<td>";
if ($key == 'dolibarr_main_db_pass') print preg_replace('/./i','*',${$key}); if ($newkey == 'dolibarr_main_db_pass') print preg_replace('/./i','*',${$newkey});
else if ($key == 'dolibarr_main_url_root' && preg_match('/__auto__/',${$key})) print ${$key}.' => '.constant('DOL_MAIN_URL_ROOT'); else if ($newkey == 'dolibarr_main_url_root' && preg_match('/__auto__/',${$newkey})) print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT');
else if ($key == 'dolibarr_main_url_root_alt' && preg_match('/__auto__/',${$key})) print ${$key}.' => '.constant('DOL_MAIN_URL_ROOT_ALT'); else if ($newkey == 'dolibarr_main_url_root_alt' && preg_match('/__auto__/',${$newkey})) print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT_ALT');
else print ${$key}; else print ${$newkey};
print "</td>"; print "</td>";
} }
print "</tr>\n"; print "</tr>\n";
$lastkeyshown=$newkey;
} }
$i++; $i++;
} }

View File

@ -260,7 +260,7 @@ $dolibarr_main_prod='0';
# Value to overwrite path to use shared libraries instead of embedded one # Value to overwrite path to use shared libraries instead of embedded one
#$dolibarr_lib_FPDFI_PATH=''; #$dolibarr_lib_FPDFI_PATH='';
# Value to overwrite path to use shared libraries instead of embedded one # Value to overwrite path to use shared libraries instead of embedded one
#$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap/'; #$dolibarr_lib_NUSOAP_PATH='/usr/share/nusoap/';
# Value to overwrite path to use shared libraries instead of embedded one # Value to overwrite path to use shared libraries instead of embedded one
#$dolibarr_lib_PHPEXCEL_PATH=''; #$dolibarr_lib_PHPEXCEL_PATH='';
# Value to overwrite path to use shared libraries instead of embedded one # Value to overwrite path to use shared libraries instead of embedded one