// CHANGELOG

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11917 b9a71923-0436-4b27-9f14-aed3839534dd
// add new icon process commande
2011-12-29 18:31:31 +00:00 · 2011-12-29 17:41:49 +00:00 · 2011-12-29 17:41:00 +00:00 · 2011-12-29 17:37:20 +00:00 · 2011-12-29 17:37:03 +00:00 · 2011-12-29 17:29:06 +00:00
7629 changed files with 243509 additions and 257934 deletions
@@ -1,107 +0,0 @@
-.buildpath
-.htaccess
-.project
-.settings
-.idea
-.svn
-.DS_Store
-robots.txt
-sitemap.xml
-cache/cachefs/*
-!cache/cachefs/index.php
-download/*
-!download/index.php
-upload/*
-!upload/index.php
-admin-dev/autoupgrade/*
-admin-dev/backups/*
-!admin-dev/backups/index.php
-cache/smarty/cache/*
-!cache/smarty/cache/index.php
-cache/smarty/compile/*
-!cache/smarty/compile/index.php
-cache/class_index.php
-cache/tcpdf/*
-!cache/tcpdf/index.php
-config/xml/*.xml
-config/settings.inc.php
-config/settings.old.php
-log/*.log
-img/*
-!img/index.php
-!img/*/index.php
-tools/smarty*/cache/*.php
-!tools/smarty*/cache/index.php
-tools/smarty*/compile/*.php
-!tools/smarty*/compile/index.php
-override/classes/*.php
-themes/default/cache/*.js
-themes/default/cache/*.css
-themes/default/modules/*/*.php
-!themes/default/modules/*/index.php
-themes/default/lang/*.php
-!themes/default/lang/index.php
-modules/*/translations/*.php
-!modules/*/translations/index.php
-mails/*
-!mails/en
-modules/*/mails/*
-!modules/*/mails/en
-translations/*
-!translations/*.gzip
-modules/atos/*
-modules/addshoppers
-modules/alliedwallet
-modules/authorizeaim
-modules/autoupgrade
-modules/avalaratax
-modules/backwardcompatibility
-modules/canadapost
-modules/cloudcache
-modules/ebay
-modules/fedexcarrier
-modules/fianetfraud
-modules/fianetsceau
-modules/fidbag
-modules/firstdata
-modules/gadwords
-modules/gamification
-modules/ganalytics
-modules/gsitemap
-modules/hipay
-modules/iadvize
-modules/itembase
-modules/jirafe
-modules/kiala
-modules/kialasmall
-modules/klarnaprestashop
-modules/kwixo
-modules/livezilla
-modules/mailjet
-modules/merchantware
-modules/mobile_theme
-modules/mondialrelay
-modules/moneybookers
-modules/nqgatewayneteven
-modules/ogone
-modules/pagseguro
-modules/paypal
-modules/payulatam
-modules/prediggo
-modules/prestafraud
-modules/shipwire
-modules/shoppingfeedexport
-modules/shoppingfluxexport
-modules/socolissimo
-modules/stripejs
-modules/themeinstallator
-modules/tntcarrier
-modules/treepodia
-modules/trustedshops
-modules/trustly
-modules/twenga
-modules/upscarrier
-modules/uspscarrier
-modules/wexpay
-modules/yotpo
-modules/zingaya
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,11 +19,24 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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
 */

+/* Send the proper status code in HTTP headers */
+header('HTTP/1.1 404 Not Found');
+header('Status: 404 Not Found');
+
+if (in_array(substr($_SERVER['REQUEST_URI'], -3), array('png', 'jpg', 'gif')))
+{
+	require_once(dirname(__FILE__).'/config/settings.inc.php');
+	header('Location: '.__PS_BASE_URI__.'img/404.gif');
+	exit;
+}
+elseif (in_array(substr($_SERVER['REQUEST_URI'], -3), array('.js', 'css')))
+	die('');
+
 require_once(dirname(__FILE__).'/config/config.inc.php');
-Tools::displayFileAsDeprecated();
 Controller::getController('PageNotFoundController')->run();
@@ -1,12 +0,0 @@
-Contributing
------------
-
-PrestaShop is an open-source e-commerce solution - To contribute to our project, you can make pull requests on the bootstrap branch.  
-If you need some help to make a [pull-request][1]  
-All contributions must respect [the coding norm][2] and [the commit norm][3] in your pull-request.  
-All core files you commit in your pull request must have Open Software License (OSL 3.0)  
-All modules files you commit in your pull request must have Academic Free License (AFL 3.0)  
-
-[1]: https://help.github.com/articles/using-pull-requests
-[2]: http://docs.prestashop.com/display/PS15/Coding+Standards
-[3]: http://docs.prestashop.com/display/PS15/How+to+write+a+commit+message
@@ -1,186 +0,0 @@
-	- adonis karavokyros
-	- aFolletete
-	- Agence CINS
-	- aKorczak
-	- Aleksander Palyan
-	- Alexander Otchenashev
-	- anat
-	- Andrew
-	- aNiassy
-	- antoniofr
-	- AntonLejon
-	- Arnaud Lemercier
-	- Axome
-	- Benjamin PONGY
-	- BigZ
-	- bLeveque
-	- bMancone
-	- bumbu
-	- Burhan
-	- Caleydon Media
-	- cam.lafit
-	- Captain FLAM
-	- Captain-FLAM
-	- ccauw
-	- cedricfontaine
-	- Cédric Mouleyre
-	- Chris
-	- ChristopheBoucaut
-	- CINS
-	- cippest
-	- cmouleyre
-	- Corentin Delcourt
-	- Cosmin Hutanu
-	- Damien Metzger
-	- DamienMetzger
-	- Damon Skelhorn
-	- Daniel
-	- Daniele Giachino
-	- David Gasperoni
-	- Davy Rolink
-	- Dinis Lage
-	- djfm
-	- dlage
-	- dMetzger
-	- (d)oekia
-	- Dragan Skrbic
-	- dreammeup
-	- DrySs
-	- DrÿSs
-	- DrÿSs'
-	- dSevere
-	- Edouard Gaulué
-	- emily-d
-	- Eric Le Lay
-	- Fabio Chelly
-	- fBrignoli
-	- fchellypresta
-	- fram
-	- Francois Gaillard
-	- François Gaillard
-	- Fran�ois Gaillard
-	- fSerny
-	- Gabriel Schwardy
-	- Gaelle ITZKOVITZ
-	- gBrunier
-	- gCharmes
-	- gPoulain
-	- gr4devel
-	- Grégoire Bélorgey
-	- Gregory Roussac
-	- gRoussac
-	- Guillaume DELOINCE
-	- ha99y
-	- hAitmansour
-	- Ha!*!*y
-	- indesign47
-	- inem0o
-	- ivancasasempere
-	- Jáchym Toušek
-	- Javsmile
-	- jBreux
-	- jeckyl
-	- jeromenadaud
-	- Jerome Nadaud
-	- Jérôme Nadaud
-	- jessylenne
-	- jmCollin
-	- jObregon
-	- Jonathan Danse
-	- joseantgv
-	- Julien
-	- Kevin Granger
-	- kiropowered
-	- kpodemski
-	- Krystian Podemski
-	- lBrieu
-	- lCherifi
-	- ldecoker
-	- lLefevre
-	- LOIC ROSSET ltd
-	- Madef
-	- Mainmich
-	- makk1ntosh
-	- marcinsz101
-	- Marco Cervellin
-	- matiasiglesias
-	- Mats Rynge
-	- MatthieuB
-	- Maxence
-	- mBertholino
-	- mDeflotte
-	- Michel Courtade
-	- Mickael Desgranges
-	- Mikael Blotin
-	- Milow
-	- minic studio
-	- misthero
-	- mMarinetti
-	- montes
-	- MustangZhong
-	- nezenmoins
-	- Nicolas Sorosac
-	- Nils-Helge Garli Hegvik
-	- Nino Uzelac
-	- nPellicari
-	- nturato
-	- oleacorner
-	- Otto Nascarella
-	- Patanock
-	- PhpMadman
-	- Pierre
-	- Piotr Kaczor
-	- Piotr Moćko
-	- PrestaEdit
-	- PrestaLab
-	- PrestanceDesign
-	- prestarocket
-	- Prestaspirit
-	- pxls
-	- Raphaël Malié
-	- raulgundin
-	- Rémi Gaillard
-	- rGaillard
-	- Rimas Kudelis
-	- rMalie
-	- rMontagne
-	- romainberger
-	- root
-	- runningz
-	- sagaradonis
-	- Samy Rabih
-	- Sarah Lorenzini
-	- Seb
-	- Sébastien
-	- Sébastien Bocahu
-	- Seynaeve
-	- Shagshag
-	- sjousse
-	- sLorenzini
-	- smartdatasoft
-	- soufyan
-	- soware
-	- Staging
-	- sThiebaut
-	- Sylvain Gougouzian
-	- Sylvain WITMEYER
-	- tDidierjean
-	- thoma202
-	- Tomasz Slominski
-	- Tom Panier
-	- tucoinfo
-	- unknown
-	- vAugagneur
-	- vChabot
-	- Vincent Augagneur
-	- Vincent Schoener
-	- Vincent Terenti
-	- vinvin27
-	- vKham
-	- vSchoener
-	- Xavier
-	- Xavier POITAU
-	- Yoozio
-	- zimmi1
-	- Zollner Robert
-
@@ -1,49 +0,0 @@
-README
-======
-![PrestaShop](http://www.prestashop.com/images/banners/general/prestashop_728x90.png "PrestaShop")
-
-ABOUT
--------
-
-PrestaShop is a free and open-source e-commerce web application, committed to providing the best shopping cart experience for both merchants and consumers.
-
-
-SERVER CONFIGURATION
--------
-
-To install PrestaShop, you need a web server running PHP5 and any flavor of MySQL5 (MySQL, MariaDB, Percona Server...).
-You will also need a database administration tool, such as phpMyAdmin, in order to create a database for PrestaShop.
-We recommend the Apache or Nginx web servers.
-
-If your host does not offer PHP5 by default, here are a few [explanations][2] about PHP5 or the .htaccess file for certain hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc).
-
-If you want your online store ready to go, visit [http://www.prestabox.com][1]: it lets you create your online store in less than 10 minutes without any technical knowledge.
-
-
-INSTALLATION
--------
-
-With your web browser, go to the root of your PrestaShop directory, and the installer will start. Follow the instructions until PrestaShop is installed.
-
-If you have any PHP error, perhaps you don't have PHP5 or you need to activate it on your web host. See the page linked above.
-If you don't find any solution to start the installer, please post on [the PrestaShop forums][3].
-
-
-DOCUMENTATION
--------
-
-The official PrestaShop documentation is available online [on its own website][4].
-
-
-FORUMS
--------
-
-You can discuss, help and contribute with PrestaShop community on [the PrestaShop forums][5].
-
-Thank you for downloading and using PrestaShop e-commerce Open-source solution!
-
-[1]: http://www.prestabox.com
-[2]: http://www.prestashop.com/forums/topic/2946-pre-installation-settings-php-5-htaccess-for-certain-hosting-services/
-[3]: http://www.prestashop.com/forums/forum/7-installing-prestashop/
-[4]: http://doc.prestashop.com
-[5]: http://www.prestashop.com/forums/
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,19 +19,17 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 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();

-Tools::redirect('index.php?controller=address'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+// 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'] : ''));
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,19 +19,17 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 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();

-Tools::redirect('index.php?controller=addresses'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+// 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'] : ''));
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,14 +19,15 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */

 define('_PS_ADMIN_DIR_', getcwd());
-require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
-require(_PS_ADMIN_DIR_.'/functions.php');
+require(dirname(__FILE__).'/../config/config.inc.php');
+require(dirname(__FILE__).'/functions.php');

 // For retrocompatibility with "tab" parameter
 if (!isset($_GET['controller']) && isset($_GET['tab']))
@@ -37,5 +38,6 @@ 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();
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,38 +19,353 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 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
 */

 define('_PS_ADMIN_DIR_', getcwd());
 include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
-
 /* Getting cookie or logout */
-require_once(_PS_ADMIN_DIR_.'/init.php');
+require_once(dirname(__FILE__).'/init.php');

 $context = Context::getContext();

+if (Tools::isSubmit('changeParentUrl'))
+	echo '<script type="text/javascript">parent.parent.document.location.href = "'.addslashes(urldecode(Tools::getValue('changeParentUrl'))).'";</script>';
+if (Tools::isSubmit('installBoughtModule'))
+{
+	$file = false;
+	while ($file === false OR file_exists(_PS_MODULE_DIR_.$file))
+		$file = uniqid();
+	$file = _PS_MODULE_DIR_.$file.'.zip';
+	$sourceFile = 'http://addons.prestashop.com/iframe/getboughtfile.php?id_order_detail='.Tools::getValue('id_order_detail').'&token='.Tools::getValue('token');
+	if (!copy($sourceFile, $file))
+	{
+		if (!($content = file_get_contents($sourceFile)))
+			die(displayJavascriptAlert('Access denied: Please download your module directly from PrestaShop Addons website'));
+		elseif (!file_put_contents($file, $content))
+			die(displayJavascriptAlert('Local error: your module directory is not writable'));
+	}
+	$first6 = fread($fd = fopen($file, 'r'), 6);
+	if (!strncmp($first6, 'Error:', 6))
+	{
+		$displayJavascriptAlert = displayJavascriptAlert(fread($fd, 1024));
+		fclose($fd);
+		unlink($file);
+		die($displayJavascriptAlert);
+	}
+	fclose($fd);
+	if (!Tools::ZipExtract($file, _PS_MODULE_DIR_))
+	{
+		unlink($file);
+		die(displayJavascriptAlert('Cannot unzip file'));
+	}
+	unlink($file);
+	die(displayJavascriptAlert('Module copied to disk'));
+}
+
+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();
 	$import = new AdminImportController();

+	$languages = Language::getLanguages(false);
+	$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
 	$fields = $import->getAvailableFields(true);
 	foreach ($fields AS $field)
 		$jsonArray[] = '{"field":"'.addslashes($field).'"}';
 	die('['.implode(',', $jsonArray).']');
 }

+if (Tools::isSubmit('ajaxModulesPositions'))
+{
+	$id_module = (int)(Tools::getValue('id_module'));
+	$id_hook = (int)(Tools::getValue('id_hook'));
+	$way = (int)(Tools::getValue('way'));
+	$positions = Tools::getValue(strval($id_hook));
+	$position = (is_array($positions)) ? array_search($id_hook.'_'.$id_module, $positions) : null;
+	$module = Module::getInstanceById($id_module);
+	if (Validate::isLoadedObject($module))
+		if ($module->updatePosition($id_hook, $way, $position))
+			die(true);
+		else
+			die('{"hasError" : true, "errors" : "Can not update module position"}');
+	else
+		die('{"hasError" : true, "errors" : "This module can not be loaded"}');
+}
+
+if (Tools::isSubmit('ajaxCategoriesPositions'))
+{
+	$id_category_to_move = (int)(Tools::getValue('id_category_to_move'));
+	$id_category_parent = (int)(Tools::getValue('id_category_parent'));
+	$way = (int)(Tools::getValue('way'));
+	$positions = Tools::getValue('category');
+	if (is_array($positions))
+		foreach ($positions AS $key => $value)
+		{
+			$pos = explode('_', $value);
+			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_category_parent AND $pos[2] == $id_category_to_move))
+			{
+				$position = $key;
+				break;
+			}
+		}
+	$category = new Category($id_category_to_move);
+	if (Validate::isLoadedObject($category))
+	{
+		if (isset($position) && $category->updatePosition($way, $position))
+		{
+			Hook::exec('categoryUpdate');
+			die(true);
+		}
+		else
+			die('{"hasError" : true, errors : "Can not update categories position"}');
+	}
+	else
+		die('{"hasError" : true, "errors" : "This category can not be loaded"}');
+
+}
+
+if (Tools::isSubmit('ajaxCMSCategoriesPositions'))
+{
+	$id_cms_category_to_move = (int)(Tools::getValue('id_cms_category_to_move'));
+	$id_cms_category_parent = (int)(Tools::getValue('id_cms_category_parent'));
+	$way = (int)(Tools::getValue('way'));
+	$positions = Tools::getValue('cms_category');
+	if (is_array($positions))
+		foreach ($positions AS $key => $value)
+		{
+			$pos = explode('_', $value);
+			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_cms_category_parent AND $pos[2] == $id_cms_category_to_move))
+			{
+				$position = $key;
+				break;
+			}
+		}
+	$cms_category = new CMSCategory($id_cms_category_to_move);
+	if (Validate::isLoadedObject($cms_category))
+	{
+		if (isset($position) && $cms_category->updatePosition($way, $position))
+			die(true);
+		else
+			die('{"hasError" : true, "errors" : "Can not update cms categories position"}');
+	}
+	else
+		die('{"hasError" : true, "errors" : "This cms category can not be loaded"}');
+}
+
+if (Tools::isSubmit('ajaxCMSPositions'))
+{
+	$id_cms = (int)(Tools::getValue('id_cms'));
+	$id_category = (int)(Tools::getValue('id_cms_category'));
+	$way = (int)(Tools::getValue('way'));
+	$positions = Tools::getValue('cms');
+	if (is_array($positions))
+		foreach ($positions AS $key => $value)
+		{
+			$pos = explode('_', $value);
+			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_category AND $pos[2] == $id_cms))
+			{
+				$position = $key;
+				break;
+			}
+		}
+	$cms = new CMS($id_cms);
+	if (Validate::isLoadedObject($cms))
+	{
+		if (isset($position) && $cms->updatePosition($way, $position))
+			die(true);
+		else
+			die('{"hasError" : true, "errors" : "Can not update cms position"}');
+	}
+	else
+		die('{"hasError" : true, "errors" : "This cms can not be loaded"}');
+}
+
+/* Modify product position in catalog */
+if (Tools::isSubmit('ajaxProductsPositions'))
+{
+	$way = (int)(Tools::getValue('way'));
+	$id_product = (int)(Tools::getValue('id_product'));
+	$id_category = (int)(Tools::getValue('id_category'));
+	$positions = Tools::getValue('product');
+
+	if (is_array($positions))
+		foreach ($positions AS $position => $value)
+		{
+			// pos[1] = id_categ, pos[2] = id_product, pos[3]=old position
+			$pos = explode('_', $value);
+
+			if ((isset($pos[1]) AND isset($pos[2])) AND ($pos[1] == $id_category AND (int)$pos[2] === $id_product))
+			{
+				if ($product = new Product((int)$pos[2]))
+					if (isset($position) && $product->updatePosition($way, $position))
+						echo "ok position ".(int)$position." for product ".(int)$pos[2]."\r\n";
+					else
+						echo '{"hasError" : true, "errors" : "Can not update product '. (int)$id_product . ' to position '.(int)$position.' "}';
+				else
+					echo '{"hasError" : true, "errors" : "This product ('.(int)$id_product.') can t be loaded"}';
+
+				break;
+			}
+		}
+}
+
+if (Tools::isSubmit('ajaxProductImagesPositions'))
+{
+	$id_image = (int)(Tools::getValue('id_image'));
+	$way = (int)(Tools::getValue('way'));
+	$positions = Tools::getValue('imageTable');
+
+	if (is_array($positions))
+		foreach ($positions AS $key => $value)
+		{
+			$pos = explode('_', $value);
+			if ((isset($pos[1])) AND ($pos[1] == $id_image))
+			{
+				// +1 is added because images position range starts from 1 instead of 0 for other objects (products, categories...)
+				$position = ($key + 1);
+				break;
+			}
+		}
+	$image = new Image($id_image);
+	if (Validate::isLoadedObject($image))
+	{
+		if (isset($position) && $image->updatePosition($way, $position))
+			die(true);
+		else
+			die('{"hasError" : true, "errors" : "Cannot update image position"}');
+	}
+	else
+		die('{"hasError" : true, "errors" : "This image cannot be loaded"}');
+}
+
+
 if (Tools::isSubmit('ajaxProductPackItems'))
 {
 	$jsonArray = array();
@@ -59,7 +374,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')).'
-	'.Shop::addSqlRestrictionOnLang('pl').'
+	'.Context::getContext()->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')));

