// CHANGELOG

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15948 b9a71923-0436-4b27-9f14-aed3839534dd

404.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

address.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7104 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=address'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=address'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');

addresses.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7104 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -35,4 +35,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=addresses'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=addresses'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');

admin-dev/ajax-tab.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajax.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7234 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -92,170 +92,6 @@ if (Tools::isSubmit('getAvailableFields') AND Tools::isSubmit('entity'))
 	die('['.implode(',', $jsonArray).']');
 }
 
-if (Tools::isSubmit('ajaxModulesPositions'))
-{
-	$id_module = (int)(Tools::getValue('id_module'));
-	$id_hook = (int)(Tools::getValue('id_hook'));
-	$way = (int)(Tools::getValue('way'));
-	$positions = Tools::getValue(strval($id_hook));
-	$position = (is_array($positions)) ? array_search($id_hook.'_'.$id_module, $positions) : null;
-	$module = Module::getInstanceById($id_module);
-	if (Validate::isLoadedObject($module))
-		if ($module->updatePosition($id_hook, $way, $position))
-			die(true);
-		else
-			die('{"hasError" : true, "errors" : "Can not update module position"}');
-	else
-		die('{"hasError" : true, "errors" : "This module can not be loaded"}');
-}
-
-if (Tools::isSubmit('ajaxCategoriesPositions'))
-{
-	$id_category_to_move = (int)(Tools::getValue('id_category_to_move'));
-	$id_category_parent = (int)(Tools::getValue('id_category_parent'));
-	$way = (int)(Tools::getValue('way'));
-	$positions = Tools::getValue('category');
-	if (is_array($positions))
-		foreach ($positions AS $key => $value)
-		{
-			$pos = explode('_', $value);
-			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_category_parent AND $pos[2] == $id_category_to_move))
-			{
-				$position = $key;
-				break;
-			}
-		}
-	$category = new Category($id_category_to_move);
-	if (Validate::isLoadedObject($category))
-	{
-		if (isset($position) && $category->updatePosition($way, $position))
-		{
-			Hook::exec('actionCategoryUpdate');
-			die(true);
-		}
-		else
-			die('{"hasError" : true, errors : "Can not update categories position"}');
-	}
-	else
-		die('{"hasError" : true, "errors" : "This category can not be loaded"}');
-
-}
-
-if (Tools::isSubmit('ajaxCMSCategoriesPositions'))
-{
-	$id_cms_category_to_move = (int)(Tools::getValue('id_cms_category_to_move'));
-	$id_cms_category_parent = (int)(Tools::getValue('id_cms_category_parent'));
-	$way = (int)(Tools::getValue('way'));
-	$positions = Tools::getValue('cms_category');
-	if (is_array($positions))
-		foreach ($positions AS $key => $value)
-		{
-			$pos = explode('_', $value);
-			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_cms_category_parent AND $pos[2] == $id_cms_category_to_move))
-			{
-				$position = $key;
-				break;
-			}
-		}
-	$cms_category = new CMSCategory($id_cms_category_to_move);
-	if (Validate::isLoadedObject($cms_category))
-	{
-		if (isset($position) && $cms_category->updatePosition($way, $position))
-			die(true);
-		else
-			die('{"hasError" : true, "errors" : "Can not update cms categories position"}');
-	}
-	else
-		die('{"hasError" : true, "errors" : "This cms category can not be loaded"}');
-}
-
-if (Tools::isSubmit('ajaxCMSPositions'))
-{
-	$id_cms = (int)(Tools::getValue('id_cms'));
-	$id_category = (int)(Tools::getValue('id_cms_category'));
-	$way = (int)(Tools::getValue('way'));
-	$positions = Tools::getValue('cms');
-	if (is_array($positions))
-		foreach ($positions AS $key => $value)
-		{
-			$pos = explode('_', $value);
-			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_category AND $pos[2] == $id_cms))
-			{
-				$position = $key;
-				break;
-			}
-		}
-	$cms = new CMS($id_cms);
-	if (Validate::isLoadedObject($cms))
-	{
-		if (isset($position) && $cms->updatePosition($way, $position))
-			die(true);
-		else
-			die('{"hasError" : true, "errors" : "Can not update cms position"}');
-	}
-	else
-		die('{"hasError" : true, "errors" : "This cms can not be loaded"}');
-}
-
-/* Modify product position in catalog */
-if (Tools::isSubmit('ajaxProductsPositions'))
-{
-	$way = (int)(Tools::getValue('way'));
-	$id_product = (int)(Tools::getValue('id_product'));
-	$id_category = (int)(Tools::getValue('id_category'));
-	$positions = Tools::getValue('product');
-
-	if (is_array($positions))
-		foreach ($positions AS $position => $value)
-		{
-			// pos[1] = id_categ, pos[2] = id_product, pos[3]=old position
-			$pos = explode('_', $value);
-
-			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_category AND (int)$pos[2] === $id_product))
-			{
-				if ($product = new Product((int)$pos[2]))
-					if (isset($position) && $product->updatePosition($way, $position))
-						echo "ok position ".(int)$position." for product ".(int)$pos[2]."\r\n";
-					else
-						echo '{"hasError" : true, "errors" : "Can not update product '. (int)$id_product . ' to position '.(int)$position.' "}';
-				else
-					echo '{"hasError" : true, "errors" : "This product ('.(int)$id_product.') can t be loaded"}';
-
-				break;
-			}
-		}
-}
-
-if (Tools::isSubmit('ajaxProductImagesPositions'))
-{
-	$id_image = (int)(Tools::getValue('id_image'));
-	$way = (int)(Tools::getValue('way'));
-	$positions = Tools::getValue('imageTable');
-
-	if (is_array($positions))
-		foreach ($positions AS $key => $value)
-		{
-			$pos = explode('_', $value);
-			if ((isset($pos[1])) AND ($pos[1] == $id_image))
-			{
-				// +1 is added because images position range starts from 1 instead of 0 for other objects (products, categories...)
-				$position = ($key + 1);
-				break;
-			}
-		}
-	$image = new Image($id_image);
-	if (Validate::isLoadedObject($image))
-	{
-		if (isset($position) && $image->updatePosition($way, $position))
-			die(true);
-		else
-			die('{"hasError" : true, "errors" : "Cannot update image position"}');
-	}
-	else
-		die('{"hasError" : true, "errors" : "This image cannot be loaded"}');
-}
-
-
 if (Tools::isSubmit('ajaxProductPackItems'))
 {
 	$jsonArray = array();
@@ -264,7 +100,7 @@ if (Tools::isSubmit('ajaxProductPackItems'))
 	FROM `'._DB_PREFIX_.'product` p
 	NATURAL LEFT JOIN `'._DB_PREFIX_.'product_lang` pl
 	WHERE pl.`id_lang` = '.(int)(Tools::getValue('id_lang')).'
-	'.Context::getContext()->shop->addSqlRestrictionOnLang('pl').'
+	'.Shop::addSqlRestrictionOnLang('pl').'
 	AND p.`id_product` NOT IN (SELECT DISTINCT id_product_pack FROM `'._DB_PREFIX_.'pack`)
 	AND p.`id_product` != '.(int)(Tools::getValue('id_product')));
 
@@ -462,7 +298,7 @@ if (Tools::isSubmit('getHookableList'))
 			if (!array_key_exists($hook_name, $hookableList))
 				$hookableList[$hook_name] = array();
 			if ($moduleInstance->isHookableOn($hook_name))
-				array_push($hookableList[$hook_name], $module);
+				array_push($hookableList[$hook_name], str_replace('_', '-', $module));
 		}
 
 	}
@@ -503,7 +339,7 @@ if (Tools::isSubmit('saveHook'))
 	$hooks_list = explode(',', Tools::getValue('hooks_list'));
 	$id_shop = (int)Tools::getValue('id_shop');
 	if (!$id_shop)
-		$id_shop = Context::getContext()->shop->getId(true);
+		$id_shop = Context::getContext()->shop->id;
 
 	$res = true;
 	$hookableList = array();
