// CHANGELOG

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14252 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,17 +19,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: 7104 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+/**
+ * This file will be removed in 1.6
+ * You have to use index.php?controller=page_name instead of this page
+ *
+ * @deprecated 1.5.0
+ */
+
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-// init front controller in order to use Tools::redirect
-$controller = new FrontController();
-$controller->init();
-
-Tools::redirect('index.php?controller=address'.(($_SERVER['QUERY_STRING']) ? '&'.$_SERVER['QUERY_STRING'] : ''));
+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,17 +19,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: 7104 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+/**
+ * This file will be removed in 1.6
+ * You have to use index.php?controller=page_name instead of this page
+ *
+ * @deprecated 1.5.0
+ */
+
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-// init front controller in order to use Tools::redirect
-$controller = new FrontController();
-$controller->init();
-
-Tools::redirect('index.php?controller=addresses'.(($_SERVER['QUERY_STRING']) ? '&'.$_SERVER['QUERY_STRING'] : ''));
+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
@@ -38,6 +38,5 @@ if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
 	$_REQUEST['controller'] = strtolower($_REQUEST['tab']);
 // Retrocompatibility with 1.4
 $_REQUEST['ajaxMode'] = $_POST['ajaxMode'] = $_GET['ajaxMode'] = $_REQUEST['ajax'] = $_POST['ajax'] = $_GET['ajax'] = 1;
-	
-Dispatcher::getInstance()->setControllerDirectories(array(_PS_ADMIN_DIR_.'/tabs/', _PS_ADMIN_CONTROLLER_DIR_));
+
 Dispatcher::getInstance()->dispatch();

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
@@ -71,124 +71,14 @@ function displayJavascriptAlert($s)
 	echo '<script type="text/javascript">alert(\''.addslashes($s).'\');</script>';
 }
 