@@ -68,6 +383,117 @@ if (Tools::isSubmit('ajaxProductPackItems'))
 	die('['.implode(',', $jsonArray).']');
 }

+if (Tools::isSubmit('ajaxStates') AND Tools::isSubmit('id_country'))
+{
+	$states = Db::getInstance()->executeS('
+	SELECT s.id_state, s.name
+	FROM '._DB_PREFIX_.'state s
+	LEFT JOIN '._DB_PREFIX_.'country c ON (s.`id_country` = c.`id_country`)
+	WHERE s.id_country = '.(int)(Tools::getValue('id_country')).' AND s.active = 1 AND c.`contains_states` = 1
+	ORDER BY s.`name` ASC');
+
+	if (is_array($states) AND !empty($states))
+	{
+		$list = '';
+		if (Tools::getValue('no_empty') != true)
+		{
+			$empty_value = (Tools::isSubmit('empty_value')) ? Tools::getValue('empty_value') : '----------';
+			$list = '<option value="0">'.Tools::htmlentitiesUTF8($empty_value).'</option>'."\n";
+		}
+
+		foreach ($states AS $state)
+			$list .= '<option value="'.(int)($state['id_state']).'"'.((isset($_GET['id_state']) AND $_GET['id_state'] == $state['id_state']) ? ' selected="selected"' : '').'>'.$state['name'].'</option>'."\n";
+	}
+	else
+		$list = 'false';
+
+	die($list);
+}
+
+if (Tools::isSubmit('submitCustomerNote') AND $id_customer = (int)Tools::getValue('id_customer'))
+{
+	$note = html_entity_decode(Tools::getValue('note'));
+	if (!empty($note) AND !Validate::isCleanHtml($note))
+		die ('error:validation');
+	if (!Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'customer SET `note` = "'.pSQL($note, true).'" WHERE id_customer = '.(int)$id_customer.' LIMIT 1'))
+		die ('error:update');
+	die('ok');
+}
+
+if (Tools::getValue('form_language_id'))
+{
+	if (!($context->cookie->employee_form_lang = (int)(Tools::getValue('form_language_id'))))
+		die ('Error while updating cookie.');
+	die ('Form language updated.');
+}
+
+if (Tools::getValue('submitPublishProduct'))
+{
+	if (Tools::getIsset('id_product'))
+	{
+		$id_product = (int)(Tools::getValue('id_product'));
+		$id_tab_catalog = (int)(Tab::getIdFromClassName('AdminProducts'));
+		$token = Tools::getAdminToken('AdminProducts'.(int)($id_tab_catalog).(int)$context->employee->id);
+		$bo_product_url = dirname($_SERVER['PHP_SELF']).'/index.php?tab=AdminProducts&id_product='.$id_product.'&updateproduct&token='.$token;
+
+		if (Tools::getValue('redirect'))
+			die($bo_product_url);
+
+		$profileAccess = Profile::getProfileAccess($context->employee->id_profile, $id_tab_catalog);
+		if($profileAccess['edit'])
+		{
+			$product = new Product((int)(Tools::getValue('id_product')));
+			if (!Validate::isLoadedObject($product))
+				die('error: invalid id');
+
+			$product->active = 1;
+
+			if ($product->save())
+				die($bo_product_url);
+			else
+				die('error: saving');
+
+		} else {
+			die('error: permissions');
+		}
+	}
+	else
+		die ('error: parameters');
+}
+
+if (Tools::getValue('submitPublishCMS'))
+{
+	if (Tools::getIsset('id_cms'))
+	{
+		$id_cms = (int)(Tools::getValue('id_cms'));
+		$id_tab_cms = (int)(Tab::getIdFromClassName('AdminCmsContent'));
+		$token = Tools::getAdminToken('AdminCmsContent'.(int)($id_tab_cms).(int)$context->employee->id);
+		$bo_cms_url = dirname($_SERVER['PHP_SELF']).'/index.php?tab=AdminCmsContent&id_cms='.(int)$id_cms.'&updatecms&token='.$token;
+
+		if (Tools::getValue('redirect'))
+			die($bo_cms_url);
+
+		$profileAccess = Profile::getProfileAccess($context->employee->id_profile, $id_tab_cms);
+		if($profileAccess['edit'])
+		{
+			$cms = new CMS((int)(Tools::getValue('id_cms')));
+			if (!Validate::isLoadedObject($cms))
+				die('error: invalid id');
+
+			$cms->active = 1;
+
+			if ($cms->save())
+				die($bo_cms_url);
+			else
+				die('error: saving');
+
+		} else {
+			die('error: permissions');
+		}
+	}
+	else
+		die ('error: parameters');
+}

 if (Tools::isSubmit('submitTrackClickOnHelp'))
 {
@@ -78,9 +504,244 @@ if (Tools::isSubmit('submitTrackClickOnHelp'))
        HelpAccess::trackClick($label, $version);
 }

-if (Tools::isSubmit('getChildrenCategories') && Tools::isSubmit('id_category_parent'))
+if (Tools::isSubmit('saveImportMatchs'))
 {
-	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id, null, Tools::getValue('use_shop_context'));
+   $match = implode('|', Tools::getValue('type_value'));
+   Db::getInstance()->execute('INSERT INTO  `'._DB_PREFIX_.'import_match` (
+								`id_import_match` ,
+								`name` ,
+								`match`,
+								`skip`
+								)
+								VALUES (
+								NULL ,
+								\''.pSQL(Tools::getValue('newImportMatchs')).'\',
+								\''.pSQL($match).'\',
+								\''.pSQL(Tools::getValue('skip')).'\'
+								)');
+
+	die('{"id" : "'.Db::getInstance()->Insert_ID().'"}');
+}
+
+if (Tools::isSubmit('deleteImportMatchs'))
+{
+   Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'import_match` WHERE `id_import_match` = '.(int)Tools::getValue('idImportMatchs'));
+}
+
+if (Tools::isSubmit('loadImportMatchs'))
+{
+   $return = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'import_match` WHERE `id_import_match` = '.(int)Tools::getValue('idImportMatchs'));
+   die('{"id" : "'.$return[0]['id_import_match'].'", "matchs" : "'.$return[0]['match'].'", "skip" : "'.$return[0]['skip'].'"}');
+}
+
+if (Tools::isSubmit('toggleScreencast'))
+{
+	if (Validate::isLoadedObject($context->employee))
+	{
+		$context->employee->bo_show_screencast = !$context->employee->bo_show_screencast;
+		$context->employee->update();
+	}
+}
+
+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 */
+	if (_PS_MODE_DEMO_)
+		die('{"hasError" : true, "errors" : ["Live Edit : This functionnality has been disabled"]}');
+	/* PrestaShop demo mode*/
+
+	if (!count(Tools::getValue('hooks_list')))
+		die('{"hasError" : true, "errors" : ["Live Edit : no module on this page"]}');
+
+	$modules_list = Tools::getValue('modules_list');
+	$hooks_list = Tools::getValue('hooks_list');
+	$hookableList = array();
+
+	foreach ($modules_list as $module)
+	{
+		$module = trim($module);
+		if (!$module)
+			continue;
+
+		$moduleInstance = Module::getInstanceByName($module);
+		foreach ($hooks_list as $hook_name)
+		{
+			$hook_name = trim($hook_name);
+			if (!$hook_name)
+				continue;
+			if (!array_key_exists($hook_name, $hookableList))
+				$hookableList[$hook_name] = array();
+			if ($moduleInstance->isHookableOn($hook_name))
+				array_push($hookableList[$hook_name], $module);
+		}
+
+	}
+	$hookableList['hasError'] = false;
+	die(Tools::jsonEncode($hookableList));
+}
+
+if (Tools::isSubmit('getHookableModuleList'))
+{
+	/* PrestaShop demo mode */
+	if (_PS_MODE_DEMO_)
+		die('{"hasError" : true, "errors" : ["Live Edit : This functionnality has been disabled"]}');
+	/* PrestaShop demo mode*/
+
+	include('../init.php');
+	$hook_name = Tools::getValue('hook');
+	$hookableModulesList = array();
+	$modules = Db::getInstance()->executeS('SELECT id_module, name FROM `'._DB_PREFIX_.'module` ');
+	foreach ($modules as $module)
+	{
+		if (file_exists(_PS_MODULE_DIR_.$module['name'].'/'.$module['name'].'.php'))
+		{
+			include_once(_PS_MODULE_DIR_.$module['name'].'/'.$module['name'].'.php');
+			$mod = new $module['name']();
+			if ($mod->isHookableOn($hook_name))
+				$hookableModulesList[] = array('id' => (int)$mod->id, 'name' => $mod->displayName, 'display' => Hook::exec($hook_name, array(), (int)$mod->id));
+		}
+	}
+	die(Tools::jsonEncode($hookableModulesList));
+}
+
+if (Tools::isSubmit('saveHook'))
+{
+	/* PrestaShop demo mode */
+	if (_PS_MODE_DEMO_)
+		die('{"hasError" : true, "errors" : ["Live Edit : This functionnality has been disabled"]}');
+
+	$hooks_list = explode(',', Tools::getValue('hooks_list'));
+	$id_shop = (int)Tools::getValue('id_shop');
+	if (!$id_shop)
+		$id_shop = Context::getContext()->shop->getId(true);
+
+	$res = true;
+	$hookableList = array();
+	// $_POST['hook'] is an array of id_module
+	$hooks_list = Tools::getValue('hook');
+	foreach ($hooks_list as $id_hook => $modules)
+	{
+		// 1st, drop all previous hooked modules
+		$sql = 'DELETE FROM `'._DB_PREFIX_.'hook_module`
+			WHERE `id_hook` =  '.(int)$id_hook.'
+			AND id_shop = '.$id_shop;
+		$res &= Db::getInstance()->execute($sql);
+
+		$i = 1;
+		$value = '';
+		$ids = array();
+		// then prepare sql query to rehook all chosen modules(id_module, id_shop, id_hook, position)
+		// position is i (autoincremented)
+		foreach ($modules as $id_module)
+		{
+			if (!in_array($id_module, $ids))
+			{
+				$ids[] = $id_module;
+				$value .= '('.(int)$id_module.', '.$id_shop.', '.(int)$id_hook.', '.$i.'),';
+			}
+			$i++;
+		}
+		$value = rtrim($value, ',');
+		$res &= Db::getInstance()->execute('INSERT INTO  `'._DB_PREFIX_.'hook_module` 
+			(id_module, id_shop, id_hook, position) 
+			VALUES '.$value);
+
+	}
+	if ($res)
+		$hasError = true;
+	else
+		$hasError = false;
+	die('{"hasError" : false, "errors" : ""}');
+}
+
+if (Tools::isSubmit('getAdminHomeElement'))
+{
+	$result = array();
+
+	$protocol = Tools::usingSecureMode() ? 'https' : 'http';
+	$isoUser = Context::getContext()->language->iso_code;
+	$isoCountry = Context::getContext()->country->iso_code;
+	$stream_context = @stream_context_create(array('http' => array('method'=> 'GET', 'timeout' => 5)));
+
+	// SCREENCAST
+	if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3))
+		$result['screencast'] = 'OK';
+	else
+		$result['screencast'] = 'NOK';
+
+	// PREACTIVATION
+	$content = @file_get_contents($protocol.'://api.prestashop.com/partner/preactivation/preactivation-block.php?version=1.0&shop='.urlencode(Configuration::get('PS_SHOP_NAME')).'&protocol='.$protocol.'&url='.urlencode($_SERVER['HTTP_HOST']).'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&date_creation='._PS_CREATION_DATE_.'&v='._PS_VERSION_.'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context);
+	if (!$content)
+		$result['partner_preactivation'] = 'NOK';
+	else
+	{
+		$content = explode('|', $content);
+		if ($content[0] == 'OK' && Validate::isCleanHtml($content[2]) && Validate::isCleanHtml($content[1]))
+		{
+			$result['partner_preactivation'] = $content[2];
+			$content[1] = explode('#%#', $content[1]);
+			foreach ($content[1] as $partnerPopUp)
+				if ($partnerPopUp)
+				{
+					$partnerPopUp = explode('%%', $partnerPopUp);
+					if (!Configuration::get('PS_PREACTIVATION_'.strtoupper($partnerPopUp[0])))
+					{
+						$result['partner_preactivation'] .= $partnerPopUp[1];
+						Configuration::updateValue('PS_PREACTIVATION_'.strtoupper($partnerPopUp[0]), 'TRUE');
+					}
+				}
+		}
+		else
+			$result['partner_preactivation'] = 'NOK';
+	}
+
+	// PREACTIVATION PAYPAL WARNING
+	$content = @file_get_contents('https://api.prestashop.com/partner/preactivation/preactivation-warnings.php?version=1.0&partner=paypal&iso_country='.Tools::strtolower(Context::getContext()->country->iso_code).'&iso_lang='.Tools::strtolower(Context::getContext()->language->iso_code).'&id_lang='.(int)Context::getContext()->language->id.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context);
+	$content = explode('|', $content);
+	if ($content[0] == 'OK' && Validate::isCleanHtml($content[1]))
+		Configuration::updateValue('PS_PREACTIVATION_PAYPAL_WARNING', $content[1]);
+	else
+		Configuration::updateValue('PS_PREACTIVATION_PAYPAL_WARNING', '');
+
+	// DISCOVER PRESTASHOP
+	$content = @file_get_contents($protocol.'://api.prestashop.com/partner/prestashop/prestashop-link.php?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context);
+	if (!$content)
+		$result['discover_prestashop'] = 'NOK';
+	else
+	{
+		$content = explode('|', $content);
+		if ($content[0] == 'OK' && Validate::isCleanHtml($content[1]))
+			$result['discover_prestashop'] = $content[1];
+		else
+			$result['discover_prestashop'] = 'NOK';
+
+		if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3))
+			$result['discover_prestashop'] .= '<iframe frameborder="no" style="margin: 0px; padding: 0px; width: 315px; height: 290px;" src="'.$protocol.'://api.prestashop.com/rss/news2.php?v='._PS_VERSION_.'&lang='.$isoUser.'"></iframe>';
+
+		$content = @file_get_contents($protocol.'://api.prestashop.com/partner/paypal/paypal-tips.php?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context);
+		$content = explode('|', $content);
+		if ($content[0] == 'OK' && Validate::isCleanHtml($content[1]))
+			$result['discover_prestashop'] .= $content[1];
+	}
+
+	die(Tools::jsonEncode($result));
+}
+
+if (Tools::isSubmit('getChildrenCategories') && Tools::getValue('id_category_parent'))
+{
+	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id);
 	die(Tools::jsonEncode($children_categories));
 }

