// Fix upgrade

.gitignore

@@ -7,15 +7,6 @@
 .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/*
@@ -25,7 +16,6 @@ cache/tcpdf/*
 !cache/tcpdf/index.php
 config/xml/*.xml
 config/settings.inc.php
-config/settings.old.php
 log/*.log
 img/*
 !img/index.php
@@ -36,72 +26,4 @@ tools/smarty*/compile/*.php
 !tools/smarty*/compile/index.php
 override/classes/*.php
 themes/default/cache/*.js
-themes/default/cache/*.css
+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

404.php

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

CONTRIBUTING.md

@@ -8,5 +8,5 @@ All core files you commit in your pull request must have Open Software License (
 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
+[2]: http://docs.prestashop.com/display/PS15/Coding+Standard
-[3]: http://docs.prestashop.com/display/PS15/How+to+write+a+commit+message
+[3]: http://docs.prestashop.com/display/PS15/How+to+write+a+commit+message

CONTRIBUTORS.md

@@ -1,161 +1,58 @@
-- adonis karavokyros
+	- (d)oekia
-- aFolletete
+	- Caleydon Media
-- Agence CINS
+	- Damien Metzger
-- aKorczak
+	- DamienMetzger
-- Alexander Otchenashev
+	- Damon Skelhorn
-- anat
+	- David Gasperoni
-- Andrew
+	- François Gaillard
-- aNiassy
+	- Gabriel Schwardy
-- antoniofr
+	- Ha!*!*y
-- AntonLejon
+	- Jonathan Danse
-- Arnaud Lemercier
+	- Krystian Podemski
-- Axome
+	- Milow
-- Benjamin PONGY
+	- PrestaEdit
-- BigZ
+	- Rémi Gaillard
-- bLeveque
+	- Sarah Lorenzini
-- bMancone
+	- Vincent Augagneur
-- bumbu
+	- Xavier POITAU
-- Burhan
+	- aFolletete
-- Caleydon Media
+	- aKorczak
-- cam.lafit
+	- aNiassy
-- Captain FLAM
+	- adonis karavokyros
-- Captain-FLAM
+	- bLeveque
-- ccauw
+	- bMancone
-- Cédric Mouleyre
+	- bumbu
-- ChristopheBoucaut
+	- cmouleyre
-- CINS
+	- dMetzger
-- cippest
+	- dSevere
-- cmouleyre
+	- fBrignoli
-- Corentin Delcourt
+	- fSerny
-- Cosmin Hutanu
+	- gBrunier
-- Damien Metzger
+	- gCharmes
-- DamienMetzger
+	- gPoulain
-- Damon Skelhorn
+	- hAitmansour
-- Daniel
+	- ivancasasempere
-- David Gasperoni
+	- jBreux
-- Davy Rolink
+	- jObregon
-- djfm
+	- jessylenne
-- dlage
+	- jmCollin
-- dMetzger
+	- lBrieu
-- (d)oekia
+	- lCherifi
-- Dragan Skrbic
+	- lLefevre
-- dreammeup
+	- mBertholino
-- DrySs
+	- mDeflotte
-- DrÿSs
+	- mMarinetti
-- DrÿSs'
+	- montes
-- dSevere
+	- nPellicari
-- Edouard Gaulué
+	- oleacorner
-- emily-d
+	- rGaillard
-- Fabio Chelly
+	- rMalie
-- fBrignoli
+	- rMontagne
-- fram
+	- sLorenzini
-- Francois Gaillard
+	- sThiebaut
-- François Gaillard
+	- tDidierjean
-- Fran?s Gaillard
+	- vAugagneur
-- fSerny
+	- vChabot
-- Gabriel Schwardy
+	- vKham
-- gBrunier
+	- vSchoener
-- gCharmes
-- gPoulain
-- gr4devel
-- Grégoire Bélorgey
-- Gregory Roussac
-- gRoussac
-- Guillaume DELOINCE
-- ha99y
-- hAitmansour
-- Ha!*!*y
-- indesign47
-- inem0o
-- ivancasasempere
-- jBreux
-- jeckyl
-- jeromenadaud
-- Jerome Nadaud
-- Jérôme Nadaud
-- jessylenne
-- jmCollin
-- jObregon
-- Jonathan Danse
-- joseantgv
-- Julien
-- Kevin Granger
-- kpodemski
-- Krystian Podemski
-- lBrieu
-- lCherifi
-- ldecoker
-- lLefevre
-- LOIC ROSSET ltd
-- makk1ntosh
-- marcinsz101
-- Marco Cervellin
-- matiasiglesias
-- Mats Rynge
-- MatthieuB
-- Maxence
-- mBertholino
-- mDeflotte
-- Michel Courtade
-- Milow
-- minic studio
-- misthero
-- mMarinetti
-- montes
-- nezenmoins
-- Nicolas Sorosac
-- Nils-Helge Garli Hegvik
-- nPellicari
-- nturato
-- oleacorner
-- Otto Nascarella
-- Patanock
-- PhpMadman
-- Pierre
-- Piotr Kaczor
-- Piotr Mocko
-- PrestaEdit
-- 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 WITMEYER
-- tDidierjean
-- unknown
-- vAugagneur
-- vChabot
-- Vincent Augagneur
-- Vincent Schoener
-- Vincent Terenti
-- vinvin27
-- vKham
-- vSchoener
-- Xavier
-- Xavier POITAU
-- Yoozio
-- zimmi1
 

README.md

@@ -2,48 +2,47 @@ README
 ======
 ![PrestaShop](http://www.prestashop.com/images/banners/general/prestashop_728x90.png "PrestaShop")
 
-ABOUT
+PREPARATION
 --------
 
-PrestaShop is a free and open-source e-commerce web application, committed to providing the best shopping cart experience for both merchants and consumers.
+To install PrestaShop, you need a remote web server or on your computer (MAMP), with access to a database like MySQL.
-
+You'll need access to phpMyAdmin to create a database and to indicate the information in the database in the installer.
-
-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.
 
+If you do not host and unable to create your store, we offer a turnkey store, which lets you create your online store in less than 10 minutes without any technical knowledge.
+We invite you to visit: [http://www.prestabox.com][1]
 
 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.
+Simply go to your PrestaShop web directory and use installer :-)
 
-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 have any PHP error, perhaps you don't have PHP5 or you need to activate it on your web host.
-If you don't find any solution to start the installer, please post on [the PrestaShop forums][3].
+Please go to our forum to find pre-installation settings (PHP 5, htaccess) for certain hosting services (1&1, Free, Lycos, OVH, Infomaniak, Amen, GoDaddy, etc).
 
+English webhost [specifics settings][2]
+
+
+If you don't find any solution to launch installer, please post on [our forum][3]
+
+
+There are always solutions for your issues ;-)
 
 DOCUMENTATION
 --------
 
-The official PrestaShop documentation is available online [on its own website][4].
+For any extra documentation (how-to), please read our [Online documentation][4]
 
 
 FORUMS
 --------
 
-You can discuss, help and contribute with PrestaShop community on [the PrestaShop forums][5].
+You can also discuss, help and contribute with PrestaShop community on [our forums][5]
 
-Thank you for downloading and using PrestaShop e-commerce Open-source solution!
+
+Thanks 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/
+[5]: http://www.prestashop.com/forums/

address.php

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

addresses.php

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

admin-dev/ajax-tab.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 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-2012 PrestaShop SA
 *  @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(__FILE__).'/../config/config.inc.php');
-require(_PS_ADMIN_DIR_.'/functions.php');
+require(dirname(__FILE__).'/functions.php');
 
 // For retrocompatibility with "tab" parameter
 if (!isset($_GET['controller']) && isset($_GET['tab']))

admin-dev/ajax.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,19 +19,52 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @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'));
+}
+
 if (Tools::isSubmit('ajaxReferrers'))
 {
 	require(_PS_CONTROLLER_DIR_.'admin/AdminReferrersController.php');
@@ -68,6 +101,39 @@ 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::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::isSubmit('submitTrackClickOnHelp'))
 {
@@ -78,6 +144,15 @@ if (Tools::isSubmit('submitTrackClickOnHelp'))
         HelpAccess::trackClick($label, $version);
 }
 
+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('getChildrenCategories') && Tools::isSubmit('id_category_parent'))
 {
 	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id, null, Tools::getValue('use_shop_context'));
@@ -96,6 +171,110 @@ 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"]}');
+
+	$conf = Configuration::getMultiple(array(
+		'PS_SAV_IMAP_OPT_NORSH', 'PS_SAV_IMAP_OPT_SSL',
+		'PS_SAV_IMAP_OPT_VALIDATE-CERT', 'PS_SAV_IMAP_OPT_NOVALIDATE-CERT',
+		'PS_SAV_IMAP_OPT_TLS', 'PS_SAV_IMAP_OPT_NOTLS'));
+	
+	$conf_str = '';
+	if ($conf['PS_SAV_IMAP_OPT_NORSH'])
+		$conf_str .= '/norsh';
+	if ($conf['PS_SAV_IMAP_OPT_SSL'])
+		$conf_str .= '/ssl';
+	if ($conf['PS_SAV_IMAP_OPT_VALIDATE-CERT'])
+		$conf_str .= '/validate-cert';
+	if ($conf['PS_SAV_IMAP_OPT_NOVALIDATE-CERT'])
+		$conf_str .= '/novalidate-cert';
+	if ($conf['PS_SAV_IMAP_OPT_TLS'])
+		$conf_str .= '/tls';
+	if ($conf['PS_SAV_IMAP_OPT_NOTLS'])
+		$conf_str .= '/notls';
+
+	if (!function_exists('imap_open'))
+		die('{"hasError" : true, "errors" : ["imap is not installed on this server"]}');
+
+	$mbox = @imap_open('{'.$url.':'.$port.$conf_str.'}', $user, $password);
+
+	//checks if there is no error when connecting imap server
+	$errors = imap_errors();
+	$str_errors = '';
+	$str_error_delete = '';
+	if (sizeof($errors) && is_array($errors))
+	{
+		var_dump($errors);
+		$str_errors = '';
+		foreach($errors as $error)
+			$str_errors .= '"'.$error.'",';
+		$str_errors = rtrim($str_errors, ',').'';
+	}
+	//checks if imap connexion is active
+	if (!$mbox)
+		die('{"hasError" : true, "errors" : ["Cannot connect to the mailbox"]}');
+
+	//Returns information about the current mailbox. Returns FALSE on failure.
+	$check = imap_check($mbox);
+	if (!$check)
+		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_error_delete.'"]}');
+}
+
 if (Tools::isSubmit('searchCategory'))
 {
 	$q = Tools::getValue('q');
@@ -125,6 +304,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();
@@ -137,3 +327,8 @@ if (Tools::isSubmit('getZones'))
 	$array = array('hasError' => false, 'errors' => '', 'data' => $html);
 	die(Tools::jsonEncode($html));
 }
+
+function displayJavascriptAlert($s)
+{
+	echo '<script type="text/javascript">alert(\''.addslashes($s).'\');</script>';
+}

admin-dev/ajax_products_list.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -27,7 +27,7 @@
 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 +51,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').')
 		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))' : '').
+		($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)' : '');
-
 $items = Db::getInstance()->executeS($sql);
 
 if ($items)

admin-dev/ajaxfilemanager/ajax_file_upload.php

@@ -22,18 +22,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)))
+	}else if(!$upload->moveUploadedFile($_GET['folder']))
-		$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']))
 		$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 +60,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 +73,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);		
 
 																				

admin-dev/ajaxfilemanager/ajax_get_file_listing.php

@@ -24,8 +24,7 @@
 		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']);
@@ -100,9 +99,9 @@
 				{
 					$v = transformFileSize($v);
 				}
-				echo (($j++ > 1)?",":'') . "'" . addslashes($k) . "':'" . addslashes($v) . "'";
+				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
 			}
-			echo (($j++ > 1)?",":'') . "'url':'" . addslashes(getFileUrl($file['path'])) . "'";
+			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
 			echo "}\n";				
 		}
 		echo  "};</script>\n";

admin-dev/ajaxfilemanager/inc/class.file.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['path'] = $path;
-					$this->fileInfo['name'] = addslashes(basename($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['name'] = basename($path);
-					$this->fileInfo['path'] = addslashes($path);
+					$this->fileInfo['path'] = $path;
 					$this->fileInfo['atime'] = $this->fileStat[8];
 					$this->fileInfo['ctime'] = $this->fileStat[10];	
 					$this->fileInfo['mtime'] = $this->fileStat[9];

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

@@ -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', '');
 

admin-dev/ajaxfilemanager/inc/config.php

@@ -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))
 	{

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

@@ -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', '');
 

admin-dev/ajaxfilemanager/inc/index.php

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

admin-dev/ajaxfilemanager/index.php

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

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

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

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

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

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

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

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

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

admin-dev/ajaxfilemanager/jscripts/index.php

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

admin-dev/ajaxfilemanager/langs/index.php

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

admin-dev/ajaxfilemanager/session/index.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

admin-dev/ajaxfilemanager/theme/index.php

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

admin-dev/autoupgrade/index.php

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

admin-dev/backup.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,12 +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-2012 PrestaShop SA
 *  @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 +34,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 +59,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 +71,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).'"');

admin-dev/backups/index.php

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

admin-dev/cron_currency_rates.php

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

admin-dev/displayImage.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 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-2012 PrestaShop SA
 *  @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(dirname(__FILE__).'/../config/config.inc.php');
-require_once(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+require_once(dirname(__FILE__).'/init.php');
-require_once(_PS_ADMIN_DIR_.'/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']))
 {

admin-dev/drawer.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,13 +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-2012 PrestaShop SA
 *  @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,6 +37,7 @@ $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());
     
@@ -46,51 +47,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);
 
 $graph = new $module();
@@ -101,3 +57,4 @@ if ($option)
 
 $graph->create($render, $type, $width, $height, $layers);
 $graph->draw();
+

admin-dev/export/index.php

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

admin-dev/footer.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -30,14 +30,14 @@ echo '			</div>
 			<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>
+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::getAdminTranslation('Bug Tracker').'</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::getAdminTranslation('Forum').'</a>	
+					| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">'.translate('Forum').'</a>	
 				</div>
 			</div>
 		</div>

admin-dev/functions.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,11 +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-2012 PrestaShop SA
 *  @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)
@@ -94,8 +96,6 @@ function	rewriteSettingsFile($baseUrls = NULL, $theme = NULL, $arrayDB = NULL)
 	$defines['_DB_PASSWD_'] = (($arrayDB AND isset($arrayDB['_DB_PASSWD_'])) ? $arrayDB['_DB_PASSWD_'] : _DB_PASSWD_);
 	$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_'))
@@ -223,16 +223,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 +233,7 @@ function translate($string)
 	return str_replace('"', '&quot;', stripslashes($str));
 }
 
+
 /**
  * Returns a new Tab object
  *
@@ -259,7 +252,7 @@ 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('Page %s cannot be found.'),$tab);
 		return false;
 	}
 
@@ -272,7 +265,7 @@ function checkingTab($tab)
 	$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;
 	}
@@ -438,7 +431,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,7 +461,7 @@ 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)
@@ -477,10 +470,10 @@ function runAdminTab($tab, $ajaxMode = false)
 				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>');
+					printf(translate('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>');
+					printf(translate('You are configuring your store for shop %s'), '<b>'.Context::getContext()->shop->name.'</b>');
 				echo '</div>';
 			}
 			if (Validate::isLoadedObject($adminObj))
@@ -553,8 +546,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(array(translate('Invalid security token'),$url)));
-						die(Tools::jsonEncode(Translate::getAdminTranslation('Invalid security token')));
+						die(Tools::jsonEncode(translate('Invalid security token')));
 					}
 					else
 					{
@@ -566,17 +559,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;

admin-dev/get-file-admin.php

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

admin-dev/grider.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,13 +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-2012 PrestaShop SA
 *  @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');
@@ -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();

admin-dev/header.inc.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -36,12 +36,12 @@ 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="'._PS_CSS_DIR_.'jquery.cluetip.css" />
 		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/admin.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.css" />
-		<title>PrestaShop&trade; - '.Translate::getAdminTranslation('Administration panel').'</title>
+		<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').';
@@ -78,7 +78,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 != "")
@@ -99,7 +99,7 @@ echo '
 						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 +121,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 != "")
@@ -149,14 +149,14 @@ echo '
 			if (Shop::isFeatureActive())
 			{
 				if (Shop::getContext() == Shop::CONTEXT_ALL)
-					$youEditFieldFor = Translate::getAdminTranslation('A modification of this field will be applied for all shops');
+					$youEditFieldFor = translate('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>');
+					$youEditFieldFor = sprintf(translate('A modification of this field will be applied for all shops of group %s'), '<b>'.$shop_group->name.'</b>');
 				}
 				else
-					$youEditFieldFor = sprintf(Translate::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 +202,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>
+								<h3>'.translate('Last orders').'</h3>
-								<p class="no_notifs">'.Translate::getAdminTranslation('No new orders has been made on your shop').'</p>
+								<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 +213,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>
+								<h3>'.translate('Last customers').'</h3>
-								<p class="no_notifs">'.Translate::getAdminTranslation('No new customers registered on your shop').'</p>
+								<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 +224,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>
+								<h3>'.translate('Last messages').'</h3>
-								<p class="no_notifs">'.Translate::getAdminTranslation('No new messages posted on your shop').'</p>
+								<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>
+	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>
-	<div id="employee_box">
+				<span class="separator"></span>
-				<div id="employee_infos">
+				<span class="employee_name">
-					<div class="employee_name">'.Translate::getAdminTranslation('Welcome,').' <strong>'.Context::getContext()->employee->firstname.'&nbsp'.Context::getContext()->employee->lastname.'</strong></div>
+				'.Tools::substr(Context::getContext()->employee->firstname, 0, 1).'.&nbsp;'.htmlentities(Context::getContext()->employee->lastname, ENT_COMPAT, 'UTF-8').'
-					<div class="clear"></div>
+				</span><span class="separator"></span><a href="index.php?logout" id="header_logout"><span>'.translate('logout').'</span></a><span class="separator"></span>';
-					<ul id="employee_links">
+				if (Context::getContext()->shop->getBaseURL())
-						<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>
+					echo '<a href="'.Context::getContext()->shop->getBaseURL().'" id="header_foaccess" target="_blank" title="'.translate('View my shop').'"><span>'.translate('View my shop').'</span></a>';
-						<li class="separator">&nbsp;</li>
+			echo '</span>
-						<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>
-			
 			<div id="header_search">
-			
+				<form method="post" action="index.php?controller=AdminSearch&token='.Tools::getAdminTokenLite('AdminSearch').'">
-				<form method="post" action="index.php?controller=AdminSearch&amp;token='.Tools::getAdminTokenLite('AdminSearch').'">
+					<input type="text" name="bo_query" id="bo_query"
-					<input type="text" name="bo_query" id="bo_query" value="'.Tools::safeOutput(Tools::stripslashes(Tools::getValue('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>
+					<select name="bo_search_type" id="bo_search_type">
-						<option value="1" '.(Tools::getValue('bo_search_type') == 1 ? 'selected="selected"' : '').'>'.Translate::getAdminTranslation('catalog').'</option>
+						<option value="0">'.translate('everywhere').'</option>
-						<optgroup label="'.Translate::getAdminTranslation('customers').':">
+						<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::getAdminTranslation('by name').'</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::getAdminTranslation('by ip address').'</option>
+						<option value="6" '.(Tools::getValue('bo_search_type') == 6 ? 'selected="selected"' : '').'>'.translate('ip address').'</option>
-						</optgroup>
+						<option value="3" '.(Tools::getValue('bo_search_type') == 3 ? 'selected="selected"' : '').'>'.translate('orders').'</option>
-						<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('invoices').'</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('carts').'</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>
 					</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 +268,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);
@@ -342,8 +333,8 @@ 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('For security reasons, you must also:').' '.
-				Translate::getAdminTranslation('delete the /install folder').
+				translate('delete the /install folder').
 				'</div>' : '').'
 				';
 				if(defined('_PS_MODE_DEV_') && _PS_MODE_DEV_)
@@ -352,7 +343,7 @@ echo '
 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>'.
+        <span class="text_multishop">'.translate('Multistore configuration for').'</span>'.
 		Helper::renderShopList();
     echo '</div>';
 }

admin-dev/import/index.php

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

admin-dev/index.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -27,11 +27,8 @@
 $timer_start = microtime(true);
 define('_PS_ADMIN_DIR_', getcwd());
 
-if (!defined('PS_ADMIN_DIR'))
+require(dirname(__FILE__).'/../config/config.inc.php');
-	define('PS_ADMIN_DIR', _PS_ADMIN_DIR_);
+require(dirname(__FILE__).'/functions.php');
-
-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'))

admin-dev/init.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,7 +19,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -49,12 +49,9 @@ try
 	AdminTab::$currentIndex = $currentIndex;
 
 	$iso = $context->language->iso_code;
-	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php'))
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
-		include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
-	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php'))
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.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://';

admin-dev/login.php

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

admin-dev/password.php

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

admin-dev/pdf.php

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

admin-dev/searchcron.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -19,13 +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-2012 PrestaShop SA
 *  @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');
+include(dirname(__FILE__).'/../config/config.inc.php');
 Context::getContext()->shop->setContext(Shop::CONTEXT_ALL);
 
 if (substr(_COOKIE_KEY_, 34, 8) != Tools::getValue('token'))

admin-dev/tabs/index.php

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

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

@@ -25,16 +25,12 @@ select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disab
 .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;
 	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,35 +43,24 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #top_container{margin:0;padding:0}
 
 /*HEADER*/
