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

New: Show param to overwite lib path

Browse Source
This commit is contained in:
Laurent Destailleur 2011-09-07 15:08:49 +00:00
parent 274214f82e
commit 911117f6ce
5 changed files with 66 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/rpm/dolibarr_fedora.spec
View File

@ -25,7 +25,7 @@ BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Applications/Productivity Group: Applications/Productivity
Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, dejavu-sans-fonts Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, php-adodb, php-nusoap, dejavu-sans-fonts
Requires: mysql-server, mysql Requires: mysql-server, mysql
#BuildRequires: desktop-file-utils #BuildRequires: desktop-file-utils

4
build/rpm/file_contexts.dolibarr
View File

@ -1,5 +1,9 @@
# This file is useless. # This file is useless.
# It is provided as example to know contexts modified by installer # It is provided as example to know contexts modified by installer
# to make Dolibarr working. # to make Dolibarr working.
#
# Note: To allow temporary write permission for httpd:
# chcon -R -h -t httpd_sys_script_rw_t /dirtoallow
#
/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 /etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0
/var/lib/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 /var/lib/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0

7
build/rpm/install.forced.php.fedora
View File

@ -18,6 +18,13 @@ $force_install_dolibarrlogin='admin';
$force_install_nophpinfo='1'; $force_install_nophpinfo='1';
$force_install_lockinstall='444'; $force_install_lockinstall='444';
# Value to overwrite path to use shared libraries instead of embedded one
$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
# Value to overwrite path to use shared libraries instead of embedded one
$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
# Value to overwrite path to use shared libraries instead of embedded one
#$dolibarr_lib_ODTPHP_PATHTOPCLZIP="/usr/share/php/libphp-pclzip";
#$force_dolibarr_lib_GEOIP_PATH=''; #$force_dolibarr_lib_GEOIP_PATH='';
#$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf';

67
htdocs/admin/system/constall.php
View File

@ -63,14 +63,25 @@ $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_TCPDF_PATH',
'?dolibarr_lib_FPDFI_PATH',
'?dolibarr_lib_NUSOAP_PATH',
'?dolibarr_lib_PHPEXCEL_PATH',
'?dolibarr_lib_GEOIP_PATH',
'?dolibarr_lib_ODTPHP_PATH',
'?dolibarr_lib_ODTPHP_PATHTOPCLZIP',
'?dolibarr_font_DOL_DEFAULT_TTF',
'?dolibarr_font_DOL_DEFAULT_TTF_BOLD'
); );
$configfilelib=array( $configfilelib=array(
// 'separator', // 'separator',
@ -98,7 +109,18 @@ $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_TCPDF_PATH',
'dolibarr_lib_FPDFI_PATH',
'dolibarr_lib_NUSOAP_PATH',
'dolibarr_lib_PHPEXCEL_PATH',
'dolibarr_lib_GEOIP_PATH',
'dolibarr_lib_ODTPHP_PATH',
'dolibarr_lib_ODTPHP_PATHTOPCLZIP',
'dolibarr_font_DOL_DEFAULT_TTF',
'dolibarr_font_DOL_DEFAULT_TTF_BOLD'
); );
$var=true; $var=true;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
@ -116,9 +138,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 +163,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++;
} }

4
htdocs/conf/conf.php.example
View File

@ -254,13 +254,13 @@ $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_ADODB_PATH=''; #$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
# 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_TCPDF_PATH=''; #$dolibarr_lib_TCPDF_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_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=''; #$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