diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 828ab0260905ec66847be66a4f34386e13d18f0b..821b8aa8693e43f48abb03d87ed4b3c69b580391 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -76,6 +76,13 @@ if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not do exit; } +// Clean parameters +$dolibarr_main_data_root=trim($dolibarr_main_data_root); +$dolibarr_main_url_root=trim($dolibarr_main_url_root); +$dolibarr_main_url_root_alt=trim($dolibarr_main_url_root_alt); +$dolibarr_main_document_root=trim($dolibarr_main_document_root); +$dolibarr_main_document_root_alt=trim($dolibarr_main_document_root_alt); + if (empty($dolibarr_main_db_port)) $dolibarr_main_db_port=0; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql' if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql' if (empty($dolibarr_main_db_prefix)) $dolibarr_main_db_prefix='llx_'; diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index fafb001bd182bff60370b3d683de658f674a9d5f..27896306b43b3c195624bd1ff3aa33e6cc4e3a10 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -93,14 +93,21 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile)) $result=include_once($conffile); // Load conf file if ($result) { + // Clean parameters + $dolibarr_main_data_root=trim($dolibarr_main_data_root); + $dolibarr_main_url_root=trim($dolibarr_main_url_root); + $dolibarr_main_url_root_alt=trim($dolibarr_main_url_root_alt); + $dolibarr_main_document_root=trim($dolibarr_main_document_root); + $dolibarr_main_document_root_alt=trim($dolibarr_main_document_root_alt); + //if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility // Remove last / or \ on directories or url value - if (! empty($dolibarr_main_document_root) && ! preg_match('/^[\\/]+$/',$dolibarr_main_document_root)) $dolibarr_main_document_root=preg_replace('/[\\/]+$/','',$dolibarr_main_document_root); - if (! empty($dolibarr_main_url_root) && ! preg_match('/^[\\/]+$/',$dolibarr_main_url_root)) $dolibarr_main_url_root=preg_replace('/[\\/]+$/','',$dolibarr_main_url_root); - if (! empty($dolibarr_main_data_root) && ! preg_match('/^[\\/]+$/',$dolibarr_main_data_root)) $dolibarr_main_data_root=preg_replace('/[\\/]+$/','',$dolibarr_main_data_root); - if (! empty($dolibarr_main_document_root_alt) && ! preg_match('/^[\\/]+$/',$dolibarr_main_document_root_alt)) $dolibarr_main_document_root_alt=preg_replace('/[\\/]+$/','',$dolibarr_main_document_root_alt); - if (! empty($dolibarr_main_url_root_alt) && ! preg_match('/^[\\/]+$/',$dolibarr_main_url_root_alt)) $dolibarr_main_url_root_alt=preg_replace('/[\\/]+$/','',$dolibarr_main_url_root_alt); + if (! empty($dolibarr_main_document_root) && ! preg_match('/^[\\/]+$/',$dolibarr_main_document_root)) $dolibarr_main_document_root=preg_replace('/[\\/]+$/','',$dolibarr_main_document_root); + if (! empty($dolibarr_main_url_root) && ! preg_match('/^[\\/]+$/',$dolibarr_main_url_root)) $dolibarr_main_url_root=preg_replace('/[\\/]+$/','',$dolibarr_main_url_root); + if (! empty($dolibarr_main_data_root) && ! preg_match('/^[\\/]+$/',$dolibarr_main_data_root)) $dolibarr_main_data_root=preg_replace('/[\\/]+$/','',$dolibarr_main_data_root); + if (! empty($dolibarr_main_document_root_alt) && ! preg_match('/^[\\/]+$/',$dolibarr_main_document_root_alt)) $dolibarr_main_document_root_alt=preg_replace('/[\\/]+$/','',$dolibarr_main_document_root_alt); + if (! empty($dolibarr_main_url_root_alt) && ! preg_match('/^[\\/]+$/',$dolibarr_main_url_root_alt)) $dolibarr_main_url_root_alt=preg_replace('/[\\/]+$/','',$dolibarr_main_url_root_alt); // Create conf object if (! empty($dolibarr_main_document_root)) diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 02100b3c3da5b96735b9de96d031622f6bafe19d..1e963c61e9989906a09df3a1101178d8f8c1c565 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -676,6 +676,7 @@ function hash_call($methodName,$nvpStr) exit;*/ curl_setopt($ch, CURLOPT_URL, $API_Endpoint); curl_setopt($ch, CURLOPT_VERBOSE, 1); + curl_setopt($ch, CURLOPT_SSLVERSION, 3); // Force SSLv3 //turning off the server and peer verification(TrustManager Concept). curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 46ae981584842b2655ad737c1270a00f9195979a..bcdbbab23410c7764e645d4ca7d2729ea3165e85 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -75,7 +75,7 @@ if (! GETPOST("action")) } } -$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',$dolibarr_main_url_root); +$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); $urlok=$urlwithouturlroot.DOL_URL_ROOT.'/public/paybox/paymentok.php?'; $urlko=$urlwithouturlroot.DOL_URL_ROOT.'/public/paybox/paymentko.php?'; diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index a3a82583bcd2aadda65f7045917fe278ad1e1735..8c7e7189a334afc05d1bab0a87758cdf6689005c 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -77,7 +77,7 @@ if (! GETPOST("action")) } } -$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',$dolibarr_main_url_root); +$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); $urlok=$urlwithouturlroot.DOL_URL_ROOT.'/public/paypal/paymentok.php?'; $urlko=$urlwithouturlroot.DOL_URL_ROOT.'/public/paypal/paymentko.php?';