-if (Tools::isSubmit('ajaxProductManufacturers'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	$manufacturers = Manufacturer::getManufacturers();
-	if ($manufacturers)
-	{
-		$jsonArray = array();
-		foreach ($manufacturers AS $manufacturer)
-			$jsonArray[] = '{"optionValue": "'.$manufacturer['id_manufacturer'].'", "optionDisplay": "'.htmlspecialchars(trim($manufacturer['name'])).'"}';
-		die('['.implode(',', $jsonArray).']');
-	}
-}
-
-
 if (Tools::isSubmit('ajaxReferrers'))
 {
 	require(_PS_CONTROLLER_DIR_.'admin/AdminReferrersController.php');
 }
 
-if (Tools::isSubmit('ajaxProductSuppliers'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	$suppliers = Supplier::getSuppliers();
-	if ($suppliers)
-	{
-		$jsonArray = array();
-		foreach ($suppliers AS $supplier)
-			$jsonArray[] = '{"optionValue": "'.$supplier['id_supplier'].'", "optionDisplay": "'.htmlspecialchars(trim($supplier['name'])).'"}';
-		die('['.implode(',', $jsonArray).']');
-	}
-}
-
-if (Tools::isSubmit('ajaxProductAccessories'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	$jsonArray = array();
-
-	$products = Db::getInstance()->executeS('
-	SELECT p.`id_product`, pl.`name`
-	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').'
-	AND p.`id_product` != '.(int)(Tools::getValue('id_product')).'
-	AND p.`id_product` NOT IN (
-		SELECT a.`id_product_2`
-		FROM `'._DB_PREFIX_.'accessory` a
-		WHERE a.`id_product_1` = '.(int)(Tools::getValue('id_product')).')
-	ORDER BY pl.`name`');
-
-	foreach ($products AS $accessory)
-		$jsonArray[] = '{"value: "'.(int)($accessory['id_product']).'-'.addslashes($accessory['name']).'", "text":"'.(int)($accessory['id_product']).' - '.addslashes($accessory['name']).'"}';
-	die('['.implode(',', $jsonArray).']');
-}
-
-if (Tools::isSubmit('ajaxDiscountCustomers'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminDiscounts';
-	$jsonArray = array();
-	$filter = Tools::getValue('filter');
-
-	if (Validate::isBool_Id($filter))
-		$filterArray = explode('_', $filter);
-
-	$customers = Db::getInstance()->executeS('
-	SELECT `id_customer`, `email`, CONCAT(`lastname`, \' \', `firstname`) as name
-	FROM `'._DB_PREFIX_.'customer`
-	WHERE `deleted` = 0 AND is_guest = 0
-	AND '.(Validate::isUnsignedInt($filter) ? '`id_customer` = '.(int)($filter) : '(`email` LIKE "%'.pSQL($filter).'%"
-	'.((Validate::isBool_Id($filter) AND $filterArray[0] == 0) ? 'OR `id_customer` = '.(int)($filterArray[1]) : '').'
-	'.(Validate::isUnsignedInt($filter) ? '`id_customer` = '.(int)($filter) : '').'
-	OR CONCAT(`firstname`, \' \', `lastname`) LIKE "%'.pSQL($filter).'%"
-	OR CONCAT(`lastname`, \' \', `firstname`) LIKE "%'.pSQL($filter).'%")').'
-	ORDER BY CONCAT(`lastname`, \' \', `firstname`) ASC
-	LIMIT 50');
-
-	$groups = Db::getInstance()->executeS('
-	SELECT g.`id_group`, gl.`name`
-	FROM `'._DB_PREFIX_.'group` g
-	LEFT JOIN `'._DB_PREFIX_.'group_lang` AS gl ON (g.`id_group` = gl.`id_group` AND gl.`id_lang` = '.(int)($context->language->id).')
-	WHERE '.(Validate::isUnsignedInt($filter) ? 'g.`id_group` = '.(int)($filter) : 'gl.`name` LIKE "%'.pSQL($filter).'%"
-	'.((Validate::isBool_Id($filter) AND $filterArray[0] == 1) ? 'OR g.`id_group` = '.(int)($filterArray[1]) : '')).'
-	ORDER BY gl.`name` ASC
-	LIMIT 50');
-
-	$json = '{"customers" : ';
-	foreach ($customers AS $customer)
-		$jsonArray[] = '{"value":"0_'.(int)($customer['id_customer']).'", "text":"'.addslashes($customer['name']).' ('.addslashes($customer['email']).')"}';
-	$json .= '['.implode(',', $jsonArray).'],
-		"groups" : ';
-	$jsonArray = array();
-	foreach ($groups AS $group)
-		$jsonArray[] = '{"value":"1_'.(int)($group['id_group']).'", "text":"'.addslashes($group['name']).'"}';
-	$json .= '['.implode(',', $jsonArray).']}';
-	die($json);
-}
-
 if (Tools::getValue('page') == 'prestastore' AND @fsockopen('addons.prestashop.com', 80, $errno, $errst, 3))
 	readfile('http://addons.prestashop.com/adminmodules.php?lang='.$context->language->iso_code);
 
-if ($step = (int)(Tools::getValue('ajaxProductTab')))
-{
-	require_once(dirname(__FILE__).'/tabs/AdminCatalog.php');
-	$catalog = new AdminCatalog();
-	$admin = new AdminProducts();
-
-	$languages = Language::getLanguages(false);
-	$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
-	$product = new Product((int)(Tools::getValue('id_product')));
-	if (!Validate::isLoadedObject($product))
-		die (Tools::displayError('Product cannot be loaded'));
-
-	$switchArray = array(3 => 'displayFormPrices', 4 => 'displayFormAttributes', 5 => 'displayFormFeatures', 6 => 'displayFormCustomization', 7 => 'displayFormAttachments');
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	if (key_exists($step, $switchArray))
-		$admin->{$switchArray[$step]}($product, $languages, $defaultLanguage);
-}
-
 if (Tools::isSubmit('getAvailableFields') AND Tools::isSubmit('entity'))
 {
 	$jsonArray = array();
@@ -231,16 +121,17 @@ if (Tools::isSubmit('ajaxCategoriesPositions'))
 			$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;
+				$position = $key + 1;
 				break;
 			}
 		}
+
 	$category = new Category($id_category_to_move);
 	if (Validate::isLoadedObject($category))
 	{
 		if (isset($position) && $category->updatePosition($way, $position))
 		{
-			Hook::exec('categoryUpdate');
+			Hook::exec('actionCategoryUpdate');
 			die(true);
 		}
 		else
@@ -374,7 +265,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')));
 
@@ -543,18 +434,6 @@ if (Tools::isSubmit('toggleScreencast'))
 	}
 }
 
-if (Tools::isSubmit('helpAccess'))
-{
-	$item = Tools::getValue('item');
-	$isoUser = Tools::getValue('isoUser');
-	$country = Tools::getValue('country');
-	$version = Tools::getValue('version');
-
-	if (isset($item) AND isset($isoUser) AND isset($country))
-		die(HelpAccess::displayHelp($item, $isoUser,  $country, $version));
-	die('{nohelp}');
-}
-
 if (Tools::isSubmit('getHookableList'))
 {
 	/* PrestaShop demo mode */
@@ -625,7 +504,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();
@@ -654,8 +533,8 @@ if (Tools::isSubmit('saveHook'))
 			$i++;
 		}
 		$value = rtrim($value, ',');
-		$res &= Db::getInstance()->execute('INSERT INTO  `'._DB_PREFIX_.'hook_module` 
-			(id_module, id_shop, id_hook, position) 
+		$res &= Db::getInstance()->execute('INSERT INTO  `'._DB_PREFIX_.'hook_module`
+			(id_module, id_shop, id_hook, position)
 			VALUES '.$value);
 
 	}
@@ -739,9 +618,9 @@ if (Tools::isSubmit('getAdminHomeElement'))
 	die(Tools::jsonEncode($result));
 }
 
-if (Tools::isSubmit('getChildrenCategories') && Tools::getValue('id_category_parent'))
+if (Tools::isSubmit('getChildrenCategories') && Tools::isSubmit('id_category_parent'))
 {
-	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id);
+	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id, null, Tools::getValue('use_shop_context'));
 	die(Tools::jsonEncode($children_categories));
 }
 
@@ -759,36 +638,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)
@@ -839,7 +737,7 @@ if (Tools::isSubmit('syncImapMail'))
 	}
 	imap_expunge($mbox);
 	imap_close($mbox);
-	die('{"hasError" : false, "errors" : '.$str_errors.$str_errors_delete.'"]}');
+	die('{"hasError" : false, "errors" : ["'.$str_errors.$str_error_delete.'"]}');
 }
 
 /* Modify attribute position */
@@ -880,7 +778,7 @@ if (Tools::isSubmit('ajaxGroupsAttributesPositions'))
 
 	$new_positions = array();
 	foreach($positions as $k => $v)
-		if (count(explode('_', $v)) == 3)
+		if (count(explode('_', $v)) == 4)
 			$new_positions[] = $v;
 
 	foreach ($new_positions as $position => $value)
@@ -888,11 +786,11 @@ if (Tools::isSubmit('ajaxGroupsAttributesPositions'))
 		// pos[1] = id_attribute_group, pos[2] = old position
 		$pos = explode('_', $value);
 
-		if (isset($pos[1]) && (int)$pos[1] === $id_attribute_group)
+		if (isset($pos[2]) && (int)$pos[2] === $id_attribute_group)
 		{
-			if ($group_attribute = new AttributeGroup((int)$pos[1]))
+			if ($group_attribute = new AttributeGroup((int)$pos[2]))
 				if (isset($position) && $group_attribute->updatePosition($way, $position))
-					echo "ok position ".(int)$position." for group attribute ".(int)$pos[1]."\r\n";
+					echo "ok position ".(int)$position." for group attribute ".(int)$pos[2]."\r\n";
 				else
 					echo '{"hasError" : true, "errors" : "Can not update group attribute '. (int)$id_attribute_group . ' to position '.(int)$position.' "}';
 			else
@@ -969,7 +867,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
@@ -1014,3 +912,37 @@ if (Tools::isSubmit('getZones'))
 	$array = array('hasError' => false, 'errors' => '', 'data' => $html);
 	die(Tools::jsonEncode($html));
 }
+
+/* Modify carrier position */
+if (Tools::isSubmit('ajaxTabsPositions'))
+{
+	$way = (int)(Tools::getValue('way'));
+	$id_tab = (int)(Tools::getValue('id_tab'));
+	$positions = Tools::getValue('tab');
+
+	// when changing positions in a tab sub-list, the first array value is empty and needs to be removed
+	if (!$positions[0])
+	{
+		unset($positions[0]);
+		// reset indexation from 0
+		$positions = array_merge($positions);
+	}
+
+	foreach ($positions as $position => $value)
+	{
+		$pos = explode('_', $value);
+
+		if (isset($pos[2]) && (int)$pos[2] === $id_tab)
+		{
+			if ($tab = new Tab((int)$pos[2]))
+				if (isset($position) && $tab->updatePosition($way, $position))
+					echo "ok position ".(int)$position." for tab ".(int)$pos[1]."\r\n";
+				else
+					echo '{"hasError" : true, "errors" : "Can not update tab '. (int)$id_tab . ' to position '.(int)$position.' "}';
+			else
+				echo '{"hasError" : true, "errors" : "This tab ('.(int)$id_tab.') can t be loaded"}';
+
+			break;
+		}
+	}
+}

admin-dev/ajax_category_list.php

@@ -1,83 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 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_once('../config/config.inc.php');
-include_once('tabs/AdminCatalog.php');
-include_once('tabs/AdminProducts.php');
-include_once('init.php');
-
-if (Tools::getValue('token') != Tools::getAdminTokenLite('AdminCatalog'))
-	die(1);
-
-$catalog = new AdminCatalog();
-$adminProducts = new AdminProducts();
-
-echo '			<tr>
-					<td class="col-left"><label for="id_category_default" class="t">'.$adminProducts->getL('Default category:').'</label></td>
-					<td>
-						<select id="id_category_default" name="id_category_default" onchange="checkDefaultCategory(this.value);">';
-	$categories = Category::getCategories(Context::getContext()->language->id, false);
-	Category::recurseCategory($categories, $categories[0][1], 1, (int)(Tools::getValue('id_category_default')));
-	echo '			</select>
-					</td>
-				</tr>
-				<tr>
-					<td class="col-left">'.$adminProducts->getL('Catalog:').'</td>
-					<td>
-						<div style="overflow: auto; min-height: 300px; padding-top: 0.6em;" id="categoryList">
-							<script type="text/javascript">
-							$(document).ready(function() {
-								$(\'div#categoryList input.categoryBox\').click(function (){
-									if ($(this).is(\':not(:checked)\') && $(\'div#categoryList input.id_category_default\').val() == $(this).val())
-										alert(\''.utf8_encode(html_entity_decode($adminProducts->getL('Consider changing the default category.'))).'\');
-								});
-							});
-							</script>
-							<table cellspacing="0" cellpadding="0" class="table">
-								<tr>
-									<th><input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, \'categoryBox[]\', this.checked)" /></th>
-									<th>'.$adminProducts->getL('ID').'</th>
-									<th style="width: 600px">'.$adminProducts->getL('Name').'</th>
-								</tr>';
-		$done = array();
-		$index = array();
-
-		$categoryBox = Tools::getValue('categoryBox');
-		if ($categoryBox != '')
-		{
-			$categoryBox = @unserialize($categoryBox);
-			foreach ($categoryBox AS $k => $row)
-				$index[] = $row;
-		}
-		elseif ((int)Tools::getValue('id_product'))
-			$index = Product::getProductCategories((int)Tools::getValue('id_product'));
-		$adminProducts->recurseCategoryForInclude((int)(Tools::getValue('id_product')), $index, $categories, $categories[0][1], 1, (int)(Tools::getValue('id_category_default')));
-		echo '				</table>
-							<p style="padding:0px; margin:0px 0px 10px 0px;">'.$adminProducts->getL('Mark all checkbox(es) of categories in which product is to appear').'<sup> *</sup></p>
-						</div>
-				</tr>';

admin-dev/ajax_lang_packs.php

@@ -1,50 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop 
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 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');
-/* Getting cookie or logout */
-require_once(dirname(__FILE__).'/init.php');
-	
-if(!isset($_GET['iso_lang']) OR empty($_GET['iso_lang']))
-	die('fail:0');
-if(!isset($_GET['ps_version']) OR empty($_GET['ps_version']))
-	die('fail:0');
-if(@fsockopen('api.prestashop.com', 80))
-{
-	// Get all iso code available
-	$lang_packs = Tools::file_get_contents('http://api.prestashop.com/download/lang_packs/get_language_pack.php?version='.(string)$_GET['ps_version'].'&iso_lang='.(string)$_GET['iso_lang']);
-	
-	if ($lang_packs !== '' && Tools::jsonDecode($lang_packs) !== NULL)
-	{
-		echo $lang_packs;
-	}
-	else
-		die('fail:2');
-}
-else
-	die('offline');

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
@@ -30,18 +30,20 @@ include_once(dirname(__FILE__).'/../config/config.inc.php');
 /* Getting cookie or logout */
 require_once(dirname(__FILE__).'/init.php');
 
-$smtpChecked = (trim($_GET['mailMethod']) ==  'smtp');
-$smtpServer = $_GET['smtpSrv'];
-$content = $_GET['testMsg'];
-$subject = $_GET['testSubject'];
+$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 =  $_GET['testEmail'];
+$to =  $_POST['testEmail'];
 $from = Configuration::get('PS_SHOP_EMAIL');
-$smtpLogin = $_GET['smtpLogin'];
-$smtpPassword = $_GET['smtpPassword'];
-$smtpPort = $_GET['smtpPort'];
-$smtpEncryption = $_GET['smtpEnc'];
+$smtpLogin = $_POST['smtpLogin'];
+$smtpPassword = (!empty($_POST['smtpPassword'])) ? urldecode($_POST['smtpPassword']) : Configuration::get('PS_MAIL_PASSWD');
+$smtpPort = $_POST['smtpPort'];
+$smtpEncryption = $_POST['smtpEnc'];
 
 $result = Mail::sendMailTest(Tools::htmlentitiesUTF8($smtpChecked), Tools::htmlentitiesUTF8($smtpServer), Tools::htmlentitiesUTF8($content), Tools::htmlentitiesUTF8($subject), Tools::htmlentitiesUTF8($type), Tools::htmlentitiesUTF8($to), Tools::htmlentitiesUTF8($from), Tools::htmlentitiesUTF8($smtpLogin), Tools::htmlentitiesUTF8($smtpPassword), Tools::htmlentitiesUTF8($smtpPort), Tools::htmlentitiesUTF8($smtpEncryption));
 die($result === true ? 'ok' : $result);
 
+

admin-dev/ajaxfilemanager/inc/config.tinymce.php

@@ -8,7 +8,6 @@
 	 */
 	
 
-error_reporting(E_ALL);	
 //error_reporting(E_ALL ^ E_NOTICE);	
 	
 	
@@ -128,4 +127,4 @@ error_reporting(E_ALL);
 	//LANGAUGAE DECLARATIONNS
 	define('CONFIG_LANG_INDEX', 'language'); //the index in the session
 	define('CONFIG_LANG_DEFAULT', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['language']) && file_exists(DIR_LANG . secureFileName($_GET['language'] . '.php'))?secureFileName($_GET['language']):'en')); //change it to be your language file base name, such en
-?>
+?>

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/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

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
@@ -27,7 +27,7 @@
 
 echo '			</div>
 			</div>
-			'.Hook::exec('backOfficeFooter').'
+			'.Hook::exec('displayBackOfficeFooter').'
 			<div id="footer">
 				<div style="float:left;margin-left:10px;padding-top:6px">
 					<a href="http://www.prestashop.com/" target="_blank" style="font-weight:700;color:#666666">PrestaShop&trade; '._PS_VERSION_.'</a><br />

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
@@ -30,7 +30,7 @@ require_once(dirname(__FILE__).'/../images.inc.php');
 function bindDatepicker($id, $time)
 {
 	if ($time)
-	echo '
+		echo '
 		var dateObj = new Date();
 		var hours = dateObj.getHours();
 		var mins = dateObj.getMinutes();
@@ -42,7 +42,7 @@ function bindDatepicker($id, $time)
 
 	echo '
 	$(function() {
-		$("#'.$id.'").datepicker({
+		$("#'.Tools::htmlentitiesUTF8($id).'").datepicker({
 			prevText:"",
 			nextText:"",
 			dateFormat:"yy-mm-dd"'.($time ? '+time' : '').'});
@@ -62,7 +62,7 @@ function includeDatepicker($id, $time = false)
 	echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/jquery-ui-1.8.10.custom.min.js"></script>';
 	$iso = Db::getInstance()->getValue('SELECT iso_code FROM '._DB_PREFIX_.'lang WHERE `id_lang` = '.(int)Context::getContext()->language->id);
 	if ($iso != 'en')
-		echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/ui/i18n/jquery.ui.datepicker-'.$iso.'.js"></script>';
+		echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/ui/i18n/jquery.ui.datepicker-'.Tools::htmlentitiesUTF8($iso).'.js"></script>';
 	echo '<script type="text/javascript">';
 		if (is_array($id))
 			foreach ($id as $id2)
@@ -93,7 +93,6 @@ function	rewriteSettingsFile($baseUrls = NULL, $theme = NULL, $arrayDB = NULL)
 	$defines['_DB_USER_'] = (($arrayDB AND isset($arrayDB['_DB_USER_'])) ? $arrayDB['_DB_USER_'] : _DB_USER_);
 	$defines['_DB_PREFIX_'] = (($arrayDB AND isset($arrayDB['_DB_PREFIX_'])) ? $arrayDB['_DB_PREFIX_'] : _DB_PREFIX_);
 	$defines['_DB_PASSWD_'] = (($arrayDB AND isset($arrayDB['_DB_PASSWD_'])) ? $arrayDB['_DB_PASSWD_'] : _DB_PASSWD_);
-	$defines['_DB_TYPE_'] = (($arrayDB AND isset($arrayDB['_DB_TYPE_'])) ? $arrayDB['_DB_TYPE_'] : _DB_TYPE_);
 	$defines['_COOKIE_KEY_'] = addslashes(_COOKIE_KEY_);
 	$defines['_COOKIE_IV_'] = addslashes(_COOKIE_IV_);
 	if (defined('_RIJNDAEL_KEY_'))
@@ -148,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);
@@ -162,9 +162,10 @@ 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' : 'addcategory').'&token='.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(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('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)$context->employee->id).'" title="'.htmlentities($category['name'], ENT_NOQUOTES, 'UTF-8').'">' : '').
+				($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']).
 				($n < $nCategories ? '</a>' : '').
 				(($n++ != $nCategories OR !empty($path)) ? ' > ' : '');
@@ -389,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
  *
@@ -450,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)
 		{
@@ -503,12 +462,12 @@ 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)
+				if (Shop::getContext() == 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)
+				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

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
@@ -40,7 +40,8 @@ echo '
 		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/datepicker/datepicker.css" />
 		<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.'/admin.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').';
@@ -53,8 +54,9 @@ echo '
 		<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('backOfficeHeader').'
+		'.Hook::exec('displayBackOfficeHeader').'
 		<!--[if IE]>
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin-ie.css" />
 		<![endif]-->
@@ -147,9 +149,9 @@ 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)
+				else if (Shop::getContext() == 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>');
 				else
 					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for the shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
@@ -279,11 +281,8 @@ 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('backOfficeTop');
+			echo Hook::exec('displayBackOfficeTop');
 			echo '<ul id="menu">';
 
 if (empty($tab))
@@ -311,10 +310,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 +337,11 @@ 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,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: 7451 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
@@ -38,7 +38,4 @@ if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
 	$_REQUEST['controller'] = strtolower($_REQUEST['tab']);
 
 // Prepare and trigger admin dispatcher
-Dispatcher::getInstance()->setDefaultController('AdminHome');
-Dispatcher::getInstance()->setControllerNotFound('AdminNotFound');
-Dispatcher::getInstance()->setControllerDirectories(array(_PS_ADMIN_DIR_.'/tabs/', _PS_ADMIN_CONTROLLER_DIR_));
 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
@@ -31,69 +31,110 @@ $timerStart = microtime(true);
 //	$_GET['tab'] = $_GET['controller'];
 //	$_POST['tab'] = $_POST['controller'];
 //	$_REQUEST['tab'] = $_REQUEST['controller'];
-
-$context = Context::getContext();
-if (isset($_GET['logout']))
-	$context->employee->logout();
-
-if (!isset($context->employee) || !$context->employee->isLoggedBack())
-	Tools::redirectAdmin('index.php?controller=AdminLogin&redirect='.$_SERVER['REQUEST_URI']);
-
-// Set current index
-$currentIndex = $_SERVER['SCRIPT_NAME'].(($controller = Tools::getValue('controller')) ? '?controller='.$controller: '');
-
-if ($back = Tools::getValue('back'))
-	$currentIndex .= '&back='.urlencode($back);
-AdminTab::$currentIndex = $currentIndex;
-
-$iso = $context->language->iso_code;
-include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
-include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
-include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
-
-/* Server Params */
-$protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
-$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));
-
-$path = dirname(__FILE__).'/themes/';
-if (empty($context->employee->bo_theme) OR !file_exists($path.$context->employee->bo_theme.'/admin.css'))
+try
 {
-	if (file_exists($path.'oldschool/admin.css'))
-		$context->employee->bo_theme = 'oldschool';
-	elseif (file_exists($path.'origins/admin.css'))
-		$context->employee->bo_theme = 'origins';
-	else
-		foreach (scandir($path) as $theme)
-			if ($theme[0] != '.' AND file_exists($path.$theme.'/admin.css'))
+	$context = Context::getContext();
+	if (isset($_GET['logout']))
+		$context->employee->logout();
+
+	if (!isset($context->employee) || !$context->employee->isLoggedBack())
+		Tools::redirectAdmin('index.php?controller=AdminLogin&redirect='.$_SERVER['REQUEST_URI']);
+
+	// Set current index
+	// @deprecated global will be removed in 1.6
+	global $currentIndex; // retrocompatibility;
+	$currentIndex = $_SERVER['SCRIPT_NAME'].(($controller = Tools::getValue('controller')) ? '?controller='.$controller: '');
+
+	if ($back = Tools::getValue('back'))
+		$currentIndex .= '&back='.urlencode($back);
+	AdminTab::$currentIndex = $currentIndex;
+
+	$iso = $context->language->iso_code;
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
+
+	/* Server Params */
+	$protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
+	$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));
+
+	$path = dirname(__FILE__).'/themes/';
+	// if the current employee theme is not valid (check layout.tpl presence), 
+	// reset to default theme
+	if (empty($context->employee->bo_theme) ||
+		!file_exists($path.$context->employee->bo_theme.'/template/layout.tpl'))
+	{
+		// default admin theme is "default".
+		$context->employee->bo_theme = '';
+		if (file_exists($path.'default/template/layout.tpl'))
+			$context->employee->bo_theme = 'default';
+		else
+		{
+			// if default theme doesn't exists, try to find one, otherwise throw exception
+			foreach (scandir($path) as $theme)
+				if ($theme[0] != '.' && file_exists($path.$theme.'/template/layout.tpl'))
+				{
+					$context->employee->bo_theme = $theme;
+					break;
+				}
+			// if no theme is found, admin can't work.
+			if (empty($context->employee->bo_theme))
+				throw new PrestaShopException('Unable to load theme for employee, and no valid theme found');
+		}
+		$context->employee->update();
+	}
+
+	// Change shop context ?
+	if (Shop::isFeatureActive() && Tools::getValue('setShopContext') !== false)
+	{
+		$context->cookie->shopContext = Tools::getValue('setShopContext');
+		$url = parse_url($_SERVER['REQUEST_URI']);
+		$query = (isset($url['query'])) ? $url['query'] : '';
+		parse_str($query, $parseQuery);
+		unset($parseQuery['setShopContext']);
+		Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery));
+	}
+
+	$context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
+
+	$shop_id = '';
+	Shop::setContext(Shop::CONTEXT_ALL);
+	if ($context->cookie->shopContext)
+	{
+		$split = explode('-', $context->cookie->shopContext);
+		if (count($split) == 2)
+		{
+			if ($split[0] == 'g')
+				Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
+			else
 			{
-				$employee->bo_theme = $theme;
-				break;
+				Shop::setContext(Shop::CONTEXT_SHOP, $split[1]);
+				$shop_id = $split[1];
 			}
-	$context->employee->update();
-}
+		}
+	}
+	else if ($context->employee->id_profile == _PS_ADMIN_PROFILE_)
+		$shop_id = '';
+	else if ($context->shop->getTotalShopsWhoExists() != Employee::getTotalEmployeeShopById((int)$context->employee->id))
+	{
+		$shops = Employee::getEmployeeShopById((int)$context->employee->id);
+		if (count($shops))
+			$shop_id = (int)$shops[0];
+	}
+	else
+		Employee::getEmployeeShopAccess((int)$context->employee->id);
 