-#header { background-color: #394049; height:90px; }
+#header { background-color: #394049; height:114px; }
-/* Portrait orientation targeting */ 
+#header #header_infos{ position:relative; margin: 0; padding:0; height:84px; }
-@media screen and (orientation: portrait) {#header{min-width:1250px}}
+#header #header_shopname {float: left; margin:15px 20px 0 20px;}
-/* Portrait orientation targeting */ 
+#header #employee_links {float: right; display:block; margin:15px 15px 0 15px; }
-@media screen and (orientation: landscape) {#header{min-width:1250px}}
+#header #employee_links a{ float:left; color:#BABABA; text-transform:capitalize;}
-#header #header_infos{ position:relative; margin: 0; padding:0; height:60px; }
+#header #employee_links a:hover {color:#fff;}
-#header #header_shopname {float: left; margin:10px 15px 0 10px;}
+#header #employee_links .employee_name { float:left; color:#fff;}
-#header #employee_box {float: right; display:block;}
+#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
-#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 #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 { background: transparent url('../img/logout.png') no-repeat scroll left top; float:left; padding-left:20px; color:#bababa;}
 #header #header_infos a#header_logout:hover {color:#fff;}
 #header #header_infos #header_logout a span {color:#bababa}
 #header #header_infos #header_foaccess{ text-decoration:none; color:#bababa;}
 #header #header_infos #header_foaccess a {color:#bababa !important;}
 #header #header_infos a#header_foaccess:hover { color:#fff;}
-
+#header #header_search{ background-color:#fff; border:2px solid #000; float:left; margin-top:15px; margin-left:7%; position:relative; height:25px; box-shadow: 0 1px 0 #666666; }
-
-
-#header #header_search{ 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{ font-size:13px; float:left; margin:0 23px 0 0; padding:0 4px; vertical-align:middle;width:100px;height:27px; border:none;}
 #header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single { box-shadow:none; border-radius:0px; border:none; border-left:1px dotted #ccc;} 
 #header #header_search #bo_search_submit { background:  url('../img/icon-search2.png') no-repeat scroll center; border:none; width:27px; height:25px; float:left; font-weight:normal; margin:0; padding:0;  cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; border-left:1px solid #3079ED; border-radius:0px; /*hacking ie7*/ font-size:0 !ie7; color: transparent !ie;}
 #header #header_quick{float:right; display:block; margin-top:15px;}
@@ -107,8 +92,9 @@ 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.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.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 3px 4px 0;font-weight:normal;font-size:12px;}
+#header #menu li:first-child { margin-left:15px;}
+#header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 6px 4px 0;font-weight:normal;font-size:12px;}
 #header #menu li.submenu_size .title{_display:inline;_padding:6px 5px 4px 0}
 #header #menu li{_height:32px;_padding-top:3px}
 #header #menu img{display:inline;padding:0 3px 0 6px; margin-top:-4px; vertical-align:middle;width:16px;height:16px}
@@ -116,14 +102,12 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #menu li.active a{}
 #header #menu li:hover, #header #menu li.active {background-color:#49B2FF;}
 #header #menu li.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.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 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;}
@@ -204,14 +188,13 @@ a.module_toggle_all{color: #268CCD;}
 .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: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
-.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 .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; text-shadow:0 1px 0 #fff;}
 .toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;}
 .toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;}
 .toolbarBox a.toolbar_btn {   border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;}