@@ -96,6 +757,211 @@ if (Tools::isSubmit('updateElementEmployee') && Tools::getValue('updateElementEm
 	die($notification->updateEmployeeLastElement(Tools::getValue('updateElementEmployeeType')));
 }

+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'))
+	die('{"hasError" : true, "errors" : ["Configuration is not correct"]}');
+
+	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);
+
+	//checks if there is no error when connecting imap server
+	$errors = imap_errors();
+	$str_errors = '';
+	$str_error_delete = '';
+	if (sizeof($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)
+		die('{"hasError" : true, "errors" : ["Fail to get information about the current mailbox"]}');
+
+	if ($check->Nmsgs == 0)
+		die('{"hasError" : true, "errors" : ["NO message to sync"]}');
+
+	$result = imap_fetch_overview($mbox,"1:{$check->Nmsgs}",0);
+	foreach ($result as $overview)
+	{
+	    //check if message exist in database
+	    if (isset($overview->subject))
+	   		$subject = $overview->subject;
+	   	else
+	   		$subject = '';
+
+		//Creating an md5 to check if message has been allready processed
+	    $md5 = md5($overview->date.$overview->from.$subject.$overview->msgno);
+	    $exist = Db::getInstance()->getValue(
+			    'SELECT `md5_header`
+			    FROM `'._DB_PREFIX_.'customer_message_sync_imap`
+			    WHERE `md5_header` = \''.pSQL($md5).'\'');
+	    if ($exist)
+	    {
+			if (Configuration::get('PS_SAV_IMAP_DELETE_MSG'))
+				if (!imap_delete($mbox, $overview->msgno))
+					$str_error_delete = ', "Fail to delete message"';
+	    }
+	    else
+	    {
+	    	//check if subject has id_order
+	    	preg_match('/\#ct([0-9]*)/', $subject, $matches1);
+	    	preg_match('/\#tc([0-9-a-z-A-Z]*)/', $subject, $matches2);
+
+			if (isset($matches1[1]) && isset($matches2[1]))
+			{
+				//check if order exist in database
+				$ct = new CustomerThread((int)$matches1[1]);
+
+				if (Validate::isLoadedObject($ct) && $ct->token == $matches2[1])
+				{
+					$cm = new CustomerMessage();
+					$cm->id_customer_thread = $ct->id;
+					$cm->message = imap_fetchbody($mbox, $overview->msgno, 1);
+					$cm->add();
+				}
+			}
+			Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'customer_message_sync_imap` (`md5_header`) VALUES (\''.pSQL($md5).'\')');
+	    }
+	}
+	imap_expunge($mbox);
+	imap_close($mbox);
+	die('{"hasError" : false, "errors" : '.$str_errors.$str_errors_delete.'"]}');
+}
+
+/* Modify attribute position */
+if (Tools::isSubmit('ajaxAttributesPositions'))
+{
+	$way = (int)Tools::getValue('way');
+	$id_attribute = (int)Tools::getValue('id_attribute');
+	$id_attribute_group = (int)Tools::getValue('id_attribute_group');
+	$positions = Tools::getValue('attribute');
+
+	if (is_array($positions))
+		foreach ($positions as $position => $value)
+		{
+			// pos[1] = id_attribute_group, pos[2] = id_attribute, pos[3]=old position
+			$pos = explode('_', $value);
+
+			if ((isset($pos[1]) && isset($pos[2])) && ($pos[1] == $id_attribute_group && (int)$pos[2] === $id_attribute))
+			{
+				if ($attribute = new Attribute((int)$pos[2]))
+					if (isset($position) && $attribute->updatePosition($way, $position))
+						echo "ok position ".(int)$position." for attribute ".(int)$pos[2]."\r\n";
+					else
+						echo '{"hasError" : true, "errors" : "Can not update attribute '. (int)$id_attribute . ' to position '.(int)$position.' "}';
+				else
+					echo '{"hasError" : true, "errors" : "This attribute ('.(int)$id_attribute.') can t be loaded"}';
+
+				break;
+			}
+		}
+}
+
+/* Modify group attribute position */
+if (Tools::isSubmit('ajaxGroupsAttributesPositions'))
+{
+	$way = (int)Tools::getValue('way');
+	$id_attribute_group = (int)Tools::getValue('id_attribute_group');
+	$positions = Tools::getValue('attribute_group');
+
+	$new_positions = array();
+	foreach($positions as $k => $v)
+		if (count(explode('_', $v)) == 3)
+			$new_positions[] = $v;
+
+	foreach ($new_positions as $position => $value)
+	{
+		// pos[1] = id_attribute_group, pos[2] = old position
+		$pos = explode('_', $value);
+
+		if (isset($pos[1]) && (int)$pos[1] === $id_attribute_group)
+		{
+			if ($group_attribute = new AttributeGroup((int)$pos[1]))
+				if (isset($position) && $group_attribute->updatePosition($way, $position))
+					echo "ok position ".(int)$position." for group attribute ".(int)$pos[1]."\r\n";
+				else
+					echo '{"hasError" : true, "errors" : "Can not update group attribute '. (int)$id_attribute_group . ' to position '.(int)$position.' "}';
+			else
+				echo '{"hasError" : true, "errors" : "This group attribute ('.(int)$id_attribute_group.') can t be loaded"}';
+
+			break;
+		}
+	}
+}
+
+/* Modify feature position */
+if (Tools::isSubmit('ajaxFeaturesPositions'))
+{
+	$way = (int)Tools::getValue('way');
+	$id_feature = (int)Tools::getValue('id_feature');
+	$positions = Tools::getValue('feature');
+
+	$new_positions = array();
+	foreach($positions as $k => $v)
+		if (!empty($v))
+			$new_positions[] = $v;
+
+	foreach ($new_positions as $position => $value)
+	{
+		// pos[2] = id_feature, pos[3] = old position
+		$pos = explode('_', $value);
+
+		if (isset($pos[2]) && (int)$pos[2] === $id_feature)
+		{
+			if ($feature = new Feature((int)$pos[2]))
+				if (isset($position) && $feature->updatePosition($way, $position))
+					echo "ok position ".(int)$position." for feature ".(int)$pos[1]."\r\n";
+				else
+					echo '{"hasError" : true, "errors" : "Can not update feature '. (int)$id_feature . ' to position '.(int)$position.' "}';
+			else
+				echo '{"hasError" : true, "errors" : "This feature ('.(int)$id_feature.') can t be loaded"}';
+
+			break;
+		}
+	}
+}
+
+/* Modify carrier position */
+if (Tools::isSubmit('ajaxCarriersPositions'))
+{
+	$way = (int)(Tools::getValue('way'));
+	$id_carrier = (int)(Tools::getValue('id_carrier'));
+	$positions = Tools::getValue('carrier');
+
+
+	foreach ($positions as $position => $value)
+	{
+		$pos = explode('_', $value);
+
+		if (isset($pos[2]) && (int)$pos[2] === $id_carrier)
+		{
+			if ($carrier = new Carrier((int)$pos[2]))
+				if (isset($position) && $carrier->updatePosition($way, $position))
+					echo "ok position ".(int)$position." for carrier ".(int)$pos[1]."\r\n";
+				else
+					echo '{"hasError" : true, "errors" : "Can not update carrier '. (int)$id_carrier . ' to position '.(int)$position.' "}';
+			else
+				echo '{"hasError" : true, "errors" : "This carrier ('.(int)$id_carrier.') can t be loaded"}';
+
+			break;
+		}
+	}
+}
+
 if (Tools::isSubmit('searchCategory'))
 {
 	$q = Tools::getValue('q');
@@ -103,7 +969,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`'.Shop::addSqlRestrictionOnLang('cl').')
+		LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.$context->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
@@ -125,6 +991,17 @@ if (Tools::isSubmit('getParentCategoriesId') && $id_category = Tools::getValue('
 	die(Tools::jsonEncode($output));
 }

+/* Update attribute */
+if (Tools::isSubmit('ajaxUpdateTaxRule'))
+{
+	$id_tax_rule = Tools::getValue('id_tax_rule');
+	$tax_rules = new TaxRule((int)$id_tax_rule);
+	$output = array();
+	foreach ($tax_rules as $key => $result)
+		$output[$key] = $result;
+	die(Tools::jsonEncode($output));
+}
+
 if (Tools::isSubmit('getZones'))
 {
 	$zones = Zone::getZones();
@@ -0,0 +1,83 @@
+<?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())
+										jAlert(\''.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>';
@@ -0,0 +1,50 @@
+<?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');
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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
 */
@@ -27,7 +28,7 @@
 define('_PS_ADMIN_DIR_', getcwd());
 include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 /* Getting cookie or logout */
-require_once(_PS_ADMIN_DIR_.'/init.php');
+require_once(dirname(__FILE__).'/init.php');

 $query = Tools::getValue('q', false);
 if (!$query OR $query == '' OR strlen($query) < 1)
@@ -51,16 +52,13 @@ else

 // Excluding downloadable products from packs because download from pack is not supported
 $excludeVirtuals = (bool)Tools::getValue('excludeVirtuals', false);
-$exclude_packs = (bool)Tools::getValue('exclude_packs', 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.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.Context::getContext()->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))' : '').
-		($exclude_packs ? 'AND (p.cache_is_pack IS NULL OR p.cache_is_pack = 0)' : '');
-
+		($excludeVirtuals ? 'AND p.id_product NOT IN (SELECT pd.id_product FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))' : '');
 $items = Db::getInstance()->executeS($sql);

 if ($items)
@@ -0,0 +1,47 @@
+<?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(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'];
+$type = 'text/html';
+$to =  $_GET['testEmail'];
+$from = Configuration::get('PS_SHOP_EMAIL');
+$smtpLogin = $_GET['smtpLogin'];
+$smtpPassword = $_GET['smtpPassword'];
+$smtpPort = $_GET['smtpPort'];
+$smtpEncryption = $_GET['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);
+
@@ -1,7 +1,6 @@
 <?php
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 ?>
@@ -6,8 +6,6 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
@@ -6,8 +6,7 @@
 	 * @since 22/April/2007
 	 *
 	 */
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
@@ -6,8 +6,7 @@
 	 * @since 22/April/2007
 	 *
 	 */
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
@@ -6,8 +6,7 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	
@@ -6,8 +6,7 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
@@ -6,8 +6,7 @@
 	 * @since 22/May/2007
 	 *
 	 */
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
@@ -1,7 +1,6 @@
 <?
 	include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");		
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	$error = '';
@@ -6,8 +6,7 @@
 	 * @since 22/May/2007
 	 *
 	 */	
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());	 
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	 
@@ -22,18 +21,26 @@
 								
 	$upload->setInvalidFileExt(explode(",", CONFIG_UPLOAD_INVALID_EXTS));
 	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_UPLOAD)
+	{
 		$error = SYS_DISABLED;
+	}
 	elseif(empty($_GET['folder']) || !isUnderRoot($_GET['folder']))
+	{
 		$error = ERR_FOLDER_PATH_NOT_ALLOWED;
-	elseif (!$upload->isFileUploaded('file'))
+	}else	if(!$upload->isFileUploaded('file'))
+	{
 		$error = ERR_FILE_NOT_UPLOADED;
-	elseif (!$upload->isPermittedFileExt(explode(",", CONFIG_UPLOAD_VALID_EXTS)))
-		$error = ERR_FILE_TYPE_NOT_ALLOWED;
-	elseif (defined('CONFIG_UPLOAD_MAXSIZE') && CONFIG_UPLOAD_MAXSIZE && $upload->isSizeTooBig(CONFIG_UPLOAD_MAXSIZE))	
-		 $error = sprintf(ERROR_FILE_TOO_BID, transformFileSize(CONFIG_UPLOAD_MAXSIZE));
-	elseif (!$upload->moveUploadedFile($_GET['folder']))
+	}else if(!$upload->moveUploadedFile($_GET['folder']))
+	{
 		$error = ERR_FILE_MOVE_FAILED;
-	else
+	}	
+	elseif(!$upload->isPermittedFileExt(explode(",", CONFIG_UPLOAD_VALID_EXTS)))
+	{		
+		$error = ERR_FILE_TYPE_NOT_ALLOWED;
+	}elseif(defined('CONFIG_UPLOAD_MAXSIZE') && CONFIG_UPLOAD_MAXSIZE && $upload->isSizeTooBig(CONFIG_UPLOAD_MAXSIZE))
+	{		
+		 $error = sprintf(ERROR_FILE_TOO_BID, transformFileSize(CONFIG_UPLOAD_MAXSIZE));
+	}else
 	{
 							include_once(CLASS_FILE);
 							$path = $upload->getFilePath();
@@ -52,7 +59,7 @@
 									$tem[$k] = $v;
 								}
 								
-								$tem['path'] = addslashes(backslashToSlash($path));
+								$tem['path'] = backslashToSlash($path);		
 								$tem['type'] = "file";
 								$tem['size'] = transformFileSize($tem['size']);
 								$tem['ctime'] = date(DATE_TIME_FORMAT, $tem['ctime']);
@@ -65,7 +72,7 @@
 										$info .= sprintf(", %s:'%s'", $k, $v);									
 								}

-								$info .= sprintf(", url:'%s'",  addslashes(getFileUrl($path)));
+								$info .= sprintf(", url:'%s'",  getFileUrl($path));
 								$info .= sprintf(", tipedit:'%s'",  TIP_DOC_RENAME);		

 																				
@@ -1,142 +1,139 @@
-<?php 
-
-	/**
-	 * the php script used to get the list of file or folders under a specific folder
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/May/2007
-	 *
-	 */
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
-	require_once('../../config/config.inc.php');
-	require_once('../init.php');
-
-	if(!isset($manager))
-	{
-		/**
-		 *  this is part of  script for processing file paste 
-		 */
-		//$_GET = $_POST;
-		include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-		include_once(CLASS_PAGINATION);
-		$pagination = new pagination(false);
-		if(!empty($_GET['search']))
-		{
-			include_once(CLASS_SEARCH);
-			if (!preg_match('/^'.Tools::pRegexp(realpath(dirname(__FILE__).'/'.$_GET['search_folder']), '/').'/i', _PS_ROOT_DIR_.'/img/cms'))
-				exit;
-			$search  = new Search($_GET['search_folder']);
-			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
-			$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
-			$search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']);
-			$search->addSearchKeyword('size_from', @$_GET['search_size_from']);
-			$search->addSearchKeyword('size_to', @$_GET['search_size_to']);
-			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
-			$search->addSearchKeyword('name', @$_GET['search_name']);
-			$search->doSearch();
-			$fileList = $search->getFoundFiles();
-			$folderInfo = $search->getRootFolderInfo();			
-			
-		}else 
-		{
-			include_once(CLASS_MANAGER);
-			include_once(CLASS_SESSION_ACTION);
-			$sessionAction = new SessionAction();
-			include_once(DIR_AJAX_INC . "class.manager.php");
-		
-			$manager = new manager();
-			$manager->setSessionAction($sessionAction);
-		
-			$fileList = $manager->getFileList();
-			$folderInfo = $manager->getFolderInfo();	
-						
-		}
-		$pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER);	
-
-	}else 
-	{
-		include_once(CLASS_PAGINATION);
-		$pagination = new pagination(false);			
-	}
-
-		
-		$pagination->setTotal(sizeof($fileList));
-		$pagination->setFirstText(PAGINATION_FIRST);
-		$pagination->setPreviousText(PAGINATION_PREVIOUS);
-		$pagination->setNextText(PAGINATION_NEXT);
-		$pagination->setLastText(PAGINATION_LAST);
-		$pagination->setLimit(!empty($_GET['limit'])?(int)($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT);
-		echo $pagination->getPaginationHTML();
-		echo "<script type=\"text/javascript\">\n";
-		
-        echo "parentFolder = {path:'" . getParentFolderPath($folderInfo['path']). "'};\n"; 
-		echo 'currentFolder ={'; 
-		$count =1;
-		foreach($folderInfo as $k=>$v)
-		{
-			echo ($count++ == 1?'':',') . "'" . $k . "':'" . ($k=='ctime'|| $k=='mtime'?date(DATE_TIME_FORMAT, $v):$v)  . "'";
-
-		}
-		echo "};\n";
-		$fileList = array_slice($fileList, $pagination->getPageOffset(), $pagination->getLimit());
-		echo 'numRows = ' . sizeof($fileList) . ";\n";
-		echo "files = {\n";
-		$count = 1;
-		
-		
-		foreach($fileList as $file)
-		{
-			echo (($count > 1)?",":'').$count++ . ":{";
-			$j = 1;
-			foreach($file as $k=>$v)
-			{
-				
-				if($k  == 'ctime' || $k == 'mtime')
-				{
-					$v = @date(DATE_TIME_FORMAT, $v);
-				}	
-				if($k == 'size')
-				{
-					$v = transformFileSize($v);
-				}
-				echo (($j++ > 1)?",":'') . "'" . addslashes($k) . "':'" . addslashes($v) . "'";
-			}
-			echo (($j++ > 1)?",":'') . "'url':'" . addslashes(getFileUrl($file['path'])) . "'";
-			echo "}\n";				
-		}
-		echo  "};</script>\n";
-	if(!empty($_GET['view']))
-	{
-		switch($_GET['view'])
-		{
-			case 'detail':
-			case 'thumbnail':
-			case 'text':	
-				$view = $_GET['view'];
-				break;
-			default:
-				$view = CONFIG_DEFAULT_VIEW;
-		}
-	}else 
-	{
-		$view = CONFIG_DEFAULT_VIEW;
-	}	
-	switch($view)
-	{
-		case 'text':
-			//list file name only
-			include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php');
-			break;
-		case 'thumbnail':
-			//list file with thumbnail
-			include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php');
-			break;
-		case 'detail':
-		default:
-			include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php');
-	}
-
-	
-
+<?php 
+
+		/**
+	 * the php script used to get the list of file or folders under a specific folder
+	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+	 * @link www.phpletter.com
+	 * @since 22/May/2007
+	 *
+	 */
+	require_once('../../config/config.inc.php');
+	require_once('../init.php');
+
+	if(!isset($manager))
+	{
+		/**
+		 *  this is part of  script for processing file paste 
+		 */
+		//$_GET = $_POST;
+		include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+		include_once(CLASS_PAGINATION);
+		$pagination = new pagination(false);
+		if(!empty($_GET['search']))
+		{
+			include_once(CLASS_SEARCH);
+			
+			$search  = new Search($_GET['search_folder']);
+			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
+			$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
+			$search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']);
+			$search->addSearchKeyword('size_from', @$_GET['search_size_from']);
+			$search->addSearchKeyword('size_to', @$_GET['search_size_to']);
+			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
+			$search->addSearchKeyword('name', @$_GET['search_name']);
+			$search->doSearch();
+			$fileList = $search->getFoundFiles();
+			$folderInfo = $search->getRootFolderInfo();			
+			
+		}else 
+		{
+			include_once(CLASS_MANAGER);
+			include_once(CLASS_SESSION_ACTION);
+			$sessionAction = new SessionAction();
+			include_once(DIR_AJAX_INC . "class.manager.php");
+		
+			$manager = new manager();
+			$manager->setSessionAction($sessionAction);
+		
+			$fileList = $manager->getFileList();
+			$folderInfo = $manager->getFolderInfo();	
+						
+		}
+		$pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER);	
+
+	}else 
+	{
+		include_once(CLASS_PAGINATION);
+		$pagination = new pagination(false);			
+	}
+
+		
+		$pagination->setTotal(sizeof($fileList));
+		$pagination->setFirstText(PAGINATION_FIRST);
+		$pagination->setPreviousText(PAGINATION_PREVIOUS);
+		$pagination->setNextText(PAGINATION_NEXT);
+		$pagination->setLastText(PAGINATION_LAST);
+		$pagination->setLimit(!empty($_GET['limit'])?(int)($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT);
+		echo $pagination->getPaginationHTML();
+		echo "<script type=\"text/javascript\">\n";
+		
+        echo "parentFolder = {path:'" . getParentFolderPath($folderInfo['path']). "'};\n"; 
+		echo 'currentFolder ={'; 
+		$count =1;
+		foreach($folderInfo as $k=>$v)
+		{
+			echo ($count++ == 1?'':',') . "'" . $k . "':'" . ($k=='ctime'|| $k=='mtime'?date(DATE_TIME_FORMAT, $v):$v)  . "'";
+
+		}
+		echo "};\n";
+		$fileList = array_slice($fileList, $pagination->getPageOffset(), $pagination->getLimit());
+		echo 'numRows = ' . sizeof($fileList) . ";\n";
+		echo "files = {\n";
+		$count = 1;
+		
+		
+		foreach($fileList as $file)
+		{
+			echo (($count > 1)?",":'').$count++ . ":{";
+			$j = 1;
+			foreach($file as $k=>$v)
+			{
+				
+				if($k  == 'ctime' || $k == 'mtime')
+				{
+					$v = @date(DATE_TIME_FORMAT, $v);
+				}	
+				if($k == 'size')
+				{
+					$v = transformFileSize($v);
+				}
+				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
+			}
+			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
+			echo "}\n";				
+		}
+		echo  "};</script>\n";
+	if(!empty($_GET['view']))
+	{
+		switch($_GET['view'])
+		{
+			case 'detail':
+			case 'thumbnail':
+			case 'text':	
+				$view = $_GET['view'];
+				break;
+			default:
+				$view = CONFIG_DEFAULT_VIEW;
+		}
+	}else 
+	{
+		$view = CONFIG_DEFAULT_VIEW;
+	}	
+	switch($view)
+	{
+		case 'text':
+			//list file name only
+			include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php');
+			break;
+		case 'thumbnail':
+			//list file with thumbnail
+			include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php');
+			break;
+		case 'detail':
+		default:
+			include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php');
+	}
+
+	
+
 ?>
@@ -1,6 +1,4 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
@@ -1,6 +1,5 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 		/**
@@ -1,6 +1,5 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
@@ -1,6 +1,5 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
@@ -1,6 +1,5 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
@@ -1,6 +1,5 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
@@ -1,6 +1,5 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
@@ -1,6 +1,5 @@
 <?php 
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
@@ -1,6 +1,5 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
@@ -1,6 +1,5 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
@@ -1,6 +1,5 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 		/**
@@ -1,6 +1,5 @@
 <?php
-	if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd());
+	define('_PS_ADMIN_DIR_', getcwd());
 	require_once('../../config/config.inc.php');
 	require_once('../init.php');
 	/**
@@ -33,15 +33,15 @@
 					$this->fileInfo['atime'] = $this->fileStat[8];
 					$this->fileInfo['ctime'] = $this->fileStat[10];	
 					$this->fileInfo['mtime'] = $this->fileStat[9];
-					$this->fileInfo['path'] = addslashes($path);
-					$this->fileInfo['name'] = addslashes(basename($path));
+					$this->fileInfo['path'] = $path;
+					$this->fileInfo['name'] = basename($path);	
 					$this->fileInfo['is_writable'] = $this->isWritable();
 					$this->fileInfo['is_readable'] = $this->isReadable();
 				}elseif(is_dir($this->filePath))
 				{
 					$this->fileStat = @stat($path);
-					$this->fileInfo['name'] = addslashes(basename($path));
-					$this->fileInfo['path'] = addslashes($path);
+					$this->fileInfo['name'] = basename($path);
+					$this->fileInfo['path'] = $path;
 					$this->fileInfo['atime'] = $this->fileStat[8];
 					$this->fileInfo['ctime'] = $this->fileStat[10];	
 					$this->fileInfo['mtime'] = $this->fileStat[9];
@@ -78,9 +78,9 @@
 	define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid
 	
 	define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
-	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png');// // 
+	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png');// // 
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');//
-	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,jpeg,jpeg,png');
+	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,png');
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
 	define('CONFIG_UPLOAD_INVALID_EXTS', '');

@@ -10,9 +10,6 @@
 	
 	//FILESYSTEM CONFIG	<br>
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.auth.php");	
-	if (_PS_MODE_DEMO_)
-		die('This functionality has been disabled.');
-
 	define('CONFIG_QUERY_STRING_ENABLE', true); //Enable passed query string to setting the system configuration
 	if(!isset($_SESSION))
 	{
@@ -73,9 +73,9 @@
 	define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid
 	
 	define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
-	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png,txt'); // 
+	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');//
-	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,jpeg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf');
+	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf');
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
 	define('CONFIG_UPLOAD_INVALID_EXTS', '');

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -394,7 +394,7 @@
 	
 	function disableConstraint()
 	{
-		$('#constraint').attr('disabled', true);
+		$('#constraint').attr('disabled', 'disabled');
 	};
 	function ShowHandlers()
 	{
@@ -496,7 +496,7 @@
 	*/
 	function cancelChangeMode()
 	{
-		$('#formAction input[@value=' + $('#image_mode').val() + ']').attr('checked', true);
+		$('#formAction input[@value=' + $('#image_mode').val() + ']').attr('checked', 'checked');	
 	};
 	/**
 	*	get the image element which is going to be modified
@@ -669,7 +669,7 @@ function toggleDisabledButton(buttonId, forceDisable)
 		if(forceDisable && currentClass == 'button')
 		{
 			newClass = 'disabledButton';
-			$(disabledButton).attr('disabled', true);
+			$(disabledButton).attr('disabled', 'disabled');				
 		}else if(!forceDisable && currentClass == 'disabledButton')
 		{
 			newClass = 'button';
@@ -684,7 +684,7 @@ function toggleDisabledButton(buttonId, forceDisable)
 	else if(currentClass == 'button')
 	{
 		newClass = 'disabledButton';
-		$(disabledButton).attr('disabled', true);
+		$(disabledButton).attr('disabled', 'disabled');	
 	}else
 	{
 		newClass = 'button';
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -1,35 +0,0 @@
-<?php
-/*
-* 2007-2013 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-2013 PrestaShop SA
-*  @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;
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,12 +19,14 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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');

 if (!Context::getContext()->employee->isLoggedBack())
@@ -33,15 +35,15 @@ if (!Context::getContext()->employee->isLoggedBack())
 $tabAccess = Profile::getProfileAccess(Context::getContext()->employee->id_profile, Tab::getIdFromClassName('AdminBackup'));

 if ($tabAccess['view'] !== '1')
-	die (Tools::displayError('You do not have permission to view this.'));
+	die (Tools::displayError('You do not have permission to view here'));

 $backupdir = realpath(_PS_ADMIN_DIR_ . '/backups/');

 if ($backupdir === false)
-	die (Tools::displayError('A "Backup" directory does not exist.'));
+	die (Tools::displayError('Backups directory does not exist.'));

 if (!$backupfile = Tools::getValue('filename'))
-	die (Tools::displayError('No file has been specified.'));
+	die (Tools::displayError('No file specified'));

 // Check the realpath so we can validate the backup file is under the backup directory
 $backupfile = realpath($backupdir.'/'.$backupfile);
@@ -58,7 +60,7 @@ else
 $fp = @fopen($backupfile, 'r');

 if ($fp === false)
-	die (Tools::displayError('Unable to open backup file(s).').' "'.addslashes($backupfile).'"');
+	die (Tools::displayError('Unable to open backup file').' "'.addslashes($backupfile).'"');

 // Add the correct headers, this forces the file is saved
 header('Content-Type: '.$contentType);
@@ -70,4 +72,4 @@ $ret = @fpassthru($fp);
 fclose($fp);

 if ($ret === false)
-	die (Tools::displayError('Unable to display backup file(s).').' "'.addslashes($backupfile).'"');
+	die (Tools::displayError('Unable to display backup file').' "'.addslashes($backupfile).'"');
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -0,0 +1,85 @@
+<?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$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+/**
+ * @since 1.5.0
+ */
+
+define('_PS_ADMIN_DIR_', getcwd());
+include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+
+if (!Context::getContext()->employee->id)
+	Tools::redirectAdmin('index.php?controller=AdminLogin');
+
+/*
+ * Functions allowed
+ */
+$functions = array(
+	'id_supply_order' => 'exportSupplyOrder',
+);
+
+/*
+ * Depending on $_GET, call the corresponding function
+ */
+foreach ($functions as $var => $function)
+{
+	if (isset($_GET[$var]))
+	{
+		call_user_func($function);
+		die;
+	}
+}
+
+/**
+ * Function used for SupplyOrder
+ */
+function exportSupplyOrder()
+{
+	//@TODO Checks if employee has enough access to export
+	if (!isset($_GET['id_supply_order']))
+		die (Tools::displayError('Missing supply order ID'));
+
+	$id_supply_order = (int)$_GET['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'));
+
+    $details = $supply_order->getEntriesCollection($supply_order->id_lang);
+    exportCSV($details, 'supply_order_'.$supply_order->reference.'_details');
+}
+
+/**
+ * Main function to export CSV
+ * @param object|Array $object
+ * @param string $template
+ */
+function exportCSV(&$object, $filename)
+{
+    $csv = new CSV($object, $filename);
+    $csv->export();
+}
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,14 +19,14 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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());
-require_once(_PS_ADMIN_DIR_.'/../config/config.inc.php');
-require_once(_PS_ADMIN_DIR_.'/init.php');
+require_once(dirname(__FILE__).'/../config/config.inc.php');
+require_once(dirname(__FILE__).'/init.php');

 if (isset($_GET['img']) AND Validate::isMd5($_GET['img']) AND isset($_GET['name']) AND Validate::isGenericName($_GET['name']) AND file_exists(_PS_UPLOAD_DIR_.$_GET['img']))
 {
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,13 +19,14 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 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
 */

 define('_PS_ADMIN_DIR_', getcwd());
-include_once(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+include_once(dirname(__FILE__).'/../config/config.inc.php');

 $module = Tools::getValue('module');
 $render = Tools::getValue('render');
@@ -37,60 +38,12 @@ $height = Tools::getValue('height');
 $id_employee = Tools::getValue('id_employee');
 $id_lang = Tools::getValue('id_lang');

-if (!isset($cookie->id_employee) || !$cookie->id_employee  || $cookie->id_employee != $id_employee)
-    die(Tools::displayError());
-    
-if (!Validate::isModuleName($module))
-	die(Tools::displayError());
+if (Context::getContext()->employee->id != $id_employee)
+	die;

 if (!Tools::file_exists_cache($module_path = dirname(__FILE__).'/../modules/'.$module.'/'.$module.'.php'))
 	die(Tools::displayError());

-$shop_id = '';
-Shop::setContext(Shop::CONTEXT_ALL);
-if (Context::getContext()->cookie->shopContext)
-{
-	$split = explode('-', Context::getContext()->cookie->shopContext);
-	if (count($split) == 2)
-	{
-		if ($split[0] == 'g')
-		{
-			if (Context::getContext()->employee->hasAuthOnShopGroup($split[1]))
-				Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
-			else
-			{
-				$shop_id = Context::getContext()->employee->getDefaultShopID();
-				Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
-			}
-		}
-		else if (Shop::getShop($split[1]) && Context::getContext()->employee->hasAuthOnShop($split[1]))
-		{
-			$shop_id = $split[1];
-			Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
-		}
-		else
-		{
-			$shop_id = Context::getContext()->employee->getDefaultShopID();
-			Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
-		}
-	}
-}
-
-// Check multishop context and set right context if need
-if (Shop::getContext())
-{
-	if (Shop::getContext() == Shop::CONTEXT_SHOP && !Shop::CONTEXT_SHOP)
-		Shop::setContext(Shop::CONTEXT_GROUP, Shop::getContextShopGroupID());
-	if (Shop::getContext() == Shop::CONTEXT_GROUP && !Shop::CONTEXT_GROUP)
-		Shop::setContext(Shop::CONTEXT_ALL);
-}
-
-// Replace existing shop if necessary
-if (!$shop_id)
-	Context::getContext()->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
-elseif (Context::getContext()->shop->id != $shop_id)
-	Context::getContext()->shop = new Shop($shop_id);
-
 require_once($module_path);

 $graph = new $module();
@@ -101,3 +54,4 @@ if ($option)

 $graph->create($render, $type, $width, $height, $layers);
 $graph->draw();
+
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,25 +19,26 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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
 */

 echo '			</div>
 			</div>
-			'.Hook::exec('displayBackOfficeFooter').'
+			'.Hook::exec('backOfficeFooter').'
 			<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 />
-					<span style="font-size:10px">'.Translate::getAdminTranslation('Load time:').' '.number_format(microtime(true) - $timerStart, 3, '.', '').'s</span>
+					<span style="font-size:10px">'.translate('Load time:').' '.number_format(microtime(true) - $timerStart, 3, '.', '').'s</span>
 				</div>
 				<div style="float:right;height:40px;margin-right:10px;line-height:38px;vertical-align:middle">';
 if (strtoupper(Context::getContext()->language->iso_code) == 'FR') echo '<span style="color: #812143; font-weight: bold;">Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h ';

-echo '				| <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Contact').'</a>
-					| <a href="http://forge.prestashop.com" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Bug Tracker').'</a>
-					| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">'.Translate::getAdminTranslation('Forum').'</a>	
+echo '				| <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">'.translate('Contact').'</a>
+					| <a href="http://forge.prestashop.com" target="_blank" class="footer_link">'.translate('Bug Tracker').'</a>
+					| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">'.translate('Forum').'</a>	
 				</div>
 			</div>
 		</div>
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,15 +19,18 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 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
 */
+
 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();
@@ -39,7 +42,7 @@ function bindDatepicker($id, $time)

 	echo '
 	$(function() {
-		$("#'.Tools::htmlentitiesUTF8($id).'").datepicker({
+		$("#'.$id.'").datepicker({
 			prevText:"",
 			nextText:"",
 			dateFormat:"yy-mm-dd"'.($time ? '+time' : '').'});
@@ -56,12 +59,10 @@ function bindDatepicker($id, $time)
 function includeDatepicker($id, $time = false)
 {
 	Tools::displayAsDeprecated();
-	echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/jquery-ui.will.be.removed.in.1.6.js"></script>';
-	echo '<link type="text/css" rel="stylesheet" href="'.__PS_BASE_URI__.'js/jquery/ui/themes/ui-lightness/jquery.ui.theme.css" />';
-	echo '<link type="text/css" rel="stylesheet" href="'.__PS_BASE_URI__.'js/jquery/ui/themes/ui-lightness/jquery.ui.datepicker.css" />';	
+	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-'.Tools::htmlentitiesUTF8($iso).'.js"></script>';
+		echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/ui/i18n/jquery.ui.datepicker-'.$iso.'.js"></script>';
 	echo '<script type="text/javascript">';
 		if (is_array($id))
 			foreach ($id as $id2)
@@ -92,10 +93,9 @@ 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_);
-	$defines['_PS_CREATION_DATE_'] = addslashes(_PS_CREATION_DATE_);
-	
 	if (defined('_RIJNDAEL_KEY_'))
 		$defines['_RIJNDAEL_KEY_'] = addslashes(_RIJNDAEL_KEY_);
 	if (defined('_RIJNDAEL_IV_'))
@@ -104,8 +104,8 @@ function	rewriteSettingsFile($baseUrls = NULL, $theme = NULL, $arrayDB = NULL)
 	$content = "<?php\n\n";
 	foreach ($defines as $k => $value)
 		$content .= 'define(\''.$k.'\', \''.addslashes($value).'\');'."\n";
-	copy(_PS_ADMIN_DIR_.'/../config/settings.inc.php', _PS_ADMIN_DIR_.'/../config/settings.old.php');
-	if ($fd = fopen(_PS_ADMIN_DIR_.'/../config/settings.inc.php', 'w'))
+	$content .= "\n?>";
+	if ($fd = @fopen(_PS_ADMIN_DIR_.'/../config/settings.inc.php', 'w'))
 	{
 		fwrite($fd, $content);
 		fclose($fd);
@@ -148,12 +148,11 @@ 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'.Shop::addSqlRestrictionOnLang('cl').')
+					LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category'.$context->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);
@@ -163,10 +162,9 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
 			$nCategories = (int)sizeof($categories);
 			foreach ($categories AS $category)
 			{
-				$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> ';
+				$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> ';
 				$fullPath .= $edit.
-				($n < $nCategories ? '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&viewcategory&token='.Tools::getAdminToken('AdminCategories'.(int)(Tab::getIdFromClassName('AdminCategories')).(int)$context->employee->id).'" title="'.htmlentities($category['name'], ENT_NOQUOTES, 'UTF-8').'">' : '').
+				($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').'">' : '').
 				(!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)) ? ' > ' : '');
@@ -223,16 +221,8 @@ function checkPSVersion()
 	return $upgrader->checkPSVersion();
 }

-/**
- * Deprecated since > 1.5.4.1
- * Use Translate::getAdminTranslation($string) instead
- *
- * @param string $string
- */
 function translate($string)
 {
-	Tools::displayAsDeprecated();
-	
 	global $_LANGADM;
 	if (!is_array($_LANGADM))
 		return str_replace('"', '&quot;', $string);
@@ -241,6 +231,7 @@ function translate($string)
 	return str_replace('"', '&quot;', stripslashes($str));
 }

+
 /**
 * Returns a new Tab object
 *
@@ -259,20 +250,20 @@ function checkingTab($tab)
 	{
 		if (isset(AdminTab::$tabParenting[$tab]))
 			Tools::redirectAdmin('?tab='.AdminTab::$tabParenting[$tab].'&token='.Tools::getAdminTokenLite(AdminTab::$tabParenting[$tab]));
-		echo sprintf(Tools::displayError('Page %s cannot be found..'),$tab);
+		echo sprintf(Tools::displayError('Tab %s cannot be found.'),$tab);
 		return false;
 	}

 	// Class file is included in Dispatcher::dispatch() function
 	if (!class_exists($tab, false) OR !$row['id_tab'])
 	{
-		echo sprintf(Tools::displayError('The class %s cannot be found.'),$tab);
+		echo sprintf(Tools::displayError('Tab file %s cannot be found.'),$tab);
 		return false;
 	}
 	$adminObj = new $tab;
 	if (!$adminObj->viewAccess() AND ($adminObj->table != 'employee' OR Context::getContext()->employee->id != Tools::getValue('id_employee') OR !Tools::isSubmit('updateemployee')))
 	{
-		$adminObj->_errors = array(Tools::displayError('Access denied.'));
+		$adminObj->_errors = array(Tools::displayError('Access denied'));
 		echo $adminObj->displayErrors();
 		return false;
 	}
@@ -398,6 +389,47 @@ 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
 *
@@ -418,7 +450,7 @@ function runAdminTab($tab, $ajaxMode = false)
 	// $tab = $_REQUEST['tab'];
 	if ($adminObj = checkingTab($tab))
 	{
-		Context::getContext()->controller = $adminObj;
+		$noTabLink = $adminObj->noTabLink;
 		// init is different for new tabs (AdminController) and old tabs (AdminTab)
 		if ($adminObj instanceof AdminController)
 		{
@@ -438,7 +470,7 @@ function runAdminTab($tab, $ajaxMode = false)
 			$bread = '';
 			foreach ($tabs AS $key => $item)
 			{
-				$bread .= ' <img src="../img/admin/separator_breadcrumb.png" style="margin-right:5px" alt="&gt;" />';
+				$bread .= ' <img src="../img/admin/separator_breadcrum.png" style="margin-right:5px" alt="&gt;" />';
 				if (count($tabs) - 1 > $key)
 					$bread .= '<a href="?tab='.$item['class_name'].'&token='.Tools::getAdminToken($item['class_name'].intval($item['id_tab']).(int)Context::getContext()->employee->id).'">';

@@ -468,19 +500,16 @@ function runAdminTab($tab, $ajaxMode = false)
 				echo '<div class="path_bar">
 			<div id="help-button" class="floatr" style="display: none; font-family: Verdana; font-size: 10px; margin-right: 4px; margin-top: 4px;">
 			</div>
-				<a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.Translate::getAdminTranslation('Back Office').'</a>
+				<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() && Shop::getContext() != Shop::CONTEXT_ALL && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL)
+			if (!$ajaxMode && Shop::isFeatureActive() && Context::shop() != Shop::CONTEXT_ALL)
 			{
 				echo '<div class="multishop_info">';
-				if (Shop::getContext() == Shop::CONTEXT_GROUP)
-				{
-					$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
-					printf(Translate::getAdminTranslation('You are configuring your store for group shop %s'), '<b>'.$shop_group->name.'</b>');
-				}
-				elseif (Shop::getContext() == Shop::CONTEXT_SHOP)
-					printf(Translate::getAdminTranslation('You are configuring your store for shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
+				if (Context::shop() == Shop::CONTEXT_GROUP)
+					printf(translate('You are configuring your store for group shop %s'), '<b>'.Context::getContext()->shop->getGroup()->name.'</b>');
+				elseif (Context::shop() == Shop::CONTEXT_SHOP)
+					printf(translate('You are configuring your store for shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
 				echo '</div>';
 			}
 			if (Validate::isLoadedObject($adminObj))
@@ -553,8 +582,8 @@ function runAdminTab($tab, $ajaxMode = false)


 						// we can display the correct url
-						// die(Tools::jsonEncode(array(Translate::getAdminTranslation('Invalid security token'),$url)));
-						die(Tools::jsonEncode(Translate::getAdminTranslation('Invalid security token')));
+						// die(Tools::jsonEncode(array(translate('Invalid security token'),$url)));
+						die(Tools::jsonEncode(translate('Invalid security token')));
 					}
 					else
 					{
@@ -566,17 +595,17 @@ function runAdminTab($tab, $ajaxMode = false)
 						if (false === strpos($url, '?token=') AND false === strpos($url, '&token='))
 							$url .= '&token='.$adminObj->token;

-						$message = Translate::getAdminTranslation('Invalid security token');
+						$message = translate('Invalid security token');
 						echo '<html><head><title>'.$message.'</title></head><body style="font-family:Arial,Verdana,Helvetica,sans-serif;background-color:#EC8686">
 							<div style="background-color:#FAE2E3;border:1px solid #000000;color:#383838;font-weight:700;line-height:20px;margin:0 0 10px;padding:10px 15px;width:500px">
 								<img src="../img/admin/error2.png" style="margin:-4px 5px 0 0;vertical-align:middle">
 								'.$message.'
 							</div>';
 						echo '<a href="'.htmlentities($url).'" method="get" style="float:left;margin:10px">
-								<input type="button" value="'.Tools::htmlentitiesUTF8(Translate::getAdminTranslation('I understand the risks and I really want to display this page')).'" style="height:30px;margin-top:5px" />
+								<input type="button" value="'.Tools::htmlentitiesUTF8(translate('I understand the risks and I really want to display this page')).'" style="height:30px;margin-top:5px" />
 							</a>
 							<a href="index.php" method="get" style="float:left;margin:10px">
-								<input type="button" value="'.Tools::htmlentitiesUTF8(Translate::getAdminTranslation('Take me out of here!')).'" style="height:40px" />
+								<input type="button" value="'.Tools::htmlentitiesUTF8(translate('Take me out of here!')).'" style="height:40px" />
 							</a>
 						</body></html>';
 						die;
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,11 +19,12 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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());
-require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+require(dirname(dirname(__FILE__)).'/config/config.inc.php');
 Controller::getController('GetFileController')->run();
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,13 +19,14 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+include_once(dirname(__FILE__).'/../config/config.inc.php');

 $module = Tools::getValue('module');
 $render = Tools::getValue('render');
@@ -40,9 +41,8 @@ $dir = Tools::getValue('dir', 0); // Should be a String : Either ASC or DESC
 $id_employee = (int)(Tools::getValue('id_employee'));
 $id_lang = (int)(Tools::getValue('id_lang'));

-
-if (!isset($cookie->id_employee) || !$cookie->id_employee  || $cookie->id_employee != $id_employee)
-    die(Tools::displayError());
+if (Context::getContext()->employee->id != $id_employee)
+	die;

 if (!Validate::isModuleName($module))
 	die(Tools::displayError());
@@ -50,53 +50,6 @@ if (!Validate::isModuleName($module))
 if (!Tools::file_exists_cache($module_path = dirname(__FILE__).'/../modules/'.$module.'/'.$module.'.php'))
 	die(Tools::displayError());

-	
-$shop_id = '';
-Shop::setContext(Shop::CONTEXT_ALL);
-if (Context::getContext()->cookie->shopContext)
-{
-	$split = explode('-', Context::getContext()->cookie->shopContext);
-	if (count($split) == 2)
-	{
-		if ($split[0] == 'g')
-		{
-			if (Context::getContext()->employee->hasAuthOnShopGroup($split[1]))
-				Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
-			else
-			{
-				$shop_id = Context::getContext()->employee->getDefaultShopID();
-				Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
-			}
-		}
-		else if (Shop::getShop($split[1]) && Context::getContext()->employee->hasAuthOnShop($split[1]))
-		{
-			$shop_id = $split[1];
-			Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
-		}
-		else
-		{
-			$shop_id = Context::getContext()->employee->getDefaultShopID();
-			Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
-		}
-	}
-}
-
-// Check multishop context and set right context if need
-if (Shop::getContext())
-{
-	if (Shop::getContext() == Shop::CONTEXT_SHOP && !Shop::CONTEXT_SHOP)
-		Shop::setContext(Shop::CONTEXT_GROUP, Shop::getContextShopGroupID());
-	if (Shop::getContext() == Shop::CONTEXT_GROUP && !Shop::CONTEXT_GROUP)
-		Shop::setContext(Shop::CONTEXT_ALL);
-}
-
-// Replace existing shop if necessary
-if (!$shop_id)
-	Context::getContext()->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
-elseif (Context::getContext()->shop->id != $shop_id)
-	Context::getContext()->shop = new Shop($shop_id);
-	
-	
 require_once($module_path);

 $grid = new $module();
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 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
 */
@@ -36,26 +37,24 @@ echo '
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="robots" content="NOFOLLOW, NOINDEX" />
-		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/ui/themes/base/jquery.ui.datepicker.css" />
+		<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_JS_DIR_.'jquery/plugins/cluetip/jquery.cluetip.css" />
-		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/admin.css" />
-		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.css" />
-		<title>PrestaShop&trade; - '.Translate::getAdminTranslation('Administration panel').'</title>
+		<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" />
+		<title>PrestaShop&trade; - '.translate('Administration panel').'</title>
 		<script type="text/javascript">
 			var helpboxes = '.Configuration::get('PS_HELPBOX').';
 			var roundMode = '.Configuration::get('PS_PRICE_ROUND_MODE').';
 		</script>
-		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/jquery-'._PS_JQUERY_VERSION_.'.min.js"></script>
+		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/jquery-1.4.4.min.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/jquery.hoverIntent.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/cluetip/jquery.cluetip.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'admin.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'toggle.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'tools.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'ajax.js"></script>
-		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.js"></script>
 		<link rel="shortcut icon" href="'._PS_IMG_.'favicon.ico" />
-		'.Hook::exec('displayBackOfficeHeader').'
+		'.Hook::exec('backOfficeHeader').'
 		<!--[if IE]>
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin-ie.css" />
 		<![endif]-->
@@ -78,7 +77,7 @@ echo '
 						html = "";
 						nb_notifs = 0;
 						$.each(json.order, function(property, value) {
-							html += "<li>'.Translate::getAdminTranslation('A new order has been made on your shop.').'<br />'.Translate::getAdminTranslation('Order number : ').'<strong>#" + parseInt(value.id_order) + "</strong><br />'.Translate::getAdminTranslation('Total : ').'<strong>" + value.total_paid_real + "</strong><br />'.Translate::getAdminTranslation('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'&vieworder&id_order=" + parseInt(value.id_order) + "\">'.Translate::getAdminTranslation('Click here to see that order').'</a></li>";
+							html += "<li>'.translate('A new order has been made on your shop.').'<br />'.translate('Order number : ').'<strong>#" + parseInt(value.id_order) + "</strong><br />'.translate('Total : ').'<strong>" + value.total_paid_real + "</strong><br />'.translate('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'&vieworder&id_order=" + parseInt(value.id_order) + "\">'.translate('Click here to see that order').'</a></li>";
 						});

 						if (html != "")
@@ -94,12 +93,12 @@ echo '
 						{
 							$("#orders_notif_number_wrapper").hide();
 						}
-
+						
 						// Add customers notifications to the list
 						html = "";
 						nb_notifs = 0;
 						$.each(json.customer, function(property, value) {
-							html += "<li>'.Translate::getAdminTranslation('A new customer registered on your shop.').'<br />'.Translate::getAdminTranslation('Customer name : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'&viewcustomer&id_customer=" + parseInt(value.id_customer) + "\">'.Translate::getAdminTranslation('Click here to see that customer').'</a></li>";
+							html += "<li>'.translate('A new customer registered on your shop.').'<br />'.translate('Customer name : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'&viewcustomer&id_customer=" + parseInt(value.id_customer) + "\">'.translate('Click here to see that customer').'</a></li>";
 						});
 						if (html != "")
 						{
@@ -121,7 +120,7 @@ echo '
 						html = "";
 						nb_notifs = 0;
 						$.each(json.customer_message, function(property, value) {
-							html += "<li>'.Translate::getAdminTranslation('A new message posted on your shop.').'<br />'.Translate::getAdminTranslation('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'&viewcustomer_thread&id_customer_thread=" + parseInt(value.id_customer_thread) + "\">'.Translate::getAdminTranslation('Click here to see that message').'</a></li>";
+							html += "<li>'.translate('A new message posted on your shop.').'<br />'.translate('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'&viewcustomer_thread&id_customer_thread=" + parseInt(value.id_customer_thread) + "\">'.translate('Click here to see that message').'</a></li>";
 						});

 						if (html != "")
@@ -148,15 +147,12 @@ echo '
 			';
 			if (Shop::isFeatureActive())
 			{
-				if (Shop::getContext() == Shop::CONTEXT_ALL)
-					$youEditFieldFor = Translate::getAdminTranslation('A modification of this field will be applied for all shops');
-				elseif (Shop::getContext() == Shop::CONTEXT_GROUP)
-				{
-					$shop_group = new ShopGroup((int)Shop::getContextShopGroupID());
-					$youEditFieldFor = sprintf(Translate::getAdminTranslation('A modification of this field will be applied for all shops of group %s'), '<b>'.$shop_group->name.'</b>');
-				}
+				if (Context::shop() == Shop::CONTEXT_ALL)
+					$youEditFieldFor = translate('A modification of this field will be applied for all shops');
+				else if (Context::shop() == Shop::CONTEXT_GROUP)
+					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for all shops of group %s'), '<b>'.Context::getContext()->shop->getGroup()->name.'</b>');
 				else
-					$youEditFieldFor = sprintf(Translate::getAdminTranslation('A modification of this field will be applied for the shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
+					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for the shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
 				echo 'hints.html(hints.html()+\'<br /><span class="red">'.addslashes($youEditFieldFor).'</span>\');';
 			}

@@ -202,10 +198,10 @@ echo '		var html = "";
 				{
 					echo '<div id="orders_notif" class="notifs"><span id="orders_notif_number_wrapper" class="number_wrapper"><span id="orders_notif_value">0</span></span>
 							<div id="orders_notif_wrapper" class="notifs_wrapper">
-								<h3>'.Translate::getAdminTranslation('Last orders').'</h3>
-								<p class="no_notifs">'.Translate::getAdminTranslation('No new orders has been made on your shop').'</p>
+								<h3>'.translate('Last orders').'</h3>
+								<p class="no_notifs">'.translate('No new orders has been made on your shop').'</p>
 								<ul id="list_orders_notif"></ul>
-								<p><a href="index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'">'.Translate::getAdminTranslation('Show all orders').'</a></p>
+								<p><a href="index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'">'.translate('Show all orders').'</a></p>
 							</div>
 						</div>';
 				}
@@ -213,10 +209,10 @@ echo '		var html = "";
 				{
 					echo '<div id="customers_notif" class="notifs notifs_alternate"><span id="customers_notif_number_wrapper" class="number_wrapper"><span id="customers_notif_value">0</span></span>
 							<div id="customers_notif_wrapper" class="notifs_wrapper">
-								<h3>'.Translate::getAdminTranslation('Last customers').'</h3>
-								<p class="no_notifs">'.Translate::getAdminTranslation('No new customers registered on your shop').'</p>
+								<h3>'.translate('Last customers').'</h3>
+								<p class="no_notifs">'.translate('No new customers registered on your shop').'</p>
 								<ul id="list_customers_notif"></ul>
-								<p><a href="index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'">'.Translate::getAdminTranslation('Show all customers').'</a></p>
+								<p><a href="index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'">'.translate('Show all customers').'</a></p>
 							</div>
 						</div>';
 				}
@@ -224,46 +220,37 @@ echo '		var html = "";
 				{
 					echo '<div id="customer_messages_notif" class="notifs"><span id="customer_messages_notif_number_wrapper" class="number_wrapper"><span id="customer_messages_notif_value">0</span></span>
 							<div id="customer_messages_notif_wrapper" class="notifs_wrapper">
-								<h3>'.Translate::getAdminTranslation('Last messages').'</h3>
-								<p class="no_notifs">'.Translate::getAdminTranslation('No new messages posted on your shop').'</p>
+								<h3>'.translate('Last messages').'</h3>
+								<p class="no_notifs">'.translate('No new messages posted on your shop').'</p>
 								<ul id="list_customer_messages_notif"></ul>
-								<p><a href="index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'">'.Translate::getAdminTranslation('Show all messages').'</a></p>
+								<p><a href="index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'">'.translate('Show all messages').'</a></p>
 							</div>
 						</div>';
 				}
-	echo			'</div>
-	
-	<div id="employee_box">
-				<div id="employee_infos">
-					<div class="employee_name">'.Translate::getAdminTranslation('Welcome,').' <strong>'.Context::getContext()->employee->firstname.'&nbsp'.Context::getContext()->employee->lastname.'</strong></div>
-					<div class="clear"></div>
-					<ul id="employee_links">
-						<li><a href="'.htmlentities(Context::getContext()->link->getAdminLink('AdminEmployees'), ENT_COMPAT, 'UTF-8').'&id_employee={$employee->id}&amp;updateemployee">'.Translate::getAdminTranslation('My preferences').'</a></li>
-						<li class="separator">&nbsp;</li>
-						<li><a id="header_logout" href="index.php?logout">'.Translate::getAdminTranslation('logout').'</a></li>
-					</ul>';
-					if (defined(_PS_BASE_URL_))
-						echo '<a href="'._PS_BASE_URL_.'" id="header_foaccess" target="_blank" title="'.Translate::getAdminTranslation('View my shop').'">'.Translate::getAdminTranslation('View my shop').'</a>';
-				echo '</div>
-			</div>
-			
+	echo		'</div><span id="employee_links">
+				<a href="index.php?controller=AdminEmployees&id_employee='.(int)Context::getContext()->employee->id.'&updateemployee&token='.Tools::getAdminTokenLite('AdminEmployees').'" class="employee">'.translate('My preferences').'</a>
+				<span class="separator"></span>
+				<span class="employee_name">
+				'.Tools::substr(Context::getContext()->employee->firstname, 0, 1).'.&nbsp;'.htmlentities(Context::getContext()->employee->lastname, ENT_COMPAT, 'UTF-8').'
+				</span><span class="separator"></span><a href="index.php?logout" id="header_logout"><span>'.translate('logout').'</span></a><span class="separator"></span>';
+				if (Context::getContext()->shop->getBaseURL())
+					echo '<a href="'.Context::getContext()->shop->getBaseURL().'" id="header_foaccess" target="_blank" title="'.translate('View my shop').'"><span>'.translate('View my shop').'</span></a>';
+			echo '</span>
 			<div id="header_search">
-			
-				<form method="post" action="index.php?controller=AdminSearch&amp;token='.Tools::getAdminTokenLite('AdminSearch').'">
-					<input type="text" name="bo_query" id="bo_query" value="'.Tools::safeOutput(Tools::stripslashes(Tools::getValue('bo_query'))).'" />
-					<select name="bo_search_type" id="bo_search_type" class="chosen no-search">
-						<option value="0">'.Translate::getAdminTranslation('everywhere').'</option>
-						<option value="1" '.(Tools::getValue('bo_search_type') == 1 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('catalog').'</option>
-						<optgroup label="'.Translate::getAdminTranslation('customers').':">
-							<option value="2" '.(Tools::getValue('bo_search_type') == 2 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('by name').'</option>
-							<option value="6" '.(Tools::getValue('bo_search_type') == 6 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('by ip address').'</option>
-						</optgroup>
-						<option value="3" '.(Tools::getValue('bo_search_type') == 3 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('orders').'</option>
-						<option value="4" '.(Tools::getValue('bo_search_type') == 4 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('invoices').'</option>
-						<option value="5" '.(Tools::getValue('bo_search_type') == 5 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('carts').'</option>
-						<option value="7" '.(Tools::getValue('bo_search_type') == 7 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('modules').'</option>
+				<form method="post" action="index.php?controller=AdminSearch&token='.Tools::getAdminTokenLite('AdminSearch').'">
+					<input type="text" name="bo_query" id="bo_query"
+						value="'.Tools::safeOutput(Tools::stripslashes(Tools::getValue('bo_query'))).'"
+					/>
+					<select name="bo_search_type" id="bo_search_type">
+						<option value="0">'.translate('everywhere').'</option>
+						<option value="1" '.(Tools::getValue('bo_search_type') == 1 ? 'selected="selected"' : '').'>'.translate('catalog').'</option>
+						<option value="2" '.(Tools::getValue('bo_search_type') == 2 ? 'selected="selected"' : '').'>'.translate('customers').'</option>
+						<option value="6" '.(Tools::getValue('bo_search_type') == 6 ? 'selected="selected"' : '').'>'.translate('ip address').'</option>
+						<option value="3" '.(Tools::getValue('bo_search_type') == 3 ? 'selected="selected"' : '').'>'.translate('orders').'</option>
+						<option value="4" '.(Tools::getValue('bo_search_type') == 4 ? 'selected="selected"' : '').'>'.translate('invoices').'</option>
+						<option value="5" '.(Tools::getValue('bo_search_type') == 5 ? 'selected="selected"' : '').'>'.translate('carts').'</option>
 					</select>
-					<input type="submit" id="bo_search_submit" class="button" value="'.Translate::getAdminTranslation('Search').'"/>
+					<input type="submit" id="bo_search_submit" class="button" value="'.translate('Search').'"/>
 				</form>
 			</div>
 			<div id="header_quick">
@@ -277,7 +264,7 @@ echo '		var html = "";
 				}
 				</script>
 				<select onchange="quickSelect(this);" id="quick_select">
-					<option value="0">'.Translate::getAdminTranslation('Quick Access').'</option>';
+					<option value="0">'.translate('Quick Access').'</option>';
 foreach (QuickAccess::getQuickAccesses(Context::getContext()->language->id) AS $quick)
 {
 	preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $adminTab);
@@ -292,8 +279,11 @@ foreach (QuickAccess::getQuickAccesses(Context::getContext()->language->id) AS $
 echo '			</select>
 			</div>';

+		if (Shop::isFeatureActive())
+			echo '<div id="header_shoplist">'.translate('Select your shop:').' '.generateShopList().'</div>';
+
 		echo '</div>';
-			echo Hook::exec('displayBackOfficeTop');
+			echo Hook::exec('backOfficeTop');
 			echo '<ul id="menu">';

 if (empty($tab))
@@ -321,6 +311,10 @@ 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,18 +336,9 @@ echo '
 				<div id="main">
 				<div id="content">'
 			.(file_exists(_PS_ADMIN_DIR_.'/../install') ? '<div style="background-color: #FFEBCC;border: 1px solid #F90;line-height: 20px;margin: 0px 0px 10px;padding: 10px 20px;">'
-				.Translate::getAdminTranslation('For security reasons, you must also:').' '.
-				Translate::getAdminTranslation('delete the /install folder').
+				.translate('For security reasons, you must also:').' '.
+				translate('delete the /install folder').
 				'</div>' : '').'
 				';
 				if(defined('_PS_MODE_DEV_') && _PS_MODE_DEV_)
 					echo '<div class="warn">This tab is an AdminTab</div>';
-
-if (Shop::isFeatureActive() && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL)
-{
-   echo '<div class="multishop_toolbar">
-        <span class="text_multishop">'.Translate::getAdminTranslation('Multistore configuration for').'</span>'.
-		Helper::renderShopList();
-    echo '</div>';
-}
-
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,27 +19,15 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 7451 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */

-$timer_start = microtime(true);
 define('_PS_ADMIN_DIR_', getcwd());
-
-if (!defined('PS_ADMIN_DIR'))
-	define('PS_ADMIN_DIR', _PS_ADMIN_DIR_);
-
-require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
-require(_PS_ADMIN_DIR_.'/functions.php');
-
-//small test to clear cache after upgrade
-if (Configuration::get('PS_UPGRADE_CLEAR_CACHE'))
-{
-	header('Cache-Control: max-age=0, must-revalidate');
-	header('Expires: Mon, 06 Jun 1985 06:06:00 GMT+1');
-	Configuration::updateValue('PS_UPGRADE_CLEAR_CACHE', 0);
-}
+require(dirname(__FILE__).'/../config/config.inc.php');
+require(dirname(__FILE__).'/functions.php');

 // For retrocompatibility with "tab" parameter
 if (!isset($_GET['controller']) && isset($_GET['tab']))
@@ -50,4 +38,7 @@ if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
 	$_REQUEST['controller'] = strtolower($_REQUEST['tab']);

 // Prepare and trigger admin dispatcher
-Dispatcher::getInstance()->dispatch();
+Dispatcher::getInstance()->setDefaultController('AdminHome');
+Dispatcher::getInstance()->setControllerNotFound('AdminNotFound');
+Dispatcher::getInstance()->setControllerDirectories(array(_PS_ADMIN_DIR_.'/tabs/', _PS_ADMIN_CONTROLLER_DIR_));
+Dispatcher::getInstance()->dispatch();
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 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
 */
@@ -30,122 +31,69 @@ $timerStart = microtime(true);
 //	$_GET['tab'] = $_GET['controller'];
 //	$_POST['tab'] = $_POST['controller'];
 //	$_REQUEST['tab'] = $_REQUEST['controller'];
-try
+
+$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'))
 {
-	$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;
-	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php'))
-		include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
-	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php'))
-		include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
-	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/admin.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;
-	if (!defined('_PS_BASE_URL_'))
-		define('_PS_BASE_URL_', Tools::getShopDomain(true));
-	if (!defined('_PS_BASE_URL_SSL_'))
-		define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
-
-	$path = dirname(__FILE__).'/themes/';
-	// if the current employee theme is not valid (check layout.tpl presence), 
-	// 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'));
-
-
-	if ($context->employee->isLoggedBack())
-	{
-		$shop_id = '';
-		Shop::setContext(Shop::CONTEXT_ALL);
-		if ($context->cookie->shopContext)
-		{
-			$split = explode('-', $context->cookie->shopContext);
-			if (count($split) == 2)
+	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'))
 			{
-				if ($split[0] == 'g')
-				{
-					if ($context->employee->hasAuthOnShopGroup($split[1]))
-						Shop::setContext(Shop::CONTEXT_GROUP, $split[1]);
-					else
-					{
-						$shop_id = $context->employee->getDefaultShopID();
-						Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
-					}
-				}
-				elseif ($context->employee->hasAuthOnShop($split[1]))
-				{
-					$shop_id = $split[1];
-					Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
-				}
-				else
-				{
-					$shop_id = $context->employee->getDefaultShopID();
-					Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
-				}
+				$employee->bo_theme = $theme;
+				break;
 			}
-		}
+	$context->employee->update();
+}

-		// 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)
+// Change shop context ?
+if (Shop::isFeatureActive() && Tools::getValue('setShopContext') !== false)
 {
-	$e->displayMessage();
+	$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'));
+
+$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);
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 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
 */
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,24 +19,20 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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');

-/**
- * @deprecated 1.5.0
- * This file is deprecated, please use AdminPdfController instead
- */
-Tools::displayFileAsDeprecated();
+include(_PS_ADMIN_DIR_.'/../config/config.inc.php');

 if (!Context::getContext()->employee->id)
 	Tools::redirectAdmin('index.php?controller=AdminLogin');

-$function_array = array(
+$functionArray = array(
 	'pdf' => 'generateInvoicePDF',
 	'id_order_slip' => 'generateOrderSlipPDF',
 	'id_delivery' => 'generateDeliverySlipPDF',
@@ -48,12 +44,162 @@ $function_array = array(
 	'id_supply_order' => 'generateSupplyOrderFormPDF'
 );

-$pdf_controller = new AdminPdfController();
-foreach ($function_array as $var => $function)
+foreach ($functionArray as $var => $function)
 	if (isset($_GET[$var]))
 	{
-		$pdf_controller->{'process'.$function}();
-		exit;
+		call_user_func($function);
+		die;
 	}

-exit;
+function generateSupplyOrderFormPDF()
+{
+	if (!isset($_GET['id_supply_order']))
+		die (Tools::displayError('Missing supply order ID'));
+
+	$id_supply_order = (int)$_GET['id_supply_order'];
+	$supply_order = new SupplyOrder($id_supply_order);
+
+	if (!Validate::isLoadedObject($supply_order))
+		die(Tools::displayError('Cannot find this supply order in the database'));
+
+    generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM);
+}
+
+function generateInvoicePDF()
+{
+	if (Tools::isSubmit('id_order'))
+		generateInvoicePDFByIdOrder(Tools::getValue('id_order'));
+	elseif (Tools::isSubmit('id_order_invoice'))
+		generateInvoicePDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
+	else
+		die (Tools::displayError('Missing order ID or invoice order ID'));
+	exit;
+}
+
+function generateInvoicePDFByIdOrder($id_order)
+{
+	$order = new Order($id_order);
+	if (!Validate::isLoadedObject($order))
+		die(Tools::displayError('Cannot find order in database'));
+
+	$order_invoice_list = $order->getInvoicesCollection();
+	Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => $order_invoice_list));
+	generatePDF($order_invoice_list, PDF::TEMPLATE_INVOICE);
+}
+
+function generateInvoicePDFByIdOrderInvoice($id_order_invoice)
+{
+	$order_invoice = new OrderInvoice($id_order_invoice);
+	if (!Validate::isLoadedObject($order_invoice))
+		die(Tools::displayError('Cannot find order invoice in database'));
+
+	Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => array($order_invoice)));
+	generatePDF($order_invoice, PDF::TEMPLATE_INVOICE);
+}
+
+function generateOrderSlipPDF()
+{
+	$orderSlip = new OrderSlip((int)($_GET['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);
+}
+
+function generateDeliverySlipPDF()
+{
+	if (Tools::isSubmit('id_order'))
+		generateDeliverySlipPDFByIdOrder(Tools::getValue('id_order'));
+	elseif (Tools::isSubmit('id_order_invoice'))
+		generateDeliverySlipPDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
+	elseif (Tools::isSubmit('id_delivery'))
+	{
+		$order = Order::getByDelivery(Tools::getValue('id_delivery'));
+		generateDeliverySlipPDFByIdOrder($order->id);
+	}
+	else
+		die (Tools::displayError('Missing order ID or invoice order ID'));
+	exit;
+}
+
+function generateDeliverySlipPDFByIdOrder($id_order)
+{
+	$order = new Order($id_order);
+	if (!Validate::isLoadedObject($order))
+		throw new PrestashopException('Can\'t load Order object');
+
+	$order_invoice_collection = $order->getInvoicesCollection();
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
+}
+
+function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice)
+{
+	$order_invoice = new OrderInvoice($id_order_invoice);
+	if (!Validate::isLoadedObject($order_invoice))
+		throw new PrestashopException('Can\'t load Order Invoice object');
+
+	generatePDF($order_invoice, PDF::TEMPLATE_DELIVERY_SLIP);
+}
+
+function generateInvoicesPDF()
+{
+	$id_orders_list = OrderInvoice::getByDateInterval($_GET['date_from'], $_GET['date_to'], NULL, 'invoice');
+
+	if (!is_array($id_orders_list))
+		die (Tools::displayError('No invoices found'));
+
+ 	 generateOrderInvoicesPDF($id_orders_list);
+}
+
+function generateInvoicesPDF2()
+{
+	$id_orders_list = 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);
+
+ 	 generateOrderInvoicesPDF($id_orders_list);
+}
+
+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);
+}
+
+function generateOrderSlipsPDF()
+{
+	$id_order_slips_list = OrderSlip::getSlipsIdByDate($_GET['date_from'], $_GET['date_to']);
+	if (!count($id_order_slips_list))
+		die (Tools::displayError('No order slips found'));
+
+    $order_slips = array();
+    foreach ($id_order_slips_list as $id_order_slips)
+        $order_slips[] = new OrderSlip((int)$id_order_slips);
+
+    generatePDF($order_slips, PDF::TEMPLATE_ORDER_SLIP);
+}
+
+function generateDeliverySlipsPDF()
+{
+	$slips = unserialize(urldecode($_GET['deliveryslips']));
+	if (is_array($slips))
+        generatePDF($slips, PDF::TEMPLATE_DELIVERY_SLIP);
+}
+
+
+function generatePDF($object, $template)
+{
+    global $smarty;
+    $pdf = new PDF($object, $template, $smarty);
+    $pdf->render();
+}
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,14 +19,13 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @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');
-Context::getContext()->shop->setContext(Shop::CONTEXT_ALL);
+include(dirname(__FILE__).'/../config/config.inc.php');

 if (substr(_COOKIE_KEY_, 34, 8) != Tools::getValue('token'))
 	die;
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -17,24 +17,18 @@ label {color:#585a69;text-shadow:0 1px 0#fff;}
 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; background-color:#fff;}
-input[type="text"]:disabled,input[type="password"]:disabled,input[type="file"]:disabled,textarea:disabled {border:1px solid #ccc; background-color:#dedede; color: #444444;}
+input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc;}
 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}
+select[disabled="disabled"], input[disabled="disabled"],textarea[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}

-.icon {vertical-align:middle}
-.icon-top {vertical-align:top}
-
 /*BUTTON*/
-.button{
-	cursor: pointer;
-	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;
+.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;margin: 0;outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; 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;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}
 .button.bt-icon { display:inline-block; margin-bottom:7px;}
 .button.bt-icon span {padding-left:5px;}
@@ -47,44 +41,32 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #top_container{margin:0;padding:0}

 /*HEADER*/
-#header { background-color: #394049; height:90px; }
-/* Portrait orientation targeting */ 
-@media screen and (orientation: portrait) {#header{min-width:1250px}}
-/* Portrait orientation targeting */ 
-@media screen and (orientation: landscape) {#header{min-width:1250px}}
-#header #header_infos{ position:relative; margin: 0; padding:0; height:60px; }
-#header #header_shopname {float: left; margin:10px 15px 0 10px;}
-#header #employee_box {float: right; display:block;}
-#header #employee_infos {display:block; margin:5px 15px 0 10px;}
-#header #employee_infos a{color:#BABABA; text-transform:capitalize;margin-right: 5px}
-#header #employee_infos a:hover {color:#fff;}
-#header #employee_infos .employee_name { float:left; color:#fff;padding: 0 20px 0 0;}
-#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top;height: 19px; width: 16px; margin-right: 5px}
-#header ul#employee_links  {list-style: none;display: block;text-align: left;}
-#header ul#employee_links li {display: inline;line-height: 20px;}
-
+#header { background-color: #394049; height:114px; }
+#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 .employee_name { float:left; color:#fff;}
+#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 a#header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; 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; 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:80px !important;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_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;}
+#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('../img/icon-search.png') no-repeat scroll center; border:none; width:27px; height:27px; float:left; font-weight:normal; margin:0; padding:0;  cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; /*hacking ie7*/ font-size:0 !ie7; color: transparent !ie;}
 #header #header_quick{float:right; display:block; margin-top:15px;}
-#header #header_quick #quick_select_chzn{ font-size:13px; margin:0 10px 0 0; padding:0px 0 4px;  }
+#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('../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:95px;}
+#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('../img/notif_order.png') no-repeat center top;}
 #customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
@@ -107,23 +89,21 @@ 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;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
-#header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 3px 4px 0;font-weight:normal;font-size:12px;}
+#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.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.maintab:hover, #header #menu li.active {border-left:1px solid #49B2FF;border-right:1px solid #49B2FF;}
-#header #menu li.active a.title, #header #menu li:hover a.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
+#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('../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{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;}
 #header #menu .submenu li a:hover { background-color:#eee; text-shadow:0 1px 0 #fff;}
-#header #menu .submenu li.active a { color: #fff;}
-#header #menu .submenu li.active a:hover { color:#666666}

 /*SEPARATION*/
 .separation { background-color:#ccc;border-bottom:1px solid #fff; width:100%; height:1px; margin:10px 0;}
@@ -132,19 +112,18 @@ 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;
+	/*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; 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.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:hover td{background:#fff1b5}
+.table tr.filter:hover td{background:#F1F9FF}
+.table tr td: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}
@@ -152,11 +131,8 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table tr td.last{border-right:1px solid #DEDEDE}
 .table tr.small td{height:15px}
 .table tr.last td{border-bottom:none}
-.col-left {vertical-align:top; padding-right:10px;}
-.col-right {padding-bottom:5px;}
+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}
@@ -164,13 +140,6 @@ 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;}
@@ -193,25 +162,14 @@ a.module_toggle_all{color: #268CCD;}
 /*TABLE STATUS COMMANDE*/
 .table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}

-/*multishop toolbar*/
-.multishop_toolbar { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; font-size: 18px;}
-.multishop_toolbar span.text_multishop {vertical-align: 7px; padding-right: 5px; }
-.multishop_toolbar select.shopList { width: 300px; }
-.multishop_toolbar a.chzn-single { background: url('../img/icon-multishop.png') no-repeat 5px 5px; padding: 1px 2px 2px 25px; font-weight: bold; }
-
-.multishop_toolbar .chzn-container .chzn-results .first{font-weight: bold;background-color: #408BD5;color: #ffffff;}
-.multishop_toolbar .chzn-container .chzn-results .group{font-weight: bold;font-style: italic;padding-left: 15px;background-color: #C6DEFC;}
-.multishop_toolbar .chzn-container .chzn-results .shop{padding-left: 30px;background-color: #EAF2FC;}
-
 /*toolbarBox*/
-.toolbar-placeholder {position:relative}
-.toolbarBox {background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 5px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;position:relative}
+.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: 1.6em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;}
+.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0;}
 .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;-moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;}
+.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('../img/process-icon-delete.png');}
 .toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png');}
@@ -230,9 +188,6 @@ a.module_toggle_all{color: #268CCD;}
 .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-import { background-image: url('../img/process-icon-export-csv.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');}
@@ -242,115 +197,26 @@ a.module_toggle_all{color: #268CCD;}
 .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');}
-.toolbarBox .process-icon-modules-list{ background-image: url('../img/process-icon-modules-list.png');}

-.toolbarReduced {margin-right:221px}
-#modules_list_button {width:211px;height:63px;border:none;position:absolute;top:0;right:0;background-image:url('../img/modules_list_button.png');font-size: 1.6em;cursor:pointer;padding-left:45px}
-
-.toolbarBox #modules_list_container {
-	background: none repeat scroll 0 0 #FFF;
-	border: solid 1px #CCC;
-	display: block;
-	float: right;
-	height: auto;
-	width: 500px;
-	position: absolute;
-	right: 13px;
-	top: 63px;
-	z-index: 100;
-	box-shadow: 1px 5px 5px #CCCCCC;
-	-moz-box-shadow: 1px 5px 10px #CCCCCC;
-	-webkit-box-shadow: 1px 5px 10px #CCCCCC;
-	opacity: 1;
-
-}
-.toolbarBox #modules_list_container #modules_list_container_content
-{
-	max-height: 500px;
-    overflow: auto;
-
-}
-
-.toolbarBox #modules_list_container #modules_list_container_tab {margin-top: 10px;width: auto;height: auto; }
-.toolbarBox #modules_list_container #modules_list_container_tab table {width: 100%;border-spacing: 0px;  }
-.toolbarBox #modules_list_container #modules_list_container_tab tr { height: auto}
-.toolbarBox #modules_list_container #modules_list_container_tab tr.rowalt {background-color: #F0F7FF}
-.toolbarBox #modules_list_container #modules_list_container_tab #tab_module_switch {margin-bottom: 10px;}
-.toolbarBox #modules_list_container #modules_list_loader {margin-top: 10px}
-.toolbarBox #modules_list_container .nav-tabs-modules:after {clear: both;}
-.toolbarBox #modules_list_container .nav-tabs-modules > li {height: 19px;}
-.toolbarBox #modules_list_container .nav-tabs-modules > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px;
-}
-
-.toolbarBox #modules_list_container .nav-tabs-modules > li > a {
-  padding-top: 8px;
-  padding-bottom: 7px;
-  border: 1px solid transparent;
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-     -o-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
-}
-
-.toolbarBox #modules_list_container .nav-tabs-modules > li > a:hover {
-  border-color: #C0C0C0;
-  background-color: #ffffff;
-}
-
-.toolbarBox #modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;border-bottom:none;}
-
-.toolbarBox #modules_list_container .nav-tabs-modules > .active > a,
-.toolbarBox #modules_list_container .nav-tabs-modules > .active > a:hover {
-  color: #555555;
-  cursor: default;
-  background-color: #F8F8F8;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-}
-
-
-
-
-div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;margin:auto}
+div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}

 /*button upload files*/
-#content .qq-upload-button {
-	background: #e4e4e4 url('../img/bg-button-degrade.png') repeat-x scroll left top;
-	background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
-	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
-	color:#333;
-	width:180px;
-	text-shadow: 0 1px 0 #fff;
-	border-color: #CCCCCC #BBBBBB #A0A0A0;
-	border-left: 1px solid #BBBBBB;
-	border-radius: 3px 3px 3px 3px;
-	border-right: 1px solid #BBBBBB;
-	border-style: solid;
-	border-width: 1px;
-	color: #000000;
-}
-#content .qq-upload-button:hover { border:1px solid #939393;}
-
-.file_upload_label {margin-top:5px;}
-
+.qq-upload-button {
+		background: #e4e4e4 url('../img/bg-button-degrade.png') repeat-x scroll left top;
+		background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
+		background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
+		color:#333; width:180px; font-weight:bold; text-shadow: 0 1px 0 #fff;
+	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;}
+.qq-upload-button:hover { border:1px solid #939393;}
 /*leadin*/
-.leadin {}
-.leadin .bloc-leadin{ padding:10px 3px;}
+.leadin { padding:10px;}

 /*productBox*/
 #productBox { position:relative; width:100%; float:left;}

 /*tab-pane*/
-form#product_form, form#access_form, form#cart_rule_form, #modules_tab_list { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;}
-#modules_tab_list {min-height: inherit}
+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;}
@@ -363,13 +229,13 @@ 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;}

 /*FILTER MODULE*/
-.filter-module { background-color:#ebedf4; border:1px solid #c2c4d9; padding:10px; display:block; min-height:35px;}
+.filter-module { background-color:#ebedf4; border:1px solid #c2c4d9; margin-top:10px; padding:10px; display:block; min-height:25px;}
 .filter-module #filternameForm {float:left; margin-right:30px;}
 .filter-module label {width:auto;}
 .filter-module .select-filter { float:left;}
@@ -404,9 +270,8 @@ 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; 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 a {color:#3a6ea7; padding-left:5px;}
+.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
 .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
 .sidebar .categorieStatus { display:none;}

@@ -421,27 +286,19 @@ form#product_form h4 { font-size:18px; font-weight:normal;}

 /*STATCONTAINER*/
 #statsContainer {margin-left:220px; padding:0 0 0 20px;}
-#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 #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 .blocStats { background-color: #EBEDF4;border: 1px solid #C2C4D9; display: block; position:relative; padding: 10px;}
-#statsContainer .blocStats h2 { font-weight:normal; margin:0; font-size:1.4em}
+#statsContainer .blocStats h2 { font-weight:normal; margin:0;}
 #statsContainer .blocStats h2.icon-statsproduct span,
 #statsContainer .blocStats h2.icon-statsbestsuppliers span,
 #statsContainer .blocStats h2.icon-statsforecast span,
@@ -500,14 +357,13 @@ 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;}
 #moduleContainer .table tr th { height:40px;}
-#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 td { vertical-align:top; padding: 5px 7px 0; border-top:1px dotted #ccc; border-bottom:none;}
 #moduleContainer .table tr:first-child {border-top:1px solid #ccc}
-#moduleContainer .table tr td .imgm , #modules_list_container_tab .imgm {width:32px;}
+#moduleContainer .table tr td .imgm {width:32px;}
 #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;}
@@ -516,11 +372,10 @@ 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-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  {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.non-install { background-color:#ec7000;}
-#moduleContainer .setup.must-have { background-color: #ec7000;}
-#moduleContainer .setup.off{ background-color:#ccc; color:#666666}
-#moduleContainer .row-actions-module span {padding-right:5px;}
+#moduleContainer .setup.off{ background-color:#ccc;}
+#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;}
@@ -530,54 +385,6 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #moduleContainer .moduleGridDesc h3 { color:#3A6EA7; margin:0;}
 #moduleContainer ul.listing-grid-module li select { position:absolute; top:0; right:0px; }

-/*TAB MODULES LIST*/
-
-#modules_list_container_tab #modules_list_container_content{
-	list-style-type:none; 
-	padding:0; 
-	margin:0;
-	white-space: nowrap;
-	overflow: auto;
-	height: 370px;
-}
-#modules_list_container_tab #modules_list_container_content li{display:inline-block;}
-#modules_list_container_tab table tr th { height:40px;}
-#modules_list_container_tab table tr td { font-size:12px; padding: 3px 3px 3px; border-top:1px solid #ccc; border-bottom:none;}
-#modules_list_container_tab table tr td tr td {border: none}
-#modules_list_container_tab table tr:first-child {border-top:1px solid #ccc}
-#modules_list_container_tab .imgm {width:32px;}
-#modules_list_container_tab .moduleDesc {font-size:12px}
-#modules_list_container_tab .moduleDesc h3 { color:#3A6EA7;margin: 0;font-size: 1.1em;text-align: left;white-space: normal;}
-#modules_list_container_tab .moduleDesc .metadata  { float:left; display:block; margin:5px 0;}
-#modules_list_container_tab .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;}
-#modules_list_container_tab .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;}
-#modules_list_container_tab .moduleDesc .metadata dl dd { padding-right:10px;}
-#modules_list_container_tab .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
-#modules_list_container_tab .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic;  font-size:12px; text-align: left;white-space: normal;}
-#modules_list_container_tab .setup  {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; padding:0 10px; display: inline-block; border-radius:3px;}
-#modules_list_container_tab .row-actions-module {float: right;}
-#modules_list_container_tab .setup.non-install { background-color:#ec7000;}
-#modules_list_container_tab .setup.must-have { background-color: #ec7000;}
-#modules_list_container_tab .setup.off{ background-color:#ccc; color:#666666}
-#modules_list_container_tab .row-actions-module span { padding-right:5px;}
-#modules_list_container_tab .row-actions-module span a { font-size:12px;}
-#modules_list_container_tab ul.listing-grid-module { position:relative; margin:0; padding:0;}
-#modules_list_container_tab ul.listing-grid-module li { float:left; border:1px solid #ccc; width:400px; min-height:30px; margin:10px; padding:5px; border-radius:4px;}
-#modules_list_container_tab .moduleGridDesc { position:relative; display:block; height:30px;}
-#modules_list_container_tab .moduleGridDesc h3 { color:#3A6EA7; margin:0;}
-#modules_list_container_tab ul.listing-grid-module li select { position:absolute; top:0; right:0px; }
-
-.default_modules_list_display_type #modules_list_container_content li table tr td{border: none}
-.default_modules_list_display_type #modules_list_container_content li table {border:solid 1px #ccc;height:105px;width:100%;margin-bottom:10px}
-#modules_list_container_tab ul li {height:105px}
-
-		/******** ie7 ******/
-		.ie7 #modules_list_container_tab #modules_list_container_content li{zoom:1;display:inline;}
-		.ie7 #modules_list_container_content li table {width: 21%;}
-		.ie7 #modules_list_container_content li table td .btn_right{width:100%;float:right;}
-		.ie7 #modules_list_container_content li table td .btn_right select{float:left;}
-		.ie7 #modules_list_container_content li table td a.button{display:block;float:right;}
-
 /*MODULE POSITION*/
 .blocLiveEdit { float:right; clear:right;  background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block;  width:250px;}
 .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;}
@@ -589,89 +396,15 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #modulePosition .table tr th { height:40px;}
 #modulePosition form{ margin-right:270px;}
 #modulePosition .lab_modules_positions h3 { color:#3A6EA7; margin:0 0 0 10px; float:left;}
-#modulePosition .lab_modules_positions p { font-family:Georgia; font-style: italic; font-size:12px; padding-left:40px; clear:both;}
-#modulePosition .lab_modules_positions span { font-size:12px; padding-top:4px; padding-left:5px; 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;}

 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;}
-
-.tooltip { position: relative; }
-.tooltip .tooltip_content {
-	z-index: 100;
-	text-align: left;
-	display: none;
-	white-space: nowrap;
-	position: absolute;
-	padding: 5px 5px;
-	background: black;
-	color: white;
-	box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.5);
-	margin-top: 5px;
-}
-.tooltip .tooltip_label { cursor: pointer; }
-.tooltip .title { text-align: center; padding-bottom: 5px; display: block; font-weight: bold }
-.tooltip:hover .tooltip_content { display: block; }
-.tooltip_button {
-	border: 1px solid silver;
-	border-radius: 3px;
-	padding: 0 3px;
-	background: -moz-linear-gradient(top, #ddd, #aaa);
-	background: -o-linear-gradient(top, #ddd, #aaa);
-	background: -webkit-linear-gradient(top, #ddd, #aaa);
-	background: linear-gradient(top, #ddd, #aaa);
-	color: #666
-}
-
-/******** CREATE AN ORDER **************/
-
-#carrier_form label{padding-top:0}
-#carrier_form input{margin-top:3px}
-
-/************** SCENE *****************/
-
-#large_scene_image{clear:both;border:1px solid transparent;}
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 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
 */
@@ -1,3 +1,65 @@
+body {font-family: Arial, Helvetica, sans-serif;}
+
+
+h1, h2, h3, h4  { font-family: Arial, Helvetica, sans-serif; margin-bottom:.5em; line-height:1.4em; }
+h2  { font-size:1.7em; }
+h3  { font-size:1.25em; }
+h4  { font-size:1.05em; }
+h6  { font-size:1em; }
+
+
+/*LIST*/
+ul,ol {list-style:none; margin: 0; padding: 0;}
+
+/*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}
+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;}
+select[disabled="disabled"], input[disabled="disabled"],textarea[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;}
+
+/*BUTTON*/
+.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;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap;}
+.button[disabled=disabled]{color:#8C8C8C}
+input.button[disabled=disabled]:hover{background-color:#FFF6D3}
+.button:hover{border:1px solid #939393;}
+.button:active{border:1px solid #939393;}
+
+#top_container{margin:0;padding:0}
+
+/*HEADER*/
+#header { background-color: #394049; height:114px; }
+#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 .employee_name { float:left; color:#fff;}
+#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('../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;}
+#header #header_infos #header_foaccess a {color:#fff !important;}
+#header #header_search{ float:left; margin-top:15px; }
+#header #header_search #bo_query{float:left;background: none repeat scroll 0 0 #fff;  border-color: #666666 #CCCCCC #CCCCCC;
+    border-style:solid dotted solid solid;
+    border-width: 1px; color: #333; font: 13px Arial,sans-serif; padding: 4px 1px 4px 4px; width: 180px;
+    box-shadow: 0 1px 0 #444444;}
+#header #header_search #bo_search_type{float:left; margin:0; padding:3px 0 4px; vertical-align:middle;width:auto; border-color: #666666 #CCCCCC #CCCCCC;
+    border-style:solid solid solid none; height:25px;
+    border-width: 1px;}
+#header #header_search #bo_search_submit { border-color: #CCCCCC #BBBBBB; float:left; font-weight:normal; margin:0; padding: 4px 8px 3px;  cursor:pointer; text-shadow: 0 1px 0 #fff; border-bottom-left-radius: 0; border-left: 0 none; border-top-left-radius: 0; }
+#header #header_quick{float:right; display:block; margin-top:15px;}
+#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('../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;}
@@ -9,32 +71,131 @@
 #customers_notif.open_notifs,
 #messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }

+
+.number_wrapper {color: white;display: none;font-size: 13px;font-weight: bold;position: absolute; right: -8px;top: -10px;z-index: 101;padding: 2px 5px;}
+.number_wrapper span {background-color: #F03D25;display: block;padding: 0 2px;border-color: -moz-use-text-color #DD3822 #DD3822;border-radius: 2px 2px 2px 2px;border-right: 1px solid #DD3822;border-style: none solid solid;border-width: 0 0px;}
+.notifs_wrapper {background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #000; border-top:none;display: none; cursor:auto; position: absolute; top: 25px; left: -1px; width:300px; padding: 10px;color: black; z-index:9999;}
+.notifs_wrapper h3 {font-size: 14px;padding-bottom:8px;margin:0;border-bottom: 1px solid #E5E5E5;}
+.notifs_wrapper ul {padding:6px 0;margin:0;}
+.notifs_wrapper ul li {text-decoration: none;list-style: none;font-size:12px;padding:5px 0;}
+#header_infos .notifs_wrapper a {font-weight: bold; font-size:11px; color: black; float:right;}
+.notifs_wrapper p {font-size: 12px;padding-top:8px;margin:0;border-top: 1px solid #E5E5E5;}
+.notifs_wrapper p.no_notifs {border: none;}
+
+
+/*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.submenu_size .title{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.active span.title, #header #menu li:hover span.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
+#header #menu .withLeftBorder{background:transparent url('../img/separator_subnav.png') no-repeat 0 5px}
+#header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 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;}
+#header #menu .submenu li a:hover { background-color:#eee; text-shadow:0 1px 0 #fff;}
+
+/*SEPARATION*/
+.separation { background-color:#ccc;border-bottom:1px solid #fff; width:100%; height:1px; margin:10px 0;}
+
+/*TABLE*/
+.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 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-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;}
+.table tr td{border-bottom:1px solid #ccc;color:#333;font-size:11px;padding: 2px 4px 2px 6px}
+.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}
+.table tr td.first{border-left:1px solid #DEDEDE}
+.table tr td.last{border-right:1px solid #DEDEDE}
+.table tr.small td{height:15px}
+.table tr.last td{border-bottom:none}
+td.col-left {vertical-align:top; padding-right:10px;}
+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}
+.path_bar a{font-weight:700}
+.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}
+
+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;}
+.nbr_module{float:right;margin-right:10px;font-style:italic;font-size:12px;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 {-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;}
+
+/*TABLE STATUS COMMANDE*/
+.table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; text-shadow:0 1px 0 #fff; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
+
 /*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: bold; line-height: 48px; margin: 0; padding: 0}
-.toolbarBox ul.cc_button {float:right;margin: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-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff}
+.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: bold; line-height: 48px; margin: 0; padding: 0;}
+.toolbarBox ul.cc_button {float:right;margin: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-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('../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')}
+.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px;}
+.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:11}
+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;}
+/*leadin*/
+.leadin { padding:10px;}
+
+/*productBox*/
+#productBox { position:relative; width:100%; float:left;}
+
+/*tab-pane*/
+form#product, form#access_form{   background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px; margin-left:140px;}
+/*form.defaultForm{   background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px;}*/
+.tab-row {}
+.tab-row .tab {background:#EFEFEF;width:100px;}
+.tab-row .tab-page.selected {}
+.tab-row .tab-page {}
+.productTabs{ background-color:#fafafa; border:1px solid #ccced7; border-right:none; float:left; width:140px;}
+.productTabs ul{padding:0;margin:0;}
+.productTabs ul li.tab-row { border:none; }
+.productTabs ul li.tab-row:first-child  a {border-top:none;}
+.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;}


 /*FILTER MODULE*/
@@ -52,15 +213,14 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
 .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 { text-indent:5px; overflow:hidden;}
+.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left: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 { font-size:12px; vertical-align:top; padding: 5px 7px 0; border-top:1px solid #ccc; border-bottom:none;}
+#moduleContainer .table tr td { vertical-align:top; padding: 5px 7px 0; border-top:1px dotted #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;}
@@ -70,15 +230,14 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
 #moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
 #moduleContainer .moduleDesc p.desc { color:#666; 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.non-install { border: solid 1px #ec7000; background-color: #ffedb1; color: #ec7000}
-#moduleContainer .setup.must-have { background-color: #ec7000;}
+#moduleContainer .setup.non-install { background-color:#ec7000;}
 #moduleContainer .setup.off{ background-color:#ccc;}
 #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; 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;}
+#moduleContainer .button.installed { float:right; clear:both; margin-top:15px; font-size:12px;}
+
+
+/*FOOTER*/
+#footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
+#footer .footer_link, #footer .footer_link:hover {color:#D41958;}
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2011 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
 */
--- a/Show More
+++ b/Show More