@@ -637,36 +473,55 @@ if (Tools::isSubmit('updateElementEmployee') && Tools::getValue('updateElementEm
 
 if (Tools::isSubmit('syncImapMail'))
 {
-	if (!$url = Configuration::get('PS_SAV_IMAP_URL')
-	|| !$port = Configuration::get('PS_SAV_IMAP_PORT')
-	|| !$user = Configuration::get('PS_SAV_IMAP_USER')
-	|| !$password = Configuration::get('PS_SAV_IMAP_PWD'))
+	if (!($url = Configuration::get('PS_SAV_IMAP_URL'))
+	|| !($port = Configuration::get('PS_SAV_IMAP_PORT'))
+	|| !($user = Configuration::get('PS_SAV_IMAP_USER'))
+	|| !($password = Configuration::get('PS_SAV_IMAP_PWD')))
 	die('{"hasError" : true, "errors" : ["Configuration is not correct"]}');
 
+	$conf = Configuration::getMultiple(array(
+		'PS_SAV_IMAP_OPT_NORSH', 'PS_SAV_IMAP_OPT_SSL',
+		'PS_SAV_IMAP_OPT_VALIDATE-CERT', 'PS_SAV_IMAP_OPT_NOVALIDATE-CERT',
+		'PS_SAV_IMAP_OPT_TLS', 'PS_SAV_IMAP_OPT_NOTLS'));
+	
+	$conf_str = '';
+	if ($conf['PS_SAV_IMAP_OPT_NORSH'])
+		$conf_str .= '/norsh';
+	if ($conf['PS_SAV_IMAP_OPT_SSL'])
+		$conf_str .= '/ssl';
+	if ($conf['PS_SAV_IMAP_OPT_VALIDATE-CERT'])
+		$conf_str .= '/validate-cert';
+	if ($conf['PS_SAV_IMAP_OPT_NOVALIDATE-CERT'])
+		$conf_str .= '/novalidate-cert';
+	if ($conf['PS_SAV_IMAP_OPT_TLS'])
+		$conf_str .= '/tls';
+	if ($conf['PS_SAV_IMAP_OPT_NOTLS'])
+		$conf_str .= '/notls';
+
 	if (!function_exists('imap_open'))
 		die('{"hasError" : true, "errors" : ["imap is not installed on this server"]}');
 
-	$mbox = @imap_open('{'.$url.':'.$port.(Configuration::get('PS_SAV_IMAP_SSL') ? '/ssl' : '').'}', $user, $password);
+	$mbox = @imap_open('{'.$url.':'.$port.$conf_str.'}', $user, $password);
 
 	//checks if there is no error when connecting imap server
 	$errors = imap_errors();
 	$str_errors = '';
 	$str_error_delete = '';
-	if (sizeof($errors))
+	if (sizeof($errors) && is_array($errors))
 	{
-		$str_errors = '["';
+		var_dump($errors);
+		$str_errors = '';
 		foreach($errors as $error)
 			$str_errors .= '"'.$error.'",';
 		$str_errors = rtrim($str_errors, ',').'';
 	}
-
 	//checks if imap connexion is active
 	if (!$mbox)
 		die('{"hasError" : true, "errors" : ["Cannot connect to the mailbox"]}');
 
 	//Returns information about the current mailbox. Returns FALSE on failure.
 	$check = imap_check($mbox);
-	if ($check)
+	if (!$check)
 		die('{"hasError" : true, "errors" : ["Fail to get information about the current mailbox"]}');
 
 	if ($check->Nmsgs == 0)
@@ -717,127 +572,7 @@ if (Tools::isSubmit('syncImapMail'))
 	}
 	imap_expunge($mbox);
 	imap_close($mbox);
-	die('{"hasError" : false, "errors" : '.$str_errors.$str_errors_delete.'"]}');
-}
-
-/* Modify attribute position */
-if (Tools::isSubmit('ajaxAttributesPositions'))
-{
-	$way = (int)Tools::getValue('way');
-	$id_attribute = (int)Tools::getValue('id_attribute');
-	$id_attribute_group = (int)Tools::getValue('id_attribute_group');
-	$positions = Tools::getValue('attribute');
-
-	if (is_array($positions))
-		foreach ($positions as $position => $value)
-		{
-			// pos[1] = id_attribute_group, pos[2] = id_attribute, pos[3]=old position
-			$pos = explode('_', $value);
-
-			if ((isset($pos[1]) && isset($pos[2])) && ($pos[1] == $id_attribute_group && (int)$pos[2] === $id_attribute))
-			{
-				if ($attribute = new Attribute((int)$pos[2]))
-					if (isset($position) && $attribute->updatePosition($way, $position))
-						echo "ok position ".(int)$position." for attribute ".(int)$pos[2]."\r\n";
-					else
-						echo '{"hasError" : true, "errors" : "Can not update attribute '. (int)$id_attribute . ' to position '.(int)$position.' "}';
-				else
-					echo '{"hasError" : true, "errors" : "This attribute ('.(int)$id_attribute.') can t be loaded"}';
-
-				break;
-			}
-		}
-}
-
-/* Modify group attribute position */
-if (Tools::isSubmit('ajaxGroupsAttributesPositions'))
-{
-	$way = (int)Tools::getValue('way');
-	$id_attribute_group = (int)Tools::getValue('id_attribute_group');
-	$positions = Tools::getValue('attribute_group');
-
-	$new_positions = array();
-	foreach($positions as $k => $v)
-		if (count(explode('_', $v)) == 3)
-			$new_positions[] = $v;
-
-	foreach ($new_positions as $position => $value)
-	{
-		// pos[1] = id_attribute_group, pos[2] = old position
-		$pos = explode('_', $value);
-
-		if (isset($pos[1]) && (int)$pos[1] === $id_attribute_group)
-		{
-			if ($group_attribute = new AttributeGroup((int)$pos[1]))
-				if (isset($position) && $group_attribute->updatePosition($way, $position))
-					echo "ok position ".(int)$position." for group attribute ".(int)$pos[1]."\r\n";
-				else
-					echo '{"hasError" : true, "errors" : "Can not update group attribute '. (int)$id_attribute_group . ' to position '.(int)$position.' "}';
-			else
-				echo '{"hasError" : true, "errors" : "This group attribute ('.(int)$id_attribute_group.') can t be loaded"}';
-
-			break;
-		}
-	}
-}
-
-/* Modify feature position */
-if (Tools::isSubmit('ajaxFeaturesPositions'))
-{
-	$way = (int)Tools::getValue('way');
-	$id_feature = (int)Tools::getValue('id_feature');
-	$positions = Tools::getValue('feature');
-
-	$new_positions = array();
-	foreach($positions as $k => $v)
-		if (!empty($v))
-			$new_positions[] = $v;
-
-	foreach ($new_positions as $position => $value)
-	{
-		// pos[2] = id_feature, pos[3] = old position
-		$pos = explode('_', $value);
-
-		if (isset($pos[2]) && (int)$pos[2] === $id_feature)
-		{
-			if ($feature = new Feature((int)$pos[2]))
-				if (isset($position) && $feature->updatePosition($way, $position))
-					echo "ok position ".(int)$position." for feature ".(int)$pos[1]."\r\n";
-				else
-					echo '{"hasError" : true, "errors" : "Can not update feature '. (int)$id_feature . ' to position '.(int)$position.' "}';
-			else
-				echo '{"hasError" : true, "errors" : "This feature ('.(int)$id_feature.') can t be loaded"}';
-
-			break;
-		}
-	}
-}
-
-/* Modify carrier position */
-if (Tools::isSubmit('ajaxCarriersPositions'))
-{
-	$way = (int)(Tools::getValue('way'));
-	$id_carrier = (int)(Tools::getValue('id_carrier'));
-	$positions = Tools::getValue('carrier');
-
-
-	foreach ($positions as $position => $value)
-	{
-		$pos = explode('_', $value);
-
-		if (isset($pos[2]) && (int)$pos[2] === $id_carrier)
-		{
-			if ($carrier = new Carrier((int)$pos[2]))
-				if (isset($position) && $carrier->updatePosition($way, $position))
-					echo "ok position ".(int)$position." for carrier ".(int)$pos[1]."\r\n";
-				else
-					echo '{"hasError" : true, "errors" : "Can not update carrier '. (int)$id_carrier . ' to position '.(int)$position.' "}';
-			else
-				echo '{"hasError" : true, "errors" : "This carrier ('.(int)$id_carrier.') can t be loaded"}';
-
-			break;
-		}
-	}
+	die('{"hasError" : false, "errors" : ["'.$str_errors.$str_error_delete.'"]}');
 }
 
 if (Tools::isSubmit('searchCategory'))
@@ -847,7 +582,7 @@ if (Tools::isSubmit('searchCategory'))
 	$results = Db::getInstance()->executeS(
 		'SELECT c.`id_category`, cl.`name`
 		FROM `'._DB_PREFIX_.'category` c
-		LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.$context->shop->addSqlRestrictionOnLang('cl').')
+		LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.Shop::addSqlRestrictionOnLang('cl').')
 		WHERE cl.`id_lang` = '.(int)$context->language->id.' AND c.`level_depth` <> 0
 		AND cl.`name` LIKE \'%'.pSQL($q).'%\'
 		GROUP BY c.id_category
@@ -892,4 +627,3 @@ if (Tools::isSubmit('getZones'))
 	$array = array('hasError' => false, 'errors' => '', 'data' => $html);
 	die(Tools::jsonEncode($html));
 }
-

admin-dev/ajax_products_list.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -55,7 +55,7 @@ $excludeVirtuals = (bool)Tools::getValue('excludeVirtuals', false);
 
 $sql = 'SELECT p.`id_product`, `reference`, pl.name
 		FROM `'._DB_PREFIX_.'product` p
-		LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.id_product = p.id_product AND pl.id_lang = '.(int)Context::getContext()->language->id.Context::getContext()->shop->addSqlRestrictionOnLang('pl').')
+		LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.id_product = p.id_product AND pl.id_lang = '.(int)Context::getContext()->language->id.Shop::addSqlRestrictionOnLang('pl').')
 		WHERE (pl.name LIKE \'%'.pSQL($query).'%\' OR p.reference LIKE \'%'.pSQL($query).'%\')'.
 		(!empty($excludeIds) ? ' AND p.id_product NOT IN ('.$excludeIds.') ' : ' ').
 		($excludeVirtuals ? 'AND p.id_product NOT IN (SELECT pd.id_product FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))' : '');

admin-dev/ajax_send_mail_test.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -29,10 +29,12 @@ include_once(dirname(__FILE__).'/../config/config.inc.php');
 
 /* Getting cookie or logout */
 require_once(dirname(__FILE__).'/init.php');
-
+if (Tools::getValue('token') != Tools::getAdminTokenLite('AdminEmails'))
+	die(Tools::displayError());
 $smtpChecked = (trim($_POST['mailMethod']) ==  'smtp');
 $smtpServer = $_POST['smtpSrv'];
 $content = urldecode($_POST['testMsg']);
+$content = utf8_encode(html_entity_decode($content));
 $subject = urldecode($_POST['testSubject']);
 $type = 'text/html';
 $to =  $_POST['testEmail'];

admin-dev/ajaxfilemanager/_ajax_load_folders.php

@@ -1,6 +1,7 @@
 <?php
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 ?>

admin-dev/ajaxfilemanager/ajax_create_folder.php

@@ -6,6 +6,8 @@
 	 * @since 22/May/2007
 	 *
 	 */
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_delete_file.php

@@ -6,7 +6,8 @@
 	 * @since 22/April/2007
 	 *
 	 */
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_download.php

@@ -6,7 +6,8 @@
 	 * @since 22/April/2007
 	 *
 	 */
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_editor_reset.php

@@ -6,7 +6,8 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	

admin-dev/ajaxfilemanager/ajax_file_copy.php

@@ -6,7 +6,8 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_file_cut.php

@@ -6,7 +6,8 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_file_paste.php

@@ -1,6 +1,7 @@
 <?
 	include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");		
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	$error = '';

admin-dev/ajaxfilemanager/ajax_file_upload.php

@@ -6,7 +6,8 @@
 	 * @since 22/May/2007
 	 *
 	 */	
-	define('_PS_ADMIN_DIR_', getcwd());	 
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	 

admin-dev/ajaxfilemanager/ajax_get_file_listing.php

@@ -1,139 +1,141 @@
-<?php 
-
-		/**
-	 * the php script used to get the list of file or folders under a specific folder
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/May/2007
-	 *
-	 */
-	require_once('../../config/config.inc.php');
-	require_once('../init.php');
-
-	if(!isset($manager))
-	{
-		/**
-		 *  this is part of  script for processing file paste 
-		 */
-		//$_GET = $_POST;
-		include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-		include_once(CLASS_PAGINATION);
-		$pagination = new pagination(false);
-		if(!empty($_GET['search']))
-		{
-			include_once(CLASS_SEARCH);
-			
-			$search  = new Search($_GET['search_folder']);
-			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
-			$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
-			$search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']);
-			$search->addSearchKeyword('size_from', @$_GET['search_size_from']);
-			$search->addSearchKeyword('size_to', @$_GET['search_size_to']);
-			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
-			$search->addSearchKeyword('name', @$_GET['search_name']);
-			$search->doSearch();
-			$fileList = $search->getFoundFiles();
-			$folderInfo = $search->getRootFolderInfo();			
-			
-		}else 
-		{
-			include_once(CLASS_MANAGER);
-			include_once(CLASS_SESSION_ACTION);
-			$sessionAction = new SessionAction();
-			include_once(DIR_AJAX_INC . "class.manager.php");
-		
-			$manager = new manager();
-			$manager->setSessionAction($sessionAction);
-		
-			$fileList = $manager->getFileList();
-			$folderInfo = $manager->getFolderInfo();	
-						
-		}
-		$pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER);	
-
-	}else 
-	{
-		include_once(CLASS_PAGINATION);
-		$pagination = new pagination(false);			
-	}
-
-		
-		$pagination->setTotal(sizeof($fileList));
-		$pagination->setFirstText(PAGINATION_FIRST);
-		$pagination->setPreviousText(PAGINATION_PREVIOUS);
-		$pagination->setNextText(PAGINATION_NEXT);
-		$pagination->setLastText(PAGINATION_LAST);
-		$pagination->setLimit(!empty($_GET['limit'])?(int)($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT);
-		echo $pagination->getPaginationHTML();
-		echo "<script type=\"text/javascript\">\n";
-		
-        echo "parentFolder = {path:'" . getParentFolderPath($folderInfo['path']). "'};\n"; 
-		echo 'currentFolder ={'; 
-		$count =1;
-		foreach($folderInfo as $k=>$v)
-		{
-			echo ($count++ == 1?'':',') . "'" . $k . "':'" . ($k=='ctime'|| $k=='mtime'?date(DATE_TIME_FORMAT, $v):$v)  . "'";
-
-		}
-		echo "};\n";
-		$fileList = array_slice($fileList, $pagination->getPageOffset(), $pagination->getLimit());
-		echo 'numRows = ' . sizeof($fileList) . ";\n";
-		echo "files = {\n";
-		$count = 1;
-		
-		
-		foreach($fileList as $file)
-		{
-			echo (($count > 1)?",":'').$count++ . ":{";
-			$j = 1;
-			foreach($file as $k=>$v)
-			{
-				
-				if($k  == 'ctime' || $k == 'mtime')
-				{
-					$v = @date(DATE_TIME_FORMAT, $v);
-				}	
-				if($k == 'size')
-				{
-					$v = transformFileSize($v);
-				}
-				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
-			}
-			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
-			echo "}\n";				
-		}
-		echo  "};</script>\n";
-	if(!empty($_GET['view']))
-	{
-		switch($_GET['view'])
-		{
-			case 'detail':
-			case 'thumbnail':
-			case 'text':	
-				$view = $_GET['view'];
-				break;
-			default:
-				$view = CONFIG_DEFAULT_VIEW;
-		}
-	}else 
-	{
-		$view = CONFIG_DEFAULT_VIEW;
-	}	
-	switch($view)
-	{
-		case 'text':
-			//list file name only
-			include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php');
-			break;
-		case 'thumbnail':
-			//list file with thumbnail
-			include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php');
-			break;
-		case 'detail':
-		default:
-			include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php');
-	}
-
-	
-
+<?php 
+
+	/**
+	 * the php script used to get the list of file or folders under a specific folder
+	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+	 * @link www.phpletter.com
+	 * @since 22/May/2007
+	 *
+	 */
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
+	require_once('../../config/config.inc.php');
+	require_once('../init.php');
+
+	if(!isset($manager))
+	{
+		/**
+		 *  this is part of  script for processing file paste 
+		 */
+		//$_GET = $_POST;
+		include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+		include_once(CLASS_PAGINATION);
+		$pagination = new pagination(false);
+		if(!empty($_GET['search']))
+		{
+			include_once(CLASS_SEARCH);
+			
+			$search  = new Search($_GET['search_folder']);
+			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
+			$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
+			$search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']);
+			$search->addSearchKeyword('size_from', @$_GET['search_size_from']);
+			$search->addSearchKeyword('size_to', @$_GET['search_size_to']);
+			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
+			$search->addSearchKeyword('name', @$_GET['search_name']);
+			$search->doSearch();
+			$fileList = $search->getFoundFiles();
+			$folderInfo = $search->getRootFolderInfo();			
+			
+		}else 
+		{
+			include_once(CLASS_MANAGER);
+			include_once(CLASS_SESSION_ACTION);
+			$sessionAction = new SessionAction();
+			include_once(DIR_AJAX_INC . "class.manager.php");
+		
+			$manager = new manager();
+			$manager->setSessionAction($sessionAction);
+		
+			$fileList = $manager->getFileList();
+			$folderInfo = $manager->getFolderInfo();	
+						
+		}
+		$pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER);	
+
+	}else 
+	{
+		include_once(CLASS_PAGINATION);
+		$pagination = new pagination(false);			
+	}
+
+		
+		$pagination->setTotal(sizeof($fileList));
+		$pagination->setFirstText(PAGINATION_FIRST);
+		$pagination->setPreviousText(PAGINATION_PREVIOUS);
+		$pagination->setNextText(PAGINATION_NEXT);
+		$pagination->setLastText(PAGINATION_LAST);
+		$pagination->setLimit(!empty($_GET['limit'])?(int)($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT);
+		echo $pagination->getPaginationHTML();
+		echo "<script type=\"text/javascript\">\n";
+		
+        echo "parentFolder = {path:'" . getParentFolderPath($folderInfo['path']). "'};\n"; 
+		echo 'currentFolder ={'; 
+		$count =1;
+		foreach($folderInfo as $k=>$v)
+		{
+			echo ($count++ == 1?'':',') . "'" . $k . "':'" . ($k=='ctime'|| $k=='mtime'?date(DATE_TIME_FORMAT, $v):$v)  . "'";
+
+		}
+		echo "};\n";
+		$fileList = array_slice($fileList, $pagination->getPageOffset(), $pagination->getLimit());
+		echo 'numRows = ' . sizeof($fileList) . ";\n";
+		echo "files = {\n";
+		$count = 1;
+		
+		
+		foreach($fileList as $file)
+		{
+			echo (($count > 1)?",":'').$count++ . ":{";
+			$j = 1;
+			foreach($file as $k=>$v)
+			{
+				
+				if($k  == 'ctime' || $k == 'mtime')
+				{
+					$v = @date(DATE_TIME_FORMAT, $v);
+				}	
+				if($k == 'size')
+				{
+					$v = transformFileSize($v);
+				}
+				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
+			}
+			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
+			echo "}\n";				
+		}
+		echo  "};</script>\n";
+	if(!empty($_GET['view']))
+	{
+		switch($_GET['view'])
+		{
+			case 'detail':
+			case 'thumbnail':
+			case 'text':	
+				$view = $_GET['view'];
+				break;
+			default:
+				$view = CONFIG_DEFAULT_VIEW;
+		}
+	}else 
+	{
+		$view = CONFIG_DEFAULT_VIEW;
+	}	
+	switch($view)
+	{
+		case 'text':
+			//list file name only
+			include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php');
+			break;
+		case 'thumbnail':
+			//list file with thumbnail
+			include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php');
+			break;
+		case 'detail':
+		default:
+			include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php');
+	}
+
+	
+
 ?>

admin-dev/ajaxfilemanager/ajax_get_folder_listing.php

@@ -1,4 +1,6 @@
 <?php
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_image_editor.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 		/**

admin-dev/ajaxfilemanager/ajax_image_save.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_image_thumbnail.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_image_undo.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_login.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_preview.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_save_as_form.php

@@ -1,5 +1,6 @@
 <?php 
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");

admin-dev/ajaxfilemanager/ajax_save_name.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_save_text.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/ajax_text_editor.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 		/**

admin-dev/ajaxfilemanager/ajaxfilemanager.php

@@ -1,5 +1,6 @@
 <?php
-	define('_PS_ADMIN_DIR_', getcwd());
+	if (!defined('_PS_ADMIN_DIR_'))
+		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**

admin-dev/ajaxfilemanager/inc/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/jscripts/ajaximageeditor.js

@@ -394,7 +394,7 @@
 	
 	function disableConstraint()
 	{
-		$('#constraint').attr('disabled', 'disabled');
+		$('#constraint').attr('disabled', true);
 	};
 	function ShowHandlers()
 	{
@@ -496,7 +496,7 @@
 	*/
 	function cancelChangeMode()
 	{
-		$('#formAction input[@value=' + $('#image_mode').val() + ']').attr('checked', 'checked');	
+		$('#formAction input[@value=' + $('#image_mode').val() + ']').attr('checked', true);
 	};
 	/**
 	*	get the image element which is going to be modified
@@ -669,7 +669,7 @@ function toggleDisabledButton(buttonId, forceDisable)
 		if(forceDisable && currentClass == 'button')
 		{
 			newClass = 'disabledButton';
-			$(disabledButton).attr('disabled', 'disabled');				
+			$(disabledButton).attr('disabled', true);
 		}else if(!forceDisable && currentClass == 'disabledButton')
 		{
 			newClass = 'button';
@@ -684,7 +684,7 @@ function toggleDisabledButton(buttonId, forceDisable)
 	else if(currentClass == 'button')
 	{
 		newClass = 'disabledButton';
-		$(disabledButton).attr('disabled', 'disabled');	
+		$(disabledButton).attr('disabled', true);
 	}else
 	{
 		newClass = 'button';

admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/jscripts/edit_area/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/jscripts/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/langs/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/session/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/theme/default/css/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/theme/default/images/action/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/theme/default/images/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/theme/default/images/standard/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/theme/default/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/ajaxfilemanager/theme/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/backup.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/backups/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/cron_currency_rates.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/csv.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/displayImage.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/drawer.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6883 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -38,8 +38,12 @@ $height = Tools::getValue('height');
 $id_employee = Tools::getValue('id_employee');
 $id_lang = Tools::getValue('id_lang');
 
-if (Context::getContext()->employee->id != $id_employee)
-	die;
+
+if (!isset($cookie->id_employee) || !$cookie->id_employee  || $cookie->id_employee != $id_employee)
+    die(Tools::displayError());
+    
+if (!Validate::isModuleName($module))
+	die(Tools::displayError());
 
 if (!Tools::file_exists_cache($module_path = dirname(__FILE__).'/../modules/'.$module.'/'.$module.'.php'))
 	die(Tools::displayError());

admin-dev/export/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/footer.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/functions.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7383 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -147,11 +147,12 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
 		{
 			$sql = 'SELECT c.id_category, cl.name, cl.link_rewrite
 					FROM '._DB_PREFIX_.'category c
-					LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category'.$context->shop->addSqlRestrictionOnLang('cl').')
+					LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category'.Shop::addSqlRestrictionOnLang('cl').')
 					WHERE c.nleft <= '.(int)$category['nleft'].'
 						AND c.nright >= '.(int)$category['nright'].'
 						AND cl.id_lang = '.(int)$context->language->id.
 						($home ? ' AND c.id_category='.$id_category : '').'
+						AND c.id_category != '.(int)Category::getTopCategory()->id.'
 					GROUP BY c.id_category
 					ORDER BY c.level_depth ASC
 					LIMIT '.(!$home ? (int)($category['level_depth'] + 1) : 1);
@@ -161,7 +162,8 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
 			$nCategories = (int)sizeof($categories);
 			foreach ($categories AS $category)
 			{
-				$edit = '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&'.(($category['id_category'] == 1 || $home) ? 'viewcategory' : 'updatecategory').'&token='.Tools::getAdminToken('AdminCategories'.(int)(Tab::getIdFromClassName('AdminCategories')).(int)$context->employee->id).'" title="'.($category['id_category'] == 1 ? 'Home' : 'Modify').'"><img src="../img/admin/'.(($category['id_category'] == 1  || $home) ? 'home' : 'edit').'.gif" alt="" /></a> ';
+				$link = Context::getContext()->link->getAdminLink('AdminCategories');
+				$edit = '<a href="'.$link.'&id_category='.(int)$category['id_category'].'&'.(($category['id_category'] == 1 || $home) ? 'viewcategory' : 'updatecategory').'" title="'.($category['id_category'] == 1 ? 'Home' : 'Modify').'"><img src="../img/admin/'.(($category['id_category'] == 1  || $home) ? 'home' : 'edit').'.gif" alt="" /></a> ';
 				$fullPath .= $edit.
 				($n < $nCategories ? '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&viewcategory&token='.Tools::getAdminToken('AdminCategories'.(int)(Tab::getIdFromClassName('AdminCategories')).(int)$context->employee->id).'" title="'.htmlentities($category['name'], ENT_NOQUOTES, 'UTF-8').'">' : '').
 				(!empty($highlight) ? str_ireplace($highlight, '<span class="highlight">'.htmlentities($highlight, ENT_NOQUOTES, 'UTF-8').'</span>', $category['name']) : $category['name']).
@@ -388,47 +390,6 @@ function simpleXMLToArray ($xml, $flattenValues = true, $flattenAttributes = tru
 	return $return;
 }
 
-/**
- * Generate a sweet HTML list for shop selection
- *
- * @todo move in adminTab
- * @return string
- */
-function generateShopList()
-{
-	$tree = Shop::getTree();
-	$context = Context::getContext();
-
-	// Get default value
-	list($shopID, $shopGroupID) = Shop::getContext();
-	if ($shopID)
-		$value = 's-'.$shopID;
-	else if ($shopGroupID)
-		$value = 'g-'.$shopGroupID;
-	else
-		$value = '';
-
-	// Generate HTML
-	$url = $_SERVER['REQUEST_URI'].(($_SERVER['QUERY_STRING']) ? '&' : '?').'setShopContext=';
-	$html = '<select class="shopList" onchange="location.href = \''.$url.'\'+$(this).val();">';
-
-	if ($context->employee->id_profile == _PS_ADMIN_PROFILE_ ||
-					$context->shop->getTotalShopsWhoExists() == Employee::getTotalEmployeeShopById($context->employee->id))
-		$html .= '<option value="" class="first">'.translate('All shops').'</option>';
-	/*$html .= (Context::getContext()->employee->id_profile == _PS_ADMIN_PROFILE_) ? '<option value="" class="first">'.translate('All shops').'</option>' : '';*/
-	foreach ($tree as $gID => $group_data)
-	{
-		$disabled = ($group_data['totalShops'] != count($group_data['shops'])) ? 'disabled="disabled"' : '';
-		$html .= '<option class="group" value="g-'.$gID.'" '.(($value == 'g-'.$gID) ? 'selected="selected"' : '').' '.$disabled.'>'.htmlspecialchars($group_data['name']).'</option>';
-		foreach ($group_data['shops'] as $sID => $shopData)
-			if ($shopData['active'])
-				$html .= '<option value="s-'.$sID.'" class="shop" '.(($value == 's-'.$sID || $context->shop->id == $sID) ? 'selected="selected"' : '').'>&raquo; '.$shopData['name'].'</option>';
-	}
-	$html .= '</select>';
-
-	return $html;
-}
-
 /**
  * for retrocompatibility with old AdminTab, old index.php
  *
@@ -449,7 +410,6 @@ function runAdminTab($tab, $ajaxMode = false)
 	// $tab = $_REQUEST['tab'];
 	if ($adminObj = checkingTab($tab))
 	{
-		$noTabLink = $adminObj->noTabLink;
 		// init is different for new tabs (AdminController) and old tabs (AdminTab)
 		if ($adminObj instanceof AdminController)
 		{
@@ -502,12 +462,15 @@ function runAdminTab($tab, $ajaxMode = false)
 				<a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.translate('Back Office').'</a>
 				'.$bread.'</div>';
 
-			if (!$ajaxMode && Shop::isFeatureActive() && Context::shop() != Shop::CONTEXT_ALL)
+			if (!$ajaxMode && Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL)
 			{
 				echo '<div class="multishop_info">';
-				if (Context::shop() == Shop::CONTEXT_GROUP)
-					printf(translate('You are configuring your store for group shop %s'), '<b>'.Context::getContext()->shop->getGroup()->name.'</b>');
-				elseif (Context::shop() == Shop::CONTEXT_SHOP)
+				if (Shop::getContext() == Shop::CONTEXT_GROUP)
+				{
+					$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
+					printf(translate('You are configuring your store for group shop %s'), '<b>'.$shop_group->name.'</b>');
+				}
+				elseif (Shop::getContext() == Shop::CONTEXT_SHOP)
 					printf(translate('You are configuring your store for shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
 				echo '</div>';
 			}

admin-dev/get-file-admin.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/grider.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -41,8 +41,9 @@ $dir = Tools::getValue('dir', 0); // Should be a String : Either ASC or DESC
 $id_employee = (int)(Tools::getValue('id_employee'));
 $id_lang = (int)(Tools::getValue('id_lang'));
 
-if (Context::getContext()->employee->id != $id_employee)
-	die;
+
+if (!isset($cookie->id_employee) || !$cookie->id_employee  || $cookie->id_employee != $id_employee)
+    die(Tools::displayError());
 
 if (!Validate::isModuleName($module))
 	die(Tools::displayError());

admin-dev/header.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7048 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -41,18 +41,20 @@ echo '
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'jquery.cluetip.css" />
 		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/admin.css" />
+		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.css" />
 		<title>PrestaShop&trade; - '.translate('Administration panel').'</title>
 		<script type="text/javascript">
 			var helpboxes = '.Configuration::get('PS_HELPBOX').';
 			var roundMode = '.Configuration::get('PS_PRICE_ROUND_MODE').';
 		</script>
-		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/jquery-1.4.4.min.js"></script>
+		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/jquery-'._PS_JQUERY_VERSION_.'.min.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/jquery.hoverIntent.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/cluetip/jquery.cluetip.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'admin.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'toggle.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'tools.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'ajax.js"></script>
+		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.js"></script>
 		<link rel="shortcut icon" href="'._PS_IMG_.'favicon.ico" />
 		'.Hook::exec('displayBackOfficeHeader').'
 		<!--[if IE]>
@@ -93,7 +95,7 @@ echo '
 						{
 							$("#orders_notif_number_wrapper").hide();
 						}
-						
+
 						// Add customers notifications to the list
 						html = "";
 						nb_notifs = 0;
@@ -147,10 +149,13 @@ echo '
 			';
 			if (Shop::isFeatureActive())
 			{
-				if (Context::shop() == Shop::CONTEXT_ALL)
+				if (Shop::getContext() == Shop::CONTEXT_ALL)
 					$youEditFieldFor = translate('A modification of this field will be applied for all shops');
-				else if (Context::shop() == Shop::CONTEXT_GROUP)
-					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for all shops of group %s'), '<b>'.Context::getContext()->shop->getGroup()->name.'</b>');
+				elseif (Shop::getContext() == Shop::CONTEXT_GROUP)
+				{
+					$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
+					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for all shops of group %s'), '<b>'.$shop_group->name.'</b>');
+				}
 				else
 					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for the shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
 				echo 'hints.html(hints.html()+\'<br /><span class="red">'.addslashes($youEditFieldFor).'</span>\');';
@@ -279,9 +284,6 @@ foreach (QuickAccess::getQuickAccesses(Context::getContext()->language->id) AS $
 echo '			</select>
 			</div>';
 
-		if (Shop::isFeatureActive())
-			echo '<div id="header_shoplist">'.translate('Select your shop:').' '.generateShopList().'</div>';
-
 		echo '</div>';
 			echo Hook::exec('displayBackOfficeTop');
 			echo '<ul id="menu">';
@@ -311,10 +313,6 @@ foreach ($tabs AS $t)
 			<ul class="submenu">';
 		$subTabs = Tab::getTabs(Context::getContext()->language->id, (int)$t['id_tab']);
 
-		// @todo need a better way than using noTabLink property, keeping the fact to avoid db modification
-		if (!in_array($t['class_name'], $noTabLink))
-			array_unshift($subTabs, $t);
-
 		foreach ($subTabs AS $t2)
 			if (checkTabRights($t2['id_tab']) === true AND (bool)$t2['active'])
 				echo '<li><a href="index.php?controller='.$t2['class_name'].'&token='.Tools::getAdminTokenLite($t2['class_name']).'">'.$t2['name'].'</a></li>';
@@ -342,3 +340,12 @@ echo '
 				';
 				if(defined('_PS_MODE_DEV_') && _PS_MODE_DEV_)
 					echo '<div class="warn">This tab is an AdminTab</div>';
+
+if (Shop::isFeatureActive())
+{
+   echo '<div class="multishop_toolbar">
+        <span class="text_multishop">'.translate('Multishop configuration for').'</span>'.
+		Helper::renderShopList();
+    echo '</div>';
+}
+

admin-dev/import/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,13 +19,15 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7451 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+$timer_start = microtime(true);
 define('_PS_ADMIN_DIR_', getcwd());
+
 require(dirname(__FILE__).'/../config/config.inc.php');
 require(dirname(__FILE__).'/functions.php');
 
@@ -38,4 +40,4 @@ if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
 	$_REQUEST['controller'] = strtolower($_REQUEST['tab']);
 
 // Prepare and trigger admin dispatcher
-Dispatcher::getInstance()->dispatch();
+Dispatcher::getInstance()->dispatch();

admin-dev/init.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7227 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -59,8 +59,10 @@ try
 	$protocol_content = (isset($useSSL) AND $useSSL AND Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
 	$link = new Link($protocol_link, $protocol_content);
 	$context->link = $link;
-	define('_PS_BASE_URL_', Tools::getShopDomain(true));
-	define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
+	if (!defined('_PS_BASE_URL_'))
+		define('_PS_BASE_URL_', Tools::getShopDomain(true));
+	if (!defined('_PS_BASE_URL_SSL_'))
+		define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
 
 	$path = dirname(__FILE__).'/themes/';
 	// if the current employee theme is not valid (check layout.tpl presence), 
@@ -96,19 +98,50 @@ try
 		$query = (isset($url['query'])) ? $url['query'] : '';
 		parse_str($query, $parseQuery);
 		unset($parseQuery['setShopContext']);
-		Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery));
+		Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery, '', '&'));
 	}
 
 	$context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
 
-	$shopID = '';
-	if ($context->cookie->shopContext)
+
+	if ($context->employee->isLoggedBack())
 	{
-		$split = explode('-', $context->cookie->shopContext);
-		if (count($split) == 2 && $split[0] == 's')
-			$shopID = (int)$split[1];
+		$shop_id = '';
+		Shop::setContext(Shop::CONTEXT_ALL);
+		if ($context->cookie->shopContext)
+		{
+			$split = explode('-', $context->cookie->shopContext);
+			if (count($split) == 2)
+			{
+				if ($split[0] == 'g')
+				{
+					if ($context->employee->hasAuthOnShopGroup($split[1]))
+						Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
+					else
+					{
+						$shop_id = $context->employee->getDefaultShopID();
+						Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+					}
+				}
+				else if ($context->employee->hasAuthOnShop($split[1]))
+				{
+					$shop_id = $split[1];
+					Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+				}
+				else
+				{
+					$shop_id = $context->employee->getDefaultShopID();
+					Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
+				}
+			}
+		}
+
+		// Replace existing shop if necessary
+		if (!$shop_id)
+			$context->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
+		else if ($context->shop->id != $shop_id)
+			$context->shop = new Shop($shop_id);
 	}
-	$context->shop = new Shop($shopID);
 }
 catch(PrestaShopException $e)
 {

admin-dev/login.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/password.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 7310 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/pdf.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,16 +19,21 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @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());
-
 include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 
+/**
+ * @deprecated 1.5.0
+ * This file is deprecated, please use AdminPdfController instead
+ */
+Tools::displayFileAsDeprecated();
+
 if (!Context::getContext()->employee->id)
 	Tools::redirectAdmin('index.php?controller=AdminLogin');
 
@@ -44,153 +49,12 @@ $function_array = array(
 	'id_supply_order' => 'generateSupplyOrderFormPDF'
 );
 
+$pdf_controller = new AdminPdfController();
 foreach ($function_array as $var => $function)
 	if (isset($_GET[$var]))
 	{
-		call_user_func($function);
-		die;
+		$pdf_controller->{'process'.$function}();
+		exit;
 	}
 
-function generateSupplyOrderFormPDF()
-{
-	if (!Tools::isSubmit('id_supply_order'))
-		die (Tools::displayError('Missing supply order ID'));
-
-	$id_supply_order = (int)Tools::getValue('id_supply_order');
-	$supply_order = new SupplyOrder($id_supply_order);
-
-	if (!Validate::isLoadedObject($supply_order))
-		die(Tools::displayError('Cannot find this supply order in the database'));
-
-	generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM);
-}
-
-function generateInvoicePDF()
-{
-	if (Tools::isSubmit('id_order'))
-		generateInvoicePDFByIdOrder(Tools::getValue('id_order'));
-	elseif (Tools::isSubmit('id_order_invoice'))
-		generateInvoicePDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
-	else
-		die (Tools::displayError('Missing order ID or invoice order ID'));
-	exit;
-}
-
-function generateInvoicePDFByIdOrder($id_order)
-{
-	$order = new Order((int)$id_order);
-	if (!Validate::isLoadedObject($order))
-		die(Tools::displayError('Cannot find order in database'));
-
-	$order_invoice_list = $order->getInvoicesCollection();
-	Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => $order_invoice_list));
-	generatePDF($order_invoice_list, PDF::TEMPLATE_INVOICE);
-}
-
-function generateInvoicePDFByIdOrderInvoice($id_order_invoice)
-{
-	$order_invoice = new OrderInvoice((int)$id_order_invoice);
-	if (!Validate::isLoadedObject($order_invoice))
-		die(Tools::displayError('Cannot find order invoice in database'));
-
-	Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => array($order_invoice)));
-	generatePDF($order_invoice, PDF::TEMPLATE_INVOICE);
-}
-
-function generateOrderSlipPDF()
-{
-	$orderSlip = new OrderSlip((int)Tools::getValue('id_order_slip'));
-	$order = new Order((int)$orderSlip->id_order);
-	if (!Validate::isLoadedObject($order))
-		die(Tools::displayError('Cannot find order in database'));
-	$order->products = OrderSlip::getOrdersSlipProducts($orderSlip->id, $order);
-
-	generatePDF($orderSlip, PDF::TEMPLATE_ORDER_SLIP);
-}
-
-function generateDeliverySlipPDF()
-{
-	if (Tools::isSubmit('id_order'))
-		generateDeliverySlipPDFByIdOrder((int)Tools::getValue('id_order'));
-	elseif (Tools::isSubmit('id_order_invoice'))
-		generateDeliverySlipPDFByIdOrderInvoice((int)Tools::getValue('id_order_invoice'));
-	elseif (Tools::isSubmit('id_delivery'))
-	{
-		$order = Order::getByDelivery((int)Tools::getValue('id_delivery'));
-		generateDeliverySlipPDFByIdOrder((int)$order->id);
-	}
-	else
-		die (Tools::displayError('Missing order ID or invoice order ID'));
-	exit;
-}
-
-function generateDeliverySlipPDFByIdOrder($id_order)
-{
-	$order = new Order((int)$id_order);
-	if (!Validate::isLoadedObject($order))
-		throw new PrestaShopException('Can\'t load Order object');
-
-	$order_invoice_collection = $order->getInvoicesCollection();
-	generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
-}
-
-function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice)
-{
-	$order_invoice = new OrderInvoice((int)$id_order_invoice);
-	if (!Validate::isLoadedObject($order_invoice))
-		throw new PrestaShopException('Can\'t load Order Invoice object');
-
-	generatePDF($order_invoice, PDF::TEMPLATE_DELIVERY_SLIP);
-}
-
-function generateInvoicesPDF()
-{
-	$order_invoice_collection = OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
-
-	if (!count($order_invoice_collection))
-		die(Tools::displayError('No invoices found'));
-
-	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
-}
-
-function generateInvoicesPDF2()
-{
-	$order_invoice_collection = array();
-	foreach (explode('-', Tools::getValue('id_order_state')) as $id_order_state)
-		if (is_array($order_invoices = OrderInvoice::getByStatus((int)$id_order_state)))
-			$order_invoice_collection = array_merge($order_invoices, $order_invoice_collection);
-
-	if (!count($order_invoice_collection))
-		die(Tools::displayError('No invoices found'));
-
-	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
-}
-
-function generateOrderSlipsPDF()
-{
-	$id_order_slips_list = OrderSlip::getSlipsIdByDate(Tools::getValue('date_from'), Tools::getValue('date_to'));
-	if (!count($id_order_slips_list))
-		die (Tools::displayError('No order slips found'));
-
-	$order_slips = array();
-	foreach ($id_order_slips_list as $id_order_slips)
-		$order_slips[] = new OrderSlip((int)$id_order_slips);
-
-	generatePDF($order_slips, PDF::TEMPLATE_ORDER_SLIP);
-}
-
-function generateDeliverySlipsPDF()
-{
-	$order_invoice_collection = OrderInvoice::getByDeliveryDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
-
-	if (!count($order_invoice_collection))
-		die(Tools::displayError('No invoices found'));
-
-	generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
-}
-
-function generatePDF($object, $template)
-{
-	$pdf = new PDF($object, $template, Context::getContext()->smarty);
-	$pdf->render();
-}
+exit;