-.toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;-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');}
@@ -244,80 +227,8 @@ a.module_toggle_all{color: #268CCD;}
 .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}
+div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;}
-#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}
 
 /*button upload files*/
 #content .qq-upload-button {
@@ -347,8 +258,7 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
 #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;}
+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;}
-#modules_tab_list {min-height: inherit}
 #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;}
@@ -369,7 +279,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #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;}
@@ -505,9 +415,9 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 /*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;}
@@ -518,9 +428,8 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #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.non-install { background-color:#ec7000;}
-#moduleContainer .setup.must-have { background-color: #ec7000;}
+#moduleContainer .setup.off{ background-color:#ccc;}
-#moduleContainer .setup.off{ background-color:#ccc; color:#666666}
+#moduleContainer .row-actions-module span { padding-right:5px;}
-#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 +439,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;}
@@ -667,11 +528,3 @@ ul.listForm li {padding-bottom:3px;}
 	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;}

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

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

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

@@ -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,6 +71,79 @@
 #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}
@@ -34,7 +169,33 @@
 .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*/
@@ -81,4 +242,8 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
 #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 .moduleFavDesc { font-family:Georgia; font-style:italic; color:#666;}
+
+/*FOOTER*/
+#footer {height:40px;padding-top:5px;font-size:12px;clear:both;font-size:0.9em;color:#666666}
+#footer .footer_link, #footer .footer_link:hover {color:#D41958;}

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

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

