From 85c77105f61dd5a70ce3181d3fcb8a86ef84b40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Fri, 15 Mar 2013 16:25:19 +0100 Subject: [PATCH] // Remove unnecessary fsockopen --- controllers/admin/AdminHomeController.php | 9 +++------ controllers/admin/AdminLanguagesController.php | 8 ++++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index c8acf893b..84ec1cde1 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -480,10 +480,8 @@ class AdminHomeControllerCore extends AdminController $stream_context = @stream_context_create(array('http' => array('method'=> 'GET', 'timeout' => 2))); // SCREENCAST - if (@fsockopen('screencasts.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT)) - $result['screencast'] = 'OK'; - else - $result['screencast'] = 'NOK'; + $result['screencast'] = 'OK'; + // PREACTIVATION $result['partner_preactivation'] = $this->getBlockPartners(); @@ -491,8 +489,7 @@ class AdminHomeControllerCore extends AdminController // DISCOVER PRESTASHOP $result['discover_prestashop'] = '
'.$this->getBlockDiscover().'
'; - if (@fsockopen('api.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT)) - $result['discover_prestashop'] .= '
'; + $result['discover_prestashop'] .= '
'; // SHOW TIPS OF THE DAY $content = @file_get_contents($protocol.'://api.prestashop.com/partner/tipsoftheday/?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser), false, $stream_context); diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index 4193d9f34..9a00c8ca0 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -485,10 +485,10 @@ class AdminLanguagesControllerCore extends AdminController $this->status = 'error'; $this->errors[] = '[TECHNICAL ERROR] ps_version not set or empty'; } - if (@fsockopen('www.prestashop.com', 80)) + + // Get all iso code available + if($lang_packs = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='.(string)$_GET['ps_version'].'&iso_lang='.(string)$_GET['iso_lang'])) { - // Get all iso code available - $lang_packs = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='.(string)$_GET['ps_version'].'&iso_lang='.(string)$_GET['iso_lang']); $result = Tools::jsonDecode($lang_packs); if ($lang_packs !== '' && $result && !isset($result->error)) { @@ -510,7 +510,7 @@ class AdminLanguagesControllerCore extends AdminController $this->errors[] = '[TECHNICAL ERROR] Server unreachable'; } } - + protected function checkEmployeeIdLang($current_id_lang) { //update employee lang if current id lang is disabled