admin-dev/searchcron.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 6844 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/tabs/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/themes/default/css/admin.css

@@ -18,6 +18,7 @@ fieldset{background-color:#EBEDF4; border:1px solid #CCCED7; color:#585A69; font
 .Bloc {background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
 legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
 input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc; background-color:#fff;}
+input[type="text"]:disabled,input[type="password"]:disabled,input[type="file"]:disabled,textarea:disabled {border:1px solid #ccc; background-color:#dedede; color: #444444;}
 select { border:1px solid #ccc; font-size: 12px;}
 select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"], option[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
 .header_module{background:url('../img/header_module.png');padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
@@ -57,19 +58,18 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #header_infos #header_foaccess{ text-decoration:none; color:#bababa;}
 #header #header_infos #header_foaccess a {color:#bababa !important;}
 #header #header_infos a#header_foaccess:hover { color:#fff;}
-#header #header_search{ float:left; margin-top:15px; position:relative;  }
-#header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 #fff;  border:1px solid #000; border-radius:4px;  padding: 5px 25px 5px 4px; width: 180px; box-shadow: 0 1px 0 #666;}
-#header #header_search #bo_search_type{ font-size:13px; float:left; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:auto; border-color: #666666 #CCCCCC #CCCCCC;border-style:solid solid solid none; height:27px; border-width: 1px;}
-#header #header_search #bo_search_submit { background: transparent url('../img/icon-search.png') no-repeat scroll center; border:none; width:27px; height:27px; float:left; font-weight:normal; margin:0; padding:0;  cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; /*hacking ie7*/ font-size:0 !ie7; color: transparent !ie;}
+#header #header_search{ background-color:#fff; border:2px solid #000; float:left; margin-top:15px; margin-left:7%; position:relative; height:25px; box-shadow: 0 1px 0 #666666; }
+#header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 transparent;  border:none; box-shadow:none;  padding: 5px 0px 5px 4px; width: 160px; }
+#header #header_search #bo_search_type_chzn{ font-size:13px; float:left; margin:0 23px 0 0; padding:0 4px; vertical-align:middle;width:100px;height:27px; border:none;}
+#header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single { box-shadow:none; border-radius:0px; border:none; border-left:1px dotted #ccc;} 
+#header #header_search #bo_search_submit { background:  url('../img/icon-search2.png') no-repeat scroll center; border:none; width:27px; height:25px; float:left; font-weight:normal; margin:0; padding:0;  cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; border-left:1px solid #3079ED; border-radius:0px; /*hacking ie7*/ font-size:0 !ie7; color: transparent !ie;}
 #header #header_quick{float:right; display:block; margin-top:15px;}
-#header #header_quick #quick_select{ font-size:13px; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:140px; height:27px;}
-#header #header_shoplist{ background-image:none; clear:both; float: right; color:#fff; margin-top:10px; margin-right:15px;}
-#header #header_shoplist span { float:left; padding:3px;}
+#header #header_quick #quick_select_chzn{ font-size:13px; margin:0 10px 0 0; padding:0px 0 4px;  }
 #header #header_myaccount{background:url('../img/bg-lang.png') no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
 
 
 .path_bar {display:none;}
-#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;}
+#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:95px;}
 .notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
 #orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
 #customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
@@ -105,7 +105,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #menu li.active span.title, #header #menu li:hover span.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
 #header #menu .withLeftBorder{background:transparent url('../img/separator_subnav.png') no-repeat 0 5px}
 #header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 5px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;}
-#header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;}
+#header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;min-width:150px;}
 #header #menu .submenu li a{ font-size:12px;display:block;padding: 5px 15px 5px 10px; color:#666666;border-top:1px solid #fff; border-bottom:1px solid #ccc;}
 #header #menu .submenu li a:hover { background-color:#eee; text-shadow:0 1px 0 #fff;}
 
@@ -116,6 +116,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table_grid {width:100%;}
 .table{ background-color:#fff;border:1px solid #ccc;padding:0: border-radius:3px; -moz-border-radius:3px;-webkit-border-radius:3px;}
 .filter {background-color:#f1f9ff;}
+.table .filter {margin:2px;}
 .table th a{text-decoration:underline}
 .table a:hover{text-decoration:none}
 .table tr th{ background-color: #F1F1F1; text-shadow:0 1px 0 #fff; padding:4px 6px;
@@ -135,9 +136,10 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table tr td.last{border-right:1px solid #DEDEDE}
 .table tr.small td{height:15px}
 .table tr.last td{border-bottom:none}
-td.col-left {vertical-align:top; padding-right:10px;}
+.col-left {vertical-align:top; padding-right:10px;}
+.col-right {padding-bottom:5px;}
 #tabPane1 td.col-left { width:200px;}
-#product-tab-content-wait{display:block;background:url('../img/bg_loaderSpace.png');position:absolute;width:100%;z-index:100;min-height:600px;padding:5px 10px 10px;}
+#product-tab-content-wait{display:block;background:url('../img/bg_loaderSpace.png');min-height:420px;position:absolute;width:96.5%;}
 div#loading{height:128px;width:128px;background:url('../img/ajax-loader.gif');display:block;text-indent:-9999px;margin:100px auto;}
 td.col-left label { display:block; width:100%; text-align:right;}
 .alt_row{background-color:#f8f8f8}
@@ -146,6 +148,13 @@ td.col-left label { display:block; width:100%; text-align:right;}
 .cat_bar{background-color:#F4E8CD;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:12px;font-weight:700;margin-bottom:20px;padding:5px}
 .cat_bar a{font-weight:700}
 
+.table tr#total_products, 
+.table tr#total_discounts,
+.table tr#total_wrapping,
+.table tr#total_shipping { height:35px;}
+.table tr#total_order { height:50px;}
+
+
 a.action_module{color: #268CCD;text-decoration: underline;}
 a.header_module_toggle{font-weight: bold;color: #268CCD;display:block;}
 a.module_toggle_all{color: #268CCD;}
@@ -168,6 +177,16 @@ a.module_toggle_all{color: #268CCD;}
 /*TABLE STATUS COMMANDE*/
 .table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
 
+/*multishop toolbar*/
+.multishop_toolbar { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; font-size: 18px;}
+.multishop_toolbar span.text_multishop {vertical-align: 7px; padding-right: 5px; }
+.multishop_toolbar select.shopList { width: 300px; }
+.multishop_toolbar a.chzn-single { background: url('../img/icon-multishop.png') no-repeat 5px 5px; padding: 1px 2px 2px 25px; font-weight: bold; }
+
+.multishop_toolbar .chzn-container .chzn-results .first{font-weight: bold;background-color: #408BD5;color: #ffffff;}
+.multishop_toolbar .chzn-container .chzn-results .group{font-weight: bold;font-style: italic;padding-left: 15px;background-color: #C6DEFC;}
+.multishop_toolbar .chzn-container .chzn-results .shop{padding-left: 30px;background-color: #EAF2FC;}
+
 /*toolbarBox*/
 .toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
 .toolbarBox .pageTitle { margin-left:10px; line-height:48px}
@@ -208,16 +227,27 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox .process-icon-help{ background-image: url('../img/process-icon-help.png');}
 .toolbarBox .process-icon-help-new{ background-image: url('../img/process-icon-help-new.png');}
 
-div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
+div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;}
 
 /*button upload files*/
-.qq-upload-button {
-		background: #e4e4e4 url('../img/bg-button-degrade.png') repeat-x scroll left top;
-		background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
-		background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
-		color:#333; width:180px; font-weight:bold; text-shadow: 0 1px 0 #fff;
-	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;}
-.qq-upload-button:hover { border:1px solid #939393;}
+#content .qq-upload-button {
+	background: #e4e4e4 url('../img/bg-button-degrade.png') repeat-x scroll left top;
+	background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
+	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
+	color:#333;
+	width:180px;
+	text-shadow: 0 1px 0 #fff;
+	border-color: #CCCCCC #BBBBBB #A0A0A0;
+	border-left: 1px solid #BBBBBB;
+	border-radius: 3px 3px 3px 3px;
+	border-right: 1px solid #BBBBBB;
+	border-style: solid;
+	border-width: 1px;
+	color: #000000;
+}
+#content .qq-upload-button:hover { border:1px solid #939393;}
+
+.file_upload_label {margin-top:5px;}
 
 /*leadin*/
 .leadin {}
@@ -285,7 +315,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 .sidebar ul.categorieList li:first-child { border-top:none;}
 .sidebar ul.categorieList li a {color:#3a6ea7; display:block; padding-left:5px;}
 .sidebar ul.categorieList li a:hover { background-color: #EBEDF4;}
-.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
+.sidebar ul.categorieList li div.categorieWidth { overflow:hidden;}
 .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
 .sidebar .categorieStatus { display:none;}
 
@@ -320,7 +350,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #statsContainer #calendar p, #referrersContainer #calendar p { margin:2px;}
 #statsContainer #calendar p span, #referrersContainer #calendar p span { float:left; display:block; padding:3px;}
 #statsContainer .blocStats { background-color: #EBEDF4;border: 1px solid #C2C4D9; display: block; position:relative; padding: 10px;}
-#statsContainer .blocStats h2 { font-weight:normal; margin:0;}
+#statsContainer .blocStats h2 { font-weight:normal; margin:0; font-size:1.4em}
 #statsContainer .blocStats h2.icon-statsproduct span,
 #statsContainer .blocStats h2.icon-statsbestsuppliers span,
 #statsContainer .blocStats h2.icon-statsforecast span,
@@ -419,8 +449,8 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #modulePosition .table tr th { height:40px;}
 #modulePosition form{ margin-right:270px;}
 #modulePosition .lab_modules_positions h3 { color:#3A6EA7; margin:0 0 0 10px; float:left;}
-#modulePosition .lab_modules_positions p { font-family:Georgia; font-style: italic; font-size:12px; padding-left:40px;}
-#modulePosition .lab_modules_positions span { font-size:12px; padding-left:5px;}
+#modulePosition .lab_modules_positions p { font-family:Georgia; font-style: italic; font-size:12px; padding-left:40px; clear:both;}
+#modulePosition .lab_modules_positions span { font-size:12px; padding-top:4px; padding-left:5px; float:left; }
 
 select#show_modules { font-size:12px;}
 
@@ -463,3 +493,9 @@ ul.listForm li {padding-bottom:3px;}
 .view-modules li.favorites-view-disabled:hover {border-color: #CCCCCC #BBBBBB #A0A0A0;}
 .view-modules li.favorites-view   {border-bottom-left-radius: 0;border-left: 1px solid #fff; border-top-left-radius: 0;}
 .view-modules li.normal-view  {border-bottom-right-radius: 0;border-right: 1px solid #ccc; border-top-right-radius: 0;}
+
+.margin-form select.chosen{width: 200px;}
+
+.selected-line {background:#fff1b5;}
+
+#changedFiles ul{list-style-type: square; padding-left: 40px;}

admin-dev/themes/default/css/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 8667 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/themes/default/css/modules.css

@@ -213,14 +213,15 @@ form#product, form#access_form{   background-color:#ebedf4; border:1px solid #cc
 .sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;}
 .sidebar ul.categorieList li:first-child { border-top:none;}
 .sidebar ul.categorieList li a {color:#3a6ea7;}
-.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
+.sidebar ul.categorieList li div.categorieWidth { text-indent:5px; overflow:hidden;}
 .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
 
 /*MODULECONTAINER*/
 #moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
 #moduleContainer .table tr th { height:40px;}
-#moduleContainer .table tr td { vertical-align:top; padding: 5px 7px 0; border-top:1px dotted #ccc; border-bottom:none;}
+#moduleContainer .table tr td { font-size:12px; vertical-align:top; padding: 5px 7px 0; border-top:1px solid #ccc; border-bottom:none;}
 #moduleContainer .table tr:first-child {border-top:1px solid #ccc}
+#moduleContainer .table tr:hover { background-color:#FFF1B5;}
 #moduleContainer .moduleDesc { font-size:12px; position:relative; margin-bottom:10px;}
 #moduleContainer .moduleDesc h3 { color:#3A6EA7; margin:0;}
 #moduleContainer .moduleDesc .metadata  { float:left; display:block; margin:5px 0;}
@@ -235,7 +236,12 @@ form#product, form#access_form{   background-color:#ebedf4; border:1px solid #cc
 #moduleContainer .row-actions-module span { padding-right:5px;}
 #moduleContainer .row-actions-module span a { font-size:12px;}
 #moduleContainer .button.uninstalled,
-#moduleContainer .button.installed { float:right; clear:both; margin-top:15px; font-size:12px;}
+#moduleContainer .button.installed { float:right; display: inline-block; margin-top:15px; font-size:12px;}
+#moduleContainer .button.updated {  margin-top:15px; display: inline-block; font-size:12px;}
+#list-action-button{width:175px}
+#list-action-button li{margin-left:10px;display: inline;float: left;}
+#moduleContainer .moduleName {font-size:12px; color:#3A6EA7;font-weight:bold;}
+#moduleContainer .moduleFavDesc { font-family:Georgia; font-style:italic; color:#666;}
 
 
 /*FOOTER*/

admin-dev/themes/default/img/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 8667 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

admin-dev/themes/default/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/themes/default/template/content.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 8971 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -48,8 +48,43 @@
 			var tabnumber = tout[4];
 			var table = 'table#table_'+id_profile;
 
-			perfect_access_js_gestion(this, perm, id_tab, tabsize, tabnumber, table);
-			
+			if (perm == 'all' && $(this).parent().parent().hasClass('parent'))
+			{
+				checked = enabled ? 'checked': '';
+				$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').attr('checked', checked);
+				$.ajax({
+					url: "{$link->getAdminLink('AdminAccess')}",
+					cache: false,
+					data : {
+						ajaxMode : '1',
+						id_tab: id_tab,
+						id_profile: id_profile,
+						perm: perm,
+						enabled: enabled,
+						submitAddAccess: '1',
+						addFromParent: '1',
+						action: 'updateAccess',
+						ajax: '1',
+						token: '{getAdminToken tab='AdminAccess'}'
+					},
+					success : function(res,textStatus,jqXHR)
+					{
+						try
+						{
+							if (res == 'ok')
+								showSuccessMessage("{l s='Update successful'}");
+							else
+								showErrorMessage("{l s='Update error'}");
+						}
+						catch(e)
+						{
+							jAlert('Technical error');
+						}
+					}
+				});
+			}
+			perfect_access_js_gestion(this, perm, id_tab, tabsize, tabnumber, table, '{$id_tab_access}');
+
 			$.ajax({
 				url: "{$link->getAdminLink('AdminAccess')}",
 				cache: false,
@@ -62,7 +97,7 @@
 					submitAddAccess: '1',
 					action: 'updateAccess',
 					ajax: '1',
-					token: '{getAdminToken tab='AdminAccess'}',
+					token: '{getAdminToken tab='AdminAccess'}'
 				},
 				success : function(res,textStatus,jqXHR)
 				{
@@ -86,7 +121,7 @@
 			var id_module = tout[0];
 			var perm = tout[1];
 			var id_profile = tout[2];
-			var enabled = $(this).is(':checked')? 1 : 0;
+			var enabled = $(this).is(':checked') ? 1 : 0;
 			var table = 'table#table_module_'+id_profile;
 
 			if (id_module == -1)
@@ -110,7 +145,7 @@
 					changeModuleAccess: '1',
 					action: 'updateModuleAccess',
 					ajax: '1',
-					token: '{getAdminToken tab='AdminAccess'}',
+					token: '{getAdminToken tab='AdminAccess'}'
 				},
 				success : function(res,textStatus,jqXHR)
 				{
@@ -133,18 +168,10 @@
 
 </script>
 
-
-<div class="toolbarBox">
 {if $show_toolbar}
-	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-	<div class="pageTitle">
-	<h3>{block name=pageTitle}
-		<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-		{/block}</h3>
-	</div>
-{/if}
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 	<div class="leadin">{block name="leadin"}{/block}</div>
-</div>
+{/if}
 
 <div class="productTabs">
 	<ul class="tab">
@@ -158,7 +185,7 @@
 
 <form id="{$table}_form" class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
 	{if $form_id}
-		<input type="hidden" name="id_{$table}" id="id_{$table}" value="{$form_id}" />
+		<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
 	{/if}
 
 	{assign var=tabsize value=count($tabs)}
@@ -236,7 +263,7 @@
 							{if !$tab.id_parent OR $tab.id_parent == -1}
 								{assign var=is_child value=false}
 								{assign var=result_accesses value=0}
-								<tr>
+								<tr{if !$is_child} class="parent"{/if}>
 									<td{if !$is_child} class="bold"{/if}>{if $is_child} &raquo; {/if}<strong>{$tab.name}</strong></td>
 									{foreach $perms as $perm}
 										{if $access_edit == 1}
@@ -275,7 +302,7 @@
 										{if isset($access[$child.id_tab])}
 											{assign var=is_child value=true}
 											{assign var=result_accesses value=0}
-											<tr>
+											<tr class="child-{$child.id_parent}">
 												<td{if !$is_child} class="bold"{/if}>{if $is_child} &raquo; {/if}<strong>{$child.name}</strong></td>
 												{foreach $perms as $perm}
 													{if $access_edit == 1}
@@ -382,7 +409,7 @@
 				<div class="clear">&nbsp;</div>
 
 			{else}
-				{l s='Administrator permissions can\'t be modified.'}
+				{l s='Administrator permissions cannot be modified.'}
 			{/if}
 
 		</div>

admin-dev/themes/default/template/controllers/accounting_export/common_form.tpl

@@ -1,51 +0,0 @@
-{*
-* 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 <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9856 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-
-{if $existingExport}
-	<div class="hint" style="display:block;">
-		{l s='The last export has been found for this section:'}
-		<a href="{$smarty.server.REQUEST_URI}&download={$type}">{l s='Click here'}</a>
-	</div>
-	<br />
-{/if}
-
-<label for="clientPrefix">{l s='Client prefix:'}</label>
-<div class="margin-form">
-	<input type="text" value="{$clientPrefix|htmlentities}" name="clientPrefix" />
-	<span class="input-error"></span>
-</div>
-
-<label for="beginDate">{l s='Begin to:'}</label>
-<div class="margin-form">
-	<input class="datepicker" id="beginDate_{$type}" type="text" name="beginDate" value="{$begin_date}" />
-	<span class="input-error">{l s='The date has not the right format'}</span>
-</div>
-
-<label for="endDate">{l s='End to:'}</label>
-<div class="margin-form">
-	<input class="datepicker" id="endDate_{$type}" type="text" name="endDate" value="{$end_date}" />
-	<span class="input-error">{l s='The date has not the right format'}</span>
-</div>

admin-dev/themes/default/template/controllers/accounting_export/global_export.tpl

@@ -1,42 +0,0 @@
-{*
-* 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 <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9856 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-
-<div class="formAccountingExport" id="block_global_export">
-	<fieldset>
-		<legend>{$title}</legend>
-		<form id="reconfiliation_form" action="{$smarty.server.REQUEST_URI}" method="POST">
-			{include file="controllers/accounting_export/common_form.tpl"}
-			<label for="clientPrefix">{l s='Journal:'}</label>
-			<div class="margin-form">
-				<input type="text" name="journal" value="{$journal|htmlentities}"/>
-			</div>	
-			<div class="margin-form">
-				<input id="submitGlobalExport" type="submit" class="button" name="submitAccountingExportType" />
-				<input type="hidden" name="exportType" value="global_export"/>
-			</div>
-		</form>
-	</fieldset>
-</div>

admin-dev/themes/default/template/controllers/accounting_export/menu.tpl

@@ -1,117 +0,0 @@
-{*
-* 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 <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9856 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-
-<script type="text/javascript">
-	
-	function validateInputDate(input, displayError)
-	{
-		{literal}
-		dateRegex = /^\d{4}-\d{1,2}-\d{1,2}$/
-  	{/literal}
-			
-  	if (!input.val().match(dateRegex))
-  	{
-			input.parent().find('span.input-error').fadeIn('fast');
-			return false;
-		}
-		input.parent().find('span.input-error').css('display','none');
-		return true;
-	}
-	
-	function validateAccountingForm()
-	{
-		validation = true;
-		
-		$('span.input-error').css('display', 'none');
-		$('.datepicker:visible').each(function() {
-			if (!(validateInputDate($(this), true)))
-				validation = false;
-		});
-    
-		return validation;
-	}
-	
-	$(document).ready(function() {
-		$('#export_menu').find('a').each(function() {
-			$(this).click(function() {
-				blockID = 'block_' + $(this).attr('id');
-				if (!$('#' + blockID).is(':visible'))
-				{
-				
-					$('.formAccountingExport:visible').each(function() {
-						$(this).fadeOut('fast', function() {
-							$('#' + blockID).fadeIn('fast');
-						});			
-					});
-				}
-			});
-		});
-		
-		$('#' + '{$defaultType}').fadeIn('fast');
-	
-		$('.datepicker').each(function() {
-			$(this).change(function() {
-				validateInputDate($(this), true);
-			});
-			$(this).datepicker({
-	     prevText: '',
-	     nextText: '',
-	     dateFormat: 'yy-mm-dd'
-	    });			
-		});
-    
-    $('.formAccountingExport form input[type="submit"]').each(function()
-    {
-    	$(this).click(function() {
-    		return validateAccountingForm();
-    	});
-    });
-	});
-</script>
-
-{foreach from=$preventList key=name item=preventType}
-	{if !empty($preventType)}
-		<div class="{$name}">
-			{foreach from=$preventType item=translationPrevent}
-				{$translationPrevent}
-			{/foreach}
-		</div>
-	{/if}
-{/foreach}
-
-<div id="export_menu">
-	<div class="toolbarBox">
-		<div class="pageTitle">
-			<h3>
-				<span id="current_obj" style="font-weight: normal;">{l s='Export:'}</span>
-			</h3>
-			{l s='Select which export you want to do:'}<br />
-			{foreach from=$exportTypeList item=export}
-				<a id="{$export['type']}" class="button" href="javascript:void(0);">{$export['name']}</a>
-			{/foreach}
-		</div>
-	</div>
-</div>

admin-dev/themes/default/template/controllers/accounting_management/content.tpl

@@ -1,63 +0,0 @@
-{*
-* 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 <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9856 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-
-{if !empty($error)}
-	<div class="hint" style="display:block">{$error}</div>
-{else}
-	<div class="toolbarBox">
-		{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-		<div class="pageTitle">
-			<h3>
-				<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-			</h3>
-		</div>
-	</div>
-	<fieldset>
-		<legend>{l s='Account number'}</legend>
-		<div class="hint" style="display:block">
-			{l s='Configure the account number by zone for:'} <b>{$shop_details['name']}</b>
-		</div>
-		<br />
-		<form id="{$table}_form" method="POST" action="{$smarty.server.REQUEST_URI}">
-			<label>{l s='Default number for this shop'}</label>
-				<div class="margin-form">
-				<input type="text" name="default_account_number" value="{$shop_details['default_account_number']|htmlentities}" />
-				<p>{l s='If a zone field is empty it will use this default number.'}</p>
-			</div>
-			{foreach from=$shop_details['zones'] key=id_zone item=currentZone}
-				<label>{$currentZone['name']}</label>
-				<div class="margin-form">
-					<input type="text" name="zone_{$id_zone}" value="{$currentZone['account_number']|escape:htmlall|htmlentities}" />
-
-				</div>
-			{/foreach}
-			<div class="margin-form">
-				<input type="submit" class="button" id="{$table}_form_submit_btn" name="UpdateNumbers" value="{l s='Save'}"/>
-			</div>
-		</form>
-		<div class="separation"></div>
-	</fieldset>
-{/if}

admin-dev/themes/default/template/controllers/addons_catalog/content.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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

admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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
@@ -27,12 +27,26 @@
 {extends file="helpers/form/form.tpl"}
 
 {block name="label"}
+	{if $input.name == 'vat_number'}
+		{if $vat == 'is_applicable'}
+			<div id="vat_area" style="display: visible">
+		{else if $vat == 'management'}
+			<div id="vat_area" style="display: hidden">
+		{else}
+			<div style="display: none;">
+		{/if}
+	{/if}
+
+	{if $input.type == 'text_customer' && !isset($customer)}
+		<label>{l s='Customer e-mail'}</label>
+	{else}
+		{$smarty.block.parent}
+	{/if}
 {/block}
 
-{block name="start_field_block"}
+{block name="field"}
 	{if $input.type == 'text_customer'}
 		{if isset($customer)}
-			<label>{$input.label}</label>
 			<div class="margin-form"><a style="display: block; padding-top: 4px;" href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={$tokenCustomer}">{$customer->lastname} {$customer->firstname} ({$customer->email})</a></div>
 			<input type="hidden" name="id_customer" value="{$customer->id}" />
 			<input type="hidden" name="email" value="{$customer->email}" />
@@ -71,35 +85,14 @@
 				}
 			});
 			</script>
-			<label>{l s='Customer e-mail'}</label>
 			<div class="margin-form">
-				<input type="text" size="33" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'|htmlentities}" style="text-transform: lowercase;" /> <sup>*</sup>
+				<input type="text" size="33" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" style="text-transform: lowercase;" /> <sup>*</sup>
 			</div>
 		{/if}
-	{else} 
-		{if $input.name == 'vat_number'}		
-			{if $vat == 'is_applicable'}
-				<div id="vat_area" style="display: visible">
-			{else if $vat == 'management'}
-				<div id="vat_area" style="display: hidden">
-			{else}
-				<div style="display: none;">
-			{/if}
-		{else if $input.name == 'id_state'}
-				<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
-		{/if}
-		<label>{$input.label} </label>
-		<div class="margin-form">
+	{else}
+		{$smarty.block.parent}
 	{/if}
-{/block}
-
-{block name="end_field_block"}
-	{* close div margin-form *}
-	{if $input.type != 'text_customer'}
-		</div>
-	{/if}
-	{* close hidden div *}
-	{if $input.name == 'vat_number' || $input.name == 'id_state'}
+	{if $input.name == 'vat_number'}
 		</div>
 	{/if}
 {/block}

admin-dev/themes/default/template/controllers/addresses/helpers/list/list_header.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,11 +18,17 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9197 $
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision: 10891 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a class="pointer delete" onclick="javascript:deleteProductAttribute('{$id}', '{getAdminToken tab='AdminProducts'}', $(this).parent('td').parent('tr'));" title="{$action}" >
-	<img src="../img/admin/delete.gif" alt="{$action}" />
-</a>
+{extends file="helpers/list/list_header.tpl"}
+{block name='override_header'}
+{if $submit_form_ajax}
+	<script type="text/javascript">
+		parent.getSummary();
+		parent.$.fancybox.close();
+	</script>
+{/if}
+{/block}

admin-dev/themes/default/template/controllers/attachments/list_action_delete.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 9197 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -26,7 +26,7 @@
 <script>
 	function confirmProductAttached(productList)
 	{
-		var confirm_text = "{l s='This attachment is used by the following products:'}";
+		var confirm_text = "{l s='This attachment is associated with the following products:'}";
 		if (confirm('{$confirm}'))
 			return confirm(confirm_text + product_list);
 		return false;

admin-dev/themes/default/template/controllers/attribute_generator/content.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,21 +18,20 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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
 *}
 
 <script type="text/javascript">
-	i18n_tax_exc = "{l s='Tax Excl.:'}";
-	i18n_tax_inc = "{l s='Tax Incl.:'}";
+	i18n_tax_exc = '{l s='Tax Excl.:'} ';
+	i18n_tax_inc = '{l s='Tax Incl.:'} ';
 
-	var product_tax = "{$tax_rates}";
+	var product_tax = '{$tax_rates}';
 	function calcPrice(element, element_has_tax)
 	{
-			name = element.attr("name");
-			var element_price = element.val().replace(/,/g, ".");
+			var element_price = element.val().replace(/,/g, '.');
 			var other_element_price = 0;
 
 			if (!isNaN(element_price) && element_price > 0)
@@ -45,103 +44,81 @@
 				other_element_price = other_element_price.toFixed(2);
 			}
 
-			$("#related_to_"+name).val(other_element_price);
+			$('#related_to_'+element.attr('name')).val(other_element_price);
 	}
 
-
-	$(document).ready(function()
-	{
-		$(".price_impact").each(function()
-		{
-			calcPrice($(this), false);
-		});
-	});
+	$(document).ready(function() { $('.price_impact').each(function() { calcPrice($(this), false); }); });
 </script>
 
-<div class="toolbarBox">
-	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-	<div class="pageTitle">
-	<h3>
-		<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-	</h3>
-	</div>
-</div>
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
 
-{if $generate}
-	<div class="module_confirmation conf confirm">
-		{$combinations_size} {l s='product(s) successfully created.'}
-	</div>
-{/if}
+{if $generate}<div class="module_confirmation conf confirm">{l s='%d product(s) successfully created.' sprintf=$combinations_size}</div>{/if}
 <script type="text/javascript" src="../js/attributesBack.js"></script>
 <form enctype="multipart/form-data" method="post" id="generator" action="{$url_generator}">
 	<fieldset style="margin-bottom: 35px;">
-		<legend><img src="../img/admin/asterisk.gif" />{l s='Attributes generator'}</legend>
-        <div style="display: block; margin-bottom: 20px;" class="hint">{l s='To generate the attributes, click on the "Ctrl", select your attributes and click "Add".'}</div>
-		<div style="float: left; margin-right:50px;">
-			<div>
-				<select multiple name="attributes[]" id="attribute_group" style="width: 200px; height: 350px; margin-bottom: 10px;">
-					{foreach $attribute_groups as $k => $attribute_group}
-						{if isset($attribute_js[$attribute_group['id_attribute_group']])}
-							<optgroup name="{$attribute_group['id_attribute_group']}" id="{$attribute_group['id_attribute_group']}" label="{$attribute_group['name']|escape:'htmlall':'UTF-8'}">
-								{foreach $attribute_js[$attribute_group['id_attribute_group']] as $k => $v}
-									<option name="{$k}" id="attr_{$k}" value="{$v|escape:'htmlall':'UTF-8'}" title="{$v|escape:'htmlall':'UTF-8'}">{$v|escape:'htmlall':'UTF-8'}</option>
-								{/foreach}
-							</optgroup>
-						{/if}
-					{/foreach}
-				</select>
-			</div>
-			<div>
-				<p style="text-align: center;">
-					<input class="button" type="button" style="margin: 0 0 10px 20px;" value="{l s='Add'}" class="button" onclick="add_attr_multiple();" />
-					<input class="button" type="button" style="margin: 0 0 10px 20px;" value="{l s='Delete'}" class="button" onclick="del_attr_multiple();" /><br />
+		<legend><img src="../img/admin/asterisk.gif" alt="" />{l s='Attributes generator'}</legend>
+		<div style="float: left; margin-right: 50px;">
+			<select multiple name="attributes[]" id="attribute_group" style="height: 500px; margin-bottom: 10px;">
+				{foreach $attribute_groups as $k => $attribute_group}
+					{if isset($attribute_js[$attribute_group['id_attribute_group']])}
+						<optgroup name="{$attribute_group['id_attribute_group']}" id="{$attribute_group['id_attribute_group']}" label="{$attribute_group['name']|escape:'htmlall':'UTF-8'}">
+							{foreach $attribute_js[$attribute_group['id_attribute_group']] as $k => $v}
+								<option name="{$k}" id="attr_{$k}" value="{$v|escape:'htmlall':'UTF-8'}" title="{$v|escape:'htmlall':'UTF-8'}">{$v|escape:'htmlall':'UTF-8'}</option>
+							{/foreach}
+						</optgroup>
+					{/if}
+				{/foreach}
+			</select>
+			<div style="text-align: center; margin-bottom: 10px;">
+				<p>
+					<input class="button" type="button" style="margin-right: 15px;" value="{l s='Add'}" class="button" onclick="add_attr_multiple();" />
+					<input class="button" type="button" value="{l s='Delete'}" class="button" onclick="del_attr_multiple();" />
 				</p>
 			</div>
 		</div>
-		<br />
-		{l s='Add or modify attributes for product:'} <b>{$product_name}</b>
-		<br /><br />
-		<div style="padding-top:10px; float: left; width: 570px;">
-			<div style="float:left;">
-				<label>{l s='Quantity'}</label>
-				<div class="margin-form">
-					<input type="text" size="20" name="quantity" value="0"/>
-				</div>
-				<label>{l s='Reference'}</label>
-				<div class="margin-form">
-					<input type="text" size="20" name="reference" value="{$product_reference|htmlentities}"/>
-				</div>
-			</div>
-			<div style="float:left; text-align:center; margin-left:20px;">
-				<input type="submit" class="button" style="margin-bottom:5px;" name="generate" value="{l s='Generate'}" /><br />
-			</div>
-			<br style="clear:both;" />
-			<div style="margin-top: 15px;">
-				{foreach $attribute_groups as $k => $attribute_group}
-					{if isset($attribute_js[$attribute_group['id_attribute_group']])}
-						<br class="clear"/>
-						<table class="table" cellpadding="0" cellspacing="0" align="left" style="margin-bottom: 10px; display: none;">
-							<thead>
-								<tr>
-									<th id="tab_h1" style="width: 150px">{$attribute_group['name']|escape:'htmlall':'UTF-8'}</th>
-									<th id="tab_h2" style="width: 350px" colspan="2">{l s='Price impact'} {$currency_sign}</th>
-									<th style="width: 150px">{l s='Weight impact'} ({$weight_unit})</th>
-								</tr>
-							</thead>
-							<tbody id="table_{$attribute_group['id_attribute_group']}" name="result_table">
-							</tbody>
-						</table>
-						{if isset($attributes[$attribute_group['id_attribute_group']])}
-							{foreach $attributes[$attribute_group['id_attribute_group']] AS $k => $attribute}
-								<script type="text/javascript">
-									$('#table_{$attribute_group['id_attribute_group']}').append(create_attribute_row({$k}, {$attribute_group['id_attribute_group']}, '{$attribute['attribute_name']|addslashes}', {$attribute['price']}, {$attribute['weight']}));
-									toggle(getE('table_' + {$attribute_group['id_attribute_group']}).parentNode, true);
-								</script>
-							{/foreach}						
-						{/if}
+		<div style="float: left; width: 570px;">
+			<div class="hint" style="width: 570px; padding-left: 45px; margin-bottom: 15px; display: block; position: inherit;">{l s='The Combinations Generator is a tool which allows you to easily create a series of combinations by selecting the related attributes. For example, if you are selling T-Shirts, in 3 different sizes and 2 different colors, the Generator will create 6 combinations for you.'}</div>
+			<p>{l s='You are currently generating combinations for the following product:'} <b>{$product_name|escape:'htmlall':'UTF-8'}</b></p>
+			<h4>{l s='Step 1: On the left side, Select the attributes you want to use (Holding down the "CTRL" Key on your keyboard and validating by clicking on "Add"'}</h4>
+			<div>
+			{foreach $attribute_groups as $k => $attribute_group}
+				{if isset($attribute_js[$attribute_group['id_attribute_group']])}
+					<table class="table clear" cellpadding="0" cellspacing="0" style="margin-bottom: 10px; display: none;">
+						<thead>
+							<tr>
+								<th id="tab_h1" style="width: 150px">{$attribute_group['name']|escape:'htmlall':'UTF-8'}</th>
+								<th id="tab_h2" style="width: 350px" colspan="2">{l s='Impact on the Product Price'} ({$currency_sign})</th>
+								<th style="width: 150px">{l s='Impact on the Product Weight'} ({$weight_unit})</th>
+							</tr>
+						</thead>
+						<tbody id="table_{$attribute_group['id_attribute_group']}" name="result_table">
+						</tbody>
+					</table>
+					{if isset($attributes[$attribute_group['id_attribute_group']])}
+						{foreach $attributes[$attribute_group['id_attribute_group']] AS $k => $attribute}
+							<script type="text/javascript">
+								$('#table_{$attribute_group['id_attribute_group']}').append(create_attribute_row({$k}, {$attribute_group['id_attribute_group']}, '{$attribute['attribute_name']|addslashes}', {$attribute['price']}, {$attribute['weight']}));
+								toggle(getE('table_' + {$attribute_group['id_attribute_group']}).parentNode, true);
+							</script>
+						{/foreach}						
 					{/if}
-				{/foreach}
+				{/if}
+			{/foreach}
             </div>
+			<h4>{l s='Step 2 (optional): Select a default Quantity and Reference for all the combinations that the Generator will create for this product'}</h4>
+			<table border="0" class="table" cellpadding="0" cellspacing="0">
+				<tr>
+					<td>{l s='Default Quantity:'}</td>
+					<td><input type="text" size="20" name="quantity" value="0" style="width: 50px;" /></td>
+				</tr>
+				<tr>
+					<td>{l s='Default Reference:'}</td>
+					<td><input type="text" size="20" name="reference" value="{$product_reference|escape:'htmlall':'UTF-8'}" /></td>
+				</tr>
+			</table>
+			<h4>{l s='Finally, click on "Generate these combinations"'}</h4>
+			<p><input type="submit" class="button" style="margin-bottom:5px;" name="generate" value="{l s='Generate these combinations'}" /></p>
 		</div>
 	</fieldset>
 </form>

admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 8971 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -30,25 +30,29 @@
 	{if $input.type == 'color'}
 		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if}";>
 	{/if}
-	{if isset($input.label)}
-		<label>{$input.label} </label>
-	{/if}
+	{$smarty.block.parent}
 {/block}
 
-
-{block name="end_field_block"}
-		{if $input.type == 'text' && $input.name == 'texture'}
-			</div>
-		{/if}
-	</div>
-		{if $input.name == 'name'}
-			{hook h="displayAttributeForm" id_attribute=$form_id}
-		{/if}
+{block name="field"}
+	{if $input.name == 'current_texture'}
+		<div class="margin-form">
+			{if isset($imageTextureExists) && $imageTextureExists}
+				<img src="{$imageTexture}" alt="{l s='Texture'}" />
+			{else}
+				{l s='None'}
+			{/if}
+		</div>
+	{else}
+		{$smarty.block.parent}
+	{/if}
+	{if $input.name == 'name'}
+		{hook h="displayAttributeForm" id_attribute=$form_id}
+	{/if}
 {/block}
 
 {block name="script"}
 	var attributesGroups = {ldelim}{$strAttributesGroups}{rdelim};
-	
+
 	var displayColorFieldsOption = function() {
 		var val = $('#id_attribute_group').val();
 		if (attributesGroups[val])
@@ -60,5 +64,23 @@
 	displayColorFieldsOption();
 	
 	$('#id_attribute_group').change(displayColorFieldsOption);
-	
+
+	var shop_associations = {$fields[0]['form']['shop_associations']};
+	var changeAssociationGroup = function()
+	{
+		var id_attribute_group = $('#id_attribute_group').val();
+		$('.input_shop').each(function(k, item)
+		{
+			var id_shop = $(item).attr('shop_id');
+			if (typeof shop_associations[id_attribute_group] != 'undefined' && $.inArray(id_shop, shop_associations[id_attribute_group]) > -1)
+				$(item).attr('disabled', false);
+			else
+			{
+				$(item).attr('disabled', true);
+				$(item).attr('checked', false);
+			}
+		});
+	};
+	$('#id_attribute_group').change(changeAssociationGroup);
+	changeAssociationGroup();
 {/block}

admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 9608 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -27,7 +27,7 @@
 {if count($list)}
 {foreach $list AS $index => $tr}
 	<tr
-	{if $is_dnd_identifier}id="tr_{$tr.id_attribute_group}_{$tr.$identifier}_{if isset($tr.position['position'])}{$tr.position['position']}{else}0{/if}"{/if}
+	{if $position_identifier}id="tr_{$tr.id_attribute_group}_{$tr.$identifier}_{if isset($tr.position['position'])}{$tr.position['position']}{else}0{/if}"{/if}
 	{if $index is odd}class="alt_row"{/if}
 	{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
 	>
@@ -91,11 +91,15 @@
 				{$tr.$key}
 			{* If type is 'editable', an input is created *}
 			{elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)}
-				<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|htmlentities}" class="{$key}" />
+				<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|escape:'htmlall':'UTF-8'}" class="{$key}" />
 			{elseif isset($params.callback)}
 				{$tr.$key}
 			{elseif isset($tr.$key) && $key == 'color'}
-				<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
+				{if isset($tr.$key['texture']) && $tr.$key['texture']|count_characters > 1}
+					<img src="{$tr.$key.texture}" alt="" />
+				{else}
+					<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
+				{/if}
 			{elseif isset($tr.$key)}
 				{$tr.$key|escape:'htmlall':'UTF-8'}
 			{else}

admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 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
@@ -26,9 +26,9 @@
 
 {extends file="helpers/form/form.tpl"}
 
-{block name="end_field_block"}
-		</div>
-		{if $input.name == 'public_name'}
-			{hook h="displayAttributeGroupForm" id_attribute_group=$form_id}
-		{/if}
+{block name="field"}
+	{$smarty.block.parent}
+	{if $input.name == 'public_name'}
+		{hook h="displayAttributeGroupForm" id_attribute_group=$form_id}
+	{/if}
 {/block}

admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_content.tpl

@@ -1,116 +0,0 @@
-{*
-* 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 <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9608 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-<tbody>
-{foreach $list AS $index => $tr}
-	<tr
-	{if $is_dnd_identifier}id="tr_{$tr.$identifier}_{$tr.position['position']}"{/if}
-	{if $index is odd}class="alt_row"{/if}
-	{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
-	>
-		<td class="center">
-			{if $bulk_actions}
-				{assign var=bulkActionPossible value=true}
-				{foreach $list_skip_actions as $key => $value}
-					{if in_array($tr.$identifier, $value) == true}
-						{assign var=bulkActionPossible value=false}
-					{/if}
-				{/foreach}
-				{if $bulkActionPossible == true}
-					<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
-				{/if}
-			{/if}
-		</td>
-		{foreach $fields_display AS $key => $params}
-			<td
-				{if isset($params.position)}
-					id="td_{if $id_category}{$id_category}{else}0{/if}_{$tr.$identifier}"
-				{/if}
-				class="{if !$no_link}pointer{/if}
-					   {if isset($params.position) && $order_by == 'position'} dragHandle{/if}
-					   {if isset($params.align)} {$params.align}{/if}"
-
-			{if (!isset($params.position) && !$no_link)}
-				onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">{if isset($params.prefix)}{$params.prefix}{/if}
-			{else}
-				>
-			{/if}
-			{if isset($params.active)}
-			    {$tr.$key}
-			{elseif isset($params.activeVisu)}
-				<img src="../img/admin/{if $tr.$key}enabled.gif{else}disabled.gif{/if}"
-				alt="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" title="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" />
-			{elseif isset($params.position)}
-				{if $order_by == 'position' && $order_way != 'DESC'}
-					<a href="{$tr.$key.position_url_down}" {if !($tr.$key.position != $positions[count($positions) - 1])}style="display: none;"{/if}>
-						<img src="../img/admin/{if $order_way == 'ASC'}down{else}up{/if}.gif" alt="{l s='Down'}" title="{l s='Down'}" />
-					</a>
-
-					<a href="{$tr.$key.position_url_up}" {if !($tr.$key.position != $positions.0)}style="display: none;"{/if}>
-						<img src="../img/admin/{if $order_way == 'ASC'}up{else}down{/if}.gif" alt="{l s='Up'}" title="{l s='Up'}" />
-					</a>
-				{else}
-					{$tr.$key.position + 1}
-				{/if}
-			{elseif isset($params.image)}
-				{$tr.$key}
-			{elseif (isset($params.icon))}
-				<img src="../img/admin/{$tr[$key]}" alt="{$tr[$key]}" title="{$tr[$key]}" />
-            {elseif isset($params.price)}
-				{$tr.$key}
-			{elseif isset($params.float)}
-				{$tr.$key}
-			{elseif isset($params.type) && $params.type == 'date'}
-				{$tr.$key}
-			{elseif isset($params.type) && $params.type == 'datetime'}
-				{$tr.$key}
-			{elseif isset($params.callback)}
-				{$tr.$key}
-			{elseif isset($tr.$key) && $key == 'color'}
-				<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
-			{elseif isset($tr.$key)}
-				{$tr.$key|escape:'htmlall':'UTF-8'}
-			{else}
-				--
-			{/if}
-			{if isset($params.suffix)}{$params.suffix}{/if}
-			</td>
-		{/foreach}
-
-	{if $shop_link_type}
-		<td class="center" {if $name != $tr.shop_name}title="{$tr.shop_name}"{/if}>{if isset($tr.shop_short_name)}{$tr.shop_short_name}{else}{$tr.shop_name}{/if}</td>
-	{/if}
-	{if $has_actions}
-		<td class="center" style="white-space: nowrap;">
-			{foreach $actions AS $action}
-				{if isset($tr.$action)}
-	            	{$tr.$action}
-	            {/if}
-			{/foreach}
-		</td>
-	{/if}
-	</tr>
-{/foreach}
-</tbody>

admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,11 +18,17 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9197 $
+*  @copyright  2007-2012 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
 *}
-<a class="pointer default" onclick="javascript:defaultProductAttribute('{$id}', '{getAdminToken tab='AdminProducts'}', $(this).parent('td').parent('tr'));" title="{$action}" >
-	<img src="../img/admin/asterisk.gif" alt="{$action}" />
-</a>
+
+{extends file="helpers/list/list_header.tpl"}
+{block name=leadin}
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$(location.hash).click();
+		});
+	</script>
+{/block}

admin-dev/themes/default/template/controllers/backup/download/view.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 8971 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -32,37 +32,37 @@
 		<legend><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /> {l s='Download'}</legend>
 		<p style="font-size: 13px;">
 			<a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a>
-			<b><a href="{$backup_url}">{l s='Download the Backup file'} ({$backup_weight}{l s='Mb'})</a></b><br /><br />
-		{l s='Tip: You can also download this file by FTP, Backup files are located in "admin/backups" directory.'}</p>
+			<b><a href="{$backup_url}">{l s='Download the Backup file'} ({$backup_weight}{l s='MB'})</a></b><br /><br />
+		{l s='Tip: You can also download this file over your FTP. Backup files are located in "admin/backups" directory.'}</p>
 	</fieldset><br /><br />
 
 	<div class="error width1" style="float: left; margin-right: 10px;">
 		<p>{l s='Disclaimer before creating a new Backup'}</p>
 		<ol style="font-size: 11px; font-weight: normal; line-height: 20px; padding-left: 10px;">
-			<li>{l s='PrestaShop is not responsible for your database, Backups, restore and data.'}</li>
-			<li>{l s='PrestaShop is an Open-source software, you are using it at your own risk under the licence agreement.'}</li>
+			<li>{l s='PrestaShop is not responsible for your database, Backups, data and recovery.'}</li>
+			<li>{l s='PrestaShop is Open-source software, you are using it at your own risk under the license agreement.'}</li>
 			<li>{l s='You should Backup your data on a regular basis (both files and database).'}</li>
 			<li>{l s='This function only backs up your database, not your files.'}</li>
-			<li>{l s='By default, your existing database tables will be deleted during Backup restore (see options).'}</li>
-			<li>{l s='Always verify the quality and integrity of your Backups files.'}</li>
-			<li>{l s='Always verify that your Backups files are complete, up-to-date and valid. Even if you had a success message during the Backup process.'}</li>
+			<li>{l s='By default, your existing database tables will be dropped during Backup recovery (see "Backup options" below).'}</li>
+			<li>{l s='Always verify the quality and integrity of your Backup files.'}</li>
+			<li>{l s='Always verify that your Backup files are complete, up-to-date and valid, even if you had a success message during the Backup process.'}</li>
 			<li>{l s='Always check your data.'}</li>
 			<li>{l s='Never restore a Backup on a live site.'}</li>
 		</ol>
 	</div>
 
 	<div class="warn width2" style="float: left;">
-		<p>{l s='How-to restore a database Backup in 10 easy steps'}</p>
+		<p>{l s='How to restore a database Backup in 10 easy steps:'}</p>
 		<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
-			<li>{l s='Turn off the "Enable Shop" option in the "Preferences" tab.'}</li>
+			<li>{l s='Set "Enable Shop" to "No" in the Preferences > Maintenance tab.'}</li>
 			<li>{l s='Download the Backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
-			<li>{l s='Check the Backup integrity: look for errors, incomplete file. Verify all your data.'}</li>
-			<li>{l s='Ask your hosting provider for a "phpMyAdmin" access to your database'}</li>
+			<li>{l s='Check the Backup integrity: look for errors, incomplete file, etc. Be sure to verify all your data.'}</li>
+			<li>{l s='Ask your hosting provider for "phpMyAdmin" access to your database'}</li>
 			<li>{l s='Connect to "phpMyAdmin" and select your current database'}</li>
 			<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
-			<li>{l s='At the top of the screen select the tab "Import"'}</li>
+			<li>{l s='At the top of the screen select the "Import" tab'}</li>
 			<li>{l s='Click on the "Browse..." button and select the Backup file from your hard drive'}</li>
-			<li>{l s='Check the max. allowed filesize (ie. Max: 16Mb)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
+			<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
 			<li>{l s='Click on the "Go" button and wait during the import, the process can take several minutes'}</li>
 		</ol>
 	</div>

admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl

@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @version  Release: $Revision: 9639 $
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -31,36 +31,36 @@
 	<div class="error width1" style="float: left; margin-right: 10px;">
 		<p>{l s='Disclaimer before creating a new Backup'}</p>
 		<ol style="font-size: 11px; font-weight: normal; line-height: 20px; padding-left: 10px;">
-			<li>{l s='PrestaShop is not responsible for your database, Backups, restore and data.'}</li>
-			<li>{l s='PrestaShop is an Open-source software, you are using it at your own risk under the licence agreement.'}</li>
+			<li>{l s='PrestaShop is not responsible for your database, Backups, data and recovery.'}</li>
+			<li>{l s='PrestaShop is Open-source software, you are using it at your own risk under the license agreement.'}</li>
 			<li>{l s='You should Backup your data on a regular basis (both files and database).'}</li>
 			<li>{l s='This function only backs up your database, not your files.'}</li>
-			<li>{l s='By default, your existing database tables will be deleted during Backup restore (see options).'}</li>
-			<li>{l s='Always verify the quality and integrity of your Backups files.'}</li>
-			<li>{l s='Always verify that your Backups files are complete, up-to-date and valid. Even if you had a success message during the Backup process.'}</li>
+			<li>{l s='By default, your existing database tables will be dropped during Backup recovery (see "Backup options" below).'}</li>
+			<li>{l s='Always verify the quality and integrity of your Backup files.'}</li>
+			<li>{l s='Always verify that your Backup files are complete, up-to-date and valid, even if you had a success message during the Backup process.'}</li>
 			<li>{l s='Always check your data.'}</li>
 			<li>{l s='Never restore a Backup on a live site.'}</li>
 		</ol>
 		<br />
 
 		<form action="{$currentIndex}&add{$table}&token={$token}" method="post" style="text-align:center;">
-			<input type="submit" class="button" value="{l s='I read the disclaimer - Create a new Backup'}" style="padding:10px;font-weight:bold;border:1px solid;cursor:pointer;" />
+			<input type="submit" class="button" value="{l s='I have read the disclaimer - Create a new Backup'}" style="padding:10px;font-weight:bold;border:1px solid;cursor:pointer;" />
 		</form>
 
 	</div>
 
 	<div class="warn width2" style="float: left;">
-		<p>{l s='How-to restore a database Backup in 10 easy steps'}</p>
+		<p>{l s='How to restore a database Backup in 10 easy steps:'}</p>
 		<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
-			<li>{l s='Turn off the "Enable Shop" option in the "Preferences" tab.'}</li>
+			<li>{l s='Set "Enable Shop" to "No" in the Preferences > Maintenance tab.'}</li>
 			<li>{l s='Download the Backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
-			<li>{l s='Check the Backup integrity: look for errors, incomplete file. Verify all your data.'}</li>
-			<li>{l s='Ask your hosting provider for a "phpMyAdmin" access to your database'}</li>
+			<li>{l s='Check the Backup integrity: look for errors, incomplete file, etc. Be sure to verify all your data.'}</li>
+			<li>{l s='Ask your hosting provider for "phpMyAdmin" access to your database'}</li>
 			<li>{l s='Connect to "phpMyAdmin" and select your current database'}</li>
 			<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
-			<li>{l s='At the top of the screen select the tab "Import"'}</li>
+			<li>{l s='At the top of the screen select the "Import" tab'}</li>
 			<li>{l s='Click on the "Browse..." button and select the Backup file from your hard drive'}</li>
-			<li>{l s='Check the max. allowed filesize (ie. Max: 16Mb)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
+			<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
 			<li>{l s='Click on the "Go" button and wait during the import, the process can take several minutes'}</li>
 		</ol>
 	</div>