admin-dev/themes/default/index.php

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

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
@@ -49,12 +49,10 @@
 
 			if (perm == 'all' && $(this).parent().parent().hasClass('parent'))
 			{
-				if (enabled)
+				checked = enabled ? 'checked': '';
-					$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').attr('checked', 'checked');
+				$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').attr('checked', checked);
-				else
-					$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').removeAttr('checked');
 				$.ajax({
-					url: "{$link->getAdminLink('AdminAccess')|addslashes}",
+					url: "{$link->getAdminLink('AdminAccess')}",
 					cache: false,
 					data : {
 						ajaxMode : '1',
@@ -70,12 +68,15 @@
 					},
 					success : function(res,textStatus,jqXHR)
 					{
-						try {
+						try
+						{
 							if (res == 'ok')
 								showSuccessMessage("{l s='Update successful'}");
 							else
 								showErrorMessage("{l s='Update error'}");
-						} catch(e) {
+						}
+						catch(e)
+						{
 							jAlert('Technical error');
 						}
 					}
@@ -84,7 +85,7 @@
 			perfect_access_js_gestion(this, perm, id_tab, tabsize, tabnumber, table);
 
 			$.ajax({
-				url: "{$link->getAdminLink('AdminAccess')|addslashes}",
+				url: "{$link->getAdminLink('AdminAccess')}",
 				cache: false,
 				data : {
 					ajaxMode : '1',
@@ -133,7 +134,7 @@
 				});
 
 			$.ajax({
-				url: "{$link->getAdminLink('AdminAccess')|addslashes}",
+				url: "{$link->getAdminLink('AdminAccess')}",
 				cache: false,
 				data : {
 					ajaxMode: '1',
@@ -302,7 +303,7 @@
 											{assign var=is_child value=true}
 											{assign var=result_accesses value=0}
 											<tr class="child-{$child.id_parent}">
-												<td{if !$is_child} class="bold"{/if}>{if $is_child} &raquo; {/if}{$child.name}</td>
+												<td{if !$is_child} class="bold"{/if}>{if $is_child} &raquo; {/if}<strong>{$child.name}</strong></td>
 												{foreach $perms as $perm}
 													{if $access_edit == 1}
 														<td>
@@ -368,7 +369,7 @@
 					
 					{if !count($modules)}
 						<tr>
-							<td colspan="3">{l s='No modules are installed'}</td>
+							<td colspan="3">{l s='No modules installed'}</td>
 						</tr>
 					{else}
 						{foreach $modules[$profile.id_profile] AS $module}

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

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

admin-dev/themes/default/template/controllers/access/helpers/index.php

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

admin-dev/themes/default/template/controllers/access/index.php

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

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}

admin-dev/themes/default/template/controllers/addons_catalog/index.php

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

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
@@ -27,11 +27,17 @@
 
 {block name="label"}
 	{if $input.name == 'vat_number'}
-		<div id="vat_area" style="display: visible">
+		{if $vat == 'is_applicable'}
+			<div id="vat_area" style="display: visible">
+		{else if $vat == 'management'}
+			<div id="vat_area" style="display: hidden">
+		{else}
+			<div style="display: none;">
+		{/if}
 	{/if}
 
 	{if $input.type == 'text_customer' && !isset($customer)}
-		<label>{l s='Customer email'}</label>
+		<label>{l s='Customer e-mail'}</label>
 	{else}
 		{$smarty.block.parent}
 	{/if}
@@ -66,8 +72,7 @@
 						{
 							if (msg)
 							{
-								var infos = msg.infos.replace("\\'", "'").split('_');
+								var infos = msg.infos.split('_');
-
 								$('input[name=firstname]').val(infos[0]);
 								$('input[name=lastname]').val(infos[1]);
 								$('input[name=company]').val(infos[2]);

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

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

admin-dev/themes/default/template/controllers/addresses/helpers/index.php

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

admin-dev/themes/default/template/controllers/addresses/helpers/list/index.php

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

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}

admin-dev/themes/default/template/controllers/addresses/index.php

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

admin-dev/themes/default/template/controllers/attachments/index.php

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

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,14 +18,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-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
 <script type="text/javascript">
-	i18n_tax_exc = '{l s='Tax Excluded'} ';
+	i18n_tax_exc = '{l s='Tax Excl.:'} ';
-	i18n_tax_inc = '{l s='Tax Included'} ';
+	i18n_tax_inc = '{l s='Tax Incl.:'} ';
 
 	var product_tax = '{$tax_rates}';
 	function calcPrice(element, element_has_tax)
@@ -75,9 +75,9 @@
 			</div>
 		</div>
 		<div style="float: left; width: 570px;">
-			<div class="hint" style="width: 570px; padding-left: 45px; margin-bottom: 15px; display: block; position: inherit;">{l s='The Combinations Generator is a tool that allows you to easily create a series of combinations by selecting the related attributes. For example, if you\'re selling t-shirts in three different sizes and two different colors, the generator will create six combinations for you.'}</div>
+			<div class="hint" style="width: 570px; padding-left: 45px; margin-bottom: 15px; display: block; position: inherit;">{l s='The Combinations Generator is a tool which allows you to easily create a series of combinations by selecting the related attributes. For example, if you are selling T-Shirts in 3 different sizes and 2 different colors, the Generator will create 6 combinations for you.'}</div>
-			<p>{l s='You\'re currently generating combinations for the following product:'} <b>{$product_name|escape:'htmlall':'UTF-8'}</b></p>
+			<p>{l s='You are currently generating combinations for the following product:'} <b>{$product_name|escape:'htmlall':'UTF-8'}</b></p>
-			<h4>{l s='Step 1: On the left side, select the attributes you want to use (Hold down the "Ctrl" key on your keyboard and validate by clicking on "Add")'}</h4>
+			<h4>{l s='Step 1: On the left side, Select the attributes you want to use (Hold down the "CTRL" Key on your keyboard and validate by clicking on "Add")'}</h4>
 			<div>
 			{foreach $attribute_groups as $k => $attribute_group}
 				{if isset($attribute_js[$attribute_group['id_attribute_group']])}
@@ -85,8 +85,8 @@
 						<thead>
 							<tr>
 								<th id="tab_h1" style="width: 150px">{$attribute_group['name']|escape:'htmlall':'UTF-8'}</th>
-								<th id="tab_h2" style="width: 350px" colspan="2">{l s='Impact on the product price'} ({$currency_sign})</th>
+								<th id="tab_h2" style="width: 350px" colspan="2">{l s='Impact on the Product Price'} ({$currency_sign})</th>
-								<th style="width: 150px">{l s='Impact on the product weight'} ({$weight_unit})</th>
+								<th style="width: 150px">{l s='Impact on the Product Weight'} ({$weight_unit})</th>
 							</tr>
 						</thead>
 						<tbody id="table_{$attribute_group['id_attribute_group']}" name="result_table">
@@ -103,7 +103,7 @@
 				{/if}
 			{/foreach}
             </div>
-			<h4>{l s='Select a default quantity, and reference, for each combination the generator will create for this product.'}</h4>
+			<h4>{l s='Step 2 (optional): Select a default Quantity and Reference for all the combinations that the Generator will create for this product'}</h4>
 			<table border="0" class="table" cellpadding="0" cellspacing="0">
 				<tr>
 					<td>{l s='Default Quantity:'}</td>
@@ -114,8 +114,8 @@
 					<td><input type="text" size="20" name="reference" value="{$product_reference|escape:'htmlall':'UTF-8'}" /></td>
 				</tr>
 			</table>
-			<h4>{l s='Please click on "Generate these Combinations"'}</h4>
+			<h4>{l s='Finally, click on "Generate these combinations"'}</h4>
-			<p><input type="submit" class="button" style="margin-bottom:5px;" name="generate" value="{l s='Generate these Combinations'}" /></p>
+			<p><input type="submit" class="button" style="margin-bottom:5px;" name="generate" value="{l s='Generate these combinations'}" /></p>
 		</div>
 	</fieldset>
 </form>

admin-dev/themes/default/template/controllers/attribute_generator/index.php

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

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
@@ -27,10 +27,7 @@
 
 {block name="label"}
 	{if $input.type == 'color'}
-		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if};">
+		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if}";>
-	{/if}
-	{if $input.type == 'closediv'}
-		</div>
 	{/if}
 	{$smarty.block.parent}
 {/block}

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

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

admin-dev/themes/default/template/controllers/attributes/helpers/index.php

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

admin-dev/themes/default/template/controllers/attributes/helpers/list/index.php

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

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}

admin-dev/themes/default/template/controllers/attributes/index.php

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

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}

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

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

admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php

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

admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php

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

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}

admin-dev/themes/default/template/controllers/attributes_groups/index.php

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

admin-dev/themes/default/template/controllers/backup/download/index.php

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

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

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

admin-dev/themes/default/template/controllers/backup/helpers/index.php

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

admin-dev/themes/default/template/controllers/backup/helpers/list/index.php

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

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

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

admin-dev/themes/default/template/controllers/backup/helpers/view/index.php

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

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

@@ -1,5 +1,5 @@
 {*
-* 2007-2013 PrestaShop
+* 2007-2012 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
+*  @copyright  2007-2012 PrestaShop SA
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
@@ -27,9 +27,9 @@
 
 {block name="override_tpl"}
 
-	<div class="conf">{l s='Beginning the download ...'}</div>
+	<div class="conf">{l s='Beginning download ...'}</div>
 
-	<p>{l s='Backup files should automatically download.'}</p>
+	<p>{l s='Backup file should automatically download.'}</p>
 
 	<p>{l s='If not,'} <b><a href="{$url_backup}">{l s='please click here!'}</a></b></p>
 

admin-dev/themes/default/template/controllers/backup/index.php

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

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

@@ -1,58 +0,0 @@
-{*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*	@author PrestaShop SA <contact@prestashop.com>
-*	@copyright	2007-2013 PrestaShop SA
-*	@license		http://opensource.org/licenses/afl-3.0.php	Academic Free License (AFL 3.0)
-*	International Registered Trademark & Property of PrestaShop SA
-*}
-{extends file="helpers/form/form.tpl"}
-{block name="script"}
-	var string_price = '{l s='Will be applied when the price is' js=1}';
-	var string_weight = '{l s='Will be applied when the weight is' js=1}';
-{/block}
-
-{block name="field"}
-	{if $input.name == 'zones'}
-		<div class="ranges_not_follow warn" style="display:none">
-			<label>{l s="Ranges are not correctly ordered:"}</label>
-			<a href="#" onclick="checkRangeContinuity(true); return false;" class="button" style="text-decoration:none">{l s="Reordering"}</a>
-		</div>
-		{include file='controllers/carrier_wizard/helpers/form/form_ranges.tpl'}
-		<!--
-<div class="validate_range" style="display:none">
-			<a href="#" class="button" id="validate_range_button">{l s="Validate"}</a>
-		</div>
--->
-		<div class="new_range">
-			<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s='Add new range'}</a>
-		</div>
-	{/if}
-	{if $input.name == 'logo'}
-		<div class="margin-form">
-			<input id="carrier_logo_input" type="file" onchange="uploadCarrierLogo();" name="carrier_logo_input" />
-			<input type="hidden" id="logo" name="logo" value="" />
-			<p class="preference_description">
-				{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}
-				<br />{l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>.
-			</p>
-		</div>
-	{/if}
-	{$smarty.block.parent}
-{/block}