diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php index f4ed611ac03..a91ff8e8efa 100644 --- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php +++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php @@ -128,6 +128,7 @@ class PrestaShopWebservice CURLOPT_HTTPHEADER => array( 'Expect:' ) ); + dol_syslog("curl_init url=".$url); $session = curl_init($url); $curl_options = array(); @@ -142,6 +143,7 @@ class PrestaShopWebservice if (!isset($curl_options[$defkey])) $curl_options[$defkey] = $curl_params[$defkey]; + dol_syslog("curl curl_options = ".var_export($curl_options, true)); curl_setopt_array($session, $curl_options); $response = curl_exec($session); diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index ecbecdeee2d..12d6b337fd0 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -659,8 +659,8 @@ class Conf if (! isset($this->global->MAIN_EXTRAFIELDS_IN_ONE_TD)) $this->global->MAIN_EXTRAFIELDS_IN_ONE_TD = 1; - $this->global->MAIN_MODULE_DOLISTORE_API_SRV='https://www.dolistore.com'; - $this->global->MAIN_MODULE_DOLISTORE_API_KEY='dolistorecatalogpublickey1234567'; + if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV='https://www.dolistore.com'; + if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) $this->global->MAIN_MODULE_DOLISTORE_API_KEY='dolistorecatalogpublickey1234567'; // For backward compatibility if (isset($this->product)) $this->produit=$this->product;