Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

//added check on field lenght in install and fix sql in upgrade

  • Loading branch information...
commit e7e156c261f897ed25ff73cf2174700854dd20b2 1 parent 367a442
@vAugagneur vAugagneur authored
View
12 install-dev/controllers/http/configure.php
@@ -72,14 +72,20 @@ public function validate()
// Check shop name
if ($this->session->shop_name && !Validate::isGenericName($this->session->shop_name))
$this->errors['shop_name'] = $this->l('Invalid shop name');
-
+ else if (strlen($this->session->shop_name) > 64)
+ $this->errors['shop_name'] = $this->l('The field %s is limited to %d characters', $this->l('shop name'), 64);
+
// Check admin name
if ($this->session->admin_firstname && !Validate::isName($this->session->admin_firstname))
$this->errors['admin_firstname'] = $this->l('Your firstname contains some invalid characters');
-
+ else if (strlen($this->session->admin_firstname) > 32)
+ $this->errors['admin_firstname'] = $this->l('The field %s is limited to %d characters', $this->l('firstname'), 32);
+
if ($this->session->admin_lastname && !Validate::isName($this->session->admin_lastname))
$this->errors['admin_lastname'] = $this->l('Your lastname contains some invalid characters');
-
+ else if (strlen($this->session->admin_lastname) > 32)
+ $this->errors['admin_lastname'] = $this->l('The field %s is limited to %d characters', $this->l('lastname'), 32);
+
// Check passwords
if ($this->session->admin_password)
{
View
4 install-dev/langs/fr/install.php
@@ -195,5 +195,9 @@
'<b>Warning: You cannot use anymore this tool to upgrade your store.</b><br /><br />You already have <b>PrestaShop version %1$s installed</b>.<br /><br />If you want to upgrade to the latest version please read our documentation: <a href="%2$s">%2$s</a>' => '<b>Attention: Vous ne pouvez plus utiliser cet outil pour mettre à jour votre boutique.</b><br /><br />Vous avez déjà <b>PrestaShop version %1$s d\'installé.</b><br /><br />Si vous souhaitez utiliser la dernière version, merci de vous référer à notre documentation pour la mise à jour : <a href="%2$s">%2$s</a>',
'PrestaShop Wizard Installer' => 'Installation de PrestaShop',
'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'PrestaShop peut vous assister si vous rencontrez un obstacle lors de l\'installation de votre boutique. Contactez notre équipe au %s et indiquez-nous l\'URL de votre boutique. Nous serons heureux de vous aider dans les dernières étapes de l\'installation !',
+ 'The field %s is limited to %d characters' => 'Le champs %s est limité à %d caractères',
+ 'shop name' => 'nom de la boutique',
+ 'firstname' => 'prénom',
+ 'lastname' => 'nom de famille',
),
);
View
4 install-dev/upgrade/sql/1.5.3.0.sql
@@ -8,9 +8,9 @@ ALTER TABLE `PREFIX_address` CHANGE `outstanding_allow_amount` `outstanding_all
UPDATE `PREFIX_order_state` SET `delivery` = 0 WHERE `id_order_state` = 3;
-ALTER TABLE `PREFIX_product_shop` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` , ADD `available_for_order` tinyint(1) NOT NULL default '1' AFTER `id_product_redirected`;
+ALTER TABLE `PREFIX_product_shop` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` ;
-ALTER TABLE `PREFIX_product` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` , ADD `available_for_order` tinyint(1) NOT NULL default '1' AFTER `id_product_redirected`;
+ALTER TABLE `PREFIX_product` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` ;
UPDATE `PREFIX_order_state` SET `send_email` = 1 WHERE `id_order_state` = (SELECT `value` FROM `PREFIX_configuration` WHERE `name` = 'PS_OS_WS_PAYMENT' LIMIT 1);
Please sign in to comment.
Something went wrong with that request. Please try again.