Remove code - you can't send multiple cookie domain

adm/tabs/AdminImport.php

@@ -79,16 +79,7 @@ class AdminImport extends AdminTab
 
 	public function __construct()
 	{
-		$this->entities = array_flip(array(
-			$this->l('Categories'),
-			$this->l('Products'),
-			$this->l('Combinations'),
-			$this->l('Customers'),
-			$this->l('Addresses'),
-			$this->l('Manufacturers'),
-			$this->l('Suppliers'),
-			$this->l('Pack'),
-		));
+		$this->entities = array_flip(array($this->l('Categories'), $this->l('Products'), $this->l('Combinations'), $this->l('Customers'), $this->l('Addresses'), $this->l('Manufacturers'), $this->l('Suppliers')));
 
 		switch ((int)(Tools::getValue('entity')))
 		{
@@ -289,19 +280,7 @@ class AdminImport extends AdminTab
 				'meta_keywords' => array('label' => $this->l('Meta-keywords')),
 				'meta_description' => array('label' => $this->l('Meta-description')));
 			break;
-			
-			case $this->entities[$this->l('Pack')]:
-
-				self::$required_fields = array('id_product_item', 'qty', 'id');
-				
-				$this->available_fields = array(
-					'id_product_item' => array('label' => $this->l('ID Item')),
-					'qty' => array('label' => $this->l('Quantity Item')),
-					'id' => array('label' => $this->l('ID Pack')),
-				);
-			break;
 		}
-		
 		parent::__construct();
 	}
 
@@ -1313,51 +1292,6 @@ class AdminImport extends AdminTab
 		}
 		$this->closeCsvFile($handle);
 	}
-	
-	public function packImport()
-	{
-		$this->receiveTab();
-		$handle = $this->openCsvFile();
-		self::setLocale();
-		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
-		{
-			if (Tools::getValue('convert')) {
-				$line = $this->utf8_encode_array($line);
-			}
-			$info = self::getMaskedRow($line);
-
-			self::setDefaultValues($info);
-			
-			// Is product a pack
-			if (array_key_exists('id', $info) && (int)($info['id']) && Pack::isPack((int)($info['id']))) {
-				$pack = new Pack((int)($info['id']));
-			}
-			else {
-				$pack = new Pack();
-			}
-		
-			self::array_walk($info, array('AdminImport', 'fillInfo'), $pack);
-			if (($fieldError = $pack->validateFields(UNFRIENDLY_ERROR, true)) === true && is_numeric($info['qty']))
-			{
-				$res = false;
-				// Is product item in pack
-				if ($pack->isPacked($info['id_product_item'])) {
-					$res = $pack->updateItem($info['id'], $info['id_product_item'], $info['qty']);
-				}
-				// Insert
-				if (!$res) {
-					$res = $pack->addItem($info['id'], $info['id_product_item'], $info['qty']);
-				}
-				if (!$res) {
-					$this->_errors[] = mysql_error().' '.$info['id_product_item'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved');
-				}
-			}
-			else {
-				$this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '');
-			}
-		}
-		$this->closeCsvFile($handle);
-	}
 
 	public function display()
 	{
@@ -1890,9 +1824,6 @@ class AdminImport extends AdminTab
 				case $this->entities[$this->l('Suppliers')]:
 					$this->supplierImport();
 				break;
-				case $this->entities[$this->l('Pack')]:
-					$this->packImport();
-				break;
 				default:
 					$this->_errors[] = $this->l('no entity selected');
 			}

classes/Cookie.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -83,22 +83,29 @@ class	CookieCore
 	{
 		$r = '!(?:(\w+)://)?(?:(\w+)\:(\w+)@)?([^/:]+)?(?:\:(\d*))?([^#?]+)?(?:\?([^#]+))?(?:#(.+$))?!i';
 	    preg_match ($r, Tools::getHttpHost(false, false), $out);
-		if (preg_match('/^(((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]{1}[0-9]|[1-9]).)'. 
-         '{1}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]).)'. 
-         '{2}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]){1}))$/', $out[4]))
-			return false;
-		if (!strstr(Tools::getHttpHost(false, false), '.'))
+		if (preg_match('/^(((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]{1}[0-9]|[1-9]).)'.
+			'{1}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]).)'.
+			'{2}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]){1}))$/', $out[4])) {
+				return false;
+		}
+		
+		if (!strstr(Tools::getHttpHost(false, false), '.')) {
 			return false;
+		}
+		
 		$domain = $out[4];
 		$subDomains = SubDomain::getSubDomains();
-		if ($subDomains === false)
+		if ($subDomains === false) {
 			die(Tools::displayError('Bad SubDomain SQL query.'));
-		foreach ($subDomains AS $subDomain)
-		{
-			$subDomainLength = strlen($subDomain) + 1;
-			if (strncmp($subDomain.'.', $domain, $subDomainLength) == 0)
-				$domain = substr($domain, $subDomainLength);
 		}
+		
+		foreach ($subDomains AS $subDomain) {
+			$subDomainLength = strlen($subDomain) + 1;
+			if (strncmp($subDomain.'.', $domain, $subDomainLength) == 0) {
+				$domain = substr($domain, $subDomainLength);
+			}
+		}
+		
 		return $domain;
 	}
 

classes/Pack.php

@@ -174,30 +174,18 @@ class PackCore extends Product
 	}
 
 	/**
-	 * Add an item to the pack
-	 * @param integer $id_product
-	 * @param integer $id_item
-	 * @param integer $qty
-	 * @return boolean true if everything was fine
-	 */
+	* Add an item to the pack
+	*
+	* @param integer $id_product
+	* @param integer $id_item
+	* @param integer $qty
+	* @return boolean true if everything was fine
+	*/
 	public static function addItem($id_product, $id_item, $qty)
 	{
 		Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'product SET cache_is_pack = 1 WHERE id_product = '.(int)($id_product).' LIMIT 1');
 		return Db::getInstance()->AutoExecute(_DB_PREFIX_.'pack', array('id_product_pack' => (int)($id_product), 'id_product_item' => (int)($id_item), 'quantity' => (int)($qty)), 'INSERT');
 	}
