From 477b0f8b1c59f321e028db6cf7c6099cf665d924 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Wed, 20 Feb 2013 14:26:16 +0100 Subject: [PATCH 1/2] [-] CORE : do not verify ssl certificate when using CURL --- classes/Tools.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/Tools.php b/classes/Tools.php index ba0ce7031..9ebfe64ff 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -1288,6 +1288,7 @@ class ToolsCore curl_setopt($curl, CURLOPT_URL, $url); curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, $curl_timeout); curl_setopt($curl, CURLOPT_TIMEOUT, $curl_timeout); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); $opts = stream_context_get_options($stream_context); if (isset($opts['http']['method']) && Tools::strtolower($opts['http']['method']) == 'post') { From a236224da0558390922c904acf479dbde7f1b6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Gaillard?= Date: Wed, 20 Feb 2013 15:24:58 +0100 Subject: [PATCH 2/2] [-] AdminTab header updated --- admin-dev/header.inc.php | 45 +++++++++++++++++++++++--------------- translations/br/admin.php | 0 translations/br/errors.php | 0 translations/br/fields.php | 0 translations/br/pdf.php | 0 translations/br/tabs.php | 0 translations/de/admin.php | 0 translations/de/errors.php | 0 translations/de/fields.php | 0 translations/de/pdf.php | 0 translations/en/admin.php | 0 translations/en/errors.php | 0 translations/en/fields.php | 0 translations/en/pdf.php | 0 translations/es/admin.php | 0 translations/es/errors.php | 0 translations/es/fields.php | 0 translations/es/pdf.php | 0 translations/fr/admin.php | 19 +++++++++++++++- translations/fr/errors.php | 0 translations/fr/fields.php | 0 translations/fr/pdf.php | 0 translations/it/admin.php | 0 translations/it/errors.php | 0 translations/it/fields.php | 0 translations/it/pdf.php | 0 26 files changed, 45 insertions(+), 19 deletions(-) mode change 100644 => 100755 translations/br/admin.php mode change 100644 => 100755 translations/br/errors.php mode change 100644 => 100755 translations/br/fields.php mode change 100644 => 100755 translations/br/pdf.php mode change 100644 => 100755 translations/br/tabs.php mode change 100644 => 100755 translations/de/admin.php mode change 100644 => 100755 translations/de/errors.php mode change 100644 => 100755 translations/de/fields.php mode change 100644 => 100755 translations/de/pdf.php mode change 100644 => 100755 translations/en/admin.php mode change 100644 => 100755 translations/en/errors.php mode change 100644 => 100755 translations/en/fields.php mode change 100644 => 100755 translations/en/pdf.php mode change 100644 => 100755 translations/es/admin.php mode change 100644 => 100755 translations/es/errors.php mode change 100644 => 100755 translations/es/fields.php mode change 100644 => 100755 translations/es/pdf.php mode change 100644 => 100755 translations/fr/admin.php mode change 100644 => 100755 translations/fr/errors.php mode change 100644 => 100755 translations/fr/fields.php mode change 100644 => 100755 translations/fr/pdf.php mode change 100644 => 100755 translations/it/admin.php mode change 100644 => 100755 translations/it/errors.php mode change 100644 => 100755 translations/it/fields.php mode change 100644 => 100755 translations/it/pdf.php diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php index 13d3696f7..077fde82f 100644 --- a/admin-dev/header.inc.php +++ b/admin-dev/header.inc.php @@ -36,9 +36,9 @@ echo ' - + - + PrestaShop™ - '.translate('Administration panel').' @@ -231,28 +231,37 @@ echo ' var html = ""; '; } - echo ' - '.translate('My preferences').' - - - '.Tools::substr(Context::getContext()->employee->firstname, 0, 1).'. '.htmlentities(Context::getContext()->employee->lastname, ENT_COMPAT, 'UTF-8').' - '.translate('logout').''; - if (Context::getContext()->shop->getBaseURL()) - echo ''.translate('View my shop').''; - echo ' + echo ' + +
+
+
'.translate('Welcome,').' '.Context::getContext()->employee->firstname.' '.Context::getContext()->employee->lastname.'
+
+ '; + if (defined(_PS_BASE_URL_)) + echo ''.translate('View my shop').''; + echo '
+
+