diff --git a/admin-dev/ajax-tab.php b/admin-dev/ajax-tab.php new file mode 100755 index 000000000..f6abe3658 --- /dev/null +++ b/admin-dev/ajax-tab.php @@ -0,0 +1,91 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +define('_PS_ADMIN_DIR_', getcwd()); +define('PS_ADMIN_DIR', _PS_ADMIN_DIR_); // Retro-compatibility + +include(_PS_ADMIN_DIR_.'/../config/config.inc.php'); +include(_PS_ADMIN_DIR_.'/functions.php'); + + +include(_PS_ADMIN_DIR_.'/init.php'); + +if (empty($tab) and !sizeof($_POST)) +{ + $tab = 'AdminHome'; + $_POST['tab'] = 'AdminHome'; + $_POST['token'] = Tools::getAdminTokenLite($tab); +} + if ($id_tab = checkingTab($tab)) + { + $isoUser = Language::getIsoById(intval($cookie->id_lang)); + + + if (Validate::isLoadedObject($adminObj)) + { + $adminObj->ajax = true; + if ($adminObj->checkToken()) + { + // the differences with index.php is here + + $adminObj->ajaxPreProcess(); + $action = Tools::getValue('action'); + + // no need to use displayConf() here + + if (!empty($action) AND method_exists($adminObj, 'ajaxProcess'.Tools::toCamelCase($action)) ) + $adminObj->{'ajaxProcess'.Tools::toCamelCase($action)}(); + else + $adminObj->ajaxProcess(); + + // @TODO We should use a displayAjaxError + $adminObj->displayErrors(); + if (!empty($action) AND method_exists($adminObj, 'displayAjax'.Tools::toCamelCase($action)) ) + $adminObj->{'displayAjax'.$action}(); + else + $adminObj->displayAjax(); + + } + else + { + // If this is an XSS attempt, then we should only display a simple, secure page + ob_clean(); + + // ${1} in the replacement string of the regexp is required, because the token may begin with a number and mix up with it (e.g. $17) + $url = preg_replace('/([&?]token=)[^&]*(&.*)?$/', '${1}'.$adminObj->token.'$2', $_SERVER['REQUEST_URI']); + if (false === strpos($url, '?token=') AND false === strpos($url, '&token=')) + $url .= '&token='.$adminObj->token; + + // we can display the correct url + // die(Tools::jsonEncode(array(translate('Invalid security token'),$url))); + die(Tools::jsonEncode(translate('Invalid security token'))); + } + } + } + + + diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index 4e9b5abd6..f1817a731 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -30,8 +30,6 @@ include(PS_ADMIN_DIR.'/../config/config.inc.php'); /* Getting cookie or logout */ require_once(dirname(__FILE__).'/init.php'); -require_once(PS_ADMIN_DIR.'/tabs/AdminCounty.php'); - $context = Context::getContext(); if (isset($_GET['changeParentUrl'])) @@ -491,12 +489,12 @@ if (Tools::isSubmit('saveImportMatchs')) if (Tools::isSubmit('deleteImportMatchs')) { - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'import_match` WHERE id_import_match = '.pSQL(Tools::getValue('idImportMatchs'))); + Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'import_match` WHERE `id_import_match` = '.(int)Tools::getValue('idImportMatchs')); } if (Tools::isSubmit('loadImportMatchs')) { - $return = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'import_match` WHERE id_import_match = '.pSQL(Tools::getValue('idImportMatchs'))); + $return = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'import_match` WHERE `id_import_match` = '.(int)Tools::getValue('idImportMatchs')); die('{"id" : "'.$return[0]['id_import_match'].'", "matchs" : "'.$return[0]['match'].'", "skip" : "'.$return[0]['skip'].'"}'); } @@ -508,6 +506,8 @@ if (Tools::isSubmit('toggleScreencast')) if (Tools::isSubmit('ajaxAddZipCode') OR Tools::isSubmit('ajaxRemoveZipCode')) { + require_once(PS_ADMIN_DIR.'/tabs/AdminCounty.php'); + $zipcodes = Tools::getValue('zipcodes'); $id_county = (int)Tools::getValue('id_county'); @@ -688,7 +688,7 @@ if (Tools::isSubmit('getAdminHomeElement')) if (Tools::isSubmit('getChildrenCategories') && Tools::getValue('id_category_parent')) { - $children_categories = Category::getChildrenWithNbSelectedSubCatForProduct(Tools::getValue('id_category_parent'), Tools::getValue('id_product', 0), Tools::getValue('post_selected_cat', null), $cookie->id_lang); + $children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat', array()), $cookie->id_lang); die(Tools::jsonEncode($children_categories)); } diff --git a/admin-dev/ajaxfilemanager/inc/index.php b/admin-dev/ajaxfilemanager/inc/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/admin-dev/ajaxfilemanager/inc/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/admin-dev/ajaxfilemanager/index.php b/admin-dev/ajaxfilemanager/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/admin-dev/ajaxfilemanager/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/admin-dev/ajaxfilemanager/jscripts/ajaxfilemanager_c.js b/admin-dev/ajaxfilemanager/jscripts/ajaxfilemanager_c.js index b3b1f73f2..d253986dd 100755 --- a/admin-dev/ajaxfilemanager/jscripts/ajaxfilemanager_c.js +++ b/admin-dev/ajaxfilemanager/jscripts/ajaxfilemanager_c.js @@ -31,7 +31,11 @@ eval(function(p,a,c,k,e,r){e=function(c){return c.toString(a)};if(!''.replace(/^ //media.js end //ajaxfileupload start jQuery.extend({ createUploadIframe: function(id, uri) -{ var frameId = 'jUploadFrame' + id; if(window.ActiveXObject) { var io = document.createElement(' @@ -856,9 +996,18 @@ if ($lm->getIncludeTradFilename()) -
-

-

+
+
+

+ +
    +
  • Etape 1
    • +
  • Etape 2
    • +
  • Etape 3
    • +
  • Etape 4
    • +
+
+



@@ -879,7 +1028,7 @@ if ($lm->getIncludeTradFilename()) $(document).ready(function() { $.ajax({ url: 'xml/getNonNativeModules.php', - async: false, + async: true, dataType: "json", success: function (json) { @@ -962,20 +1111,20 @@ if ($lm->getIncludeTradFilename()) if (sizeof($upgradeFiles)) { echo ' - +
- + '; uasort($upgradeFiles, 'sortnatversion'); $totalInstructions = 0; foreach ($upgradeFiles AS $file) { - echo ''; + echo ''; $totalInstructions += (int)$file['instructions']; } - echo ''; + echo ''; echo '
'.lang('Upgrade file').''.lang('Modifications to process').''.lang('Modifications to process').'
v'.$file['version'].($file['is_major'] ? ' '.lang('(major)') : '').''.(int)$file['instructions'].'
v'.$file['version'].($file['is_major'] ? ' '.lang('(major)') : '').''.(int)$file['instructions'].'
'.lang('TOTAL').''.(int)$totalInstructions.'
'.lang('TOTAL').''.(int)$totalInstructions.'
'; @@ -983,7 +1132,7 @@ if ($lm->getIncludeTradFilename()) $minutes = (int)($upgradeTime / 60); $seconds = (int)($upgradeTime - ($minutes * 60)); - echo '

'.lang('Estimated time to complete the').' '.(int)$totalInstructions.' '.lang('modifications:').' '.(int)$minutes.' '.($minutes > 1 ? lang('minutes') : lang('minute')).' '.(int)$seconds.' '.($seconds > 1 ? lang('seconds') : lang('second')).'
+ echo '

'.lang('Estimated time to complete the').' '.(int)$totalInstructions.' '.lang('modifications:').' '.(int)$minutes.' '.($minutes > 1 ? lang('minutes') : lang('minute')).' '.(int)$seconds.' '.($seconds > 1 ? lang('seconds') : lang('second')).'
'.lang('Depending on your server and the size of your shop').'

'; if ($majorReleases > 1) @@ -1011,7 +1160,7 @@ if ($lm->getIncludeTradFilename())

'.lang('Hosting parameters').'

'.lang('PrestaShop tries to automatically set the best settings for your server in order the update to be successful.').'

- +
@@ -1028,28 +1177,32 @@ if ($lm->getIncludeTradFilename())
'.lang('PHP parameter').' '.lang('Description').''.ini_get('memory_limit').'
-
'; +
'; if ($color == '#D9F2D0') - echo ' '.lang('All your settings seem to be OK, go for it!'); + echo ' '.lang('All your settings seem to be OK, go for it!'); elseif ($color == '#FFDEB7') - echo ' '.lang('Beware, your settings look correct but are not optimal, if you encounter problems (upgrade too long, memory error...), please ask your hosting provider to increase the values of these parameters (max_execution_time & memory_limit).'); + echo ' '.lang('Beware, your settings look correct but are not optimal, if you encounter problems (upgrade too long, memory error...), please ask your hosting provider to increase the values of these parameters (max_execution_time & memory_limit).'); elseif ($color == '#FAE2E3') - echo ' '.lang('We strongly recommend that you inform your hosting provider to modify the settings before process to the update.'); - - echo ' -

'; - + echo ' '.lang('We strongly recommend that you inform your hosting provider to modify the settings before process to the update.'); + echo '
'; ?>
-
+
+
+

-

- -

+
    +
  • Etape 1 ok
    • +
  • Etape 2 ok
    • +
  • Etape 3
    • +
  • Etape 4
    • +
+
+

@@ -1058,7 +1211,7 @@ if ($lm->getIncludeTradFilename())

- +

-
-

+
+
+

+ +
    +
  • Etape 1 ok
    • +
  • Etape 2 ok
    • +
  • Etape 3
    • +
  • Etape 4
    • +
+
+

-

-

+ +

+
+

-
-
+
+
+

-

-

-

+ +
    +
  • Etape 1 ok
    • +
  • Etape 2 ok
    • +
  • Etape 3
    • +
  • Etape 4
    • +
+
+
+ +
+ +

-


+

getIncludeTradFilename()) { echo '

'.lang('New features in PrestaShop v').INSTALL_VERSION.'

- '; } ?> -

- - - - - +
+ +
+ +
+ +

+

+ +
diff --git a/install-dev/langs/de.php b/install-dev/langs/de.php index acc28cf86..251ce9043 100644 --- a/install-dev/langs/de.php +++ b/install-dev/langs/de.php @@ -92,7 +92,7 @@ $_LANG['Please set a database login'] = 'Geben Sie die SQL-Anmeldung ein'; $_LANG['Please set a database name'] = 'Geben Sie den Namen der Datenbank ein'; $_LANG['Please set a database server name'] = 'Geben Sie den Namen des Datenbank-Servers ein'; $_LANG['Port:'] = 'Port:'; -$_LANG['PrestaShop ".INSTALL_VERSION." Installer'] = 'Installation der PrestaShop-Version "INSTALL_VERSION."'; +$_LANG['PrestaShop %s Installer'] = 'Installation der PrestaShop-Version %s'; $_LANG['PrestaShop is ready!'] = 'PrestaShop ist fertig!'; $_LANG['Re-type to confirm:'] = 'Bestätigen Sie das Kennwort:'; $_LANG['Ready, set, go!'] = 'PrestaShop ist installiert!'; @@ -143,12 +143,12 @@ $_LANG['Verify system compatibility'] = 'Systemkompatibilität'; $_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'VORSICHT: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\' und die readme-Dateien (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'; $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Vorsicht: eine manuelle Sicherung ist UNERLÄSSLICH, bevor mit der Aktualisierung der PrestaShop-Anwendung begonnen wird, um jeglichen versehentlichen Datenverlust zu verhindern'; $_LANG['Welcome'] = 'Willkommen'; -$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Bienvenue dans l\'installation de PrestaShop '.INSTALL_VERSION; +$_LANG['Welcome to the PrestaShop %s Installer.'] = 'Bienvenue dans l\'installation de PrestaShop %s'; $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Sobald die Anwendungsdateien und Ihre Datenbank gesichert sind, werden wir Sie um Bestätigung bitten. Damit übernehmen Sie die gesamte Haftung eines möglichen Datenverlusts durch die Aktualisierung der PrestaShop-Anwendung.'; $_LANG['Write permissions on folders (and subfolders):'] = 'Schreibberechtigung für die Ordner (und deren Unterordner):'; $_LANG['Write permissions on files and folders:'] = 'Schreibberechtigung für die Dateien und Ordner:'; $_LANG['Write permissions on folders:'] = 'Schreibberechtigung für die Ordner'; -$_LANG['You already have the ".INSTALL_VERSION." version.'] = 'Sie besitzen bereits die Version. ".INSTALL_VERSION."'; +$_LANG['You already have the %s version.'] = 'Sie besitzen bereits die Version. %s'; $_LANG['You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Sie haben gerade Ihren Online-Shop installiert und konfiguriert, wir danken Ihnen.'; $_LANG['You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Sie haben gerade Ihren Online-Shop aktualisiert wir danken Ihnen.'; $_LANG['Your installation is finished!'] = 'Die Installation ist abgeschlossen!'; @@ -282,4 +282,4 @@ $_LANG['version'] = 'Version'; $_LANG['In this aim, use our'] = 'Verwenden Sie dazu unseren'; $_LANG['Additional Benefits'] = 'Exklusiv Angebot'; $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Exklusiv Angebot für die Verkäufer PrestaShop'; -$_LANG['PHP magic quotes option is off (recommended)'] = 'Die PHP-Option "magic quotes" ist deaktiviert (empfohlen)'; \ No newline at end of file +$_LANG['PHP magic quotes option is off (recommended)'] = 'Die PHP-Option "magic quotes" ist deaktiviert (empfohlen)'; diff --git a/install-dev/langs/es.php b/install-dev/langs/es.php index 5560c5a47..54d4f2d87 100644 --- a/install-dev/langs/es.php +++ b/install-dev/langs/es.php @@ -91,7 +91,7 @@ $_LANG['Please set a database login'] = 'Introduzca el inicio de sesión de SQL' $_LANG['Please set a database name'] = 'Introduzca el nombre de la base de datos'; $_LANG['Please set a database server name'] = 'Introduzca el nombre del servidor de la base de datos'; $_LANG['Port:'] = 'Puerto:'; -$_LANG['PrestaShop ".INSTALL_VERSION." Installer'] = 'Instalación de PrestaShop ".INSTALL_VERSION."'; +$_LANG['PrestaShop %s Installer'] = 'Instalación de PrestaShop %s'; $_LANG['PrestaShop is ready!'] = '¡PrestaShop está listo!'; $_LANG['Re-type to confirm:'] = 'Confirmar la contraseña:'; $_LANG['Ready, set, go!'] = '¡PrestaShop está instalado!'; @@ -141,12 +141,12 @@ $_LANG['Verify system compatibility'] = 'Compatibilidad sistema'; $_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATENCION : para más seguridad, por favor suprima la carpeta \'/install\' y los archivos readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG)..'; $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = '¡Atención: se recomienda hacer una copia de seguridad manual antes de continuar!'; $_LANG['Welcome'] = 'Bienvenido'; -$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Bienvenido a la instalación de PrestaShop '.INSTALL_VERSION; +$_LANG['Welcome to the PrestaShop %s Installer.'] = 'Bienvenido a la instalación de PrestaShop %s'; $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Una vez que los archivos de aplicación y su base de datos se hayan guardado, le pediremos que los certifique. Por lo tanto, usted asume plenamente su responsabilidad por cualquier pérdida de datos debido a la actualización de la aplicación PrestaShop.'; $_LANG['Write permissions on folders (and subfolders):'] = 'en escritura en las carpetas (y sus subcarpetas) :'; $_LANG['Write permissions on files and folders:'] = 'Derechos en escritura en los archivos y carpetas :'; $_LANG['Write permissions on folders:'] = 'Permiso de escritura en los archivos de'; -$_LANG['You already have the ".INSTALL_VERSION." version.'] = 'Ya está en posesión de la versión ".INSTALL_VERSION."'; +$_LANG['You already have the %s version.'] = 'Ya está en posesión de la versión %s'; $_LANG['You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Acaba de instalar y de configurar su tienda en línea y se lo agradecemos.'; $_LANG['You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Deba actualizar su tienda en línea. Se lo agradecemos.'; $_LANG['Your installation is finished!'] = '¡La instalación está terminada!'; @@ -282,4 +282,4 @@ $_LANG['version'] = 'versión'; $_LANG['In this aim, use our'] = 'En este objetivo, utilice nuestro'; $_LANG['Additional Benefits'] = 'Otros beneficios'; $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Ofertas exclusivas dedicadas a los comerciantes PrestaShop'; -$_LANG['PHP magic quotes option is off (recommended)'] = 'La opción PHP "magic quotes" está desactivada (aconsejable)'; \ No newline at end of file +$_LANG['PHP magic quotes option is off (recommended)'] = 'La opción PHP "magic quotes" está desactivada (aconsejable)'; diff --git a/install-dev/langs/fr.php b/install-dev/langs/fr.php index e0e28351f..c392486f3 100644 --- a/install-dev/langs/fr.php +++ b/install-dev/langs/fr.php @@ -63,7 +63,8 @@ $_LANG['Installation : complete install of the PrestaShop Solution'] = 'Installa $_LANG['Installation is complete!'] = 'Installation terminée !'; $_LANG['Installation method'] = 'Méthode d\'installation'; $_LANG['Last name:'] = 'Nom :'; -$_LANG['License Agreement'] = 'Contrat de Licence'; +$_LANG['Licenses Agreement'] = 'Contrat de Licences'; +$_LANG['PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.'] = 'Le coeur de PrestaShop est publié sous licence OSL 3.0 tandis que les modules et thèmes sont publiés sous licence AFL 3.0.'; $_LANG['Login:'] = 'Identifiant :'; $_LANG['Merchant info'] = 'Informations à propos du vendeur'; $_LANG['Missing a temporary folder'] = 'Il manque le dossier temporaire de réception de vos envois de fichiers. Merci de consulter votre administrateur système.'; @@ -92,7 +93,7 @@ $_LANG['Please set a database login'] = 'Entrez le login SQL'; $_LANG['Please set a database name'] = 'Entrez le nom de la base de données'; $_LANG['Please set a database server name'] = 'Entrez le nom du serveur de la base de données'; $_LANG['Port:'] = 'Port :'; -$_LANG['PrestaShop ".INSTALL_VERSION." Installer'] = 'Installation de PrestaShop ".INSTALL_VERSION."'; +$_LANG['PrestaShop %s Installer'] = 'Installation de PrestaShop %s'; $_LANG['PrestaShop is ready!'] = 'PrestaShop est prêt!'; $_LANG['Re-type to confirm:'] = 'Confirmez le mot de passe :'; $_LANG['Ready, set, go!'] = 'PrestaShop est installé !'; @@ -143,12 +144,12 @@ $_LANG['Verify system compatibility'] = 'Compatibilité système'; $_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\' et les fichiers readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'; $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attention : une sauvegarde manuelle est INDISPENSABLE avant de procéder à la mise à jour de l\'application PrestaShop, cela afin de prévenir toute perte de données accidentelle'; $_LANG['Welcome'] = 'Bienvenue'; -$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Bienvenue dans l\'installation de PrestaShop '.INSTALL_VERSION; +$_LANG['Welcome to the PrestaShop %s Installer.'] = 'Bienvenue dans l\'installation de PrestaShop %s'; $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Une fois que les fichiers de l\'application et votre base de données seront sauvegardés, nous vous demanderons de le certifier. De ce fait, vous assumerez l\'entière responsabilité d\'une éventuelle perte de données liée à la mise à jour de l\'application PrestaShop.'; $_LANG['Write permissions on folders (and subfolders):'] = 'Droits en écriture sur les dossiers (et leurs sous-dossiers) :'; $_LANG['Write permissions on files and folders:'] = 'Droits en écriture sur les fichiers et dossiers:'; $_LANG['Write permissions on folders:'] = 'Droits en écriture sur les dossiers'; -$_LANG['You already have the ".INSTALL_VERSION." version.'] = 'Vous êtes déjà en possession de la version ".INSTALL_VERSION."'; +$_LANG['You already have the %s version.'] = 'Vous êtes déjà en possession de la version %s'; $_LANG['You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Vous venez d\'installer et de configurer votre boutique en ligne, nous vous en remercions.'; $_LANG['You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Vous venez de mettre à jour votre boutique en ligne. Nous vous en remercions.'; $_LANG['Your installation is finished!'] = 'L\'installation est terminée !'; @@ -177,8 +178,8 @@ $_LANG['Did you know?'] = 'Le saviez-vous ?'; $_LANG['Prestashop and community offers over 40 different languages for free download on'] = 'Prestashop et sa communauté propose plus de 40 langues différentes en téléchargement gratuit sur'; $_LANG['Default country:'] = 'Pays par défaut :'; $_LANG['Shop\'s timezone:'] = 'Fuseau horaire de la boutique :'; -$_LANG['Your configuration is valid, click next to continue!'] = 'Votre configuration est valide,
cliquez sur suivant pour continuer !'; -$_LANG['Your configuration is invalid. Please fix the issues below:'] = 'Votre configuration n\'est pas valide,
merci de corriger ces problèmes :'; +$_LANG['Your configuration is valid, click next to continue!'] = 'Votre configuration est valide, cliquez sur suivant pour continuer !'; +$_LANG['Your configuration is invalid. Please fix the issues below:'] = 'Votre configuration n\'est pas valide, merci de corriger ces problèmes :'; $_LANG['You have to create a database, help available in readme_en.txt'] = 'Vous devez au préalable créer une base de données (aide disponible dans le fichier readme.txt)'; $_LANG['If you check this box and your mail configuration is wrong, your installation might be blocked. If so, please uncheck the box to go to the next step.'] = 'Cette option peut être bloquante si votre configuration e-mail est erronée, merci de la désactiver si vous ne pouvez pas passer à l\'étape suivante.'; $_LANG['Mcrypt is available (recommended)'] = 'Mcrypt est disponible (recommandé)'; @@ -216,7 +217,7 @@ $_LANG['This information isn\'t required, it will be used for statistical purpos $_LANG['Invalid shop name'] = 'Nom de boutique invalide'; $_LANG['Your firstname contains some invalid characters'] = 'Votre prénom contient des caractères invalides'; $_LANG['Your lastname contains some invalid characters'] = 'Votre nom contient des caractères invalides'; -$_LANG['PrestaShop '.INSTALL_VERSION.' Installer'] = ''; +$_LANG['PrestaShop %s Installer'] = ''; $_LANG['+33 (0)1.40.18.30.04'] = '+33 (0)1.40.18.30.04'; $_LANG['(FREE)'] = '(GRATUIT)'; $_LANG['(FREE too!)'] = '(GRATUIT AUSSI !)'; @@ -286,4 +287,5 @@ $_LANG['Warning, the installer was unable to detect what is your current PrestaS $_LANG['However the installer has detected that the version stored in your configuration table is %1$s'] = "Cependant l'installeur a détecté que la version sauvée dans votre table de configuration est %1\$s"; $_LANG['Additional Benefits'] = 'Avantages exclusifs PrestaShop'; $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Offres réservées aux marchands PrestaShop'; -$_LANG['PHP magic quotes option is off (recommended)'] = 'L\'option PHP "magic quotes" est désactivée (recommandé)'; \ No newline at end of file +$_LANG['PHP magic quotes option is off (recommended)'] = 'L\'option PHP "magic quotes" est désactivée (recommandé)'; +$_LANG['Dom extension loaded'] = 'L\'extension Dom est activée'; diff --git a/install-dev/langs/index.php b/install-dev/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/install-dev/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/install-dev/langs/it.php b/install-dev/langs/it.php index 1567ed525..dedbc8a81 100644 --- a/install-dev/langs/it.php +++ b/install-dev/langs/it.php @@ -92,7 +92,7 @@ $_LANG['Please set a database login'] = 'Inserire il login SQL'; $_LANG['Please set a database name'] = 'Inserire il nome del database.'; $_LANG['Please set a database server name'] = 'Inserire il nome del server del database.'; $_LANG['Port:'] = 'Porta:'; -$_LANG['PrestaShop ".INSTALL_VERSION." Installer'] = 'Installazione di PrestaShop ".INSTALL_VERSION."'; +$_LANG['PrestaShop %s Installer'] = 'Installazione di PrestaShop %s'; $_LANG['PrestaShop is ready!'] = 'PrestaShop è pronto!'; $_LANG['Re-type to confirm:'] = 'Conferma la password:'; $_LANG['Ready, set, go!'] = 'PrestaShop è installato!'; @@ -143,12 +143,12 @@ $_LANG['Verify system compatibility'] = 'Compatibilità sistema'; $_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\' e i file readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'; $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attenzione: E\' FONDAMENTALE un backup manuale prima di continuare l\'aggiornamento dell\'applicazione Prestashop, al fine di evitare la perdita accidentale di dati.'; $_LANG['Welcome'] = 'Benvenuto'; -$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Benvenuto nell\'installazione di PrestaShop '.INSTALL_VERSION; +$_LANG['Welcome to the PrestaShop %s Installer.'] = 'Benvenuto nell\'installazione di PrestaShop %s'; $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Una volta salvati i tuoi file applicazione e il database, ti chiederemo di certificarlo. Così facendo, ti assumerai tutte le responsabilità per qualsiasi perdita di dati dovuti ad un aggiornamento del software PrestaShop.'; $_LANG['Write permissions on folders (and subfolders):'] = 'Scrivi i permessi sulle cartelle (e le loro sottocartelle):'; $_LANG['Write permissions on files and folders:'] = 'Permessi di scrittura su file e cartelle:'; $_LANG['Write permissions on folders:'] = 'Permessi di scrittura sulle cartelle'; -$_LANG['You already have the ".INSTALL_VERSION." version.'] = 'Sei già in possesso della versione ".INSTALL_VERSION."'; +$_LANG['You already have the %s version.'] = 'Sei già in possesso della versione %s'; $_LANG['You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Hai appena installato e configurato il tuo negozio online, grazie.'; $_LANG['You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Hai appena aggiornato il tuo negozio online. Grazie.'; $_LANG['Your installation is finished!'] = 'Installazione terminata!'; @@ -269,4 +269,4 @@ $_LANG['New features in PrestaShop v'] = 'Nuove caratteristiche in PrestaShop v' $_LANG['In this aim, use our'] = 'A questo scopo, utilizzare il nostro'; $_LANG['Additional Benefits'] = 'Ulteriori vantaggi'; $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Offerte esclusivo dedicato ai venditori PrestaShop'; -$_LANG['PHP magic quotes option is off (recommended)'] = 'Opzione magic quotes PHP è disattivata (consigliato)'; \ No newline at end of file +$_LANG['PHP magic quotes option is off (recommended)'] = 'Opzione magic quotes PHP è disattivata (consigliato)'; diff --git a/install-dev/model.php b/install-dev/model.php index 1d8798e14..08f5eea25 100644 --- a/install-dev/model.php +++ b/install-dev/model.php @@ -63,6 +63,7 @@ if ($tmp = strpos($_SERVER['REQUEST_URI'], '?')) $_SERVER['REQUEST_URI'] = str_replace('//', '/', $_SERVER['REQUEST_URI']); define('INSTALL_VERSION', '1.5.0.0'); + define('PS_INSTALLATION_IN_PROGRESS', true); include_once(INSTALL_PATH.'/classes/ToolsInstall.php'); define('SETTINGS_FILE', INSTALL_PATH.'/../config/settings.inc.php'); diff --git a/install-dev/php/add_missing_rewrite_value.php b/install-dev/php/add_missing_rewrite_value.php index 214349f38..329d632b7 100644 --- a/install-dev/php/add_missing_rewrite_value.php +++ b/install-dev/php/add_missing_rewrite_value.php @@ -34,6 +34,7 @@ function add_missing_rewrite_value() WHERE ml.`url_rewrite` = \'\' AND m.`page` != "index" '); + if (sizeof($pages) && is_array($pages)) foreach ($pages as $page) { Db::getInstance()->Execute(' diff --git a/install-dev/php/add_order_state.php b/install-dev/php/add_order_state.php new file mode 100644 index 000000000..7118a6a29 --- /dev/null +++ b/install-dev/php/add_order_state.php @@ -0,0 +1,63 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +function add_order_state($conf_name, $name, $invoice, $send_email, $color, $unremovable, $logable, $delivery, $template = null) +{ + $name_lang = array(); + $template_lang = array(); + foreach (explode('|', $name) AS $item) + { + $temp = explode(':', $item); + $name_lang[$temp[0]] = $temp[1]; + } + + if ($template) + foreach (explode('|', $template) AS $item) + { + $temp = explode(':', $item); + $template_lang[$temp[0]] = $temp[1]; + } + + Db::getInstance()->Execute(' + INSERT INTO `'._DB_PREFIX_.'order_state` (`invoice`, `send_email`, `color`, `unremovable`, `logable`, `delivery`) + VALUES ('.(int)$invoice.', '.(int)$send_email.', \''.pSQL($color).'\', '.(int)$unremovable.', '.(int)$logable.', '.(int)$delivery.')'); + + $id_order_state = Db::getInstance()->getValue(' + SELECT MAX(`id_order_state`) + FROM `'._DB_PREFIX_.'order_state` + '); + + foreach (Language::getLanguages() AS $lang) + { + Db::getInstance()->Execute(' + INSERT IGNORE INTO `'._DB_PREFIX_.'order_state_lang` (`id_lang`, `id_order_state`, `name`, `template`) + VALUES ('.(int)$lang['id_lang'].', '.(int)$id_order_state.', \''.pSQL(isset($name_lang[$lang['iso_code']]) ? $name_lang[$lang['iso_code']] : $name_lang['en']).'\', \''.pSQL(isset($template_lang[$lang['iso_code']]) ? $template_lang[$lang['iso_code']] : (isset($template_lang['en']) ? $template_lang['en'] : '')).'\') + '); + } + + Configuration::updateValue($conf_name, $id_order_state); +} \ No newline at end of file diff --git a/install-dev/php/alter_productcomments_guest_index.php b/install-dev/php/alter_productcomments_guest_index.php new file mode 100644 index 000000000..49babefc4 --- /dev/null +++ b/install-dev/php/alter_productcomments_guest_index.php @@ -0,0 +1,39 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +function alter_productcomments_guest_index() +{ + Configuration::loadConfiguration(); + $productcomments = Module::getInstanceByName('productcomments'); + if (!$productcomments->id) + return; + + DB::getInstance()->Execute(' + ALTER TABLE `'._DB_PREFIX_.'product_comment` DROP INDEX `id_guest`, + ADD INDEX `id_guest` USING BTREE(`id_guest`);'); +} + diff --git a/install-dev/php/index.php b/install-dev/php/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/install-dev/php/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/install-dev/php/utf8.php b/install-dev/php/utf8.php index 759bdd348..b31b99fbb 100644 --- a/install-dev/php/utf8.php +++ b/install-dev/php/utf8.php @@ -24,6 +24,8 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ + +if(!defined('_PS_MAGIC_QUOTES_GPC_')) define('_PS_MAGIC_QUOTES_GPC_', get_magic_quotes_gpc()); function latin1_database_to_utf8() diff --git a/install-dev/sql/db.sql b/install-dev/sql/db.sql index dc86ed16b..d8385834a 100644 --- a/install-dev/sql/db.sql +++ b/install-dev/sql/db.sql @@ -61,7 +61,7 @@ CREATE TABLE `PREFIX_attachment` ( `id_attachment` int(10) unsigned NOT NULL auto_increment, `file` varchar(40) NOT NULL, `file_name` varchar(128) NOT NULL, - `mime` varchar(64) NOT NULL, + `mime` varchar(128) NOT NULL, PRIMARY KEY (`id_attachment`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; @@ -290,6 +290,16 @@ CREATE TABLE `PREFIX_cms_category_lang` ( KEY `category_name` (`name`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; +CREATE TABLE `PREFIX_compare_product` ( + `id_compare_product` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_product` int(10) unsigned NOT NULL, + `id_guest` int(10) unsigned NOT NULL, + `id_customer` int(10) unsigned NOT NULL, + `date_add` datetime NOT NULL, + `date_upd` datetime NOT NULL, + PRIMARY KEY (`id_compare_product`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + CREATE TABLE `PREFIX_configuration` ( `id_configuration` int(10) unsigned NOT NULL auto_increment, `id_group_shop` INT(11) UNSIGNED DEFAULT NULL, @@ -739,7 +749,7 @@ CREATE TABLE `PREFIX_hook_module_exceptions` ( CREATE TABLE `PREFIX_image` ( `id_image` int(10) unsigned NOT NULL auto_increment, `id_product` int(10) unsigned NOT NULL, - `position` tinyint(2) unsigned NOT NULL default '0', + `position` smallint(2) unsigned NOT NULL default '0', `cover` tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (`id_image`), KEY `image_product` (`id_product`), @@ -776,6 +786,7 @@ CREATE TABLE `PREFIX_lang` ( `active` tinyint(3) unsigned NOT NULL default '0', `iso_code` char(2) NOT NULL, `language_code` char(5) NOT NULL, + `is_rtl` TINYINT(1) NOT NULL default '0', PRIMARY KEY (`id_lang`), KEY `lang_iso_code` (`iso_code`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; diff --git a/install-dev/sql/db_settings_extends.sql b/install-dev/sql/db_settings_extends.sql index 8f8e9e8a8..d9baa4e14 100644 --- a/install-dev/sql/db_settings_extends.sql +++ b/install-dev/sql/db_settings_extends.sql @@ -45,6 +45,7 @@ INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VAL ('CHECKUP_STOCK_GT', '3', NOW(), NOW()), ('FOOTER_CMS', '0_3|0_4', NOW(), NOW()), ('FOOTER_BLOCK_ACTIVATION', '0_3|0_4', NOW(), NOW()), + ('FOOTER_POWEREDBY', 1, NOW(), NOW()), ('BLOCKADVERT_LINK', 0, NOW(), NOW()), ('BLOCKSTORE_IMG', 'store.jpg', NOW(), NOW()); @@ -109,7 +110,7 @@ CREATE TABLE `PREFIX_cms_block` ( `name` varchar(40) NOT NULL, `location` tinyint(1) unsigned NOT NULL, `position` int(10) unsigned NOT NULL default '0', - `display_store` tinyint(1) NOT NULL DEFAULT '1', + `display_store` tinyint(1) unsigned NOT NULL DEFAULT '1', PRIMARY KEY (`id_cms_block`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql index 3db4af89c..2a7dafeb7 100644 --- a/install-dev/sql/db_settings_lite.sql +++ b/install-dev/sql/db_settings_lite.sql @@ -185,7 +185,24 @@ INSERT INTO `PREFIX_configuration` (`id_configuration`, `name`, `value`, `date_a (114, 'PS_CANONICAL_REDIRECT', '1', NOW(), NOW()), (115, 'PS_IMG_UPDATE_TIME', UNIX_TIMESTAMP(), NOW(), NOW()), (116, 'PS_BACKUP_DROP_TABLE', 1, NOW(), NOW()), -(117, 'PS_LEGACY_IMAGES', '1', NOW(), NOW()); +(117, 'PS_OS_CHEQUE', '1', NOW(), NOW()), +(118, 'PS_OS_PAYMENT', '2', NOW(), NOW()), +(119, 'PS_OS_PREPARATION', '3', NOW(), NOW()), +(120, 'PS_OS_SHIPPING', '4', NOW(), NOW()), +(121, 'PS_OS_DELIVERED', '5', NOW(), NOW()), +(122, 'PS_OS_CANCELED', '6', NOW(), NOW()), +(123, 'PS_OS_REFUND', '7', NOW(), NOW()), +(124, 'PS_OS_ERROR', '8', NOW(), NOW()), +(125, 'PS_OS_OUTOFSTOCK', '9', NOW(), NOW()), +(126, 'PS_OS_BANKWIRE', '10', NOW(), NOW()), +(127, 'PS_OS_PAYPAL', '11', NOW(), NOW()), +(128, 'PS_OS_WS_PAYMENT', '12', NOW(), NOW()), +(129, 'PS_LEGACY_IMAGES', '1', NOW(), NOW()), +(130, 'PS_IMAGE_QUALITY', 'jpg', NOW(), NOW()), +(131, 'PS_PNG_QUALITY', '7', NOW(), NOW()), +(132, 'PS_JPEG_QUALITY', '90', NOW(), NOW()), +(133, 'PS_COOKIE_LIFETIME_FO', '480', NOW(), NOW()), +(134, 'PS_COOKIE_LIFETIME_BO', '480', NOW(), NOW()); INSERT INTO `PREFIX_configuration_lang` (`id_configuration`, `id_lang`, `value`, `date_upd`) VALUES (36, 1, 'IN', NOW()),(36, 2, 'FA', NOW()),(36, 3, 'CU', NOW()),(36, 4, 'FA', NOW()),(36, 5, 'FA', NOW()), @@ -712,8 +729,8 @@ INSERT INTO `PREFIX_tab` (`id_tab`, `class_name`, `id_parent`, `position`) VALUE (53, 'AdminBackup', 9, 8),(57, 'AdminCMSContent', 9, 9),(64, 'AdminGenerator', 9, 10),(43, 'AdminSearch', -1, 0),(69, 'AdminInformation', 9, 11), (70, 'AdminPerformance', 8, 11),(71, 'AdminCustomerThreads', 29, 4),(72, 'AdminWebservice', 9, 12),(73, 'AdminStockMvt', 1, 9), (80, 'AdminAddonsCatalog', 7, 1),(81, 'AdminAddonsMyAccount', 7, 2),(83, 'AdminThemes', 7, 3),(84, 'AdminGeolocation', 8, 12), -(85, 'AdminTaxRulesGroup', 4, 3),(86, 'AdminLogs', 9, 13), (87, 'AdminCounty', 5, 4),(88,'AdminHome',-1,0),(89,'AdminShop', 0, 11), (90,'AdminGroupShop', 89, 1), -(91, 'AdminShopUrl', 89, 2); +(85, 'AdminTaxRulesGroup', 4, 3),(86, 'AdminLogs', 9, 13), (87, 'AdminCounty', 5, 4),(88,'AdminHome',-1,0),(89,'AdminUpgrade',9,14), +(90,'AdminShop', 0, 11), (91,'AdminGroupShop', 90, 1),(92, 'AdminShopUrl', 90, 2); INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 1, id_tab, 1, 1, 1, 1 FROM PREFIX_tab); @@ -723,29 +740,29 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES (1, 12, 'Addresses'),(1, 13, 'Statuses'),(1, 14, 'Vouchers'),(1, 15, 'Currencies'),(1, 16, 'Taxes'),(1, 17, 'Carriers'),(1, 18, 'Countries'), (1, 19, 'Zones'),(1, 20, 'Price Ranges'),(1, 21, 'Weight Ranges'),(1, 22, 'Positions'),(1, 23, 'Database'),(1, 24, 'E-mail'),(1, 26, 'Image'), (1, 27, 'Products'),(1, 28, 'Contacts'),(1, 29, 'Employees'),(1, 30, 'Profiles'),(1, 31, 'Permissions'),(1, 32, 'Languages'),(1, 33, 'Translations'), -(1, 34, 'Suppliers'),(1, 35, 'Tabs'),(1, 36, 'Features'),(1, 37, 'Quick Access'),(1, 38, 'Appearance'),(1, 39, 'Contact Information'),(1, 40, 'Aliases'), +(1, 34, 'Suppliers'),(1, 35, 'Tabs'),(1, 36, 'Features'),(1, 37, 'Quick Access'),(1, 38, 'Appearance'),(1, 39, 'Contact Information'),(1, 40, 'Alias ​​Research'), (1, 41, 'Import'),(1, 42, 'Invoices'),(1, 43, 'Search'),(1, 44, 'Localization'),(1, 46, 'States'),(1, 47, 'Merchandise Returns'),(1, 48, 'PDF'), (1, 49, 'Credit Slips'),(1, 51, 'Settings'),(1, 52, 'Subdomains'),(1, 53, 'DB backup'),(1, 54, 'Order Messages'), (1, 55, 'Delivery Slips'),(1, 56, 'SEO & URLs'),(1, 57, 'CMS'),(1, 58, 'Image Mapping'),(1, 59, 'Customer Messages'),(1, 60, 'Tracking'), (1, 61, 'Search Engines'),(1, 62, 'Referrers'),(1, 63, 'Groups'),(1, 64, 'Generators'),(1, 65, 'Shopping Carts'),(1, 66, 'Tags'),(1, 67, 'Search'), (1, 68, 'Attachments'),(1, 69, 'Configuration Information'),(1, 70, 'Performance'),(1, 71, 'Customer Service'),(1, 72, 'Webservice'),(1, 73, 'Stock Movements'), (1, 80, 'Modules & Themes Catalog'),(1, 81, 'My Account'),(1, 82, 'Stores'),(1, 83, 'Themes'),(1, 84, 'Geolocation'),(1, 85, 'Tax Rules'),(1, 86, 'Log'), -(1, 87, 'Counties'),(1, 88, 'Home'), (1, 89, 'Shops'), (1, 90, 'Group Shops'), (1, 91, 'Shop Urls'); +(1, 87, 'Counties'),(1, 88, 'Home'),(1, 89, 'Upgrade'), (1, 90, 'Shops'), (1, 91, 'Group Shops'), (1, 92, 'Shop Urls'); INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES (2, 1, 'Catalogue'),(2, 2, 'Clients'),(2, 3, 'Commandes'),(2, 4, 'Paiement'),(2, 5, 'Transport'), -(2, 6, 'Stats'),(2, 7, 'Modules'),(2, 8, 'Préférences'),(2, 9, 'Outils'),(2, 10, 'Fabricants'),(2, 11, 'Attributs et groupes'),(2, 12, 'Adresses'),(2, 13, 'Statuts'), +(2, 6, 'Stats'),(2, 7, 'Modules'),(2, 8, 'Préférences'),(2, 9, 'Outils'),(2, 10, 'Marques'),(2, 11, 'Attributs et groupes'),(2, 12, 'Adresses'),(2, 13, 'Statuts'), (2, 14, 'Bons de réduction'),(2, 15, 'Devises'),(2, 16, 'Taxes'),(2, 17, 'Transporteurs'),(2, 18, 'Pays'),(2, 19, 'Zones'),(2, 20, 'Tranches de prix'), (2, 21, 'Tranches de poids'),(2, 22, 'Positions'),(2, 23, 'Base de données'),(2, 24, 'Emails'),(2, 26, 'Images'),(2, 27, 'Produits'),(2, 28, 'Contacts'), (2, 29, 'Employés'),(2, 30, 'Profils'),(2, 31, 'Permissions'),(2, 32, 'Langues'),(2, 33, 'Traductions'),(2, 34, 'Fournisseurs'),(2, 35, 'Onglets'), -(2, 36, 'Caractéristiques'),(2, 37, 'Accès rapide'),(2, 38, 'Apparence'),(2, 39, 'Coordonnées'),(2, 40, 'Alias'),(2, 41, 'Import'),(2, 42, 'Factures'), +(2, 36, 'Caractéristiques'),(2, 37, 'Accès rapide'),(2, 38, 'Apparence'),(2, 39, 'Coordonnées'),(2, 40, 'Alias de recherche'),(2, 41, 'Import'),(2, 42, 'Factures'), (2, 43, 'Recherche'),(2, 44, 'Localisation'),(2, 46, 'Etats'),(2, 47, 'Retours produits'),(2, 48, 'PDF'),(2, 49, 'Avoirs'), (2, 51, 'Configuration'),(2, 52, 'Sous domaines'),(2, 53, 'Sauvegarde BDD'),(2, 54, 'Messages prédéfinis'),(2, 55, 'Bons de livraison'), (2, 56, 'SEO & URLs'),(2, 57, 'CMS'),(2, 58, 'Scènes'),(2, 59, 'Messages clients'),(2, 60, 'Suivi'),(2, 61, 'Moteurs de recherche'), (2, 62, 'Sites affluents'),(2, 63, 'Groupes'),(2, 64, 'Générateurs'),(2, 65, 'Paniers'),(2, 66, 'Tags'),(2, 67, 'Recherche'), (2, 68, 'Documents joints'),(2, 69, 'Informations'),(2, 70, 'Performances'),(2, 71, 'SAV'),(2, 72, 'Service web'),(2, 73, 'Mouvements de Stock'), (2, 80, 'Catalogue de modules et thèmes'),(2, 81, 'Mon compte'),(2, 82, 'Magasins'),(2, 83, 'Thèmes'),(2, 84, 'Géolocalisation'),(2, 85, 'Règles de taxes'),(2, 86, 'Log'), -(2, 87, 'Comtés'),(2,88,'Accueil'), (2, 89, 'Boutiques'), (2, 90, 'Groupes de boutique'), (2, 91, 'URLs de boutique'); +(2, 87, 'Comtés'),(2,88,'Accueil'),(2, 89, 'Mise à jour'), (2, 90, 'Boutiques'), (2, 91, 'Groupes de boutique'), (2, 92, 'URLs de boutique'); INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES (3, 1, 'Catálogo'),(3, 2, 'Clientes'),(3, 3, 'Pedidos'),(3, 4, 'Pago'),(3, 5, 'Transporte'), @@ -753,13 +770,13 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES (3, 13, 'Estados'),(3, 14, 'Vales de descuento'),(3, 15, 'Divisas'),(3, 16, 'Impuestos'),(3, 17, 'Transportistas'),(3, 18, 'Países'),(3, 19, 'Zonas'), (3, 20, 'Franja de precios'),(3, 21, 'Franja de pesos'),(3, 22, 'Posiciones'),(3, 23, 'Base de datos'),(3, 24, 'Emails'),(3, 26, 'Imágenes'), (3, 27, 'Productos'),(3, 28, 'Contactos'),(3, 29, 'Empleados'),(3, 30, 'Perfiles'),(3, 31, 'Permisos'),(3, 32, 'Idiomas'),(3, 33, 'Traducciones'), -(3, 34, 'Proovedores'),(3, 35, 'Pestañas'),(3, 36, 'Características'),(3, 37, 'Acceso rápido'),(3, 38, 'Aspecto'),(3, 39, 'Datos'),(3, 40, 'Alias'), +(3, 34, 'Proveedores'),(3, 35, 'Pestañas'),(3, 36, 'Características'),(3, 37, 'Acceso rápido'),(3, 38, 'Aspecto'),(3, 39, 'Datos'),(3, 40, 'Alias ​​de Investigación'), (3, 41, 'Importar'),(3, 42, 'Facturas'),(3, 43, 'Búsqueda'),(3, 44, 'Ubicación'),(3, 46, 'Estados'),(3, 47, 'Devolución productos'),(3, 48, 'PDF'), (3, 49, 'Vales'),(3, 51, 'Configuración'),(3, 52, 'Subcampos'),(3, 53, 'Copia de seguridad'),(3, 54, 'Mensajes de Orden'), (3, 55, 'Albaranes de entrega'),(3, 56, 'SEO & URLs'),(3, 57, 'CMS'),(3, 58, 'Mapeo de la imagen'),(3, 59, 'Mensajes del cliente'),(3, 60, 'Rastreo'), (3, 61, 'Motores de búsqueda'),(3, 62, 'Referido'),(3, 63, 'Grupos'),(3, 64, 'Generadores'),(3, 65, 'Carritos'),(3, 66, 'Etiquetas'),(3, 67, 'Búsqueda'),(3, 68, 'Adjuntos'), -(3, 69, 'Informations'),(3, 70, 'Rendimiento'),(3, 72, 'Web service'),(3, 71, 'Servicio al cliente'),(3, 73, 'Movimiento de Stock'), (3, 82, 'Tiendas'),(3, 83, 'Temas'),(3, 84, 'Geolocalización'),(3, 85, 'Reglas de Impuestos'),(3, 86, 'Log'), -(3, 87, 'Condados'),(3,88,'Home'), (3, 89, 'Shops'), (3, 90, 'Group Shops'), (3, 91, 'Shop Urls'); +(3, 69, 'Informaciones'),(3, 70, 'Rendimiento'),(3, 72, 'Web service'),(3, 71, 'Servicio al cliente'),(3, 73, 'Movimiento de Stock'), (3, 82, 'Tiendas'),(3, 83, 'Temas'),(3, 84, 'Geolocalización'),(3, 85, 'Reglas de Impuestos'),(3, 86, 'Log'), +(3, 87, 'Condados'),(3,88,'Home'),(3, 89, 'Mejorar'), (3, 90, 'Shops'), (3, 91, 'Group Shops'), (3, 92, 'Shop Urls'); INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES (4, 1, 'Katalog'),(4, 2, 'Kunden'),(4, 3, 'Bestellungen'),(4, 4, 'Zahlung'), @@ -767,14 +784,14 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES (4, 12, 'Adressen'),(4, 13, 'Status'),(4, 14, 'Gutscheine'),(4, 15, 'Währungen'),(4, 16, 'Steuern'),(4, 17, 'Lieferanten'),(4, 18, 'Länder'), (4, 19, 'Zonen'),(4, 20, 'Preislagen'),(4, 21, 'Gewichtsklassen'),(4, 22, 'Positionen'),(4, 23, 'Datenbank'),(4, 24, 'E-Mail'),(4, 26, 'Bild'), (4, 27, 'Produkte'),(4, 28, 'Kontakte'),(4, 29, 'Mitarbeiter'),(4, 30, 'Profile'),(4, 31, 'Berechtigungen'),(4, 32, 'Sprachen'),(4, 33, 'Übersetzungen'), -(4, 34, 'Zulieferer'),(4, 35, 'Tabs'),(4, 36, 'Funktionen'),(4, 37, 'Schnellzugriff'),(4, 38, 'Aussehen'),(4, 39, 'Kontaktinformation'),(4, 40, 'Alias'), +(4, 34, 'Zulieferer'),(4, 35, 'Tabs'),(4, 36, 'Funktionen'),(4, 37, 'Schnellzugriff'),(4, 38, 'Aussehen'),(4, 39, 'Kontaktinformation'),(4, 40, 'Suchname'), (4, 41, 'Import'),(4, 42, 'Rechnungen'),(4, 43, 'Suche'),(4, 44, 'Lokalisierung'),(4, 46, 'Staaten'),(4, 47, 'Warenrücksendungen'),(4, 48, 'PDF'), (4, 49, 'Gutscheine'),(4, 51, 'Einstellungen'),(4, 52, 'Subdomains'),(4, 53, 'DB-Backup'),(4, 54, 'Bestellnachrichten'), (4, 55, 'Lieferscheine'),(4, 56, 'SEO & URLs'),(4, 57, 'CMS'),(4, 58, 'Image Mapping'),(4, 59, 'Kundennachrichten'),(4, 60, 'Tracking'), (4, 61, 'Suchmaschinen'),(4, 62, 'Referrer'),(4, 63, 'Gruppen'),(4, 64, 'Generatoren'),(4, 65, 'Warenkörbe'),(4, 66, 'Tags'),(4, 67, 'Suche'), (4, 68, 'Anhänge'),(4, 69, 'Konfigurationsinformationen'),(4, 70, 'Leistung'),(4, 71, 'Kundenservice'),(4, 72, 'Webservice'),(4, 73, 'Lagerbewegungen'), (4, 80, 'Module und Themenkatalog'),(4, 81, 'Mein Konto'),(4, 82, 'Shops'),(4, 83, 'Themen'),(4, 84, 'Geotargeting'),(4, 85, 'Steuerregeln'),(4, 86, 'Log'), -(4,87,'Counties'),(4,88,'Home'), (4, 89, 'Shops'), (4, 90, 'Group Shops'), (4, 91, 'Shop Urls'); +(4,87,'Counties'),(4,88,'Home'),(4, 89, 'Upgrade'), (4, 90, 'Shops'), (4, 91, 'Group Shops'), (4, 92, 'Shop Urls'); INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES (5, 1, 'Catalogo'),(5, 2, 'Clienti'),(5, 3, 'Ordini'),(5, 4, 'Pagamento'), @@ -782,14 +799,14 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES (5, 12, 'Indirizzi'),(5, 13, 'Status'),(5, 14, 'Voucher'),(5, 15, 'Valute'),(5, 16, 'Tasse'),(5, 17, 'Corrieri'),(5, 18, 'Nazioni'), (5, 19, 'Zone'),(5, 20, 'Fasce di prezzo'),(5, 21, 'Fasce di peso'),(5, 22, 'Posizioni'),(5, 23, 'Database'),(5, 24, 'E-mail'),(5, 26, 'Immagine'), (5, 27, 'Prodotti'),(5, 28, 'Contatti'),(5, 29, 'Impiegati'),(5, 30, 'Profili'),(5, 31, 'Permessi'),(5, 32, 'Lingue'),(5, 33, 'Traduzioni'), -(5, 34, 'Fornitori'),(5, 35, 'Tab'),(5, 36, 'Caratteristiche'),(5, 37, 'Accesso rapido'),(5, 38, 'Aspetto'),(5, 39, 'Informazioni di contatto'),(5, 40, 'Alias'), +(5, 34, 'Fornitori'),(5, 35, 'Tab'),(5, 36, 'Caratteristiche'),(5, 37, 'Accesso rapido'),(5, 38, 'Aspetto'),(5, 39, 'Informazioni di contatto'),(5, 40, 'Alias di ricerca'), (5, 41, 'Importa'),(5, 42, 'Fatture'),(5, 43, 'Cerca'),(5, 44, 'Localizzazione'),(5, 46, 'Stati'),(5, 47, 'Resi merci'),(5, 48, 'PDF'), (5, 49, 'Note di credito'),(5, 51, 'Impostazioni'),(5, 52, 'Sottodomini'),(5, 53, 'DB backup'),(5, 54, 'Messaggi ordine'), (5, 55, 'Note di consegna'),(5, 56, 'SEO & URLs'),(5, 57, 'CMS'),(5, 58, 'Mappatura immagine'),(5, 59, 'Messaggi cliente'),(5, 60, 'Rintracciare'), (5, 61, 'Motori di ricerca'),(5, 62, 'Referenti'),(5, 63, 'Gruppi'),(5, 64, 'Generatori'),(5, 65, 'Carrelli shopping'),(5, 66, 'Tag'),(5, 67, 'Cerca'), (5, 68, 'Allegati'),(5, 69, 'Informazioni di configurazione'),(5, 70, 'Performance'),(5, 71, 'Servizio clienti'),(5, 72, 'Webservice'),(5, 73, 'Movimenti magazzino'), (5, 80, 'Moduli & Temi catalogo'),(5, 81, 'Il mio Account'),(5, 82, 'Negozi'),(5, 83, 'Temi'),(5, 84, 'Geolocalizzazione'),(5, 85, 'Regimi fiscali'),(5, 86, 'Log'), -(5,87,'Counties'),(5,88,'Home'), (5, 89, 'Shops'), (5, 90, 'Group Shops'), (5, 91, 'Shop Urls'); +(5,87,'Counties'),(5,88,'Home'),(5, 89, 'Aggiornamento'), (5, 90, 'Shops'), (5, 91, 'Group Shops'), (5, 92, 'Shop Urls'); INSERT IGNORE INTO `PREFIX_tab_lang` (`id_tab`, `id_lang`, `name`) (SELECT `id_tab`, id_lang, (SELECT tl.`name` @@ -1160,10 +1177,10 @@ INSERT INTO `PREFIX_stock_mvt_reason_lang` (`id_stock_mvt_reason`, `id_lang`, `n INSERT INTO `PREFIX_address_format` (`id_country`, `format`) (SELECT `id_country` as id_country, 'firstname lastname\ncompany\nvat_number\naddress1\naddress2\npostcode city\nCountry:name\nphone' as format FROM `PREFIX_country`); -UPDATE `PREFIX_address_format` set `format`='company -firstname lastname +UPDATE `PREFIX_address_format` set `format`='firstname lastname +company address1 address2 -city State:name postcode +city, State:name postcode Country:name phone' where `id_country`=21; diff --git a/install-dev/sql/index.php b/install-dev/sql/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/install-dev/sql/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/install-dev/sql/upgrade/1.4.0.15.sql b/install-dev/sql/upgrade/1.4.0.15.sql index 7a0227965..f58669a52 100644 --- a/install-dev/sql/upgrade/1.4.0.15.sql +++ b/install-dev/sql/upgrade/1.4.0.15.sql @@ -1,7 +1,7 @@ /* PHP:add_new_tab(AdminCounty, fr:Comtés|es:Condados|en:Counties|de:Counties|it:Counties, 5); */; ALTER TABLE `PREFIX_tax_rule` ADD `county_behavior` INT NOT NULL AFTER `state_behavior`; -ALTER TABLE `PREFIX_tax_rule` ADD `id_county` INT NOT NULL AFTER `state_behavior`; +ALTER TABLE `PREFIX_tax_rule` ADD `id_county` INT NOT NULL AFTER `id_country`; ALTER TABLE `PREFIX_tax_rule` ADD UNIQUE ( `id_tax_rules_group` , diff --git a/install-dev/sql/upgrade/1.4.0.17.sql b/install-dev/sql/upgrade/1.4.0.17.sql index dc6af7ab0..bf8cb320f 100644 --- a/install-dev/sql/upgrade/1.4.0.17.sql +++ b/install-dev/sql/upgrade/1.4.0.17.sql @@ -1,6 +1,6 @@ SET NAMES 'utf8'; -ALTER TABLE `PREFIX_stock_mvt_reason` ADD `sign` TINYINT(1) NOT NULL AFTER `id_stock_mvt_reason`; +ALTER TABLE `PREFIX_stock_mvt_reason` ADD `sign` TINYINT(1) NOT NULL DEFAULT '1' AFTER `id_stock_mvt_reason`; UPDATE `PREFIX_stock_mvt_reason` SET `sign`=-1; UPDATE `PREFIX_stock_mvt_reason` SET `sign`=1 WHERE `id_stock_mvt_reason`=3; UPDATE `PREFIX_stock_mvt_reason` SET `id_stock_mvt_reason`=`id_stock_mvt_reason`+2 ORDER BY `id_stock_mvt_reason` DESC; diff --git a/install-dev/sql/upgrade/1.4.2.0.sql b/install-dev/sql/upgrade/1.4.2.0.sql index d4b66a53e..2034dcf8e 100644 --- a/install-dev/sql/upgrade/1.4.2.0.sql +++ b/install-dev/sql/upgrade/1.4.2.0.sql @@ -12,15 +12,7 @@ ALTER TABLE `PREFIX_orders` ADD INDEX `date_add`(`date_add`); INSERT IGNORE INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_STOCK_MVT_REASON_DEFAULT', 3, NOW(), NOW()); -INSERT IGNORE INTO `PREFIX_order_state` (`id_order_state`, `invoice`, `send_email`, `color`, `unremovable`, `logable`, `delivery`) VALUES (12, 0, 0, 'lightblue', 1, 0, 0); - -INSERT IGNORE INTO `PREFIX_order_state_lang` (`id_order_state`, `id_lang`, `name`, `template`) VALUES -(12, 1, 'Payment remotely accepted', ''), -(12, 2, 'Paiement à distance accepté', ''), -(12, 3, 'Payment remotely accepted', ''), -(12, 4, 'Payment remotely accepted', ''), -(12, 5, 'Payment remotely accepted', ''); - +/* PHP:add_order_state(PS_OS_WS_PAYMENT, en:Payment remotely accepted|fr:Paiement à distance accepté, 0, 0, lightblue, 1, 0, 0); */; /* PHP:alter_blocklink(); */; /* PHP:update_module_loyalty(); */; /* PHP:remove_module_from_hook(blockcategories, afterCreateHtaccess); */; diff --git a/install-dev/sql/upgrade/1.4.3.sql b/install-dev/sql/upgrade/1.4.3.0.sql similarity index 70% rename from install-dev/sql/upgrade/1.4.3.sql rename to install-dev/sql/upgrade/1.4.3.0.sql index fdef3a327..e5be50568 100644 --- a/install-dev/sql/upgrade/1.4.3.sql +++ b/install-dev/sql/upgrade/1.4.3.0.sql @@ -8,7 +8,7 @@ city State:name postcode Country:name' -WHERE id_country = (SELECT id_country FROM `PREFIX_country` WHERE `iso_code`='GB'); +WHERE `id_country` = (SELECT `id_country` FROM `PREFIX_country` WHERE `iso_code`='GB'); UPDATE `PREFIX_country` SET `contains_states` = 1 WHERE `id_country` = 145; diff --git a/install-dev/sql/upgrade/1.4.4.0.sql b/install-dev/sql/upgrade/1.4.4.0.sql new file mode 100644 index 000000000..4c20d78c6 --- /dev/null +++ b/install-dev/sql/upgrade/1.4.4.0.sql @@ -0,0 +1,80 @@ +SET NAMES 'utf8'; + +ALTER TABLE `PREFIX_image` MODIFY COLUMN `position` SMALLINT(2) UNSIGNED NOT NULL DEFAULT 0; + +INSERT IGNORE INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES +('PS_OS_CHEQUE', '1', NOW(), NOW()), +('PS_OS_PAYMENT', '2', NOW(), NOW()), +('PS_OS_PREPARATION', '3', NOW(), NOW()), +('PS_OS_SHIPPING', '4', NOW(), NOW()), +('PS_OS_DELIVERED', '5', NOW(), NOW()), +('PS_OS_CANCELED', '6', NOW(), NOW()), +('PS_OS_REFUND', '7', NOW(), NOW()), +('PS_OS_ERROR', '8', NOW(), NOW()), +('PS_OS_OUTOFSTOCK', '9', NOW(), NOW()), +('PS_OS_BANKWIRE', '10', NOW(), NOW()), +('PS_OS_PAYPAL', '11', NOW(), NOW()), +('PS_OS_WS_PAYMENT', '12', NOW(), NOW()), +('PS_IMAGE_QUALITY', 'jpg', NOW(), NOW()), +('PS_PNG_QUALITY', '7', NOW(), NOW()), +('PS_JPEG_QUALITY', '90', NOW(), NOW()), +('PS_COOKIE_LIFETIME_FO', '480', NOW(), NOW()), +('PS_COOKIE_LIFETIME_BO', '480', NOW(), NOW()); + +ALTER TABLE `PREFIX_lang` ADD `is_rtl` TINYINT(1) NOT NULL DEFAULT '0'; + +UPDATE `PREFIX_country_lang` +SET `name` = 'United State' +WHERE `name` = 'USA' +AND `id_lang` = ( + SELECT `id_lang` + FROM `PREFIX_lang` + WHERE `iso_code` = 'en' + LIMIT 1 +); + +UPDATE `PREFIX_hook` +SET `live_edit` = 1 +WHERE `name` = 'leftColumn' +OR `name` = 'home' +OR `name` = 'rightColumn' +OR `name` = 'productfooter' +OR `name` = 'payment'; + +ALTER TABLE `PREFIX_stock_mvt_reason` MODIFY `sign` TINYINT(1) NOT NULL DEFAULT '1' AFTER `id_stock_mvt_reason`; + +UPDATE `PREFIX_tab_lang` +SET `name` = 'Geolocation' +WHERE `name` = 'Geolocalization'; + +UPDATE `PREFIX_tab_lang` +SET `name` = 'Counties' +WHERE `name` = 'County'; + +ALTER TABLE `PREFIX_tax_rule` MODIFY `id_county` INT NOT NULL AFTER `id_country`; + +UPDATE `PREFIX_address_format` set `format`='firstname lastname +company +address1 address2 +city, State:name postcode +Country:name +phone' +WHERE `id_country` = (SELECT `id_country` FROM `PREFIX_country` WHERE `iso_code`='US'); + +ALTER TABLE `PREFIX_attachment` CHANGE `mime` `mime` VARCHAR(128) NOT NULL; + +CREATE TABLE IF NOT EXISTS `PREFIX_compare_product` ( + `id_compare_product` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_product` int(10) unsigned NOT NULL, + `id_guest` int(10) unsigned NOT NULL, + `id_customer` int(10) unsigned NOT NULL, + `date_add` datetime NOT NULL, + `date_upd` datetime NOT NULL, + PRIMARY KEY (`id_compare_product`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +DELETE FROM `PREFIX_configuration` WHERE name = 'PS_LAYERED_NAVIGATION_CHECKBOXES' LIMIT 1; + +/* PHP:add_new_tab(AdminUpgrade, en:Upgrade|fr:Mise à jour, 9); */; + +/* PHP:alter_productcomments_guest_index(); */; diff --git a/install-dev/sql/upgrade/index.php b/install-dev/sql/upgrade/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/install-dev/sql/upgrade/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/install-dev/view.css b/install-dev/view.css index b610bfce0..09810edd1 100644 --- a/install-dev/view.css +++ b/install-dev/view.css @@ -1,594 +1,740 @@ @CHARSET "UTF-8"; -/* -purple #d41958 +/* **************************************************************************** + reset +**************************************************************************** */ +html{color:#000;background:#FFF;} +body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;} +table{border-collapse:collapse;border-spacing:0;} +fieldset,img{border:0;} +address,caption,cite,code,dfn,em,th,var,optgroup{font-style:inherit;font-weight:inherit;} +del,ins{text-decoration:none;} +caption,th{text-align:left;} +h1,h2,h3,h4,h5,h6{font-size:100%;} +q:before,q:after{content:'';} +abbr,acronym{border:0;font-variant:normal;} +sup{vertical-align:baseline;} +sub{vertical-align:baseline;} +legend{color:#000;} +input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;} +input,button,textarea,select{font-size:100%;} +a {cursor:pointer;} -green #7eb423 -*/ - -body{ - background-image : url(img/bg-body.png); - font-family:Verdana, Geneva, Arial, Helvetica, sans-serif; +.installModuleList { display: none; } +.installModuleList.selected { display: block; } +.clearfix:before, +.clearfix:after { + content: "."; + display: block; + height: 0; + overflow: hidden; } +.clearfix:after {clear: both;} +.clearfix {zoom: 1;} -a:link, a:active, a:visited{ - text-decoration:none; - color:#d41958; -} -a:hover{ - color:#7eb423; -} +/* **************************************************************************** + structure +**************************************************************************** */ #container{ - margin:1em auto 0 auto; - width:930px; - padding:10px 30px 0px 30px; - font-size:0.8em; - background : #456d01 url(img/bg-ctnr.png) top repeat-x; + position:relative; display:none; + margin:0 auto; + padding:0; + width:990px; + background :#fff; } + #header { + padding:6px 16px 16px 16px; + height:68px;/* 90 */ + background:#394049; + } #loaderSpace{ - height:24px; + display:none; + z-index: 100; + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + background:transparent url(img/bg_loaderSpace.png) repeat 0 0; } div#loader{ - float:right; - background-image:url(../img/loadingAnimation.gif); - height:13px; - width:208px; - color:white; display:none; + margin: 450px 0 0 440px; + height:128px; + width:128px; + color:#fff; + background-image:url(img/ajax-loader.gif); } div#leftpannel{ float:left; - width:250px; - margin-top: 15px; + margin:65px 30px 0 30px; + width:220px; } -div#leftpannel div#help{ - width:175px; - height:129px; - margin:20px 0; - padding:5px; - background:url('img/bg_help.png') no-repeat; - font-family:Arial, sans-serif; + div#sheets { + float:left; + margin-top:65px; + min-height:400px; + width:700px; + background-color:#fff; } -div#leftpannel div#help img.ico_help{float:left; margin:5px;} -div#leftpannel div#help div.content{ - float:right; - width:125px; + * html div#sheets { + height: 400px; } -div#leftpannel div#help div.content p.title{color:#fff;font-weight:bold;font-size:10.5pt;margin:6pt 0 3px 0;} -div#leftpannel div#help div.content p.title_down{color:#383838;font-size:8pt;margin:0;} -div#leftpannel div#help div.content ul{margin:10px 0;padding:0;} -div#leftpannel div#help div.content ul li{clear:both;padding-bottom:5px;list-style-type:none;} -div#leftpannel div#help div.content ul li img, - div#leftpannel div#help div.content ul li a{ float:left; } -div#leftpannel div#help div.content ul li a{ - display:block; - margin-left:6px; + #sheets div.sheet{ + /*display:none;*/ + padding:1em; + width:650px; +} + + div#buttons{ + clear:both; + margin:0 0 0 295px; + height:70px; + width:650px; +} + * html div#buttons { + margin-bottom:60px; + margin-top:-30px; + } + #btNext {float:right;} + +ul#footer{ + margin-top:5px; + list-style-type:none; + text-align:center; + margin-bottom:2px; color:#fff; - font-weight:bold; - line-height:17px; - vertical-align:middle; - text-decoration:underline; } + +/* **************************************************************************** + generics styles +**************************************************************************** */ +body{ + font:normal 13px/18px Arial, Helvetica, sans-serif; + color:#333; + background:#e1e2e2; +} + +/* title */ +h1 {font-size:24px;} +h2 { + padding-bottom:20px; + font-size:18px; +} +h3 { + padding-bottom:20px; + font-size:16px; +} +h4 { + padding-bottom:20px; + font-size:14px; +} + +/* text */ +p {padding-bottom:20px;} +#sheets ul { + margin-left: 15px; + padding-bottom:20px; + list-style-type:square; +} + +/* link */ +a, a:active, a:visited { + color:#d41958; + text-decoration:none; +} + a:hover {text-decoration:underline;} + +sup.required {color: red;} + +/*buttons */ + + +/* form */ +input.button { + padding:0 30px; + height:31px; + line-height:31px; + color:#fff; + text-shadow:0 1px 0 #0d7903; + background:#039701 url(img/bt.png) repeat-x 0 0; + border:1px solid #ccc; + -moz-border-radius: 5px; + -webkit-border-radius:5px; + border-radius: 5px; + box-shadow:0 1px #666; +} + input.button:hover { + background:#039701 url(img/bt-hover.png) repeat-x 0 0; + cursor:pointer; +} + input#btBack { + color:#666; + text-shadow:0 1px 0 #fff; + background-image:url(img/bt_off.png); +} + input#btBack:hover {background-image:url(img/bt_off_hover.png);} + +input.button.disabled { + color:#666; + text-shadow:0 1px 0 #fff; + background:#ccc url(img/bt-dsbl.png) repeat-x 0 0; +} + +input.text { + padding:0 6px; + height:22px; + width:218px;/* 230 */ + background:#fff img(img/bg-input-text.png) repeat-x 0 0; + border:1px solid #ccc; +} +select { + width: 232px; + border:1px solid #ccc; +} + +div.field { + padding:10px 0; + border-bottom:1px solid #ccc; +} + div.field label { + display:inline-block; + width:190px; + vertical-align: top; +} + div.field label.radiolabel {width:auto;} + div.field span.contentinput { + display:inline-block; + width:245px; + vertical-align: top; +} + div.field .userInfos { + display:inline-block; + width:200px; + font-size:11px; + font-style:italic; + color:#999; +} + +.okBlock { + padding:20px 20px 20px 38px; + background:#b7e2a7 url(img/pict_ok.png) no-repeat 15px 21px; + border:1px solid #85c10c; +} + +.errorBlock { + padding:20px 20px 20px 38px; + background:#ffebe8 url(img/pict_error.png) no-repeat 15px 21px; + border:1px solid #cc0000; +} + +.infosBlock { + padding:14px 25px 14px 35px; + font-weight:normal; + font-size:13px; + line-height:18px; + background:#f8f8f8 url(img/pict_h3_infos.png) no-repeat 10px 13px; + border:1px solid #ccc; +} + +.okBlock h1, +.okBlock h2, +.okBlock h3, +.errorBlock h1, +.errorBlock h2, +.errorBlock h3, +.infosBlock h1, +.infosBlock h2, +.infosBlock h3 { + padding-bottom:5px; +} + + +/* **************************************************************************** + HEADER +**************************************************************************** */ +#header #headerLinks {float:right;} + #header #headerLinks li { + display:inline-block; + padding:0 12px; + vertical-align: top; + background:transparent url(img/bg-li-headerLinks.png) no-repeat right 2px; +} + #header #headerLinks li.last {background:none;} + #header #headerLinks li a { + color:#fff; + text-decoration:none; +} + #header #headerLinks li a:hover {text-decoration:underline;} + #header #headerLinks #phone_block { + padding:0 0 0 46px; + line-height:14px; + color:#fff; + text-shadow:0 1px 0 #333; + background:transparent url(img/bg-phone_block.png) no-repeat 0 0; +} + #header #headerLinks #phone_block div { + padding:7px 15px 8px 0; + background:transparent url(img/bg-phone_block.png) no-repeat right top; +} + +#header #PrestaShopLogo { + float:left; + margin:5px 0 0 10px; + height: 51px; + width: 192px; + text-indent: -5000px; + background:transparent url(img/logo.png) no-repeat 0 0; +} + +#header #infosSup { + display:none; + float:left; + margin:10px 0 0 50px; +} + + +/* **************************************************************************** + LEFTPANEL +**************************************************************************** */ +div#leftpannel div#help{display:none;} + ol#tabs{ list-style-type:none; margin:0; padding:0; } + ol#tabs li{ + padding:9px 0 9px 16px; + font-size:14px; + color:#adadad; + } + ol#tabs li.selected{ + color:#000; + background : url(img/bg-li-tabs.png) no-repeat 1px 15px; + } + ol#tabs li.finished{ + color:#78a531; + background : url(img/bg-li-tabs-finished.png) no-repeat 0 12px; + } -ol#tabs li{ - background-color:#CFE5BD; - font-size:1em; - height:25px; - padding-top:10px; - clear:both; - background-color:#699d0f; - color:white; + +/* **************************************************************************** + FOOTER +**************************************************************************** */ +ul#footer li { + display:inline; font-weight:bold; + font-size:12px; + color:#666; } -ol#tabs li.selected{ - background : url(img/bg-tab.png) repeat-x; - height:36px; - padding-top:23px; +ul#footer a:link, ul#footer a:active, ul#footer a:visited { + color:#666; + text-decoration:none; } - -ol#tabs li.finished{ - font-weight:normal; -} -ol#tabs li span { - display:block; - padding-left:20px; - margin-left:20px; - height:18px; -} - -ol#tabs li span.number1 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/01-gd100.png', sizingMethod='crop'); -} -html>body ol#tabs li.selected span.number1 { - filter: none; - background: url('img/01-pt100.png') no-repeat; + ul#footer a:hover{ + color:#333; + text-decoration:underline; } -ol#tabs li.selected span.number1 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/01-gd100.png', sizingMethod='crop'); +/* **************************************************************************** + SHEET +**************************************************************************** */ +#sheets div.sheet { + display: none; + padding: 14px; + width: 650px; } -html>body ol#tabs li.selected span.number1 { - filter: none; - background: url('img/01-gd100.png') no-repeat; -} - - - -ol#tabs li.finished span.number1 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/01-pt70.png', sizingMethod='crop'); -} -html>body ol#tabs li.finished span.number1 { - filter: none; - background: url('img/01-pt70.png') no-repeat; -} - -ol#tabs li span.number2 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/02-pt100.png', sizingMethod='crop'); -} -html>body ol#tabs li span.number2 { - filter: none; - background: url('img/02-pt100.png') no-repeat; -} - - - -ol#tabs li.selected span.number2 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/02-gd100.png', sizingMethod='crop'); -} -html>body ol#tabs li.selected span.number2 { - filter: none; - background: url('img/02-gd100.png') no-repeat; -} - - -ol#tabs li.finished span.number2 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/02-pt70.png', sizingMethod='crop'); -} -html>body ol#tabs li.finished span.number2 { - filter: none; - background: url('img/02-pt70.png') no-repeat; -} - -ol#tabs li span.number3 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/03-pt100.png', sizingMethod='crop'); -} -html>body ol#tabs li span.number3 { - filter: none; - background: url('img/03-pt100.png') no-repeat; -} - -ol#tabs li.selected span.number3 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/03-gd100.png', sizingMethod='crop'); -} -html>body ol#tabs li.selected span.number3 { - filter: none; - background: url('img/03-gd100.png') no-repeat; -} - -ol#tabs li.finished span.number3 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/03-pt70.png', sizingMethod='crop'); -} -html>body ol#tabs li.finished span.number3 { - filter: none; - background: url('img/03-pt70.png') no-repeat; -} - -ol#tabs li span.number4 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/04-pt100.png', sizingMethod='crop'); -} -html>body ol#tabs li span.number4 { - filter: none; - background: url('img/04-pt100.png') no-repeat; -} - -ol#tabs li.selected span.number4 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/04-gd100.png', sizingMethod='crop'); -} -html>body ol#tabs li.selected span.number4 { - filter: none; - background: url('img/04-gd100.png') no-repeat; -} - -ol#tabs li.finished span.number4 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/04-pt70.png', sizingMethod='crop'); -} -html>body ol#tabs li.finished span.number4 { - filter: none; - background: url('img/04-pt70.png') no-repeat; -} - -ol#tabs li span.number5 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/05-pt100.png', sizingMethod='crop'); -} -html>body ol#tabs li span.number5 { - filter: none; - background: url('img/05-pt100.png') no-repeat; -} - -ol#tabs li.selected span.number5 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/05-gd100.png', sizingMethod='crop'); -} -html>body ol#tabs li.selected span.number5 { - filter: none; - background: url('img/05-gd100.png') no-repeat; -} - -ol#tabs li.finished span.number5 { - background:none; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/05-pt70.png', sizingMethod='crop'); -} -html>body ol#tabs li.finished span.number5 { - filter: none; - background: url('img/05-pt70.png') no-repeat; -} - -div#sheets { - float:left; - background-color:white; - margin-top:15px; - min-height:400px; - -} -* html div#sheets { - height: 400px; -} - -#sheets div.sheet{ - display:none; - width:650px; - padding:1em; -} - -h1{ - color:#7EB423; - margin:0; - text-align:center; -} - -h2{ - color:#7EB423; - font-size:1.3em; - margin:0pt 0pt 0.5em; - text-transform:uppercase; - font-weight:bold; -} - -h3{ - color:#d41958; - margin:2em 0; - font-size:0.9em; -} -p{ - margin : 0.5em 0; -} - #sheets div#sheet_lang{ display:block; } - -ul#langList { - list-style-type:none; + .sheet .contentTitle { + position:absolute; + top:90px; + left:0; + padding:15px 25px 10px 38px; + height:28px;/* 53 */ + width:927px;/* 990 */ + background:transparent url(img/bg-contentTitle.png) repeat-x 0 0; } - -ul#langList img { - margin:0 2px; + .sheet .contentTitle .stepList { + position:absolute; + top:7px; + right:20px; + list-style-type:none !important; } + .sheet .contentTitle .stepList li { + float:left; + height:42px; + width:42px; + text-indent:-5000px; + background:transparent url(img/bg_li_stepList.png) no-repeat 0 0; + } + .sheet .contentTitle .stepList li.ok {background-position:0 -50px;} + .sheet .contentTitle .stepList li.ko {background-position:0 -100px;} -input.button { - background:transparent url(img/bt.png) no-repeat scroll 0%; - border:medium none; - color:white; - font-size:0.97em; + li.title { + margin:0; font-weight:bold; - margin:0pt 0.1em; - height:26px; - width:177px; - padding-bottom:0.3em; -} -input.button.little{ - background : url(img/boutonpt-on.png) no-repeat; - height:23px; - width:102px; } -input.button:hover { - background : url(img/bt-hover.png) no-repeat; +/* INSTALLATION ***************************************************************************** */ +/* ETAPE 1 - lang ********************************************************** */ +#formSetMethod {padding-bottom:20px;} + #formSetMethod p {padding-bottom:0;} + +ul#langList {list-style-type:none;} + +/* ETAPE 2 - required ******************************************************* */ +#sheet_require #req_bt_refresh {float:right;} +#sheet_require #btTestDB {float:right;} + +/*h3#resultConfig { + padding:20px 20px 20px 38px; + background:#ffebe8 url(img/pict_error.png) no-repeat 15px 21px; + border:1px solid #cc0000; +}*/ + +ul#required, +ul#optional {list-style-type:none;} + ul#required li, + ul#optional li { + padding:6px 8px 4px 8px; + background:#f8f8f8; } -input.button.little:hover{ - background : url(img/boutonpt-over.png) no-repeat; + ul#required li.title, + ul#optional li.title { + margin-top: 20px; + padding:4px 8px; + background:#f8f8f8 url(img/bg_li_title.png) repeat-x 0 0; +} + ul#required li.required , + ul#optional li.optional{ + border-top:1px solid #fff; + border-bottom:1px solid #ccc; +} + ul#required li.ok, + ul#optional li.ok{ + background:#f8f8f8 url(img/pict_ok.png) no-repeat 100% 10px; +} + ul#required li.fail, + ul#optional li.fail { + background:#f8f8f8 url(img/pict_error.png) no-repeat 100% 8px; } -input.button.disabled { - background : url(img/bt-dsbl.png) no-repeat; -} -input.button.little.disabled{ - background : url(img/boutonpt-disabled.png) no-repeat; +/* ETAPE 3 - DB ************************************************************* */ +#sheet_db { + padding:0 !important; + width:678px !important; } - -label.disabled, p.disabled{ - color:gray; +#formCheckSQL p, +#mailSMTPParam p { + /* + USELESS + padding:10px 0; + border-top:1px solid #fff; + border-bottom:1px solid #ccc;*/ +} +#formCheckSQL p.first {border-top:none;} +#formCheckSQL p.last {border-bottom:none;} +/*USELESS #formCheckSQL p#dbResultCheck {border:none;}*/ +#formCheckSQL p label, +#mailSMTPParam p label { + display:inline-block; + width:230px; } -input.text { - border:1px gray solid; - width:175px; -} -input.text.required { - border-color:#D41958; +#dbPart, +#dbTableParam, +#mailPart { + margin-bottom:15px; + padding:14px; + width:650px; + background:#f8f8f8; } -div#buttons{ - clear:both; - margin-right:2px; - margin-bottom:0px; - margin-top:0px; - text-align:right; - height:70px; -} - -* html div#buttons { - margin-bottom:60px; - margin-top:-30px; -} - -div#buttons input{ - margin-top :5px; - margin-left :5px; -} - -div#sheet_require ul, div#sheet_require_update ul{ - list-style-type:none; -} - -div#sheets .ok{ - padding-left: 20px; - background: url(img/ok.gif) left no-repeat; -} - -div#sheets .fail{ - font-weight:bold; - padding-left: 20px; - background: url(img/bad.gif) left no-repeat; - color:#D41958; -} - -.userInfos{ - color:gray; +#mailSMTPParam {margin-bottom:10px;} + #mailSMTPParam #configsmtp span { + padding-left:15px; + font-size:11px; font-style:italic; - font-size:0.85em; -} -p.userInfos.aligned{ - margin-left:160px; + color:#999; } -div#mailSMTPParam{ - display:none; -} - -img#uploadedImage{ - border:3px dashed #E0E0E0; - margin:auto; - padding:3px; -} -ul#footer{ - margin-top:5px; - list-style-type:none; - text-align:center; - font-size:0.7em; - margin-bottom:2px; - color:white; -} -ul#footer li{ - display:inline; -} - -ul#footer a:link, ul#footer a:active, ul#footer a:visited{ - text-decoration:none; - color:white; -} -ul#footer a:hover{ - color:#7eb423; +#mailPart .userInfos { + padding-left:18px; + font-size:11px; + font-style:italic; + color:#999; } -label.aligned{ - width:245px; - float:left; - display:block; - text-align:right; - margin-right:1em; +/* ETAPE 4 - infos ********************************************************* */ +#sheet_infos { + padding:0 !important; + width:678px !important; } -input.aligned{ - margin-left:258px; -} -* html input.aligned{ - margin-left:0; -} -span.aligned{ - margin-left:258px; -} -div.field { - margin-bottom:1.5em; -} -span.result{ - display:none; -} -div#disclaimerDivCertify{ - text-align:center; -} -div#updateLog{ - height:200px; - width:100%; - border:gray 1px dashed; - overflow:auto; - display:none; -} - -table#resultInstall{ - width:100%; - margin:10px auto 5px auto; +#contentInfosNotification { + padding-left:190px; border:none; } -table#resultInstall td{ - border-bottom:3px solid #FFF; - background:#F5FFE4; - padding:5px; -} -table#resultInstall td.label{ - width:35%; - text-align:right; -} -table#resultInstall td.resultEnd{width:65%;color:#D41956;font-weight:bold;} -p#alignedLogo{ - text-align:center; +#contentInfosNotification label { + width:auto; + font-size:11px; } -form.aligned{ - border:1px dashed gray; +#infosShopBlock, +#benefitsBlock { + margin-bottom:15px; + padding:14px; + width:650px; + background:#f8f8f8; +} + +#inputFileLogo {margin-left:190px;} + +.moduleTable { + padding: 5px; + width: 650px; + background:#fff; + border: 1px solid #CCC; + border-bottom:none; +} + .moduleTable tr { + border-bottom: 1px solid #CCC; +} + .moduleTable th { + font-size:13; + color:#000; + text-shadow:0 1px 0 #fff; + background:#cfcfcf url(img/bg_moduleTable_th.png) repeat-x 0 0; +} + .moduleTable .field { + padding:10px 0; + border-bottom:none; +} + .moduleTable .field label { + display:inline-block; + padding-left:10px; + width:180px;/* 190 */ +} + .moduleTable .field label.radiolabel {width:auto;} + .moduleTable .field span.contentinput { + display:inline-block; + width:245px; + font-size: 11px; + font-style:italic; + color:#999; +} + +#paypal_uk_form_form_dateOfEstablishment_year, +#paypal_de_form_dateOfEstablishment_year, +#paypal_es_form_dateOfEstablishment_year, +#paypal_it_form_dateOfEstablishment_year, +#paypal_gb_form_dateOfEstablishment_year, +#paypal_se_form_dateOfEstablishment_year, +#paypal_fr_form_dateOfEstablishment_year + +#moneybookers_uk_form_dateOfBirth_year, +#moneybookers_de_form_dateOfBirth_year, +#moneybookers_es_form_dateOfBirth_year, +#moneybookers_it_form_dateOfBirth_year, +#moneybookers_gb_form_dateOfBirth_year, +#moneybookers_se_form_dateOfBirth_year, +#moneybookers_fr_form_dateOfBirth_year { + margin-right:10px; + width:60px !important; +} + +#paypal_uk_form_dateOfEstablishment_month, +#paypal_uk_form_dateOfEstablishment_day, +#paypal_de_form_dateOfEstablishment_month, +#paypal_de_form_dateOfEstablishment_day, +#paypal_es_form_dateOfEstablishment_month, +#paypal_es_form_dateOfEstablishment_day, +#paypal_it_form_dateOfEstablishment_month, +#paypal_it_form_dateOfEstablishment_day, +#paypal_gb_form_dateOfEstablishment_month, +#paypal_gb_form_dateOfEstablishment_day, +#paypal_se_form_dateOfEstablishment_month, +#paypal_se_form_dateOfEstablishment_day, + +#moneybookers_uk_form_dateOfBirth_month, +#moneybookers_uk_form_dateOfBirth_day, +#moneybookers_de_form_dateOfBirth_month, +#moneybookers_de_form_dateOfBirth_day, +#moneybookers_es_form_dateOfBirth_month, +#moneybookers_es_form_dateOfBirth_day, +#moneybookers_it_form_dateOfBirth_month, +#moneybookers_it_form_dateOfBirth_day, +#moneybookers_gb_form_dateOfBirth_month, +#moneybookers_gb_form_dateOfBirth_day, +#moneybookers_se_form_dateOfBirth_month, +#moneybookers_se_form_dateOfBirth_day, +#moneybookers_fr_form_dateOfBirth_month, +#moneybookers_fr_form_dateOfBirth_day { + margin-right:10px; + width:45px !important; +} + +#resultInfosPasswordRepeat {color:#cc0000;} + +/* ETAPE 5 - end *********************************************************** */ +#resultInstall {margin-bottom:25px;} + #resultInstall td {padding:7px 6px;} + #resultInstall tr.odd {background:#f8f8f8;} + #resultInstall td.resultEnd {color:#666;} + +.blockInfoEnd { + float:left; + margin:34px 20px 22px 0; padding:10px; - width:60%; + width:292px;/* 312 */ + background:#fff url(img/bg_blockInfoEnd.png) repeat-x 0 0; + border:1px solid #ccc; + -moz-border-radius: 5px; + -webkit-border-radius:5px; + border-radius: 5px; + box-shadow:0 1px #d9d9d9; +} +.blockInfoEnd.last {margin-right:0;} + .blockInfoEnd p { + font:italic 11px/14px Georgia, Arial, Sans-serif; + color:#666; +} + .blockInfoEnd img { + float:left; + margin:0 14px 5px 0; +} + .blockInfoEnd a.BO, + .blockInfoEnd a.FO { + float:right; + padding:0 0 0 12px; + height:33px; + line-height:33px; + color:#fff; + background:#039701 url(img/bg_bt_blockInfoEnd.png) no-repeat 0 0; + border:1px solid #019700; + -moz-border-radius: 5px; + -webkit-border-radius:5px; + border-radius: 5px; +} + .blockInfoEnd a.BO span , + .blockInfoEnd a.FO span { + display:inline-block; + padding:0 32px 0 0; + height:33px; + line-height:33px; + color:#fff; + background:#039701 url(img/bg_bt_blockInfoEnd.png) no-repeat 100% 0; + } + +#prestastore, +#prestastore_update { + height:170px; + width:645px; + border:1px solid #ccc; + -moz-border-radius: 5px; + -webkit-border-radius:5px; + border-radius: 5px +} + +/* MISE A JOUR ********************************************************************************* */ + +/* ETAPE 1 - disclaimer **************************************************** */ + +/* ETAPE 2 - require_update ************************************************ */ +#disclaimerDivCertify {margin-bottom:20px;} + +#upgradeProcess table { + padding: 5px; + width: 650px; + background:#fff; + border: 1px solid #CCC; + border-bottom:none; +} + #upgradeProcess tr { + border-bottom: 1px solid #CCC; +} + #upgradeProcess th, + #upgradeProcess td{padding:3px 5px;} + #upgradeProcess th { + font-size:13; + color:#000; + text-shadow:0 1px 0 #fff; + background:#cfcfcf url(img/bg_moduleTable_th.png) repeat-x 0 0; +} + +#upgradeProcess .infosBlock { margin:20px 0; -} -form.aligned p{ -height:30px; -} -form.aligned label { - display:block; - width:150px; - float:left; -} -form.aligned input.text { - display:block; - width:150px; - float:left; + padding:14px 25px; + background:#F8F8F8; } -p.aligned{ - text-align:center; +ul#required_update, +ul#optional_update {list-style-type:none;} + ul#required_update li, + ul#optional_update li { + padding:6px 8px 4px 8px; + background:#f8f8f8; } -li.title{ + ul#required_update li.title, + ul#optional_update li.title { + margin-top: 20px; + padding:4px 8px; + background:#f8f8f8 url(img/bg_li_title.png) repeat-x 0 0; +} + ul#required_update li.required , + ul#optional_update li.optional{ + border-top:1px solid #fff; + border-bottom:1px solid #ccc; +} + ul#required_update li.fail, + ul#optional_update li.fail { + background:#f8f8f8 url(img/pict_error.png) no-repeat 100% 8px; + } + ul#required_update li.ok, + ul#optional_update li.ok{ + background:#f8f8f8 url(img/pict_ok.png) no-repeat 100% 10px; + } +#sheet_require_update #req_bt_refresh_update {float:right;} + +/* ETAPE 3 - updateErrors ************************************************** */ + +/* ETAPE 4 - end_update **************************************************** */ +#updateLog { + height: 200px; + overflow: scroll; + border: 1px solid #E1E2E2; +} +#updateLog .fail { font-weight:bold; - margin:0.5em 0; + color: red; } -#infosFirstname{ - text-transform:capitalize; -} -div.request{ - border-top:1px gray dotted; - margin-top:10px; - padding-top:10px; -} -div#PrestaShopLogo{ - background:none; - width:233px; - height:68px; - text-indent:-1000px; - margin:0 auto; - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/logo.png', sizingMethod='crop'); -} -html>body div#PrestaShopLogo { - filter: none; - background: url(img/logo.png) left no-repeat; +.request { + border-bottom: 1px solid #E1E2E2; } -div.installerVersion, div.updaterVersion { - color:#FFFFFF; - font-size:14px; - text-align:left; - padding:10px; - text-transform:uppercase; -} -p#dbResultCheck{ - height:auto; -} -div#resultEnd{ - clear:both; -} +/* **************************************************************************** + xxxxx +**************************************************************************** */ + + + + + -div#noJavaScript{ - margin: 100px 200px 20px 200px; - padding: 100px 30px; - background-color: white; - text-align: center; -} -a#access, a#access_update, span#box_admin{ - display:block; - width:300px; - height:150px; - background:url('img/btn-installeur.png') top left; - font-family:Arial, sans-serif; -} -a#access:hover,a#access_update:hover{background:url('img/btn-installeur.png') bottom left;} -a#access.BO{float:left;} -a#access.FO{float:right;} -a#access span{display:block;} -a#access span.title{margin:5px 15px;font-size:18pt;font-weight:bold;color:#FFF;} -a#access span.description{margin:10px 20px;color:#FFF;height:63px;} -a#access span.message{margin-left:20px;font-weight:bold;color:#FFF;} -a#access_update{float:left;} -a#access_update span{display:block;} -a#access_update span.title{margin:5px 15px;font-size:18pt;font-weight:bold;color:#FFF;} -a#access_update span.description{margin:10px 20px;color:#FFF;height:63px;} -a#access_update span.message{margin-left:20px;font-weight:bold;color:#FFF;} -h3.no-margin{margin:0;} -iframe#prestastore{width:100%;height:430px;border:none;margin:0px;} -iframe#prestastore_update{clear:both;width:100%;height:430px;border:none;margin-top:15px;} -p#php5_nok { - color:#fff; -} -p#php5_nok a { - color:#fff; - font-weight:bold; - text-decoration:underline; -} -#resultConfigHelper a{ - text-decoration:underline; -} -#phone_block{ - font-size: 16px; - color: #fff; - height: 25px; - width: 225px; - margin-left: 3px; -} -#phone_block span{ - font-size: 11px; - display: block; - width: 185px; -} -.versionInfo{ - color: #D41958; -} \ No newline at end of file diff --git a/install-dev/xml/checkConfig.php b/install-dev/xml/checkConfig.php index 1b4ce6068..3b098eebd 100644 --- a/install-dev/xml/checkConfig.php +++ b/install-dev/xml/checkConfig.php @@ -26,7 +26,7 @@ */ header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date dans le passé -include_once(INSTALL_PATH.'/classes/ConfigurationTest.php'); +include_once(INSTALL_PATH.'/../classes/ConfigurationTest.php'); // Functions list to test with 'test_system' $funcs = array('fopen', 'fclose', 'fread', 'fwrite', 'rename', 'file_exists', 'unlink', 'rmdir', 'mkdir', 'getcwd', 'chdir', 'chmod'); @@ -60,6 +60,7 @@ $tests_op = array( 'gz' => false, 'mcrypt' => false, 'magicquotes' => false, + 'dom' => false, ); // Execute tests diff --git a/install-dev/xml/doUpgrade.php b/install-dev/xml/doUpgrade.php index 127a29573..dbf90cf7d 100644 --- a/install-dev/xml/doUpgrade.php +++ b/install-dev/xml/doUpgrade.php @@ -31,8 +31,15 @@ $engineType = 'ENGINE_TYPE'; if (function_exists('date_default_timezone_set')) date_default_timezone_set('Europe/Paris'); -define('_PS_MODULE_DIR_', realpath(INSTALL_PATH).'/../modules/'); -define('_PS_INSTALLER_PHP_UPGRADE_DIR_', realpath(INSTALL_PATH).'/php/'); +// if _PS_ROOT_DIR_ is defined, use it instead of "guessing" the module dir. +if (defined('_PS_ROOT_DIR_') AND !defined('_PS_MODULE_DIR_')) + define('_PS_MODULE_DIR_', _PS_ROOT_DIR_.'/modules/'); +else if (!defined('_PS_MODULE_DIR_')) + define('_PS_MODULE_DIR_', INSTALL_PATH.'/../modules/'); + +if(!defined('_PS_INSTALLER_PHP_UPGRADE_DIR_')) + define('_PS_INSTALLER_PHP_UPGRADE_DIR_', INSTALL_PATH.DIRECTORY_SEPARATOR.'php/'); + // Only if loyalty module is installed require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_module_loyalty.php'); // desactivate non-native module @@ -104,6 +111,8 @@ require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'alter_cms_block.php'); require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'alter_blocklink.php'); +require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'alter_productcomments_guest_index.php'); + require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_module_loyalty.php'); require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_module_followup.php'); @@ -122,6 +131,8 @@ require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'migrate_block_info_to_cms_block.php require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'create_multistore.php'); +require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_order_state.php'); + //old version detection global $oldversion, $logger; $oldversion = false; @@ -133,14 +144,14 @@ if (file_exists(SETTINGS_FILE) AND file_exists(DEFINES_FILE)) } else { - die(''."\n"); $logger->logError('The config/settings.inc.php file was not found.'); + die(''."\n"); } if (!file_exists(DEFINES_FILE)) { - die(''."\n"); $logger->logError('The config/settings.inc.php file was not found.'); + die(''."\n"); } include_once(SETTINGS_FILE); @@ -156,7 +167,8 @@ include_once(DEFINES_FILE); $oldversion = _PS_VERSION_; -$versionCompare = version_compare(INSTALL_VERSION, _PS_VERSION_); +$versionCompare = version_compare(INSTALL_VERSION, $oldversion); + if ($versionCompare == '-1') { $logger->logError('This installer is too old.'); @@ -164,7 +176,7 @@ if ($versionCompare == '-1') } elseif ($versionCompare == 0) { - $logger->logError('You already have the '.INSTALL_VERSION.' version.'); + $logger->logError(sprintf('You already have the %s version.',INSTALL_VERSION)); die(''."\n"); } elseif ($versionCompare === false) @@ -198,9 +210,27 @@ if (empty($upgradeFiles)) } natcasesort($upgradeFiles); $neededUpgradeFiles = array(); + +// fix : complete version number if there is not all 4 numbers +// for example replace 1.4.3 by 1.4.3.0 +// consequences : file 1.4.3.0.sql will be skipped if oldversion = 1.4.3 +// @since 1.4.4.0 +$arrayVersion = preg_split('#\.#', $oldversion); +$versionNumbers = sizeof($arrayVersion); + +if ($versionNumbers != 4) + $arrayVersion = array_pad($arrayVersion, 4, '0'); + +$oldversion = implode('.', $arrayVersion); +// end of fix + foreach ($upgradeFiles AS $version) - if (version_compare($version, _PS_VERSION_) == 1 AND version_compare(INSTALL_VERSION, $version) != -1) +{ + + if (version_compare($version, $oldversion) == 1 AND version_compare(INSTALL_VERSION, $version) != -1) $neededUpgradeFiles[] = $version; +} + if (empty($neededUpgradeFiles)) { $logger->logError('No upgrade is possible.'); diff --git a/install-dev/xml/index.php b/install-dev/xml/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/install-dev/xml/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/admin-categories-tree.js b/js/admin-categories-tree.js new file mode 100755 index 000000000..53a1dbdb4 --- /dev/null +++ b/js/admin-categories-tree.js @@ -0,0 +1,246 @@ +/* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License (OSL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/osl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +var readyToExpand = true; +var needCheckAll = false; +var needUncheckAll = false; +var interval = null; +var id = 0; +var arrayCatToExpand = new Array(); + +$(document).ready(function(){ + $("#categories-treeview").treeview({ + url : 'ajax.php', + toggle: function () { callbackToggle($(this)); }, + ajax : { + type: 'POST', + async: true, + data: { + getChildrenCategories : true, + selectedCat: selectedCat + } + } + }); + + $('#categories-treeview li#1 span').trigger('click'); + + $('#expand_all').click( function () { + expandAllCategories(); + return false; + }); + + $('#collapse_all').click( function () { + collapseAllCategories(); + return false; + }); + + $('#check_all').click( function () { + needCheckAll = true; + checkAllCategories(); + return false; + }); + + $('#uncheck_all').click( function () { + needUncheckAll = true; + uncheckAllCategories(); + return false; + }); +}); + +function callbackToggle(element) +{ + if (!element.is('.expandable')) + return false; + + if (element.children('ul').children('li.collapsable').length != 0) + closeChildrenCategories(element); +} + +function closeChildrenCategories(element) +{ + var arrayLevel = new Array(); + + if (element.children('ul').find('li.collapsable').length == 0) + return false; + + element.children('ul').find('li.collapsable').each(function() { + var level = $(this).children('span.category_level').html(); + if (arrayLevel[level] == undefined) + arrayLevel[level] = new Array(); + + arrayLevel[level].push($(this).attr('id')); + }); + + for(i=arrayLevel.length-1;i!=0;i--) + if (arrayLevel[i] != undefined) + for(j=0;j= arrayCatToExpand.length && readyToExpand) + { + if (!setCategoryToExpand()) + { + clearInterval(interval); + // delete interval value + interval = null; + readyToExpand = false; + if (needCheckAll) + { + checkAllCategories(); + needCheckAll = false; + } + else if (needUncheckAll) + { + uncheckAllCategories(); + needUncheckAll = false; + } + } + else + readyToExpand = true; + } + + if (readyToExpand) + { + if ($('li#'+arrayCatToExpand[id]+'.hasChildren').length > 0) + readyToExpand = false; + $('li#'+arrayCatToExpand[id]+'.expandable:visible span.category_label').trigger('click'); + id++; + } +} + +function collapseAllCategories() +{ + closeChildrenCategories($('li#1')); +} + +function checkAllCategories() +{ + if (needExpandAllCategories()) + expandAllCategories(); + else + { + $('input[name="categoryBox[]"]').not(':checked').each(function () { + $(this).attr('checked', 'checked'); + clickOnCategoryBox($(this)); + }); + } +} + +function uncheckAllCategories() +{ + if (needExpandAllCategories()) + expandAllCategories(); + else + { + $('input[name="categoryBox[]"]:checked').each(function () { + $(this).removeAttr('checked'); + clickOnCategoryBox($(this)); + }); + } +} + +function clickOnCategoryBox(category) +{ + if (category.is(':checked')) + { + $('select#id_category_default').append(''); + updateNbSubCategorySelected(category, true); + if ($('select#id_category_default option').length > 0) + { + $('select#id_category_default').show(); + $('#no_default_category').hide(); + } + } + else + { + $('select#id_category_default option[value='+category.val()+']').remove(); + updateNbSubCategorySelected(category, false); + if ($('select#id_category_default option').length == 0) + { + $('select#id_category_default').hide(); + $('#no_default_category').show(); + } + } +} + +function updateNbSubCategorySelected(category, add) +{ + var currentSpan = category.parent().parent().parent().children('.nb_sub_cat_selected'); + var parentNbSubCategorySelected = currentSpan.children('.nb_sub_cat_selected_value').html(); + + if (add) + var newValue = parseInt(parentNbSubCategorySelected)+1; + else + var newValue = parseInt(parentNbSubCategorySelected)-1; + + currentSpan.children('.nb_sub_cat_selected_value').html(newValue); + currentSpan.children('.nb_sub_cat_selected_word').html(selectedLabel); + + if (newValue == 0) + currentSpan.hide(); + else + currentSpan.show(); + + if (currentSpan.parent().children('.nb_sub_cat_selected').length != 0) + updateNbSubCategorySelected(currentSpan.parent().children('input'), add); +} \ No newline at end of file diff --git a/js/admin-scene-cropping.js b/js/admin-scene-cropping.js index 26654efee..fdb599b95 100644 --- a/js/admin-scene-cropping.js +++ b/js/admin-scene-cropping.js @@ -32,7 +32,7 @@ valueOfZoneEdited = null; // Last item is used to save the current zone and // allow to replace it if user cancel the editing -lastItemEdited = null; +lastEditedItem = null; /* functions called by cropping events */ diff --git a/js/admin.js b/js/admin.js index 1ae411879..be38bddce 100644 --- a/js/admin.js +++ b/js/admin.js @@ -307,7 +307,7 @@ function delAccessory(id) var inputCut = input.value.split('-'); var nameCut = name.value.split('¤'); - if (inputCut.lenght != nameCut.lenght) + if (inputCut.length != nameCut.length) return alert('Bad size'); // Reset all hidden fields diff --git a/js/jquery/accordion/index.php b/js/jquery/accordion/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/jquery/accordion/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/jquery/fancybox/index.php b/js/jquery/fancybox/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/jquery/fancybox/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/jquery/jquery-colorpicker.js b/js/jquery/jquery-colorpicker.js index 7f4189458..b2f0c8469 100644 --- a/js/jquery/jquery-colorpicker.js +++ b/js/jquery/jquery-colorpicker.js @@ -1,34 +1,12 @@ /* mColorPicker - Version: 1.0 r21 + Version: 1.0 r34 Copyright (c) 2010 Meta100 LLC. + http://www.meta100.com/ - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - Except as contained in this notice, the name(s) of the above - copyright holders shall not be used in advertising or otherwise - to promote the sale, use or other dealings in this Software - without prior written authorization. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. + Licensed under the MIT license + http://www.opensource.org/licenses/mit-license.php */ // After this script loads set: @@ -49,6 +27,8 @@ (function($){ + var $o; + $.fn.mColorPicker = function(options) { $o = $.extend($.fn.mColorPicker.defaults, options); @@ -56,13 +36,10 @@ if ($o.swatches.length < 10) $o.swatches = $.fn.mColorPicker.defaults.swatches if ($("div#mColorPicker").length < 1) $.fn.mColorPicker.drawPicker(); - this.each(function () { + if ($('#css_disabled_color_picker').length < 1) $('head').prepend(''); - $.fn.mColorPicker.drawPickerTriggers($(this)); - }); + $('.mColorPicker').live('keyup', function () { - $('.mColorPickerInput').unbind().bind('keyup', function () { - try { $(this).css({ @@ -72,6 +49,18 @@ }).trigger('change'); } catch (r) {} }); + + $('.mColorPickerTrigger').live('click', function () { + + $.fn.mColorPicker.colorShow($(this).attr('id').replace('icp_', '')); + }); + + this.each(function () { + + $.fn.mColorPicker.drawPickerTriggers($(this)); + }); + + return this; }; $.fn.mColorPicker.currentColor = false; @@ -80,9 +69,12 @@ $.fn.mColorPicker.init = { replace: '[type=color]', + index: 0, enhancedSwatches: true, - allowTransparency: true, - showLogo: true + allowTransparency: false, + checkRedraw: 'DOMUpdated', // Change to 'ajaxSuccess' for ajax only or false if not needed + liveEvents: false, + showLogo: false }; $.fn.mColorPicker.defaults = { @@ -101,18 +93,29 @@ ] }; + $.fn.mColorPicker.liveEvents = function() { + + $.fn.mColorPicker.init.liveEvents = true; + + if ($.fn.mColorPicker.init.checkRedraw && $.fn.mColorPicker.init.replace) { + + $(document).bind($.fn.mColorPicker.init.checkRedraw + '.mColorPicker', function () { + + $('input[data-mcolorpicker!="true"]').filter(function() { + + return ($.fn.mColorPicker.init.replace == '[type=color]')? this.getAttribute("type") == 'color': $(this).is($.fn.mColorPicker.init.replace); + }).mColorPicker(); + }); + } + }; + $.fn.mColorPicker.drawPickerTriggers = function ($t) { - if ($t[0].nodeName.toLowerCase() != 'input') return false - if ($t.data('mColorPicker') == 'true') return false + if ($t[0].nodeName.toLowerCase() != 'input') return false; - var id = $t.attr('id'), - currentTime = new Date(), + var id = $t.attr('id') || 'color_' + $.fn.mColorPicker.init.index++, hidden = false; - if (id == '') id = $t.attr('name'); - if (id == '') id = 'color_' + Math.round(Math.random() * currentTime.getTime()); - $t.attr('id', id); if ($t.attr('text') == 'hidden' || $t.attr('data-text') == 'hidden') hidden = true; @@ -126,7 +129,7 @@ $('body').append(''); $('span#color_work_area').append($t.clone(true)); - colorPicker = $('span#color_work_area').html().replace(/type=[^a-z]*color[^a-z]*/gi, (hidden)? 'type="hidden"': 'type="text"'); + colorPicker = $('span#color_work_area').html().replace(/type="color"/gi, '').replace(/input /gi, (hidden)? 'input type="hidden"': 'input type="text"'); $('span#color_work_area').html('').remove(); $t.after( (hidden)? ' ': '' @@ -138,7 +141,11 @@ 'background-color': color, 'background-image': image, 'display': 'inline-block' - }); + }).attr( + 'class', $('#' + id).attr('class') + ).addClass( + 'mColorPickerTrigger' + ); } else { $('#' + id).css({ @@ -147,14 +154,15 @@ }).css({ 'color': $.fn.mColorPicker.textColor($('#' + id).css('background-color')) }).after( - '' + '' ).addClass('mColorPickerInput'); } - $('#icp_' + id).bind('click', function () { + $('#icp_' + id).attr('data-mcolorpicker', 'true'); - $.fn.mColorPicker.colorShow(id, hidden); - }).data('mColorPicker', 'true'); + $('#' + id).addClass('mColorPicker'); + + return $('#' + id); }; $.fn.mColorPicker.drawPicker = function () { @@ -164,7 +172,7 @@ ).css( 'display','none' ).html( - '
' + '
' ).appendTo("body"); $(document.createElement("div")).attr("id","mColorPickerBg").css({ @@ -186,7 +194,7 @@ 'color':'#fff', 'z-index':999998, 'width':'194px', - 'height':'157px', + 'height':'184px', 'font-size':'12px', 'font-family':'times' }); @@ -259,19 +267,13 @@ if ($.fn.mColorPicker.init.allowTransparency) $('#mColorPickerFooter').prepend('transparent'); if ($.fn.mColorPicker.init.showLogo) $('#mColorPickerFooter').prepend('Meta100 - Designing Fun'); - $("#mColorPickerBg").click(function() { + $("#mColorPickerBg").click($.fn.mColorPicker.closePicker); - $("#mColorPickerBg").hide(); - $("#mColorPicker").fadeOut() - }); - - var swatch = ($.fn.mColorPicker.init.enhancedSwatches)? $.fn.mColorPicker.getCookie('swatches'): $o.swatches, + var swatch = $.fn.mColorPicker.getCookie('swatches'), i = 0; - if (swatch == null) swatch = $o.swatches; - else swatch = swatch.split('||'); - - if (swatch.length < 10) swatch = $o.swatches; + if (typeof swatch == 'string') swatch = swatch.split('||'); + if (swatch == null || $.fn.mColorPicker.init.enhancedSwatches || swatch.length < 10) swatch = $o.swatches; $(".mPastColor").each(function() { @@ -279,7 +281,14 @@ }); }; - $.fn.mColorPicker.colorShow = function (id, updateInput) { + $.fn.mColorPicker.closePicker = function () { + + $(".mColor, .mPastColor, #mColorPickerInput, #mColorPickerWrapper").unbind(); + $("#mColorPickerBg").hide(); + $("#mColorPicker").fadeOut() + }; + + $.fn.mColorPicker.colorShow = function (id) { var $e = $("#icp_" + id); pos = $e.offset(), @@ -290,6 +299,8 @@ $d = $(document), $m = $("#mColorPicker"); + if ($i.attr('disabled')) return false; + // KEEP COLOR PICKER IN VIEWPORT if (pickerTop + $m.height() > $d.height()) pickerTop = pos.top - $m.height(); if (pickerLeft + $m.width() > $d.width()) pickerLeft = pos.left - $m.width() + $e.outerWidth(); @@ -317,12 +328,13 @@ $('#colorPreview').css('background', def); $('#color').val(def); - if (updateInput) $.fn.mColorPicker.currentColor = $e.css('background-color'); + if ($('#' + id).attr('data-text')) $.fn.mColorPicker.currentColor = $e.css('background-color'); else $.fn.mColorPicker.currentColor = $i.css('background-color'); if (hex == 'true') $.fn.mColorPicker.currentColor = $.fn.mColorPicker.RGBtoHex($.fn.mColorPicker.currentColor); $("#mColorPickerInput").val($.fn.mColorPicker.currentColor); + $('.mColor, .mPastColor').bind('mousemove', function(e) { var offset = $(this).offset(); @@ -334,7 +346,7 @@ else if ($(this).attr('id') == 'mColorPickerTransparent') $.fn.mColorPicker.color = 'transparent'; else if (!$(this).hasClass('mPastColor')) $.fn.mColorPicker.color = $.fn.mColorPicker.whichColor(e.pageX - offset.left, e.pageY - offset.top + (($(this).attr('id') == 'mColorPickerImgGray')? 128: 0), hex); - $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.color, updateInput); + $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.color); }).click(function() { $.fn.mColorPicker.colorPicked(id); @@ -345,32 +357,29 @@ try { $.fn.mColorPicker.color = $('#mColorPickerInput').val(); - $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.color, updateInput); + $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.color); - if (e.which == 13) { - $.fn.mColorPicker.colorPicked(id); - } + if (e.which == 13) $.fn.mColorPicker.colorPicked(id); } catch (r) {} + }).bind('blur', function () { - $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.currentColor, updateInput); + $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.currentColor); }); $('#mColorPickerWrapper').bind('mouseleave', function () { - $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.currentColor, updateInput); + $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.currentColor); }); }; - $.fn.mColorPicker.setInputColor = function (id, color, updateInput) { + $.fn.mColorPicker.setInputColor = function (id, color) { var image = (color == 'transparent')? "url('" + $o.imageFolder + "grid.gif')": '', textColor = $.fn.mColorPicker.textColor(color); - if (updateInput) $("#icp_" + id).css({'background-color': color, 'background-image': image}); + if ($('#' + id).attr('data-text') || $('#' + id).attr('text')) $("#icp_" + id).css({'background-color': color, 'background-image': image}); $("#" + id).val(color).css({'background-color': color, 'background-image': image, 'color' : textColor}).trigger('change'); - if(typeof(employeePage) != 'undefined') - $('body').css('background-color', color); $("#mColorPickerInput").val(color); }; @@ -401,9 +410,7 @@ $.fn.mColorPicker.colorPicked = function (id) { - $(".mColor, .mPastColor, #mColorPickerInput, #mColorPickerWrapper").unbind(); - $("#mColorPickerBg").hide(); - $("#mColorPicker").fadeOut(); + $.fn.mColorPicker.closePicker(); if ($.fn.mColorPicker.init.enhancedSwatches) $.fn.mColorPicker.addToSwatch(); @@ -539,35 +546,18 @@ if (c.length < 6) c = c.substr(0, 1) + c.substr(0, 1) + c.substr(1, 1) + c.substr(1, 1) + c.substr(2, 1) + c.substr(2, 1); return 'rgb(' + parseInt(c.substr(0, 2), 16) + ', ' + parseInt(c.substr(2, 2), 16) + ', ' + parseInt(c.substr(4, 2), 16) + ')'; - } - - if ($.fn.mColorPicker.init.replace == '[type=color]') { + }; $(document).ready(function () { - $('input').filter(function(index) { + if ($.fn.mColorPicker.init.replace) { - return this.getAttribute("type") == 'color'; - }).mColorPicker(); + $('input[data-mcolorpicker!="true"]').filter(function() { - $(document).bind('ajaxSuccess', function () { - - $('input').filter(function(index) { - - return this.getAttribute("type") == 'color'; + return ($.fn.mColorPicker.init.replace == '[type=color]')? this.getAttribute("type") == 'color': $(this).is($.fn.mColorPicker.init.replace); }).mColorPicker(); - }); - }); - } else if ($.fn.mColorPicker.init.replace) { - $(document).ready(function () { - - $('input' + $.fn.mColorPicker.init.replace).mColorPicker(); - - $(document).bind('ajaxSuccess', function () { - - $('input' + $.fn.mColorPicker.init.replace).mColorPicker(); - }); - }); + $.fn.mColorPicker.liveEvents(); } -})(jQuery); + }); +})(jQuery); \ No newline at end of file diff --git a/js/jquery/jquery.cluetip.js b/js/jquery/jquery.cluetip.js index fa7cc0725..dd4a4752c 100644 --- a/js/jquery/jquery.cluetip.js +++ b/js/jquery/jquery.cluetip.js @@ -15,7 +15,7 @@ ;(function($){var $cluetip,$cluetipInner,$cluetipOuter,$cluetipTitle,$cluetipArrows,$dropShadow,imgCount;$.fn.cluetip=function(js,options){if(typeof js=='object'){options=js;js=null;} return this.each(function(index){var $this=$(this);var opts=$.extend(false,{},$.fn.cluetip.defaults,options||{},$.metadata?$this.metadata():$.meta?$this.data():{});var cluetipContents=false;var cluezIndex=parseInt(opts.cluezIndex,10)-1;var isActive=false,closeOnDelay=0;if(!$('#cluetip').length){$cluetipInner=$('
');$cluetipTitle=$('

');$cluetipOuter=$('
').append($cluetipInner).prepend($cluetipTitle);$cluetip=$('
').css({zIndex:opts.cluezIndex}).append($cluetipOuter).append('
')[insertionType](insertionElement).hide();$('
').css({position:'absolute',zIndex:cluezIndex-1}).insertBefore('#cluetip').hide();$cluetip.css({position:'absolute',zIndex:cluezIndex});$cluetipOuter.css({position:'relative',zIndex:cluezIndex+1});$cluetipArrows=$('
').css({zIndex:cluezIndex+1}).appendTo('#cluetip');} -var dropShadowSteps=(opts.dropShadow)?+opts.dropShadowSteps:0;if(!$dropShadow){$dropShadow=$([]);for(var i=0;i
').css({zIndex:cluezIndex-i-1,opacity:.1,top:1+i,left:1+i}));};$dropShadow.css({position:'absolute',backgroundColor:'#000'}).prependTo($cluetip);} +var dropShadowSteps=(opts.dropShadow)?+opts.dropShadowSteps:0;if(!$dropShadow){$dropShadow=$([]);for(var i=0;i0&&opts.p wHeight=$(window).height();if(js){$cluetipInner.html(js);cluetipShow(pY);} else if(tipParts){var tpl=tipParts.length;for(var i=0;i'+tipParts[i]+'
');}};cluetipShow(pY);} else if(!opts.local&&tipAttribute.indexOf('#')!=0){if(cluetipContents&&opts.ajaxCache){$cluetipInner.html(cluetipContents);cluetipShow(pY);} -else{var ajaxSettings=opts.ajaxSettings;ajaxSettings.url=tipAttribute;ajaxSettings.beforeSend=function(){$cluetipOuter.children().empty();if(opts.waitImage){$('#cluetip-waitimage').css({top:mouseY+20,left:mouseX+20}).show();}};ajaxSettings.error=function(){if(isActive){$cluetipInner.html('sorry, the contents could not be loaded');}};ajaxSettings.success=function(data){cluetipContents=opts.ajaxProcess(data);if(isActive){$cluetipInner.html(cluetipContents);}};ajaxSettings.complete=function(){imgCount=$('#cluetip-inner img').length;if(imgCount&&!$.browser.opera){$('#cluetip-inner img').load(function(){imgCount--;if(imgCount<1){$('#cluetip-waitimage').hide();if(isActive)cluetipShow(pY);}});}else{$('#cluetip-waitimage').hide();if(isActive)cluetipShow(pY);}};$.ajax(ajaxSettings);}}else if(opts.local){var $localContent=$(tipAttribute+':first');var localCluetip=$.fn.wrapInner?$localContent.wrapInner('
').children().clone(true):$localContent.html();$.fn.wrapInner?$cluetipInner.empty().append(localCluetip):$cluetipInner.html(localCluetip);cluetipShow(pY);}};var cluetipShow=function(bpY){$cluetip.addClass('cluetip-'+ctClass);if(opts.truncate){var $truncloaded=$cluetipInner.text().slice(0,opts.truncate)+'...';$cluetipInner.html($truncloaded);} +else{var ajaxSettings=opts.ajaxSettings;ajaxSettings.url=tipAttribute;ajaxSettings.beforeSend=function(){$cluetipOuter.children().empty();if(opts.waitImage){$('#cluetip-waitimage').css({top:mouseY+20,left:mouseX+20}).show();}};ajaxSettings.error=function(){if(isActive){$cluetipInner.html('sorry, the contents could not be loaded');}};ajaxSettings.success=function(data){cluetipContents=opts.ajaxProcess(data);if(isActive){$cluetipInner.html(cluetipContents);}};ajaxSettings.complete=function(){imgCount=$('#cluetip-inner img').length;if(imgCount&&!$.browser.opera){$('#cluetip-inner img').load(function(){imgCount--;if(imgCount<1){$('#cluetip-waitimage').hide();if(isActive)cluetipShow(pY);}});}else{$('#cluetip-waitimage').hide();if(isActive)cluetipShow(pY);}};$.ajax(ajaxSettings);}}else if(opts.local){var $localContent=$(tipAttribute+':first');var localCluetip=$.fn.wrapInner?$localContent.wrapInner('').children().clone(true):$localContent.html();$.fn.wrapInner?$cluetipInner.empty().append(localCluetip):$cluetipInner.html(localCluetip);cluetipShow(pY);}};var cluetipShow=function(bpY){$cluetip.addClass('cluetip-'+ctClass);if(opts.truncate){var $truncloaded=$cluetipInner.text().slice(0,opts.truncate)+'...';$cluetipInner.html($truncloaded);} function doNothing(){};tipTitle?$cluetipTitle.show().html(tipTitle):(opts.showTitle)?$cluetipTitle.show().html(' '):$cluetipTitle.hide();if(opts.sticky){var $closeLink=$('');(opts.closePosition=='bottom')?$closeLink.appendTo($cluetipInner):(opts.closePosition=='title')?$closeLink.prependTo($cluetipTitle):$closeLink.prependTo($cluetipInner);$closeLink.click(function(){cluetipClose();return false;});if(opts.mouseOutClose){if($.fn.hoverIntent&&opts.hoverIntent){$cluetip.hoverIntent({over:doNothing,timeout:opts.hoverIntent.timeout,out:function(){$closeLink.trigger('click');}});}else{$cluetip.hover(doNothing,function(){$closeLink.trigger('click');});}}else{$cluetip.unbind('mouseout');}} var direction='';$cluetipOuter.css({overflow:defHeight=='auto'?'visible':'auto',height:defHeight});tipHeight=defHeight=='auto'?Math.max($cluetip.outerHeight(),$cluetip.height()):parseInt(defHeight,10);tipY=posY;baseline=sTop+wHeight;if(opts.positionBy=='fixed'){tipY=posY-opts.dropShadowSteps+tOffset;}else if((posXmouseX)||opts.positionBy=='bottomTop'){if(posY+tipHeight+tOffset>baseline&&mouseY-sTop>tipHeight+tOffset){tipY=mouseY-tipHeight-tOffset;direction='top';}else{tipY=mouseY+tOffset;direction='bottom';}}else if(posY+tipHeight+tOffset>baseline){tipY=(tipHeight>=wHeight)?sTop:baseline-tipHeight-tOffset;}else if($this.css('display')=='block'||$this[0].tagName.toLowerCase()=='area'||opts.positionBy=="mouse"){tipY=bpY-tOffset;}else{tipY=posY-opts.dropShadowSteps;} if(direction==''){posX/g,'').replace(/<(link|title)(.|\s)*?\/(link|title)>/g,'');return data;},ajaxSettings:{dataType:'html'},debug:false};var insertionType='appendTo',insertionElement='body';$.cluetip={};$.cluetip.setup=function(options){if(options&&options.insertionType&&(options.insertionType).match(/appendTo|prependTo|insertBefore|insertAfter/)){insertionType=options.insertionType;} -if(options&&options.insertionElement){insertionElement=options.insertionElement;}};})(jQuery); +if(options&&options.insertionElement){insertionElement=options.insertionElement;}};})(jQuery); \ No newline at end of file diff --git a/js/jquery/treeview/jquery.treeview.async.js b/js/jquery/treeview/jquery.treeview.async.js new file mode 100755 index 000000000..541bbe134 --- /dev/null +++ b/js/jquery/treeview/jquery.treeview.async.js @@ -0,0 +1,85 @@ +/* + * Async Treeview 0.1 - Lazy-loading extension for Treeview + * + * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/ + * + * Copyright (c) 2007 Jörn Zaefferer + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + * Revision: $Id$ + * + */ + +;(function($) { + +function load(settings, root, child, container) { + function createNode(parent) { + var id_category = this.id_category; + var checked = false; + $('input[name="'+inputName+'[]"][type=hidden]').each( function () { + if ($(this).attr('value') == id_category) + { + checked = true; + $(this).remove(); + } + }); + var current = $("
  • ").attr("id", this.id_category || "").html(" " + this.name +" " + this.level_depth +" ("+this.nbSelectedSubCat+" "+selectedLabel+")").appendTo(parent); + if (this.classes) { + current.children("span").addClass(this.classes); + } + if (this.has_children > 0) { + var branch = $("
      ").hide().appendTo(current); + current.addClass("hasChildren"); + createNode.call({ + classes: "placeholder", + name: " ", + children:[] + }, branch); + branch.children().children('.nb_sub_cat_selected').remove(); + } + } + $.ajax($.extend(true, { + url: settings.url, + dataType: "json", + data: { + id_category_parent: root + }, + success: function(response) { + child.empty(); + $.each(response, createNode, [child]); + $(container).treeview({ + add: child + }); + readyToExpand = true; + } + }, settings.ajax)); +} + +var proxied = $.fn.treeview; +$.fn.treeview = function(settings) { + if (!settings.url) { + return proxied.apply(this, arguments); + } + var container = this; + if (!container.children().size()) + load(settings, "source", this, container); + var userToggle = settings.toggle; + return proxied.call(this, $.extend({}, settings, { + collapsed: true, + toggle: function() { + var $this = $(this); + if ($this.hasClass("hasChildren")) { + var childList = $this.removeClass("hasChildren").find("ul"); + load(settings, this.id, childList, container); + } + if (userToggle) { + userToggle.apply(this, arguments); + } + } + })); +}; + +})(jQuery); diff --git a/js/jquery/treeview/jquery.treeview.edit.js b/js/jquery/treeview/jquery.treeview.edit.js new file mode 100755 index 000000000..f3c580b3f --- /dev/null +++ b/js/jquery/treeview/jquery.treeview.edit.js @@ -0,0 +1,37 @@ +(function($) { + var CLASSES = $.treeview.classes; + var proxied = $.fn.treeview; + $.fn.treeview = function(settings) { + settings = $.extend({}, settings); + if (settings.add) { + return this.trigger("add", [settings.add]); + } + if (settings.remove) { + return this.trigger("remove", [settings.remove]); + } + return proxied.apply(this, arguments).bind("add", function(event, branches) { + $(branches).prev() + .removeClass(CLASSES.last) + .removeClass(CLASSES.lastCollapsable) + .removeClass(CLASSES.lastExpandable) + .find(">.hitarea") + .removeClass(CLASSES.lastCollapsableHitarea) + .removeClass(CLASSES.lastExpandableHitarea); + $(branches).find("li").andSelf().prepareBranches(settings).applyClasses(settings, $(this).data("toggler")); + }).bind("remove", function(event, branches) { + var prev = $(branches).prev(); + var parent = $(branches).parent(); + $(branches).remove(); + prev.filter(":last-child").addClass(CLASSES.last) + .filter("." + CLASSES.expandable).replaceClass(CLASSES.last, CLASSES.lastExpandable).end() + .find(">.hitarea").replaceClass(CLASSES.expandableHitarea, CLASSES.lastExpandableHitarea).end() + .filter("." + CLASSES.collapsable).replaceClass(CLASSES.last, CLASSES.lastCollapsable).end() + .find(">.hitarea").replaceClass(CLASSES.collapsableHitarea, CLASSES.lastCollapsableHitarea); + if (parent.is(":not(:has(>))") && parent[0] != this) { + parent.parent().removeClass(CLASSES.collapsable).removeClass(CLASSES.expandable) + parent.siblings(".hitarea").andSelf().remove(); + } + }); + }; + +})(jQuery); \ No newline at end of file diff --git a/js/jquery/treeview/jquery.treeview.js b/js/jquery/treeview/jquery.treeview.js new file mode 100755 index 000000000..8cc4ec9f0 --- /dev/null +++ b/js/jquery/treeview/jquery.treeview.js @@ -0,0 +1,256 @@ +/* + * Treeview 1.5pre - jQuery plugin to hide and show branches of a tree + * + * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/ + * http://docs.jquery.com/Plugins/Treeview + * + * Copyright (c) 2007 Jörn Zaefferer + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + * Revision: $Id$ + * + */ + +;(function($) { + + // TODO rewrite as a widget, removing all the extra plugins + $.extend($.fn, { + swapClass: function(c1, c2) { + var c1Elements = this.filter('.' + c1); + this.filter('.' + c2).removeClass(c2).addClass(c1); + c1Elements.removeClass(c1).addClass(c2); + return this; + }, + replaceClass: function(c1, c2) { + return this.filter('.' + c1).removeClass(c1).addClass(c2).end(); + }, + hoverClass: function(className) { + className = className || "hover"; + return this.hover(function() { + $(this).addClass(className); + }, function() { + $(this).removeClass(className); + }); + }, + heightToggle: function(animated, callback) { + animated ? + this.animate({ height: "toggle" }, animated, callback) : + this.each(function(){ + jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ](); + if(callback) + callback.apply(this, arguments); + }); + }, + heightHide: function(animated, callback) { + if (animated) { + this.animate({ height: "hide" }, animated, callback); + } else { + this.hide(); + if (callback) + this.each(callback); + } + }, + prepareBranches: function(settings) { + if (!settings.prerendered) { + // mark last tree items + this.filter(":last-child:not(ul)").addClass(CLASSES.last); + // collapse whole tree, or only those marked as closed, anyway except those marked as open + this.filter((settings.collapsed ? "" : "." + CLASSES.closed) + ":not(." + CLASSES.open + ")").find(">ul").hide(); + } + // return all items with sublists + return this.filter(":has(>ul)"); + }, + applyClasses: function(settings, toggler) { + // TODO use event delegation + this.filter(":has(>ul):not(:has(>a))").find(">span").unbind("click.treeview").bind("click.treeview", function(event) { + // don't handle click events on children, eg. checkboxes + if ( this == event.target ) + toggler.apply($(this).next()); + }).add( $("a", this) ).hoverClass(); + + if (!settings.prerendered) { + // handle closed ones first + this.filter(":has(>ul:hidden)") + .addClass(CLASSES.expandable) + .replaceClass(CLASSES.last, CLASSES.lastExpandable); + + // handle open ones + this.not(":has(>ul:hidden)") + .addClass(CLASSES.collapsable) + .replaceClass(CLASSES.last, CLASSES.lastCollapsable); + + // create hitarea if not present + var hitarea = this.find("div." + CLASSES.hitarea); + if (!hitarea.length) + hitarea = this.prepend("
      ").find("div." + CLASSES.hitarea); + hitarea.removeClass().addClass(CLASSES.hitarea).each(function() { + var classes = ""; + $.each($(this).parent().attr("class").split(" "), function() { + classes += this + "-hitarea "; + }); + $(this).addClass( classes ); + }) + } + + // apply event to hitarea + this.find("div." + CLASSES.hitarea).click( toggler ); + }, + treeview: function(settings) { + + settings = $.extend({ + cookieId: "treeview" + }, settings); + + if ( settings.toggle ) { + var callback = settings.toggle; + settings.toggle = function() { + return callback.apply($(this).parent()[0], arguments); + }; + } + + // factory for treecontroller + function treeController(tree, control) { + // factory for click handlers + function handler(filter) { + return function() { + // reuse toggle event handler, applying the elements to toggle + // start searching for all hitareas + toggler.apply( $("div." + CLASSES.hitarea, tree).filter(function() { + // for plain toggle, no filter is provided, otherwise we need to check the parent element + return filter ? $(this).parent("." + filter).length : true; + }) ); + return false; + }; + } + // click on first element to collapse tree + $("a:eq(0)", control).click( handler(CLASSES.collapsable) ); + // click on second to expand tree + $("a:eq(1)", control).click( handler(CLASSES.expandable) ); + // click on third to toggle tree + $("a:eq(2)", control).click( handler() ); + } + + // handle toggle event + function toggler() { + $(this) + .parent() + // swap classes for hitarea + .find(">.hitarea") + .swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea ) + .swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea ) + .end() + // swap classes for parent li + .swapClass( CLASSES.collapsable, CLASSES.expandable ) + .swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable ) + // find child lists + .find( ">ul" ) + // toggle them + .heightToggle( settings.animated, settings.toggle ); + if ( settings.unique ) { + $(this).parent() + .siblings() + // swap classes for hitarea + .find(">.hitarea") + .replaceClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea ) + .replaceClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea ) + .end() + .replaceClass( CLASSES.collapsable, CLASSES.expandable ) + .replaceClass( CLASSES.lastCollapsable, CLASSES.lastExpandable ) + .find( ">ul" ) + .heightHide( settings.animated, settings.toggle ); + } + } + this.data("toggler", toggler); + + function serialize() { + function binary(arg) { + return arg ? 1 : 0; + } + var data = []; + branches.each(function(i, e) { + data[i] = $(e).is(":has(>ul:visible)") ? 1 : 0; + }); + $.cookie(settings.cookieId, data.join(""), settings.cookieOptions ); + } + + function deserialize() { + var stored = $.cookie(settings.cookieId); + if ( stored ) { + var data = stored.split(""); + branches.each(function(i, e) { + $(e).find(">ul")[ parseInt(data[i]) ? "show" : "hide" ](); + }); + } + } + + // add treeview class to activate styles + this.addClass("treeview"); + + // prepare branches and find all tree items with child lists + var branches = this.find("li").prepareBranches(settings); + + switch(settings.persist) { + case "cookie": + var toggleCallback = settings.toggle; + settings.toggle = function() { + serialize(); + if (toggleCallback) { + toggleCallback.apply(this, arguments); + } + }; + deserialize(); + break; + case "location": + var current = this.find("a").filter(function() { + return this.href.toLowerCase() == location.href.toLowerCase(); + }); + if ( current.length ) { + // TODO update the open/closed classes + var items = current.addClass("selected").parents("ul, li").add( current.next() ).show(); + if (settings.prerendered) { + // if prerendered is on, replicate the basic class swapping + items.filter("li") + .swapClass( CLASSES.collapsable, CLASSES.expandable ) + .swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable ) + .find(">.hitarea") + .swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea ) + .swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea ); + } + } + break; + } + + branches.applyClasses(settings, toggler); + + // if control option is set, create the treecontroller and show it + if ( settings.control ) { + treeController(this, settings.control); + $(settings.control).show(); + } + + return this; + } + }); + + // classes used by the plugin + // need to be styled via external stylesheet, see first example + $.treeview = {}; + var CLASSES = ($.treeview.classes = { + open: "open", + closed: "closed", + expandable: "expandable", + expandableHitarea: "expandable-hitarea", + lastExpandableHitarea: "lastExpandable-hitarea", + collapsable: "collapsable", + collapsableHitarea: "collapsable-hitarea", + lastCollapsableHitarea: "lastCollapsable-hitarea", + lastCollapsable: "lastCollapsable", + lastExpandable: "lastExpandable", + last: "last", + hitarea: "hitarea" + }); + +})(jQuery); \ No newline at end of file diff --git a/js/jquery/treeview/jquery.treeview.sortable.js b/js/jquery/treeview/jquery.treeview.sortable.js new file mode 100755 index 000000000..3fddc6320 --- /dev/null +++ b/js/jquery/treeview/jquery.treeview.sortable.js @@ -0,0 +1,378 @@ +/* + * jQuery UI Sortable + * + * Copyright (c) 2008 Paul Bakaus + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI/Sortables + * + * Depends: + * ui.base.js + * + * Revision: $Id$ + */ +;(function($) { + + if (window.Node && Node.prototype && !Node.prototype.contains) { + Node.prototype.contains = function (arg) { + return !!(this.compareDocumentPosition(arg) & 16); + }; + } + + + $.widget("ui.sortableTree", $.extend($.ui.mouse, { + init: function() { + + //Initialize needed constants + var self = this, o = this.options; + this.containerCache = {}; + this.element.addClass("ui-sortableTree"); + + //Get the items + this.refresh(); + + //Let's determine the parent's offset + if(!(/(relative|absolute|fixed)/).test(this.element.css('position'))) this.element.css('position', 'relative'); + this.offset = this.element.offset(); + + //Initialize mouse events for interaction + this.mouseInit(); + + //Prepare cursorAt + if(o.cursorAt && o.cursorAt.constructor == Array) + o.cursorAt = { left: o.cursorAt[0], top: o.cursorAt[1] }; + + }, + plugins: {}, + ui: function(inst) { + return { + helper: (inst || this)["helper"], + position: (inst || this)["position"].current, + absolutePosition: (inst || this)["position"].absolute, + instance: this, + options: this.options, + element: this.element, + item: (inst || this)["currentItem"], + sender: inst ? inst.element : null + }; + }, + propagate: function(n,e,inst) { + $.ui.plugin.call(this, n, [e, this.ui(inst)]); + this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]); + }, + serialize: function(o) { + + var items = $(this.options.items, this.element).not('.ui-sortableTree-helper'); //Only the items of the sortable itself + var str = []; o = o || {}; + + items.each(function() { + var res = ($(this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/)); + if(res) str.push((o.key || res[1])+'[]='+(o.key ? res[1] : res[2])); + }); + + return str.join('&'); + + }, + toArray: function(attr) { + var items = $(this.options.items, this.element).not('.ui-sortableTree-helper'); //Only the items of the sortable itself + var ret = []; + + items.each(function() { ret.push($(this).attr(attr || 'id')); }); + return ret; + }, + enable: function() { + this.element.removeClass("ui-sortableTree-disabled"); + this.options.disabled = false; + }, + disable: function() { + this.element.addClass("ui-sortableTree-disabled"); + this.options.disabled = true; + }, + /* Be careful with the following core functions */ + intersectsWith: function(item) { + + var x1 = this.position.absolute.left - 10, x2 = x1 + 10, + y1 = this.position.absolute.top - 10, y2 = y1 + 10; + var l = item.left, r = l + item.width, + t = item.top, b = t + item.height; + + return ( l < x1 + (this.helperProportions.width / 2) // Right Half + && x2 - (this.helperProportions.width / 2) < r // Left Half + && t < y1 + (this.helperProportions.height / 2) // Bottom Half + && y2 - (this.helperProportions.height / 2) < b ); // Top Half + + }, + intersectsWithEdge: function(item) { + var y1 = this.position.absolute.top - 10, y2 = y1 + 10; + var t = item.top, b = t + item.height; + + if(!this.intersectsWith(item.item.parents(".ui-sortableTree").data("sortableTree").containerCache)) return false; + + if (!( t < y1 + (this.helperProportions.height / 2) // Bottom Half + && y2 - (this.helperProportions.height / 2) < b )) return false; // Top Half + + if(y2 > t && y1 < t) return 1; //Crosses top edge + if(y1 < b && y2 > b) return 2; //Crosses bottom edge + + return false; + + }, + refresh: function() { + this.refreshItems(); + this.refreshPositions(); + }, + refreshItems: function() { + + this.items = []; + this.containers = [this]; + var items = this.items; + var queries = [$(this.options.items, this.element)]; + + if(this.options.connectWith) { + for (var i = this.options.connectWith.length - 1; i >= 0; i--){ + var cur = $(this.options.connectWith[i]); + for (var j = cur.length - 1; j >= 0; j--){ + var inst = $.data(cur[j], 'sortableTree'); + if(inst && !inst.options.disabled) { + queries.push($(inst.options.items, inst.element)); + this.containers.push(inst); + } + }; + }; + } + + for (var i = queries.length - 1; i >= 0; i--){ + queries[i].each(function() { + $.data(this, 'sortableTree-item', true); // Data for target checking (mouse manager) + items.push({ + item: $(this), + width: 0, height: 0, + left: 0, top: 0 + }); + }); + }; + + }, + refreshPositions: function(fast) { + for (var i = this.items.length - 1; i >= 0; i--){ + if(!fast) this.items[i].height = this.items[i].item.outerHeight(); + this.items[i].top = this.items[i].item.offset().top; + }; + for (var i = this.containers.length - 1; i >= 0; i--){ + var p =this.containers[i].element.offset(); + this.containers[i].containerCache.left = p.left; + this.containers[i].containerCache.top = p.top; + this.containers[i].containerCache.width = this.containers[i].element.outerWidth(); + this.containers[i].containerCache.height= this.containers[i].element.outerHeight(); + }; + }, + destroy: function() { + + this.element + .removeClass("ui-sortableTree ui-sortableTree-disabled") + .removeData("sortableTree") + .unbind(".sortableTree"); + this.mouseDestroy(); + + for ( var i = this.items.length - 1; i >= 0; i-- ) + this.items[i].item.removeData("sortableTree-item"); + + }, + contactContainers: function(e) { + for (var i = this.containers.length - 1; i >= 0; i--){ + + if(this.intersectsWith(this.containers[i].containerCache)) { + if(!this.containers[i].containerCache.over) { + + if(this.currentContainer != this.containers[i]) { + + //When entering a new container, we will find the item with the least distance and append our item near it + var dist = 10000; var itemWithLeastDistance = null; var base = this.position.absolute.top; + for (var j = this.items.length - 1; j >= 0; j--) { + if(!this.containers[i].element[0].contains(this.items[j].item[0])) continue; + var cur = this.items[j].top; + if(Math.abs(cur - base) < dist) { + dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j]; + } + } + + itemWithLeastDistance ? this.rearrange(e, itemWithLeastDistance) : this.rearrange(e, null, this.containers[i].element); + this.propagate("change", e); //Call plugins and callbacks + this.containers[i].propagate("change", e, this); //Call plugins and callbacks + this.currentContainer = this.containers[i]; + + } + + this.containers[i].propagate("over", e, this); + this.containers[i].containerCache.over = 1; + } + } else { + if(this.containers[i].containerCache.over) { + this.containers[i].propagate("out", e, this); + this.containers[i].containerCache.over = 0; + } + } + + }; + }, + mouseStart: function(e,el) { + + if(this.options.disabled || this.options.type == 'static') return false; + + //Find out if the clicked node (or one of its parents) is a actual item in this.items + var currentItem = null, nodes = $(e.target).parents().each(function() { + if($.data(this, 'sortableTree-item')) { + currentItem = $(this); + return false; + } + }); + if($.data(e.target, 'sortableTree-item')) currentItem = $(e.target); + + if(!currentItem) return false; + if(this.options.handle) { + var validHandle = false; + $(this.options.handle, currentItem).each(function() { if(this == e.target) validHandle = true; }); + if(!validHandle) return false; + } + + this.currentItem = currentItem; + + var o = this.options; + this.currentContainer = this; + this.refresh(); + + //Create and append the visible helper + this.helper = typeof o.helper == 'function' ? $(o.helper.apply(this.element[0], [e, this.currentItem])) : this.currentItem.clone(); + if(!this.helper.parents('body').length) this.helper.appendTo("body"); //Add the helper to the DOM if that didn't happen already + this.helper.css({ position: 'absolute', clear: 'both' }).addClass('ui-sortableTree-helper'); //Position it absolutely and add a helper class + + //Prepare variables for position generation + $.extend(this, { + offsetParent: this.helper.offsetParent(), + offsets: { absolute: this.currentItem.offset() } + }); + + //Save the first time position + $.extend(this, { + position: { + current: { left: e.pageX, top: e.pageY }, + absolute: { left: e.pageX, top: e.pageY }, + dom: this.currentItem.prev()[0] + }, + clickOffset: { left: -5, top: -5 } + }); + + this.propagate("start", e); //Call plugins and callbacks + this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() }; //Save and store the helper proportions + + for (var i = this.containers.length - 1; i >= 0; i--) { + this.containers[i].propagate("activate", e, this); + } //Post 'activate' events to possible containers + + //Prepare possible droppables + if($.ui.ddmanager) $.ui.ddmanager.current = this; + if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e); + + this.dragging = true; + return true; + + }, + mouseStop: function(e) { + + if(this.newPositionAt) this.options.sortIndication.remove.call(this.currentItem, this.newPositionAt); //remove sort indicator + this.propagate("stop", e); //Call plugins and trigger callbacks + + //If we are using droppables, inform the manager about the drop + var dropped = ($.ui.ddmanager && !this.options.dropBehaviour) ? $.ui.ddmanager.drop(this, e) : false; + if(!dropped && this.newPositionAt) this.newPositionAt[this.direction == 'down' ? 'before' : 'after'](this.currentItem); //Append to element to its new position + + if(this.position.dom != this.currentItem.prev()[0]) this.propagate("update", e); //Trigger update callback if the DOM position has changed + if(!this.element[0].contains(this.currentItem[0])) { //Node was moved out of the current element + this.propagate("remove", e); + for (var i = this.containers.length - 1; i >= 0; i--){ + if(this.containers[i].element[0].contains(this.currentItem[0])) { + this.containers[i].propagate("update", e, this); + this.containers[i].propagate("receive", e, this); + } + }; + }; + + //Post events to containers + for (var i = this.containers.length - 1; i >= 0; i--){ + this.containers[i].propagate("deactivate", e, this); + if(this.containers[i].containerCache.over) { + this.containers[i].propagate("out", e, this); + this.containers[i].containerCache.over = 0; + } + } + + this.dragging = false; + if(this.cancelHelperRemoval) return false; + this.helper.remove(); + + return false; + + }, + mouseDrag: function(e) { + + //Compute the helpers position + this.position.current = { top: e.pageY + 5, left: e.pageX + 5 }; + this.position.absolute = { left: e.pageX + 5, top: e.pageY + 5 }; + + //Interconnect with droppables + if($.ui.ddmanager) $.ui.ddmanager.drag(this, e); + var intersectsWithDroppable = false; + $.each($.ui.ddmanager.droppables, function() { + if(this.isover) intersectsWithDroppable = true; + }); + + //Rearrange + if(intersectsWithDroppable) { + if(this.newPositionAt) this.options.sortIndication.remove.call(this.currentItem, this.newPositionAt); + } else { + for (var i = this.items.length - 1; i >= 0; i--) { + + if(this.currentItem[0].contains(this.items[i].item[0])) continue; + + var intersection = this.intersectsWithEdge(this.items[i]); + if(!intersection) continue; + + this.direction = intersection == 1 ? "down" : "up"; + this.rearrange(e, this.items[i]); + this.propagate("change", e); //Call plugins and callbacks + break; + } + } + + //Post events to containers + this.contactContainers(e); + + this.propagate("sort", e); //Call plugins and callbacks + this.helper.css({ left: this.position.current.left+'px', top: this.position.current.top+'px' }); // Stick the helper to the cursor + return false; + + }, + rearrange: function(e, i, a) { + if(i) { + if(this.newPositionAt) this.options.sortIndication.remove.call(this.currentItem, this.newPositionAt); + this.newPositionAt = i.item; + this.options.sortIndication[this.direction].call(this.currentItem, this.newPositionAt); + } else { + //Append + } + } + })); + + $.extend($.ui.sortableTree, { + defaults: { + items: '> *', + zIndex: 1000, + distance: 1 + }, + getter: "serialize toArray" + }); + + + +})(jQuery); diff --git a/js/tiny_mce/index.php b/js/tiny_mce/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/langs/index.php b/js/tiny_mce/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/advimage/css/index.php b/js/tiny_mce/plugins/advimage/css/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/advimage/css/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/advimage/img/index.php b/js/tiny_mce/plugins/advimage/img/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/advimage/img/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/advimage/index.php b/js/tiny_mce/plugins/advimage/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/advimage/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/advimage/js/index.php b/js/tiny_mce/plugins/advimage/js/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/advimage/js/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/advimage/langs/index.php b/js/tiny_mce/plugins/advimage/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/advimage/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/advlink/css/index.php b/js/tiny_mce/plugins/advlink/css/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/advlink/css/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/advlink/index.php b/js/tiny_mce/plugins/advlink/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/advlink/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/advlink/js/index.php b/js/tiny_mce/plugins/advlink/js/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/advlink/js/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/advlink/langs/index.php b/js/tiny_mce/plugins/advlink/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/advlink/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/contextmenu/index.php b/js/tiny_mce/plugins/contextmenu/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/contextmenu/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/fullscreen/index.php b/js/tiny_mce/plugins/fullscreen/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/fullscreen/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/index.php b/js/tiny_mce/plugins/index.php new file mode 100644 index 000000000..dce6b30f5 --- /dev/null +++ b/js/tiny_mce/plugins/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/inlinepopups/index.php b/js/tiny_mce/plugins/inlinepopups/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/inlinepopups/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.php b/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.php b/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/inlinepopups/skins/index.php b/js/tiny_mce/plugins/inlinepopups/skins/index.php new file mode 100644 index 000000000..dce6b30f5 --- /dev/null +++ b/js/tiny_mce/plugins/inlinepopups/skins/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/media/css/index.php b/js/tiny_mce/plugins/media/css/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/media/css/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/media/index.php b/js/tiny_mce/plugins/media/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/media/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/media/js/index.php b/js/tiny_mce/plugins/media/js/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/media/js/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/media/langs/index.php b/js/tiny_mce/plugins/media/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/media/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/pagebreak/index.php b/js/tiny_mce/plugins/pagebreak/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/pagebreak/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/paste/index.php b/js/tiny_mce/plugins/paste/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/paste/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/paste/js/index.php b/js/tiny_mce/plugins/paste/js/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/paste/js/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/paste/langs/index.php b/js/tiny_mce/plugins/paste/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/paste/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/preview/index.php b/js/tiny_mce/plugins/preview/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/preview/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/preview/jscripts/index.php b/js/tiny_mce/plugins/preview/jscripts/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/preview/jscripts/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/searchreplace/index.php b/js/tiny_mce/plugins/searchreplace/index.php new file mode 100644 index 000000000..dce6b30f5 --- /dev/null +++ b/js/tiny_mce/plugins/searchreplace/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/searchreplace/langs/index.php b/js/tiny_mce/plugins/searchreplace/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/searchreplace/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/style/css/index.php b/js/tiny_mce/plugins/style/css/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/style/css/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/style/index.php b/js/tiny_mce/plugins/style/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/style/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/style/js/index.php b/js/tiny_mce/plugins/style/js/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/style/js/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/style/langs/index.php b/js/tiny_mce/plugins/style/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/style/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/table/css/index.php b/js/tiny_mce/plugins/table/css/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/table/css/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/table/index.php b/js/tiny_mce/plugins/table/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/table/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/table/js/index.php b/js/tiny_mce/plugins/table/js/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/table/js/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/table/langs/index.php b/js/tiny_mce/plugins/table/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/table/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/xhtmlxtras/css/index.php b/js/tiny_mce/plugins/xhtmlxtras/css/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/xhtmlxtras/css/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/xhtmlxtras/index.php b/js/tiny_mce/plugins/xhtmlxtras/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/xhtmlxtras/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/xhtmlxtras/js/index.php b/js/tiny_mce/plugins/xhtmlxtras/js/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/xhtmlxtras/js/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/plugins/xhtmlxtras/langs/index.php b/js/tiny_mce/plugins/xhtmlxtras/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/plugins/xhtmlxtras/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/img/index.php b/js/tiny_mce/themes/advanced/img/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/img/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/index.php b/js/tiny_mce/themes/advanced/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/js/index.php b/js/tiny_mce/themes/advanced/js/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/js/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/langs/index.php b/js/tiny_mce/themes/advanced/langs/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/langs/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/skins/cirkuit/img/index.php b/js/tiny_mce/themes/advanced/skins/cirkuit/img/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/skins/cirkuit/img/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/skins/cirkuit/index.php b/js/tiny_mce/themes/advanced/skins/cirkuit/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/skins/cirkuit/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/skins/default/img/index.php b/js/tiny_mce/themes/advanced/skins/default/img/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/skins/default/img/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/skins/default/index.php b/js/tiny_mce/themes/advanced/skins/default/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/skins/default/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/skins/highcontrast/index.php b/js/tiny_mce/themes/advanced/skins/highcontrast/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/skins/highcontrast/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/skins/index.php b/js/tiny_mce/themes/advanced/skins/index.php new file mode 100644 index 000000000..dce6b30f5 --- /dev/null +++ b/js/tiny_mce/themes/advanced/skins/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/skins/o2k7/img/index.php b/js/tiny_mce/themes/advanced/skins/o2k7/img/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/skins/o2k7/img/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/advanced/skins/o2k7/index.php b/js/tiny_mce/themes/advanced/skins/o2k7/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/themes/advanced/skins/o2k7/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/themes/index.php b/js/tiny_mce/themes/index.php new file mode 100644 index 000000000..dce6b30f5 --- /dev/null +++ b/js/tiny_mce/themes/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/js/tiny_mce/utils/index.php b/js/tiny_mce/utils/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/js/tiny_mce/utils/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/localization/index.php b/localization/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/localization/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/mails/de/order_conf.html b/mails/de/order_conf.html index 1aacf8493..26354db8b 100644 --- a/mails/de/order_conf.html +++ b/mails/de/order_conf.html @@ -92,8 +92,12 @@ Lieferanschrift Rechnungsanschrift -{delivery_company}
      {delivery_firstname} {delivery_lastname}
      {delivery_address1}
      {delivery_address2}
      {delivery_city} {delivery_postal_code}
      {delivery_country} {delivery_state}
      {delivery_phone}
      {delivery_other} -{invoice_company}
      {invoice_firstname} {invoice_lastname}
      {invoice_address1}
      {invoice_address2}
      {invoice_city} {invoice_postal_code}
      {invoice_country} {invoice_state}
      {invoice_phone}
      {invoice_other} + +{delivery_block_html} + + +{invoice_block_html} + @@ -117,4 +121,4 @@ - \ No newline at end of file + diff --git a/mails/de/order_conf.txt b/mails/de/order_conf.txt index b7ec88e1a..d76a4dc40 100644 --- a/mails/de/order_conf.txt +++ b/mails/de/order_conf.txt @@ -18,24 +18,11 @@ Versand Lieferanschrift: - {delivery_company} - {delivery_firstname} {delivery_lastname} - {delivery_address1} - {delivery_address2} - {delivery_postal_code} {delivery_city} - {delivery_country} {delivery_state} - {delivery_other} + {delivery_block_txt} Rechnungsanschrift: - {invoice_company} - {invoice_vat_number} - {invoice_firstname} {invoice_lastname} - {invoice_address1} - {invoice_address2} - {invoice_postal_code} {invoice_city} - {invoice_country} {invoice_state} - {invoice_other} + {invoice_block_txt} Sie können diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. Wenn Sie ein Gast-Konto haben, können Sie Ihre Bestellung auf dieser Webseite verfolgen: {shop_url}gast-bestellverfolgung.php diff --git a/mails/en/password_query.html b/mails/en/password_query.html index 2eaaf5d1c..aa1a6f94e 100644 --- a/mails/en/password_query.html +++ b/mails/en/password_query.html @@ -30,7 +30,7 @@   - {shop_name} realised by PrestaShop™ + {shop_name} powered by PrestaShop™ diff --git a/mails/es/order_merchant_comment.html b/mails/es/order_merchant_comment.html index 836a8c4c4..e72a4f650 100644 --- a/mails/es/order_merchant_comment.html +++ b/mails/es/order_merchant_comment.html @@ -5,7 +5,34 @@ Mensaje de {shop_name} - - + + + + + + + + + + + + + + + + + + + + +
      + {shop_name} +
       
      Hola {firstname} {lastname},
       
      Mensaje de {shop_name}
       
      + Has recibido un nuevo mensaje sobre el pedido n°{id_order} : +

      + {message} +
       
      + {shop_name} desarrollado por PrestaShop™ +
      - \ No newline at end of file + diff --git a/mails/es/order_merchant_comment.txt b/mails/es/order_merchant_comment.txt index e69de29bb..fc67ac6b1 100644 --- a/mails/es/order_merchant_comment.txt +++ b/mails/es/order_merchant_comment.txt @@ -0,0 +1,10 @@ +Hola {firstname} {lastname}, + +Has recibido un mensaje sobre el pedido n°{id_order} : +{message} + +Puedes, en cualquier momento, consultar tus antiguos mensajes en Seguimiento de pedido. + + + +{shop_url} desarrollado por PrestaShop™ \ No newline at end of file diff --git a/mails/it/order_conf.html b/mails/it/order_conf.html index d565e4751..b333dc4ef 100644 --- a/mails/it/order_conf.html +++ b/mails/it/order_conf.html @@ -92,8 +92,12 @@ INDIRIZZO DI CONSEGNA INDIRIZZO DI FATTURAZIONE -{delivery_company}
      {delivery_firstname} {delivery_lastname}
      {delivery_address1}
      {delivery_address2}
      {delivery_city} {delivery_postal_code}
      {delivery_country} {delivery_state}
      {delivery_phone}
      {delivery_other} -{invoice_company}
      {invoice_vat_number}
      {invoice_firstname} {invoice_lastname}
      {invoice_address1}
      {invoice_address2}
      {invoice_city} {invoice_postal_code}
      {invoice_country} {invoice_state}
      {invoice_phone}
      {invoice_other} + +{delivery_block_html} + + +{invoice_block_html} + @@ -117,4 +121,4 @@ - \ No newline at end of file + diff --git a/mails/it/order_conf.txt b/mails/it/order_conf.txt index d7f60dded..87fcefeb3 100644 --- a/mails/it/order_conf.txt +++ b/mails/it/order_conf.txt @@ -18,24 +18,11 @@ Spedizione Indirizzo di consegna: - {delivery_company} - {delivery_firstname} {delivery_lastname} - {delivery_address1} - {delivery_address2} - {delivery_postal_code} {delivery_city} - {delivery_country} {delivery_state} - {delivery_other} + {delivery_block_html} Indirizzo di fatturazione: - {invoice_company} - {invoice_vat_number} - {invoice_firstname} {invoice_lastname} - {invoice_address1} - {invoice_address2} - {invoice_postal_code} {invoice_city} - {invoice_country} {invoice_state} - {invoice_other} + {delivery_block_html} Puoi rivedere questo ordine e scaricare la fattura dalla sezione "Cronologia ordine" del tuo account cliccando su "Il mio account" nel nostro sito web. Se hai un account ospite, puoi seguire il tuo ordine in questa pagina: {shop_url}guest-tracking.php diff --git a/modules/.htaccess b/modules/.htaccess index 7c78adc17..d6fd8d12b 100644 --- a/modules/.htaccess +++ b/modules/.htaccess @@ -1,3 +1,3 @@ - + Deny from all diff --git a/modules/authorizeaim/authorizeaim.php b/modules/authorizeaim/authorizeaim.php index 64a76ebff..832978e0b 100755 --- a/modules/authorizeaim/authorizeaim.php +++ b/modules/authorizeaim/authorizeaim.php @@ -68,7 +68,7 @@ class authorizeAIM extends PaymentModule if ($params['objOrder']->module != $this->name) return; - if ($params['objOrder']->getCurrentState() != _PS_OS_ERROR_) + if ($params['objOrder']->getCurrentState() != Configuration::get('PS_OS_ERROR')) $this->context->smarty->assign(array('status' => 'ok', 'id_order' => intval($params['objOrder']->id))); else $this->context->smarty->assign('status', 'failed'); diff --git a/modules/authorizeaim/cards/index.php b/modules/authorizeaim/cards/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/authorizeaim/cards/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/authorizeaim/de.php b/modules/authorizeaim/de.php index 99343a97d..0144eb5a8 100755 --- a/modules/authorizeaim/de.php +++ b/modules/authorizeaim/de.php @@ -2,20 +2,6 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{authorizeaim}prestashop>authorizeaim_f745351b1387473d3d2de5bfe18d3562'] = 'Fehler, bitte Kreditkarteninformationen überprüfen'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_1814fc250eea61e13aa95e81b61bf72a'] = 'Bezahlen Sie mit authorizeaim'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_442155d68aea78b4ef707796d76ca48c'] = 'Visa-Logo'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_f65943f43529e119969e533dc6f691f9'] = 'MasterCard-Logo'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_2937b5dab08029b1055b37c98a98d740'] = 'Discover-Logo'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_3b8a6fa58a71e7448c264c9dc61e6904'] = 'American Express Logo'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_1edaf23879c3b52a8df80069d2af3cef'] = 'Sichere Kreditkartenzahlung mit Authorize.net'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_f11b368cddfe37c47af9b9d91c6ba4f0'] = 'Vollständiger Name'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_a44217022190f5734b2f72ba1e4f8a79'] = 'Kartennummer'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_8c1279db4db86553e4b9682f78cf500e'] = 'Verfallsdatum'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_60a104dc50579d60cbc90158fada1dcf'] = 'CVV'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_6149e52c36edb9ee4494d5412e42eef2'] = 'die letzten drei Ziffern auf der Rückseite Ihrer Kreditkarte'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_40566b26dcc126bce704f2c1d622a6a3'] = 'Bestellung bestätigen'; -$_MODULE['<{authorizeaim}prestashop>authorizeaim_9286982d71addb45ad3a9472282f2c69'] = 'Ihre Kartennummer ist falsch'; $_MODULE['<{authorizeaim}prestashop>authorizeaim_cb313e911b15b21b57f4fc7b53058e4f'] = 'Zahlung mit Authorize.net erhalten '; $_MODULE['<{authorizeaim}prestashop>authorizeaim_20015706a8cbd457cbb6ea3e7d5dc9b3'] = 'Konfiguration aktualisiert'; $_MODULE['<{authorizeaim}prestashop>authorizeaim_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Hilfe'; @@ -30,11 +16,23 @@ $_MODULE['<{authorizeaim}prestashop>authorizeaim_756d97bb256b8580d4d71ee0c547804 $_MODULE['<{authorizeaim}prestashop>authorizeaim_0cbc6611f5540bd0809a388dc95a615b'] = 'Test'; $_MODULE['<{authorizeaim}prestashop>authorizeaim_291cdb0a8abb42484f5d44dc20540ce6'] = 'Karten:'; $_MODULE['<{authorizeaim}prestashop>authorizeaim_b17f3f4dcf653a5776792498a9b44d6a'] = 'Aktualisierungseinstellungen'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_f745351b1387473d3d2de5bfe18d3562'] = 'Fehler, bitte Kreditkarteninformationen überprüfen'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_1814fc250eea61e13aa95e81b61bf72a'] = 'Bezahlen Sie mit authorizeaim'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_442155d68aea78b4ef707796d76ca48c'] = 'Visa-Logo'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_f65943f43529e119969e533dc6f691f9'] = 'MasterCard-Logo'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_2937b5dab08029b1055b37c98a98d740'] = 'Discover-Logo'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_3b8a6fa58a71e7448c264c9dc61e6904'] = 'American Express Logo'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_1edaf23879c3b52a8df80069d2af3cef'] = 'Sichere Kreditkartenzahlung mit Authorize.net'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_f11b368cddfe37c47af9b9d91c6ba4f0'] = 'Vollständiger Name'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_a44217022190f5734b2f72ba1e4f8a79'] = 'Kartennummer'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_8c1279db4db86553e4b9682f78cf500e'] = 'Verfallsdatum'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_60a104dc50579d60cbc90158fada1dcf'] = 'CVV'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_6149e52c36edb9ee4494d5412e42eef2'] = 'die letzten drei Ziffern auf der Rückseite Ihrer Kreditkarte'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_40566b26dcc126bce704f2c1d622a6a3'] = 'Bestellung bestätigen'; +$_MODULE['<{authorizeaim}prestashop>authorizeaim_9286982d71addb45ad3a9472282f2c69'] = 'Ihre Kartennummer ist falsch'; $_MODULE['<{authorizeaim}prestashop>hookorderconfirmation_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Ihre Bestellung vom'; $_MODULE['<{authorizeaim}prestashop>hookorderconfirmation_75fbf512d744977d62599cc3f0ae2bb4'] = ' ist abgeschlossen.'; $_MODULE['<{authorizeaim}prestashop>hookorderconfirmation_30163d8fc3068e8297e7ab5bf32aec87'] = 'Ihre Bestellung wird so schnell wie möglich zugeschickt.'; $_MODULE['<{authorizeaim}prestashop>hookorderconfirmation_0db71da7150c27142eef9d22b843b4a9'] = 'Bei Fragen oder für weitere Informationen, kontaktieren Sie bitte unseren'; $_MODULE['<{authorizeaim}prestashop>hookorderconfirmation_64430ad2835be8ad60c59e7d44e4b0b1'] = 'Kunden-Support'; $_MODULE['<{authorizeaim}prestashop>hookorderconfirmation_8de637e24570c1edb0357826a2ad5aea'] = 'Wir haben ein Problem bei Ihrer Bestellung festgestellt. Wenn Sie denken, dies sei ein Fehler, können Sie an unseren'; - -?> \ No newline at end of file diff --git a/modules/authorizeaim/index.php b/modules/authorizeaim/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/authorizeaim/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/authorizeaim/validation.php b/modules/authorizeaim/validation.php index 5470d565a..1bb4716fa 100755 --- a/modules/authorizeaim/validation.php +++ b/modules/authorizeaim/validation.php @@ -77,9 +77,9 @@ else $authorizeaim = new authorizeaim(); $message = $response[3]; if ($response[0] == 1) - $authorizeaim->validateOrder((int)$cart->id, _PS_OS_PAYMENT_, (float)$response[9], $authorizeaim->displayName, $message, NULL, NULL, false, $customer->secure_key); + $authorizeaim->validateOrder((int)$cart->id, Configuration::get('PS_OS_PAYMENT'), (float)$response[9], $authorizeaim->displayName, $message, NULL, NULL, false, $customer->secure_key); else - $authorizeaim->validateOrder((int)$cart->id, _PS_OS_ERROR_, (float)$response[9], $authorizeaim->displayName, $message, NULL, NULL, false, $customer->secure_key); + $authorizeaim->validateOrder((int)$cart->id, Configuration::get('PS_OS_ERROR'), (float)$response[9], $authorizeaim->displayName, $message, NULL, NULL, false, $customer->secure_key); Tools::redirect('index.php?controller=order-confirmation&id_module='.(int)$authorizeaim->id.'&id_cart='.(int)$cart->id.'&key='.$customer->secure_key); } diff --git a/modules/bankwire/bankwire.php b/modules/bankwire/bankwire.php index 0fa4a3b61..d72b1e59b 100644 --- a/modules/bankwire/bankwire.php +++ b/modules/bankwire/bankwire.php @@ -206,7 +206,7 @@ class BankWire extends PaymentModule $context = Context::getContext(); $state = $params['objOrder']->getCurrentState(); - if ($state == _PS_OS_BANKWIRE_ OR $state == _PS_OS_OUTOFSTOCK_) + if ($state == Configuration::get('PS_OS_BANKWIRE') OR $state == Configuration::get('PS_OS_OUTOFSTOCK')) $context->smarty->assign(array( 'total_to_pay' => Tools::displayPrice($params['total_to_pay'], $params['currencyObj'], false), 'bankwireDetails' => Tools::nl2br($this->details), diff --git a/modules/bankwire/de.php b/modules/bankwire/de.php index ceeb94c8a..d4de8455a 100644 --- a/modules/bankwire/de.php +++ b/modules/bankwire/de.php @@ -2,6 +2,25 @@ global $_MODULE; $_MODULE = array(); +$_MODULE['<{bankwire}prestashop>bankwire_85ee0d0492a4e37e6c183520f5d59c40'] = 'Banküberweisung'; +$_MODULE['<{bankwire}prestashop>bankwire_f652b92eefd4ecfe61ef5fb118157a05'] = 'Zahlungen per Banküberweisung annehmen'; +$_MODULE['<{bankwire}prestashop>bankwire_69a1a3ad8dd5da6db3c4da838a0cf9c7'] = 'Sind Sie sicher, dass Sie Ihre Details löschen möchten?'; +$_MODULE['<{bankwire}prestashop>bankwire_f05d09f37c9a02f0737c1e71142028a9'] = 'Kontoinhaber und Details müssen konfiguriert werden, um dieses Modul korrekt zu nutzen'; +$_MODULE['<{bankwire}prestashop>bankwire_4402acab1c8f90dcf4a31dc96833bd86'] = 'Keine Währung für dieses Modul eingestellt'; +$_MODULE['<{bankwire}prestashop>bankwire_bfa43217dfe8261ee7cb040339085677'] = 'Konto-Details erforderlich.'; +$_MODULE['<{bankwire}prestashop>bankwire_ccab155f173ac76f79eb192703f86b18'] = 'Kontoinhaber erforderlich.'; +$_MODULE['<{bankwire}prestashop>bankwire_444bcb3a3fcf8389296c49467f27e1d6'] = 'ok'; +$_MODULE['<{bankwire}prestashop>bankwire_c888438d14855d7d96a2724ee9c306bd'] = 'Einstellungen aktualisiert'; +$_MODULE['<{bankwire}prestashop>bankwire_fcec4d73cccd149a2d18695fd8785f88'] = 'Dieses Modul ermöglicht Ihnen Zahlungen per Banküberweisung.'; +$_MODULE['<{bankwire}prestashop>bankwire_b6af2d31afe71aedcceca73cc27fec29'] = 'Wenn der Kunde diese Zahlungsmethode wählt, wird der Bestellstatus auf \"Wartet auf Zahlung\" umgestellt. '; +$_MODULE['<{bankwire}prestashop>bankwire_0daeb8f6c1874ec9442e821b524d37c1'] = 'Aus diesem Grund müssen Sie die Bestellung manuell bestätigen, sobald Sie die Überweisung erhalten.'; +$_MODULE['<{bankwire}prestashop>bankwire_5dd532f0a63d89c5af0243b74732f63c'] = 'Kontaktdetails'; +$_MODULE['<{bankwire}prestashop>bankwire_17e6954ea60d238857324fea1f10b8f3'] = 'Bitte spezifizieren Sie die Bankverbindungsdetails für Kunden.'; +$_MODULE['<{bankwire}prestashop>bankwire_857216dd1b374de9bf54068fcd78a8f3'] = 'Kontoinhaber'; +$_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'Details'; +$_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'wie Zweigstelle, IBAN-Nummer, BIC, etc.'; +$_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Bankadresse'; +$_MODULE['<{bankwire}prestashop>bankwire_b17f3f4dcf653a5776792498a9b44d6a'] = 'Aktualisierungseinstellungen'; $_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Zahlung per Banküberweisung'; $_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Zahlung per Banküberweisung (längerer Bestellvorgang)'; $_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Zahlung per Banküberweisung'; @@ -33,24 +52,3 @@ $_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f' $_MODULE['<{bankwire}prestashop>payment_return_0db71da7150c27142eef9d22b843b4a9'] = 'Bei Fragen oderfür weitere Informationen kontaktieren Sie bitte unseren'; $_MODULE['<{bankwire}prestashop>payment_return_64430ad2835be8ad60c59e7d44e4b0b1'] = 'Kundendienst'; $_MODULE['<{bankwire}prestashop>payment_return_8de637e24570c1edb0357826a2ad5aea'] = 'Bei Ihrer Bestellung ist ein Problem aufgetreten. Wenn Sie denken, dass dies ein Fehler ist, können Sie unseren kontaktieren'; -$_MODULE['<{bankwire}prestashop>bankwire_85ee0d0492a4e37e6c183520f5d59c40'] = 'Banküberweisung'; -$_MODULE['<{bankwire}prestashop>bankwire_f652b92eefd4ecfe61ef5fb118157a05'] = 'Zahlungen per Banküberweisung annehmen'; -$_MODULE['<{bankwire}prestashop>bankwire_69a1a3ad8dd5da6db3c4da838a0cf9c7'] = 'Sind Sie sicher, dass Sie Ihre Details löschen möchten?'; -$_MODULE['<{bankwire}prestashop>bankwire_f05d09f37c9a02f0737c1e71142028a9'] = 'Kontoinhaber und Details müssen konfiguriert werden, um dieses Modul korrekt zu nutzen'; -$_MODULE['<{bankwire}prestashop>bankwire_4402acab1c8f90dcf4a31dc96833bd86'] = 'Keine Währung für dieses Modul eingestellt'; -$_MODULE['<{bankwire}prestashop>bankwire_bfa43217dfe8261ee7cb040339085677'] = 'Konto-Details erforderlich.'; -$_MODULE['<{bankwire}prestashop>bankwire_ccab155f173ac76f79eb192703f86b18'] = 'Kontoinhaber erforderlich.'; -$_MODULE['<{bankwire}prestashop>bankwire_444bcb3a3fcf8389296c49467f27e1d6'] = 'ok'; -$_MODULE['<{bankwire}prestashop>bankwire_c888438d14855d7d96a2724ee9c306bd'] = 'Einstellungen aktualisiert'; -$_MODULE['<{bankwire}prestashop>bankwire_fcec4d73cccd149a2d18695fd8785f88'] = 'Dieses Modul ermöglicht Ihnen Zahlungen per Banküberweisung.'; -$_MODULE['<{bankwire}prestashop>bankwire_b6af2d31afe71aedcceca73cc27fec29'] = 'Wenn der Kunde diese Zahlungsmethode wählt, wird der Bestellstatus auf \"Wartet auf Zahlung\" umgestellt. '; -$_MODULE['<{bankwire}prestashop>bankwire_0daeb8f6c1874ec9442e821b524d37c1'] = 'Aus diesem Grund müssen Sie die Bestellung manuell bestätigen, sobald Sie die Überweisung erhalten.'; -$_MODULE['<{bankwire}prestashop>bankwire_5dd532f0a63d89c5af0243b74732f63c'] = 'Kontaktdetails'; -$_MODULE['<{bankwire}prestashop>bankwire_17e6954ea60d238857324fea1f10b8f3'] = 'Bitte spezifizieren Sie die Bankverbindungsdetails für Kunden.'; -$_MODULE['<{bankwire}prestashop>bankwire_857216dd1b374de9bf54068fcd78a8f3'] = 'Kontoinhaber'; -$_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'Details'; -$_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'wie Zweigstelle, IBAN-Nummer, BIC, etc.'; -$_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Bankadresse'; -$_MODULE['<{bankwire}prestashop>bankwire_b17f3f4dcf653a5776792498a9b44d6a'] = 'Aktualisierungseinstellungen'; - -?> \ No newline at end of file diff --git a/modules/bankwire/index.php b/modules/bankwire/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/bankwire/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/bankwire/validation.php b/modules/bankwire/validation.php index 9ff50d20c..cd85497ec 100644 --- a/modules/bankwire/validation.php +++ b/modules/bankwire/validation.php @@ -34,6 +34,17 @@ $bankwire = new BankWire(); if ($cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$bankwire->active) Tools::redirect('index.php?controller=order&step=1'); +// Check that this payment option is still available in case the customer changed his address just before the end of the checkout process +$authorized = false; +foreach (Module::getPaymentModules() as $module) + if ($module['name'] == 'bankwire') + { + $authorized = true; + break; + } +if (!$authorized) + die(Tools::displayError('This payment method is not available.')); + $customer = new Customer((int)$cart->id_customer); if (!Validate::isLoadedObject($customer)) @@ -47,6 +58,6 @@ $mailVars = array( '{bankwire_address}' => nl2br(Configuration::get('BANK_WIRE_ADDRESS')) ); -$bankwire->validateOrder($cart->id, _PS_OS_BANKWIRE_, $total, $bankwire->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key); +$bankwire->validateOrder($cart->id, Configuration::get('PS_OS_BANKWIRE'), $total, $bankwire->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key); $order = new Order($bankwire->currentOrder); Tools::redirect('index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$bankwire->id.'&id_order='.$bankwire->currentOrder.'&key='.$customer->secure_key); diff --git a/modules/birthdaypresent/de.php b/modules/birthdaypresent/de.php index ae1227973..b43e5da9d 100644 --- a/modules/birthdaypresent/de.php +++ b/modules/birthdaypresent/de.php @@ -26,5 +26,3 @@ $_MODULE['<{birthdaypresent}prestashop>birthdaypresent_3e788301a1b0ce341aa5ce15b $_MODULE['<{birthdaypresent}prestashop>birthdaypresent_f299b58558601a85c98a2d1d7867d523'] = 'Nachhaltige Aktionen: Treue- oder Kundenkarte, die nicht nur der Kommunikation zwischen Händler und Kunden dient, sondern Kunden auch Vorteile bietet (Persönliche Angebote, Ermäßigungen).'; $_MODULE['<{birthdaypresent}prestashop>birthdaypresent_d434c183a411611f50fa7e121b0f6565'] = 'Diese Operation bewegt die Kunden dazu, in IHrem Shop regelmäßig einzukaufen.'; $_MODULE['<{birthdaypresent}prestashop>birthdaypresent_d46bd07675d08116e85f8a4c7866de53'] = 'Ihr Geburtstagsgeschenk!'; - -?> \ No newline at end of file diff --git a/modules/birthdaypresent/index.php b/modules/birthdaypresent/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/birthdaypresent/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/birthdaypresent/mails/de/index.php b/modules/birthdaypresent/mails/de/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/birthdaypresent/mails/de/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/birthdaypresent/mails/en/index.php b/modules/birthdaypresent/mails/en/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/birthdaypresent/mails/en/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/birthdaypresent/mails/es/index.php b/modules/birthdaypresent/mails/es/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/birthdaypresent/mails/es/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/birthdaypresent/mails/fr/index.php b/modules/birthdaypresent/mails/fr/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/birthdaypresent/mails/fr/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/birthdaypresent/mails/index.php b/modules/birthdaypresent/mails/index.php new file mode 100644 index 000000000..dce6b30f5 --- /dev/null +++ b/modules/birthdaypresent/mails/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/birthdaypresent/mails/it/index.php b/modules/birthdaypresent/mails/it/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/birthdaypresent/mails/it/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockadvertising/de.php b/modules/blockadvertising/de.php index 06f284e50..c5dd389d6 100644 --- a/modules/blockadvertising/de.php +++ b/modules/blockadvertising/de.php @@ -2,17 +2,13 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{blockadvertising}prestashop>blockadvertising_2ce5fc289845ce826261032b9c6749ea'] = 'Werbung'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_fd4c71c948857cce596a69fbaea7426b'] = 'Werbeblock'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_a7339a98fd0ebea5ed982f92eed11c70'] = 'Fügt einen block für Werbeanzeigen hinzu'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_226ed577d0eff50725be6447bcd5a2f0'] = 'Fehler bewegt hochgeladene Datei'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_6e7be6d836003f069c00cd217660913b'] = 'Werbeblock-Konfiguration'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_93d5113a3d56b880522391fd049128f6'] = 'Werbebild'; -$_MODULE['<{blockadvertising}prestashop>blockadvertising_706bebc78ad992a07e4c1ce0f39def81'] = 'kein Bild'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_83b5a65e518c21ed0a5f2b383dd9b617'] = 'Bild löschen'; +$_MODULE['<{blockadvertising}prestashop>blockadvertising_706bebc78ad992a07e4c1ce0f39def81'] = 'kein Bild'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_8c38cf08a0d0a01bd44c682479432350'] = 'Bild ändern'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_56d9dfa26d7848a3fbcd2ae3091d38d9'] = 'Bild wird mit 155x163 gezeigt'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_9ce38727cff004a058021a6c7351a74a'] = 'Bild-Link'; $_MODULE['<{blockadvertising}prestashop>blockadvertising_f9ab05454998236921a6b0e281fae632'] = 'bestätigen'; - -?> \ No newline at end of file diff --git a/modules/blockadvertising/index.php b/modules/blockadvertising/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/blockadvertising/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockbestsellers/blockbestsellers-home.tpl b/modules/blockbestsellers/blockbestsellers-home.tpl new file mode 100644 index 000000000..95fe7cc5e --- /dev/null +++ b/modules/blockbestsellers/blockbestsellers-home.tpl @@ -0,0 +1,57 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + + +
      +

      {l s='Top sellers' mod='blockbestsellers'}

      + {if isset($best_sellers) AND $best_sellers} +
      + {assign var='liHeight' value=320} + {assign var='nbItemsPerLine' value=4} + {assign var='nbLi' value=$best_sellers|@count} + {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines} + {math equation="nbLines*liHeight" nbLines=$nbLines|ceil liHeight=$liHeight assign=ulHeight} + +

      {l s='All best sellers' mod='blockbestsellers'}

      +
      + {else} +

      {l s='No best sellers at this time' mod='blockbestsellers'}

      + {/if} +
      +
      + diff --git a/modules/blockbestsellers/blockbestsellers.php b/modules/blockbestsellers/blockbestsellers.php index 602bac997..f8cfc6aa0 100644 --- a/modules/blockbestsellers/blockbestsellers.php +++ b/modules/blockbestsellers/blockbestsellers.php @@ -105,14 +105,18 @@ class BlockBestSellers extends Module if (!$bestsellers AND !Configuration::get('PS_BLOCK_BESTSELLERS_DISPLAY')) return; $best_sellers = array(); + + if($bestsellers) foreach ($bestsellers AS $bestseller) { $bestseller['price'] = Tools::displayPrice(Product::getPriceStatic((int)($bestseller['id_product'])), $currency); $best_sellers[] = $bestseller; } + $context->smarty->assign(array( 'best_sellers' => $best_sellers, - 'mediumSize' => Image::getSize('medium'))); + 'mediumSize' => Image::getSize('medium'), + )); return $this->display(__FILE__, 'blockbestsellers.tpl'); } @@ -128,6 +132,31 @@ class BlockBestSellers extends Module $context = Context::getContext(); $context->controller->addCSS(($this->_path).'blockbestsellers.css', 'all'); } + + public function hookHome($params) + { + if (Configuration::get('PS_CATALOG_MODE')) + return ; + + global $smarty; + $currency = new Currency((int)($params['cookie']->id_currency)); + $bestsellers = ProductSale::getBestSalesLight((int)($params['cookie']->id_lang), 0, 4); + if (!$bestsellers AND !Configuration::get('PS_BLOCK_BESTSELLERS_DISPLAY')) + return; + $best_sellers = array(); + + if($bestsellers) + foreach ($bestsellers AS $bestseller) + { + $bestseller['price'] = Tools::displayPrice(Product::getPriceStatic((int)($bestseller['id_product'])), $currency); + $best_sellers[] = $bestseller; +} + + $smarty->assign(array( + 'best_sellers' => $best_sellers, + 'homeSize' => Image::getSize('home'))); + return $this->display(__FILE__, 'blockbestsellers-home.tpl'); + } } diff --git a/modules/blockbestsellers/de.php b/modules/blockbestsellers/de.php index d183a32e8..a45f93b41 100644 --- a/modules/blockbestsellers/de.php +++ b/modules/blockbestsellers/de.php @@ -2,9 +2,11 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Verkaufshits'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_eae99cd6a931f3553123420b16383812'] = 'Alle Verkaufshits'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'Momentan keine Verkaufshits'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_3cb29f0ccc5fd220a97df89dafe46290'] = 'Verkaufshits'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Mehr'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Anzeigen'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Alle Verkaufshits'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'Momentan keine Verkaufshits'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Block Verkaufshits'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_95d17a0a1b5ea2de13a3565ed400ebbb'] = 'Block mit Verkaufshits des Shops hinzufügen'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4d1ea475eaa85102e2b4e6d95da84bd'] = 'Bestätigung'; @@ -15,5 +17,6 @@ $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_00d23a76e43b46dae9ec7aa $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_b9f5c797ebbf55adccdd8539a65a0241'] = 'Deaktiviert'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_a8a670d89a6d2f3fa59942fc591011ef'] = 'Block anzeigen, auch wenn kein Produkt verfügbar ist.'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern'; - -?> \ No newline at end of file +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Verkaufshits'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_eae99cd6a931f3553123420b16383812'] = 'Alle Verkaufshits'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'Momentan keine Verkaufshits'; diff --git a/modules/blockbestsellers/es.php b/modules/blockbestsellers/es.php index b4427c102..f958aab02 100644 --- a/modules/blockbestsellers/es.php +++ b/modules/blockbestsellers/es.php @@ -2,6 +2,11 @@ global $_MODULE; $_MODULE = array(); +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_3cb29f0ccc5fd220a97df89dafe46290'] = '¡Lo más vendido!'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Más'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Ver'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Los productos más vendidos'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'No hay productos más vendidos en este momento'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Bloque de mejores ventas'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_95d17a0a1b5ea2de13a3565ed400ebbb'] = 'Añadir un bloque para mostrar las mejores ventas de la tienda'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4d1ea475eaa85102e2b4e6d95da84bd'] = 'Confirmación'; diff --git a/modules/blockbestsellers/fr.php b/modules/blockbestsellers/fr.php index 5388db49a..987f132ed 100644 --- a/modules/blockbestsellers/fr.php +++ b/modules/blockbestsellers/fr.php @@ -2,6 +2,11 @@ global $_MODULE; $_MODULE = array(); +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Plus d\'infos'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Voir'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Toutes les meilleures ventes'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'Pas encore de meilleure vente'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Bloc meilleures ventes'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_95d17a0a1b5ea2de13a3565ed400ebbb'] = 'Ajoute un bloc qui affiche les meilleures ventes de la boutique'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4d1ea475eaa85102e2b4e6d95da84bd'] = 'Confirmation'; diff --git a/modules/blockbestsellers/img/index.php b/modules/blockbestsellers/img/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/blockbestsellers/img/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockbestsellers/index.php b/modules/blockbestsellers/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/blockbestsellers/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockbestsellers/it.php b/modules/blockbestsellers/it.php index 1007b5301..4de6d3e7c 100644 --- a/modules/blockbestsellers/it.php +++ b/modules/blockbestsellers/it.php @@ -2,9 +2,11 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Migliori vendite'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_eae99cd6a931f3553123420b16383812'] = 'Tutte le migliori vendite'; -$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'Non ci sono migliori vendite in questo momento'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_3cb29f0ccc5fd220a97df89dafe46290'] = 'Migliori vendite'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Più'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_4351cfebe4b61d8aa5efa1d020710005'] = 'Visualizza'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_eae99cd6a931f3553123420b16383812'] = 'Tutte le migliori vendite'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers-home_f7be84d6809317a6eb0ff3823a936800'] = 'Non ci sono migliori vendite in questo momento'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_6232eaff79c9ccb6c1a66e5a75a212d5'] = 'Blocco migliori vendite'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_95d17a0a1b5ea2de13a3565ed400ebbb'] = 'Aggiungi un blocco che mostra le migliori vendite del negozio'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f4d1ea475eaa85102e2b4e6d95da84bd'] = 'Conferma'; @@ -15,5 +17,6 @@ $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_00d23a76e43b46dae9ec7aa $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_b9f5c797ebbf55adccdd8539a65a0241'] = 'Disattivato'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_a8a670d89a6d2f3fa59942fc591011ef'] = 'Mostra il blocco anche se nessun prodotto è disponibile.'; $_MODULE['<{blockbestsellers}prestashop>blockbestsellers_c9cc8cce247e49bae79f15173ce97354'] = 'Salva'; - -?> \ No newline at end of file +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_3cb29f0ccc5fd220a97df89dafe46290'] = 'Migliori vendite'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_eae99cd6a931f3553123420b16383812'] = 'Tutte le migliori vendite'; +$_MODULE['<{blockbestsellers}prestashop>blockbestsellers_f7be84d6809317a6eb0ff3823a936800'] = 'Non ci sono migliori vendite in questo momento'; diff --git a/modules/blockcart/de.php b/modules/blockcart/de.php index 83313e1fe..01c2fab79 100644 --- a/modules/blockcart/de.php +++ b/modules/blockcart/de.php @@ -2,6 +2,17 @@ global $_MODULE; $_MODULE = array(); +$_MODULE['<{blockcart}prestashop>blockcart_c2e1362a9710a3dd86f937c2ea1f336d'] = 'Block Warenkorb'; +$_MODULE['<{blockcart}prestashop>blockcart_e03093a5753b436ee1de63b6e3e1bd02'] = 'Fügt einen Block mit dem Warenkorb des Kunden hinzu'; +$_MODULE['<{blockcart}prestashop>blockcart_eb4ae207521bbe6403f7fe9564d38cda'] = 'Ajax: ungültige Wahl.'; +$_MODULE['<{blockcart}prestashop>blockcart_f4d1ea475eaa85102e2b4e6d95da84bd'] = 'Bestätigung'; +$_MODULE['<{blockcart}prestashop>blockcart_c888438d14855d7d96a2724ee9c306bd'] = 'Einstellungen aktualisiert'; +$_MODULE['<{blockcart}prestashop>blockcart_f4f70727dc34561dfde1a3c529b6205c'] = 'Einstellungen'; +$_MODULE['<{blockcart}prestashop>blockcart_614a8820aa4ac08ce2ee398a41b10778'] = 'Ajax-Warenkorb'; +$_MODULE['<{blockcart}prestashop>blockcart_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Aktiviert'; +$_MODULE['<{blockcart}prestashop>blockcart_b9f5c797ebbf55adccdd8539a65a0241'] = 'Deaktiviert'; +$_MODULE['<{blockcart}prestashop>blockcart_dba281afb9a38e654ea9dab4cd6cb0ca'] = 'Ajax-Modus für Warenkorb aktivieren (kompatibel mit Standardthema)'; +$_MODULE['<{blockcart}prestashop>blockcart_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern'; $_MODULE['<{blockcart}prestashop>blockcart_20351b3328c35ab617549920f5cb4939'] = 'Benutzereinstellung Nr.'; $_MODULE['<{blockcart}prestashop>blockcart_ed6e9a09a111035684bb23682561e12d'] = 'dieses Produkt aus meinem Warenkorb entfernen'; $_MODULE['<{blockcart}prestashop>blockcart_a85eba4c6c699122b2bb1387ea4813ad'] = 'Warenkorb'; @@ -19,16 +30,3 @@ $_MODULE['<{blockcart}prestashop>blockcart_96b0141273eabab320119c467cdcaf17'] = $_MODULE['<{blockcart}prestashop>blockcart_0d11c2b75cf03522c8d97938490466b2'] = 'Preise inkl. MsWst.'; $_MODULE['<{blockcart}prestashop>blockcart_41202aa6b8cf7ae885644717dab1e8b4'] = 'Preise zzgl. MsWst.'; $_MODULE['<{blockcart}prestashop>blockcart_377e99e7404b414341a9621f7fb3f906'] = 'Bestellen'; -$_MODULE['<{blockcart}prestashop>blockcart_c2e1362a9710a3dd86f937c2ea1f336d'] = 'Block Warenkorb'; -$_MODULE['<{blockcart}prestashop>blockcart_e03093a5753b436ee1de63b6e3e1bd02'] = 'Fügt einen Block mit dem Warenkorb des Kunden hinzu'; -$_MODULE['<{blockcart}prestashop>blockcart_eb4ae207521bbe6403f7fe9564d38cda'] = 'Ajax: ungültige Wahl.'; -$_MODULE['<{blockcart}prestashop>blockcart_f4d1ea475eaa85102e2b4e6d95da84bd'] = 'Bestätigung'; -$_MODULE['<{blockcart}prestashop>blockcart_c888438d14855d7d96a2724ee9c306bd'] = 'Einstellungen aktualisiert'; -$_MODULE['<{blockcart}prestashop>blockcart_f4f70727dc34561dfde1a3c529b6205c'] = 'Einstellungen'; -$_MODULE['<{blockcart}prestashop>blockcart_614a8820aa4ac08ce2ee398a41b10778'] = 'Ajax-Warenkorb'; -$_MODULE['<{blockcart}prestashop>blockcart_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Aktiviert'; -$_MODULE['<{blockcart}prestashop>blockcart_b9f5c797ebbf55adccdd8539a65a0241'] = 'Deaktiviert'; -$_MODULE['<{blockcart}prestashop>blockcart_dba281afb9a38e654ea9dab4cd6cb0ca'] = 'Ajax-Modus für Warenkorb aktivieren (kompatibel mit Standardthema)'; -$_MODULE['<{blockcart}prestashop>blockcart_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern'; - -?> \ No newline at end of file diff --git a/modules/blockcart/img/icon/index.php b/modules/blockcart/img/icon/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/blockcart/img/icon/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockcart/img/index.php b/modules/blockcart/img/index.php new file mode 100644 index 000000000..dce6b30f5 --- /dev/null +++ b/modules/blockcart/img/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockcart/index.php b/modules/blockcart/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/blockcart/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockcategories/de.php b/modules/blockcategories/de.php index 015ba55e7..2eddd9231 100644 --- a/modules/blockcategories/de.php +++ b/modules/blockcategories/de.php @@ -2,7 +2,6 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{blockcategories}prestashop>blockcategories_af1b98adf7f686b84cd0b443e022b7a0'] = 'Kategorien'; $_MODULE['<{blockcategories}prestashop>blockcategories_8f0ed7c57fca428f7e3f8e64d2f00918'] = 'Blockkategorien'; $_MODULE['<{blockcategories}prestashop>blockcategories_15a6f5841d9e4d7e62bec3319b4b7036'] = 'Fügt einen Block mit Produktkategorien hinzu'; $_MODULE['<{blockcategories}prestashop>blockcategories_23e0d4ecc25de9b2777fdaca3e2f3193'] = 'Maximale Tiefe: Ungültige Zahl.'; @@ -19,6 +18,5 @@ $_MODULE['<{blockcategories}prestashop>blockcategories_2c1199ee18b344152f35ec237 $_MODULE['<{blockcategories}prestashop>blockcategories_4f32360218e145e3ba681a2343015eb3'] = 'Anzahl der Footerspalten'; $_MODULE['<{blockcategories}prestashop>blockcategories_3d81ca758785a8528208613752ad2c81'] = 'Anzahl der Footerspalten'; $_MODULE['<{blockcategories}prestashop>blockcategories_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern'; +$_MODULE['<{blockcategories}prestashop>blockcategories_af1b98adf7f686b84cd0b443e022b7a0'] = 'Kategorien'; $_MODULE['<{blockcategories}prestashop>blockcategories_footer_af1b98adf7f686b84cd0b443e022b7a0'] = 'Kategorien'; - -?> \ No newline at end of file diff --git a/modules/blockcategories/index.php b/modules/blockcategories/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/blockcategories/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockcms/blockcms.php b/modules/blockcms/blockcms.php index a64ffa8fd..37af200d9 100755 --- a/modules/blockcms/blockcms.php +++ b/modules/blockcms/blockcms.php @@ -85,7 +85,8 @@ class BlockCms extends Module PRIMARY KEY (`id_cms_block_page`) ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8') OR !Configuration::updateValue('FOOTER_CMS', '') OR - !Configuration::updateValue('FOOTER_BLOCK_ACTIVATION', 1)) + !Configuration::updateValue('FOOTER_BLOCK_ACTIVATION', 1) OR + !Configuration::updateValue('FOOTER_POWEREDBY', 1)) return false; return true; } @@ -95,6 +96,7 @@ class BlockCms extends Module if (!parent::uninstall() OR !Configuration::deleteByName('FOOTER_CMS') OR !Configuration::deleteByName('FOOTER_BLOCK_ACTIVATION') OR + !Configuration::deleteByName('FOOTER_POWEREDBY') OR !Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'cms_block` , `'._DB_PREFIX_.'cms_block_page`, `'._DB_PREFIX_.'cms_block_lang`')) return false; return true; @@ -402,6 +404,7 @@ class BlockCms extends Module
      '.$this->l('Footer\'s various links Configuration').' +



      @@ -673,6 +676,7 @@ class BlockCms extends Module $footer .= $box.'|'; Configuration::updateValue('FOOTER_CMS', rtrim($footer, '|')); Configuration::updateValue('FOOTER_BLOCK_ACTIVATION', Tools::getValue('footer_active')); + Configuration::updateValue('FOOTER_POWEREDBY', (Tools::getValue('footer_poweredby_active') == 1 ? 1 : 0)); $this->_html = $this->displayConfirmation($this->l('Footer\'s CMS updated')); } @@ -735,7 +739,8 @@ class BlockCms extends Module 'block' => 0, 'cmslinks' => $cms_titles, 'theme_dir' => _PS_THEME_DIR_, - 'display_stores_footer' => Configuration::get('PS_STORES_DISPLAY_FOOTER') + 'display_stores_footer' => Configuration::get('PS_STORES_DISPLAY_FOOTER'), + 'display_poweredby' => ((int)Configuration::get('FOOTER_POWEREDBY') === 1 || Configuration::get('FOOTER_POWEREDBY') === false) )); return $this->display(__FILE__, 'blockcms.tpl'); } diff --git a/modules/blockcms/blockcms.tpl b/modules/blockcms/blockcms.tpl index c23058df0..c0a9337e6 100755 --- a/modules/blockcms/blockcms.tpl +++ b/modules/blockcms/blockcms.tpl @@ -56,7 +56,7 @@
    • {$cmslink.meta_title|escape:'htmlall':'UTF-8'}
      • {/if} {/foreach} -
    • {l s='Powered by' mod='blockcms'} PrestaShop™
      • + {if $display_poweredby}
    • {l s='Powered by' mod='blockcms'} PrestaShop™
      • {/if} {/if} diff --git a/modules/blockcms/de.php b/modules/blockcms/de.php index 925b6293d..cff8a8837 100644 --- a/modules/blockcms/de.php +++ b/modules/blockcms/de.php @@ -2,12 +2,6 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{blockcms}prestashop>blockcms_34c869c542dee932ef8cd96d2f91cae6'] = 'Unsere Shops'; -$_MODULE['<{blockcms}prestashop>blockcms_d1aa22a3126f04664e0fe3f598994014'] = 'Specials'; -$_MODULE['<{blockcms}prestashop>blockcms_9ff0635f5737513b1a6f559ac2bff745'] = 'Neue Produkte'; -$_MODULE['<{blockcms}prestashop>blockcms_3cb29f0ccc5fd220a97df89dafe46290'] = 'Verkaufshits'; -$_MODULE['<{blockcms}prestashop>blockcms_02d4482d332e1aef3437cd61c9bcc624'] = 'Kontaktieren Sie uns'; -$_MODULE['<{blockcms}prestashop>blockcms_7a52e36bf4a1caa031c75a742fb9927a'] = 'Powered by'; $_MODULE['<{blockcms}prestashop>blockcms_cd275312651aebf8cbbb8d3bb1c086ae'] = 'CMS-Block'; $_MODULE['<{blockcms}prestashop>blockcms_cdca12007979fc49008fd125cdb775fc'] = 'Fügt einen Block mit mehreren CMS-Links hinzu'; $_MODULE['<{blockcms}prestashop>blockcms_97390dd0b5ba7867120aee2ff22bfa38'] = 'CMS-Block-Konfiguration'; @@ -52,8 +46,11 @@ $_MODULE['<{blockcms}prestashop>blockcms_5dab5acc3c6a2a7e87e8d8926a2c763e'] = 'V $_MODULE['<{blockcms}prestashop>blockcms_138218281781fd0d938a140892d7386c'] = 'Fußzeilen-CMS erfolgreich aktualisiert'; $_MODULE['<{blockcms}prestashop>blockcms_ddd7d8a072783afaf23e5e6843398fc9'] = 'CMS-Block erfolgreich hinzugefügt'; $_MODULE['<{blockcms}prestashop>blockcms_31a22821c66edf7e3aa33ef1c8109f4c'] = 'CMS-Block erfolgreich bearbeitet'; -$_MODULE['<{blockcms}prestashop>blockcms_10432af9a9d55d5aa8b0f380194af673'] = 'Löschung erfolgreich'; $_MODULE['<{blockcms}prestashop>blockcms_be58fccb15fb119b8c3d485e3a8561c4'] = 'CMS-Block-Konfiguration'; $_MODULE['<{blockcms}prestashop>blockcms_78edb384f1a71576034e00ed6844bcc2'] = 'In dieser CMS-Kategorie gibt es nichts anzuzeigen'; - -?> \ No newline at end of file +$_MODULE['<{blockcms}prestashop>blockcms_34c869c542dee932ef8cd96d2f91cae6'] = 'Unsere Shops'; +$_MODULE['<{blockcms}prestashop>blockcms_d1aa22a3126f04664e0fe3f598994014'] = 'Specials'; +$_MODULE['<{blockcms}prestashop>blockcms_9ff0635f5737513b1a6f559ac2bff745'] = 'Neue Produkte'; +$_MODULE['<{blockcms}prestashop>blockcms_3cb29f0ccc5fd220a97df89dafe46290'] = 'Verkaufshits'; +$_MODULE['<{blockcms}prestashop>blockcms_02d4482d332e1aef3437cd61c9bcc624'] = 'Kontaktieren Sie uns'; +$_MODULE['<{blockcms}prestashop>blockcms_7a52e36bf4a1caa031c75a742fb9927a'] = 'Powered by'; diff --git a/modules/blockcms/es.php b/modules/blockcms/es.php index 640817cf2..a9da3476f 100755 --- a/modules/blockcms/es.php +++ b/modules/blockcms/es.php @@ -19,6 +19,7 @@ $_MODULE['<{blockcms}prestashop>blockcms_f2a6c498fb90ee345d997f888fce3b18'] = 'B $_MODULE['<{blockcms}prestashop>blockcms_8f08c1af47e3e9611289c1882befc3a8'] = 'No existe ningún bloque CMS'; $_MODULE['<{blockcms}prestashop>blockcms_0a40c06f34e5c794a7f0d3085d17d63a'] = 'Lista de los bloques CMS de la derecha'; $_MODULE['<{blockcms}prestashop>blockcms_965be994da393e5aa15bd3a2444c6ccf'] = 'Configuración de los links CMS a pie de página'; +$_MODULE['<{blockcms}prestashop>blockcms_32c532e462a1f85b1b103ed9989a1aba'] = 'Mostrar \"Creado por PrestaShop\"'; $_MODULE['<{blockcms}prestashop>blockcms_fab8ca8250236ed20b96f9750e1eacc7'] = 'Mostrar links a pie de página'; $_MODULE['<{blockcms}prestashop>blockcms_49ee3087348e8d44e1feda1917443987'] = 'Nombre'; $_MODULE['<{blockcms}prestashop>blockcms_c9cc8cce247e49bae79f15173ce97354'] = 'Guardar'; diff --git a/modules/blockcms/fr.php b/modules/blockcms/fr.php index 97ea4985c..8a7e192c2 100755 --- a/modules/blockcms/fr.php +++ b/modules/blockcms/fr.php @@ -19,6 +19,7 @@ $_MODULE['<{blockcms}prestashop>blockcms_f2a6c498fb90ee345d997f888fce3b18'] = 'S $_MODULE['<{blockcms}prestashop>blockcms_8f08c1af47e3e9611289c1882befc3a8'] = 'Il n\'existe aucun bloc CMS'; $_MODULE['<{blockcms}prestashop>blockcms_0a40c06f34e5c794a7f0d3085d17d63a'] = 'Liste des blocs CMS de droite'; $_MODULE['<{blockcms}prestashop>blockcms_965be994da393e5aa15bd3a2444c6ccf'] = 'Configuration des liens CMS en pied de page'; +$_MODULE['<{blockcms}prestashop>blockcms_32c532e462a1f85b1b103ed9989a1aba'] = 'Afficher \"Propulsé par PrestaShop\"'; $_MODULE['<{blockcms}prestashop>blockcms_fab8ca8250236ed20b96f9750e1eacc7'] = 'Afficher les liens de bas de page'; $_MODULE['<{blockcms}prestashop>blockcms_49ee3087348e8d44e1feda1917443987'] = 'Nom'; $_MODULE['<{blockcms}prestashop>blockcms_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer'; diff --git a/modules/blockcms/index.php b/modules/blockcms/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/blockcms/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockcurrencies/de.php b/modules/blockcurrencies/de.php index 0a9ed08ca..11647250e 100644 --- a/modules/blockcurrencies/de.php +++ b/modules/blockcurrencies/de.php @@ -2,8 +2,6 @@ global $_MODULE; $_MODULE = array(); -$_MODULE['<{blockcurrencies}prestashop>blockcurrencies_386c339d37e737a436499d423a77df0c'] = 'Währung'; $_MODULE['<{blockcurrencies}prestashop>blockcurrencies_f7a31ae8f776597d4282bd3b1013f08b'] = 'Währungsblock'; $_MODULE['<{blockcurrencies}prestashop>blockcurrencies_d06c31fa4b0b56c2a61aa4dd7b632767'] = 'Fügt einen Block zur Auswahl der Währung hinzu'; - -?> \ No newline at end of file +$_MODULE['<{blockcurrencies}prestashop>blockcurrencies_386c339d37e737a436499d423a77df0c'] = 'Währung'; diff --git a/modules/blockcurrencies/index.php b/modules/blockcurrencies/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/blockcurrencies/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockcustomerprivacy/blockcustomerprivacy.jpg b/modules/blockcustomerprivacy/blockcustomerprivacy.jpg new file mode 100644 index 000000000..31d9db63f Binary files /dev/null and b/modules/blockcustomerprivacy/blockcustomerprivacy.jpg differ diff --git a/modules/blockcustomerprivacy/blockcustomerprivacy.php b/modules/blockcustomerprivacy/blockcustomerprivacy.php new file mode 100644 index 000000000..a97ae6ec2 --- /dev/null +++ b/modules/blockcustomerprivacy/blockcustomerprivacy.php @@ -0,0 +1,169 @@ + +* @copyright 2007-2010 Prestashop SA +* @version Release: $Revision: 1.4 $ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +if (!defined('_CAN_LOAD_FILES_')) + exit; + +class blockcustomerprivacy extends Module +{ + public function __construct() + { + $this->name = 'blockcustomerprivacy'; + if (version_compare(_PS_VERSION_, '1.4.0.0') >= 0) + $this->tab = 'front_office_features'; + else + $this->tab = 'Blocks'; + $this->version = '1.0'; + $this->author = 'PrestaShop'; + $this->need_instance = 0; + + parent::__construct(); + + $this->displayName = $this->l('Block customer data privacy'); + $this->description = $this->l('Adds a block to display a message about customer data privacy.'); + } + + public function install() + { + return (parent::install() AND $this->registerHook('createAccountForm') AND Configuration::updateValue('CUSTPRIV_MESSAGE', array())); + } + + public function getContent() + { + global $cookie; + + $defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT')); + $languages = Language::getLanguages(false); + $iso = Language::getIsoById((int)$cookie->id_lang); + + if (Tools::isSubmit('submitCustPrivMess')) + { + $message_trads = array(); + foreach($_POST as $key => $value) + if (preg_match("/custpriv_message_/i", $key)) + { + $id_lang = preg_split("/custpriv_message_/i", $key); + $message_trads[(int)$id_lang[1]] = $value; + } + Configuration::updateValue('CUSTPRIV_MESSAGE', $message_trads, true); + echo '
      '.$this->l('Configuration updated').'
      '; + } + + $content = ''; + if (version_compare(_PS_VERSION_, '1.4.0.0') >= 0) + $content .= ' + + + + '; + else + { + $content .= ' + + '; + } + + $values = Configuration::getInt('CUSTPRIV_MESSAGE'); + $content .= ' +
      '.$this->displayName.' + + +
      '; + foreach ($languages as $language) + $content .= ' +
      + +
      '; + $content .= $this->displayFlags($languages, $defaultLanguage, 'ccont', 'ccont', true).' +
      +
      +

      + '.$this->l('Message that will be displayed in the account creation form.').'
      + '.$this->l('Tips: Remember that if the text is too long to be written directly in the form, you can add a link to one of your pages created via the CMS tab.').' +

      +
      +
       
      +
      + +
      + +
      '; + + return $content; + } + + public function hookCreateAccountForm($params) + { + if (!$this->active) + return ; + + global $smarty, $cookie; + + /* Languages preliminaries */ + $defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT')); + $languages = Language::getLanguages(false); + $iso = Language::getIsoById((int)($cookie->id_lang)); + + $smarty->assign(array( + 'privacy_message' => Configuration::get('CUSTPRIV_MESSAGE', (int)($cookie->id_lang)), + 'error_message' => $this->l('Please agree with the customer data privacy by ticking the checkbox below.') + )); + return $this->display(__FILE__, 'blockcustomerprivacy.tpl'); + } +} \ No newline at end of file diff --git a/modules/blockcustomerprivacy/blockcustomerprivacy.tpl b/modules/blockcustomerprivacy/blockcustomerprivacy.tpl new file mode 100644 index 000000000..9a5bd472a --- /dev/null +++ b/modules/blockcustomerprivacy/blockcustomerprivacy.tpl @@ -0,0 +1,60 @@ +{* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 6594 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + + + +
      + \ No newline at end of file diff --git a/modules/blockcustomerprivacy/config.xml b/modules/blockcustomerprivacy/config.xml new file mode 100644 index 000000000..5387544d8 --- /dev/null +++ b/modules/blockcustomerprivacy/config.xml @@ -0,0 +1,12 @@ + + + blockcustomerprivacy + + + + + + 1 + 0 + + \ No newline at end of file diff --git a/modules/blockcustomerprivacy/fr.php b/modules/blockcustomerprivacy/fr.php new file mode 100644 index 000000000..085fa0c59 --- /dev/null +++ b/modules/blockcustomerprivacy/fr.php @@ -0,0 +1,13 @@ +blockcustomerprivacy_0cec62d1bea02fbb1484d55d14f493dd'] = 'Bloc confidentialité des données clients'; +$_MODULE['<{blockcustomerprivacy}prestashop>blockcustomerprivacy_3a32ec2dbd8d955f6240d95d6004557c'] = 'Ajoute un bloc qui affiche un message concernant la confidentialité des données clients.'; +$_MODULE['<{blockcustomerprivacy}prestashop>blockcustomerprivacy_20015706a8cbd457cbb6ea3e7d5dc9b3'] = 'Configuration mise à jour'; +$_MODULE['<{blockcustomerprivacy}prestashop>blockcustomerprivacy_b75fe4f32f17eb695f145704a8909146'] = 'Message concernant la concernant la confidentialité des données clients.'; +$_MODULE['<{blockcustomerprivacy}prestashop>blockcustomerprivacy_03e6791c07164957bb87bfad5030f846'] = 'Le message sera affiché sur le formulaire de création de compte.'; +$_MODULE['<{blockcustomerprivacy}prestashop>blockcustomerprivacy_2d4e74ab9c95452f5948cd959d186b6d'] = 'Astuce : si votre texte est trop long pour être affiché entièrement sur le formulaire d\'inscription sans gêner la navigation, vous pouvez à la place indiquer un lien vers une des pages que vous avez créées via l\'onglet CMS.'; +$_MODULE['<{blockcustomerprivacy}prestashop>blockcustomerprivacy_c9cc8cce247e49bae79f15173ce97354'] = 'Sauvegarder'; +$_MODULE['<{blockcustomerprivacy}prestashop>blockcustomerprivacy_ffeb523df77567c7fad7faf8af5f7e46'] = 'Veuillez accepter nos conditions concernant la confidentialité des données clients, en cochant la case ci-dessous.'; +$_MODULE['<{blockcustomerprivacy}prestashop>blockcustomerprivacy_fb0440f9ca32a8b49eded51b09e70821'] = 'Confidentialité des données clients'; diff --git a/modules/blockcustomerprivacy/index.php b/modules/blockcustomerprivacy/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/blockcustomerprivacy/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blockcustomerprivacy/logo.gif b/modules/blockcustomerprivacy/logo.gif new file mode 100644 index 000000000..9cdb8ef3a Binary files /dev/null and b/modules/blockcustomerprivacy/logo.gif differ diff --git a/modules/blocklanguages/blocklanguages.php b/modules/blocklanguages/blocklanguages.php index 41bf11c76..0c340f47a 100644 --- a/modules/blocklanguages/blocklanguages.php +++ b/modules/blocklanguages/blocklanguages.php @@ -34,7 +34,7 @@ class BlockLanguages extends Module { $this->name = 'blocklanguages'; $this->tab = 'front_office_features'; - $this->version = 0.1; + $this->version = 1.1; $this->author = 'PrestaShop'; $this->need_instance = 0; @@ -58,15 +58,50 @@ class BlockLanguages extends Module function hookTop($params) { $languages = Language::getLanguages(true, $this->context->shop->getID()); - if (!sizeof($languages)) - return ''; + if (!count($languages)) + return; + $link = new Link(); + + if((int)Configuration::get('PS_REWRITING_SETTINGS')) + { + $default_rewrite = array(); + $phpSelf = isset($_SERVER['PHP_SELF']) ? substr($_SERVER['PHP_SELF'], strlen(__PS_BASE_URI__)) : ''; + if ($phpSelf == 'product.php' AND $id_product = (int)Tools::getValue('id_product')) + { + $rewrite_infos = Product::getUrlRewriteInformations((int)$id_product); + foreach ($rewrite_infos AS $infos) + $default_rewrite[$infos['id_lang']] = $link->getProductLink((int)$id_product, $infos['link_rewrite'], $infos['category_rewrite'], $infos['ean13'], (int)$infos['id_lang']); + } + + if ($phpSelf == 'category.php' AND $id_category = (int)Tools::getValue('id_category')) + { + $rewrite_infos = Category::getUrlRewriteInformations((int)$id_category); + foreach ($rewrite_infos AS $infos) + $default_rewrite[$infos['id_lang']] = $link->getCategoryLink((int)$id_category, $infos['link_rewrite'], $infos['id_lang']); + } + + if ($phpSelf == 'cms.php' AND ($id_cms = (int)Tools::getValue('id_cms') OR $id_cms_category = (int)Tools::getValue('id_cms_category'))) + { + $rewrite_infos = (isset($id_cms) AND !isset($id_cms_category)) ? CMS::getUrlRewriteInformations($id_cms) : CMSCategory::getUrlRewriteInformations($id_cms_category); + foreach ($rewrite_infos AS $infos) + { + $arr_link = (isset($id_cms) AND !isset($id_cms_category)) ? + $link->getCMSLink($id_cms, $infos['link_rewrite'], NULL, $infos['id_lang']) : + $link->getCMSCategoryLink($id_cms_category, $infos['link_rewrite'], $infos['id_lang']); + $default_rewrite[$infos['id_lang']] = $arr_link; + } + } + if (count($default_rewrite)) + $smarty->assign('lang_rewrite_urls', $default_rewrite); + } + $this->context->smarty->assign('languages', $languages); return $this->display(__FILE__, 'blocklanguages.tpl'); } function hookHeader($params) { - $this->context->controller->addCSS(($this->_path).'blocklanguages.css', 'all'); + $this->context->controller->addCSS($this->_path.'blocklanguages.css', 'all'); } } diff --git a/modules/blocklanguages/config.xml b/modules/blocklanguages/config.xml index c74a6415a..257be1873 100755 --- a/modules/blocklanguages/config.xml +++ b/modules/blocklanguages/config.xml @@ -2,7 +2,7 @@ blocklanguages - + diff --git a/modules/blocklanguages/de.php b/modules/blocklanguages/de.php index 61c416116..06d62bfdd 100644 --- a/modules/blocklanguages/de.php +++ b/modules/blocklanguages/de.php @@ -4,5 +4,3 @@ global $_MODULE; $_MODULE = array(); $_MODULE['<{blocklanguages}prestashop>blocklanguages_d5988791c07fedc0e2fc77683b4e61f6'] = 'Sprachblock'; $_MODULE['<{blocklanguages}prestashop>blocklanguages_2575f2a453fd18a4e74e430a80eb3540'] = 'Fügt einen Block zur Auswahl der Sprache hinzu'; - -?> \ No newline at end of file diff --git a/modules/blocklanguages/index.php b/modules/blocklanguages/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/blocklanguages/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/blocklayered/blocklayered-ajax-back.php b/modules/blocklayered/blocklayered-ajax-back.php new file mode 100644 index 000000000..adaac79e3 --- /dev/null +++ b/modules/blocklayered/blocklayered-ajax-back.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registred Trademark & Property of PrestaShop SA +*/ + +/* Getting cookie or logout */ +include(dirname(__FILE__).'/../../config/config.inc.php'); +require_once(dirname(__FILE__).'/../../init.php'); +include(dirname(__FILE__).'/blocklayered.php'); + +$blockLayered = new BlockLayered(); +echo $blockLayered->ajaxCallBackOffice((isset($_GET['categoryBox']) AND is_array($_GET['categoryBox'])) ? $_GET['categoryBox'] : array(), +(isset($_GET['id_layered_filter']) AND !empty($_GET['id_layered_filter'])) ? (int)$_GET['id_layered_filter'] : array()); \ No newline at end of file diff --git a/modules/blocklayered/blocklayered.js b/modules/blocklayered/blocklayered.js index 65a20e227..00bac519d 100644 --- a/modules/blocklayered/blocklayered.js +++ b/modules/blocklayered/blocklayered.js @@ -47,6 +47,7 @@ $(document).ready(function() }); paginationButton(); + reloadContent(); }); function paginationButton() { diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 62c648b7a..443f11c85 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -37,7 +37,7 @@ class BlockLayered extends Module { $this->name = 'blocklayered'; $this->tab = 'front_office_features'; - $this->version = 1.3; + $this->version = 1.4; $this->author = 'PrestaShop'; $this->need_instance = 0; @@ -49,11 +49,15 @@ class BlockLayered extends Module public function install() { - if ($result = parent::install() AND $this->registerHook('leftColumn') AND $this->registerHook('header') + if ($result = parent::install() AND $this->registerHook('leftColumn') AND $this->registerHook('header') AND $this->registerHook('footer') AND $this->registerHook('categoryAddition') AND $this->registerHook('categoryUpdate') AND $this->registerHook('categoryDeletion')) { - Configuration::updateValue('PS_LAYERED_NAVIGATION_CHECKBOXES', 1); + Configuration::updateValue('PS_LAYERED_SHARE', 0); + Configuration::updateValue('PS_LAYERED_HIDE_0_VALUES', 0); + Configuration::updateValue('PS_LAYERED_SHOW_QTIES', 1); + $this->rebuildLayeredStructure(); + $this->rebuildLayeredCache(); } return $result; @@ -62,7 +66,12 @@ class BlockLayered extends Module public function uninstall() { /* Delete all configurations */ - Configuration::deleteByName('PS_LAYERED_NAVIGATION_CHECKBOXES'); + Configuration::deleteByName('PS_LAYERED_SHARE'); + Configuration::deleteByName('PS_LAYERED_HIDE_0_VALUES'); + Configuration::deleteByName('PS_LAYERED_SHOW_QTIES'); + Configuration::deleteByName('PS_LAYERED_BITLY_USERNAME'); + Configuration::deleteByName('PS_LAYERED_BITLY_API_KEY'); + return parent::uninstall(); } @@ -81,12 +90,29 @@ class BlockLayered extends Module $id_parent = (int)Tools::getValue('id_category', Tools::getValue('id_category_layered', 1)); if ($id_parent == 1) return; + $context = Context::getContext(); - $context->controller->addJS(($this->_path).'blocklayered.js'); + $context->controller->addJS($this->_path.'blocklayered.js'); $context->controller->addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js'); - $context->controller->addCSS(($this->_path).'blocklayered.css', 'all'); $context->controller->addCSS(_PS_CSS_DIR_.'jquery-ui-1.8.10.custom.css', 'all'); + $context->controller->addCSS(($this->_path).'blocklayered.css', 'all'); + } + public function hookFooter($params) + { + if (basename($_SERVER['PHP_SELF']) == 'category.php') + return ' + '; } public function hookCategoryAddition($params) @@ -97,22 +123,9 @@ class BlockLayered extends Module public function hookCategoryUpdate($params) { /* The category status might (active, inactive) have changed, we have to update the layered cache table structure */ - /* if (!$params['category']->active) $this->hookCategoryDeletion($params); - else - { - $oneRow = Db::getInstance()->getRow('SELECT c'.(int)$params['category']->id.' FROM `'._DB_PREFIX_.'layered_cache`'); - if (!isset($oneRow['c'.(int)$params['category']->id])) - { - Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'layered_cache` ADD `c'.(int)$params['category']->id.'` TINYINT UNSIGNED NOT NULL DEFAULT \'0\''); - Configuration::updateValue('PS_LAYERED_COLUMNS', Configuration::get('PS_LAYERED_COLUMNS').',c'.(int)$params['category']->id); } - if (!Db::getInstance()->getRow('SELECT id_layered_category FROM `'._DB_PREFIX_.'layered_category` WHERE id_category = '.(int)$params['category']->id)) - $this->rebuildLayeredCache(array(), array((int)$params['category']->id)); - } - */ - } public function hookCategoryDeletion($params) { @@ -121,20 +134,81 @@ class BlockLayered extends Module public function getContent() { + global $cookie; + $errors = array(); $html = ''; + if (!extension_loaded('curl')) + $html .= '

      '.$this->l('You must enable cURL extension on your server if you want to use short link.').'

      '; + if (Tools::isSubmit('submitLayeredCache')) { $this->rebuildLayeredStructure(); $this->rebuildLayeredCache(); $html .= ' -
      - - '.$this->l('Layered navigation database was initialized successfully').' +
      + '.$this->l('Layered navigation database was initialized successfully').'
      '; } + elseif (Tools::isSubmit('SubmitFilter')) + { + if (isset($_POST['id_layered_filter']) AND $_POST['id_layered_filter']) + Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_filter WHERE id_layered_filter = '.(int)Tools::getValue('id_layered_filter')); + + if (Tools::getValue('scope') == 1) + { + Db::getInstance()->Execute('TRUNCATE TABLE '._DB_PREFIX_.'layered_filter'); + $categories = Db::getInstance()->ExecuteS('SELECT id_category FROM '._DB_PREFIX_.'category'); + foreach ($categories AS $category) + $_POST['categoryBox'][] = (int)$category['id_category']; + } + + if (sizeof($_POST['categoryBox'])) + { + Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_category WHERE id_category IN ('.implode(',', $_POST['categoryBox']).')'); + + $filterValues = array(); + + $sqlToInsert = 'INSERT INTO '._DB_PREFIX_.'layered_category (id_category, id_value, type, position) VALUES '; + foreach ($_POST['categoryBox'] AS $id_category_layered) + { + $n = 0; + foreach ($_POST AS $key => $value) + if (substr($key, 0, 17) == 'layered_selection' AND $value == 'on') + { + $filterValues[$key] = $value; + + $n++; + if ($key == 'layered_selection_stock') + $sqlToInsert .= '('.(int)$id_category_layered.',NULL,\'quantity\','.(int)$n.'),'; + elseif ($key == 'layered_selection_subcategories') + $sqlToInsert .= '('.(int)$id_category_layered.',NULL,\'category\','.(int)$n.'),'; + elseif ($key == 'layered_selection_condition') + $sqlToInsert .= '('.(int)$id_category_layered.',NULL,\'condition\','.(int)$n.'),'; + elseif ($key == 'layered_selection_weight_slider') + $sqlToInsert .= '('.(int)$id_category_layered.',NULL,\'weight\','.(int)$n.'),'; + elseif ($key == 'layered_selection_manufacturer') + $sqlToInsert .= '('.(int)$id_category_layered.',NULL,\'manufacturer\','.(int)$n.'),'; + elseif (substr($key, 0, 21) == 'layered_selection_ag_') + $sqlToInsert .= '('.(int)$id_category_layered.','.(int)str_replace('layered_selection_ag_', '', $key).',\'id_attribute_group\','.(int)$n.'),'; + elseif (substr($key, 0, 23) == 'layered_selection_feat_') + $sqlToInsert .= '('.(int)$id_category_layered.','.(int)str_replace('layered_selection_feat_', '', $key).',\'id_feature\','.(int)$n.'),'; + } + $filterValues['categories'] = Tools::getValue('categoryBox'); + } + Db::getInstance()->Execute(rtrim($sqlToInsert, ',')); + + $valuesToInsert = array('name' => pSQL(Tools::getValue('layered_tpl_name')), 'filters' => pSQL(serialize($filterValues)), 'n_categories' => (int)sizeof($_POST['categoryBox']), 'date_add' => date('Y-m-d H:i:s')); + if (isset($_POST['id_layered_filter']) AND $_POST['id_layered_filter']) + $valuesToInsert['id_layered_filter'] = (int)Tools::getValue('id_layered_filter'); + + Db::getInstance()->AutoExecute(_DB_PREFIX_.'layered_filter', $valuesToInsert, 'INSERT'); + + echo '
      '.$this->l('Your filter').' "'.Tools::getValue('layered_tpl_name').'" '.((isset($_POST['id_layered_filter']) AND $_POST['id_layered_filter']) ? $this->l('was updated successfully.') : $this->l('was added successfully.')).'
      '; + } + } elseif (Tools::isSubmit('submitLayeredSettings')) { if (Tools::getValue('share_url')) @@ -150,10 +224,12 @@ class BlockLayered extends Module Configuration::updateValue('PS_LAYERED_BITLY_USERNAME', Tools::getValue('bitly_username')); Configuration::updateValue('PS_LAYERED_BITLY_API_KEY', Tools::getValue('bitly_api_key')); Configuration::updateValue('PS_LAYERED_SHARE', Tools::getValue('share_url')); + Configuration::updateValue('PS_LAYERED_HIDE_0_VALUES', Tools::getValue('ps_layered_hide_0_values')); + Configuration::updateValue('PS_LAYERED_SHOW_QTIES', Tools::getValue('ps_layered_show_qties')); + $html .= ' -
      - - '.$this->l('Settings saved successfully').' +
      + '.$this->l('Settings saved successfully').'
      '; } else @@ -161,14 +237,40 @@ class BlockLayered extends Module $html .= '
      '.$this->l('Settings not saved :').'
        '; - foreach($errors as $error) + foreach($errors AS $error) $html .= '
      • '.$error.'
        • '; - $html .= '
      '; + $html .= ' +
      '; } } + elseif (isset($_GET['deleteFilterTemplate'])) + { + $layeredValues = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' + SELECT filters + FROM '._DB_PREFIX_.'layered_filter + WHERE id_layered_filter = '.(int)$_GET['id_layered_filter']); - $html .= '

      '.$this->l('Layered navigation').'

      -

      '.$this->l('This module is in beta version and will be improved').'


      -
      - '.$this->l('10 upcoming improvements').' -
        -
      1. '.$this->l('Real-time refresh of the cache table').'
        2. -
      2. '.$this->l('Additional filters (prices, weight)').'
        3. -
      3. '.$this->l('Ability to manage filters by category in the module configuration').'
        4. -
      4. '.$this->l('Ability to hide filter groups with no values and filter values with 0 products').'
        5. -
      5. '.$this->l('Statistics and analysis').'
        6. -
      6. '.$this->l('Manage products sort & pagination').'
        7. -
      7. '.$this->l('Add a check on the category_group table').'
        8. -
      8. '.$this->l('SEO links & real time URL building (ability to give the URL to someone)').'
        9. -
      9. '.$this->l('Add more options in the module configuration').'
        10. -
      10. '.$this->l('Performances improvements').'
        11. -
      +
      + '.$this->l('Existing filters templates').''; + + $filtersTemplates = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM '._DB_PREFIX_.'layered_filter ORDER BY date_add DESC'); + if (sizeof($filtersTemplates)) + { + $html .= '

      '.sizeof($filtersTemplates).' '.$this->l('filters templates are configured:').'

      +
      + + + + + + + '; + + foreach ($filtersTemplates AS $filtersTemplate) + { + /* Clean request URI first */ + $_SERVER['REQUEST_URI'] = preg_replace('/&deleteFilterTemplate=[0-9]*&id_layered_filter=[0-9]*/', '', $_SERVER['REQUEST_URI']); + + $html .= ' + + + + + + + '; + } + + $html .= ' +
      IDNameCategoriesCreated onActions
      '.(int)$filtersTemplate['id_layered_filter'].''.$filtersTemplate['name'].''.(int)$filtersTemplate['n_categories'].''.Tools::displayDate($filtersTemplate['date_add'], (int)$cookie->id_lang, true).' + + +
      '; + } + else + $html .= $this->l('No filter template found.'); + + $html .= '

      +
      + '.$this->l('Build your own filters template').' + + +
      '; + + $html.= ' +

      '.$this->l('Step 1/3 - Select categories').'

      +

      '.$this->l('Use this template for:').' + + + + +

      + +
      +
      +

      '.$this->l('Categories using this template').'

      +
        +
      1. '.$this->l('Select one ore more category using this filter template').'
        2. +
      2. '.$this->l('Press "Save this selection" or close the window to save').'
        3. +
      '; -
      - '.$this->l('Cache initialization').' - -
      -

      '.$this->l('Before using this module for the first time you have to initialize the cache').'

      -

      '.$this->l('Warning: This could take several minutes.').'

      - '.$this->l('If you do not, this cache table might become larger and larger (less efficient), and all the new choices (attributes, features) will not be offered to your visitors.').'

      + $trads = array(); + $selectedCat = array(); + foreach(Helper::$translationsKeysForAdminCategorieTree AS $key) + $trads[$key] = $this->l($key); + $html .= Helper::renderAdminCategorieTree($trads, $selectedCat, 'categoryBox'); + + $html .= ' +
      +
      -

      +
      +
      +
      +

      '.$this->l('Step 2/3 - Select filters').'

      +
      +
      +

      '.$this->l('Selected filters').' (0)

      +

      '.$this->l('No filters selected yet.').'

      +
        +
        +
        + '.$this->ajaxCallBackOffice().' +
        +
        +
        +
        + + + + +
        +
        +

        '.$this->l('Step 3/3 - Name your template').'

        +

        '.$this->l('Template name:').' ('.$this->l('only as a reminder').')

        +
        +
        +
        +
        + +

        - '.$this->l('Configuration').'
        - -
        + '.$this->l('Configuration').' + + + + + + + + + + + + + + + + + +
        '.$this->l('Option').''.$this->l('Value').'
        '.$this->l('Hide filter values with no product is matching').' + '.$this->l('Yes').' + '.$this->l('Yes').' + '.$this->l('No').' + '.$this->l('No').' +
        '.$this->l('Show the number of matching products').' + '.$this->l('Yes').' + '.$this->l('Yes').' + '.$this->l('No').' + '.$this->l('No').' +
        '.$this->l('Allow customers to share URLs').' - + '.$this->l('Yes').' - -

        '.$this->l('By enabling this option, your visitors can share the URL of their research').'

        - -
        + '.$this->l('No').' +

        '.$this->l('To offer your customers short links, create an account on bit.ly, then copy and paste login and API key.').' '.$this->l('Sign Up').'

        @@ -240,6 +601,7 @@ class BlockLayered extends Module

        '; + return $html; } @@ -293,10 +655,14 @@ class BlockLayered extends Module if ($id_parent == 1) return; - if (!sizeof($selectedFilters['category'])) - $selectedFilters['category'][] = $id_parent; - $queryFilters = ''; + + $parent = new Category((int)$id_parent); + if (!sizeof($selectedFilters['category'])) + $queryFilters .= ' AND p.id_product IN (SELECT id_product FROM '._DB_PREFIX_.'category_product cp + LEFT JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category) + WHERE 1 AND c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright.')'; + foreach ($selectedFilters AS $key => $filterValues) { if (!sizeof($filterValues)) @@ -326,20 +692,10 @@ class BlockLayered extends Module break; case 'category': - $parent = new Category($id_parent); - if (!sizeof($selectedFilters['category'])) - $queryFilters .= ' AND p.id_product IN ( SELECT id_product FROM '._DB_PREFIX_.'category_product cp - LEFT JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category) - WHERE 1 AND c.nleft >= parent->nleft AND c.nright <= parent->nright'; - else - { - $queryFilters .= ' AND p.id_product IN ( SELECT id_product FROM '._DB_PREFIX_.'category_product cp WHERE 1 AND cp.`id_category` = '.(int)$id_parent; - if (sizeof($selectedFilters['category'])) - $queryFilters .= ' OR '; + $queryFilters .= ' AND p.id_product IN (SELECT id_product FROM '._DB_PREFIX_.'category_product cp WHERE '; foreach ($selectedFilters['category'] AS $id_category) $queryFilters .= 'cp.`id_category` = '.(int)$id_category.' OR '; $queryFilters = rtrim($queryFilters, 'OR ').')'; - } break; case 'quantity': @@ -367,23 +723,16 @@ class BlockLayered extends Module } } - //id_category_layered = current displayed category - if (!sizeof($selectedFilters['category'])) - $queryFilters .= ' AND p.id_product IN ( - SELECT id_product FROM '._DB_PREFIX_.'category_product cp - WHERE cp.`id_category` = '.(int)$id_parent.')'; - /* Return only the number of products */ $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' SELECT COUNT(p.`id_product`) AS total FROM `'._DB_PREFIX_.'product` p WHERE 1 '.$queryFilters); - $this->nbr_products = isset($result) ? $result['total'] : 0; + $this->nbr_products = isset($result) ? (int)$result['total'] : 0; $n = (int)Tools::getValue('n', Configuration::get('PS_PRODUCTS_PER_PAGE')); - - $sql = 'SELECT p.id_product, p.out_of_stock, p.available_for_order, p.minimal_quantity, p.id_category_default, p.customizable, p.show_price, p.`weight`, + $sql = 'SELECT p.id_product, p.on_sale, p.out_of_stock, p.available_for_order, p.quantity, p.minimal_quantity, p.id_category_default, p.customizable, p.show_price, p.`weight`, p.ean13, pl.available_later, pl.description_short, pl.link_rewrite, pl.name, i.id_image, il.legend, m.name manufacturer_name, p.condition, p.id_manufacturer, stock.quantity, DATEDIFF(p.`date_add`, DATE_SUB(NOW(), INTERVAL '.(Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20).' DAY)) > 0 AS new FROM '._DB_PREFIX_.'product p @@ -413,13 +762,19 @@ class BlockLayered extends Module return; /* First we need to get all subcategories of current category */ - $category = new Category((int)$id_parent); + $category = new Category($id_parent); + + $groups = FrontController::getCurrentCustomerGroups(); $subCategories = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' SELECT c.id_category, c.id_parent, cl.name FROM '._DB_PREFIX_.'category c + LEFT JOIN '._DB_PREFIX_.'category_group cg ON (cg.id_category = c.id_category) LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category) WHERE c.nleft > '.(int)$category->nleft.' and c.nright <= '.(int)$category->nright.' AND c.active = 1 AND c.id_parent = '.(int)$category->id.' AND cl.id_lang = '.(int)$context->language->id.' + WHERE c.nleft > '.(int)$category->nleft.' and c.nright <= '.(int)$category->nright.' AND c.active = 1 AND c.id_parent = '.(int)$category->id.' AND cl.id_lang = '.(int)$cookie->id_lang.' + AND cg.id_group '.pSQL(sizeof($groups) ? 'IN ('.implode(',', $groups).')' : '= 1').' + GROUP BY c.id_category ORDER BY c.position ASC'); $whereC = ' cp.`id_category` = '.(int)$id_parent.' OR '; @@ -440,7 +795,7 @@ class BlockLayered extends Module WHERE p.`active` = 1 AND p.`id_product` IN ( SELECT id_product FROM `'._DB_PREFIX_.'category_product` cp WHERE'.$whereC.')', false); $products = array(); - $db = Db::getInstance(); + $db = Db::getInstance(_PS_USE_SQL_SLAVE_); $weight = array(); while ($product = $db->nextRow($productsSQL)) { @@ -465,7 +820,7 @@ class BlockLayered extends Module } /* Get the filters for the current category */ - $filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM '._DB_PREFIX_.'layered_category WHERE id_category = '.(int)$id_parent); + $filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM '._DB_PREFIX_.'layered_category WHERE id_category = '.(int)$id_parent.' ORDER BY position ASC'); $filterBlocks = $f = $a = array(); foreach ($filters AS $filter) @@ -478,18 +833,17 @@ class BlockLayered extends Module case 'id_feature': $f[] = (int)$filter['id_value']; - $filterBlocks[(int)$filter['position']]['SQLvalues'] = Db::getInstance()->ExecuteS(' + $filterBlocks[(int)$filter['position']]['SQLvalues'] = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' SELECT fvl.id_feature_value, fvl.value FROM '._DB_PREFIX_.'feature_value fv LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.id_feature_value = fv.id_feature_value) WHERE (fv.custom IS NULL OR fv.custom = 0) AND fv.id_feature = '.(int)$filterBlocks[(int)$filter['position']]['id_key'].' AND fvl.id_lang = '.(int)$context->language->id); - break; case 'id_attribute_group': $a[] = (int)$filter['id_value']; - $filterBlocks[(int)$filter['position']]['SQLvalues'] = Db::getInstance()->ExecuteS(' + $filterBlocks[(int)$filter['position']]['SQLvalues'] = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' SELECT al.id_attribute, al.name, a.color FROM '._DB_PREFIX_.'attribute a LEFT JOIN '._DB_PREFIX_.'attribute_lang al ON (al.id_attribute = a.id_attribute) @@ -501,7 +855,7 @@ class BlockLayered extends Module /* Get the feature block names & values */ if (sizeof($f)) { - $fNames = Db::getInstance()->ExecuteS(' + $fNames = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' SELECT id_feature, name FROM '._DB_PREFIX_.'feature_lang WHERE id_lang = '.(int)$context->language->id.' AND id_feature IN ('.implode(',', $f).')'); @@ -513,7 +867,7 @@ class BlockLayered extends Module /* Get the attribute block names & values */ if (sizeof($a)) { - $aNames = Db::getInstance()->ExecuteS(' + $aNames = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' SELECT ag.id_attribute_group, agl.public_name, ag.is_color_group FROM '._DB_PREFIX_.'attribute_group ag LEFT JOIN '._DB_PREFIX_.'attribute_group_lang agl ON (agl.id_attribute_group = ag.id_attribute_group) @@ -552,11 +906,14 @@ class BlockLayered extends Module $productCat = $this->filterProducts($products, $selectedFilters, 'category'); - //count nbr product in category + // Count number of products in each category foreach ($c AS $idSubCategory) foreach ($productCat AS $product) if (in_array($idSubCategory, $product['c'])) $filterBlock['values'][(int)$idSubCategory]['nbr']++; + + if (Configuration::get('PS_LAYERED_HIDE_0_VALUES') AND !$filterBlock['values'][(int)$idSubCategory]['nbr']) + unset($filterBlock['values'][(int)$subCat['id_category']]); } elseif ($filterBlock['type_lite'] == 'id_feature') { @@ -569,11 +926,14 @@ class BlockLayered extends Module { foreach ($productFeat AS $product) { - if (in_array($value['id_feature_value'], $product['f'])) + if (Configuration::get('PS_LAYERED_HIDE_0_VALUES') AND !in_array($value['id_feature_value'], $product['f'])) + continue; + else { $filterBlock['values'][(int)$value['id_feature_value']]['name'] = $value['value']; if (!isset($filterBlock['values'][(int)$value['id_feature_value']]['nbr'])) $filterBlock['values'][(int)$value['id_feature_value']]['nbr'] = 0; + if (in_array($value['id_feature_value'], $product['f'])) $filterBlock['values'][(int)$value['id_feature_value']]['nbr']++; } if (in_array($value['id_feature_value'], $product['f']) AND !isset($filterBlock['values'][(int)$value['id_feature_value']])) @@ -637,6 +997,13 @@ class BlockLayered extends Module if (isset($selectedFilters['condition']) AND in_array($conditionKey, $selectedFilters['condition'])) $condition['checked'] = true; } + + if (Configuration::get('PS_LAYERED_HIDE_0_VALUES')) + { + foreach ($filterBlock['values'] AS $conditionKey2 => $condition2) + if (!$condition2['nbr']) + unset($filterBlock['values'][$conditionKey2]); + } } elseif ($filterBlock['type_lite'] == 'quantity') { @@ -655,6 +1022,13 @@ class BlockLayered extends Module if (isset($selectedFilters['quantity']) AND in_array($quantKey, $selectedFilters['quantity'])) $quantity['checked'] = true; } + + if (Configuration::get('PS_LAYERED_HIDE_0_VALUES')) + { + foreach ($filterBlock['values'] AS $quantKey2 => $quantity2) + if (!$quantity2['nbr']) + unset($filterBlock['values'][$quantKey2]); + } } elseif ($filterBlock['type_lite'] == 'manufacturer') { @@ -708,9 +1082,8 @@ class BlockLayered extends Module foreach ($selectedFilters AS $filters) $nFilters += sizeof($filters); - $params = '?'; - foreach ($_GET as $key => $val) + foreach($_GET AS $key => $val) $params .= $key.'='.$val.'&'; $share_url = $context->link->getCategoryLink((int)$category->id, $category->link_rewrite[(int)$context->language->id], $context->language->id).rtrim($params, '&'); @@ -718,7 +1091,7 @@ class BlockLayered extends Module $context->smarty->assign(array( 'display_share' => (int)Configuration::get('PS_LAYERED_SHARE'), 'share_url' => $this->getShortLink($share_url), - 'layered_use_checkboxes' => (int)Configuration::get('PS_LAYERED_NAVIGATION_CHECKBOXES'), + 'layered_show_qties' => (int)Configuration::get('PS_LAYERED_SHOW_QTIES'), 'id_category_layered' => (int)$id_parent, 'selected_filters' => $selectedFilters, 'n_filters' => (int)$nFilters, @@ -728,6 +1101,119 @@ class BlockLayered extends Module return $this->display(__FILE__, 'blocklayered.tpl'); } + public function ajaxCallBackOffice($categoryBox = array(), $id_layered_filter = NULL) + { + global $cookie; + + if (!empty($id_layered_filter)) + { + $layeredFilter = Db::getInstance()->getRow('SELECT * FROM '._DB_PREFIX_.'layered_filter WHERE id_layered_filter = '.(int)$id_layered_filter); + if ($layeredFilter AND isset($layeredFilter['filters']) AND !empty($layeredFilter['filters'])) + $layeredValues = unserialize($layeredFilter['filters']); + if (isset($layeredValues['categories']) AND sizeof($layeredValues['categories'])) + foreach ($layeredValues['categories'] AS $id_category) + $categoryBox[] = (int)$id_category; + } + + $attributeGroups = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + SELECT ag.id_attribute_group, ag.is_color_group, agl.name, COUNT(DISTINCT(a.id_attribute)) n + FROM '._DB_PREFIX_.'attribute_group ag + LEFT JOIN '._DB_PREFIX_.'attribute_group_lang agl ON (agl.id_attribute_group = ag.id_attribute_group) + LEFT JOIN '._DB_PREFIX_.'attribute a ON (a.id_attribute_group = ag.id_attribute_group) + '.(sizeof($categoryBox) ? ' + LEFT JOIN '._DB_PREFIX_.'product_attribute_combination pac ON (pac.id_attribute = a.id_attribute) + LEFT JOIN '._DB_PREFIX_.'product_attribute pa ON (pa.id_product_attribute = pac.id_product_attribute) + LEFT JOIN '._DB_PREFIX_.'category_product cp ON (cp.id_product = pa.id_product)' : '').' + WHERE agl.id_lang = '.(int)$cookie->id_lang. + (sizeof($categoryBox) ? ' AND cp.id_category IN ('.implode(',', $categoryBox).')' : '').' + GROUP BY ag.id_attribute_group'); + + $features = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + SELECT fl.id_feature, fl.name, COUNT(DISTINCT(fv.id_feature_value)) n + FROM '._DB_PREFIX_.'feature_lang fl + LEFT JOIN '._DB_PREFIX_.'feature_value fv ON (fv.id_feature = fl.id_feature) + '.(sizeof($categoryBox) ? ' + LEFT JOIN '._DB_PREFIX_.'feature_product fp ON (fp.id_feature = fv.id_feature) + LEFT JOIN '._DB_PREFIX_.'category_product cp ON (cp.id_product = fp.id_product)' : '').' + WHERE (fv.custom IS NULL OR fv.custom = 0) AND fl.id_lang = '.(int)$cookie->id_lang. + (sizeof($categoryBox) ? ' AND cp.id_category IN ('.implode(',', $categoryBox).')' : '').' + GROUP BY fl.id_feature'); + + $nElements = sizeof($attributeGroups) + sizeof($features) + 4; + if ($nElements > 20) + $nElements = 20; + + $html = ' +
        +

        '.$this->l('Available filters').' (0)

        +
          +
          • '.$this->l('Sub-categories filter').'
          +
          • '.$this->l('Product stock filter').'
          +
          • '.$this->l('Product condition filter').'
          +
          • '.$this->l('Product manufacturer filter').'
          +
          • '.$this->l('Product weight filter (slider)').'
          '; + + if (sizeof($attributeGroups)) + { + $html .= '
            '; + foreach ($attributeGroups AS $attributeGroup) + $html .= '
          • '.$this->l('Attribute group:').' '.$attributeGroup['name'].' ('.(int)$attributeGroup['n'].' '.($attributeGroup['n'] > 1 ? $this->l('attributes') : $this->l('attribute')).')'.($attributeGroup['is_color_group'] ? ' ' : '').'
            • '; + $html .= '
          '; + } + + if (sizeof($features)) + { + $html .= '
            '; + foreach ($features AS $feature) + $html .= '
          • '.$this->l('Feature:').' '.$feature['name'].' ('.(int)$feature['n'].' '.($feature['n'] > 1 ? $this->l('values') : $this->l('value')).')
            • '; + $html .= '
          '; + } + + $html .= ' +
          '; + + if (isset($layeredValues)) + { + $html .= ' + '; + } + + return $html; + } + public function ajaxCall() { $context = Context::getContext(); @@ -759,12 +1245,12 @@ class BlockLayered extends Module $context->smarty->assign('nb_products', $nbProducts); $pagination_infos = array( 'pages_nb' => (int)($pages_nb), - 'p' => (int)($p), - 'n' => (int)($n), - 'range' => (int)($range), - 'start' => (int)($start), - 'stop' => (int)($stop), - 'nArray' => $nArray = (int)(Configuration::get('PS_PRODUCTS_PER_PAGE')) != 10 ? array((int)(Configuration::get('PS_PRODUCTS_PER_PAGE')), 10, 20, 50) : array(10, 20, 50) + 'p' => (int)$p, + 'n' => (int)$n, + 'range' => (int)$range, + 'start' => (int)$start, + 'stop' => (int)$stop, + 'nArray' => $nArray = (int)Configuration::get('PS_PRODUCTS_PER_PAGE') != 10 ? array((int)Configuration::get('PS_PRODUCTS_PER_PAGE'), 10, 20, 50) : array(10, 20, 50) ); $context->smarty->assign($pagination_infos); @@ -776,21 +1262,16 @@ class BlockLayered extends Module 'productList' => $context->smarty->fetch(_PS_THEME_DIR_.'product-list.tpl'), 'pagination' => $context->smarty->fetch(_PS_THEME_DIR_.'pagination.tpl') )); - // return '
          '.$this->generateFiltersBlock($selectedFilters).'
          '.$smarty->fetch(_PS_THEME_DIR_.'product-list.tpl').'
          '; } public function rebuildLayeredStructure() { @set_time_limit(0); - // setting the memory limit to 128M only if current is lower + + /* Set memory limit to 128M only if current is lower */ $memory_limit = ini_get('memory_limit'); - if ( substr($memory_limit,-1) != 'G' - AND ((substr($memory_limit,-1) == 'M' AND substr($memory_limit,0,-1) < 128) - OR is_numeric($memory_limit) AND (intval($memory_limit) < 131072)) - ) - { + if (substr($memory_limit,-1) != 'G' AND ((substr($memory_limit,-1) == 'M' AND substr($memory_limit,0,-1) < 128) OR is_numeric($memory_limit) AND (intval($memory_limit) < 131072))) @ini_set('memory_limit','128M'); - } /* Delete and re-create the layered categories table */ Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_category'); @@ -798,32 +1279,36 @@ class BlockLayered extends Module CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'layered_category` ( `id_layered_category` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, `id_category` INT(10) UNSIGNED NOT NULL, - `id_value` INT(10) UNSIGNED NOT NULL DEFAULT \'0\', + `id_value` INT(10) UNSIGNED NULL DEFAULT \'0\', `type` ENUM(\'category\',\'id_feature\',\'id_attribute_group\',\'quantity\',\'condition\',\'manufacturer\',\'weight\') NOT NULL, `position` INT(10) UNSIGNED NOT NULL, PRIMARY KEY (`id_layered_category`), KEY `id_category` (`id_category`,`type`) - ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;'); + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;'); /* MyISAM + latin1 = Smaller/faster */ + + Db::getInstance()->Execute(' + CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'layered_filter` ( + `id_layered_filter` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, + `name` VARCHAR(64) NOT NULL, + `filters` TEXT NULL, + `n_categories` INT(10) UNSIGNED NOT NULL, + `date_add` DATETIME NOT NULL)'); } public function rebuildLayeredCache($productsIds = array(), $categoriesIds = array()) { @set_time_limit(0); - // setting the memory limit to 128M only if current is lower + + /* Set memory limit to 128M only if current is lower */ $memory_limit = ini_get('memory_limit'); - if (substr($memory_limit,-1) != 'G' - AND ((substr($memory_limit,-1) == 'M' AND substr($memory_limit,0,-1) < 128) - OR is_numeric($memory_limit) AND (intval($memory_limit) < 131072)) - ) - { - @ini_set('memory_limit','129M'); - } + if (substr($memory_limit,-1) != 'G' AND ((substr($memory_limit,-1) == 'M' AND substr($memory_limit,0,-1) < 128) OR is_numeric($memory_limit) AND (intval($memory_limit) < 131072))) + @ini_set('memory_limit','128M'); - $db = Db::getInstance(); + $db = Db::getInstance(_PS_USE_SQL_SLAVE_); $nCategories = array(); $doneCategories = array(); - $attributeGroups = Db::getInstance()->ExecuteS(' + $attributeGroups = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' SELECT a.id_attribute, a.id_attribute_group FROM '._DB_PREFIX_.'attribute a LEFT JOIN '._DB_PREFIX_.'product_attribute_combination pac ON (pac.id_attribute = a.id_attribute) @@ -837,7 +1322,7 @@ class BlockLayered extends Module while ($row = $db->nextRow($attributeGroups)) $attributeGroupsById[(int)$row['id_attribute']] = (int)$row['id_attribute_group']; - $features = Db::getInstance()->ExecuteS(' + $features = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' SELECT fv.id_feature_value, fv.id_feature FROM '._DB_PREFIX_.'feature_value fv LEFT JOIN '._DB_PREFIX_.'feature_product fp ON (fp.id_feature_value = fv.id_feature_value) @@ -922,7 +1407,7 @@ class BlockLayered extends Module $queryCategory .= '('.(int)$id_category.',NULL,\'weight\','.(int)$nCategories[(int)$id_category]++.'),'; $toInsert = true; } - /* + /* Filter by price (dev in progress) if (!isset($doneCategories[(int)$id_category]['p'])) { $doneCategories[(int)$id_category]['p'] = true; @@ -996,6 +1481,9 @@ if (!isset($doneCategories[(int)$id_category]['p'])) private function getShortLink($share_url) { + $return = ''; + if (extension_loaded('curl')) + { $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, "http://api.bitly.com/v3/shorten"); curl_setopt($ch, CURLOPT_HEADER, 0); @@ -1003,8 +1491,8 @@ if (!isset($doneCategories[(int)$id_category]['p'])) curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_POSTFIELDS, 'login='.Configuration::get('PS_LAYERED_BITLY_USERNAME').'&apiKey='.Configuration::get('PS_LAYERED_BITLY_API_KEY').'&longUrl='.urlencode($share_url).'&format=txt'); $return = curl_exec($ch); - - if ($return != 'INVALID_LOGIN' AND $return != 'INVALID_APIKEY') + } + if ($return != 'INVALID_LOGIN' AND $return != 'INVALID_APIKEY' AND extension_loaded('curl')) return $return; else return $share_url; diff --git a/modules/blocklayered/blocklayered.tpl b/modules/blocklayered/blocklayered.tpl index 6dadd2c77..6ff108e56 100644 --- a/modules/blocklayered/blocklayered.tpl +++ b/modules/blocklayered/blocklayered.tpl @@ -77,21 +77,21 @@
            {if !isset($filter.slider)} {foreach from=$filter.values key=id_value item=value} - +
          • {if isset($filter.is_color_group) && $filter.is_color_group} {if isset($value.checked) && $value.checked}{/if} {else} - {if $layered_use_checkboxes} {/if} - {/if} - +
            • {/foreach} {else} - + +
            +
            + + -{/literal} \ No newline at end of file +{/literal} diff --git a/modules/treepodia/index.php b/modules/treepodia/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/treepodia/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/treepodia/logos/index.php b/modules/treepodia/logos/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/treepodia/logos/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/treepodia/treepodia.php b/modules/treepodia/treepodia.php index a743002be..e4b91a867 100644 --- a/modules/treepodia/treepodia.php +++ b/modules/treepodia/treepodia.php @@ -46,7 +46,7 @@ class Treepodia extends Module { $this->name = 'treepodia'; $this->tab = 'front_office_features'; - $this->version = '1.2'; + $this->version = '1.3'; $this->displayName = 'Treepodia'; parent::__construct(); diff --git a/modules/trustedshops/cache/index.php b/modules/trustedshops/cache/index.php new file mode 100644 index 000000000..dce6b30f5 --- /dev/null +++ b/modules/trustedshops/cache/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/config.xml b/modules/trustedshops/config.xml index eb4351eb0..f4db1361c 100755 --- a/modules/trustedshops/config.xml +++ b/modules/trustedshops/config.xml @@ -1,9 +1,9 @@ trustedshops - - - + + + Are you sure you want to delete all your settings? diff --git a/modules/trustedshops/de.php b/modules/trustedshops/de.php index c5d875958..7842c7035 100644 --- a/modules/trustedshops/de.php +++ b/modules/trustedshops/de.php @@ -4,19 +4,23 @@ global $_MODULE; $_MODULE = array(); $_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops Käuferschutz (empfohlen)'; $_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Käuferschutz ab'; -$_MODULE['<{trustedshops}prestashop>display_products_a53a5a9f38f31d62a791717b943e02f3'] = 'Gesamtbetrag inkl. MwSt.'; -$_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'Trusted Shops Käuferschutz sichert Ihre Online Bestellung ab. Ich stimme zu, dass meine E-Mail Adresse gespeichert und'; -$_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'gespeichert'; -$_MODULE['<{trustedshops}prestashop>display_products_2dc4be4d5564180e6df95d5a5a679195'] = 'zu Zwecken des Käuferschutzes von Trusted Shops verwendet wird.'; -$_MODULE['<{trustedshops}prestashop>display_products_229eb04083e06f419f9ac494329f957d'] = 'Konditionen'; -$_MODULE['<{trustedshops}prestashop>display_products_4ccaceceffe4b5e58f6a7a7ed3ced4c4'] = 'für Käuferschutz'; +$_MODULE['<{trustedshops}prestashop>display_products_69db1ddc2a15253abb0a11beb1eae734'] = 'inkl. MwSt.'; +$_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'Die im Käuferschutz enthaltene Trusted Shops Garantie sichert Ihren Online-Kauf ab. Mit der Übermittlung und'; +$_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'Speicherung'; +$_MODULE['<{trustedshops}prestashop>display_products_2dc4be4d5564180e6df95d5a5a679195'] = 'meiner E-Mail-Adresse zur Abwicklung des Käuferschutzes durch Trusted Shops bin ich einverstanden.'; +$_MODULE['<{trustedshops}prestashop>display_products_229eb04083e06f419f9ac494329f957d'] = 'Garantiebedingungen'; +$_MODULE['<{trustedshops}prestashop>display_products_4ccaceceffe4b5e58f6a7a7ed3ced4c4'] = 'für den Käuferschutz.'; $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_7b5406da2d5f15923d6b01d3264c5619'] = 'Trusted Shops Gütesiegel - Bitte hier Gültigkeit prüfen!'; $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_4052048c767f22e9071c3e6f404d00c6'] = 'Als zusätzlichen Service bieten wir Ihnen den Trusted Shops Käuferschutz an. Wir übernehmen alle Kosten dieser Garantie, Sie müssen sich lediglich anmelden.'; $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_f975f42362625cf21e592009ff4b3d7b'] = 'Anmeldung zum Trusted Shops Käuferschutz'; $_MODULE['<{trustedshops}prestashop>seal_of_approval_ee9ae315b086e1b1a0c8fdc6078f9add'] = 'Trusted Shops Gütesiegel - Bitte hier Gültigkeit prüfen!'; $_MODULE['<{trustedshops}prestashop>seal_of_approval_750bea678eeb1d07f21fe86173288e2e'] = 'Testzertifikat für Shopsystempartner DE trägt das Trusted Shops Zertifikat mit Käuferschutz. Mehr...'; -$_MODULE['<{trustedshops}prestashop>tsbpexception_79fc246c2b70963d27ebb0e9ebaab349'] = 'Kontaktieren Sie Trusted Shops unter service@trustedshops.co.uk.'; -$_MODULE['<{trustedshops}prestashop>tsbpexception_de14ce5aee772cd0330819c0ecf76adb'] = 'Benutzername oder Passwort ungültig'; +$_MODULE['<{trustedshops}prestashop>trustedshops_0aa7ce92297d05fc09fb9fdbe5da6be6'] = 'Dieses Modul erfordert die SOAP-PHP-Erweiterung, um ordnungsgemäß zu funktionieren.'; +$_MODULE['<{trustedshops}prestashop>trustedshops_8b61f54775adf535d4da32eb434309ea'] = 'Trusted Shops Vertrauenslösungen'; +$_MODULE['<{trustedshops}prestashop>trustedshops_f3607bb2fb5f04aa4937e7846c560faa'] = 'Stärken Sie das Vertrauen in Ihren Online-Shop mit Trusted Shops Gütesiegel, Käuferschutz und Kundenbewertung.'; +$_MODULE['<{trustedshops}prestashop>trustedshops_968e0f78caa7d3245c8f6f858de993d8'] = 'Sie sind sicher, dass Sie alle Ihre Einstellungen löschen möchten?'; +$_MODULE['<{trustedshops}prestashop>tsbpexception_79fc246c2b70963d27ebb0e9ebaab349'] = 'Kontaktieren Sie Trusted Shops unter service@trustedshops.de'; +$_MODULE['<{trustedshops}prestashop>tsbpexception_3a2a06b3a1f05cde765219211bf2e9bd'] = 'Benutzername oder Passwort ungültig.'; $_MODULE['<{trustedshops}prestashop>tsbpexception_43048f232a4ebab67835c425a1113b29'] = 'Sie haben Ihr Kreditlimit erreicht'; $_MODULE['<{trustedshops}prestashop>tsbpexception_eb601fb44b908fec1ee41383d4d948ac'] = 'Keine Kredite von Trusted Shops erältlich'; $_MODULE['<{trustedshops}prestashop>tsbpexception_cb71cc86f5c38200b3821adb49966522'] = 'Daten konnten nicht gespeichert werden'; @@ -59,7 +63,7 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_982830b027a279fdc4b4b7993f $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_7e1795d054242cf7c546c1491a7c467d'] = 'DIRECTebanking.com'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_37554cc43c645833d6713b9cddda909b'] = 'moneybookers.com'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9203aec73d2ea1770f66f065c4069816'] = 'Andere Zahlungsmethode'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_068ce643ff39bf2189935d14736fd10b'] = 'Siegel und Käuferschutz'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_743a602a92e214f08c05442217332938'] = 'Trusted Shops Gütesiegel und Käuferschutz'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f51dabfce0c8ccc01734ed38d8afe27a'] = 'Json Funktionen müssen in Ihrer php Version eingeschaltet sein.'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b1801eaadecfddd04529313a1e929262'] = 'Die Zertifizierung ist gültig'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_ce323cb3453812434f9abc007ba7a952'] = 'Die Zertifizierung ist angelaufen'; @@ -80,6 +84,7 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_bf67e5e156927e871cc3dd2bde $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_259060bb469ed1256c2e758e32da126f'] = 'Das Zertifikat'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8512ae7d57b1396273f76fe6ed341a23'] = 'Sprache'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8638c4fb6ff62122acd9927c4edbd22c'] = 'wurde entfernt'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_068ce643ff39bf2189935d14736fd10b'] = 'Siegel und Käuferschutz'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_10b5f8531f2b6a3f6d8abad45024bbea'] = 'Kein Bedarf'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_5c697646774e5acf5c5864b6819e82b5'] = 'Zertifikat bearbeiten'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f8c823f9ba0a86ceaa8d3ea7e688595d'] = 'Zertifikat ID'; @@ -90,15 +95,12 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_23a58bf9274bedb19375e527a0 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_fd5291d7f0624933870702ff183bb14e'] = 'Bezahlmodul'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b3b1a406e097bc87c8745db26e11904e'] = 'Aktualisieren'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_c9ba5f6e6d58162530424afaa68bf496'] = 'Cronjob Konfiguration'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_c17d7635f5ee99ee25f7f2cc9a672c74'] = 'Die Datei, die aufgerufen werden soll:'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_12a4fc31ae8a9e4038df56961a5aec9b'] = 'Soweit In Ihrem Shop ein Trusted Shops Zertifikat mit Käuferschutz EXCELLENCE verwendet wird, richten Sie auf Ihrem Server einen cron job ein'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f811271eb84f3df1a430c3c78b6e7640'] = 'Rufen Sie die Datei'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_06ec9154ce96a389f7b1d884e021818b'] = 'mit einem Intervall von 10 Minuten auf.'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f89b7100efcc136900c909690e43f008'] = 'Die Zeile in Ihrer cron Datei könnte so aussehen:'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9d36bad327b052a9bdec7003f95ce4bd'] = 'Problem mit Ihrer Sprache:'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_03e9e3ceaf5769311c57b5903a958e94'] = 'Ein Käufer kann mehrfachen Käuferschutz nicht kaufen.'; -$_MODULE['<{trustedshops}prestashop>trustedshopsrating_c006c102f7e2ffef1f7c1808d5e0e54a'] = 'Kundenbewertungen'; +$_MODULE['<{trustedshops}prestashop>trustedshopsrating_2b83e3a2e08203b9892ad8801d6b2543'] = 'Trusted Shops Kundenbewertung'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_2ab78702e34e81e82ca61847300b1618'] = 'Sind Sie zufriedn mit'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_a11109fe93f6dc4637e5b039651a4fdb'] = '? Schreiben Sie bitte eine Kundnemeinung'; -$_MODULE['<{trustedshops}prestashop>trustedshops_0aa7ce92297d05fc09fb9fdbe5da6be6'] = 'Dieses Modul erfordert die SOAP-PHP-Erweiterung, um ordnungsgemäß zu funktionieren.'; -$_MODULE['<{trustedshops}prestashop>trustedshops_9a983837b32d42343dc0c62d35b1f955'] = 'Trusted Shops Kundenbeurteilung'; -$_MODULE['<{trustedshops}prestashop>trustedshops_eeae17826fa637ecca0344165514ab4e'] = 'Stärken Sie das Vertrauen der Verbraucher und machen Sie mehr Shopper zu Käufer'; -$_MODULE['<{trustedshops}prestashop>trustedshops_968e0f78caa7d3245c8f6f858de993d8'] = 'Sie sind sicher, dass Sie alle Ihre Einstellungen löschen möchten?'; - -?> \ No newline at end of file diff --git a/modules/trustedshops/display_products.tpl b/modules/trustedshops/display_products.tpl index 665ec3dd4..2a1022ff4 100644 --- a/modules/trustedshops/display_products.tpl +++ b/modules/trustedshops/display_products.tpl @@ -72,14 +72,16 @@ var TS = (function()

            {l s='Trusted Shops Buyer Protection (recommended)' mod='trustedshops'}

            - logo + + logo +
            {foreach from=$buyer_protection_items item=product} -

            {l s='Buyer protection from' mod='trustedshops'} {$product.protected_amount_decimal} ({$product.gross_fee|round:2} {l s='GBP incl. VAT' mod='trustedshops'})

            +

            {l s='Buyer protection from' mod='trustedshops'} {$product.protected_amount_decimal} {$currency_iso_code} ({$price|round:2} {$currency_iso_code} {l s='incl. VAT' mod='trustedshops'})

            {/foreach}
            -

            {l s='The Trusted Shops Buyer Protection secures your online purchase. I agree to my email address being transferred and' mod='trustedshops'} {l s='saved' mod='trustedshops'} {l s='for the purposes of Buyer Protection processing by Trusted Shops.' mod='trustedshops'}{l s='Conditions' mod='trustedshops'}: {l s='for Buyer Protection.' mod='trustedshops'}

            +

            {l s='The Trusted Shops Buyer Protection secures your online purchase. I agree to my email address being transferred and' mod='trustedshops'} {l s='saved' mod='trustedshops'} {l s='for the purposes of Buyer Protection processing by Trusted Shops.' mod='trustedshops'} {l s='Conditions' mod='trustedshops'} {l s='for Buyer Protection.' mod='trustedshops'}

          diff --git a/modules/trustedshops/es.php b/modules/trustedshops/es.php index a058392d7..58bc677fd 100644 --- a/modules/trustedshops/es.php +++ b/modules/trustedshops/es.php @@ -4,8 +4,6 @@ global $_MODULE; $_MODULE = array(); $_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops protección comprador (recomendado)'; $_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Protección comprador hasta'; -$_MODULE['<{trustedshops}prestashop>display_products_a53a5a9f38f31d62a791717b943e02f3'] = 'EUR IVA incluído'; -$_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'La protección comprador Trusted Shops hace su compra en línea segura. Acepto que mi email sea trasferido y'; $_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'guardado'; $_MODULE['<{trustedshops}prestashop>display_products_2dc4be4d5564180e6df95d5a5a679195'] = 'para el tratamiento de la protección comprador por Trusted Shops.'; $_MODULE['<{trustedshops}prestashop>display_products_229eb04083e06f419f9ac494329f957d'] = 'Condiciones'; @@ -16,11 +14,9 @@ $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_f975f4236262 $_MODULE['<{trustedshops}prestashop>seal_of_approval_ee9ae315b086e1b1a0c8fdc6078f9add'] = 'Cuño Trusted Shops- Pulse aquí para comprobar'; $_MODULE['<{trustedshops}prestashop>seal_of_approval_750bea678eeb1d07f21fe86173288e2e'] = 'es un sitio de venta en línea certificado con la garantía de reembolso de Trusted Shops. '; $_MODULE['<{trustedshops}prestashop>trustedshops_0aa7ce92297d05fc09fb9fdbe5da6be6'] = 'Este módulo requiere la extensión PHP SOAP para funcionar correctamente.'; -$_MODULE['<{trustedshops}prestashop>trustedshops_9a983837b32d42343dc0c62d35b1f955'] = 'Trusted Shops Systema de evaluación cliente'; -$_MODULE['<{trustedshops}prestashop>trustedshops_eeae17826fa637ecca0344165514ab4e'] = 'Haga que sus clientes confíen en usted y transforme a sus visitantes en compradores.'; $_MODULE['<{trustedshops}prestashop>trustedshops_968e0f78caa7d3245c8f6f858de993d8'] = '¿Está seguro de que desea suprimir esta configuración?'; $_MODULE['<{trustedshops}prestashop>tsbpexception_79fc246c2b70963d27ebb0e9ebaab349'] = 'Póngase en contacto con Trusted Shops en la siguiente dirección service@trustedshop.fr'; -$_MODULE['<{trustedshops}prestashop>tsbpexception_de14ce5aee772cd0330819c0ecf76adb'] = 'El nombre de usuario o contrasea no son válidos.'; +$_MODULE['<{trustedshops}prestashop>tsbpexception_3a2a06b3a1f05cde765219211bf2e9bd'] = 'El nombre de usuario o contrasea no son válidos.'; $_MODULE['<{trustedshops}prestashop>tsbpexception_43048f232a4ebab67835c425a1113b29'] = 'Se ha anulado la línea de crédito acordada por Trusted Shop.'; $_MODULE['<{trustedshops}prestashop>tsbpexception_eb601fb44b908fec1ee41383d4d948ac'] = 'No existe ninguna línea de crédito en Trusted Shops. '; $_MODULE['<{trustedshops}prestashop>tsbpexception_cb71cc86f5c38200b3821adb49966522'] = 'No se han podido guardar los datos.'; @@ -65,7 +61,6 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_982830b027a279fdc4b4b7993f $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_7e1795d054242cf7c546c1491a7c467d'] = 'DIRECTebanking.com'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_37554cc43c645833d6713b9cddda909b'] = 'moneybookers.com'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9203aec73d2ea1770f66f065c4069816'] = 'Otros modos de pago'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_068ce643ff39bf2189935d14736fd10b'] = 'Cuño Trusted Shops y protección comprador'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f51dabfce0c8ccc01734ed38d8afe27a'] = 'Las aplicaciones Json deben ser implementadas en la versión de PHP'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b1801eaadecfddd04529313a1e929262'] = 'El certificado es válido'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_ce323cb3453812434f9abc007ba7a952'] = 'El certificado ha caducado'; @@ -92,6 +87,7 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8512ae7d57b1396273f76fe6ed $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8638c4fb6ff62122acd9927c4edbd22c'] = 'ha sido suprimido'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_a599ec4408db04d4bb9e4edd78b849f4'] = 'Certificado de inicio de sesión es un éxito'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b18f5630d5ffdfcee5ab0a44ee6e1eb6'] = 'Tiene que crear un nombre de usuario y una contraseña antes de efectuar cualquier cambio.'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_068ce643ff39bf2189935d14736fd10b'] = 'Cuño Trusted Shops y protección comprador'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_e32263743aac776e5e32fc385d8b669a'] = 'Trusted Shops es el sello de calidad europea para sitios de venta en línea con garantía de reembolso para sus clientes. En el momento de la certificación, su tienda está sometida a una auditoría que agrupa más de 1000 criterios diferentes que respetan las exigencias de las asociaciones de protección de los consumidores, así como las legislaciones nacionales y europeas. '; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_2c786e15a571a442adf85460e6358883'] = '¡Más confianza implica más ventas!'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_e06f60bb083e167516a94aafd5a3a2e2'] = 'El sello de calidad Trusted Shops es ideal para aumentar la confianza de los clientes en su tienda en línea. Cuanto más confíen los clientes en su sitio Wab, más compras realizarán el el mismo.'; @@ -129,14 +125,10 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_23a58bf9274bedb19375e527a0 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_fd5291d7f0624933870702ff183bb14e'] = 'módulo de pago'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b3b1a406e097bc87c8745db26e11904e'] = 'Actualizar'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_c9ba5f6e6d58162530424afaa68bf496'] = 'Configuración del cron'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9a82b12b4b1fe9b34ce7c2952f0284d2'] = 'Debe añadir una tarea cron en su servidor, que funcionen para sus certificados EXCELLENT'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_c17d7635f5ee99ee25f7f2cc9a672c74'] = 'El archivo que debe llamar:'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_a3c2818ac0ecfe9beff0973388eedd69'] = 'Trusted Shops aconseja que se automatice la búsqueda para una tarea cron con un intervalo de 10 minutos.'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b40495f7999e31d4abed3183d2e3cd25'] = 'La protección comprador de Trusted Shops requiere un login para funcionar. '; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9d36bad327b052a9bdec7003f95ce4bd'] = 'Se ha producido un error con su idioma:'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_03e9e3ceaf5769311c57b5903a958e94'] = 'Un comprador no puede comprar varios productos de protección comprador'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_26a7019f9c88a24e63ebc690e9527f31'] = 'Va a recibir un email de Trusted Shops con su número de garantía.'; -$_MODULE['<{trustedshops}prestashop>trustedshopsrating_c006c102f7e2ffef1f7c1808d5e0e54a'] = 'Trusted Shops Sistema de aealuación cliente'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_b20a16afda98421bbf7457ccfa50e311'] = 'Este módulo necesita los derechos de lectura y de escritura en el repertorio cache del módulo.'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_0aa7ce92297d05fc09fb9fdbe5da6be6'] = 'Este módulo necesita la extensión PHP SOAP para funcionar correctamente.'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_1097e2b0ee70e248749f0d0a9292df56'] = 'ID Trusted Shops no válido'; @@ -171,6 +163,5 @@ $_MODULE['<{trustedshops}prestashop>trustedshopsrating_866a520be0de10a4fc8958a9e $_MODULE['<{trustedshops}prestashop>trustedshopsrating_9c6dfeed0caab43f7ff0f6bbd19b27dd'] = 'Con sus intervenciones, sus clientes le ayudan a optimizar el proceso de compra en su sitio. Cuanto mejor funcione su tienda, más satisfechos estarán sus clientes.'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_0fac19c0cc6e205682dd52d61dd5a0a2'] = 'Difusión en Facebook, Twitter y Google'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_afe906fe9448ed1b480b3eec383461de'] = 'Sus clientes dan opiniones y evaluaciones en Facebook y Twitter directamente a sus amigos y conocidos. Las evaluaciones se integran directamente en el Google-Index y se tienen en cuenta en Google Shopping.'; -$_MODULE['<{trustedshops}prestashop>trustedshopsrating_273769f3a3d91979bfdb5ca4909c517a'] = 'Crear una cuenta Trusted Shops'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_2ab78702e34e81e82ca61847300b1618'] = '¿Está satisfecho de su compra en'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_a11109fe93f6dc4637e5b039651a4fdb'] = '? ¡Denos su opinión!'; diff --git a/modules/trustedshops/fr.php b/modules/trustedshops/fr.php index af4951bd4..61003ecba 100644 --- a/modules/trustedshops/fr.php +++ b/modules/trustedshops/fr.php @@ -4,7 +4,7 @@ global $_MODULE; $_MODULE = array(); $_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops protection acheteur (recommandée)'; $_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Protection acheteur jusqu\'à'; -$_MODULE['<{trustedshops}prestashop>display_products_a53a5a9f38f31d62a791717b943e02f3'] = 'EUR TVA incluse'; +$_MODULE['<{trustedshops}prestashop>display_products_69db1ddc2a15253abb0a11beb1eae734'] = 'TVA incluse'; $_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'La protection acheteur Trusted Shops sécurise votre achat en ligne. J’accepte le transfert et la'; $_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'sauvegarde'; $_MODULE['<{trustedshops}prestashop>display_products_2dc4be4d5564180e6df95d5a5a679195'] = 'de mon adresse email pour le traitement de la protection acheteur par Trusted Shops.'; @@ -16,11 +16,11 @@ $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_f975f4236262 $_MODULE['<{trustedshops}prestashop>seal_of_approval_ee9ae315b086e1b1a0c8fdc6078f9add'] = 'Sceau Trusted Shops - Cliquez pour le verifier.'; $_MODULE['<{trustedshops}prestashop>seal_of_approval_750bea678eeb1d07f21fe86173288e2e'] = 'est un site marchand certifié avec la garantie de remboursement de Trusted Shops. En savoir plus...'; $_MODULE['<{trustedshops}prestashop>trustedshops_0aa7ce92297d05fc09fb9fdbe5da6be6'] = 'Ce module requiert l\'extension PHP SOAP pour fonctionner correctement.'; -$_MODULE['<{trustedshops}prestashop>trustedshops_9a983837b32d42343dc0c62d35b1f955'] = 'Trusted Shops Système d’évaluation client'; -$_MODULE['<{trustedshops}prestashop>trustedshops_eeae17826fa637ecca0344165514ab4e'] = 'Boostez la confiance de vos clients et transformez vos visiteurs en acheteurs.'; +$_MODULE['<{trustedshops}prestashop>trustedshops_8b61f54775adf535d4da32eb434309ea'] = 'Solutions de confiance Trusted Shops'; +$_MODULE['<{trustedshops}prestashop>trustedshops_f3607bb2fb5f04aa4937e7846c560faa'] = 'Donnez confiance en affichant sur votre boutique le label de qualité, la protection acheteur et les évaluations client.'; $_MODULE['<{trustedshops}prestashop>trustedshops_968e0f78caa7d3245c8f6f858de993d8'] = 'Etes-vous sûr de vouloir supprimer votre configuration?'; $_MODULE['<{trustedshops}prestashop>tsbpexception_79fc246c2b70963d27ebb0e9ebaab349'] = 'Veuillez contacter Trusted Shops à l\'adresse service@trustedshops.fr'; -$_MODULE['<{trustedshops}prestashop>tsbpexception_de14ce5aee772cd0330819c0ecf76adb'] = 'Le nom d\'utilisateur ou le mot de passe n\'est pas valable.'; +$_MODULE['<{trustedshops}prestashop>tsbpexception_3a2a06b3a1f05cde765219211bf2e9bd'] = 'Le nom d\'utilisateur ou le mot de passe n\'est pas valable.'; $_MODULE['<{trustedshops}prestashop>tsbpexception_43048f232a4ebab67835c425a1113b29'] = 'La ligne de crédit accordée par Trusted Shops a été annulée.'; $_MODULE['<{trustedshops}prestashop>tsbpexception_eb601fb44b908fec1ee41383d4d948ac'] = 'Aucune ligne de crédit n\'existe chez Trusted Shops.'; $_MODULE['<{trustedshops}prestashop>tsbpexception_cb71cc86f5c38200b3821adb49966522'] = 'Les données n\'ont pas pu être sauvegardées.'; @@ -65,7 +65,7 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_982830b027a279fdc4b4b7993f $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_7e1795d054242cf7c546c1491a7c467d'] = 'DIRECTebanking.com'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_37554cc43c645833d6713b9cddda909b'] = 'moneybookers.com'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9203aec73d2ea1770f66f065c4069816'] = 'Autre mode de paiement'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_068ce643ff39bf2189935d14736fd10b'] = 'Sceau Trusted Shops et protection acheteur'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_743a602a92e214f08c05442217332938'] = 'Trusted Shops label de qualité et protection acheteur'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f51dabfce0c8ccc01734ed38d8afe27a'] = 'Les fonctions Json doivent être installées sur votre version de PHP'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b1801eaadecfddd04529313a1e929262'] = 'Le certificat est valide'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_ce323cb3453812434f9abc007ba7a952'] = 'le certificat a expiré'; @@ -92,6 +92,7 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8512ae7d57b1396273f76fe6ed $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8638c4fb6ff62122acd9927c4edbd22c'] = 'A bien été supprimé'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_a599ec4408db04d4bb9e4edd78b849f4'] = 'Le login du certificat à bien été ajouté'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b18f5630d5ffdfcee5ab0a44ee6e1eb6'] = 'Vous devez définir un nom d\'utilisateur et un mot de passe avant toute modification.'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_068ce643ff39bf2189935d14736fd10b'] = 'Sceau Trusted Shops et protection acheteur'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_e32263743aac776e5e32fc385d8b669a'] = 'Trusted Shops est le label de qualité européen pour sites marchands avec garantie de remboursement pour vos clients. Lors de la certification, votre boutique est soumise à un audit qui regroupe plus de 100 critères différents respectant les exigences des associations de protection des consommateurs, ainsi que les législations nationales et européennes.'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_2c786e15a571a442adf85460e6358883'] = 'Plus de confiance pour plus de ventes!'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_e06f60bb083e167516a94aafd5a3a2e2'] = 'Le label de qualité Trusted Shops est optimal pour accroître la confiance des clients dans votre boutique en ligne. Plus les internautes ont confiance en votre site marchand, plus ils achèteront chez vous.'; @@ -129,14 +130,14 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_23a58bf9274bedb19375e527a0 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_fd5291d7f0624933870702ff183bb14e'] = 'module de paiement'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b3b1a406e097bc87c8745db26e11904e'] = 'Le mettre à jour'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_c9ba5f6e6d58162530424afaa68bf496'] = 'Configuration de la tâche cron'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9a82b12b4b1fe9b34ce7c2952f0284d2'] = 'Vous devez ajouter une tâche cron sur votre serveur, fonctionnant pour vos certificats EXCELLENT'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_c17d7635f5ee99ee25f7f2cc9a672c74'] = 'Le fichier que vous devez appeler :'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_a3c2818ac0ecfe9beff0973388eedd69'] = 'Trusted Shops recommande que la requête doit être automatisé par une tâche cron avec un intervalle de 10 minutes.'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f811271eb84f3df1a430c3c78b6e7640'] = 'Lancez le fichier'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_06ec9154ce96a389f7b1d884e021818b'] = 'avec un intervalle de 10 minutes.'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f89b7100efcc136900c909690e43f008'] = 'La ligne correspondante dans votre fichier cron apparaît ainsi :'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b40495f7999e31d4abed3183d2e3cd25'] = 'La protection acheteur de Trusted Shops à besoin d\'un login pour fonctionner. Veuillez contacter l\'administrateur de la boutique.'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9d36bad327b052a9bdec7003f95ce4bd'] = 'Une erreur est apparue avec votre langue :'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_03e9e3ceaf5769311c57b5903a958e94'] = 'Un acheteur ne peut pas acheter plusieurs produits de protection d\'acheteur'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_26a7019f9c88a24e63ebc690e9527f31'] = 'Vous allez recevoir un mail de la part de Trusted Shops à propos de votre numéro de garantie.'; -$_MODULE['<{trustedshops}prestashop>trustedshopsrating_c006c102f7e2ffef1f7c1808d5e0e54a'] = 'Trusted Shops Système d’évaluation client'; +$_MODULE['<{trustedshops}prestashop>trustedshopsrating_2b83e3a2e08203b9892ad8801d6b2543'] = 'Trusted Shops Système d’évaluation client'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_b20a16afda98421bbf7457ccfa50e311'] = 'Ce module nécessite les droits de lecture et d\'écriture sur le répertoire cache du module.'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_0aa7ce92297d05fc09fb9fdbe5da6be6'] = 'Ce module requiert l\'extension PHP SOAP pour fonctionner correctement.'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_1097e2b0ee70e248749f0d0a9292df56'] = 'Trusted Shops ID non valide'; @@ -171,6 +172,5 @@ $_MODULE['<{trustedshops}prestashop>trustedshopsrating_866a520be0de10a4fc8958a9e $_MODULE['<{trustedshops}prestashop>trustedshopsrating_9c6dfeed0caab43f7ff0f6bbd19b27dd'] = 'Par leurs interventions, vos clients vous aident à optimiser les processus de votre site. Car mieux un site marchand fonctionne, plus vos clients sont satisfaits.'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_0fac19c0cc6e205682dd52d61dd5a0a2'] = 'Diffusion sur Facebook, Twitter et Google'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_afe906fe9448ed1b480b3eec383461de'] = 'Vos clients diffusent avis et évaluations sur Facebook et Twitter directement à leurs amis et connaissances. Les évaluations sont intégrées automatiquement dans le Google-Index et prises en compte dans Google Shopping.'; -$_MODULE['<{trustedshops}prestashop>trustedshopsrating_273769f3a3d91979bfdb5ca4909c517a'] = 'Créer un compte Trusted Shops'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_2ab78702e34e81e82ca61847300b1618'] = 'Etes-vous satisfait de votre achat chez'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_a11109fe93f6dc4637e5b039651a4fdb'] = '? Donnez nous votre avis!'; diff --git a/modules/trustedshops/img/index.php b/modules/trustedshops/img/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/trustedshops/img/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/img/seal.png b/modules/trustedshops/img/seal.png new file mode 100755 index 000000000..94508eae5 Binary files /dev/null and b/modules/trustedshops/img/seal.png differ diff --git a/modules/trustedshops/img/ts_rating_de.jpg b/modules/trustedshops/img/ts_rating_de.jpg new file mode 100755 index 000000000..155a39292 Binary files /dev/null and b/modules/trustedshops/img/ts_rating_de.jpg differ diff --git a/modules/trustedshops/index.php b/modules/trustedshops/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/trustedshops/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/it.php b/modules/trustedshops/it.php index 5723ad7ce..3eada38b2 100644 --- a/modules/trustedshops/it.php +++ b/modules/trustedshops/it.php @@ -4,7 +4,6 @@ global $_MODULE; $_MODULE = array(); $_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Protezione acquirente Trusted Shops (consigliato)'; $_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Protezione acquirente da'; -$_MODULE['<{trustedshops}prestashop>display_products_a53a5a9f38f31d62a791717b943e02f3'] = 'EUR incl. IVA'; $_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'salvato'; $_MODULE['<{trustedshops}prestashop>display_products_229eb04083e06f419f9ac494329f957d'] = 'Condizioni'; $_MODULE['<{trustedshops}prestashop>display_products_4ccaceceffe4b5e58f6a7a7ed3ced4c4'] = 'per la protezione dell\'acquirente.'; @@ -13,8 +12,10 @@ $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_4052048c767f $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_f975f42362625cf21e592009ff4b3d7b'] = 'Registrati per la Protezione acquirente Trusted shops'; $_MODULE['<{trustedshops}prestashop>seal_of_approval_ee9ae315b086e1b1a0c8fdc6078f9add'] = 'Sigillo di Approvazione Trusted Shops - Clicca per verificare.'; $_MODULE['<{trustedshops}prestashop>seal_of_approval_750bea678eeb1d07f21fe86173288e2e'] = 'è un negozio on-line certificato con Protezione acquirente Trusted Shops. Maggiori informazioni ...'; +$_MODULE['<{trustedshops}prestashop>trustedshops_0aa7ce92297d05fc09fb9fdbe5da6be6'] = 'Questo modulo richiede l\'estensione SOAP di PHP per funzionare correttamente.'; +$_MODULE['<{trustedshops}prestashop>trustedshops_968e0f78caa7d3245c8f6f858de993d8'] = 'Sei sicuro di voler eliminare tutte le impostazioni?'; $_MODULE['<{trustedshops}prestashop>tsbpexception_79fc246c2b70963d27ebb0e9ebaab349'] = 'Si prega di contattare Trusted Shops a service@trustedshops.co.uk.'; -$_MODULE['<{trustedshops}prestashop>tsbpexception_de14ce5aee772cd0330819c0ecf76adb'] = 'Nome utente o password non valida.'; +$_MODULE['<{trustedshops}prestashop>tsbpexception_3a2a06b3a1f05cde765219211bf2e9bd'] = 'Nome utente o password non valida.'; $_MODULE['<{trustedshops}prestashop>tsbpexception_43048f232a4ebab67835c425a1113b29'] = 'Hai raggiunto il limite di credito.'; $_MODULE['<{trustedshops}prestashop>tsbpexception_eb601fb44b908fec1ee41383d4d948ac'] = 'Nessun credito a disposizione di Trusted Shops.'; $_MODULE['<{trustedshops}prestashop>tsbpexception_cb71cc86f5c38200b3821adb49966522'] = 'I dati non possono essere salvati.'; @@ -58,7 +59,6 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_982830b027a279fdc4b4b7993f $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_7e1795d054242cf7c546c1491a7c467d'] = 'DIRECTebanking.com'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_37554cc43c645833d6713b9cddda909b'] = 'moneybookers.com'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9203aec73d2ea1770f66f065c4069816'] = 'Altri metodi di pagamento'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_068ce643ff39bf2189935d14736fd10b'] = 'Sigillo di Approvazione e protezione acquirente'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f51dabfce0c8ccc01734ed38d8afe27a'] = 'Le funzioni Json devono essere attuate nella tua versione di PHP'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b1801eaadecfddd04529313a1e929262'] = 'Il certificato è valido'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_ce323cb3453812434f9abc007ba7a952'] = 'Il certificato è scaduto'; @@ -78,6 +78,7 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_97e7c9a7d06eac006a28bf0546 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_259060bb469ed1256c2e758e32da126f'] = 'Il certificato'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8512ae7d57b1396273f76fe6ed341a23'] = 'lingua'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b18f5630d5ffdfcee5ab0a44ee6e1eb6'] = 'È necessario impostare un nome utente e una password prima di qualsiasi modifica.'; +$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_068ce643ff39bf2189935d14736fd10b'] = 'Sigillo di Approvazione e protezione acquirente'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_e32263743aac776e5e32fc385d8b669a'] = 'Trusted Shops è il famoso noto Sigillo di Approvazione per i negozi online che offre anche ai clienti una protezione dell\'acquirente. Nel corso del controllo, il tuo negozio online è sottoposto a test ampi ed approfonditi. Questo controllo, che consta di oltre 100 criteri individuali, si basa sui requisiti di tutela dei consumatori, sulle leggi nazionali ed europee.'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_2c786e15a571a442adf85460e6358883'] = 'Più fiducia porta a più vendite!'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_e06f60bb083e167516a94aafd5a3a2e2'] = 'Il sigillo di approvazione Trusted Shops è il modo ottimale per aumentare la fiducia dei tuoi clienti online. Trust aumenta la propensione dei clienti a comprare da te.'; @@ -113,12 +114,8 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_23a58bf9274bedb19375e527a0 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_fd5291d7f0624933870702ff183bb14e'] = 'modulo di pagamento'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_b3b1a406e097bc87c8745db26e11904e'] = 'Aggiornalo'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_c9ba5f6e6d58162530424afaa68bf496'] = 'Configurazione Cronjob '; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9a82b12b4b1fe9b34ce7c2952f0284d2'] = 'È necessario impostare un cron Task sul server, lavorando con il certificato EXCELLENT.'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_c17d7635f5ee99ee25f7f2cc9a672c74'] = 'Il file che devi nominare:'; -$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_a3c2818ac0ecfe9beff0973388eedd69'] = 'Trusted Shops raccomanda che la richiesta sia automatizzata da un cronjob con un intervallo di 10 minuti.'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_9d36bad327b052a9bdec7003f95ce4bd'] = 'Problema con la tua lingua:'; $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_03e9e3ceaf5769311c57b5903a958e94'] = 'L\'acquirente non può acquistare più prodotti Protezione acquirente.'; -$_MODULE['<{trustedshops}prestashop>trustedshopsrating_c006c102f7e2ffef1f7c1808d5e0e54a'] = 'Valutazione del cliente'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_b20a16afda98421bbf7457ccfa50e311'] = 'Questo modulo richiede permessi di scrittura e lettura sulla directory della cache dei moduli.'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_0aa7ce92297d05fc09fb9fdbe5da6be6'] = 'Questo modulo richiede l\'estensione SOAP di PHP per funzionare correttamente.'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_1097e2b0ee70e248749f0d0a9292df56'] = 'ID Trusted Shops non valido'; @@ -152,12 +149,5 @@ $_MODULE['<{trustedshops}prestashop>trustedshopsrating_866a520be0de10a4fc8958a9e $_MODULE['<{trustedshops}prestashop>trustedshopsrating_9c6dfeed0caab43f7ff0f6bbd19b27dd'] = 'I tuoi clienti sono felici di aiutarti a ottimizzare il negozio con i loro feedback. Dopotutto, meglio funziona il tuo negozio online, e più soddisfatti saranno i tuoi clienti.'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_0fac19c0cc6e205682dd52d61dd5a0a2'] = 'Aumenta la portata tramite Facebook, Twitter e Google'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_afe906fe9448ed1b480b3eec383461de'] = 'I tuoi clienti diffondono opinioni e valutazioni su Facebook e Twitter direttamente ad amici e seguaci. Le valutazioni sono automaticamente elencate nel Google Index e vengono visualizzati in Google Shopping.'; -$_MODULE['<{trustedshops}prestashop>trustedshopsrating_273769f3a3d91979bfdb5ca4909c517a'] = 'Registrati per la valutazione del cliente Trusted shops'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_2ab78702e34e81e82ca61847300b1618'] = 'Sei soddisfatto di'; $_MODULE['<{trustedshops}prestashop>trustedshopsrating_a11109fe93f6dc4637e5b039651a4fdb'] = '? Scrivi una recensione!'; -$_MODULE['<{trustedshops}prestashop>trustedshops_0aa7ce92297d05fc09fb9fdbe5da6be6'] = 'Questo modulo richiede l\'estensione SOAP di PHP per funzionare correttamente.'; -$_MODULE['<{trustedshops}prestashop>trustedshops_9a983837b32d42343dc0c62d35b1f955'] = 'Trusted Shops Valutazione del cliente'; -$_MODULE['<{trustedshops}prestashop>trustedshops_eeae17826fa637ecca0344165514ab4e'] = 'Accrescere la fiducia dei consumatori e girare più acquirenti in clienti'; -$_MODULE['<{trustedshops}prestashop>trustedshops_968e0f78caa7d3245c8f6f858de993d8'] = 'Sei sicuro di voler eliminare tutte le impostazioni?'; - -?> \ No newline at end of file diff --git a/modules/trustedshops/lib/TSBPException.php b/modules/trustedshops/lib/TSBPException.php index 05702abfa..9c58c2a97 100644 --- a/modules/trustedshops/lib/TSBPException.php +++ b/modules/trustedshops/lib/TSBPException.php @@ -56,7 +56,7 @@ class TSBPException extends Exception // @todo : don't forget to change email in translation $mail = self::$translation_object->l('Please contact Trusted Shops at service@trustedshops.co.uk.', TSBPException::$translate_key); $errors = array( - -10001 => self::$translation_object->l('Username or password invalid.', TSBPException::$translate_key), + -10001 => self::$translation_object->l('Invalid username or password.', TSBPException::$translate_key), -10002 => self::$translation_object->l('You have reached your credit limit.', TSBPException::$translate_key), -10011 => self::$translation_object->l('No credit available from Trusted Shops.', TSBPException::$translate_key), -11111 => self::$translation_object->l('The data could not be saved.', TSBPException::$translate_key), diff --git a/modules/trustedshops/lib/TSBuyerProtection.php b/modules/trustedshops/lib/TSBuyerProtection.php index f4a9ed5bd..814618cb7 100644 --- a/modules/trustedshops/lib/TSBuyerProtection.php +++ b/modules/trustedshops/lib/TSBuyerProtection.php @@ -150,7 +150,7 @@ class TSBuyerProtection extends AbsTrustedShops 'MONEYBOOKERS' => $this->l('moneybookers.com'), 'OTHER' => $this->l('Other method of payment'), ); - $this->tab_name = $this->l('Seal of Approval and Buyer Protection'); + $this->tab_name = $this->l('Trusted Shops quality seal and buyer protection'); $this->site_url = Tools::htmlentitiesutf8('http://'.$_SERVER['HTTP_HOST'].__PS_BASE_URI__); TSBPException::setTranslationObject($this); if (!method_exists('Tools', 'jsonDecode') || !method_exists('Tools', 'jsonEncode')) @@ -675,6 +675,15 @@ class TSBuyerProtection extends AbsTrustedShops $product->name[(int)Configuration::get('PS_LANG_DEFAULT')] = 'Trustedshops'; $product->link_rewrite[(int)Configuration::get('PS_LANG_DEFAULT')] = 'trustedshops'; } + + // Add specifics translations + $id_lang = Language::getIdByIso('de'); + if ((int)$id_lang > 0) $product->name[$id_lang] = 'Trusted Shops Käuferschutz'; + $id_lang = Language::getIdByIso('en'); + if ((int)$id_lang > 0) $product->name[$id_lang] = 'Trusted Shops buyer protection'; + $id_lang = Language::getIdByIso('fr'); + if ((int)$id_lang > 0) $product->name[$id_lang] = 'Trusted Shops protection acheteur'; + $product->quantity = 1000; $product->price = ToolsCore::convertPrice($item->grossFee,Currency::getIdByIsoCode($item->currency)); $product->id_category_default = TSBuyerProtection::$CAT_ID; @@ -922,6 +931,16 @@ class TSBuyerProtection extends AbsTrustedShops } private function _displayPresentation() { + global $cookie; + $link = ''; + + if (strtolower(Language::getIsoById((int)$cookie->id_lang)) == 'de') + $link = '

          Jetzt bei Trusted Shops anmelden!


          '; + if (strtolower(Language::getIsoById((int)$cookie->id_lang)) == 'en') + $link = '

          Appy now!


          '; + if (strtolower(Language::getIsoById((int)$cookie->id_lang)) == 'fr') + $link = '

          Enregistrement Trusted Shops


          '; + return '
          logo @@ -935,7 +954,7 @@ class TSBuyerProtection extends AbsTrustedShops

          '.$this->l('Profitable and long-term customer relationship').'

          '.$this->l('For many online shoppers, the Trusted Shops Seal of Approval with Buyer Protection is an effective sign of quality for safe shopping on the internet. One-time buyers become regular customers.').'


          '.$this->l('Environment type').'

          -

          '.$this->l('You are currently using the mode :').' '.TSBuyerProtection::$ENV_API.'


          '; +

          '.$this->l('You are currently using the mode :').' '.TSBuyerProtection::$ENV_API.'


          '.$link; } private function _displayFormRegistrationLink($link = false) @@ -1172,9 +1191,9 @@ class TSBuyerProtection extends AbsTrustedShops $out = '
          '.$this->l('Cronjob configuration').''; $out .= '

          ' - .$this->l('You need to set a cron Task on your server, working with your EXCELLENT certificate.').'
          ' - .$this->l('The file you need to call:').' '.$this->getCronFilePath().'
          ' - .$this->l('Trusted Shops recommends that the request should be automated by a cronjob with an interval of 10 minutes.') + .$this->l('If you are using a Trusted Shops EXCELLENCE cetificate in your shop, set up a cron job on your web server.').'
          ' + .$this->l('Run the script file ').' '.$this->getCronFilePath().' '.$this->l('with an interval of 10 minutes.').'

          ' + .$this->l('The corresponding line in your cron file may look like this:').'
          */10 * * * * '.$this->getCronFilePath().'>/dev/null 2>&1
          ' .'

          '; $out .= '
          '; return $out; @@ -1250,6 +1269,9 @@ class TSBuyerProtection extends AbsTrustedShops TSBuyerProtection::$smarty->assign(array( 'tax_label' => 'TTC', + 'shop_id' => TSBuyerProtection::$CERTIFICATE[$lang]['tsID'], + 'price' => Product::getPriceStatic((int)$items[0]['id_product']), + 'currency_iso_code' => $items[0]['currency'], 'buyer_protection_items' => $items) ); } diff --git a/modules/trustedshops/lib/TrustedShopsRating.php b/modules/trustedshops/lib/TrustedShopsRating.php index f635c2d18..ecfddf79c 100644 --- a/modules/trustedshops/lib/TrustedShopsRating.php +++ b/modules/trustedshops/lib/TrustedShopsRating.php @@ -52,7 +52,7 @@ class TrustedShopsRating extends AbsTrustedShops 'fr' => '&et_cid=53&et_lid=3362'); public function __construct() { - $this->tab_name = $this->l('Customer Rating'); + $this->tab_name = $this->l('Trusted Shops customer rating'); // @todo : That gonna be change - Be worry it's false, countries have not the same ISO code as Languages, waiting Truste Shop's answer $this->limited_countries = $this->available_languages; @@ -107,7 +107,7 @@ class TrustedShopsRating extends AbsTrustedShops } - static public function getHttpHost($http = false, $entities = false) + public static function getHttpHost($http = false, $entities = false) { if (method_exists('Tools', 'getHttpHost')) return call_user_func(array('Tools', 'getHttpHost'), array($http, $entities)); @@ -360,6 +360,14 @@ class TrustedShopsRating extends AbsTrustedShops { global $cookie; + $link = ''; + if (strtolower(Language::getIsoById((int)$cookie->id_lang)) == 'de') + $link = '

          Jetzt bei Trusted Shops anmelden!


          '; + if (strtolower(Language::getIsoById((int)$cookie->id_lang)) == 'en') + $link = '

          Apply now!


          '; + if (strtolower(Language::getIsoById((int)$cookie->id_lang)) == 'fr') + $link = '

          Enregistrement Trusted Shops


          '; + return '
          '.$this->l('Learn More').' @@ -377,7 +385,7 @@ class TrustedShopsRating extends AbsTrustedShops

          '.$this->l('Increase reach via Facebook, Twitter and Google').'

          '.$this->l('Your customers spread reviews and rating on Facebook and Twitter directly to friends and followers. Ratings are automatically listed in the Google-Index and are displayed in Google Shopping.').'


          - '.$this->l('Register for Trusted Shops Customer Rating').' + '.$link.'

          '; } diff --git a/modules/trustedshops/lib/WidgetCache.php b/modules/trustedshops/lib/WidgetCache.php index 438aa2d53..4b50319e7 100644 --- a/modules/trustedshops/lib/WidgetCache.php +++ b/modules/trustedshops/lib/WidgetCache.php @@ -39,7 +39,7 @@ class WidgetCache public function isFresh($timeout = 10800) { if (file_exists($this->_fileName)) - return ((mktime() - filemtime($this->_fileName)) < $timeout); + return ((time() - filemtime($this->_fileName)) < $timeout); else return false; } diff --git a/modules/trustedshops/lib/index.php b/modules/trustedshops/lib/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/trustedshops/lib/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/lib/js/index.php b/modules/trustedshops/lib/js/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/trustedshops/lib/js/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/lib/js/payment.js b/modules/trustedshops/lib/js/payment.js index 1b511ed53..0d0820c5d 100644 --- a/modules/trustedshops/lib/js/payment.js +++ b/modules/trustedshops/lib/js/payment.js @@ -5,8 +5,8 @@ var TSPayment = (function() payment_module : {}, alert_message : '', module_box : { - html : '', - class : '.payment-module-label', + html : '', + ui_class : '.payment-module-label', id :'label-module-', css : { display : 'none', @@ -38,10 +38,10 @@ var TSPayment = (function() }; function hoverEffect() { - $(TSPayment.module_box.class).live('mouseover', function(){ + $(TSPayment.module_box.ui_class).live('mouseover', function(){ $(this).css({backgroundColor:'#CF0000', opacity:0.6}); }); - $(TSPayment.module_box.class).live('mouseout', function(){ + $(TSPayment.module_box.ui_class).live('mouseout', function(){ $(this).css({backgroundColor:TSPayment.module_box.css.backgroundColor, opacity:1}); }); @@ -65,6 +65,8 @@ var TSPayment = (function() var boolean = true; var payment_type = $('select[name=payment_type]').val(); var payment_module = $('select[name=payment_module]').val(); + if (payment_type != null && payment_module != null) + { $('.choosen_payment_type').each(function() { var reg = new RegExp(payment_type, 'i'); if ($(this).val() == payment_module) @@ -78,6 +80,7 @@ var TSPayment = (function() TSPayment.alert_message = 'A payment module can be choosen for only one payment type'; TSPayment.alertMessage(); + } }); } function clickRemoveFunction() diff --git a/modules/trustedshops/mails/de/index.php b/modules/trustedshops/mails/de/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/trustedshops/mails/de/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/mails/en/index.php b/modules/trustedshops/mails/en/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/trustedshops/mails/en/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/mails/es/index.php b/modules/trustedshops/mails/es/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/trustedshops/mails/es/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/mails/fr/index.php b/modules/trustedshops/mails/fr/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/trustedshops/mails/fr/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/mails/index.php b/modules/trustedshops/mails/index.php new file mode 100644 index 000000000..dce6b30f5 --- /dev/null +++ b/modules/trustedshops/mails/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/mails/it/index.php b/modules/trustedshops/mails/it/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/trustedshops/mails/it/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/trustedshops/seal_of_approval.tpl b/modules/trustedshops/seal_of_approval.tpl index 1084278c3..5d6ee2a46 100644 --- a/modules/trustedshops/seal_of_approval.tpl +++ b/modules/trustedshops/seal_of_approval.tpl @@ -31,7 +31,7 @@
          - +
          {$onlineshop_name} {l s='is a certified online shop with Trusted Shops Buyer Protection. More...' mod='trustedshops'} diff --git a/modules/trustedshops/trustedshops.php b/modules/trustedshops/trustedshops.php index 8d5a05b48..bc3d970a6 100644 --- a/modules/trustedshops/trustedshops.php +++ b/modules/trustedshops/trustedshops.php @@ -48,7 +48,7 @@ class TrustedShops extends Module global $smarty; $this->name = 'trustedshops'; $this->tab = 'payment_security'; - $this->version = 1.2; + $this->version = 1.3; parent::__construct(); @@ -76,8 +76,8 @@ class TrustedShops extends Module if (!empty($this->warnings)) $this->warning = implode(',
          ', $this->warnings).'.'; - $this->displayName = $this->l('Trusted Shops Customer Rating'); - $this->description = $this->l('Boost consumer confidence and turn more shoppers into buyers.'); + $this->displayName = $this->l('Trusted Shops trust solutions'); + $this->description = $this->l('Build confidence in your online shop with the Trusted Shops quality seal, buyer protection and customer rating.'); $this->confirmUninstall = $this->l('Are you sure you want to delete all your settings?'); } diff --git a/modules/twenga/config.xml b/modules/twenga/config.xml index e4bd6e97d..15a72ab00 100644 --- a/modules/twenga/config.xml +++ b/modules/twenga/config.xml @@ -2,11 +2,11 @@ twenga - + 1 1 - \ No newline at end of file + diff --git a/modules/twenga/de.php b/modules/twenga/de.php index f7fdb17c2..09300edc8 100644 --- a/modules/twenga/de.php +++ b/modules/twenga/de.php @@ -18,14 +18,11 @@ $_MODULE['<{twenga}prestashop>twenga_5f77daeb6fc30c87e051e5b5d11b034c'] = 'Einig $_MODULE['<{twenga}prestashop>twenga_da8ac71ff9563d9a5dd0f8894c8bc0ac'] = 'Listen Sie Ihre Produkte auf Twenga.de und verfolgen Sie die von Twenga generierten Verkäufe'; $_MODULE['<{twenga}prestashop>twenga_0ed6e223384a822859461ca6bab72256'] = 'Sie sind schon bei Twenga Ready to Sell angemeldet ? '; $_MODULE['<{twenga}prestashop>twenga_63f97ef2cb80a6cf0a8fa98453577601'] = 'Schritt 1 : Kopieren Sie Ihren Twenga Hashkey, den Sie per Email von Twenga erhalten haben oder in Ihrem Twenga Ready to Sell Konto unter (tools>tracking>hashkey) finden. Klicken auch auf \"Test das Tracking\".'; -$_MODULE['<{twenga}prestashop>twenga_5ac315e486b693637a06f490f308dc67'] = 'Schritt 2 : Kehren Sie hier zurück, und kopieren Sie den Hashkey in das Feld „hash key“. Klicken Sie auf Speichern und Aktivieren.'; $_MODULE['<{twenga}prestashop>twenga_f5cff2635ec9ecf0249d33a7656f61c5'] = 'Sie sind noch nicht bei Twenga Ready to Sell angemeldet ?'; $_MODULE['<{twenga}prestashop>twenga_f9c31cabc1e6928068e7394f5453e759'] = 'Wie listen Sie Ihre Produkte auf Twenga.de:'; $_MODULE['<{twenga}prestashop>twenga_87645feb1c92efecd6a6946d1b498fd7'] = 'Schritt 1 : Klicken auf dieses Link um sich bei Twenga Ready to Sell anzumelden.'; $_MODULE['<{twenga}prestashop>twenga_b26917587d98330d93f87808fc9d7267'] = 'melden Sie sich an'; $_MODULE['<{twenga}prestashop>twenga_1d79f46fad241d4984e47165ca578ee9'] = '(Fehler aufgetreten: Bitte kontaktieren Sie Twenga)'; -$_MODULE['<{twenga}prestashop>twenga_195b3777fa9dcc91d27b86391e7f9a49'] = 'Schritt 2 : Füllen Sie das Twenga Anmeldeformular aus '; -$_MODULE['<{twenga}prestashop>twenga_767a31e960aa760c42722d2e7373b2ad'] = 'Schritt 3 : Sobald Sie den Twenga hash-key per Email erhalten haben, kehren Sie hier zurück, und kopieren kopieren Sie den Hashkey in das Feld „hash key“. Klicken Sie auf Speichern und Aktivieren.'; $_MODULE['<{twenga}prestashop>twenga_bc88fe7063d7e7da0bf08003f21a1ad2'] = 'Steigern Sie Ihre Besucherzahlen - 500 geschenkte Klicks'; $_MODULE['<{twenga}prestashop>twenga_2d82e5a3931e70d2c94b9ba6e674edbc'] = 'Listen Sie Ihre Produkte kostenlos und erfolgsbasiert auf Twenga: Sie zahlen nur, wenn Sie auch verkaufen '; $_MODULE['<{twenga}prestashop>twenga_f9372612b4e86b53c45d31d7ca3402bb'] = 'Sehen hier Twenga Preisliste'; @@ -62,5 +59,3 @@ $_MODULE['<{twenga}prestashop>twenga_cd07439a0c70b97a595de73218094a36'] = 'Klick $_MODULE['<{twenga}prestashop>twenga_a13367a8e2a3f3bf4f3409079e3fdf87'] = 'Aktivieren'; $_MODULE['<{twenga}prestashop>twenga_09d0c75c525a2cb0bf2310e447ea8a45'] = 'Der Hash Key muss für genutzte Twenga API eingestellt werden.'; $_MODULE['<{twenga}prestashop>twenga_12a4f08255155a828e10c2c513595fe1'] = 'Einige Parameter fehlen, ansonsten existiert die Seite nicht'; - -?> \ No newline at end of file diff --git a/modules/twenga/export.php b/modules/twenga/export.php index 84a94388a..bad14002c 100644 --- a/modules/twenga/export.php +++ b/modules/twenga/export.php @@ -36,8 +36,11 @@ include_once(dirname(__FILE__).'/twenga.php'); if ((sha1(Configuration::get('TWENGA_TOKEN')._COOKIE_KEY_)) != Tools::getValue('twenga_token')) die('FATAL ERROR : INVALID TOKEN'); +if (!ini_get('safe_mode')) + @set_time_limit(300); + $export = new Twenga(); $output = $export->buildXML(); if (empty($export->_errors)) header("Content-type: text/xml; charset=utf-8"); -echo $output; \ No newline at end of file +echo $output; diff --git a/modules/twenga/index.php b/modules/twenga/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/twenga/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/twenga/lib/TwengaObj.php b/modules/twenga/lib/TwengaObj.php index e349c50b4..712e23502 100644 --- a/modules/twenga/lib/TwengaObj.php +++ b/modules/twenga/lib/TwengaObj.php @@ -530,7 +530,7 @@ class TwengaObj } } - static public function setTranslationObject(Module $object) + public static function setTranslationObject(Module $object) { self::$translation_object = $object; } @@ -542,7 +542,7 @@ class TwengaException extends Exception * @var AbsTrustedShops */ private static $translation_object; - static public function setTranslationObject(Module $object) + public static function setTranslationObject(Module $object) { self::$translation_object = $object; } diff --git a/modules/twenga/lib/index.php b/modules/twenga/lib/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/twenga/lib/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/twenga/mails/de/index.php b/modules/twenga/mails/de/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/twenga/mails/de/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/twenga/mails/en/index.php b/modules/twenga/mails/en/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/twenga/mails/en/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/twenga/mails/es/index.php b/modules/twenga/mails/es/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/twenga/mails/es/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/twenga/mails/fr/index.php b/modules/twenga/mails/fr/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/twenga/mails/fr/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/twenga/mails/index.php b/modules/twenga/mails/index.php new file mode 100644 index 000000000..dce6b30f5 --- /dev/null +++ b/modules/twenga/mails/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/twenga/mails/it/index.php b/modules/twenga/mails/it/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/twenga/mails/it/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/twenga/twenga.php b/modules/twenga/twenga.php index bbcef78e1..d830ed8ab 100644 --- a/modules/twenga/twenga.php +++ b/modules/twenga/twenga.php @@ -94,7 +94,7 @@ class Twenga extends PaymentModule * need to be in lowercase * @var array */ - public $limited_countries = array('fr', 'de', 'gb', 'uk', 'it', 'es'); + public $limited_countries = array('fr', 'de', 'gb', 'uk', 'it', 'es', 'nl'); private $_allowToWork = true; @@ -122,7 +122,7 @@ class Twenga extends PaymentModule $this->token = Tools::getValue('token'); $this->name = 'twenga'; $this->tab = 'smart_shopping'; - $this->version = '1.6'; + $this->version = '1.8'; parent::__construct(); @@ -210,6 +210,8 @@ class Twenga extends PaymentModule (($_POST['type'] == 'reset') ? $this->l('Reset') : (($_POST['type'] == 'uninstall') ? $this->l('Uninstall') : $this->l('Delete')))); + if ($_POST['type'] == 'delete') + $_POST['type'] = 'deleteModule'; $url = $_POST['base'].'&token='.$_POST['token'].'&module_name='. $_POST['module_name'].'&tab_module='.$_POST['tab_module'].'&'. $_POST['type'].'='.$_POST['module_name']; @@ -413,7 +415,7 @@ class Twenga extends PaymentModule self::$obj_ps_stats->cancelOrder(); } } catch (Exception $e) { - die($e->getMessage()); + // die($e->getMessage()); } } } @@ -444,7 +446,7 @@ class Twenga extends PaymentModule self::$obj_ps_stats->validateOrder($obj_order->total_products_wt, $obj_order->total_paid); } } catch (Exception $e) { - die($e->getMessage()); + // die($e->getMessage()); } } } @@ -524,7 +526,7 @@ class Twenga extends PaymentModule /* ** Get the current country name used literaly */ - static public function getCurrentCountryName() + public static function getCurrentCountryName() { global $cookie; @@ -1010,7 +1012,7 @@ class Twenga extends PaymentModule $category_path = (Configuration::get('PS_NAVIGATION_PIPE') != false && Configuration::get('PS_NAVIGATION_PIPE') !== '>' ) ? str_replace(Configuration::get('PS_NAVIGATION_PIPE'), '>', $category_path) : $category_path; // image tag $id_image = (isset($combination['id_image'])) ? $combination['id_image'] : 0; - if($id_image === 0) + if($id_image === 0 || $id_image < 0) { $image = $product->getCover((int)$product->id); $id_image = $image['id_image']; @@ -1031,8 +1033,18 @@ class Twenga extends PaymentModule $arr_return['designation'] = Tools::htmlentitiesUTF8($product->name[$lang].' '.Manufacturer::getNameById($product->id_manufacturer).' '.implode(' ', $model)); $arr_return['price'] = $price; $arr_return['category'] = Tools::htmlentitiesUTF8(strip_tags($category_path)); + + if (substr(_PS_VERSION_, 0, 3) == '1.3') + { + if (!Configuration::get('PS_SHOP_DOMAIN')) + Configuration::updateValue('PS_SHOP_DOMAIN', $_SERVER['HTTP_HOST']); + $prefix = 'http://'.Configuration::get('PS_SHOP_DOMAIN').'/'; + $arr_return['image_url'] = $prefix.$link->getImageLink('', $product->id.'-'.$id_image, 'large'); + } + else $arr_return['image_url'] = $link->getImageLink($product->link_rewrite[$lang], $product->id.'-'.$id_image, 'large'); + // Must description added since Twenga-module v1.1 $arr_return['description'] = is_array($product->description) ? strip_tags($product->description[$lang]) : strip_tags($product->description); $arr_return['description'] = trim($arr_return['description'].' '.strip_tags(implode(', ', $str_features))); diff --git a/modules/upscarrier/config.xml b/modules/upscarrier/config.xml index cbd7eb463..54a9489cd 100755 --- a/modules/upscarrier/config.xml +++ b/modules/upscarrier/config.xml @@ -2,7 +2,7 @@ upscarrier - + diff --git a/modules/upscarrier/de.php b/modules/upscarrier/de.php index 06b831d10..70cc20a1c 100644 --- a/modules/upscarrier/de.php +++ b/modules/upscarrier/de.php @@ -142,5 +142,3 @@ $_MODULE['<{upscarrier}prestashop>upscarrier_902b0d55fddef6f8d651fe1035b7d4bd'] $_MODULE['<{upscarrier}prestashop>upscarrier_bbb1730944c8f495534aa125411687af'] = 'UPS Webservice scheint heruntergefahren zu sein, warten Sie bitte ein paar Minuten und versuchen Sie es erneut'; $_MODULE['<{upscarrier}prestashop>upscarrier_da603f01f9ef4785e2aed2b3a2619e99'] = 'UPS Webservice hat die Zeit überschritten.'; $_MODULE['<{upscarrier}prestashop>upscarrier_755549828deba234f771ea065e24c115'] = 'Konnte keine Verbindung zu UPS.com herstellen'; - -?> \ No newline at end of file diff --git a/modules/upscarrier/fr.php b/modules/upscarrier/fr.php index a2f2e5eae..910f4bfb2 100644 --- a/modules/upscarrier/fr.php +++ b/modules/upscarrier/fr.php @@ -11,6 +11,8 @@ $_MODULE['<{upscarrier}prestashop>upscarrier_f795d6b3e974858bb6720cfc2b4d22d6'] $_MODULE['<{upscarrier}prestashop>upscarrier_fe4ee8226f826b73619fc422ca5b7382'] = 'Mot de passe UPS'; $_MODULE['<{upscarrier}prestashop>upscarrier_5e20501e9384bef70cc36012e20c49a1'] = 'MyUps ID'; $_MODULE['<{upscarrier}prestashop>upscarrier_70620de307a173fe781d1a9a575346cb'] = 'Clé API UPS'; +$_MODULE['<{upscarrier}prestashop>upscarrier_20449d3f0b6c6b9265a5cd2a470a6451'] = 'Poids du colis'; +$_MODULE['<{upscarrier}prestashop>upscarrier_bfc00de34bc04366e7fee516adf7dca5'] = 'Frais supplémentaire'; $_MODULE['<{upscarrier}prestashop>upscarrier_3d2c007374b08d6999fa43e037d54b53'] = 'Méthode de ramassage'; $_MODULE['<{upscarrier}prestashop>upscarrier_ead6e6f6c0c0be25f6275464f2ae0d3c'] = 'Type de colis'; $_MODULE['<{upscarrier}prestashop>upscarrier_885d2a3462e6b8b6ab763b95a0ce3a63'] = 'Zones tarifaires'; @@ -60,6 +62,8 @@ $_MODULE['<{upscarrier}prestashop>upscarrier_32b02316cc0c3e871dd2ba4451abbb23'] $_MODULE['<{upscarrier}prestashop>upscarrier_c4906d203203052c2119c2c27e7cef65'] = 'Votre identifiant MyUps ID'; $_MODULE['<{upscarrier}prestashop>upscarrier_e75761482891a9ad8c6a1339dd143119'] = 'Votre UPS API Key'; $_MODULE['<{upscarrier}prestashop>upscarrier_bdfcb5fba4c72a81163a0b403a25338d'] = 'Cliquez ici pour obtenir votre UPS API Key'; +$_MODULE['<{upscarrier}prestashop>upscarrier_db06a2900c66a3a2cb78fe3a470f1b85'] = 'Poids du colis'; +$_MODULE['<{upscarrier}prestashop>upscarrier_0274f749472f365e7d48a501e14793e6'] = 'Frais supplémentaire'; $_MODULE['<{upscarrier}prestashop>upscarrier_83ad4fdaf06650e6d9d7ca18f82fb975'] = 'Configuration de localisation'; $_MODULE['<{upscarrier}prestashop>upscarrier_f489118ea95c746d648d36bb50c226f0'] = 'Unité de poids'; $_MODULE['<{upscarrier}prestashop>upscarrier_659c95668841b7d6602ead454b28d4ba'] = 'L\'unité de poids de votre magasin (ex: kg ou lbs)'; @@ -87,7 +91,7 @@ $_MODULE['<{upscarrier}prestashop>upscarrier_da42caf26ef85de3d7e48e16ca60b891'] $_MODULE['<{upscarrier}prestashop>upscarrier_8d2ee0603dfce09b57d60db628cde269'] = 'Choisissez le type de paquet ...'; $_MODULE['<{upscarrier}prestashop>upscarrier_795de10b1bdcb843b3703c63ad577fc6'] = 'Choisissez dans la liste des types de paquet celui par défaut.'; $_MODULE['<{upscarrier}prestashop>upscarrier_8d6bd50f3fe3ee2f4513066c25e5fb4a'] = 'Mode de calcul'; -$_MODULE['<{upscarrier}prestashop>upscarrier_37fa4a1a7af70286d9067ac63555cbf4'] = 'Utilisation du mode de calcul : \"Tous les articles dans un seul paquet\" utilisera automatiquement la taille des emballages par défaut, le type d\'emballage et de livraison. Les configurations spécifiques pour les catégories ou un produit ne seront pas utilisées.'; +$_MODULE['<{upscarrier}prestashop>upscarrier_3169c5057093f8e6c2750f1949a0900d'] = 'Utiliser la méthode de calcul \"Tous les produits dans un colis\" utilisera automatiquement la taille de colis, le type de colis et les services de livraison par défaut. Les configurations spécifiques des catégories et des produits ne seront pas pris en compte.'; $_MODULE['<{upscarrier}prestashop>upscarrier_5cdd307ba6e260beb4801c0c10e22a3a'] = 'Service de livraison'; $_MODULE['<{upscarrier}prestashop>upscarrier_78945de8de090e90045d299651a68a9b'] = 'Disponible'; $_MODULE['<{upscarrier}prestashop>upscarrier_2d25c72c1b18e562f6654fff8e11711e'] = 'Non disponible'; diff --git a/modules/upscarrier/index.php b/modules/upscarrier/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/modules/upscarrier/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/modules/upscarrier/upscarrier.php b/modules/upscarrier/upscarrier.php index 1fdc87138..1edadfa07 100644 --- a/modules/upscarrier/upscarrier.php +++ b/modules/upscarrier/upscarrier.php @@ -45,12 +45,16 @@ class UpsCarrier extends CarrierModule private $_weightUnitList = array('KG' => 'KGS', 'KGS' => 'KGS', 'LBS' => 'LBS', 'LB' => 'LBS'); private $_moduleName = 'upscarrier'; + /* + ** Construct Method + ** + */ + public function __construct() { - set_time_limit(0); $this->name = 'upscarrier'; $this->tab = 'shipping_logistics'; - $this->version = '1.1'; + $this->version = '1.2'; $this->author = 'PrestaShop'; $this->limited_countries = array('us'); @@ -96,6 +100,8 @@ class UpsCarrier extends CarrierModule 'UPS_CARRIER_PASSWORD' => $this->l('UPS Password'), 'UPS_CARRIER_SHIPPER_ID' => $this->l('MyUps ID'), 'UPS_CARRIER_API_KEY' => $this->l('UPS API Key'), + 'UPS_CARRIER_PACKAGING_WEIGHT' => $this->l('Packaging weight'), + 'UPS_CARRIER_HANDLING_FEE' => $this->l('Handling fee'), 'UPS_CARRIER_PICKUP_TYPE' => $this->l('UPS Pickup Type'), 'UPS_CARRIER_PACKAGING_TYPE' => $this->l('UPS Packaging Type'), 'UPS_CARRIER_RATE_SERVICE_GROUP' => $this->l('UPS Rate Service Group'), @@ -421,6 +427,7 @@ class UpsCarrier extends CarrierModule private function _displayFormGeneral() { global $cookie; + $configCurrency = new Currency((int)Configuration::get('PS_CURRENCY_DEFAULT')); $html = ' {/if} {/if} - {if $field_name eq 'State:name'} + {if $field_name eq 'State:name' || $field_name eq 'state'} {assign var="stateExist" value="true"}

          @@ -242,12 +271,14 @@ $(function(){ldelim} *

          -

          +

          {if isset($id_address)}{/if} {if isset($back)}{/if} {if isset($mod)}{/if} {if isset($select_address)}{/if} + « {l s='Previous'} +

          *{l s='Required field'}

          diff --git a/themes/prestashop/addresses.tpl b/themes/prestashop/addresses.tpl index a17373371..3ac9ab616 100644 --- a/themes/prestashop/addresses.tpl +++ b/themes/prestashop/addresses.tpl @@ -24,6 +24,58 @@ * International Registered Trademark & Property of PrestaShop SA *} +{* +** Retro compatibility for PrestaShop version < 1.4.2.5 with a recent theme +*} + +{* Two variable are necessaries to display the address with the new layout system *} +{* Will be deleted for 1.5 version and more *} +{if !isset($multipleAddresses)} + {$ignoreList.0 = "id_address"} + {$ignoreList.1 = "id_country"} + {$ignoreList.2 = "id_state"} + {$ignoreList.3 = "id_customer"} + {$ignoreList.4 = "id_manufacturer"} + {$ignoreList.5 = "id_supplier"} + {$ignoreList.6 = "date_add"} + {$ignoreList.7 = "date_upd"} + {$ignoreList.8 = "active"} + {$ignoreList.9 = "deleted"} + + {* PrestaShop < 1.4.2 compatibility *} + {if isset($addresses)} + {$address_number = 0} + {foreach from=$addresses key=k item=address} + {counter start=0 skip=1 assign=address_key_number} + {foreach from=$address key=address_key item=address_content} + {if !in_array($address_key, $ignoreList)} + {$multipleAddresses.$address_number.ordered.$address_key_number = $address_key} + {$multipleAddresses.$address_number.formated.$address_key = $address_content} + {counter} + {/if} + {/foreach} + {$multipleAddresses.$address_number.object = $address} + {$address_number = $address_number + 1} + {/foreach} + {/if} +{/if} + +{* Define the style if it doesn't exist in the PrestaShop version*} +{* Will be deleted for 1.5 version and more *} +{if !isset($addresses_style)} + {$addresses_style.company = 'address_company'} + {$addresses_style.vat_number = 'address_company'} + {$addresses_style.firstname = 'address_name'} + {$addresses_style.lastname = 'address_name'} + {$addresses_style.address1 = 'address_address1'} + {$addresses_style.address2 = 'address_address2'} + {$addresses_style.city = 'address_city'} + {$addresses_style.country = 'address_country'} + {$addresses_style.phone = 'address_phone'} + {$addresses_style.phone_mobile = 'address_phone_mobile'} + {$addresses_style.alias = 'address_title'} +{/if} + @@ -80,7 +80,7 @@ {/if}

          {/if} -{if $order->recyclable} +{if $order->recyclable && isset($isRecyclable) && $isRecyclable}

           {l s='You have given permission to receive your order in recycled packaging.'}

          {/if} {if $order->gift} diff --git a/themes/prestashop/order-opc-new-account.tpl b/themes/prestashop/order-opc-new-account.tpl index a3876d3dc..a69f8a6a9 100644 --- a/themes/prestashop/order-opc-new-account.tpl +++ b/themes/prestashop/order-opc-new-account.tpl @@ -1,3 +1,23 @@ +{* +** Compatibility code for Prestashop older than 1.4.2 using a recent theme +** Ignore list isn't require here +** $address exist in every PrestaShop version +*} + +{* Will be deleted for 1.5 version and more *} +{* If ordered_adr_fields doesn't exist, it's a PrestaShop older than 1.4.2 *} +{if !isset($dlv_all_fields)} + {$dlv_all_fields.0 = 'company'} + {$dlv_all_fields.1 = 'firstname'} + {$dlv_all_fields.2 = 'lastname'} + {$dlv_all_fields.3 = 'address1'} + {$dlv_all_fields.4 = 'address2'} + {$dlv_all_fields.5 = 'postcode'} + {$dlv_all_fields.6 = 'city'} + {$dlv_all_fields.7 = 'country'} + {$dlv_all_fields.8 = 'state'} +{/if} +

          1. {l s='Account'}

          @@ -14,7 +34,7 @@
          - +

          {if isset($back)}{/if} @@ -169,7 +189,7 @@ {/foreach}

          - {if $newsletter} + {if isset($newsletter) && $newsletter}

          @@ -274,6 +294,7 @@

          + {assign var=stateExist value=false}

          {l s='Invoice address'}

          {foreach from=$inv_all_fields item=field_name} {if $field_name eq "company"} @@ -290,7 +311,7 @@

          - + {l s='DNI / NIF / NIE'} *

          @@ -329,7 +350,7 @@ *

          - {elseif $field_name eq "country"} + {elseif $field_name eq "country" || $field_name eq "Country:name"}

          *

          - {elseif $field_name eq "state"} + {elseif $field_name eq "state" || $field_name eq 'State:name'} + {$stateExist = true} + {/if}

          diff --git a/themes/prestashop/order-opc.tpl b/themes/prestashop/order-opc.tpl index 818916eee..c15722a7c 100755 --- a/themes/prestashop/order-opc.tpl +++ b/themes/prestashop/order-opc.tpl @@ -81,7 +81,7 @@ {if $productNumber} {include file="$tpl_dir./shopping-cart.tpl"} - + {if $isLogged AND !$isGuest} {include file="$tpl_dir./order-address.tpl"} {else} diff --git a/themes/prestashop/product-compare.tpl b/themes/prestashop/product-compare.tpl index 9a6a9d50f..15d028287 100644 --- a/themes/prestashop/product-compare.tpl +++ b/themes/prestashop/product-compare.tpl @@ -31,7 +31,7 @@ var max_item = "{l s='You cannot add more than' js=1} {$comparator_max_item} {l s='product(s) in the product comparator' js=1}"; //]]> -

          +

          diff --git a/themes/prestashop/product-list.tpl b/themes/prestashop/product-list.tpl index 72e03de13..66d9eb406 100644 --- a/themes/prestashop/product-list.tpl +++ b/themes/prestashop/product-list.tpl @@ -57,7 +57,7 @@ {/if} {l s='View'} {if isset($comparator_max_item) && $comparator_max_item} -

          +

          {/if}
          diff --git a/themes/prestashop/product-sort.tpl b/themes/prestashop/product-sort.tpl index a154ec652..b63f59a2a 100644 --- a/themes/prestashop/product-sort.tpl +++ b/themes/prestashop/product-sort.tpl @@ -38,20 +38,18 @@ diff --git a/themes/prestashop/product.tpl b/themes/prestashop/product.tpl index 5d7c3c421..a9e1e01d5 100644 --- a/themes/prestashop/product.tpl +++ b/themes/prestashop/product.tpl @@ -260,7 +260,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus {if $priceDisplay == 2}
          - {convertPrice price=$product->getPrice(false, $smarty.const.NULL)} {l s='tax excl.'} + {convertPrice price=$product->getPrice(false, $smarty.const.NULL, 2)} {l s='tax excl.'} {/if}

          diff --git a/themes/prestashop/products-comparison.tpl b/themes/prestashop/products-comparison.tpl index 587ed7f33..4bdcbea8b 100644 --- a/themes/prestashop/products-comparison.tpl +++ b/themes/prestashop/products-comparison.tpl @@ -44,10 +44,11 @@
          {$product->name|truncate:27:'...'|escape:'htmlall':'UTF-8'}
          {$product->description_short|strip_tags|truncate:130:'...'}
          +
          {$product->name|escape:html:'UTF-8'} - +
          {if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}

          {convertPrice price=$product->getPrice($taxes_behavior)}

          @@ -82,7 +83,7 @@ {/if}

          - {l s='Remove'} + {l s='Remove'} {l s='View'} {if (!$product->hasAttributes() OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product->minimal_quantity == 1 AND $product->customizable != 2 AND !$PS_CATALOG_MODE} {if ($product->quantity > 0 OR $product->allow_oosp)} diff --git a/themes/prestashop/shopping-cart.tpl b/themes/prestashop/shopping-cart.tpl index 1e1767aa5..fb1bc84a1 100644 --- a/themes/prestashop/shopping-cart.tpl +++ b/themes/prestashop/shopping-cart.tpl @@ -312,8 +312,26 @@
          {/if}
          {$HOOK_SHOPPING_CART}
          + +{* Define the style if it doesn't exist in the PrestaShop version*} +{* Will be deleted for 1.5 version and more *} +{if !isset($addresses_style)} + {$addresses_style.company = 'address_company'} + {$addresses_style.vat_number = 'address_company'} + {$addresses_style.firstname = 'address_name'} + {$addresses_style.lastname = 'address_name'} + {$addresses_style.address1 = 'address_address1'} + {$addresses_style.address2 = 'address_address2'} + {$addresses_style.city = 'address_city'} + {$addresses_style.country = 'address_country'} + {$addresses_style.phone = 'address_phone'} + {$addresses_style.phone_mobile = 'address_phone_mobile'} + {$addresses_style.alias = 'address_title'} +{/if} + {if (($carrier->id AND !isset($virtualCart)) OR $delivery->id OR $invoice->id) AND !$opc}
          + {if !isset($formattedAddresses)} {if $delivery->id}
          • {l s='Delivery address'}
            • @@ -336,6 +354,24 @@
          • {$invoice->country|escape:'htmlall':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'htmlall':'UTF-8'}){/if}
          {/if} + {else} + {foreach from=$formattedAddresses item=address name=myLoop} +
            +
          • {$address.object.alias}
            • + {foreach from=$address.ordered name=adr_loop item=pattern} + {assign var=addressKey value=" "|explode:$pattern} +
          • + {foreach from=$addressKey item=key name="word_loop"} + + {$address.formated[$key]|escape:'htmlall':'UTF-8'} + + {/foreach} +
            • + {/foreach} +
          + {/foreach} +

          + {/if} {if $carrier->id AND !isset($virtualCart)}

          {l s='Carrier:'}

          diff --git a/tools/geoip/index.php b/tools/geoip/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/geoip/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/tools/js_minify/index.php b/tools/js_minify/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/js_minify/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/tools/json/index.php b/tools/json/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/json/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/tools/minify_html/index.php b/tools/minify_html/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/minify_html/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/tools/pclzip/index.php b/tools/pclzip/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/pclzip/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/tools/pear/index.php b/tools/pear/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/pear/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/tools/smarty/index.php b/tools/smarty/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/smarty/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/tools/smarty/plugins/index.php b/tools/smarty/plugins/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/smarty/plugins/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/tools/smarty/sysplugins/index.php b/tools/smarty/sysplugins/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/smarty/sysplugins/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/tools/taasc/index.php b/tools/taasc/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/taasc/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/tools/tar/index.php b/tools/tar/index.php new file mode 100644 index 000000000..4e2611d37 --- /dev/null +++ b/tools/tar/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; \ No newline at end of file diff --git a/translations/de/admin.php b/translations/de/admin.php index 7d84a03c1..09439866b 100644 --- a/translations/de/admin.php +++ b/translations/de/admin.php @@ -1023,10 +1023,6 @@ $_LANGADM['AdminHome96b0141273eabab320119c467cdcaf17'] = 'Gesamt'; $_LANGADM['AdminHome004bf6c9a40003140292e97330236c53'] = 'Aktion'; $_LANGADM['AdminHome3ec365dd533ddb7ef3d1c111186ce872'] = 'Details'; $_LANGADM['AdminHome4ff2e716a7d06ce5274b4090b39abad3'] = 'Sehen'; -$_LANGADM['AdminImageResize148a7944a02795af69b75371060bdf47'] = 'Bildmaßstab ändern'; -$_LANGADM['AdminImageResize69a9a68872d80d068d8bc7b85db92a79'] = 'Sie müssen mit Ihrer Maus definieren, welche Fläche zur Erzeugung jedes einzelnen Vorschaubildtyps verwendet werden soll.'; -$_LANGADM['AdminImageResizee1b148c77b02601d08472ba7bfd274b0'] = 'Format der Vorschaubilder'; -$_LANGADM['AdminImageResize1b2bdcd2d92f8d571e35d2f795fdaefa'] = 'Alles speichern'; $_LANGADM['AdminImagesb718adec73e04ce3ec720dd11a06a308'] = 'ID'; $_LANGADM['AdminImages49ee3087348e8d44e1feda1917443987'] = 'Name'; $_LANGADM['AdminImages32954654ac8fe66a1d09be19001de2d4'] = 'Breite'; @@ -1091,6 +1087,7 @@ $_LANGADM['AdminImporte92cfa244b5eb9025d07522080468445'] = 'Ökosteuer'; $_LANGADM['AdminImport694e8d1f2ee056f98ee488bdc4982d73'] = 'Menge'; $_LANGADM['AdminImport8c489d0946f66d17d73f26366a4bf620'] = 'Gewicht'; $_LANGADM['AdminImport7a1920d61156abc05a60135aefe8bc67'] = 'Fehler'; +$_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'URL des Bildes'; $_LANGADM['AdminImportb718adec73e04ce3ec720dd11a06a308'] = 'Kennung'; $_LANGADM['AdminImportfd0dcc6233b026d257763713c133cf72'] = 'Aktiv (0/1)'; $_LANGADM['AdminImport2688a544cd5ac33f27ab78c8d8c3acaa'] = 'Nachname *'; @@ -1100,7 +1097,6 @@ $_LANGADM['AdminImporta51d7d2f3e952dfcf1e12ae572d7b337'] = 'Kennzeichen ' $_LANGADM['AdminImport5482749e99fa2d325e607075c3fd1c7a'] = 'Meta Schlüsselwörter'; $_LANGADM['AdminImport2a982c2c140ad66259355df1e2c5b69f'] = 'Meta Beschreibung'; $_LANGADM['AdminImportc1a59288c830561834340f6e7d969401'] = 'Vereinfachte URL'; -$_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'URL des Bildes'; $_LANGADM['AdminImportdf8ffb90c945e796f2cfd9265325b9c3'] = 'Kategorien (x, y, z. ..)'; $_LANGADM['AdminImport4da86e0470f0b14e4e516442202a8d26'] = 'Preis ohne MwSt.'; $_LANGADM['AdminImportf0a8011e2482cf9351b7bf565c7950ad'] = 'Preis inkl. MwSt.'; @@ -1146,7 +1142,6 @@ $_LANGADM['AdminImportbcc254b55c4a1babdf1dcb82c207506b'] = 'Telefonnr.'; $_LANGADM['AdminImport5020eaae41baf0caa37bcb73b4a12934'] = 'Mobilnummer'; $_LANGADM['AdminImport7cb32e708d6b961d476baced73d362bb'] = 'Umsatzsteuer-Identifikationsnummer'; $_LANGADM['AdminImporte81c4e4f2b7b93b481e13a8553c2ae1b'] = 'oder'; -$_LANGADM['AdminImport326e057f57e830834c20d668e44627ef'] = 'Infos'; $_LANGADM['AdminImport87aae49bd054f2cfa4b7b395dee5f2d3'] = 'Ermäßigung ungültig'; $_LANGADM['AdminImport99af56daf9ee280b15e8ed79d75f0255'] = 'Die Tag-Liste'; $_LANGADM['AdminImport998b344cff693ad388a14ba89b1523c7'] = 'ist ungültig'; @@ -1297,8 +1292,8 @@ $_LANGADM['AdminLanguagesc907a021c935ae6144fa2ccadfe9360d'] = 'Fahne:'; $_LANGADM['AdminLanguages581e03e07411d053e8c0f275f90fcabc'] = 'Landesfahne von Ihrem Rechner herunterladen'; $_LANGADM['AdminLanguages70212b3d97d23361e0ec0bc567d7ea30'] = 'Bild \"kein Bild\":'; $_LANGADM['AdminLanguages2426cdf3330e330b60bb7004015207ba'] = 'Angezeigtes Bild, wenn kein Bild verfügbar ist'; -$_LANGADM['AdminLanguages24a23d787190f2c4812ff9ab11847a72'] = 'Status:'; $_LANGADM['AdminLanguagesb9f5c797ebbf55adccdd8539a65a0241'] = 'Deaktiviert'; +$_LANGADM['AdminLanguages24a23d787190f2c4812ff9ab11847a72'] = 'Status:'; $_LANGADM['AdminLanguages4c85fb98bf7cfd94c638d0f4e4e39b92'] = 'Diese Sprache aktivieren'; $_LANGADM['AdminLanguages6ed8662bd9b7b3f59b193010be0c0f4a'] = 'Prüft, ob ein Sprachpaket für diesen ISO-Code zur Verfügung .steht...'; $_LANGADM['AdminLanguages38fb7d24e0d60a048f540ecb18e13376'] = 'Speichern'; @@ -1507,11 +1502,11 @@ $_LANGADM['AdminModulesf7c686a2f449e94bbbafca23e76dd33b'] = 'Bildsymbol-Legende' $_LANGADM['AdminModules150854c56046ef1253500d082fdfbbc2'] = 'Modul installiert und aktiviert'; $_LANGADM['AdminModules48a963c9173e950ace0c801509eb8ef2'] = 'Modul installiert, aber deaktiviert'; $_LANGADM['AdminModulesbacc7d9b8003258a090961660729a9b5'] = 'Kein Modul '; +$_LANGADM['AdminModules9ce81cf948b7325d53c64aa610851552'] = 'Diese Handlung löscht das Modul endgültig von Ihrem Server. Sind Sie wirklich sicher?'; +$_LANGADM['AdminModulesf2a6c498fb90ee345d997f888fce3b18'] = 'Löschen'; $_LANGADM['AdminModulesbcfaccebf745acfd5e75351095a5394a'] = 'Deaktivieren'; $_LANGADM['AdminModules2faec1f9f8cc7f8f40d521c4dd574f49'] = 'Aktivieren'; $_LANGADM['AdminModulesf1206f9fadc5ce41694f69129aecac26'] = 'Konfigurieren'; -$_LANGADM['AdminModules9ce81cf948b7325d53c64aa610851552'] = 'Diese Handlung löscht das Modul endgültig von Ihrem Server. Sind Sie wirklich sicher?'; -$_LANGADM['AdminModulesf2a6c498fb90ee345d997f888fce3b18'] = 'Löschen'; $_LANGADM['AdminModules3488a51eb7f723d65daeff912e69b177'] = 'Gewälte Filter'; $_LANGADM['AdminModulesPositions51a8b3a61ad63d4e5df2ce86870e39b8'] = 'Modul hinzufügen'; $_LANGADM['AdminModulesPositions498f79c4c5bbde77f1bceb6c86fd0f6d'] = 'Zeigen'; @@ -1743,7 +1738,6 @@ $_LANGADM['AdminPaymentcf7da676516ac041a93fd91755fa40f9'] = 'Keine Zahlungsmodul $_LANGADM['AdminPayment3e15057a39314e679d553bd9b6522ec8'] = 'Währung des Kunden'; $_LANGADM['AdminPaymentcdf4c2da827655c1ea74209dd683c903'] = 'Standard-Währung'; $_LANGADM['AdminPaymente39a06ebd5bb473161c5dff3c79c80a5'] = 'Speichern'; -$_LANGADM['AdminPerformance488d2e9e9b539c0ff188844a062afa48'] = 'Zur Benutzung von Memcached müssen Sie die Memcache PECL-Erweiterung auf Ihrem Server installieren.'; $_LANGADM['AdminPerformance3d064d5efb6cf2ed52cf72bfef7c7db2'] = 'Zur Verwendung des Ordners CacheFS'; $_LANGADM['AdminPerformancea9b036d3e91d53892d6a67c31327e456'] = 'muss die Schreibrechte haben'; $_LANGADM['AdminPerformancef8d698aea36fcbead2b9d5359ffca76f'] = 'Smarty'; @@ -1855,9 +1849,6 @@ $_LANGADM['AdminPreferencesbbd6622dbbdf4bcb166f5e3f018a2351'] = 'Hier klicken, u $_LANGADM['AdminPreferences0db377921f4ce762c62526131097968f'] = 'Allgemein'; $_LANGADM['AdminPreferences93cba07454f06a4a960172bbd6e2a435'] = 'Ja'; $_LANGADM['AdminPreferencesbafd7322c6e97d25b6299b5d6fe8920b'] = 'Nein'; -$_LANGADM['AdminPreferences9db16b0de8024dbd5267e53827679905'] = 'Führen Sie folgende Schritte durch, um ein neues Thema zu verwenden:'; -$_LANGADM['AdminPreferences47c255b10709674b30820470b0b62f35'] = 'Importieren Sie Ihr Thema, indem Sie dieses Modul verwenden:'; -$_LANGADM['AdminPreferences7caa930a3a7d493e8b6e1b052da477b0'] = 'Themen-Installer'; $_LANGADM['AdminPreferences64915993f11c4fbd47d8a6465f44125c'] = 'Wenn Ihr Thema importiert ist, wählen Sie das Thema bitte auf dieser Seite aus'; $_LANGADM['AdminPreferences21034ae6d01a83e702839a72ba8a77b0'] = 'ohne MwSt.'; $_LANGADM['AdminPreferencesc770d8e0d1d1943ce239c64dbd6acc20'] = 'Nehmen Sie meinen IP'; @@ -2059,12 +2050,12 @@ $_LANGADM['AdminProductse2e79605fc9450ec17957cf0e910f5c6'] = 'mit MwSt.'; $_LANGADM['AdminProducts887ee91702c962a70b87cbef07bbcaec'] = 'ohne MwSt.'; $_LANGADM['AdminProducts6aa641a49246a5538f692e9884fbe96e'] = 'Sie können mehrere Ermäßigungen und spezifische Preisregeln in der Registerkarte definieren'; $_LANGADM['AdminProducts90a38214f3409698c7110ce3217b7f22'] = 'Warenbewegung:'; -$_LANGADM['AdminProducts61fa2d8712a070d9bab490ceb5bd6fe8'] = 'Wählen Sie den Grund und geben Sie die Menge an, um die Sie Ihren Lagerbestand erhöhen oder reduzieren wollen'; $_LANGADM['AdminProducts3c6c92395ebfd9ba66296793ee901854'] = 'Ursprünglicher Lagerbestand:'; $_LANGADM['AdminProducts006b4cc15322f7951d9100716edcac07'] = 'Mindestmenge:'; $_LANGADM['AdminProductsb287d004082f0d743a49dc7360d4fbbe'] = 'Mindestmenge für die Bestellung dieses Produkts (1 definieren zum Deaktivieren dieser Funktion)'; $_LANGADM['AdminProducts3b8c1da80dae1d62561a6d04d2f68dd5'] = 'Lagerbestand:'; $_LANGADM['AdminProducts6606420385ad3fd14c70b8ffa210e407'] = 'Sie verwendeten Varianten, daher können Sie Ihren Lagerbestand nicht hier bearbeiten, sondern nur in der Registerkarte \"Varianten\"'; +$_LANGADM['AdminProductsd74838fbbeb384c01d7294db33c36ec3'] = 'Die Lagerverwaltung ist deaktiviert'; $_LANGADM['AdminProducts10b8ce36a973c8009b521b39488a89a7'] = 'Zusätzliche Versandkosten'; $_LANGADM['AdminProductsb6ef48322d4d59004db9f650344c1a8f'] = 'Dazu kommt die Transportsteuer.'; $_LANGADM['AdminProducts3e565755572fa5df48eb811c62619098'] = 'Nachricht, wenn auf Lager:'; @@ -2076,6 +2067,7 @@ $_LANGADM['AdminProducts119a7c88cf8f1c685c57981abff26f43'] = 'Bestellungen anneh $_LANGADM['AdminProductse5f7f63d66023847e693fd34bea09d41'] = 'Standardeinstellung:'; $_LANGADM['AdminProducts0871f875dff8224be3247ccedea01024'] = 'wie gesetzt in'; $_LANGADM['AdminProductsd0834fcec6337785ee749c8f5464f6f6'] = 'Voreinstellugen'; +$_LANGADM['AdminProducts9d9aa88574c4dab04ddd8356c377357d'] = 'Standard-Kategorie:'; $_LANGADM['AdminProductsd88946b678e4c2f251d4e292e8142291'] = 'SEO'; $_LANGADM['AdminProducts2651608f8f1c6f391f919be228a6ee62'] = 'Klicken Sie hier, um Ihre Position in den Suchmaschinen (SEO) zu verbessern'; $_LANGADM['AdminProducts7b250cb374c12c42a75227ba75df7779'] = 'Metatitel'; @@ -2181,7 +2173,6 @@ $_LANGADM['AdminProductsd1a1006c2d7ebf87d5e4d934a138e5a5'] = 'Sie müssen dieses $_LANGADM['AdminProducts4492081ca02b059f9e8af4ddaf0f7292'] = 'Paket'; $_LANGADM['AdminProducts2811dedc85918c3e3ed0becd87cbb336'] = 'Sie können dem Produktbüdel keine downloadbaren Produkte hinzufügen'; $_LANGADM['AdminProductsc7a915a59b56dc898c0ae52b64bed0c5'] = 'Dem Paket ein Objekt hinzufügen'; -$_LANGADM['AdminProducts9d9aa88574c4dab04ddd8356c377357d'] = 'Standard-Kategorie:'; $_LANGADM['AdminProducts10cbdb4839f838ce30409739435a6070'] = 'Katalog:'; $_LANGADM['AdminProductsb61bd19699eab41bbcdabc42f83af268'] = 'Denken Sie daran, die Standard-Kategorie zu ändern.'; $_LANGADM['AdminProducts74645ed4e5e25461a664d5f68ff19098'] = 'Klicken Sie die Kategorie(n) an, in der das Produkt erscheinen soll'; @@ -2785,7 +2776,6 @@ $_LANGADM['AdminTrackingeadcead196002163653bd0e9be7b6d5e'] = 'Dieses Produkt än $_LANGADM['AdminTrackingdcc4db89d62ec3e757428a5811553c0b'] = 'Möchten Sie löschen'; $_LANGADM['AdminTracking0449f210068787074ce58175b1a2f5cf'] = 'Dieses Produkt löschen'; $_LANGADM['AdminTranslations91aaf01cad2d0dc0382edb323ed6e51a'] = 'Kann Ordner nicht erstellen'; -$_LANGADM['AdminTranslations498ceaf940d61e880e87f93d76a11e05'] = 'Überprüfen Sie die Berechtigungen des Ordners.'; $_LANGADM['AdminTranslationsd797353e4c5b71edce10d34557198b81'] = 'Sie müssen 2 Sprachen wählen, um die Daten aus der Quelle ins Ziel zu kopieren'; $_LANGADM['AdminTranslationsf31ffb564b1c234d509f4b20fbb2d068'] = 'Sie müssen 2 Themen wählen, um die Daten von einer Seite zur anderen zu kopieren'; $_LANGADM['AdminTranslationsb0f0554e563b8ffcabe170739d126bb1'] = 'ein Fehler ist beim Kopieren der Daten aufgetreten'; @@ -2806,7 +2796,6 @@ $_LANGADM['AdminTranslations404b4271ee96d691668bdf528724d337'] = 'Wählen Sie ei $_LANGADM['AdminTranslations2e8d630dcde90b8b5be0468678f88551'] = 'Import / Export von Übersetzungen'; $_LANGADM['AdminTranslations763d71969e7ee9bff4e5dc8976501f33'] = 'Sprache hinzfügen/aktualisieren'; $_LANGADM['AdminTranslationsd8f73c2c197bf664e07849db8cff86d8'] = 'Sie können das Sprachpaket von prestashop.com direkt von hier aus aktualisieren. '; -$_LANGADM['AdminTranslationsa9ba88b8d248e9e06ab46a376d147df1'] = 'Falls Sie sich für ein Update entscheiden, werden alle benutzerdefinierte Übersetzungen im Thema \"Prestashop\" verloren gehen. Das betrifft ebenfalls die Übersetzungen für FrontEnd und alle E-Mails. '; $_LANGADM['AdminTranslations4cfef51ba8ab14fc4de1439f1ed1e430'] = 'Sprache, die Sie hinzufügen/aktualisieren möchten:'; $_LANGADM['AdminTranslations369b8db3e9651d0b5d8a13a5f7f9a53a'] = 'Sprachen hinzufügen'; $_LANGADM['AdminTranslations57fa5be19cbdbe09aa4f555b2ee710b3'] = 'Sprachpaket aktualisieren'; @@ -2875,6 +2864,58 @@ $_LANGADM['AdminTranslations52d83d7ed502b33d300a8c0af2c5b455'] = 'Themenliste - $_LANGADM['AdminTranslationsc21f969b5f03d33d43e04f8f136e7682'] = 'Standardmäßig'; $_LANGADM['AdminTranslationsa9e4402481bd9b8e36752bf731f67eb6'] = 'Thema'; $_LANGADM['AdminTranslations53b3cae42737979c884275593a01f468'] = 'Modul:'; +$_LANGADM['AdminUpgrade19f823c6453c2b1ffd09cb715214813d'] = 'Pflichtfelder'; +$_LANGADM['AdminUpgrade760c4026bc5a0bd5378e6efc3f1370b4'] = 'Zu lang!'; +$_LANGADM['AdminUpgrade4f2e28904946a09d8c7f36dd3ee72457'] = 'Die Felder sind unterschiedlich!'; +$_LANGADM['AdminUpgrade43b01d1a6c5065545c65f42003b0ab5c'] = 'Falsche Adresse!'; +$_LANGADM['AdminUpgrade2e170dfd78c2171a25605ececc0950a4'] = 'Kann E-Mail nicht senden!'; +$_LANGADM['AdminUpgrade6deee80e4bdb8894331994116818558e'] = 'Fehler beim Erstellen der Konfigurationsdatei, wenn die Datei /config/ settings.inc.php existiert, geben Sie ihr bitte die offiziellen Schreibrechte, ansonsten erstellen Sie bitte eine Datei settings.inc.php im Konfigurationsverzeichnis (/config/)'; +$_LANGADM['AdminUpgradeaa946cb00b1c23ff6553b6f9e05da151'] = 'Die Settings-Datei konnte nicht geschrieben werden, erstellen Sie bitte eine Datei namens settings.inc.php in Ihrem Konfigurationsverzeichnis.'; +$_LANGADM['AdminUpgradee930e2474c664a3a7e89ecfb8793694b'] = 'Kann Datei nicht senden!'; +$_LANGADM['AdminUpgrade774fc7a0f56391abc5d8856f2436ca07'] = 'Die Integrität der Daten ist nicht bestätigt.'; +$_LANGADM['AdminUpgrade8fd007bf08e0717537825a3e91cb4fcc'] = 'Kann den Inhalt einer *.sql-Datei nicht lesen.'; +$_LANGADM['AdminUpgradec71e825f6873f64b91efc26313614eab'] = 'Kann nicht auf den Inhalt einer *.sql-Datei zugreifen.'; +$_LANGADM['AdminUpgrade3d5c8f1d29b1a1dc4ea0673122e0d277'] = 'Fehler beim Einfügen in die Datenbank:'; +$_LANGADM['AdminUpgrade17e1581d01152347bfaacd153b961379'] = 'Falsches Kennwort (alpha-numerischer String aus mindestens 8 Zeichen)'; +$_LANGADM['AdminUpgrade9b9f3b2f8a4dffcad9188c8fc4b468c8'] = 'Eine PrestaShop Datenbank existiert bereits mit diesem Präfix, Sie müssen sie manuell löschen oder das Präfix ändern.'; +$_LANGADM['AdminUpgradebc5e1163a15106f9e941a7603124709d'] = 'Dies ist kein gültiger Name.'; +$_LANGADM['AdminUpgradea9d82945b8603f0c8807958d7db9a24d'] = 'Dies ist kein gültiges Bild.'; +$_LANGADM['AdminUpgradeb37eef07b764ea58eec9afe624e20a40'] = 'Fehler beim Erstellen der Datei /config/settings.inc.php.'; +$_LANGADM['AdminUpgrade3d9f514d46849760ef1b1412e314fd99'] = 'Fehler:'; +$_LANGADM['AdminUpgrade504053ab4c6d648edf11624f1bea4bb4'] = 'Diese PrestaShop-Datenbank existiert schon, bitte bestätigen Sie der Datenbank erneut Ihre Kennungen.'; +$_LANGADM['AdminUpgraded7a99f61bb284d096ea4f221784af85a'] = 'Bei der Änderung des Bildmaßstabs ist ein Fehler aufgetreten.'; +$_LANGADM['AdminUpgrade428c933bafbf262d693fbf1c22c03e5d'] = 'Die Datenbank wurde gefunden!'; +$_LANGADM['AdminUpgrade76bd190129b7aefb90fdf42f09ec3ec7'] = 'Der Datenbank-Server steht zur Verfügung, aber die Datenbank wurde nicht gefunden'; +$_LANGADM['AdminUpgrade045f4b5c3f990e5a26e2837495d68259'] = 'Der Datenbank-Server wurde nicht gefunden, bitte prüfen Sie Ihren Benutzernamen oder den Server-Namen.'; +$_LANGADM['AdminUpgrade757fc72e8d69106dd2cf9da22cc7adb1'] = 'Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte prüfen Sie Ihre Einstellungen.'; +$_LANGADM['AdminUpgraded18ad19290b3bfc3cd0d7badbb6cb6a3'] = 'Kann Bild /img/logo.jpg nicht schreiben. Falls es bereits existiert, löschen Sie es bitte manuell.'; +$_LANGADM['AdminUpgrade2368e33e3e01d53abb9b60061ab83903'] = 'Die gesendete Datei überschreitet die maximal zulässige Größe.'; +$_LANGADM['AdminUpgradea10ef376d9f4c877ac86d8e4350116bf'] = 'Die gesendete Datei überschreitet die maximal zulässige Größe.'; +$_LANGADM['AdminUpgradef8fe8cba1625eaf8e5c253b041d57dbd'] = 'Die Datei wurde teilweise gesendet.'; +$_LANGADM['AdminUpgrade8c9067e52e4440d8a20e74fdc745b0c6'] = 'Es ist keine Datei gesandt worden'; +$_LANGADM['AdminUpgrade2384d693d9af53b4727c092af7570a19'] = 'Der temporäre Ordner Ihrer empfangenen Dateisendungen fehlt. Bitte wenden Sie sich an Ihren Systemadministrator.'; +$_LANGADM['AdminUpgradef5985b2c059d5cc36968baab7585baba'] = 'Kann die Datei nicht auf die Festplatte schreiben'; +$_LANGADM['AdminUpgrade9e54dfe54e03b0010c1fe70bd65cd5e6'] = 'Datei Senden unterbrochen aufgrund falscher Erweiterung'; +$_LANGADM['AdminUpgrade32af3a59b50e98d254d6c03c5b320a94'] = 'Kann die Daten aus Ihrer Datenbank nicht in UTF-8 zu konvertieren.'; +$_LANGADM['AdminUpgrade989a45a4ca01ee222f4370172bf8850d'] = 'Ungültiger Shopname'; +$_LANGADM['AdminUpgrade68499acecfba9d3bf0ca8711f300d3ed'] = 'Ihr Vorname enthält ungültige Zeichen'; +$_LANGADM['AdminUpgrade2399cf4ca7b49f2706f6e147a32efa78'] = 'Ihr Nachname enthält ungültige Zeichen'; +$_LANGADM['AdminUpgrade7d72600fcff52fb3a2d2f73572117311'] = 'Ihr Datenbank-Server unterstützt keinen UTF-8-Zeichensatz.'; +$_LANGADM['AdminUpgrade5b9bbadcf96f15e7f112c13a9e5f076e'] = 'Diese Datenbank-Engine wird nicht unterstützt, bitte wählen Sie eine andere als MyISAM'; +$_LANGADM['AdminUpgrade24b481455c1b72b0c2539e7d516b9582'] = 'Die Datei /img/logo.jpg kann nicht geschrieben werden, bitte ändern Sie die Dateirechte mit CHMOD 755 oder CHMOD 777'; +$_LANGADM['AdminUpgrade5746b74663148afffd1350c97d4fcdfe'] = 'Feld Katalog-Modus ungültig'; +$_LANGADM['AdminUpgradedafe44b99256a7783bc37f4f949da373'] = 'Der Installer ist zu alt.'; +$_LANGADM['AdminUpgrade37ce0f29c7377c827e7247fe5645a782'] = 'Sie besitzen bereits die Version. %s'; +$_LANGADM['AdminUpgrade89928a14f2090aec4fd7aff9ea983f95'] = 'Keine frühere Version erkannt. Haben Sie die Datei settings.inc.php aus dem Ordner config gelöscht oder umbenannt?'; +$_LANGADM['AdminUpgrade5276a8cbd9e3e467396089b267564f51'] = 'Die Datei config/settings.inc.php wurde nicht gefunden. Haben Sie sie gelöscht oder umbenannt?'; +$_LANGADM['AdminUpgrade24784d9e80638781b74c017b33d8ca0c'] = 'Kann eine der SQL-Update-Dateien nicht finden. Bitte stellen Sie sicher, dass der Ordner /install/sql/upgrade nicht leer ist.'; +$_LANGADM['AdminUpgrade580e4b216e324f675f0237cdb34b6c2d'] = 'Kein Update verfügbar'; +$_LANGADM['AdminUpgradef15e7e7292b0c72894cf45a893e0d497'] = 'Fehler beim Öffnen der SQL-Datei'; +$_LANGADM['AdminUpgradeb8286438fbb6c7df9129fadc5316c19f'] = 'Fehler beim Einfügen in die Datenbank'; +$_LANGADM['AdminUpgrade229ee8046cafc09ddaf46fb9db710e91'] = 'Leider'; +$_LANGADM['AdminUpgradee805a556799b7cef40e9760c81d99218'] = 'Es sind SQL-Fehler aufgetreten.'; +$_LANGADM['AdminUpgrade5627353fd6ac678497af3ece05087068'] = 'Die Datei config/defines.inc.php wurde nicht gefunden. Wo ist sie?'; +$_LANGADM['AdminUpgrade783e8e29e6a8c3e22baa58a19420eb4f'] = 'Sekunden'; $_LANGADM['AdminWebservice897356954c2cd3d41b221e3f24f99bba'] = 'Key'; $_LANGADM['AdminWebservice00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Aktiviert'; $_LANGADM['AdminWebservice52699c78843b98f98620186a59b0a3fa'] = 'Kernbeschreibung'; diff --git a/translations/en/admin.php b/translations/en/admin.php index c1b32d59c..beeb19c21 100644 --- a/translations/en/admin.php +++ b/translations/en/admin.php @@ -965,10 +965,6 @@ $_LANGADM['AdminHomecee29d02d7ad25fd9176ecbc904da1dd'] = 'Use the PrestaShop for $_LANGADM['AdminHome900edb9167aaeeee689f86dcf6161a85'] = 'Go to forums.prestashop.com'; $_LANGADM['AdminHome00b15e76a26c64855d9c2f192aeca395'] = 'Enhance your Shop with new templates & modules'; $_LANGADM['AdminHome6ff90eb1e2b56a58dd748d793eaa1d07'] = 'Go to addons.prestashop.com'; -$_LANGADM['AdminImageResize148a7944a02795af69b75371060bdf47'] = 'Image resize'; -$_LANGADM['AdminImageResize69a9a68872d80d068d8bc7b85db92a79'] = 'Using your mouse, define which area of the image is to be used for generating each type of thumbnail.'; -$_LANGADM['AdminImageResizee1b148c77b02601d08472ba7bfd274b0'] = 'Thumbnails format'; -$_LANGADM['AdminImageResize1b2bdcd2d92f8d571e35d2f795fdaefa'] = ' Save all '; $_LANGADM['AdminImagesb718adec73e04ce3ec720dd11a06a308'] = 'ID'; $_LANGADM['AdminImages49ee3087348e8d44e1feda1917443987'] = 'Name'; $_LANGADM['AdminImages32954654ac8fe66a1d09be19001de2d4'] = 'Width'; diff --git a/translations/es/admin.php b/translations/es/admin.php index 8030c2430..2b94a430b 100644 --- a/translations/es/admin.php +++ b/translations/es/admin.php @@ -420,7 +420,6 @@ $_LANGADM['AdminCountries00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activado'; $_LANGADM['AdminCountries5252b12033d3181aa8270eea2fd4c4d4'] = 'Opciones de Países '; $_LANGADM['AdminCountriesd14d3384847c11b0708990b3343c8dbf'] = 'País por defecto:'; $_LANGADM['AdminCountriesb017db41a29dff4007de058af406341e'] = 'El país por defecto utilizado en la tienda'; -$_LANGADM['AdminCountriese2f569724965f1081bab1ca3b2b1637b'] = 'Mostrará su último diseño guardo'; $_LANGADM['AdminCountriesa86a021f16a103f44a8aa1c06e484831'] = 'Mostrará un diseño por defecto para este país'; $_LANGADM['AdminCountriesfc6bff84b96cbd12e8b2acb2cbe4c979'] = 'Mostrará'; $_LANGADM['AdminCountries96cddc4940425c2e51164e6f53ca3acf'] = 'Eliminará el actual diseño'; @@ -1032,10 +1031,6 @@ $_LANGADM['AdminHome96b0141273eabab320119c467cdcaf17'] = 'Total'; $_LANGADM['AdminHome004bf6c9a40003140292e97330236c53'] = 'Acción'; $_LANGADM['AdminHome3ec365dd533ddb7ef3d1c111186ce872'] = 'Detalles'; $_LANGADM['AdminHome4ff2e716a7d06ce5274b4090b39abad3'] = 'Ver'; -$_LANGADM['AdminImageResize148a7944a02795af69b75371060bdf47'] = 'Cambiar tamaño de imagen'; -$_LANGADM['AdminImageResize69a9a68872d80d068d8bc7b85db92a79'] = 'Use el ratón, puede usar el área seleccionada para generar cada miniatura.'; -$_LANGADM['AdminImageResizee1b148c77b02601d08472ba7bfd274b0'] = 'Formato de las viñetas'; -$_LANGADM['AdminImageResize1b2bdcd2d92f8d571e35d2f795fdaefa'] = 'Guardar todo'; $_LANGADM['AdminImagesb718adec73e04ce3ec720dd11a06a308'] = 'ID'; $_LANGADM['AdminImages49ee3087348e8d44e1feda1917443987'] = 'Nombre'; $_LANGADM['AdminImages32954654ac8fe66a1d09be19001de2d4'] = 'Ancho'; @@ -1082,10 +1077,6 @@ $_LANGADM['AdminImagesed13a29f9258d2b988ea7ba9d11de98b'] = 'Desmarcar esta casil $_LANGADM['AdminImages729a51874fe901b092899e9e8b31c97a'] = '¿Está seguro?'; $_LANGADM['AdminImages874d3deed67e503cac1d8bc00417794a'] = 'Mover las imágenes'; $_LANGADM['AdminImages0be9bdbde253c5d649e8667c0bae6754'] = 'Un nuevo sistema de almacenamiento de imágenes de los productos ahora es utilizado por PrestaShop. Ofrece un mejor rendimiento si su tienda tiene un número muy grande de productos.'; -$_LANGADM['AdminImages4525f5cc5925f887779671be2eff49bf'] = 'Usted puede decidir mantener sus imágenes almacenadas en el sistema anterior - ningun problema.'; -$_LANGADM['AdminImages92437a9467721bd29351629f589346c7'] = 'Usted puede también decidir de mover sus imágenes al nuevo sistema de almacenamiento: en este caso, clic en \"Mover las imágenes\" sobre el botón abajo.'; -$_LANGADM['AdminImages8f3f9e6c2209c2030fba5075950e7333'] = 'Después de mover todas las imágenes de sus productos, para el mejor rendimiento tiene que ir a \"Preferencias> Productos\" y pongar \"Activar compatibilidad con las imágenes anteriores.\" en NO.'; -$_LANGADM['AdminImages3c6b150298509e0b4f4fda934b8e5fcf'] = 'Si el proceso esta parado antes de completarse, puede hacer clic en \"Mover las imágenes\" de nuevo para reanudar el movimiento de las imágenes '; $_LANGADM['AdminImportaf1b98adf7f686b84cd0b443e022b7a0'] = 'Categorías'; $_LANGADM['AdminImport068f80c7519d0528fb08e82137a72131'] = 'Productos'; $_LANGADM['AdminImportb9208b03bcc9eb4a336258dcdcb66207'] = 'Declinaciones'; @@ -1106,6 +1097,7 @@ $_LANGADM['AdminImporte92cfa244b5eb9025d07522080468445'] = 'Ecotasa'; $_LANGADM['AdminImport694e8d1f2ee056f98ee488bdc4982d73'] = 'Cantidad'; $_LANGADM['AdminImport8c489d0946f66d17d73f26366a4bf620'] = 'Peso'; $_LANGADM['AdminImport7a1920d61156abc05a60135aefe8bc67'] = 'Por defecto'; +$_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'imagen URL'; $_LANGADM['AdminImportb718adec73e04ce3ec720dd11a06a308'] = 'ID'; $_LANGADM['AdminImportfd0dcc6233b026d257763713c133cf72'] = 'Activo (0/1)'; $_LANGADM['AdminImport2688a544cd5ac33f27ab78c8d8c3acaa'] = 'Nombre*'; @@ -1115,7 +1107,6 @@ $_LANGADM['AdminImporta51d7d2f3e952dfcf1e12ae572d7b337'] = 'Meta-título'; $_LANGADM['AdminImport5482749e99fa2d325e607075c3fd1c7a'] = 'Meta-palabras clave'; $_LANGADM['AdminImport2a982c2c140ad66259355df1e2c5b69f'] = 'Meta-descripción'; $_LANGADM['AdminImportc1a59288c830561834340f6e7d969401'] = 'URL reescrita'; -$_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'imagen URL'; $_LANGADM['AdminImportdf8ffb90c945e796f2cfd9265325b9c3'] = 'Categorías (x,y,z...)'; $_LANGADM['AdminImport4da86e0470f0b14e4e516442202a8d26'] = 'Precio sin IVA'; $_LANGADM['AdminImportf0a8011e2482cf9351b7bf565c7950ad'] = 'Precio IVA incluído'; @@ -1263,7 +1254,6 @@ $_LANGADM['AdminInvoices23bf11ceb4fb51647fd977aba60246d3'] = 'Activar o desactiv $_LANGADM['AdminInvoices832d6a06e91e49828a89fb1ca4651d37'] = 'Prefijo de factura:'; $_LANGADM['AdminInvoices0df35f41ce9f64e7f14819bd4145a2be'] = 'Prefijo utilizado para las facturas'; $_LANGADM['AdminInvoicesdb2d9ca9b008f4cdb2c5902adaa84fdc'] = 'Número de factura:'; -$_LANGADM['AdminInvoicese95a5af4294af7f4d566e91fc28a84c0'] = 'La próxima factura comenzará por este número, que se incrementará con cada nueva factura. 0 corresponde al número en curso (#'; $_LANGADM['AdminInvoicesc491f71acb93db711c341417e8c6be9e'] = 'Imprimir facturas en PDF'; $_LANGADM['AdminInvoices9a0a4f0869ab12a21407047290750e7a'] = 'Por fecha'; $_LANGADM['AdminInvoices1e6d57e813355689e9c77e947d73ad8f'] = 'Desde:'; @@ -1313,8 +1303,8 @@ $_LANGADM['AdminLanguagesc907a021c935ae6144fa2ccadfe9360d'] = 'Bandera:'; $_LANGADM['AdminLanguages581e03e07411d053e8c0f275f90fcabc'] = 'Subir bandera del país desde su ordenador'; $_LANGADM['AdminLanguages70212b3d97d23361e0ec0bc567d7ea30'] = 'Imagen \"Sin Imagen\":'; $_LANGADM['AdminLanguages2426cdf3330e330b60bb7004015207ba'] = 'Imagen para mostrar cuando \"no se encuentra la imagen\"'; -$_LANGADM['AdminLanguages24a23d787190f2c4812ff9ab11847a72'] = 'Estado:'; $_LANGADM['AdminLanguagesb9f5c797ebbf55adccdd8539a65a0241'] = 'Desactivado'; +$_LANGADM['AdminLanguages24a23d787190f2c4812ff9ab11847a72'] = 'Estado:'; $_LANGADM['AdminLanguages4c85fb98bf7cfd94c638d0f4e4e39b92'] = 'Permitir o no que el cliente seleccione este idioma'; $_LANGADM['AdminLanguages6ed8662bd9b7b3f59b193010be0c0f4a'] = 'Compruebe si un paquete de idiomas se encuentra disponible para este código ISO...'; $_LANGADM['AdminLanguages38fb7d24e0d60a048f540ecb18e13376'] = 'Guardar'; @@ -1523,11 +1513,11 @@ $_LANGADM['AdminModulesf7c686a2f449e94bbbafca23e76dd33b'] = 'Leyenda de iconos'; $_LANGADM['AdminModules150854c56046ef1253500d082fdfbbc2'] = 'Módulo instalado y activado'; $_LANGADM['AdminModules48a963c9173e950ace0c801509eb8ef2'] = 'Módulo instalado pero desactivado'; $_LANGADM['AdminModulesbacc7d9b8003258a090961660729a9b5'] = 'Ningún módulo'; +$_LANGADM['AdminModules9ce81cf948b7325d53c64aa610851552'] = 'Esta acción suprime definitivamente el módulo de su servidor. ¿Está realmente seguro?'; +$_LANGADM['AdminModulesf2a6c498fb90ee345d997f888fce3b18'] = 'Suprimir'; $_LANGADM['AdminModulesbcfaccebf745acfd5e75351095a5394a'] = 'Desactivar'; $_LANGADM['AdminModules2faec1f9f8cc7f8f40d521c4dd574f49'] = 'Activar'; $_LANGADM['AdminModulesf1206f9fadc5ce41694f69129aecac26'] = 'Configurar'; -$_LANGADM['AdminModules9ce81cf948b7325d53c64aa610851552'] = 'Esta acción suprime definitivamente el módulo de su servidor. ¿Está realmente seguro?'; -$_LANGADM['AdminModulesf2a6c498fb90ee345d997f888fce3b18'] = 'Suprimir'; $_LANGADM['AdminModules3488a51eb7f723d65daeff912e69b177'] = 'Filtros seleccionados'; $_LANGADM['AdminModulesPositions51a8b3a61ad63d4e5df2ce86870e39b8'] = 'Trasladar un módulo'; $_LANGADM['AdminModulesPositions498f79c4c5bbde77f1bceb6c86fd0f6d'] = 'Mostrar'; @@ -1746,8 +1736,6 @@ $_LANGADM['AdminPPreferences048a517fd1781ed314402df592f2ea68'] = 'Ancho de la im $_LANGADM['AdminPPreferencesc9c4e9c1a92d9b15e0cdefc7ddb1bbd5'] = 'El ancho máximo de imágenes cargable por los clientes'; $_LANGADM['AdminPPreferences9a61f5ce3180789a8455f536681cabc1'] = 'Altura de la imagen del artículo'; $_LANGADM['AdminPPreferencesdde6c96bcb0af50f18f37572267d904a'] = 'La altura máxima de imágenes cargable por los clientes'; -$_LANGADM['AdminPPreferencesb8cb3480780964dfe2f3853f7fd43034'] = 'Activar la compatibilidad con las imágenes anteriores'; -$_LANGADM['AdminPPreferences2573851a4dcbfc967a339ce0cf0db3e3'] = 'Pone \"sí\" a menos que esta es una nueva instalación de PrestaShop'; $_LANGADM['AdminPPreferences068f80c7519d0528fb08e82137a72131'] = 'Productos'; $_LANGADM['AdminPaymenta75b01d1ff66cd0a327bda1effa71dec'] = 'Lista de los módulos de pago'; $_LANGADM['AdminPayment1f3a05f7b45df8e5c5cafaf0485eedd5'] = 'Pulsar para ver la lista de los módulos de pago'; @@ -2086,6 +2074,7 @@ $_LANGADM['AdminProducts006b4cc15322f7951d9100716edcac07'] = 'Cantidad mínima:' $_LANGADM['AdminProductsb287d004082f0d743a49dc7360d4fbbe'] = 'La cantidad mínima para pedir este producto (definir 1 para desactivar esta aplicación)'; $_LANGADM['AdminProducts3b8c1da80dae1d62561a6d04d2f68dd5'] = 'Cantidad disponible:'; $_LANGADM['AdminProducts6606420385ad3fd14c70b8ffa210e407'] = 'Está utilizando declinaciones, por lo tanto no puede editar su cantidad de stock aquí, sino en la pestaña \"Declinaciones\"'; +$_LANGADM['AdminProductsd74838fbbeb384c01d7294db33c36ec3'] = 'La gestión de existencias está desactivado'; $_LANGADM['AdminProducts10b8ce36a973c8009b521b39488a89a7'] = 'Gastos de porte suplementarios'; $_LANGADM['AdminProductsb6ef48322d4d59004db9f650344c1a8f'] = 'Se aplicará la tasa del transportista'; $_LANGADM['AdminProducts3e565755572fa5df48eb811c62619098'] = 'Texto mostrado cuando está disponible:'; @@ -2097,6 +2086,7 @@ $_LANGADM['AdminProducts119a7c88cf8f1c685c57981abff26f43'] = 'Admitir pedidos'; $_LANGADM['AdminProductse5f7f63d66023847e693fd34bea09d41'] = 'Por defecto:'; $_LANGADM['AdminProducts0871f875dff8224be3247ccedea01024'] = 'marcar como'; $_LANGADM['AdminProductsd0834fcec6337785ee749c8f5464f6f6'] = 'Preferencias'; +$_LANGADM['AdminProducts9d9aa88574c4dab04ddd8356c377357d'] = 'Categoría por defecto:'; $_LANGADM['AdminProductsd88946b678e4c2f251d4e292e8142291'] = 'SEO'; $_LANGADM['AdminProducts2651608f8f1c6f391f919be228a6ee62'] = 'Haga clic aquí para mejorar su presencia en los buscadores (SEO)'; $_LANGADM['AdminProducts7b250cb374c12c42a75227ba75df7779'] = 'Meta título:'; @@ -2108,7 +2098,6 @@ $_LANGADM['AdminProducts6d3adfeed355509b6aee5588e66d0157'] = 'Palabras clave par $_LANGADM['AdminProducts02fa003c38fefcda498b876f67f4cac7'] = 'URL amigables:'; $_LANGADM['AdminProducts03a1790c522058303088150cfb8b7353'] = 'Sólo se autorizan letras y símbolos \"menos\"'; $_LANGADM['AdminProducts32b919d18cfaca89383f6000dcc9c031'] = 'Generar'; -$_LANGADM['AdminProductsf66ff6c96650130d5c68c8b1f0f95b89'] = 'URL amigable basada en el nombre del producto'; $_LANGADM['AdminProducts92ab5edf4194cb5a84d6808cb8d8b696'] = 'El enlace del producto aparecerá como:'; $_LANGADM['AdminProducts234078adec0a64008b6ae77653776cfa'] = 'Breve descripción:'; $_LANGADM['AdminProducts83d4043f36afbc6c2549ec9309d9aee8'] = 'aparecerá en el resultado de las búsquedas'; @@ -2202,7 +2191,6 @@ $_LANGADM['AdminProductsd1a1006c2d7ebf87d5e4d934a138e5a5'] = 'Debe guardar el pr $_LANGADM['AdminProducts4492081ca02b059f9e8af4ddaf0f7292'] = 'Paquete'; $_LANGADM['AdminProducts2811dedc85918c3e3ed0becd87cbb336'] = 'No se puede añadir productos descargables a un paquete.'; $_LANGADM['AdminProductsc7a915a59b56dc898c0ae52b64bed0c5'] = 'Añadir un elemento al pack'; -$_LANGADM['AdminProducts9d9aa88574c4dab04ddd8356c377357d'] = 'Categoría por defecto:'; $_LANGADM['AdminProducts10cbdb4839f838ce30409739435a6070'] = 'Catálogo'; $_LANGADM['AdminProductsb61bd19699eab41bbcdabc42f83af268'] = 'Considere la posibilidad de cambiar la categoría predeterminada.'; $_LANGADM['AdminProducts74645ed4e5e25461a664d5f68ff19098'] = 'Marcar la o las categorías en las que aparecen el o los productos'; @@ -2906,6 +2894,58 @@ $_LANGADM['AdminTranslations52d83d7ed502b33d300a8c0af2c5b455'] = 'Lista de los t $_LANGADM['AdminTranslationsc21f969b5f03d33d43e04f8f136e7682'] = 'defecto'; $_LANGADM['AdminTranslationsa9e4402481bd9b8e36752bf731f67eb6'] = 'Tema'; $_LANGADM['AdminTranslations53b3cae42737979c884275593a01f468'] = 'Módulo:'; +$_LANGADM['AdminUpgrade19f823c6453c2b1ffd09cb715214813d'] = 'Los campos obligatorios'; +$_LANGADM['AdminUpgrade760c4026bc5a0bd5378e6efc3f1370b4'] = '¡Demasiado largo!'; +$_LANGADM['AdminUpgrade4f2e28904946a09d8c7f36dd3ee72457'] = '¡Los campos son diferentes!'; +$_LANGADM['AdminUpgrade43b01d1a6c5065545c65f42003b0ab5c'] = '¡Dirección no válida!'; +$_LANGADM['AdminUpgrade2e170dfd78c2171a25605ececc0950a4'] = '¡No se puede enviar un correo electrónico!'; +$_LANGADM['AdminUpgrade6deee80e4bdb8894331994116818558e'] = 'Error en la creación del archivo de configuración, si el archivo /config/settings.inc.php existe, por favor dele derechos púplicos deescritura; si no, cree un archivo settings.inc.php en el repertorio de configuración (/config/)'; +$_LANGADM['AdminUpgradeaa946cb00b1c23ff6553b6f9e05da151'] = 'El archivo de parámetros no pudo escribirse, cree un archivo llamado settings.inc.php en su repertorio de configuración.'; +$_LANGADM['AdminUpgradee930e2474c664a3a7e89ecfb8793694b'] = '¡No se puede enviar el archivo!'; +$_LANGADM['AdminUpgrade774fc7a0f56391abc5d8856f2436ca07'] = 'La integridad de los datos no está validada.'; +$_LANGADM['AdminUpgrade8fd007bf08e0717537825a3e91cb4fcc'] = 'No se puede leer el contenido de un archivo *.sql.'; +$_LANGADM['AdminUpgradec71e825f6873f64b91efc26313614eab'] = 'No se puede acceder al contenido de un archivo *.sql.'; +$_LANGADM['AdminUpgrade3d5c8f1d29b1a1dc4ea0673122e0d277'] = 'Error al insertar en la base de datos:'; +$_LANGADM['AdminUpgrade17e1581d01152347bfaacd153b961379'] = 'Contraseña incorrecta (alfa-cadena numérica de al menos 8 caracteres)'; +$_LANGADM['AdminUpgrade9b9f3b2f8a4dffcad9188c8fc4b468c8'] = 'Ya existe una base de datos PrestaShop con este prefijo, debe eliminarla manualmente o cambiar el prefijo.'; +$_LANGADM['AdminUpgradebc5e1163a15106f9e941a7603124709d'] = 'Esto no es un nombre válido.'; +$_LANGADM['AdminUpgradea9d82945b8603f0c8807958d7db9a24d'] = 'Esto no es una imagen válida.'; +$_LANGADM['AdminUpgradeb37eef07b764ea58eec9afe624e20a40'] = 'Error al crear el archivo /config/settings.inc.php.'; +$_LANGADM['AdminUpgrade3d9f514d46849760ef1b1412e314fd99'] = 'Error :'; +$_LANGADM['AdminUpgrade504053ab4c6d648edf11624f1bea4bb4'] = 'Esta base de datos ya existe PrestaShop, por favor, valide de nuevo sus credenciales en la base de datos.'; +$_LANGADM['AdminUpgraded7a99f61bb284d096ea4f221784af85a'] = 'Se ha producido un error al cambiar el tamaño de la imagen.'; +$_LANGADM['AdminUpgrade428c933bafbf262d693fbf1c22c03e5d'] = '¡La base de datos se ha encontrado!'; +$_LANGADM['AdminUpgrade76bd190129b7aefb90fdf42f09ec3ec7'] = 'La base de datos del servidor está disponible, pero la base de datos no se ha encontrado '; +$_LANGADM['AdminUpgrade045f4b5c3f990e5a26e2837495d68259'] = 'La base de datos de servidor no se ha encontrado, por favor, compruebe sus datos de acceso o el nombre de servidor.'; +$_LANGADM['AdminUpgrade757fc72e8d69106dd2cf9da22cc7adb1'] = 'Se ha producido un error al enviar el correo electrónico, gracias por verificar la configuración.'; +$_LANGADM['AdminUpgraded18ad19290b3bfc3cd0d7badbb6cb6a3'] = 'No se puede escribir la imagen /img/logo.jpg. Si ya existe, por favor, suprímala manualmente.'; +$_LANGADM['AdminUpgrade2368e33e3e01d53abb9b60061ab83903'] = 'El archivo enviado supera el tamaño máximo permitido.'; +$_LANGADM['AdminUpgradea10ef376d9f4c877ac86d8e4350116bf'] = 'El archivo enviado supera el tamaño máximo permitido.'; +$_LANGADM['AdminUpgradef8fe8cba1625eaf8e5c253b041d57dbd'] = 'El archivo fue parcialmente enviado.'; +$_LANGADM['AdminUpgrade8c9067e52e4440d8a20e74fdc745b0c6'] = 'No se ha enviado ningún archivo'; +$_LANGADM['AdminUpgrade2384d693d9af53b4727c092af7570a19'] = 'Carece de la carpeta temporal para recibir su archivo de correo. ¡Por favor consulte su administrador de sistema!'; +$_LANGADM['AdminUpgradef5985b2c059d5cc36968baab7585baba'] = 'No se pueden escribir archivos en el disco'; +$_LANGADM['AdminUpgrade9e54dfe54e03b0010c1fe70bd65cd5e6'] = 'Carga de archivos interrumpido a causa de la extensión incorrecta'; +$_LANGADM['AdminUpgrade32af3a59b50e98d254d6c03c5b320a94'] = 'No se pueden convertir los datos de su base de datos en UTF-8.'; +$_LANGADM['AdminUpgrade989a45a4ca01ee222f4370172bf8850d'] = 'Nombre de la tienda no válido'; +$_LANGADM['AdminUpgrade68499acecfba9d3bf0ca8711f300d3ed'] = 'Su nombre contiene caracteres no válidos'; +$_LANGADM['AdminUpgrade2399cf4ca7b49f2706f6e147a32efa78'] = 'Su apellido contiene caracteres no válidos'; +$_LANGADM['AdminUpgrade7d72600fcff52fb3a2d2f73572117311'] = 'La base de datos del servidor no es compatible con UTF-8.'; +$_LANGADM['AdminUpgrade5b9bbadcf96f15e7f112c13a9e5f076e'] = 'El soporte de este motor de base de datos no se puede soportar, elija otro como por ejemplo MyISAM'; +$_LANGADM['AdminUpgrade24b481455c1b72b0c2539e7d516b9582'] = 'El archivo /img/logo.jpg no tiene derechos de escritura, por favor efectúe un CHMOD 755 o 777 en el archivo'; +$_LANGADM['AdminUpgrade5746b74663148afffd1350c97d4fcdfe'] = 'Campo modo catálogo no válido'; +$_LANGADM['AdminUpgradedafe44b99256a7783bc37f4f949da373'] = 'Este instalador es demasiado viejo.'; +$_LANGADM['AdminUpgrade37ce0f29c7377c827e7247fe5645a782'] = 'Ya está en posesión de la versión %s'; +$_LANGADM['AdminUpgrade89928a14f2090aec4fd7aff9ea983f95'] = 'Ninguna versión anterior detectada. ¿Puede borrar o renombrar el archivo de configuración settings.inc.php archivo?'; +$_LANGADM['AdminUpgrade5276a8cbd9e3e467396089b267564f51'] = 'Config/settings.inc.php no se ha encontrado. ¿Ha eliminado o cambiado de nombre?'; +$_LANGADM['AdminUpgrade24784d9e80638781b74c017b33d8ca0c'] = 'Imposible encontrar uno de los archivos de puesta al día SQL. Por favor, compruebe que el archivo /install/sql/upgrade no está vacío.'; +$_LANGADM['AdminUpgrade580e4b216e324f675f0237cdb34b6c2d'] = 'No existe actualización'; +$_LANGADM['AdminUpgradef15e7e7292b0c72894cf45a893e0d497'] = 'Error al abrir el archivo SQL'; +$_LANGADM['AdminUpgradeb8286438fbb6c7df9129fadc5316c19f'] = 'Error al insertar en la base de datos'; +$_LANGADM['AdminUpgrade229ee8046cafc09ddaf46fb9db710e91'] = 'Desgraciadamente,'; +$_LANGADM['AdminUpgradee805a556799b7cef40e9760c81d99218'] = 'Han aparecido errores de SQL.'; +$_LANGADM['AdminUpgrade5627353fd6ac678497af3ece05087068'] = 'El archivo config/defines.inc.php no se ha encontrado. ¿Dónde se encuentra?'; +$_LANGADM['AdminUpgrade783e8e29e6a8c3e22baa58a19420eb4f'] = 'segundos'; $_LANGADM['AdminWebservice897356954c2cd3d41b221e3f24f99bba'] = 'Clave'; $_LANGADM['AdminWebservice00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activado'; $_LANGADM['AdminWebservice52699c78843b98f98620186a59b0a3fa'] = 'Descripción de la clave'; diff --git a/translations/es/errors.php b/translations/es/errors.php index 17e7e55b2..c91614641 100644 --- a/translations/es/errors.php +++ b/translations/es/errors.php @@ -264,6 +264,7 @@ $_ERRORS['65c02cc2c82051fccca8e5b5647f03e5'] = 'No es un email válido'; $_ERRORS['ab57fd0432e25d5b3013133a1c910d56'] = 'KB'; $_ERRORS['e389fb6a0b1d8aba957ef5bd33929e86'] = 'etiqueta de campos no válida'; $_ERRORS['6cf73576720519e739771a4fa489410b'] = 'no se encuentra el idioma'; +$_ERRORS['60e8343766afd5e69c5797ea7380ce8e'] = 'Latitud y longitud son obligatorios'; $_ERRORS['ba2a9c6c8c77e03f83ef8bf543612275'] = 'longitud >'; $_ERRORS['4803e6b9e63dabf04de980788d6a13c4'] = 'línea'; $_ERRORS['49bd922182bd3518641589e3077eacd3'] = 'El enlace con la base de datos no se puede establecer'; @@ -347,7 +348,6 @@ $_ERRORS['f2ee6211fd44afca2f01ee2d1031d0e5'] = 'Por favor, inscríbase para ver $_ERRORS['f996dce5bdfb1b1094e41cf996c5fdae'] = 'por favor, especifique la URL del módulo'; $_ERRORS['a05b582431bd7063de0623ef76b14c73'] = 'Por favor, especifique prioridades'; $_ERRORS['27e12c3c443d7165ab71cd376a3b3f10'] = 'introduzca su código postal'; -$_ERRORS['c22042ba6792cfe142bf63f5a8c50ae8'] = 'producto no disponible actualmente'; $_ERRORS['f1cdcf26d9787f078f7fc0e0645858d7'] = 'Error fatal Prestashop: no hay soporte utf-8. Por favor, compruebe la configuración de su servidor.'; $_ERRORS['350bf1d858bae55fa9c344b39ea9afcd'] = 'no se puede cargar el producto'; $_ERRORS['a3451334219f0c7cac75275c0ac6346e'] = 'Producto ya no está disponible.'; @@ -363,7 +363,6 @@ $_ERRORS['edeb9e20655b946e4bee4ac44a6c0a7f'] = 'El servidor no dispone de permis $_ERRORS['5d7cc18ef21285f980cbada9adb9df5c'] = 'La conexión al servidor expiró, la filigrana no se ha podido aplicar a todas las imígenes.'; $_ERRORS['721b2acc2e54e77e36654bbc42a0747a'] = 'Lo sentimos, actualmente las copias de seguridad solo soportan bases de datos MySQL. Usted esta usando'; $_ERRORS['c45319ee556dc43ba15523c539c7e9d4'] = 'Lo sentimos, no es posible renovar su pedido'; -$_ERRORS['c3f365ea3ae0b35b814493fc72ff0458'] = 'el proveedor no existe'; $_ERRORS['35f55f4e657f542d5f27853332c46f80'] = 'Error de sintaxis con este motivo'; $_ERRORS['19a99b7aed449fbbedc3ce65483d6a3a'] = 'La pestaña no se puede encontrar'; $_ERRORS['cae059a6bd57c0b7d289ce097c060ba6'] = 'El archivo de la pestaña no puede encontrarse'; diff --git a/translations/fr/admin.php b/translations/fr/admin.php index 0f997a5b6..dad8399f0 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -21,8 +21,8 @@ $_LANGADM['AdminAddresses77638e87a55b8747e79590defafa75c9'] = 'Code postal'; $_LANGADM['AdminAddresses57d056ed0984166336b7879c2af3657f'] = 'Ville'; $_LANGADM['AdminAddresses59716c97497eb9694541f7c3d37b1a4d'] = 'Pays'; $_LANGADM['AdminAddresses284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Adresses'; -$_LANGADM['AdminAddresses2ac25f8f90ece36fa66024d7bbc235c9'] = 'Choisir le fabriquant'; -$_LANGADM['AdminAddressesd7ec0ec68dddc7f411a5171af7c70f43'] = 'Aucun fabricant disponible'; +$_LANGADM['AdminAddresses2ac25f8f90ece36fa66024d7bbc235c9'] = 'Choisir la marque'; +$_LANGADM['AdminAddressesd7ec0ec68dddc7f411a5171af7c70f43'] = 'Aucune marque disponible'; $_LANGADM['AdminAddressesce26601dac0dea138b7295f02b7620a7'] = 'Client'; $_LANGADM['AdminAddressesf90e807b74928118048a1a6fa65ebfe5'] = 'Email du client'; $_LANGADM['AdminAddresses919d1ffe6c1855e790a416efa7b4cc4e'] = 'Numéro d\'identification fiscale'; @@ -69,6 +69,9 @@ $_LANGADM['AdminAttachmentsd0042a700e9bdf79689d63ee6846dc0e'] = 'Decsription :'; $_LANGADM['AdminAttachmentsab335fe79ef8a5e26c0dbc23332a7148'] = 'Chargez un fichier depuis votre poste de travail'; $_LANGADM['AdminAttachments38fb7d24e0d60a048f540ecb18e13376'] = 'Sauvegarder'; $_LANGADM['AdminAttachments19f823c6453c2b1ffd09cb715214813d'] = 'Champ requis'; +$_LANGADM['AdminAttachmentsf2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer'; +$_LANGADM['AdminAttachments0071aa279bd1583754a544277740f047'] = 'Supprimer objet #'; +$_LANGADM['AdminAttachments4a21a191879a23aa2a27829300da95f5'] = 'Cette pièce jointe est utilisée par les produits suivants :'; $_LANGADM['AdminAttributeGenerator233c543a23378c4ffd0e1efb17408510'] = 'Impact sur le prix :'; $_LANGADM['AdminAttributeGenerator792467936100838046f749e63dadfbdb'] = 'Impact sur le poids :'; $_LANGADM['AdminAttributeGenerator42dc1497090b299a41c64d1389e6ca8c'] = 'HT :'; @@ -629,6 +632,7 @@ $_LANGADM['AdminCustomers24a23d787190f2c4812ff9ab11847a72'] = 'Statut :'; $_LANGADM['AdminCustomers125cf762f473a17738b97ee3fabe4e8b'] = 'Ce client est enregistré en tant'; $_LANGADM['AdminCustomers084e0343a0486ff05530df6c705c8bb4'] = 'qu\'invité'; $_LANGADM['AdminCustomers80e915c39ca9254655d2802979aa698b'] = 'Transformer en compte client'; +$_LANGADM['AdminCustomers450a7392b73a4b434634f8fe0e3f13c8'] = 'Cette fonctionnalité génère un mot de passe aléatoire et envoie un e-mail au client.'; $_LANGADM['AdminCustomers81fe7d0c685ca9f1829f5ff52370d06e'] = 'Un compte client existe déjà avec la même adresse email'; $_LANGADM['AdminCustomersa7136d956fbff49c3912e44722dbf000'] = 'Ajoutez une note privée'; $_LANGADM['AdminCustomersac7ba2fb36727fd3fcbf967c27cd9dc0'] = 'Cette note sera affichée pour tous les employés mais pas au client.'; @@ -909,6 +913,8 @@ $_LANGADM['AdminGenerator15970c4fdbca1fc48c5b412d94e798c0'] = 'Optimisation'; $_LANGADM['AdminGenerator32d593fb52ab5e4ae3f16844b576867d'] = 'En cochant cette case, votre fichier .htaccess sera complété automatiquement avec des directives améliorant le cache et la compression.'; $_LANGADM['AdminGenerator1dec4f55522b828fe5dacf8478021a9e'] = 'URLs simplifiées'; $_LANGADM['AdminGenerator223cf855cfa657eeb99550e1acd8eaa3'] = 'N\'activez cette option que si le mode rewrite est activé sur votre serveur.'; +$_LANGADM['AdminGeneratoracaa02ab1d800ce9a0b3df2e4ab8909a'] = 'Désactiver l\'option apache multivues'; +$_LANGADM['AdminGenerator7dc12aaf3ebf9e01ef5b2ec91761c26a'] = 'N\'activez cette option que si vous rencontrez des problèmes avec la redirection d\'url de certaines pages.'; $_LANGADM['AdminGenerator8b1fa347125449d64bb72e2c723cd8bf'] = 'Configuration spécifique'; $_LANGADM['AdminGeneratord59b3e143646e3f3e28005adccdb36a3'] = 'Ajouter ici les directives spécifiques de votre hébergement (SetEnv PHP_VER 5, AddType x-mapp-php5 .php...).'; $_LANGADM['AdminGeneratorb696dfaf5a833f70d71d26d052c6eaa3'] = 'Générer le fichier \".htaccess\" en cliquant sur le bouton suivant :'; @@ -922,7 +928,7 @@ $_LANGADM['AdminGenerator8052c42ab3b8aa06a3f5f788a4ddccc2'] = 'fichier .htaccess $_LANGADM['AdminGenerator93f711fc90428ec9589a70706e1866a2'] = 'fichier vide dans le dossier'; $_LANGADM['AdminGenerator60e4943ad37920b1f95133fae1420b59'] = 'lui donner les permissions (CHMOD 666 sur les système Unix)'; $_LANGADM['AdminGenerator345d6249c20c6319bb09edaaf536744b'] = 'Génération du fichier robots'; -$_LANGADM['AdminGenerator3b823baba7abb920bd1c18104ae7537b'] = 'Votre fichier robots.txt DOIT être à la racine de votre site internet, et nul part ailleurs.'; +$_LANGADM['AdminGenerator3b823baba7abb920bd1c18104ae7537b'] = 'Votre fichier robots.txt DOIT être à la racine de votre site internet, et nulle part ailleurs.'; $_LANGADM['AdminGeneratorb65cc08420e484602c7c313336933452'] = 'Ex : http://www.monsite.com/robots.txt'; $_LANGADM['AdminGenerator2129c4f9bb14dcddabb6453bfbeff246'] = 'Cet outil va générer automatiquement le fichier \"robots.txt\" offrant la possibilité de refuser l\'accès à certaines pages aux moteurs de recherche.'; $_LANGADM['AdminGeneratorffd4c6a67eb0c56d04a5ebca5e8cbf80'] = 'Générer le fichier \"robots.txt\" en cliquant sur le bouton suivant :'; @@ -1058,10 +1064,6 @@ $_LANGADM['AdminHome96b0141273eabab320119c467cdcaf17'] = 'Total'; $_LANGADM['AdminHome004bf6c9a40003140292e97330236c53'] = 'Action'; $_LANGADM['AdminHome3ec365dd533ddb7ef3d1c111186ce872'] = 'Détails'; $_LANGADM['AdminHome4ff2e716a7d06ce5274b4090b39abad3'] = 'Voir'; -$_LANGADM['AdminImageResize148a7944a02795af69b75371060bdf47'] = 'Redimensionnement d\'image'; -$_LANGADM['AdminImageResize69a9a68872d80d068d8bc7b85db92a79'] = 'Vous devez définir, à l\'aide de votre souris, quelle zone utiliser pour générer chacun des types de miniature.'; -$_LANGADM['AdminImageResizee1b148c77b02601d08472ba7bfd274b0'] = 'Format des vignettes'; -$_LANGADM['AdminImageResize1b2bdcd2d92f8d571e35d2f795fdaefa'] = 'Enregistrer tout'; $_LANGADM['AdminImagesb718adec73e04ce3ec720dd11a06a308'] = 'ID'; $_LANGADM['AdminImages49ee3087348e8d44e1feda1917443987'] = 'Nom'; $_LANGADM['AdminImages32954654ac8fe66a1d09be19001de2d4'] = 'Largeur'; @@ -1099,7 +1101,7 @@ $_LANGADM['AdminImages821b8ee6937cec96c30fdafbfe836d68'] = 'Magasins'; $_LANGADM['AdminImages258606ef5a3ed5cd7e39da08435adec0'] = 'Régénérer des miniatures'; $_LANGADM['AdminImagese4bb324f29622b389af104bce1db6fdc'] = 'Régénère les miniatures pour tous les produits et catégories'; $_LANGADM['AdminImages9310244aa3f5325c976135a2a089949b'] = 'Merci d\'être patient, le processus peut prendre de quelques minutes à plus d\'une heure'; -$_LANGADM['AdminImages66a3f886eb548f3575add71847622388'] = 'Attention !! Les miniatures générées manuellement seront automatiquement remplacées par la génération automatique.'; +$_LANGADM['AdminImages66a3f886eb548f3575add71847622388'] = 'Attention ! Les miniatures générées manuellement seront automatiquement remplacées par la génération automatique.'; $_LANGADM['AdminImagesb51000000ff730e7cacd10980186c1a4'] = 'Selectionner l\'image'; $_LANGADM['AdminImagesb1c94ca2fbc3e78fc30069c8d0f01680'] = 'Toutes'; $_LANGADM['AdminImagesf559543da6c5866a2dd0ae70f4de370f'] = 'Selectionner un format'; @@ -1113,6 +1115,16 @@ $_LANGADM['AdminImages6e9b08be274aa15f116c641e4c9b8599'] = 'Vous pouvez aussi d $_LANGADM['AdminImages1bd266b7c30df50f9b77b0e0f55f2878'] = 'Après avoir déplacé toutes vos images produit, pour des performances optimales allez aux '; $_LANGADM['AdminImagese686877843ac3c9f4c45aaea265fe59c'] = 'préférences produit'; $_LANGADM['AdminImages8b82bc51644c14c234bb3b635b2e2d1c'] = ' et changez \"Activer la compatibilité avec les anciennes images\" à NON.'; +$_LANGADM['AdminImagesff17d73fa2731689640e8afa0f591b0f'] = 'Les images JPEG ont une taille de fichier petite et une qualité standard. Les images PNG ont une taille de fichier plus importante, une meilleure qualité, et gèrent la transparence. Notez que dans tous les cas les fichiers image auront l\'extension .jpg.'; +$_LANGADM['AdminImagesff167676b1516b34e7f9be0fea5349d6'] = 'ATTENTION : Cette fonctionnalité peut ne pas être compatible avec votre thème ou avec certains modules. En particulier, le mode PNG n\'est pas compatible avec le module Filigrane. En cas de problème, désactivez cette fonctionnalité en sélectionnant \"Utiliser le JPEG\".'; +$_LANGADM['AdminImages42ceb344b0aaf896b362b0db70b46f98'] = 'Qualité d\'image'; +$_LANGADM['AdminImages2a911eb0d71d1b707a3f9d722a5935c2'] = 'Utiliser le JPEG'; +$_LANGADM['AdminImagesb8d0be967a9105f094abc811656ee660'] = 'Utiliser le PNG seulement si l\'image de base est au format PNG'; +$_LANGADM['AdminImages718e1e271056782b288616e916511980'] = 'Utiliser le PNG pour toutes les images'; +$_LANGADM['AdminImagesd46bafd645c490bd4be22c4226619db9'] = 'Qualité JPEG'; +$_LANGADM['AdminImagesb73770b303fc0f331eee23ad7add197c'] = 'Va de 0 (plus faible qualité, petite taille de fichier) à 100 (meilleure qualité, taille du fichier importante)'; +$_LANGADM['AdminImagesc5e26b2211d5ecbbeac96ea6e1cbb7c2'] = 'Qualité PNG'; +$_LANGADM['AdminImages2c1bbb0a5ff08c8011d6ea83084277ff'] = 'Va de 9 (plus faible qualité, petite taille de fichier) à 0 (meilleure qualité, taille du fichier importante)'; $_LANGADM['AdminImportaf1b98adf7f686b84cd0b443e022b7a0'] = 'Catégories'; $_LANGADM['AdminImport068f80c7519d0528fb08e82137a72131'] = 'Produits'; $_LANGADM['AdminImportb9208b03bcc9eb4a336258dcdcb66207'] = 'Déclinaisons'; @@ -1133,6 +1145,9 @@ $_LANGADM['AdminImporte92cfa244b5eb9025d07522080468445'] = 'Eco taxe'; $_LANGADM['AdminImport694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantité'; $_LANGADM['AdminImport8c489d0946f66d17d73f26366a4bf620'] = 'Poids'; $_LANGADM['AdminImport7a1920d61156abc05a60135aefe8bc67'] = 'Défaut'; +$_LANGADM['AdminImport9b93b45649ec5961b8cc84e905964683'] = 'Position de l\'image'; +$_LANGADM['AdminImport9c163d2934fbdd2775356db804d451fc'] = 'Position de l\'image produit à utiliser pour cette déclinaison. Si vous remplissez ce champ, laissez le champ \"URL de l\'image\" vide.'; +$_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'URL de l\'image'; $_LANGADM['AdminImportb718adec73e04ce3ec720dd11a06a308'] = 'Identifiant'; $_LANGADM['AdminImportfd0dcc6233b026d257763713c133cf72'] = 'Actif (0/1)'; $_LANGADM['AdminImport2688a544cd5ac33f27ab78c8d8c3acaa'] = 'Nom *'; @@ -1142,7 +1157,6 @@ $_LANGADM['AdminImporta51d7d2f3e952dfcf1e12ae572d7b337'] = 'Balise <title>'; $_LANGADM['AdminImport5482749e99fa2d325e607075c3fd1c7a'] = 'Meta mots-clefs'; $_LANGADM['AdminImport2a982c2c140ad66259355df1e2c5b69f'] = 'Meta description'; $_LANGADM['AdminImportc1a59288c830561834340f6e7d969401'] = 'URL simplifiée'; -$_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'URL de l\'image'; $_LANGADM['AdminImportdf8ffb90c945e796f2cfd9265325b9c3'] = 'Catégories (x,y,z...)'; $_LANGADM['AdminImport4da86e0470f0b14e4e516442202a8d26'] = 'Prix HT'; $_LANGADM['AdminImportf0a8011e2482cf9351b7bf565c7950ad'] = 'Prix TTC'; @@ -1160,6 +1174,9 @@ $_LANGADM['AdminImportc1069a480848e06782b81b8bea9c0c94'] = 'Description courte'; $_LANGADM['AdminImportbede52f418b34b1ab0db65f9450bdfc3'] = 'Tags (x,y,z...)'; $_LANGADM['AdminImport927f1f2b947a6e113e98af5ae86fcc49'] = 'Texte en stock'; $_LANGADM['AdminImport77493578c6e0675711fe7355a8457668'] = 'Texte en commande'; +$_LANGADM['AdminImportf2149c422ab7577f063b69a2884d17f0'] = 'Disponible'; +$_LANGADM['AdminImportb1a2a959c20b1bd847895e73a5fddbc9'] = 'Date d\'ajout d\'un produit'; +$_LANGADM['AdminImporte1a5e653bc356ed6745d6814d50213eb'] = 'Afficher le prix'; $_LANGADM['AdminImport4d2589e1bcd4263cb99927b59f0f88d2'] = 'URLs des images (x,y,z...)'; $_LANGADM['AdminImport14913d7e9d486e77b5c8d085e3797f94'] = 'Supprimer les images existantes (0 = non, 1 = oui)'; $_LANGADM['AdminImporte6691747add3b37b9c381b8d9476fd4c'] = 'Si vous ne spécifiez pas cette colonne et vous spécifier la colonne images, toutes les images du produit seront remplacé par celle spécifié dans le fichier d\'import'; @@ -1220,6 +1237,9 @@ $_LANGADM['AdminImportb0b5ccb4a195a07fd3eed14affb8695f'] = 'catégories'; $_LANGADM['AdminImport74b997703c3e7fc1db960f1366ba03ab'] = 'avant l\'import ?'; $_LANGADM['AdminImportc290a5941ad6eb0d5fe8752c15c5fd78'] = 'Etape suivante'; $_LANGADM['AdminImport651463c8be1ff45540a213cfcae30cfc'] = 'Notez que l\'import de catégories ne gère pas les catégories de même nom'; +$_LANGADM['AdminImport6fa9eb1f1c5bd853188d93953b6e92b2'] = 'Il n\'y a pas de fichier CSV de disponible, veuillez en charger un.'; +$_LANGADM['AdminImport6a84219217279f2f1ad80deda1c512d8'] = 'Vous pouvez obtenir de nombreuses informations sur l\'importation CSV à l\'adresse suivante:'; +$_LANGADM['AdminImport950770fc8c228bda83a28836b467df5d'] = 'Pour en savoir plus sur le format CSV rendez-vous à l\'adresse suivante:'; $_LANGADM['AdminImportc78474e0acad6beccb0671eacf904543'] = 'Champs disponibles'; $_LANGADM['AdminImport1522206cca1be4bf77fff2ea9838ec2c'] = '* Champs obligatoires'; $_LANGADM['AdminImporte6fe8dc743bfea4d45a4d582e3f86150'] = 'Merci de saisir un nom pour sauvegarder'; @@ -1343,8 +1363,13 @@ $_LANGADM['AdminLanguagesc907a021c935ae6144fa2ccadfe9360d'] = 'Drapeau :'; $_LANGADM['AdminLanguages581e03e07411d053e8c0f275f90fcabc'] = 'Charger le drapeau du pays à partir de votre ordinateur'; $_LANGADM['AdminLanguages70212b3d97d23361e0ec0bc567d7ea30'] = 'Image \"Aucune image\" :'; $_LANGADM['AdminLanguages2426cdf3330e330b60bb7004015207ba'] = 'Image affichée lorsqu\'aucune image n\'est disponible'; -$_LANGADM['AdminLanguages24a23d787190f2c4812ff9ab11847a72'] = 'Statut :'; +$_LANGADM['AdminLanguagesaff03422ee7ccc83301ebd200479efc1'] = 'Langue RTL :'; +$_LANGADM['AdminLanguages93cba07454f06a4a960172bbd6e2a435'] = 'Oui'; $_LANGADM['AdminLanguagesb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé'; +$_LANGADM['AdminLanguagesbafd7322c6e97d25b6299b5d6fe8920b'] = 'Non'; +$_LANGADM['AdminLanguagese6ced2c612d5024c1a2331cdf96e1c33'] = 'A activer si cette langue s\'écrit de droite à gauche.'; +$_LANGADM['AdminLanguages886815cb03a02e29a28906c196292ba0'] = '(Experimental: votre thème doit être compatible à ce type de language)'; +$_LANGADM['AdminLanguages24a23d787190f2c4812ff9ab11847a72'] = 'Statut :'; $_LANGADM['AdminLanguages4c85fb98bf7cfd94c638d0f4e4e39b92'] = 'Activer cette langue'; $_LANGADM['AdminLanguages6ed8662bd9b7b3f59b193010be0c0f4a'] = 'Vérifie si un pack de langue est disponible pour cet ISO code...'; $_LANGADM['AdminLanguagesf16b5952df8d25ea30b25ff95ee8fedf'] = 'Boutique associée'; @@ -1398,23 +1423,23 @@ $_LANGADM['AdminLogs0eaadb4fcb48a0a0ed7bc9868be9fbaa'] = 'Avertissement'; $_LANGADM['AdminLogs902b0d55fddef6f8d651fe1035b7d4bd'] = 'Erreur'; $_LANGADM['AdminLogs2d7a39ee844a8ac84031dcd289630dd9'] = 'Problème majeur (erreur critique)'; $_LANGADM['AdminManufacturersb718adec73e04ce3ec720dd11a06a308'] = 'ID'; -$_LANGADM['AdminManufacturersc0bd7654d5b278e65f21cf4e9153fdb4'] = 'Fabricant'; +$_LANGADM['AdminManufacturersc0bd7654d5b278e65f21cf4e9153fdb4'] = 'Marque'; $_LANGADM['AdminManufacturers20db0bfeecd8fe60533206a2b5e9891a'] = 'Prénom'; $_LANGADM['AdminManufacturers8d3f5eff9c40ee315d452392bed5309b'] = 'Nom'; $_LANGADM['AdminManufacturers77638e87a55b8747e79590defafa75c9'] = 'Code postal'; $_LANGADM['AdminManufacturers57d056ed0984166336b7879c2af3657f'] = 'Ville'; $_LANGADM['AdminManufacturers59716c97497eb9694541f7c3d37b1a4d'] = 'Pays'; -$_LANGADM['AdminManufacturers34c7cc7e30ac36bc5e108bc567aeef73'] = 'Adresses des fabricants'; +$_LANGADM['AdminManufacturers34c7cc7e30ac36bc5e108bc567aeef73'] = 'Adresses des marques'; $_LANGADM['AdminManufacturers49ee3087348e8d44e1feda1917443987'] = 'Nom'; $_LANGADM['AdminManufacturers8c2857a9ad1d8f31659e35e904e20fa6'] = 'Logo'; $_LANGADM['AdminManufacturers284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Adresses'; $_LANGADM['AdminManufacturers068f80c7519d0528fb08e82137a72131'] = 'Produits'; $_LANGADM['AdminManufacturers00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé'; -$_LANGADM['AdminManufacturers2377be3c2ad9b435ba277a73f0f1ca76'] = 'Fabricants'; +$_LANGADM['AdminManufacturers2377be3c2ad9b435ba277a73f0f1ca76'] = 'Marques'; $_LANGADM['AdminManufacturers6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Caractères interdits :'; $_LANGADM['AdminManufacturersc1069a480848e06782b81b8bea9c0c94'] = 'Description courte :'; $_LANGADM['AdminManufacturersb5a7adde1af5c87d7fd797b6245c2a39'] = 'Description :'; -$_LANGADM['AdminManufacturers4ff771c5a62c10ddbe02b9b5357b3402'] = 'Charger le logo du fabricant à partir de votre ordinateur'; +$_LANGADM['AdminManufacturers4ff771c5a62c10ddbe02b9b5357b3402'] = 'Charger le logo de la marque à partir de votre ordinateur'; $_LANGADM['AdminManufacturers9e11e4b371570340ca07913bc4783a7a'] = 'Titre META'; $_LANGADM['AdminManufacturers3e053943605d9e4bf7dd7588ea19e9d2'] = 'Caractères interdits'; $_LANGADM['AdminManufacturers3f64b2beede1082fd32ddb0bf11a641f'] = 'Description META'; @@ -1552,11 +1577,11 @@ $_LANGADM['AdminModules48a963c9173e950ace0c801509eb8ef2'] = 'Module installé ma $_LANGADM['AdminModulesbacc7d9b8003258a090961660729a9b5'] = 'Aucun module '; $_LANGADM['AdminModulesb2f31ef3065bf40b2da9fa8525c6adb9'] = 'Désactiver ce module'; $_LANGADM['AdminModules668c99c1164d5348f99c0878770b53a8'] = 'Activer ce module pour toutes les boutiques'; +$_LANGADM['AdminModules9ce81cf948b7325d53c64aa610851552'] = 'Cette action supprime définitivement le module sur votre serveur. Êtes-vous vraiment sûr ?'; +$_LANGADM['AdminModulesf2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer'; $_LANGADM['AdminModulesbcfaccebf745acfd5e75351095a5394a'] = 'Desactiver'; $_LANGADM['AdminModules2faec1f9f8cc7f8f40d521c4dd574f49'] = 'Activer'; $_LANGADM['AdminModulesf1206f9fadc5ce41694f69129aecac26'] = 'Configurer'; -$_LANGADM['AdminModules9ce81cf948b7325d53c64aa610851552'] = 'Cette action supprime définitivement le module sur votre serveur. Êtes-vous vraiment sûr ?'; -$_LANGADM['AdminModulesf2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer'; $_LANGADM['AdminModules3488a51eb7f723d65daeff912e69b177'] = 'Filtres sélectionnés'; $_LANGADM['AdminModulesPositions51a8b3a61ad63d4e5df2ce86870e39b8'] = 'Greffer un module'; $_LANGADM['AdminModulesPositions498f79c4c5bbde77f1bceb6c86fd0f6d'] = 'Montrer'; @@ -1778,8 +1803,8 @@ $_LANGADM['AdminPPreferences048a517fd1781ed314402df592f2ea68'] = 'Largeur :'; $_LANGADM['AdminPPreferencesc9c4e9c1a92d9b15e0cdefc7ddb1bbd5'] = 'La largeur maximum des images envoyées par les clients'; $_LANGADM['AdminPPreferences9a61f5ce3180789a8455f536681cabc1'] = 'Hauteur :'; $_LANGADM['AdminPPreferencesdde6c96bcb0af50f18f37572267d904a'] = 'La hauteur maximum des images envoyées par les clients'; -$_LANGADM['AdminPPreferencesb8cb3480780964dfe2f3853f7fd43034'] = 'Activer la compatibilité avec les anciennes images'; -$_LANGADM['AdminPPreferences2573851a4dcbfc967a339ce0cf0db3e3'] = 'Ce réglage doit être sur \"oui\" à moins qu\'il s\'agisse d\'une nouvelle installation de PrestaShop'; +$_LANGADM['AdminPPreferences044a77653804fe33652d68098d98121e'] = 'Activer la compatibilité avec les anciennes images'; +$_LANGADM['AdminPPreferencese7ed00268dc16aecaac5a60aeb6f4c73'] = 'Ce réglage doit rester sur \"Oui\" à moins que vous n’ayez déplacé avec succès les images dans l\'onglet Préférences > Image'; $_LANGADM['AdminPPreferences068f80c7519d0528fb08e82137a72131'] = 'Produits'; $_LANGADM['AdminPaymenta75b01d1ff66cd0a327bda1effa71dec'] = 'Liste de modules de paiement'; $_LANGADM['AdminPayment1f3a05f7b45df8e5c5cafaf0485eedd5'] = 'Cliquez pour voir la liste des modules de paiement.'; @@ -1867,6 +1892,9 @@ $_LANGADM['AdminPreferences1656072e927c8d3acd24359cbb648bb5'] = 'Activer le SSL' $_LANGADM['AdminPreferences8de64d6b49cebd2306af6ddbcd268700'] = 'Si votre hébergeur propose le protocole SSL, vous pouvez activer le cryptage SSL (https://) pour l\'identification des clients et le processus de commande'; $_LANGADM['AdminPreferencesed5454727fb14b9800ead242d0972184'] = 'Vérifier l\'IP dans le cookie'; $_LANGADM['AdminPreferences9cfc2e28ebe44b3e14f9d780d2150650'] = 'Vérifiez l\'adresse IP du cookie afin d\'éviter que votre cookie soit volé'; +$_LANGADM['AdminPreferencesc87330f475e4384552c0077927d26e1a'] = 'Durée de vie du cookie Front Office'; +$_LANGADM['AdminPreferences6d964e25aa6aa88c8353880e00202cf4'] = 'Indiquez le nombre d\'heures'; +$_LANGADM['AdminPreferencese673b146824251548feecf1f3929aceb'] = 'Durée de vie du cookie Back Office'; $_LANGADM['AdminPreferencese12874163bcb256726ddfe643aa53a63'] = 'Améliore la sécurité du Front Office'; $_LANGADM['AdminPreferencescce43372fe8624c0edf870f417557b84'] = 'Active ou désactive les tokens en front-office afin d\'améliorer la sécurité de PrestaShop'; $_LANGADM['AdminPreferences16c390c0fd1efc4f493a6a861aa22d2f'] = 'Bulles d\'aide Back-office'; @@ -2123,6 +2151,7 @@ $_LANGADM['AdminProducts006b4cc15322f7951d9100716edcac07'] = 'Quantité minimale $_LANGADM['AdminProductsb287d004082f0d743a49dc7360d4fbbe'] = 'La quantité minimale pour commander ce produit (définir 1 pour désactiver cette fonctionnalité)'; $_LANGADM['AdminProducts3b8c1da80dae1d62561a6d04d2f68dd5'] = 'Quantité en stock :'; $_LANGADM['AdminProducts6606420385ad3fd14c70b8ffa210e407'] = 'Vous avez utilisé des déclinaisons, pour cette raison vous ne pouvez pas éditer votre quantité en stock ici, mais dans l\'onglet \"Déclinaisons\"'; +$_LANGADM['AdminProductsd74838fbbeb384c01d7294db33c36ec3'] = 'La gestion des stocks est désactivée'; $_LANGADM['AdminProducts10b8ce36a973c8009b521b39488a89a7'] = 'Frais de port supplémentaires'; $_LANGADM['AdminProductsb6ef48322d4d59004db9f650344c1a8f'] = 'La taxe du transporteur sera appliquée.'; $_LANGADM['AdminProducts3e565755572fa5df48eb811c62619098'] = 'Message quand en stock :'; @@ -2134,6 +2163,14 @@ $_LANGADM['AdminProducts119a7c88cf8f1c685c57981abff26f43'] = 'Accepter les comma $_LANGADM['AdminProductse5f7f63d66023847e693fd34bea09d41'] = 'Par défaut :'; $_LANGADM['AdminProducts0871f875dff8224be3247ccedea01024'] = 'voir dans'; $_LANGADM['AdminProductsd0834fcec6337785ee749c8f5464f6f6'] = 'Préférences'; +$_LANGADM['AdminProducts9d9aa88574c4dab04ddd8356c377357d'] = 'Catégorie par défaut :'; +$_LANGADM['AdminProducts3faccbfcb5f35451302dcaff3af6cd3f'] = 'Merci de cocher une catégorie afin de sélectionner la catégorie par défaut.'; +$_LANGADM['AdminProducts8cf04a9734132302f96da8e113e80ce5'] = 'Accueil'; +$_LANGADM['AdminProductsef7de3f485174ff47f061ad27d83d0ee'] = 'sélectionnée(s)'; +$_LANGADM['AdminProductsb56c3bda503a8dc4be356edb0cc31793'] = 'Tout étendre'; +$_LANGADM['AdminProducts5ffd7a335dd836b3373f5ec570a58bdc'] = 'Tout déplier'; +$_LANGADM['AdminProducts5e9df908eafa83cb51c0a3720e8348c7'] = 'Tout cocher'; +$_LANGADM['AdminProducts9747d23c8cc358c5ef78c51e59cd6817'] = 'Tout décocher'; $_LANGADM['AdminProductsd88946b678e4c2f251d4e292e8142291'] = 'SEO'; $_LANGADM['AdminProducts2651608f8f1c6f391f919be228a6ee62'] = 'Cliquez ici pour améliorer votre position dans les moteurs de recherche (SEO)'; $_LANGADM['AdminProducts7b250cb374c12c42a75227ba75df7779'] = 'Balise <title> :'; @@ -2239,7 +2276,8 @@ $_LANGADM['AdminProductsd1a1006c2d7ebf87d5e4d934a138e5a5'] = 'Vous devez sauvega $_LANGADM['AdminProducts4492081ca02b059f9e8af4ddaf0f7292'] = 'Pack'; $_LANGADM['AdminProducts2811dedc85918c3e3ed0becd87cbb336'] = 'Vous ne pouvez pas ajouter de produits téléchargeables à un pack.'; $_LANGADM['AdminProductsc7a915a59b56dc898c0ae52b64bed0c5'] = 'Ajouter un objet au pack'; -$_LANGADM['AdminProducts9d9aa88574c4dab04ddd8356c377357d'] = 'Catégorie par défaut :'; +$_LANGADM['AdminProducts126ddccbd9f946b8cd46d88b304a2020'] = 'Merci de sélectionner au moins un produit'; +$_LANGADM['AdminProductsd764262872a3bfe2b0944d1826f43a88'] = 'Merci de mettre une quantité pour ajouter un produit.'; $_LANGADM['AdminProducts10cbdb4839f838ce30409739435a6070'] = 'Catalogue :'; $_LANGADM['AdminProductsb61bd19699eab41bbcdabc42f83af268'] = 'Pensez à changer la catégorie par défaut.'; $_LANGADM['AdminProducts74645ed4e5e25461a664d5f68ff19098'] = 'Cocher dans quelle(s) catégorie(s) le produit doit apparaître'; @@ -2850,6 +2888,7 @@ $_LANGADM['AdminTaxesb718adec73e04ce3ec720dd11a06a308'] = 'ID'; $_LANGADM['AdminTaxes49ee3087348e8d44e1feda1917443987'] = 'Nom'; $_LANGADM['AdminTaxesdcb66ff6e4a2517ade22183779939c9d'] = 'Taux'; $_LANGADM['AdminTaxes00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé'; +$_LANGADM['AdminTaxes5f7d9a7f76dba4bc86062ea848255f2f'] = 'Si vous désactivez l\'ecotax, elle sera mise à 0 sur chacun de vos produits.'; $_LANGADM['AdminTaxes1c669d037f8bc785f0e1a9aeb7070367'] = 'Taxe'; $_LANGADM['AdminTaxes50068b9a709a0e2da6f25210de57bb85'] = 'Activer les taxes :'; $_LANGADM['AdminTaxes7c9ad104937545220eb5ac67fb1ee9d9'] = 'Activer ou désactiver la prise en charge des taxes'; @@ -3006,6 +3045,152 @@ $_LANGADM['AdminTranslations52d83d7ed502b33d300a8c0af2c5b455'] = 'Liste des them $_LANGADM['AdminTranslationsc21f969b5f03d33d43e04f8f136e7682'] = 'defaut'; $_LANGADM['AdminTranslationsa9e4402481bd9b8e36752bf731f67eb6'] = 'Thème'; $_LANGADM['AdminTranslations53b3cae42737979c884275593a01f468'] = 'Module :'; +$_LANGADM['AdminUpgrade875b8a59022d232837491c0fdfacb4ab'] = 'Ne pas sauver les images'; +$_LANGADM['AdminUpgrade8ec641624329d6ff15d8c4c9e8e6c2c8'] = 'Vous pouvez exclure le dossier image de la sauvegarde si vous les avez déjà sauvé d\'une autre manière (non recommandé)'; +$_LANGADM['AdminUpgradeaf98608eaedd4ba7ffd47a0204e84b23'] = 'Conserver le thème \"prestashop\" actuel'; +$_LANGADM['AdminUpgrade6e9e9426b91777a0d15f2b730277ed9f'] = 'Si vous avez directement personnalisé le thème par défaut, vous pouvez le protéger de la mise à jour (non recommandé)'; +$_LANGADM['AdminUpgrade9377a7cc364ce06c1830eeb7a31202bb'] = 'Ne pas conserver les traductions'; +$_LANGADM['AdminUpgrade51bbcf7afb0f8d35501d0a7b28979b06'] = 'Si \"oui\", vous conserverez toutes vos traductions'; +$_LANGADM['AdminUpgrade8c8194a465f0163a6724907755ac1b82'] = 'Mode manuel'; +$_LANGADM['AdminUpgradedd9dbd4916653d683244119a067ca467'] = 'Choisissze \"oui\" si vous voulez vous '; +$_LANGADM['AdminUpgradee7b6d601ff4e9069e726927e211274ea'] = 'Utiliser Subversion'; +$_LANGADM['AdminUpgradea15b09729294cf7fea1096f970a0fed4'] = 'Choisissez \"oui\" si vous voulez utiliser une version non stable au lieu de l'; +$_LANGADM['AdminUpgrade36be1130454bc8c4e0a41d36fa062a8b'] = 'Impossible de créer le répertoire %s'; +$_LANGADM['AdminUpgrade6824d57b7af37f605bd97d34defc3761'] = 'Exportation svn terminée. Suppression des fichiers exemples...'; +$_LANGADM['AdminUpgradef70307d8297e48a8783d41e6f3313d51'] = 'Erreur lors de l\'export SVN'; +$_LANGADM['AdminUpgrade4eecd9c195e46c054ef7da6d9d1a738b'] = 'Extraction terminée. Suppression des fichiers exemples...'; +$_LANGADM['AdminUpgrade0929f38eaac3ca38801f08b7269574e0'] = 'Impossible d\'extraire %1$s dans %2$s ...'; +$_LANGADM['AdminUpgrade6b2d0404b7faba0e791e15a52586a149'] = 'Basculer vers svn checkout (useSvn activé)'; +$_LANGADM['AdminUpgradef0e38ac0c558a7f216ae98382b9e58f5'] = 'Site désactivé. Téléchargement en cours (peut prendre '; +$_LANGADM['AdminUpgrade4f7c02592a962e40a920f32f3a24f2df'] = 'filesToUpgrade n\'est pas un tableau'; +$_LANGADM['AdminUpgrade3f10faa8b44a7175ae8fc5dcb8dec5de'] = 'Tous les fichiers ont été mis à jour. Mise à jour de la base de données en cours.'; +$_LANGADM['AdminUpgrade1ad932e3b85eb2907a817cd3e3e6907e'] = 'Erreur pour la mise à jour de %s'; +$_LANGADM['AdminUpgrade078a325fbcc1dbd50bd9f969ce954965'] = 'encore %2$s fichiers à mettre à jour.'; +$_LANGADM['AdminUpgrade62740df131433ec9d45bf1810eefb19b'] = 'erreur pendant la mise à jour de la base de données.'; +$_LANGADM['AdminUpgrade9a2f2cf276ea9f79b31a815897c0e3e6'] = '%s ignoré.'; +$_LANGADM['AdminUpgrade63ded4905ba41ac4bf00373df2739576'] = 'création du répertoire %2$s. encore %3$s fichiers à mettre à jour.'; +$_LANGADM['AdminUpgrade11978affb3b0dbb16c50d571fd05de6d'] = 'erreur lors de la création du répertoire %s'; +$_LANGADM['AdminUpgrade1b854285afc1988b6f83414fde5943ab'] = '%1$s copié dans %2$s. encore %3$s fichiers à mettre à jour.'; +$_LANGADM['AdminUpgrade0e06ce0972ad338e1d96e8589dc21b9c'] = 'erreur lors de la copie de %1$s vers %2$s'; +$_LANGADM['AdminUpgrade0511620a3a1d6036d3fbe47b131d7c4b'] = 'Fichiers restorés. Restauration de la base de données.'; +$_LANGADM['AdminUpgrade791403f158965a3e19f8627c7b744126'] = 'Base de données restaurée.'; +$_LANGADM['AdminUpgrade5f7f50973696d0a42c1efcc07f7820a0'] = 'Votre site est maintenant restauré.'; +$_LANGADM['AdminUpgrade28517b8a291c50d80aa53a078407065b'] = 'Répertoire racine nettoyée.'; +$_LANGADM['AdminUpgradebb71892737d721949538d6e1c4d3d22d'] = 'Fichiers restaurés. Sauvegarde de la base de données non trouvée. Restauration terminée.'; +$_LANGADM['AdminUpgradecb7dce5f6a1934d54c0d3335c7ffe841'] = 'Fichiers restaurés.'; +$_LANGADM['AdminUpgrade8efc36d230f76fbfd9e4d758964e9414'] = 'impossible d\'extraire %1$ s dans%2$s.'; +$_LANGADM['AdminUpgraded7624db09c15d46cd37d7709ae05e44b'] = 'aucune sauvegarde trouvée. Il n\'y a rien à restaurer.'; +$_LANGADM['AdminUpgrade09a362e2dd3800f8fbc55d3446513f65'] = 'Rien à restaurer (aucune requête trouvée)'; +$_LANGADM['AdminUpgrade66c4cbfb21f294b233692b67356db647'] = 'Base de données sauvegardée dans %s. Mise à jour des fichiers ...'; +$_LANGADM['AdminUpgrade48f95ff09327408a578e91655ed872a1'] = '%s fichiers à sauvegarder.'; +$_LANGADM['AdminUpgrade70960f2aa87d307170d3a1bc3e06d904'] = 'sauvegarde des fichiers initilialisée dans %s'; +$_LANGADM['AdminUpgrade8cf728d701c50a59ef78b7c55fc27cd4'] = 'Les fichiers de sauvegarde en cours. Encore %s ...'; +$_LANGADM['AdminUpgrade15b353ca964fe816547e67e1508ff85d'] = 'Fichiers sauvegardés. Sauvegarde de la base de données ...'; +$_LANGADM['AdminUpgradea25c4f085558c5f6e519e56257af531f'] = 'tous les fichiers ont été ajoutés à l\'archive.'; +$_LANGADM['AdminUpgrade91f805cf850500bda66426aea042602f'] = '%1$ s ajouté à l\'archive. Encore %2$.'; +$_LANGADM['AdminUpgradef79479c0de75d568def0afdc1e5de04e'] = 'Erreur lorsque vous essayez d\'ajouter %1$s à l\'archive %2$s.'; +$_LANGADM['AdminUpgradeb9a2db69065827812dd4b7a7f9ffc0b1'] = 'impossible d\'ouvrir l\'archive'; +$_LANGADM['AdminUpgrade2589a25910cd3d7fab7e45361c4cb39d'] = '%1$s supprimé. reste %2$s '; +$_LANGADM['AdminUpgraded82eef1ba081c54686767c555670c0fe'] = 'erreur lors de la suppression de %1$s, reste encore %2$s '; +$_LANGADM['AdminUpgrade344c592d141604c614c219fad3fa0dae'] = '%1$s fichiers exemple à supprimer'; +$_LANGADM['AdminUpgrade0baf8c94d1d03d1621c17cd6eabf7b9f'] = 'Tous les exemples de fichiers supprimés. Sauvegarde des fichiers en cours...'; +$_LANGADM['AdminUpgrade84e31682487d5a0937f9184ebcf594ba'] = 'copie de travail déjà %s à jour. exportation vers le répertoire latest'; +$_LANGADM['AdminUpgradeb0d51f91a1118b7c39ee1835cc6c926a'] = 'Téléchargement terminé. Extraction ...'; +$_LANGADM['AdminUpgrade0c0db54fe8212c1a7215005fef75d7dd'] = 'Erreur pendant le téléchargement'; +$_LANGADM['AdminUpgrade93120c07d8c5cee44042627cd493e0e0'] = 'vous avez besoin allow_url_fopen pour le téléchargement automatique. Vous pouvez également placer le fichier manuellement dans %s'; +$_LANGADM['AdminUpgrade3bb38e7d0bfd5a02f7c06cae446fee86'] = 'l\'action %s ignorée'; +$_LANGADM['AdminUpgradee82d249d3743a90bb02e6dafd4788979'] = 'action \"%1$s\" non trouvée'; +$_LANGADM['AdminUpgrade19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis'; +$_LANGADM['AdminUpgrade760c4026bc5a0bd5378e6efc3f1370b4'] = 'Trop long !'; +$_LANGADM['AdminUpgrade4f2e28904946a09d8c7f36dd3ee72457'] = 'Les champs sont différents !'; +$_LANGADM['AdminUpgrade43b01d1a6c5065545c65f42003b0ab5c'] = 'Adresse incorrecte !'; +$_LANGADM['AdminUpgrade2e170dfd78c2171a25605ececc0950a4'] = 'Impossible d\'envoyer l\'email !'; +$_LANGADM['AdminUpgrade6deee80e4bdb8894331994116818558e'] = 'Erreur à la création du fichier de configuration, si le fichier /config/settings.inc.php existe, veuillez lui donner les droits publics d\'écriture; sinon veuillez créer un fichier settings.inc.php dans le répertoire de configuration (/config/)'; +$_LANGADM['AdminUpgradeaa946cb00b1c23ff6553b6f9e05da151'] = 'Le fichier de paramètres n\'a pu être écrit, veuillez créer un fichier nommé settings.inc.php dans votre répertoire de configuration.'; +$_LANGADM['AdminUpgradee930e2474c664a3a7e89ecfb8793694b'] = 'Impossible d\'envoyer le fichier !'; +$_LANGADM['AdminUpgrade774fc7a0f56391abc5d8856f2436ca07'] = 'L\'intégrité des données n\'est pas validée.'; +$_LANGADM['AdminUpgrade8fd007bf08e0717537825a3e91cb4fcc'] = 'Impossible de lire le contenu d\'un des fichiers *.sql.'; +$_LANGADM['AdminUpgradec71e825f6873f64b91efc26313614eab'] = 'Impossible d\'accéder au contenu d\'un des fichiers *.sql.'; +$_LANGADM['AdminUpgrade3d5c8f1d29b1a1dc4ea0673122e0d277'] = 'Erreur lors de l\'insertion dans la base :'; +$_LANGADM['AdminUpgrade17e1581d01152347bfaacd153b961379'] = 'Mot de passe incorrect (chaîne alpha-numérique d\'au moins 8 caractères)'; +$_LANGADM['AdminUpgrade9b9f3b2f8a4dffcad9188c8fc4b468c8'] = 'Une base de données PrestaShop existe déjà avec ce préfixe, vous devez la supprimer manuellement ou changer son préfixe.'; +$_LANGADM['AdminUpgradebc5e1163a15106f9e941a7603124709d'] = 'Ce n\'est pas un nom valide.'; +$_LANGADM['AdminUpgradea9d82945b8603f0c8807958d7db9a24d'] = 'Ce n\'est pas une image valide.'; +$_LANGADM['AdminUpgradeb37eef07b764ea58eec9afe624e20a40'] = 'Erreur lors de la création du fichier /config/settings.inc.php.'; +$_LANGADM['AdminUpgrade3d9f514d46849760ef1b1412e314fd99'] = 'Erreur :'; +$_LANGADM['AdminUpgrade504053ab4c6d648edf11624f1bea4bb4'] = 'Cette base de données PrestaShop existe déjà, merci de revalider vos informations d\'authentification à la base de données.'; +$_LANGADM['AdminUpgraded7a99f61bb284d096ea4f221784af85a'] = 'Une erreur est survenue lors du redimensionnement de l\'image.'; +$_LANGADM['AdminUpgrade428c933bafbf262d693fbf1c22c03e5d'] = 'La base de données a été trouvée !'; +$_LANGADM['AdminUpgrade76bd190129b7aefb90fdf42f09ec3ec7'] = 'Le serveur de bases de données est disponible mais la base de données n\'a pas été trouvée'; +$_LANGADM['AdminUpgrade045f4b5c3f990e5a26e2837495d68259'] = 'Le serveur de bases de données n\'a pas été trouvé, merci de vérifier vos identifiants ou le nom du serveur.'; +$_LANGADM['AdminUpgrade757fc72e8d69106dd2cf9da22cc7adb1'] = 'Une erreur est survenue lors de l\'envoi de l\'email, merci de vérifier vos paramètres.'; +$_LANGADM['AdminUpgraded18ad19290b3bfc3cd0d7badbb6cb6a3'] = 'Impossible d\'écrire l\'image /img/logo.jpg. Si celle-ci existe déjà, merci de la supprimer manuellement.'; +$_LANGADM['AdminUpgrade2368e33e3e01d53abb9b60061ab83903'] = 'Le fichier envoyé dépasse la taille maximum autorisée.'; +$_LANGADM['AdminUpgradea10ef376d9f4c877ac86d8e4350116bf'] = 'Le fichier envoyé dépasse la taille maximum autorisée.'; +$_LANGADM['AdminUpgradef8fe8cba1625eaf8e5c253b041d57dbd'] = 'Le fichier a été envoyé partiellement.'; +$_LANGADM['AdminUpgrade8c9067e52e4440d8a20e74fdc745b0c6'] = 'Aucun fichier n\'a été envoyé'; +$_LANGADM['AdminUpgrade2384d693d9af53b4727c092af7570a19'] = 'Il manque le dossier temporaire de réception de vos envois de fichiers. Merci de consulter votre administrateur système.'; +$_LANGADM['AdminUpgradef5985b2c059d5cc36968baab7585baba'] = 'Impossible d\'écrire le fichier sur le disque'; +$_LANGADM['AdminUpgrade9e54dfe54e03b0010c1fe70bd65cd5e6'] = 'Envoi de fichier interrompu à cause de l\'extension incorrecte'; +$_LANGADM['AdminUpgrade32af3a59b50e98d254d6c03c5b320a94'] = 'Impossible de convertir les données de votre base de données en utf-8.'; +$_LANGADM['AdminUpgrade989a45a4ca01ee222f4370172bf8850d'] = 'Nom de boutique invalide'; +$_LANGADM['AdminUpgrade68499acecfba9d3bf0ca8711f300d3ed'] = 'Votre prénom contient des caractères invalides'; +$_LANGADM['AdminUpgrade2399cf4ca7b49f2706f6e147a32efa78'] = 'Votre nom contient des caractères invalides'; +$_LANGADM['AdminUpgrade7d72600fcff52fb3a2d2f73572117311'] = 'Votre serveur de base de données ne supporte pas le jeu de caractère utf-8.'; +$_LANGADM['AdminUpgrade5b9bbadcf96f15e7f112c13a9e5f076e'] = 'Le support de ce moteur de base de donnée n\'est pas supporté, veuillez en choisir un autre tel que MyISAM'; +$_LANGADM['AdminUpgrade24b481455c1b72b0c2539e7d516b9582'] = 'Le fichier /img/logo.jpg n\'a pas les droits d\'écriture, merci d\'effectuer un CHMOD 755 ou 777 sur ce fichier'; +$_LANGADM['AdminUpgrade5746b74663148afffd1350c97d4fcdfe'] = 'Champ mode catalog invalide'; +$_LANGADM['AdminUpgrade9e5459c4deb20b7842ac01e97390b334'] = 'Erreur inconnue.'; +$_LANGADM['AdminUpgradedafe44b99256a7783bc37f4f949da373'] = 'Cet installeur est trop vieux.'; +$_LANGADM['AdminUpgrade37ce0f29c7377c827e7247fe5645a782'] = 'Vous êtes déjà en possession de la version %s'; +$_LANGADM['AdminUpgrade89928a14f2090aec4fd7aff9ea983f95'] = 'Pas de version antérieur détectée. Avez-vous supprimé ou renommé le fichier settings.inc.php du dossier config ?'; +$_LANGADM['AdminUpgrade5276a8cbd9e3e467396089b267564f51'] = 'Le fichier config/settings.inc.php n\'a pas été trouvé. L\'avez-vous supprimé ou renommé ?'; +$_LANGADM['AdminUpgrade24784d9e80638781b74c017b33d8ca0c'] = 'Impossible de trouver un des fichiers de mise à jour SQL. Merci de vérifier que le dossier /install/sql/upgrade n\'est pas vide.'; +$_LANGADM['AdminUpgrade580e4b216e324f675f0237cdb34b6c2d'] = 'Pas de mise à jour disponible'; +$_LANGADM['AdminUpgradef15e7e7292b0c72894cf45a893e0d497'] = 'Erreur lors de l\'ouverture du fichier SQL'; +$_LANGADM['AdminUpgradeb8286438fbb6c7df9129fadc5316c19f'] = 'Erreur lors de l\'insertion dans la base de données'; +$_LANGADM['AdminUpgrade229ee8046cafc09ddaf46fb9db710e91'] = 'Malheureusement,'; +$_LANGADM['AdminUpgradee805a556799b7cef40e9760c81d99218'] = 'erreurs SQL sont apparues.'; +$_LANGADM['AdminUpgrade5627353fd6ac678497af3ece05087068'] = 'Le fichier config/defines.inc.php n\'a pas été trouvé. Ou est-il passé ?'; +$_LANGADM['AdminUpgrade446c9e952debe114c86bbd9e5eea7d61'] = 'Restaurer'; +$_LANGADM['AdminUpgrade4879913b16fa23f723f70a5067bda8d4'] = 'Aucune restauration disponible'; +$_LANGADM['AdminUpgradefff66e9b3d962fa319c8068b5c1997cd'] = 'restaurer'; +$_LANGADM['AdminUpgradeebdabc2d40aa563aabbb3ee57915a7a9'] = 'cliquer pour restaurer %s'; +$_LANGADM['AdminUpgradee9c57c7fbc335e66282a32617b01b9be'] = 'Votre configuration actuelle'; +$_LANGADM['AdminUpgrade8d93c2da70e3baf49fe03ecbc19ac608'] = 'dossier racine'; +$_LANGADM['AdminUpgrade2fc4ab825ce2ce9476e8a1c2211ac9b8'] = 'Dossier racine'; +$_LANGADM['AdminUpgradeede62c591a867451227643268f5b40af'] = 'PHP a les droits d\'écriture du dossier racine récursivement'; +$_LANGADM['AdminUpgrade3e992446a190ccfadbebcce061984025'] = 'PHP n\'a pas les droits d\'écriture du dossier racine récursivement'; +$_LANGADM['AdminUpgrade31a962ffeb06a6cc6d58ef3ba5fae2b7'] = 'Autoupgrade autorisé'; +$_LANGADM['AdminUpgrade9c30a74657158984997cca4930d6075b'] = 'Cette version autorise la mise à jour automatique'; +$_LANGADM['AdminUpgradeaf566be1636d11ecc8ddb728a15520b8'] = 'Cette version n\'autorise pas la mise à jour automatique'; +$_LANGADM['AdminUpgrade4d3d769b812b6faa6b76e1a8abaece2d'] = 'Actif'; +$_LANGADM['AdminUpgrade3cab03c00dbd11bc3569afa0748013f0'] = 'Inactif'; +$_LANGADM['AdminUpgradeb2e1c91a22797b8d78f9c4adb01a8f17'] = 'Statut de la boutique'; +$_LANGADM['AdminUpgrade0a08c84bcebc299204970d219acc54c0'] = 'limite de temps php'; +$_LANGADM['AdminUpgrade075ae3d2fc31640504f814f60e5ef713'] = 'désactivée'; +$_LANGADM['AdminUpgrade783e8e29e6a8c3e22baa58a19420eb4f'] = 'secondes'; +$_LANGADM['AdminUpgrade0855d08a7348a201e2fdc454c4ee42a0'] = 'droits d\'écriture récursif'; +$_LANGADM['AdminUpgrade039552aa1d74b68f01a73821f3078158'] = 'pas de droits d\'écriture récursif'; +$_LANGADM['AdminUpgrade342299aeb786a06533ba00d9a04794dd'] = 'Modifiez vos options'; +$_LANGADM['AdminUpgrade06933067aafd48425d67bcb01bba5cb6'] = 'Mettre à jour'; +$_LANGADM['AdminUpgrade5d8b77b69c92370ec4e175a638019ca7'] = 'La version actuelle de votre boutique est : %s'; +$_LANGADM['AdminUpgrade80e3d093272bc011b6bc661e408c7423'] = 'La dernière version est %1$s (%2$s)'; +$_LANGADM['AdminUpgradeb47ba7568788e46dbc7fe81e525db863'] = 'La dernière version de prestashop disponible est:'; +$_LANGADM['AdminUpgradec97dcfb0df6daa46292a0def8a567822'] = 'Sauvegardez la base de données, les fichiers de sauvegarde et faire la mise en un clic pardi !'; +$_LANGADM['AdminUpgradea60ab62ed99ef0358b2efae592be0cdd'] = 'Mettre à jour PrestaShop Maintenant !'; +$_LANGADM['AdminUpgrade943f41a7241dc56c3fbc488f015a4e6a'] = 'Votre boutique est déjà à jour'; +$_LANGADM['AdminUpgrade48c7c41b72e1d678923ce3571aa65b2d'] = 'Etape'; +$_LANGADM['AdminUpgradeeeb5a49c38d2d8c2baa51ed09beccf88'] = 'Etape de mise à jour'; +$_LANGADM['AdminUpgradec5d769685704e7ddcd70e74a6ebe50b7'] = 'Votre configuration actuelle n\'autorise pas la mise à jour.'; +$_LANGADM['AdminUpgrade3a3a651c9a67bca9ac902da789466b93'] = 'Mise à jour instable'; +$_LANGADM['AdminUpgradedae8ace18bdcbcc6ae5aece263e14fe8'] = 'Options'; +$_LANGADM['AdminUpgrade6b3930a184368a458be6e4429f409877'] = 'Mise à jour terminée. Vérifiez votre boutique (essayez de faire une commande, vérifier le thème)'; +$_LANGADM['AdminUpgrade91195bbbacc2147a736c849c46368ed8'] = 'Voulez vous restaurer votre boutique'; +$_LANGADM['AdminUpgradea498f9476a893d51ee02b3601678d318'] = 'Cliquez pour restaurer la base de donnée'; +$_LANGADM['AdminUpgradef34d5debb2bba76aa3e077937a07e373'] = 'Cliquez pour restaurer les fichiers'; +$_LANGADM['AdminUpgrade60283aa37e2063b2ada2f99216e1332a'] = 'Votre serveur ne peut pas télécharger le fichier. S\'il vous plaît le télécharger d\'abord par ftp dans votre répertoire admin/autoupgrade'; +$_LANGADM['AdminUpgrade6ef7ebe46f6d16cdbf9e2169e3dd048e'] = 'Allez manuellement au bouton restaurer'; $_LANGADM['AdminWebservice897356954c2cd3d41b221e3f24f99bba'] = 'Clé'; $_LANGADM['AdminWebservice00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé'; $_LANGADM['AdminWebservice52699c78843b98f98620186a59b0a3fa'] = 'Description de la clé'; @@ -3151,7 +3336,7 @@ $_LANGADM['index8642a2f37a5d42b54ce53b1fbdd1583f'] = 'paniers'; $_LANGADM['index13348442cc6a27032d2b4aa28b75a5d3'] = 'Recherche'; $_LANGADM['index4f32a32dea642737580dd71cdfd8d3c0'] = 'Accès rapide'; $_LANGADM['index53cd939ae14e33855274e17a3c411fdd'] = 'Pour des raisons de sécurité, vous devez :'; -$_LANGADM['index362b56674d07160fab60725a927bbf13'] = 'supprimé le dossier /install'; +$_LANGADM['index362b56674d07160fab60725a927bbf13'] = 'supprimer le dossier /install'; $_LANGADM['index7286baef44d09300636a4b99c533523c'] = 'Temps de chargement :'; $_LANGADM['indexbbaff12800505b22a853e8b7f4eb6a22'] = 'Contact'; $_LANGADM['index3e937d04c1c83492260a33d926ca587c'] = 'Bug Tracker'; diff --git a/translations/fr/errors.php b/translations/fr/errors.php index 848d6946a..b9b8e84da 100644 --- a/translations/fr/errors.php +++ b/translations/fr/errors.php @@ -264,6 +264,7 @@ $_ERRORS['65c02cc2c82051fccca8e5b5647f03e5'] = 'n\'est pas un e-mail valide'; $_ERRORS['ab57fd0432e25d5b3013133a1c910d56'] = 'Ko'; $_ERRORS['e389fb6a0b1d8aba957ef5bd33929e86'] = 'le nom des champs sont invalides'; $_ERRORS['6cf73576720519e739771a4fa489410b'] = 'langage introuvable'; +$_ERRORS['60e8343766afd5e69c5797ea7380ce8e'] = 'Latitude et longitude sont nécessaires'; $_ERRORS['ba2a9c6c8c77e03f83ef8bf543612275'] = 'longueur >'; $_ERRORS['4803e6b9e63dabf04de980788d6a13c4'] = 'ligne'; $_ERRORS['49bd922182bd3518641589e3077eacd3'] = 'Impossible de se connecter à la base de données.'; @@ -347,7 +348,6 @@ $_ERRORS['f2ee6211fd44afca2f01ee2d1031d0e5'] = 'Merci de vous inscrire pour voir $_ERRORS['f996dce5bdfb1b1094e41cf996c5fdae'] = 'merci de spécifier l\'URL du module'; $_ERRORS['a05b582431bd7063de0623ef76b14c73'] = 'Veuillez spécifier les priorités'; $_ERRORS['27e12c3c443d7165ab71cd376a3b3f10'] = 'merci de saisir votre code postal.'; -$_ERRORS['c22042ba6792cfe142bf63f5a8c50ae8'] = 'ce produit n\'est plus disponible'; $_ERRORS['f1cdcf26d9787f078f7fc0e0645858d7'] = 'Erreur fatale : Format utf-8 non supporté. Merci de vérifier la configuration de votre serveur.'; $_ERRORS['350bf1d858bae55fa9c344b39ea9afcd'] = 'le produit ne peut pas être chargé'; $_ERRORS['a3451334219f0c7cac75275c0ac6346e'] = 'Le produit n\'est plus disponible.'; @@ -363,7 +363,6 @@ $_ERRORS['edeb9e20655b946e4bee4ac44a6c0a7f'] = 'Le serveur ne dispose pas des pe $_ERRORS['5d7cc18ef21285f980cbada9adb9df5c'] = 'Le serveur a expiré, le filigrane n\'est peut-être pas été appliqué à toutes vos images.'; $_ERRORS['721b2acc2e54e77e36654bbc42a0747a'] = 'Le système de backup ne gère actuellement que les bases de données MySQL'; $_ERRORS['c45319ee556dc43ba15523c539c7e9d4'] = 'Désolé, nous ne pouvons pas renouveler votre commande'; -$_ERRORS['c3f365ea3ae0b35b814493fc72ff0458'] = 'le fournisseur n\'existe pas'; $_ERRORS['35f55f4e657f542d5f27853332c46f80'] = 'Erreur de syntaxe avec ce motif'; $_ERRORS['19a99b7aed449fbbedc3ce65483d6a3a'] = 'L\'onglet ne peut être trouvé'; $_ERRORS['cae059a6bd57c0b7d289ce097c060ba6'] = 'Le fichier de l\'onglet ne peut être trouvé'; diff --git a/translations/fr/pdf.php b/translations/fr/pdf.php index 3ef7962c6..955305318 100644 --- a/translations/fr/pdf.php +++ b/translations/fr/pdf.php @@ -35,6 +35,7 @@ $_LANGPDF['PDF_invoice396124314c5fd1fa5bf463274896dc80'] = 'Pas de méthode d\'a $_LANGPDF['PDF_invoice065ab3a28ca4f16f55f103adc7d0226f'] = 'Livraison'; $_LANGPDF['PDF_invoice6bdf2efe1a99072849d4e87baee37dbe'] = 'Facturation'; $_LANGPDF['PDF_invoice60da3bd6867e3952ef0057a0772ea885'] = 'Numéro d\'indentification fiscale:'; +$_LANGPDF['PDF_invoice7b13afd12d6d91d52aa9f857d23f96ef'] = 'Projet de facture'; $_LANGPDF['PDF_invoiced1228f5476d15142b1358ae4b5fa2454'] = 'Commande n°'; $_LANGPDF['PDF_invoicef8617a92ba0a0a4eabee724eab7c9f48'] = 'Transporteur :'; $_LANGPDF['PDF_invoicec1f6368d15f7c13c4e5e8f70c68c747f'] = 'Méthode de paiement :'; diff --git a/translations/it/admin.php b/translations/it/admin.php index 2b197d6d4..dcfc08b8f 100644 --- a/translations/it/admin.php +++ b/translations/it/admin.php @@ -979,10 +979,6 @@ $_LANGADM['AdminHome96b0141273eabab320119c467cdcaf17'] = 'Totale'; $_LANGADM['AdminHome004bf6c9a40003140292e97330236c53'] = 'Azione'; $_LANGADM['AdminHome3ec365dd533ddb7ef3d1c111186ce872'] = 'Dati:'; $_LANGADM['AdminHome4ff2e716a7d06ce5274b4090b39abad3'] = 'Vedi'; -$_LANGADM['AdminImageResize148a7944a02795af69b75371060bdf47'] = 'Ri-dimensionamento immagine'; -$_LANGADM['AdminImageResize69a9a68872d80d068d8bc7b85db92a79'] = 'Usando il mouse, definisci quale area dell\'immagine usare per creare ciascun tipo di miniatura.'; -$_LANGADM['AdminImageResizee1b148c77b02601d08472ba7bfd274b0'] = 'Formato miniature'; -$_LANGADM['AdminImageResize1b2bdcd2d92f8d571e35d2f795fdaefa'] = 'Salva tutto'; $_LANGADM['AdminImagesb718adec73e04ce3ec720dd11a06a308'] = 'ID'; $_LANGADM['AdminImages49ee3087348e8d44e1feda1917443987'] = 'Nome'; $_LANGADM['AdminImages32954654ac8fe66a1d09be19001de2d4'] = 'Larghezza'; @@ -1047,6 +1043,7 @@ $_LANGADM['AdminImporte92cfa244b5eb9025d07522080468445'] = 'Eco- tassa'; $_LANGADM['AdminImport694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantità'; $_LANGADM['AdminImport8c489d0946f66d17d73f26366a4bf620'] = 'Peso'; $_LANGADM['AdminImport7a1920d61156abc05a60135aefe8bc67'] = 'Default'; +$_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'URL dell\'immagine'; $_LANGADM['AdminImportb718adec73e04ce3ec720dd11a06a308'] = 'ID'; $_LANGADM['AdminImportfd0dcc6233b026d257763713c133cf72'] = 'Attivo (0/1)'; $_LANGADM['AdminImport2688a544cd5ac33f27ab78c8d8c3acaa'] = 'Nome *'; @@ -1056,7 +1053,6 @@ $_LANGADM['AdminImporta51d7d2f3e952dfcf1e12ae572d7b337'] = 'Meta <titolo>:'; $_LANGADM['AdminImport5482749e99fa2d325e607075c3fd1c7a'] = 'Meta keywords'; $_LANGADM['AdminImport2a982c2c140ad66259355df1e2c5b69f'] = 'Meta descrizione'; $_LANGADM['AdminImportc1a59288c830561834340f6e7d969401'] = 'URL semplificato'; -$_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'URL dell\'immagine'; $_LANGADM['AdminImportdf8ffb90c945e796f2cfd9265325b9c3'] = 'Categorie (x, y, z...)'; $_LANGADM['AdminImport4da86e0470f0b14e4e516442202a8d26'] = 'Prezzo tasse escl.'; $_LANGADM['AdminImportf0a8011e2482cf9351b7bf565c7950ad'] = 'Prezzo tasse incl.'; @@ -1142,7 +1138,6 @@ $_LANGADM['AdminImport980da98409d058c365664ff7ea33dd6b'] = 'righe'; $_LANGADM['AdminImport903ee94af7e98ce06a57d2243ddd3efd'] = 'Importa i dati'; $_LANGADM['AdminImport9c1628890f5db454a0b4aed7720de094'] = '<<'; $_LANGADM['AdminImport22a1dae7d65f90acd53638dc81c3f376'] = '>>'; -$_LANGADM['AdminImport551746895fb66f979bce758992475bfc'] = 'nessun file selezionato'; $_LANGADM['AdminImport7abccc0f7eefd61743e408d28aac7cff'] = 'si è verificato un errore nel caricamento e nella copia del file'; $_LANGADM['AdminImport628fbfc7462b2873bb027ee850185859'] = 'nessuna entità selezionata'; $_LANGADM['AdminInformationaf3e294442744e49788883caffaeaf19'] = 'Aggiorna la tua versione PHP'; @@ -1201,7 +1196,6 @@ $_LANGADM['AdminInvoices23bf11ceb4fb51647fd977aba60246d3'] = 'Scegli se attivare $_LANGADM['AdminInvoices832d6a06e91e49828a89fb1ca4651d37'] = 'Prefisso:'; $_LANGADM['AdminInvoices0df35f41ce9f64e7f14819bd4145a2be'] = 'Prefisso usato per la numerazione delle fatture'; $_LANGADM['AdminInvoicesdb2d9ca9b008f4cdb2c5902adaa84fdc'] = 'Numero fattura'; -$_LANGADM['AdminInvoicese95a5af4294af7f4d566e91fc28a84c0'] = 'La prossima fattura inizierà con questo numero e poi aumenterà ad ogni fattura successiva. 0 corrisponde al numero attuale (n.'; $_LANGADM['AdminInvoicesc491f71acb93db711c341417e8c6be9e'] = 'Stampa PDF delle fatture'; $_LANGADM['AdminInvoices9a0a4f0869ab12a21407047290750e7a'] = 'Per data'; $_LANGADM['AdminInvoices1e6d57e813355689e9c77e947d73ad8f'] = 'Da:'; @@ -1251,8 +1245,8 @@ $_LANGADM['AdminLanguagesc907a021c935ae6144fa2ccadfe9360d'] = 'Bandiera:'; $_LANGADM['AdminLanguages581e03e07411d053e8c0f275f90fcabc'] = 'Carica la bandiera della nazione dal tuo computer'; $_LANGADM['AdminLanguages70212b3d97d23361e0ec0bc567d7ea30'] = 'Immagine \"nessuna immagine\":'; $_LANGADM['AdminLanguages2426cdf3330e330b60bb7004015207ba'] = 'Immagine mostrata quando \"nessuna immagine trovata'; -$_LANGADM['AdminLanguages24a23d787190f2c4812ff9ab11847a72'] = 'Status:'; $_LANGADM['AdminLanguagesb9f5c797ebbf55adccdd8539a65a0241'] = 'Disattivato'; +$_LANGADM['AdminLanguages24a23d787190f2c4812ff9ab11847a72'] = 'Status:'; $_LANGADM['AdminLanguages4c85fb98bf7cfd94c638d0f4e4e39b92'] = 'Attiva questa lingua'; $_LANGADM['AdminLanguages6ed8662bd9b7b3f59b193010be0c0f4a'] = 'Controlla se un pacchetto lingua è disponibile per questo codice ISO...'; $_LANGADM['AdminLanguages38fb7d24e0d60a048f540ecb18e13376'] = 'Salva'; @@ -1460,11 +1454,11 @@ $_LANGADM['AdminModulesf7c686a2f449e94bbbafca23e76dd33b'] = 'Legenda icone'; $_LANGADM['AdminModules150854c56046ef1253500d082fdfbbc2'] = 'Modulo installato e attivato'; $_LANGADM['AdminModules48a963c9173e950ace0c801509eb8ef2'] = 'Modulo installato ma disattivato'; $_LANGADM['AdminModulesbacc7d9b8003258a090961660729a9b5'] = 'Nessun modulo'; +$_LANGADM['AdminModules9ce81cf948b7325d53c64aa610851552'] = 'Questa azione rimuove in permanenza il modulo dal server. Sei sicuro di volerlo fare?'; +$_LANGADM['AdminModulesf2a6c498fb90ee345d997f888fce3b18'] = 'Elimina'; $_LANGADM['AdminModulesbcfaccebf745acfd5e75351095a5394a'] = 'Disattiva'; $_LANGADM['AdminModules2faec1f9f8cc7f8f40d521c4dd574f49'] = 'Attiva'; $_LANGADM['AdminModulesf1206f9fadc5ce41694f69129aecac26'] = 'Configura'; -$_LANGADM['AdminModules9ce81cf948b7325d53c64aa610851552'] = 'Questa azione rimuove in permanenza il modulo dal server. Sei sicuro di volerlo fare?'; -$_LANGADM['AdminModulesf2a6c498fb90ee345d997f888fce3b18'] = 'Elimina'; $_LANGADM['AdminModules3488a51eb7f723d65daeff912e69b177'] = 'Filtri selezionati'; $_LANGADM['AdminModulesPositions51a8b3a61ad63d4e5df2ce86870e39b8'] = 'Innestare un modulo'; $_LANGADM['AdminModulesPositions498f79c4c5bbde77f1bceb6c86fd0f6d'] = 'Mostra'; @@ -1696,7 +1690,6 @@ $_LANGADM['AdminPaymentcf7da676516ac041a93fd91755fa40f9'] = 'Nessun modulo di pa $_LANGADM['AdminPayment3e15057a39314e679d553bd9b6522ec8'] = 'Valuta del cliente'; $_LANGADM['AdminPaymentcdf4c2da827655c1ea74209dd683c903'] = 'Valuta di default'; $_LANGADM['AdminPaymente39a06ebd5bb473161c5dff3c79c80a5'] = 'Salva'; -$_LANGADM['AdminPerformance488d2e9e9b539c0ff188844a062afa48'] = 'Per usare Memcached, devi installare l’estensione Memcache PECL nel tuo server.'; $_LANGADM['AdminPerformance3d064d5efb6cf2ed52cf72bfef7c7db2'] = 'Per usare CacheFS la directory'; $_LANGADM['AdminPerformancea9b036d3e91d53892d6a67c31327e456'] = 'deve essere scrivibile'; $_LANGADM['AdminPerformancef8d698aea36fcbead2b9d5359ffca76f'] = 'Smarty'; @@ -1807,9 +1800,6 @@ $_LANGADM['AdminPreferencesd5bc5fd307b108537039b6b6f98889d5'] = 'Fuso orario:'; $_LANGADM['AdminPreferences0db377921f4ce762c62526131097968f'] = 'Generale'; $_LANGADM['AdminPreferences93cba07454f06a4a960172bbd6e2a435'] = 'Sì'; $_LANGADM['AdminPreferencesbafd7322c6e97d25b6299b5d6fe8920b'] = 'No'; -$_LANGADM['AdminPreferences9db16b0de8024dbd5267e53827679905'] = 'Per poter utilizzare un nuovo tema, segui queste fasi:'; -$_LANGADM['AdminPreferences47c255b10709674b30820470b0b62f35'] = 'Importa il tuo tema utilizzando questo modulo:'; -$_LANGADM['AdminPreferences7caa930a3a7d493e8b6e1b052da477b0'] = 'Installatore tema'; $_LANGADM['AdminPreferences64915993f11c4fbd47d8a6465f44125c'] = 'Quando il tema è importato, seleziona il tema in questa pagina'; $_LANGADM['AdminPreferences21034ae6d01a83e702839a72ba8a77b0'] = 'Tasse escl.'; $_LANGADM['AdminPreferences6a7a397c4d4b5842440eb4eab1f7af8c'] = 'Se cambi il tema, il file settings.inc.php deve essere scrivibile (CHMOD 755 / 777)'; @@ -1871,11 +1861,10 @@ $_LANGADM['AdminProducts850611eb409c54ab510153d91572be5b'] = 'Prezzi specifici a $_LANGADM['AdminProducts386c339d37e737a436499d423a77df0c'] = 'Valuta'; $_LANGADM['AdminProducts59716c97497eb9694541f7c3d37b1a4d'] = 'Nazione'; $_LANGADM['AdminProducts03937134cedab9078be39a77ee3a48a0'] = 'Gruppo'; -$_LANGADM['AdminProductse192956d901dff59c35fd2c477ed28d6'] = 'Prezzo (tasse escl.)'; +$_LANGADM['AdminProducts21034ae6d01a83e702839a72ba8a77b0'] = 'Tasse escl.'; $_LANGADM['AdminProducts9e834f13e35e4edf64863ab414a6217a'] = 'Sconto'; $_LANGADM['AdminProducts1901606ea069a83dc7beea17881ef95a'] = 'Periodo'; $_LANGADM['AdminProducts3c6c11039b6caf151f6e3e99237f2f3b'] = 'A partire da (quantità)'; -$_LANGADM['AdminProducts528b50268977416fd8aacb16d07c2cf8'] = 'Prezzo finle (tasse escl.)'; $_LANGADM['AdminProducts004bf6c9a40003140292e97330236c53'] = 'Azione'; $_LANGADM['AdminProductsa6ff0f7a2a1993857cb67b769780e708'] = 'Non ci sono prezzi specifici'; $_LANGADM['AdminProducts545f6c2f382c04810103b3e5e6f7d841'] = 'Senza limiti'; @@ -1896,7 +1885,6 @@ $_LANGADM['AdminProducts06444363878572ed1fd5c9342cd5884f'] = 'Disponibile da'; $_LANGADM['AdminProducts01b6e20344b68835c5ed1ddedf20d531'] = 'fino al'; $_LANGADM['AdminProducts95b6faa9d75417fe5e7767a733ab6fb4'] = 'A partire da'; $_LANGADM['AdminProducts3e34bdebd9bd5edda27e8728904a2552'] = 'unità'; -$_LANGADM['AdminProducts28c9c3952f4a7bfabdc3ea344af20737'] = 'Prezzo prodotto (tasse escl.)'; $_LANGADM['AdminProducts83a3be00962f7ebef403da83d203e595'] = 'Attuale'; $_LANGADM['AdminProducts9004d8f63917997431815639087b37b2'] = 'Puoi impostare questo valore a 0 in modo da applicare il prezzo di default'; $_LANGADM['AdminProductsf5a7257cb1424678ae6bebbd0c36b341'] = 'Applica uno sconto di'; @@ -2012,12 +2000,12 @@ $_LANGADM['AdminProductse2e79605fc9450ec17957cf0e910f5c6'] = 'Tasse incl.'; $_LANGADM['AdminProducts887ee91702c962a70b87cbef07bbcaec'] = 'Tasse escl.'; $_LANGADM['AdminProducts6aa641a49246a5538f692e9884fbe96e'] = 'Puoi definire molti sconti e specifiche regole sui prezzi nei tab Prezzi'; $_LANGADM['AdminProducts90a38214f3409698c7110ce3217b7f22'] = 'Movimento magazzino:'; -$_LANGADM['AdminProducts61fa2d8712a070d9bab490ceb5bd6fe8'] = 'Scegli il motivo e inserisci la quantità che volevi aumentare o diminuire nel tuo magazzino'; $_LANGADM['AdminProducts3c6c92395ebfd9ba66296793ee901854'] = 'Magazzino iniziale:'; $_LANGADM['AdminProducts006b4cc15322f7951d9100716edcac07'] = 'Quantità minima:'; $_LANGADM['AdminProductsb287d004082f0d743a49dc7360d4fbbe'] = 'La quantità minima per acquistare il prodotto (imposta a 1 per disattivare questa funzione)'; $_LANGADM['AdminProducts3b8c1da80dae1d62561a6d04d2f68dd5'] = 'Quantità in magazzino:'; $_LANGADM['AdminProducts6606420385ad3fd14c70b8ffa210e407'] = 'Hai usato delle combinazioni, per questo non puoi modificare la quantità in magazzino qui, ma nel tab \"Combinazioni\"'; +$_LANGADM['AdminProductsd74838fbbeb384c01d7294db33c36ec3'] = 'La gestione delle scorte è disabilitato'; $_LANGADM['AdminProducts10b8ce36a973c8009b521b39488a89a7'] = 'Costi di spedizione supplementari'; $_LANGADM['AdminProductsb6ef48322d4d59004db9f650344c1a8f'] = 'Sarà applicata la tassa di spedizione.'; $_LANGADM['AdminProducts3e565755572fa5df48eb811c62619098'] = 'Messagggio mostrato quando in magazzino:'; @@ -2029,6 +2017,7 @@ $_LANGADM['AdminProducts119a7c88cf8f1c685c57981abff26f43'] = 'Accetta gli ordini $_LANGADM['AdminProductse5f7f63d66023847e693fd34bea09d41'] = 'Di defalut :'; $_LANGADM['AdminProducts0871f875dff8224be3247ccedea01024'] = 'Visualizza\' in'; $_LANGADM['AdminProductsd0834fcec6337785ee749c8f5464f6f6'] = 'Opzioni'; +$_LANGADM['AdminProducts9d9aa88574c4dab04ddd8356c377357d'] = 'Categoria di default:'; $_LANGADM['AdminProductsd88946b678e4c2f251d4e292e8142291'] = 'SEO'; $_LANGADM['AdminProducts2651608f8f1c6f391f919be228a6ee62'] = 'Clicca qui per migliorare la posizione del prodotto nei motori di ricerca (SEO)'; $_LANGADM['AdminProducts7b250cb374c12c42a75227ba75df7779'] = 'Meta <titolo>:'; @@ -2040,7 +2029,6 @@ $_LANGADM['AdminProducts6d3adfeed355509b6aee5588e66d0157'] = 'Keywords separate $_LANGADM['AdminProducts02fa003c38fefcda498b876f67f4cac7'] = 'URL semplificato:'; $_LANGADM['AdminProducts03a1790c522058303088150cfb8b7353'] = 'Sono permessi solo lettere e il carattere meno \'-\' '; $_LANGADM['AdminProducts32b919d18cfaca89383f6000dcc9c031'] = 'Crea'; -$_LANGADM['AdminProductsf66ff6c96650130d5c68c8b1f0f95b89'] = 'URL semplificato dal nome del prodotto.'; $_LANGADM['AdminProducts92ab5edf4194cb5a84d6808cb8d8b696'] = 'Il link verso il prodotto sarà così:'; $_LANGADM['AdminProducts234078adec0a64008b6ae77653776cfa'] = 'Breve descrizione:'; $_LANGADM['AdminProducts83d4043f36afbc6c2549ec9309d9aee8'] = 'appare nei risultati di ricerca'; @@ -2086,7 +2074,6 @@ $_LANGADM['AdminProductsad1c17cb310c91400d25d599cf154eda'] = 'sovrascrive il pre $_LANGADM['AdminProducts9d2ee2dd8c264912b6dd7b1689c1b423'] = 'Impatto sul prezzo:'; $_LANGADM['AdminProducts6adf97f83acf6453d4a6a4b1070f3754'] = 'Nessuno'; $_LANGADM['AdminProductsaac247ca22789872bad95dc8f6c45d37'] = 'Aumento'; -$_LANGADM['AdminProducts21034ae6d01a83e702839a72ba8a77b0'] = 'Tasse escl.'; $_LANGADM['AdminProducts1f87346a16cf80c372065de3c54c86d9'] = 'Tasse incl.'; $_LANGADM['AdminProducts190733df8c1af5e4666dfad4cc554080'] = 'il prezzo finale del prodotto sarà'; $_LANGADM['AdminProducts91c8f68700703b825761609b303d44e3'] = 'Impatto sul peso:'; @@ -2134,7 +2121,6 @@ $_LANGADM['AdminProductsd6ae681fcd58f1e1936ca97da36528ff'] = 'Aggiungi una nuova $_LANGADM['AdminProductsd1a1006c2d7ebf87d5e4d934a138e5a5'] = 'Devi salvare questo prodotto prima di aggiungere caratteristiche'; $_LANGADM['AdminProducts4492081ca02b059f9e8af4ddaf0f7292'] = 'Pacchetto'; $_LANGADM['AdminProductsc7a915a59b56dc898c0ae52b64bed0c5'] = 'Aggiungi un articolo al pacchetto'; -$_LANGADM['AdminProducts9d9aa88574c4dab04ddd8356c377357d'] = 'Categoria di default:'; $_LANGADM['AdminProducts10cbdb4839f838ce30409739435a6070'] = 'Catalogo:'; $_LANGADM['AdminProductsb61bd19699eab41bbcdabc42f83af268'] = 'Pensa a cambiare la categoria di default.'; $_LANGADM['AdminProducts74645ed4e5e25461a664d5f68ff19098'] = 'Contrassegna tutte le caselle di categorie nei quali il prodotto deve apparire'; @@ -2377,7 +2363,6 @@ $_LANGADM['AdminSearch4db15b3d4b90022287ec8dce8a42a78c'] = 'Non è stato trovato $_LANGADM['AdminSearchConf8a289df2d13df2450bfcc937a026dee3'] = 'Ricerca AJAX'; $_LANGADM['AdminSearchConf00204f71aee500f89085662a40f8a555'] = 'Attiva ricerca ajax per i tuoi visitatori.'; $_LANGADM['AdminSearchConfbbeec9bc726c86e461b48941118e4f3b'] = 'Ricerca istantanea'; -$_LANGADM['AdminSearchConf45f4a2c5ebb78d0193d48c4c4e314f1c'] = 'La soluzione di ricerca più rapida per il tuo negozio'; $_LANGADM['AdminSearchConf4381a423b1c744a58a00f9921327f4f7'] = 'Lunghezza minima della parola'; $_LANGADM['AdminSearchConfc1aa7600ab8604ee230fbf068ae3e032'] = 'Saranno indicizzate solo parole a partire da questa dimensione.'; $_LANGADM['AdminSearchConf5bff181421d95b49ad5ce5bb08f0ffbe'] = 'Parole da non indicizzare'; @@ -2731,7 +2716,6 @@ $_LANGADM['AdminTrackingeadcead196002163653bd0e9be7b6d5e'] = 'Modifica questo pr $_LANGADM['AdminTrackingdcc4db89d62ec3e757428a5811553c0b'] = 'Vuoi cancellare'; $_LANGADM['AdminTracking0449f210068787074ce58175b1a2f5cf'] = 'Cancella questo prodotto'; $_LANGADM['AdminTranslations91aaf01cad2d0dc0382edb323ed6e51a'] = 'Impossibile creare la cartella'; -$_LANGADM['AdminTranslations498ceaf940d61e880e87f93d76a11e05'] = 'Controlla i permessi della directory.'; $_LANGADM['AdminTranslationsd797353e4c5b71edce10d34557198b81'] = 'devi selezionare 2 lingue per copiare i dati da una all\'altra'; $_LANGADM['AdminTranslationsf31ffb564b1c234d509f4b20fbb2d068'] = 'devi selezionare 2 temi per copiare i dati da uno all\'altro'; $_LANGADM['AdminTranslationsb0f0554e563b8ffcabe170739d126bb1'] = 'si è verificato un errore durante la copia dei dati'; @@ -2813,6 +2797,58 @@ $_LANGADM['AdminTranslations52d83d7ed502b33d300a8c0af2c5b455'] = 'Lista di temi $_LANGADM['AdminTranslationsc21f969b5f03d33d43e04f8f136e7682'] = 'Default'; $_LANGADM['AdminTranslationsa9e4402481bd9b8e36752bf731f67eb6'] = 'Tema'; $_LANGADM['AdminTranslations53b3cae42737979c884275593a01f468'] = 'Modulo:'; +$_LANGADM['AdminUpgrade19f823c6453c2b1ffd09cb715214813d'] = 'Campi richiesti'; +$_LANGADM['AdminUpgrade760c4026bc5a0bd5378e6efc3f1370b4'] = 'Troppo lungo!'; +$_LANGADM['AdminUpgrade4f2e28904946a09d8c7f36dd3ee72457'] = 'I campi non corrispondono!'; +$_LANGADM['AdminUpgrade43b01d1a6c5065545c65f42003b0ab5c'] = 'Indirizzo errato!'; +$_LANGADM['AdminUpgrade2e170dfd78c2171a25605ececc0950a4'] = 'Impossibile inviare l\'e-mail!'; +$_LANGADM['AdminUpgrade6deee80e4bdb8894331994116818558e'] = 'Impossibile creare file di impostazione, se /config/settings.inc.php esiste, dai un\'autorizzazione scritta a questo file, altrimenti crea un file chiamato settings.inc.php nella directory config (/config/)'; +$_LANGADM['AdminUpgradeaa946cb00b1c23ff6553b6f9e05da151'] = 'Il file dei parametri non è stato scritto, crea un file denominato settings.inc.php nella tua directory di configurazione.'; +$_LANGADM['AdminUpgradee930e2474c664a3a7e89ecfb8793694b'] = 'Impossibile inviare il file!'; +$_LANGADM['AdminUpgrade774fc7a0f56391abc5d8856f2436ca07'] = 'L\'integrità dei dati non è convalidata.'; +$_LANGADM['AdminUpgrade8fd007bf08e0717537825a3e91cb4fcc'] = 'Impossibile leggere il contenuto di uno dei file *.sql.'; +$_LANGADM['AdminUpgradec71e825f6873f64b91efc26313614eab'] = 'Impossibile accedere al contenuto di uno dei file *.sql.'; +$_LANGADM['AdminUpgrade3d5c8f1d29b1a1dc4ea0673122e0d277'] = 'Errore al momento dell\'inserimento nel database:'; +$_LANGADM['AdminUpgrade17e1581d01152347bfaacd153b961379'] = 'La password non è corretta (stringa alfanumerica di almeno 8 caratteri)'; +$_LANGADM['AdminUpgrade9b9f3b2f8a4dffcad9188c8fc4b468c8'] = 'Esiste già un database Prestashop con questo prefisso; eliminalo oppure cambia prefisso.'; +$_LANGADM['AdminUpgradebc5e1163a15106f9e941a7603124709d'] = 'Non è un nome valido'; +$_LANGADM['AdminUpgradea9d82945b8603f0c8807958d7db9a24d'] = 'Non è un\'immagine valida'; +$_LANGADM['AdminUpgradeb37eef07b764ea58eec9afe624e20a40'] = 'Errore al momento della creazione del file /config/settings.inc.php.'; +$_LANGADM['AdminUpgrade3d9f514d46849760ef1b1412e314fd99'] = 'Errore:'; +$_LANGADM['AdminUpgrade504053ab4c6d648edf11624f1bea4bb4'] = 'Questo database PrestaShop esiste già. Inserisci di nuovo i tuoi dati di login nel database.'; +$_LANGADM['AdminUpgraded7a99f61bb284d096ea4f221784af85a'] = 'Si è verificato un errore durante il ridimensionamento dell\'immagine'; +$_LANGADM['AdminUpgrade428c933bafbf262d693fbf1c22c03e5d'] = 'Il database è stato trovato!'; +$_LANGADM['AdminUpgrade76bd190129b7aefb90fdf42f09ec3ec7'] = 'Il server del database è disponibile ma il database non è stato trovato.'; +$_LANGADM['AdminUpgrade045f4b5c3f990e5a26e2837495d68259'] = 'Il server del database non è stato trovato, verifica i tuoi dati o il nome del server.'; +$_LANGADM['AdminUpgrade757fc72e8d69106dd2cf9da22cc7adb1'] = 'Si è verificato un errore durante l\'invio della e-mail, verifica i tuoi parametri.'; +$_LANGADM['AdminUpgraded18ad19290b3bfc3cd0d7badbb6cb6a3'] = 'Impossibile scrivere l\'immagine /img/logo.jpg. Se esiste già, cancellala manualmente.'; +$_LANGADM['AdminUpgrade2368e33e3e01d53abb9b60061ab83903'] = 'Il file inviato supera la dimensione massima autorizzata.'; +$_LANGADM['AdminUpgradea10ef376d9f4c877ac86d8e4350116bf'] = 'Il file inviato supera la dimensione massima autorizzata.'; +$_LANGADM['AdminUpgradef8fe8cba1625eaf8e5c253b041d57dbd'] = 'Il file è stato parzialmente inviato.'; +$_LANGADM['AdminUpgrade8c9067e52e4440d8a20e74fdc745b0c6'] = 'Non è stato inviato alcun file'; +$_LANGADM['AdminUpgrade2384d693d9af53b4727c092af7570a19'] = 'Manca la cartella temporanea di ricezione dell\'invio di file. Consulta il tuo amministratore.'; +$_LANGADM['AdminUpgradef5985b2c059d5cc36968baab7585baba'] = 'Impossibile scrivere il file sul disco'; +$_LANGADM['AdminUpgrade9e54dfe54e03b0010c1fe70bd65cd5e6'] = 'Invio file interrotto a causa di estensione errata'; +$_LANGADM['AdminUpgrade32af3a59b50e98d254d6c03c5b320a94'] = 'Impossibile convertire i dati del tuo database in utf-8.'; +$_LANGADM['AdminUpgrade989a45a4ca01ee222f4370172bf8850d'] = 'nome negozio non valido'; +$_LANGADM['AdminUpgrade68499acecfba9d3bf0ca8711f300d3ed'] = 'Il tuo nome contiene dei caratteri non validi'; +$_LANGADM['AdminUpgrade2399cf4ca7b49f2706f6e147a32efa78'] = 'Il tuo cognome contiene dei caratteri non validi'; +$_LANGADM['AdminUpgrade7d72600fcff52fb3a2d2f73572117311'] = 'Il tuo server di database non supporta il charset utf-8.'; +$_LANGADM['AdminUpgrade5b9bbadcf96f15e7f112c13a9e5f076e'] = 'Il supporto di questo motore di database non è supportato, scegline un altro come MyISAM'; +$_LANGADM['AdminUpgrade24b481455c1b72b0c2539e7d516b9582'] = 'Il file /img/logo.jpg non ?scrivibile, ti preghiamo di effettuare CHMOD 755 oppure CHMOD 777'; +$_LANGADM['AdminUpgrade5746b74663148afffd1350c97d4fcdfe'] = 'Campo modalità catalogo non valido'; +$_LANGADM['AdminUpgradedafe44b99256a7783bc37f4f949da373'] = 'Questo installatore è troppo vecchio.'; +$_LANGADM['AdminUpgrade37ce0f29c7377c827e7247fe5645a782'] = 'Sei già in possesso della versione %s'; +$_LANGADM['AdminUpgrade89928a14f2090aec4fd7aff9ea983f95'] = 'Nessuna versione precedente. Hai cancellato o rinominato il file settings.inc.php della cartella config ?'; +$_LANGADM['AdminUpgrade5276a8cbd9e3e467396089b267564f51'] = 'Il file config/settings.inc.php non è stato trovato. Il file potrebbe essere stato cancellato o rinominato'; +$_LANGADM['AdminUpgrade24784d9e80638781b74c017b33d8ca0c'] = 'Impossibile trovare i file di upgrade SQL. Verifica che la cartella /install/sql/upgrade non sia vuota.'; +$_LANGADM['AdminUpgrade580e4b216e324f675f0237cdb34b6c2d'] = 'Nessun aggiornamento disponibile'; +$_LANGADM['AdminUpgradef15e7e7292b0c72894cf45a893e0d497'] = 'Errore al momento dell\'apertura del file SQL'; +$_LANGADM['AdminUpgradeb8286438fbb6c7df9129fadc5316c19f'] = 'Errore al momento dell\'inserimento nel database'; +$_LANGADM['AdminUpgrade229ee8046cafc09ddaf46fb9db710e91'] = 'Purtroppo,'; +$_LANGADM['AdminUpgradee805a556799b7cef40e9760c81d99218'] = 'sono apparsi errori SQL.'; +$_LANGADM['AdminUpgrade5627353fd6ac678497af3ece05087068'] = 'Il file config/defines.inc.php non è stato trovato. Cosa è successo?'; +$_LANGADM['AdminUpgrade783e8e29e6a8c3e22baa58a19420eb4f'] = 'secondi'; $_LANGADM['AdminWebservice897356954c2cd3d41b221e3f24f99bba'] = 'Chiave'; $_LANGADM['AdminWebservice00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Attivato'; $_LANGADM['AdminWebservice52699c78843b98f98620186a59b0a3fa'] = 'Descrizione chiave'; diff --git a/webservice/dispatcher.php b/webservice/dispatcher.php index 728080d63..f6eafcc6c 100644 --- a/webservice/dispatcher.php +++ b/webservice/dispatcher.php @@ -46,7 +46,7 @@ else if (isset($_REQUEST['xml'])) { // if a XML is in POST - $input_xml = $_REQUEST['xml']; + $input_xml = stripslashes($_REQUEST['xml']); } else {