-// Change shop context ?
-if (Shop::isFeatureActive() && Tools::getValue('setShopContext') !== false)
+	// 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);
+}
+catch(PrestaShopException $e)
 {
-	$context->cookie->shopContext = Tools::getValue('setShopContext');
-	$url = parse_url($_SERVER['REQUEST_URI']);
-	$query = (isset($url['query'])) ? $url['query'] : '';
-	parse_str($query, $parseQuery);
-	unset($parseQuery['setShopContext']);
-	Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery));
+	$e->displayMessage();
 }
-
-$context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
-
-$shopID = '';
-if ($context->cookie->shopContext)
-{
-	$split = explode('-', $context->cookie->shopContext);
-	if (count($split) == 2 && $split[0] == 's')
-		$shopID = (int)$split[1];
-}
-$context->shop = new Shop($shopID);

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,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
@@ -32,7 +32,7 @@ include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 if (!Context::getContext()->employee->id)
 	Tools::redirectAdmin('index.php?controller=AdminLogin');
 
-$functionArray = array(
+$function_array = array(
 	'pdf' => 'generateInvoicePDF',
 	'id_order_slip' => 'generateOrderSlipPDF',
 	'id_delivery' => 'generateDeliverySlipPDF',
@@ -44,7 +44,7 @@ $functionArray = array(
 	'id_supply_order' => 'generateSupplyOrderFormPDF'
 );
 
-foreach ($functionArray as $var => $function)
+foreach ($function_array as $var => $function)
 	if (isset($_GET[$var]))
 	{
 		call_user_func($function);
@@ -53,16 +53,16 @@ foreach ($functionArray as $var => $function)
 
 function generateSupplyOrderFormPDF()
 {
-	if (!isset($_GET['id_supply_order']))
+	if (!Tools::isSubmit('id_supply_order'))
 		die (Tools::displayError('Missing supply order ID'));
 
-	$id_supply_order = (int)$_GET['id_supply_order'];
+	$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);
+	generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM);
 }
 
 function generateInvoicePDF()
@@ -78,7 +78,7 @@ function generateInvoicePDF()
 
 function generateInvoicePDFByIdOrder($id_order)
 {
-	$order = new Order($id_order);
+	$order = new Order((int)$id_order);
 	if (!Validate::isLoadedObject($order))
 		die(Tools::displayError('Cannot find order in database'));
 
@@ -89,7 +89,7 @@ function generateInvoicePDFByIdOrder($id_order)
 
 function generateInvoicePDFByIdOrderInvoice($id_order_invoice)
 {
-	$order_invoice = new OrderInvoice($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'));
 
@@ -99,26 +99,25 @@ function generateInvoicePDFByIdOrderInvoice($id_order_invoice)
 
 function generateOrderSlipPDF()
 {
-	$orderSlip = new OrderSlip((int)($_GET['id_order_slip']));
-	$order = new Order((int)($orderSlip->id_order));
+	$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);
-	$tmp = NULL;
 
-   generatePDF($orderSlip, PDF::TEMPLATE_ORDER_SLIP);
+	generatePDF($orderSlip, PDF::TEMPLATE_ORDER_SLIP);
 }
 
 function generateDeliverySlipPDF()
 {
 	if (Tools::isSubmit('id_order'))
-		generateDeliverySlipPDFByIdOrder(Tools::getValue('id_order'));
+		generateDeliverySlipPDFByIdOrder((int)Tools::getValue('id_order'));
 	elseif (Tools::isSubmit('id_order_invoice'))
-		generateDeliverySlipPDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
+		generateDeliverySlipPDFByIdOrderInvoice((int)Tools::getValue('id_order_invoice'));
 	elseif (Tools::isSubmit('id_delivery'))
 	{
-		$order = Order::getByDelivery(Tools::getValue('id_delivery'));
-		generateDeliverySlipPDFByIdOrder($order->id);
+		$order = Order::getByDelivery((int)Tools::getValue('id_delivery'));
+		generateDeliverySlipPDFByIdOrder((int)$order->id);
 	}
 	else
 		die (Tools::displayError('Missing order ID or invoice order ID'));
@@ -127,9 +126,9 @@ function generateDeliverySlipPDF()
 
 function generateDeliverySlipPDFByIdOrder($id_order)
 {
-	$order = new Order($id_order);
+	$order = new Order((int)$id_order);
 	if (!Validate::isLoadedObject($order))
-		throw new PrestashopException('Can\'t load Order object');
+		throw new PrestaShopException('Can\'t load Order object');
 
 	$order_invoice_collection = $order->getInvoicesCollection();
 	generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
@@ -137,69 +136,61 @@ function generateDeliverySlipPDFByIdOrder($id_order)
 
 function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice)
 {
-	$order_invoice = new OrderInvoice($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');
+		throw new PrestaShopException('Can\'t load Order Invoice object');
 
 	generatePDF($order_invoice, PDF::TEMPLATE_DELIVERY_SLIP);
 }
 
 function generateInvoicesPDF()
 {
-	$id_orders_list = OrderInvoice::getByDateInterval($_GET['date_from'], $_GET['date_to'], NULL, 'invoice');
+	$order_invoice_collection = OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
 
-	if (!is_array($id_orders_list))
-		die (Tools::displayError('No invoices found'));
+	if (!count($order_invoice_collection))
+		die(Tools::displayError('No invoices found'));
 
- 	 generateOrderInvoicesPDF($id_orders_list);
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
 }
 
 function generateInvoicesPDF2()
 {
-	$id_orders_list = array();
+	$order_invoice_collection = array();
 	foreach (explode('-', Tools::getValue('id_order_state')) as $id_order_state)
-		if (is_array($id_orders = Order::getOrderIdsByStatus((int)$id_order_state)))
-			$id_orders_list = array_merge($id_orders_list, $id_orders);
+		if (is_array($order_invoices = OrderInvoice::getByStatus((int)$id_order_state)))
+			$order_invoice_collection = array_merge($order_invoices, $order_invoice_collection);
 
- 	 generateOrderInvoicesPDF($id_orders_list);
-}
+	if (!count($order_invoice_collection))
+		die(Tools::displayError('No invoices found'));
 
-function generateOrderInvoicesPDF($id_orders_list)
-{
-    $orders_invoices = array();
-    foreach ($id_orders_list as $id_order)
-    {
-			$order = new Order((int)$id_order);
-			$orders_invoices = array_merge($orders_invoices, $order->getInvoicesCollection());
-	 }
-
-    generatePDF($orders_invoices, PDF::TEMPLATE_INVOICE);
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
 }
 
 function generateOrderSlipsPDF()
 {
-	$id_order_slips_list = OrderSlip::getSlipsIdByDate($_GET['date_from'], $_GET['date_to']);
+	$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);
+	$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);
+	generatePDF($order_slips, PDF::TEMPLATE_ORDER_SLIP);
 }
 
 function generateDeliverySlipsPDF()
 {
-	$slips = unserialize(urldecode($_GET['deliveryslips']));
-	if (is_array($slips))
-        generatePDF($slips, PDF::TEMPLATE_DELIVERY_SLIP);
-}
+	$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)
 {
-    global $smarty;
-    $pdf = new PDF($object, $template, $smarty);
-    $pdf->render();
+	$pdf = new PDF($object, $template, Context::getContext()->smarty);
+	$pdf->render();
 }

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

@@ -14,18 +14,20 @@ ul li {color:#585A69;}
 
 /*FORM*/
 label {color:#585a69;text-shadow:0 1px 0#fff;}
-fieldset{background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
+fieldset{background-color:#EBEDF4; border:1px solid #CCCED7; color:#585A69; font-size:1.1em;margin:0;padding:1em}
 .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;}
-select { border:1px solid #ccc; color: #666666; font-size: 12px; height: 22px;}
-select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
-.header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
+input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc; background-color:#fff;}
+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;}
 .double_select select{width:300px;height:160px;}
 .double_select a{text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px}
 
 /*BUTTON*/
-.button{background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; 
+.button{
+	background: #e3e3e3 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;
 	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;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;}
 .button[disabled=disabled]{color:#8C8C8C}
@@ -34,7 +36,7 @@ select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disab
 input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .button:hover{border:1px solid #939393;}
 .button:active{border:1px solid #939393;}
-.button.export-csv span{ background: transparent url(export-csv.png) no-repeat scroll left top; padding:1px 0 1px 20px}
+.button.export-csv span{ background: transparent url('../img/export-csv.png') no-repeat scroll left top; padding:1px 0 1px 20px}
 
 
 #top_container{margin:0;padding:0}
@@ -44,32 +46,33 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #header_infos{ position:relative; margin: 0; padding:0; height:84px; }
 #header #header_shopname {float: left; margin:15px 20px 0 20px;}
 #header #employee_links {float: right; display:block; margin:15px 15px 0 15px; }
-#header #employee_links a{ float:left; color:#fff; text-transform:capitalize;}
+#header #employee_links a{ float:left; color:#BABABA; text-transform:capitalize;}
+#header #employee_links a:hover {color:#fff;}
 #header #employee_links .employee_name { float:left; color:#fff;}
-#header .separator { background: transparent url(separator.png) no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
+#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
 #header #header_infos #header_shopname span{display:block; font-size:24px; height:28px; overflow:hidden;margin:0; color:#fff; text-shadow: 0 1px 0 #000000;}
-#header #header_infos #header_logout { background: transparent url(logout.png) no-repeat scroll left top; float:left; padding-left:20px; color:#fff !important; }
-#header #header_infos #header_logout a { color:#fff !important;}
-#header #header_infos #header_logout a span {color:#fff;}
-#header #header_infos #header_foaccess{ text-decoration:none; color:#fff;}
-#header #header_infos #header_foaccess a {color:#fff !important;}
-#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(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;}
+#header #header_infos a#header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; float:left; padding-left:20px; color:#bababa;}
+#header #header_infos a#header_logout:hover {color:#fff;}
+#header #header_infos #header_logout a span {color:#bababa}
+#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{ 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_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
+#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("notif_order.png") no-repeat center top;}
-#customers_notif {background: url("notif_customer.png") no-repeat center top;}
-#customer_messages_notif {background: url("notif_message.png") no-repeat center top;}
+#orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
+#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
+#customer_messages_notif {background: url('../img/notif_message.png') no-repeat center top;}
 #orders_notif.open_notifs,
 #customers_notif.open_notifs,
 #customer_messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
@@ -89,18 +92,19 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 /*MENU*/
 #header #menu{ background-color: #f8f8f8; border-bottom:1px solid #e5e5e5; float:left;line-height:normal;margin:0;padding:0;width:100%;}
 #header #menu li.maintab{float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
-#header #menu li#maintab1 { margin-left:20px;}
+#header #menu li:first-child { margin-left:15px;}
 #header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 6px 4px 0;font-weight:normal;font-size:12px;}
 #header #menu li.submenu_size .title{_display:inline;_padding:6px 5px 4px 0}
 #header #menu li{_height:32px;_padding-top:3px}
 #header #menu img{display:inline;padding:0 3px 0 6px; margin-top:-4px; vertical-align:middle;width:16px;height:16px}
 #header #menu li.active, #header #menu li:hover{background-position:0 -38px;white-space:nowrap;}
 #header #menu li.active a{}
-#header #menu li:hover, #header #menu li.active {background-color:#49B2FF; }
+#header #menu li:hover, #header #menu li.active {background-color:#49B2FF;}
+#header #menu li.maintab:hover, #header #menu li.active {border-left:1px solid #49B2FF;border-right:1px solid #49B2FF;}
 #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(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 10px #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 .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;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;}
 
@@ -111,17 +115,19 @@ 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;
+	background: #ececec url('../img/bg-degrade-table.png') repeat-x scroll left top;
 	background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC);
 	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;
-	font-size:13px; text-align:left;}
+	font-size:13px; text-align:left; color:#333;}
 .table tr th.right { text-align:center;}
 .table tr td{border-bottom:1px solid #ccc;color:#333;font-size:12px;padding: 4px 4px 4px 6px;}
-.table tr:hover td{background:#fff1b5}
-.table tr.filter:hover td{background:#F1F9FF}
-.table tr td:hover table tr td{background:none}
+.table tr.row_hover:hover td{background:#fff1b5}
+.table tr.row_hover.filter:hover td{background:#F1F9FF}
+.table tr td.row_hover:hover table tr td{background:none}
 .table tr.action_details td{background:#FAFAFA;}
 .table tr.alt_row.action_details td{background:#E8E8E8;}
 .table tr td.empty{border-bottom:none;background:white!important}
@@ -131,6 +137,8 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table tr.last td{border-bottom:none}
 td.col-left {vertical-align:top; padding-right:10px;}
 #tabPane1 td.col-left { width:200px;}
+#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}
 .path_bar{background-color:#E2EBEE;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:13px;margin-bottom:20px;padding:5px}
@@ -138,6 +146,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;}
@@ -145,7 +160,7 @@ a.module_toggle_all{color: #268CCD;}
 
 .autoupgradeSteps div {  line-height: 30px; }
 .upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;}
-#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url("../img/admin/enabled.gif");background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
+#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url('../img/admin/enabled.gif');background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
 #upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .processing {overflow: auto;}
@@ -160,48 +175,80 @@ 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 .first{font-weight: bold;background-color: #408BD5;color: #ffffff;}
+.multishop_toolbar .chzn-container .group{font-weight: bold;font-style: italic;padding-left: 15px;background-color: #C6DEFC;}
+.multishop_toolbar .chzn-container .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}
-.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0;}
+.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;}
 .toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;}
 .toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;}
 .toolbarBox a.toolbar_btn {   border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;}
 .toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;}
 .toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px; /*hacking ie7*/ margin:0 !ie; position:relative !ie;}
-.toolbarBox .process-icon-delete { background-image: url(process-icon-delete.png);}
-.toolbarBox .process-icon-duplicate { background-image: url(process-icon-duplicate.png);}
-.toolbarBox .process-icon-preview { background-image: url(process-icon-preview.png);}
-.toolbarBox .process-icon-stats { background-image: url(process-icon-stats.png);}
-.toolbarBox .process-icon-cancel, .toolbarBox .toolbar-cancel { background-image: url(process-icon-cancel.png);}
-.toolbarBox .process-icon-new, .toolbarBox .toolbar-new{ background-image: url(process-icon-new.png);}
-.toolbarBox .process-icon-save { background-image: url(process-icon-save.png);}
-.toolbarBox .process-icon-save-and-stay { background-image: url(process-icon-save-and-stay.png);}
-.toolbarBox .process-icon-edit { background-image: url(process-icon-edit.png);}
-.toolbarBox .process-icon-back { background-image: url(process-icon-back.png);}
-.toolbarBox .process-icon-refresh-index  { background-image: url(process-icon-refresh-index.png);}
-.toolbarBox .process-icon-refresh-cache  { background-image: url(process-icon-refresh-cache.png);}
-.toolbarBox .process-icon-save-calendar { background-image: url(process-icon-save-calendar.png);}
-.toolbarBox .process-icon-new-module { background-image: url(process-icon-new-module.png);}
-.toolbarBox .process-icon-new-url { background-image: url(process-icon-new-url.png);}
-.toolbarBox .process-icon-new-module-addon { background-image: url(process-icon-new-module-addon.png);}
-.toolbarBox .process-icon-save-and-preview { background-image: url(process-icon-preview.png);}
-.toolbarBox .process-icon-export-stock-state-quantities-csv { background-image: url(process-icon-export-csv.png);}
-.toolbarBox .process-icon-export-stock-state-prices-csv { background-image: url(process-icon-export-csv-details.png);}
-.toolbarBox .process-icon-export-csv-orders { background-image: url(process-icon-export-csv.png);}
-.toolbarBox .process-icon-export-csv-details { background-image: url(process-icon-export-csv-details.png);}
-.toolbarBox .process-icon-export-stock-mvt-csv { background-image: url(process-icon-export-csv.png);}
-.toolbarBox .process-icon-newAttributes, .toolbarBox .toolbar-new{ background-image: url(process-icon-new.png);}
+.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png');}
+.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png');}
+.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png');}
+.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png');}
+.toolbarBox .process-icon-cancel, .toolbarBox .toolbar-cancel { background-image: url('../img/process-icon-cancel.png');}
+.toolbarBox .process-icon-new, .toolbarBox .toolbar-new{ background-image: url('../img/process-icon-new.png');}
+.toolbarBox .process-icon-save { background-image: url('../img/process-icon-save.png');}
+.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png');}
+.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png');}
+.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png');}
+.toolbarBox .process-icon-refresh-index  { background-image: url('../img/process-icon-refresh-index.png');}
+.toolbarBox .process-icon-refresh-cache  { background-image: url('../img/process-icon-refresh-cache.png');}
+.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png');}
+.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png');}
+.toolbarBox .process-icon-new-url { background-image: url('../img/process-icon-new-url.png');}
+.toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png');}
+.toolbarBox .process-icon-save-and-preview { background-image: url('../img/process-icon-preview.png');}
+.toolbarBox .process-icon-export { background-image: url('../img/process-icon-export-csv.png');}
+.toolbarBox .process-icon-export-all { background-image: url('../img/process-icon-export-csv-details.png');}
+.toolbarBox .process-icon-export-stock-state-quantities-csv { background-image: url('../img/process-icon-export-csv.png');}
+.toolbarBox .process-icon-export-stock-state-prices-csv { background-image: url('../img/process-icon-export-csv-details.png');}
+.toolbarBox .process-icon-export-csv-orders { background-image: url('../img/process-icon-export-csv.png');}
+.toolbarBox .process-icon-export-csv-details { background-image: url('../img/process-icon-export-csv-details.png');}
+.toolbarBox .process-icon-export-stock-mvt-csv { background-image: url('../img/process-icon-export-csv.png');}
+.toolbarBox .process-icon-newAttributes, .toolbarBox .toolbar-new{ background-image: url('../img/process-icon-new.png');}
+.toolbarBox .process-icon-new.add_product{ background-image: url('../img/process-icon-addProduct.png');}
+.toolbarBox .process-icon-partialRefund{ background-image: url('../img/process-icon-partial-refund.png');}
+.toolbarBox .process-icon-standardRefund{ background-image: url('../img/process-icon-standard-refund.png');}
+.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;}
 
 /*button upload files*/
-.qq-upload-button {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;
-	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;
+	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;
+}
+#content .qq-upload-button:hover { border:1px solid #939393;}
+
 /*leadin*/
-.leadin { padding:10px;}
+.leadin {}
+.leadin .bloc-leadin{ padding:10px 3px;}
 
 /*productBox*/
 #productBox { position:relative; width:100%; float:left;}
@@ -209,6 +256,7 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
 /*tab-pane*/
 form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;}
 #content form.adminstockmanagement {margin-left:0px;}
+form#product_form h3 { font-size:14px; font-weight:normal;}
 form#product_form h4 { font-size:18px; font-weight:normal;}
 .tab-row {}
 .tab-row .tab {background:#EFEFEF;width:100px;}
@@ -221,7 +269,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 .productTabs ul li.tab-row a { display:block; font-weight:normal; color:#666;padding: 7px 10px; border-top:1px solid #CCCED7; border-right:1px solid #CCCED7;}
 .productTabs ul li.tab-row a.selected { background-color:#EBEDF4;font-weight:bold;color:#000; border-right:none;}
 .product-tab-content h4.tab { display:none;}
-
+#product_list {margin-bottom:0.5em}
 
 #categories-treeview { }
 #product-tab-content-3-Associations .Association td.col-left  { width:200px;}
@@ -247,7 +295,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 .filter-stock-extended .button-filter { float:right;}
 
 /*ADDONS LOGIN*/
-#addons_login_div { background: #EBEDF4 url(lock.png) no-repeat scroll left 5px;}
+#addons_login_div { background: #EBEDF4 url('../img/lock.png') no-repeat scroll left 5px;}
 #addons_login_div form#addons_login_form { float:right;}
 #addons_login_div p {float:left; font-size:16px; color:#585A69; line-height:24px; text-shadow: 0 1px 0 #fff; margin:0; padding-left:25px;}
 #addons_login_div label {}
@@ -262,8 +310,9 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 .sidebar ul.categorieList {}
 .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; padding-left:5px;}
-.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
+.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 { overflow:hidden;}
 .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
 .sidebar .categorieStatus { display:none;}
 
@@ -278,19 +327,27 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 
 /*STATCONTAINER*/
 #statsContainer {margin-left:220px; padding:0 0 0 20px;}
-#statsContainer #calendar {   background-color: #EEEEEE;border-top: 1px solid #CCCCCC; display: block; margin: 10px 0;min-height: 25px; padding: 5px;}
-#statsContainer #calendar form {float:left;}
-#statsContainer #calendar input, #statsContainer #calendar p { float:left;}
-#statsContainer #calendar input.submitDateDay { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
-#statsContainer #calendar input.submitDateMonth { border-radius:0px;}
-#statsContainer #calendar input.submitDateYear { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
-#statsContainer #calendar input.submitDateDayPrev { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
-#statsContainer #calendar input.submitDateMonthPrev { border-radius:0px;}
-#statsContainer #calendar input.submitDateYearPrev { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
-#statsContainer #calendar p { margin:2px;}
-#statsContainer #calendar p span { float:left; display:block; padding:3px;}
+#statsContainer #calendar,
+#referrersContainer #calendar{   background-color: #EEEEEE;border-top: 1px solid #CCCCCC; display: block; margin: 10px 0;min-height: 25px; padding: 5px;}
+#statsContainer #calendar form,
+#referrersContainer #calendar form {float:left;}
+#statsContainer #calendar input, #statsContainer #calendar p,
+#referrersContainer #calendar input, #referrersContainer #calendar p { float:left;}
+#statsContainer #calendar input.submitDateDay, #referrersContainer #calendar input.submitDateDay { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
+#statsContainer #calendar input.submitDateMonth, #statsContainer #calendar input.submitDateMonth,
+#referrersContainer #calendar input.submitDateMonth, #referrersContainer #calendar input.submitDateMonth { border-radius:0px;}
+#statsContainer #calendar input.submitDateYear,
+#referrersContainer #calendar input.submitDateYear { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
+#statsContainer #calendar input.submitDateDayPrev,
+#referrersContainer #calendar input.submitDateDayPrev { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
+#statsContainer #calendar input.submitDateMonthPrev,
+#referrersContainer #calendar input.submitDateMonthPrev { border-radius:0px;}
+#statsContainer #calendar input.submitDateYearPrev,
+#referrersContainer #calendar input.submitDateYearPrev { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
+#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,
@@ -317,7 +374,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #statsContainer .blocStats h2.icon-category span,
 #statsContainer .blocStats h2.icon-currency span,
 #statsContainer .blocStats h2.icon-language span,
-#statsContainer .blocStats h2.icon-attribute span { background: transparent url(icon-sprites-title.png) no-repeat scroll left top; width:16px; height:16px; padding-right:18px; margin-right:3px;}
+#statsContainer .blocStats h2.icon-attribute span { background: transparent url('../img/icon-sprites-title.png') no-repeat scroll left top; width:16px; height:16px; padding-right:18px; margin-right:3px;}
 
 #statsContainer .blocStats h2.icon-statsproduct span { background-position :2px 2px;}
 #statsContainer .blocStats h2.icon-statsforecast span { background-position :-18px 2px;}
@@ -349,6 +406,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #statsContainer .blocStats form { position:absolute; top:10px; right:5px;}
 #statsContainer .blocStats form.checkup { position:relative; top:0; left:0;}
 #statsContainer .totalStats { font-size:16px; font-weight:bold;}
+#statsContainer .blocStats .blocConversion { display:block; display:inline-table; min-height:80px !ie; }
 
 /*MODULECONTAINER*/
 #moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
@@ -364,7 +422,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;}
 #moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
 #moduleContainer .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic;  font-size:12px; display:block; clear:both;}
-#moduleContainer .setup  {background-color:#6db300;font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
+#moduleContainer .setup  {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
 #moduleContainer .setup.non-install { background-color:#ec7000;}
 #moduleContainer .setup.off{ background-color:#ccc;}
 #moduleContainer .row-actions-module span { padding-right:5px;}
@@ -379,24 +437,66 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 
 /*MODULE POSITION*/
 .blocLiveEdit { float:right; clear:right;  background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block;  width:250px;}
-.blocLiveEdit h2 { background: transparent url(live_edit.png) no-repeat scroll 10px 10px; height: 40px; line-height: 50px;margin: 0; padding: 0 10px; text-indent: 40px;}
+.blocLiveEdit h2 { background: transparent url('../img/live_edit.png') no-repeat scroll 10px 10px; height: 40px; line-height: 50px;margin: 0; padding: 0 10px; text-indent: 40px;}
 .blocLiveEdit p { padding: 0 10px;}
 .blocLiveEdit a.button {float: left; margin:10px; display: inline-block;}
 
 
-#modulePosition { width:100%; float:left; clear:left; margin-right:270px;}
+#modulePosition { width:100%; float:left; clear:left;}
 #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;}
 
+label.text { padding:1px 12px 0 0;}
+label.radioCheck {font-weight:normal; padding:0; float:none; margin:0 1em 0 0.25em}
+
+.listForm {}
+ul.listForm {}
+ul.listForm li {padding-bottom:3px;}
+
+
 /*FOOTER*/
 #footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
 #footer .footerLeft { float:left; margin-left:10px;}
 #footer .footerRight {float:right; margin-right:10px;}
-
-
 #footer .footer_link, #footer .footer_link:hover { color:#268CCD;}
+
+/*DASHBOARD*/
+.pageTitleHome { font-size: 1.6em; font-weight: normal; margin:0; padding:10px 0;}
+.pageTitleHome h3 { font-weight: normal; margin:0;}
+#dashboard {  background-color: #EBEDF4; border: 1px solid #C2C4D9; display: block; padding: 10px; position: relative; min-width:1200px;}
+#dashboard h2 {font-size: 1.4em; font-weight:normal; margin:0 0 15px 0;}
+#iframe {}
+#iframe #video-content { float:left;}
+#iframe {position:relative; display:block; min-height:180px;}
+#adminpresentation #video { float:left; padding-right:15px; min-height:150px;}
+#adminpresentation #video a { position:relative; height:128px; width:220px; display:block; padding:6px; }
+#adminpresentation #video a img { }
+#adminpresentation #video a span {background: transparent url("../img/play.png") no-repeat scroll left top; height:128px; width:220px; position:absolute; top:0; left:0; z-index:1; display:block; border:6px solid #fff; border-radius:3px; }
+#adminpresentation #video a span:hover {background-position:left bottom;border:6px solid #C2C4D9; transition:background 0.5s;}
+#adminpresentation #video-content { padding-left:10px; min-height:150px;  }
+#adminpresentation #video-content p { font-size:20px; line-height: 26px; color:#585A69; text-shadow: 0 1px 0 #fff;}
+
+.view-modules { float:right; margin: 10px 0;}
+.view-modules li { float:left;}
+.view-modules li img { padding-right:5px;}
+.view-modules li.normal-view-disabled {     background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-right-radius: 0; border-right: 1px solid #ccc; border-top-right-radius: 0; color:#999;  }
+.view-modules li.favorites-view-disabled {     background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-left-radius: 0; border-left: 1px solid #fff; border-top-left-radius: 0; color:#999;  }
+.view-modules li.normal-view-disabled:hover,
+.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;}
+
+#account_list { background-color: #EBEDF4;border: 1px solid #C2C4D9; display: block; position:relative; padding: 10px;}
+#account_list  h2 { font-weight:normal; margin:0; font-size: 1.4em; padding-bottom:10px;}
+#account_list table td, #accounting_list table th {width:100px;}

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

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,8 +19,8 @@
 * 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$
+*  @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

@@ -18,7 +18,7 @@ legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padd
 input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc;}
 select { border:1px solid #ccc;}
 select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
-.header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
+.header_module{background:url('../img/header_module.png');padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
 
 /*BUTTON*/
 .button{background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; 
@@ -38,9 +38,9 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #employee_links {float: right; display:block; margin:15px 15px 0 15px; }
 #header #employee_links a{ float:left; color:#fff; text-transform:capitalize;}
 #header #employee_links .employee_name { float:left; color:#fff;}
-#header .separator { background: transparent url(separator.png) no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
+#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
 #header #header_infos #header_shopname span{display:block; font-size:24px; height:28px; overflow:hidden;margin:0; color:#fff; text-shadow: 0 1px 0 #000000;}
-#header #header_infos #header_logout { background: transparent url(logout.png) no-repeat scroll left top; float:left; padding-left:20px; color:#fff !important; }
+#header #header_infos #header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; float:left; padding-left:20px; color:#fff !important; }
 #header #header_infos #header_logout a { color:#fff !important;}
 #header #header_infos #header_logout a span {color:#fff;}
 #header #header_infos #header_foaccess{ text-decoration:none; color:#fff;}
@@ -58,15 +58,15 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #header_quick #quick_select{margin:0; padding:3px 0 4px; vertical-align:middle;width:140px; height:25px;}
 #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_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
+#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 { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
-#orders_notif {background: url("notif_order.png") no-repeat center top;}
-#customers_notif {background: url("notif_customer.png") no-repeat center top;}
-#messages_notif {background: url("notif_message.png") no-repeat center top;}
+#orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
+#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
+#messages_notif {background: url('../img/notif_message.png') no-repeat center top;}
 #orders_notif.open_notifs,
 #customers_notif.open_notifs,
 #messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
@@ -95,7 +95,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #menu li.active a{}
 #header #menu li:hover, #header #menu li.active {background-color:#49B2FF; }
 #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(separator_subnav.png) no-repeat 0 5px}
+#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 10px #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 a{ font-size:12px;display:block;padding: 5px 15px 5px 10px; color:#666666;border-top:1px solid #fff; border-bottom:1px solid #ccc;}
@@ -136,7 +136,7 @@ a.module_toggle_all{color: #268CCD;}
 
 .autoupgradeSteps div {  line-height: 30px; }
 .upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;}
-#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url("../img/admin/enabled.gif");background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
+#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url('../img/admin/enabled.gif');background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
 #upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .processing {overflow: auto;}
@@ -153,21 +153,21 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox a.toolbar_btn {   border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;;}
 .toolbarBox a.toolbar_btn:hover {}
 .toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px;}
-.toolbarBox .process-icon-delete { background-image: url(process-icon-delete.png);}
-.toolbarBox .process-icon-duplicate { background-image: url(process-icon-duplicate.png);}
-.toolbarBox .process-icon-preview { background-image: url(process-icon-preview.png);}
-.toolbarBox .process-icon-stats { background-image: url(process-icon-stats.png);}
-.toolbarBox .process-icon-cancel { background-image: url(process-icon-cancel.png);}
-.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url(process-icon-new.png);}
-.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url(process-icon-save.png);}
-.toolbarBox .process-icon-save-and-stay { background-image: url(process-icon-save-and-stay.png);}
-.toolbarBox .process-icon-edit { background-image: url(process-icon-edit.png);}
-.toolbarBox .process-icon-back { background-image: url(process-icon-back.png);}
-.toolbarBox .process-icon-refresh-index  { background-image: url(process-icon-refresh-index.png);}
-.toolbarBox .process-icon-refresh-cache  { background-image: url(process-icon-refresh-cache.png);}
-.toolbarBox .process-icon-save-calendar { background-image: url(process-icon-save-calendar.png);}
-.toolbarBox .process-icon-new-module { background-image: url(process-icon-new-module.png);}
-.toolbarBox .process-icon-new-module-addon { background-image: url(process-icon-new-module-addon.png);}
+.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png');}
+.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png');}
+.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png');}
+.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png');}
+.toolbarBox .process-icon-cancel { background-image: url('../img/process-icon-cancel.png');}
+.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url('../img/process-icon-new.png');}
+.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url('../img/process-icon-save.png');}
+.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png');}
+.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png');}
+.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png');}
+.toolbarBox .process-icon-refresh-index  { background-image: url('../img/process-icon-refresh-index.png');}
+.toolbarBox .process-icon-refresh-cache  { background-image: url('../img/process-icon-refresh-cache.png');}
+.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png');}
+.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png');}
+.toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png');}
 
 div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
 
@@ -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

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @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
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;