-	
-	/**
-	 * Update item and his pack association
-	 * @param integer $id_product
-	 * @param integer $id_item
-	 * @param integer $qty
-	 * @return boolean true if everything was fine
-	 */
-	public static function updateItem($id_product, $id_item, $qty)
-	{
-		return Db::getInstance()->AutoExecute(_DB_PREFIX_.'pack', array('quantity' => (int)($qty)),
-			'UPDATE', 'id_product_pack='.(int)($id_product).' AND id_product_item='.(int)($id_item));
-	}
 
 	public static function duplicate($id_product_old, $id_product_new)
 	{

mails/fr/loyalty_discount_reminder.html

@@ -24,7 +24,7 @@
 Nous vous informons que vous avez dans votre compte un crédit de fidélité non utilisé suite à votre commande {commandenum}. 
 Celui-ci expire dans 1 mois. 
 
-Venez nous rendre visite sur le site : https://www.bebeboutik.com et profiter de nos offres jusqu'à -70% !
+Venez nous rendre visite sur le site : https://wwww.bebeboutik.com et profiter de nos offres jusqu'à -70% !
 </td>
 </tr>
 <tr>

mails/fr/loyalty_discount_reminder.txt

@@ -3,6 +3,6 @@ Bonjour {firstname} {lastname},
 Nous vous informons que vous avez dans votre compte un crédit de fidélité non utilisé suite à votre commande {commandenum}. 
 Celui-ci expire dans 1 mois. 
 
-Venez nous rendre visite sur le site : https://www.bebeboutik.com et profiter de nos offres jusqu'à -70% !
+Venez nous rendre visite sur le site : https://wwww.bebeboutik.com et profiter de nos offres jusqu'à -70% !
 
 L'équipe Bébé Boutik,

modules/blockauth/.hg/branch

@@ -0,0 +1 @@
+default

modules/blockauth/.hg/cache/branchheads

@@ -0,0 +1,2 @@
+22140c622301271e8694549e29e360916921e485 0
+22140c622301271e8694549e29e360916921e485 default

modules/blockauth/.hg/cache/tags

@@ -0,0 +1,2 @@
+0 22140c622301271e8694549e29e360916921e485
+

modules/blockauth/.hg/hgrc

@@ -0,0 +1,2 @@
+[paths]
+default = ssh://ewen@localhost//hg/blockauth

modules/blockauth/.hg/requires

@@ -0,0 +1,4 @@
+revlogv1
+fncache
+store
+dotencode

modules/blockauth/.hg/store/fncache

@@ -0,0 +1,5 @@
+data/logo.gif.i
+data/config.xml.i
+data/fr.php.i
+data/blockauth.php.i
+data/blockauth.tpl.i

modules/blockauth/.hg/undo.branch

@@ -0,0 +1 @@
+default

modules/blockauth/.hg/undo.desc

@@ -0,0 +1,3 @@
+0
+pull
+ssh://ewen@localhost//hg/blockauth

modules/blockcartex/.hg/branch

@@ -0,0 +1 @@
+default

modules/blockcartex/.hg/cache/branchheads

@@ -0,0 +1,2 @@
+55a547b9200e199cbe52370d3ee590a2a8237c03 2
+55a547b9200e199cbe52370d3ee590a2a8237c03 default

modules/blockcartex/.hg/cache/tags

@@ -0,0 +1,2 @@
+2 55a547b9200e199cbe52370d3ee590a2a8237c03
+

modules/blockcartex/.hg/hgrc

@@ -0,0 +1,2 @@
+[paths]
+default = ssh://ewen@localhost//hg/blockcartex

modules/blockcartex/.hg/requires

@@ -0,0 +1,4 @@
+revlogv1
+fncache
+store
+dotencode

modules/blockcartex/.hg/store/fncache

@@ -0,0 +1,16 @@
+data/img/index.php.i
+data/index.php.i
+data/config.xml.i
+data/img/icon/delete.gif.i
+data/img/icon/index.php.i
+data/img/icon/basket_go.png.i
+data/blockcart-ajax.php.i
+data/img/icon/checkout.png.i
+data/blockcart-set-collapse.php.i
+data/blockcartex.php.i
+data/fr.php.i
+data/logo.gif.i
+data/ajax-cart.js.i
+data/blockcart.tpl.i
+data/img/icon/basket.png.i
+data/blockcart-json.tpl.i

modules/blockcartex/.hg/undo.branch

@@ -0,0 +1 @@
+default

modules/blockcartex/.hg/undo.desc

@@ -0,0 +1,3 @@
+0
+pull
+ssh://ewen@localhost//hg/blockcartex

modules/blocklogo/.hg/branch

@@ -0,0 +1 @@
+default

modules/blocklogo/.hg/cache/branchheads

@@ -0,0 +1,2 @@
+a0b6701fd7c40b9759a83fc8e78566aa84a678e2 0
+a0b6701fd7c40b9759a83fc8e78566aa84a678e2 default

modules/blocklogo/.hg/cache/tags

@@ -0,0 +1,2 @@
+0 a0b6701fd7c40b9759a83fc8e78566aa84a678e2
+

modules/blocklogo/.hg/hgrc

@@ -0,0 +1,2 @@
+[paths]
+default = ssh://ewen@localhost//hg/blocklogo

modules/blocklogo/.hg/requires

@@ -0,0 +1,4 @@
+revlogv1
+fncache
+store
+dotencode

modules/blocklogo/.hg/store/fncache

@@ -0,0 +1,7 @@
+data/index.php.i
+data/config.xml.i
+data/logo.gif.i
+data/en.php.i
+data/blocklogo.php.i
+data/blocklogo.tpl.i
+data/fr.php.i

modules/blocklogo/.hg/undo.branch

@@ -0,0 +1 @@
+default

modules/blocklogo/.hg/undo.desc

@@ -0,0 +1,3 @@
+0
+pull
+ssh://ewen@localhost//hg/blocklogo

modules/blockuserinfo/blockuserinfo.php

@@ -69,7 +69,7 @@ class BlockUserInfo extends Module
     	
     	global $smarty, $cookie, $cart;
     	
-    	if (!$cookie->logged) {
+    	if (!$cookie->isLogged()) {
     	    return;
     	}
     	
@@ -92,7 +92,6 @@ class BlockUserInfo extends Module
     	    'loyalties' => ($loyalties)?$loyalties:0,
     	    'cart' => $cart,
     	    'cart_qties' => $cart->nbProducts(),
-    	    'logged' => $cookie->isLogged(),
     	    'customerName' => ($cookie->logged ? $cookie->customer_firstname.' '.$cookie->customer_lastname : false),
     	    'firstName' => ($cookie->logged ? $cookie->customer_firstname : false),
     	    'lastName' => ($cookie->logged ? $cookie->customer_lastname : false),
@@ -119,7 +118,7 @@ class BlockUserInfo extends Module
 		$loyalties = null;
 		if ($this->disableCredits === false) {
     		$display_credits = true;
-    		if ($cookie->logged) {
+    		if ($cookie->isLogged()) {
 		        $display_credits = true;
 		        $sql = 'SELECT id_customer FROM `'._DB_PREFIX_.'customer_credits` WHERE id_customer  = ' .(int) $cookie->id_customer;
 		        if(Db::getInstance()->getValue($sql)){
@@ -137,7 +136,6 @@ class BlockUserInfo extends Module
 			'loyalties' => ($loyalties)?$loyalties:0,
 			'cart' => $cart,
 			'cart_qties' => $cart->nbProducts(),
-			'logged' => $cookie->isLogged(),
 			'customerName' => ($cookie->logged ? $cookie->customer_firstname.' '.$cookie->customer_lastname : false),
 			'firstName' => ($cookie->logged ? $cookie->customer_firstname : false),
 			'lastName' => ($cookie->logged ? $cookie->customer_lastname : false),

modules/categoryscroll/.hg/branch

@@ -0,0 +1 @@
+default

modules/categoryscroll/.hg/cache/branchheads

@@ -0,0 +1,2 @@
+613b481451e73594f52e08e2a35120c98652d63c 3
+613b481451e73594f52e08e2a35120c98652d63c default

modules/categoryscroll/.hg/cache/tags

@@ -0,0 +1,2 @@
+3 613b481451e73594f52e08e2a35120c98652d63c
+

modules/categoryscroll/.hg/hgrc

@@ -0,0 +1,2 @@
+[paths]
+default = ssh://ewen@localhost//hg/categoryscroll

modules/categoryscroll/.hg/requires

@@ -0,0 +1,4 @@
+revlogv1
+fncache
+store
+dotencode

modules/categoryscroll/.hg/store/fncache

@@ -0,0 +1,8 @@
+data/config.xml.i
+data/product-list.tpl.i
+data/product_list.tpl.i
+data/header.tpl.i
+data/ajax.php.i
+data/categoryscroll.php.i
+data/logo.gif.i
+data/fr.php.i

modules/categoryscroll/.hg/undo.branch

@@ -0,0 +1 @@
+default