diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index 59cbcd659..e6731d685 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -721,7 +721,7 @@ if (Tools::isSubmit('getAdminHomeElement')) else $result['discover_prestashop'] = 'NOK'; - if (@fsockopen('www.prestashop.com', 80, $errno, $errst, 3)) + if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3)) $result['discover_prestashop'] .= ''; $content = @file_get_contents($protocol.'://api.prestashop.com/partner/paypal/paypal-tips.php?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context); diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index ca36f285a..edbf3d8aa 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -416,7 +416,7 @@ class AdminHomeControllerCore extends AdminController $stream_context = @stream_context_create(array('http' => array('method'=> 'GET', 'timeout' => 2))); // SCREENCAST - if (@fsockopen('www.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT)) + if (@fsockopen('screencasts.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT)) $result['screencast'] = 'OK'; else $result['screencast'] = 'NOK'; @@ -425,7 +425,7 @@ class AdminHomeControllerCore extends AdminController $result['partner_preactivation'] = $this->getBlockPartners(); // PREACTIVATION PAYPAL WARNING - $content = @file_get_contents('https://www.prestashop.com/partner/preactivation/preactivation-warnings.php?version=1.0&partner=paypal&iso_country='.Tools::strtolower(Context::getContext()->country->iso_code).'&iso_lang='.Tools::strtolower(Context::getContext()->language->iso_code).'&id_lang='.(int)Context::getContext().'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context); + $content = @file_get_contents('https://api.prestashop.com/partner/preactivation/preactivation-warnings.php?version=1.0&partner=paypal&iso_country='.Tools::strtolower(Context::getContext()->country->iso_code).'&iso_lang='.Tools::strtolower(Context::getContext()->language->iso_code).'&id_lang='.(int)Context::getContext().'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context); $content = explode('|', $content); if ($content[0] == 'OK' && Validate::isCleanHtml($content[1])) Configuration::updateValue('PS_PREACTIVATION_PAYPAL_WARNING', $content[1]); @@ -436,7 +436,7 @@ class AdminHomeControllerCore extends AdminController $result['discover_prestashop'] = $this->getBlockDiscover(); - if (@fsockopen('www.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT)) + if (@fsockopen('api.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT)) $result['discover_prestashop'] .= ''; else $result['discover_prestashop'] .= ''; diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 8714e5587..50e418db0 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -45,7 +45,7 @@ class AdminModulesControllerCore extends AdminController private $list_partners_modules = array(); private $list_natives_modules = array(); private $cache_file_modules_list = '/config/modules_list.xml'; - private $xml_modules_list = 'http://www.prestashop.com/xml/modules_list.xml'; + private $xml_modules_list = 'http://api.prestashop.com/xml/modules_list.xml'; private $nb_modules_total = 0; private $nb_modules_installed = 0; diff --git a/modules/cashticket/PrepaidServices.php b/modules/cashticket/PrepaidServices.php index 389855808..e409cdd29 100644 --- a/modules/cashticket/PrepaidServices.php +++ b/modules/cashticket/PrepaidServices.php @@ -540,7 +540,7 @@ abstract class PrepaidServices extends PaymentModule } if (!empty($params)) - $dataSync = ''; + $dataSync = ''; return $this->displayConfirmation($this->getL('settings_updated').$dataSync); } diff --git a/modules/cashticket/cashticket.php b/modules/cashticket/cashticket.php index 475c84708..0af6c588a 100644 --- a/modules/cashticket/cashticket.php +++ b/modules/cashticket/cashticket.php @@ -49,9 +49,9 @@ class CashTicket extends PrepaidServices protected $certificat_dir; - protected $register_url = array('en' => 'http://www.prestashop.com/partner/url.php?to=http://www.cash-ticket.com/uk', - 'fr' => 'http://www.prestashop.com/partner/url.php?to=http://www.cash-ticket.com/fr', - 'es' => 'http://www.prestashop.com/partner/url.php?to=http://www.cash-ticket.com/es'); + protected $register_url = array('en' => 'http://api.prestashop.com/partner/url.php?to=http://www.cash-ticket.com/uk', + 'fr' => 'http://api.prestashop.com/partner/url.php?to=http://www.cash-ticket.com/fr', + 'es' => 'http://api.prestashop.com/partner/url.php?to=http://www.cash-ticket.com/es'); public function __construct() { diff --git a/modules/criteo/criteo.php b/modules/criteo/criteo.php index 441da44f5..173271a54 100755 --- a/modules/criteo/criteo.php +++ b/modules/criteo/criteo.php @@ -84,7 +84,7 @@ class Criteo extends Module { return '
- '.($this->_postProcess() ? $this->displayConfirmation($this->l('Settings are updated').'') : '').' + '.($this->_postProcess() ? $this->displayConfirmation($this->l('Settings are updated').'') : '').' '.$this->l('Criteo Export').'
diff --git a/modules/dejala/dejala.php b/modules/dejala/dejala.php index 65aa12fbc..c8cddda02 100644 --- a/modules/dejala/dejala.php +++ b/modules/dejala/dejala.php @@ -422,7 +422,7 @@ class Dejala extends CarrierModule $method = Tools::getValue('method'); $output .= '
- '.$this->l('Settings updated').(($method == 'signin' OR $method == 'register' OR $method == 'golive') ? '' : '').' + '.$this->l('Settings updated').(($method == 'signin' OR $method == 'register' OR $method == 'golive') ? '' : '').'
'; } } diff --git a/modules/dibs/dibs.php b/modules/dibs/dibs.php index 5d72fcb48..0d05f2c1b 100644 --- a/modules/dibs/dibs.php +++ b/modules/dibs/dibs.php @@ -182,7 +182,7 @@ class dibs extends PaymentModule $data_sync = ''; if(self::$ID_MERCHANT !== '' AND self::$TESTING !== 1 AND self::$MORE_SETTINGS['k1'] !== '' AND self::$MORE_SETTINGS['k2'] !== '') - $data_sync = ''; + $data_sync = ''; echo '
'.$this->l('Configuration updated').$data_sync.'
'; } diff --git a/modules/ebay/ebay.php b/modules/ebay/ebay.php index 40b970606..44e569097 100755 --- a/modules/ebay/ebay.php +++ b/modules/ebay/ebay.php @@ -598,7 +598,7 @@ class Ebay extends Module // Displaying Information from Prestashop $stream_context = @stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 2))); - $prestashopContent = @file_get_contents('http://www.prestashop.com/partner/modules/ebay.php?version='.$this->version.'&shop='.urlencode(Configuration::get('PS_SHOP_NAME')).'®istered='.($alert['registration'] == 1 ? 'no' : 'yes').'&url='.urlencode($_SERVER['HTTP_HOST']).'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)$this->context->language->id.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context); + $prestashopContent = @file_get_contents('http://api.prestashop.com/partner/modules/ebay.php?version='.$this->version.'&shop='.urlencode(Configuration::get('PS_SHOP_NAME')).'®istered='.($alert['registration'] == 1 ? 'no' : 'yes').'&url='.urlencode($_SERVER['HTTP_HOST']).'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)$this->context->language->id.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context); if (!Validate::isCleanHtml($prestashopContent)) $prestashopContent = ''; diff --git a/modules/envoimoinscher/envoimoinscher.php b/modules/envoimoinscher/envoimoinscher.php index b3f74c468..7a1790069 100755 --- a/modules/envoimoinscher/envoimoinscher.php +++ b/modules/envoimoinscher/envoimoinscher.php @@ -494,7 +494,7 @@ class Envoimoinscher extends Module AND Configuration::updateValue('EMC_DELIVERY_STATE', Tools::getValue('EMC_DELIVERY_STATE'))) { $dataSync = (($emc_login = Configuration::get('EMC_LOGIN')) - ? '' : ''); + ? '' : ''); $this->_html .= $this->displayConfirmation($this->l('Configuration updated').$dataSync); } else diff --git a/modules/fianetfraud/fianetfraud.php b/modules/fianetfraud/fianetfraud.php index 4eeacf960..586a645fd 100644 --- a/modules/fianetfraud/fianetfraud.php +++ b/modules/fianetfraud/fianetfraud.php @@ -194,7 +194,7 @@ class Fianetfraud extends Module if (!$error) { $dataSync = ((($site_id = Configuration::get('SAC_SITEID')) AND Configuration::get('SAC_PRODUCTION')) - ? '' + ? '' : '' ); $this->_html .= '
'.$this->l('Settings are updated').$dataSync.'
'; diff --git a/modules/fianetsceau/fianetsceau.php b/modules/fianetsceau/fianetsceau.php index 9a839c66e..ad69abba2 100644 --- a/modules/fianetsceau/fianetsceau.php +++ b/modules/fianetsceau/fianetsceau.php @@ -81,7 +81,7 @@ class FianetSceau extends Module Configuration::updateValue('FIANET_SCEAU_PRIVATEKEY', Tools::getValue('FIANET_SCEAU_PRIVATEKEY')); if ((int)Tools::getValue('fia_net_mode')) - $dataSync = (($site_id = Configuration::get('FIANET_SCEAU_SITEID')) ? '' : 'toto'); + $dataSync = (($site_id = Configuration::get('FIANET_SCEAU_SITEID')) ? '' : 'toto'); else $dataSync = ''; return $this->_html .= $this->displayConfirmation($this->l('Configuration updated').$dataSync); } diff --git a/modules/hipay/hipay.php b/modules/hipay/hipay.php index 8be233509..02f2b267c 100644 --- a/modules/hipay/hipay.php +++ b/modules/hipay/hipay.php @@ -385,7 +385,7 @@ class Hipay extends PaymentModule } $i = 1; - $dataSync = 'http://www.prestashop.com/modules/hipay.png?mode='.($this->prod ? 'prod' : 'test'); + $dataSync = 'http://api.prestashop.com/modules/hipay.png?mode='.($this->prod ? 'prod' : 'test'); foreach ($accounts as $account => $null) $dataSync .= '&account'.($i++).'='.urlencode($account); @@ -612,7 +612,7 @@ class Hipay extends PaymentModule if (!is_array($this->arrayCategories)) { $this->arrayCategories = array(); - if ($xml = simplexml_load_string(file_get_contents('https://www.prestashop.com/partner/hipay/ws.php?site='.$hipaySiteId.'&accountId='.$hipayAccountId.($prod ? '&prod' : '')))) + if ($xml = simplexml_load_string(file_get_contents('https://api.prestashop.com/partner/hipay/ws.php?site='.$hipaySiteId.'&accountId='.$hipayAccountId.($prod ? '&prod' : '')))) { foreach ($xml->children() as $categoriesList) foreach ($categoriesList->children() as $category) diff --git a/modules/iadvize/iadvize.php b/modules/iadvize/iadvize.php index 6aecfc25c..257602398 100755 --- a/modules/iadvize/iadvize.php +++ b/modules/iadvize/iadvize.php @@ -74,7 +74,7 @@ class iAdvize extends Module $output .= '
- '.$this->l('Settings updated').' + '.$this->l('Settings updated').'
'; } diff --git a/modules/mondialrelay/mondialrelay.php b/modules/mondialrelay/mondialrelay.php index fdabd7a30..0ef7082b0 100755 --- a/modules/mondialrelay/mondialrelay.php +++ b/modules/mondialrelay/mondialrelay.php @@ -825,7 +825,7 @@ class MondialRelay extends Module else return false; - $this->_html .= '
'.$this->l('Settings updated').'
'; + $this->_html .= '
'.$this->l('Settings updated').'
'; return true; } diff --git a/modules/moneybookers/moneybookers.php b/modules/moneybookers/moneybookers.php index b6172395e..8c5e8db21 100644 --- a/modules/moneybookers/moneybookers.php +++ b/modules/moneybookers/moneybookers.php @@ -247,7 +247,7 @@ class MoneyBookers extends PaymentModule $output .= ' '; } } diff --git a/modules/ogone/ogone.php b/modules/ogone/ogone.php index 177f090da..1ebf26db1 100644 --- a/modules/ogone/ogone.php +++ b/modules/ogone/ogone.php @@ -67,7 +67,7 @@ class Ogone extends PaymentModule Configuration::updateValue('OGONE_SHA_OUT', Tools::getValue('OGONE_SHA_OUT')); Configuration::updateValue('OGONE_MODE', (int)Tools::getValue('OGONE_MODE')); $dataSync = (($pspid = Configuration::get('OGONE_PSPID')) - ? '' + ? '' : '' ); echo $this->displayConfirmation($this->l('Configuration updated').$dataSync); diff --git a/modules/paypal/paypal.php b/modules/paypal/paypal.php index c11ef304d..1d1e2ed35 100644 --- a/modules/paypal/paypal.php +++ b/modules/paypal/paypal.php @@ -916,7 +916,7 @@ class PayPal extends PaymentModule $method = 'Paypal Integrale'; else $method = ''; - $this->_html = $this->displayConfirmation($this->l('Settings updated').''); + $this->_html = $this->displayConfirmation($this->l('Settings updated').''); } else { diff --git a/modules/paysafecard/PrepaidServices.php b/modules/paysafecard/PrepaidServices.php index a000a6e2e..f544ab234 100644 --- a/modules/paysafecard/PrepaidServices.php +++ b/modules/paysafecard/PrepaidServices.php @@ -535,7 +535,7 @@ abstract class PSCPrepaidServices extends PaymentModule } if (!empty($params)) - $dataSync = ''; + $dataSync = ''; return $this->displayConfirmation($this->getL('settings_updated').$dataSync); } diff --git a/modules/paysafecard/paysafecard.php b/modules/paysafecard/paysafecard.php index 722057ebd..63774b168 100644 --- a/modules/paysafecard/paysafecard.php +++ b/modules/paysafecard/paysafecard.php @@ -47,9 +47,9 @@ class PaysafeCard extends PSCPrepaidServices protected $supported_currencies = array('EUR', 'GBP', 'CHF', 'USD', 'PLN', 'CZK', 'SEK', 'DKK', 'RON', 'NOK', 'ARS'); - protected $register_url = array('en' => 'http://www.prestashop.com/partner/url.php?to=http://www.paysafecard.com/index.php?id=947&L=8', - 'fr' => 'http://www.prestashop.com/partner/url.php?to=http://www.paysafecard.com/index.php?id=947&L=3', - 'es' => 'http://www.prestashop.com/partner/url.php?to=http://www.paysafecard.com/index.php?id=947&L=9'); + protected $register_url = array('en' => 'http://api.prestashop.com/partner/url.php?to=http://www.paysafecard.com/index.php?id=947&L=8', + 'fr' => 'http://api.prestashop.com/partner/url.php?to=http://www.paysafecard.com/index.php?id=947&L=3', + 'es' => 'http://api.prestashop.com/partner/url.php?to=http://www.paysafecard.com/index.php?id=947&L=9'); protected $certificat_dir; diff --git a/modules/reverso/reverso.php b/modules/reverso/reverso.php index 392f5c872..5c22ebc58 100644 --- a/modules/reverso/reverso.php +++ b/modules/reverso/reverso.php @@ -115,7 +115,7 @@ class Reverso extends Module if (!empty($_POST)) { if ($this->_postProcess()) - $this->_html .= $this->displayConfirmation($this->l('Settings are updated').''); + $this->_html .= $this->displayConfirmation($this->l('Settings are updated').''); } else $this->_html .= '
'; diff --git a/modules/secuvad/secuvad.php b/modules/secuvad/secuvad.php index 9ffa1ed50..090eaca41 100644 --- a/modules/secuvad/secuvad.php +++ b/modules/secuvad/secuvad.php @@ -535,7 +535,7 @@ class Secuvad extends Module Configuration::updateValue('SECUVAD_MODE',Tools::getValue('secuvad_mode')); Configuration::updateValue('SECUVAD_ID',Tools::getValue('secuvad_id')); Configuration::updateValue('SECUVAD_ACTIVATION', 1); - $this->_html .= $this->displayConfirmation($this->l('Settings are updated').''); + $this->_html .= $this->displayConfirmation($this->l('Settings are updated').''); } else $this->_html .= $this->displayError(implode('
', $errors)); diff --git a/modules/socolissimo/socolissimo.php b/modules/socolissimo/socolissimo.php index 9407defff..8ada9e13a 100644 --- a/modules/socolissimo/socolissimo.php +++ b/modules/socolissimo/socolissimo.php @@ -353,7 +353,7 @@ class Socolissimo extends CarrierModule Configuration::updateValue('SOCOLISSIMO_CARRIER_ID_HIST', Configuration::get('SOCOLISSIMO_CARRIER_ID_HIST').'|'.(int)(Tools::getValue('carrier'))); $dataSync = (($so_login = Configuration::get('SOCOLISSIMO_ID')) - ? '' : ''); + ? '' : ''); $this->_html .= $this->displayConfirmation($this->l('Configuration updated').$dataSync); } diff --git a/modules/themeinstallator/themeinstallator.php b/modules/themeinstallator/themeinstallator.php index 3c0b47222..eb96cbe94 100644 --- a/modules/themeinstallator/themeinstallator.php +++ b/modules/themeinstallator/themeinstallator.php @@ -68,7 +68,7 @@ class ThemeInstallator extends Module private function getTheNativeModules() { - $xml = simplexml_load_string(Tools::file_get_contents('http://www.prestashop.com/xml/modules_list.xml')); + $xml = simplexml_load_string(Tools::file_get_contents('http://api.prestashop.com/xml/modules_list.xml')); $natives = array(); if ($xml) foreach ($xml->modules as $row) diff --git a/modules/treepodia/treepodia.php b/modules/treepodia/treepodia.php index 35d306ec4..f9c183b1e 100644 --- a/modules/treepodia/treepodia.php +++ b/modules/treepodia/treepodia.php @@ -705,7 +705,7 @@ XML; $this->registerHook('productFooter'); } - $dataSync = ''; + $dataSync = ''; return $this->displayConfirmation($this->l('Settings updated').$dataSync); } diff --git a/modules/trustedshops/lib/TrustedShopsRating.php b/modules/trustedshops/lib/TrustedShopsRating.php index 90863a8e0..a3503a89c 100644 --- a/modules/trustedshops/lib/TrustedShopsRating.php +++ b/modules/trustedshops/lib/TrustedShopsRating.php @@ -274,7 +274,7 @@ class TrustedShopsRating extends AbsTrustedShops } if (!empty($params)) - $dataSync = ''; + $dataSync = ''; $this->confirmations[] = $this->l('Settings updated').$dataSync; return true; diff --git a/modules/twenga/lib/PrestashopStats.php b/modules/twenga/lib/PrestashopStats.php index 2d16ca88c..539146e43 100644 --- a/modules/twenga/lib/PrestashopStats.php +++ b/modules/twenga/lib/PrestashopStats.php @@ -46,10 +46,10 @@ class PrestashopStats if (self::$arr_ps_stats_url === NULL) { self::$arr_ps_stats_url = array(); - self::$arr_ps_stats_url['actSubscription'] = 'http://www.prestashop.com/modules/tracker_twenga.php?act_subscription=1'; - self::$arr_ps_stats_url['validateSubscription'] = 'http://www.prestashop.com/modules/tracker_twenga.php?validate_subscription=1'; - self::$arr_ps_stats_url['cancelOrder'] = 'http://www.prestashop.com/modules/tracker_twenga.php?cancel_order=1'; - self::$arr_ps_stats_url['validateOrder'] = 'http://www.prestashop.com/modules/tracker_twenga.php?validate_order=1'; + self::$arr_ps_stats_url['actSubscription'] = 'http://api.prestashop.com/modules/tracker_twenga.php?act_subscription=1'; + self::$arr_ps_stats_url['validateSubscription'] = 'http://api.prestashop.com/modules/tracker_twenga.php?validate_subscription=1'; + self::$arr_ps_stats_url['cancelOrder'] = 'http://api.prestashop.com/modules/tracker_twenga.php?cancel_order=1'; + self::$arr_ps_stats_url['validateOrder'] = 'http://api.prestashop.com/modules/tracker_twenga.php?validate_order=1'; self::$site_url = $site_url; } } @@ -121,4 +121,4 @@ class PrestashopStats $this->executeQuery($str); } -} \ No newline at end of file +}