From c7518b456d35efb30be20c756eb8a635228b49fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 7 Sep 2011 14:34:15 +0000
Subject: [PATCH] Work on rpm package

---
 htdocs/admin/system/constall.php | 53 +++++++++-----------------------
 htdocs/conf/conf.php.example     |  2 +-
 2 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index c9c0e6edce9..af09e33cfeb 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -63,18 +63,14 @@ $configfileparameters=array(
 							'separator',
 							'dolibarr_main_authentication',
 							'separator',
-							'?dolibarr_main_auth_ldap_login_attribute',
-							'?dolibarr_main_auth_ldap_host',
-							'?dolibarr_main_auth_ldap_port',
-							'?dolibarr_main_auth_ldap_version',
-							'?dolibarr_main_auth_ldap_dn',
-							'?dolibarr_main_auth_ldap_admin_login',
-							'?dolibarr_main_auth_ldap_admin_pass',
-							'?dolibarr_main_auth_ldap_debug',
-                            'separator',
-                            '?dolibarr_lib_ADODB_PATH',
-                            '?dolibarr_lib_ODTPHP_PATH',
-                            '?dolibarr_lib_ODTPHP_PATHTOPCLZIP'
+							'dolibarr_main_auth_ldap_login_attribute',
+							'dolibarr_main_auth_ldap_host',
+							'dolibarr_main_auth_ldap_port',
+							'dolibarr_main_auth_ldap_version',
+							'dolibarr_main_auth_ldap_dn',
+							'dolibarr_main_auth_ldap_admin_login',
+							'dolibarr_main_auth_ldap_admin_pass',
+							'dolibarr_main_auth_ldap_debug'
 						);
 $configfilelib=array(
 //					'separator',
@@ -102,11 +98,7 @@ $configfilelib=array(
 					'dolibarr_main_auth_ldap_dn',
 					'dolibarr_main_auth_ldap_admin_login',
 					'dolibarr_main_auth_ldap_admin_pass',
-					'dolibarr_main_auth_ldap_debug',
-					'separator',
-					'dolibarr_lib_ADODB_PATH',
-					'dolibarr_lib_ODTPHP_PATH',
-					'dolibarr_lib_ODTPHP_PATHTOPCLZIP'
+					'dolibarr_main_auth_ldap_debug'
 					);
 $var=true;
 print '<table class="noborder" width="100%">';
@@ -124,23 +116,9 @@ foreach($configfileparameters as $key)
 
 	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;
 		print "<tr ".$bc[$var].">";
-		if ($newkey == 'separator')
+		if ($key == 'separator')
 		{
 			print '<td colspan="3">&nbsp;</td>';
 		}
@@ -149,17 +127,16 @@ foreach($configfileparameters as $key)
 			// Label
 			print "<td>".$configfilelib[$i].'</td>';
 			// Key
-			print '<td>'.$newkey.'</td>';
+			print '<td>'.$key.'</td>';
 			// 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_url_root_alt' && preg_match('/__auto__/',${$newkey})) print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT_ALT');
-			else print ${$newkey};
+			if ($key == 'dolibarr_main_db_pass') print preg_replace('/./i','*',${$key});
+			else if ($key == 'dolibarr_main_url_root' && preg_match('/__auto__/',${$key})) print ${$key}.' => '.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 print ${$key};
 			print "</td>";
 		}
 		print "</tr>\n";
-		$lastkeyshown=$newkey;
 	}
 	$i++;
 }
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 9d59caf0cc4..a4853304eda 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -260,7 +260,7 @@ $dolibarr_main_prod='0';
 # Value to overwrite path to use shared libraries instead of embedded one
 #$dolibarr_lib_FPDFI_PATH='';
 # Value to overwrite path to use shared libraries instead of embedded one
-#$dolibarr_lib_NUSOAP_PATH='/usr/share/nusoap/';
+#$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap/';
 # Value to overwrite path to use shared libraries instead of embedded one
 #$dolibarr_lib_PHPEXCEL_PATH='';
 # Value to overwrite path to use shared libraries instead of embedded one