// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
@@ -1,225 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop 
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7040 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-class	ConfigurationTest
-{
-	static function		check($tests)
-	{
-		$res = array();
-		foreach ($tests AS $key => $test)
-			$res[$key] = self::run($key, $test);
-		return $res;
-	}
-	
-	static function		run($ptr, $arg = 0)
-	{
-		if (call_user_func(array('ConfigurationTest', 'test_'.$ptr), $arg))
-			return ('ok');
-		return ('fail');
-	}
-	
-	// Misc functions	
-	static function		test_phpversion()
-	{
-		return version_compare(substr(phpversion(), 0, 3), '5.0', '>=');
-	}
-	
-	static function		test_mysql_support()
-	{
-		return function_exists('mysql_connect');
-	}
-	
-	static function		test_magicquotes()
-	{
-		return !ini_get('magic_quotes_gpc');
-	}
-
-	static	function		test_upload()
-	{
-		return  ini_get('file_uploads');
-	}
-
-	static function		test_fopen()
-	{
-		return ini_get('allow_url_fopen');
-	}
-
-	static function		test_system($funcs)
-	{
-		foreach ($funcs AS $func)
-			if (!function_exists($func))
-				return false;
-		return true;
-	}
-
-	static function		test_gd()
-	{
-		return function_exists('imagecreatetruecolor');
-	}
-	
-	static function		test_register_globals()
-	{
-		return !ini_get('register_globals');
-	}
-	
-	static function		test_gz()
-	{
-		if (function_exists('gzencode'))
-			return !(@gzencode('dd') === false); 
-		return false;
-	}
-	
-	// is_writable dirs	
-	static function		test_dir($dir, $recursive = false)
-	{
-		if (!file_exists($dir) OR !$dh = opendir($dir))
-			return false;
-		$dummy = rtrim($dir, '/').'/'.uniqid();
-		if (@file_put_contents($dummy, 'test'))
-		{
-			@unlink($dummy);
-			if (!$recursive)
-				return true;
-		}
-		elseif (!is_writable($dir))
-			return false;
-		if ($recursive)
-		{
-			while (($file = readdir($dh)) !== false)
-				if (@filetype($dir.$file) == 'dir' AND $file != '.' AND $file != '..')
-					if (!self::test_dir($dir.$file, true))
-						return false;
-		}
-		closedir($dh);
-		return true;
-	}
-	
-	// is_writable files	
-	static function		test_file($file)
-	{
-		return (file_exists($file) AND is_writable($file));
-	}
-	
-	static function		test_config_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-	
-	static function		test_sitemap($dir)
-	{
-		return self::test_file($dir);
-	}
-	
-	static function		test_root_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-
-	static function		test_log_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-
-	static function		test_admin_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-	
-	static function		test_img_dir($dir)
-	{
-		return self::test_dir($dir, true);
-	}
-	
-	static function		test_module_dir($dir)
-	{
-		return self::test_dir($dir, true);
-	}
-	
-	static function		test_tools_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-	
-	static function		test_cache_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-	
-	static function		test_tools_v2_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-	
-	static function		test_cache_v2_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-	
-	static function		test_download_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-	
-	static function		test_mails_dir($dir)
-	{
-		return self::test_dir($dir, true);
-	}
-	
-	static function		test_translations_dir($dir)
-	{
-		return self::test_dir($dir, true);
-	}
-	
-	static function		test_theme_lang_dir($dir)
-	{
-		if (!file_exists($dir))
-			return true;
-		return self::test_dir($dir, true);
-	}
-	
-	static function		test_theme_cache_dir($dir)
-	{
-		if (!file_exists($dir))
-			return true;
-		return self::test_dir($dir, true);
-	}
-
-	static function		test_customizable_products_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-	
-	static function		test_virtual_products_dir($dir)
-	{
-		return self::test_dir($dir);
-	}
-	
-	static function		test_mcrypt()
-	{
-		return function_exists('mcrypt_encrypt');
-	}
-}
@@ -463,7 +463,9 @@ class GetVersionFromDb
 			// List keys
 			$struct[$virtualTable]['@keys'] = array();
 			$sql = 'SHOW INDEX FROM ' . $table;
-			foreach (Db::getInstance()->executeS($sql) as $rowIndex)
+			$results = Db::getInstance()->executeS($sql);
+			if($results)
+				foreach ($results as $rowIndex)
 			{
 				$keyName = strtolower($rowIndex['Key_name']);
 				$type = 'index';
@@ -26,10 +26,26 @@
 */
 class ToolsInstall
 {
-	public static function checkDB ($srv, $login, $password, $name, $posted = true, $engine = false)
+	/**
+	 * checkDB will call to the 
+	 * 
+	 * @param string $srv 
+	 * @param string $login 
+	 * @param string $password 
+	 * @param string $name 
+	 * @param string $posted 
+	 * @return void
+	 */
+	public static function checkDB ($srv, $login, $password, $name, $posted = true)
 	{
+		// Don't include theses files if classes are already defined
+		if (!class_exists('Validate', false))
 		include_once(INSTALL_PATH.'/../classes/Validate.php');
+
+		if (!class_exists('Db', false))
 		include_once(INSTALL_PATH.'/../classes/Db.php');
+
+		if (!class_exists('MySQL', false))
 		include_once(INSTALL_PATH.'/../classes/MySQL.php');
 		
 		if($posted)
@@ -51,7 +67,7 @@ class ToolsInstall
 					return 8;
 		}

-		switch(MySQL::tryToConnect(trim($srv), trim($login), trim($password), trim($name), trim($engine)))
+		switch(MySQL::tryToConnect(trim($srv), trim($login), trim($password), trim($name)))
 		{
 			case 0:
 				if (MySQL::tryUTF8(trim($srv), trim($login), trim($password)))
@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
@@ -73,6 +73,9 @@ function showStep(aStep, way)
 		.removeClass("selected")
 		.removeClass("finished");
 		if (step < 6) {
+			if (step == 5)
+				$('#tabs li:nth-child(' + step + ')').addClass("finished");
+			else
 			$('#tabs li:nth-child(' + step + ')').addClass("selected");
 			$('#tabs li:lt(' + (step - 1) + ')').addClass("finished");
 		}
@@ -106,7 +109,7 @@ function showStep(aStep, way)
 				$('#tabs li:nth-child(1)').removeClass("selected").addClass("finished");
 				$('#tabs li:nth-child(2)').removeClass("selected").addClass("finished");
 				$('#tabs li:nth-child(3)').removeClass("selected").addClass("finished");
-				$('#tabs li:nth-child(4)').addClass("selected").removeClass("finished");
+				$('#tabs li:nth-child(4)').addClass("finished");
 				break;
 				
 			}
@@ -276,38 +279,41 @@ function verifyAndSetRequire(firsttime)
 			for (i = 0; i < testListRequired.length; i++){
 				result = testListRequired[i].getAttribute("result");
 				$($("div#sheet_require"+isUpdate+" > ul#required"+isUpdate+" .required")[i])
-				.removeClass( (result == "fail") ? "ok" : "fail" )
+				.removeClass( (result == "fail") ? "okBlock" : "errorBlock" )
 				.addClass(result);
 				if (result == "fail") configIsOk = false;
 			}
 			
-			
 			testListOptional = testLists[1].getElementsByTagName('test');
+			optionalIsOk = true
 			
 			for (i = 0; i < testListOptional.length; i++){
 				result = testListOptional[i].getAttribute("result");
 				$($("div#sheet_require"+isUpdate+" > ul#optional"+isUpdate+" li.optional")[i])
-					.removeClass( (result == "fail") ? "ok" : "fail" )
+					.removeClass( (result == "fail") ? "okBlock" : "errorBlock" )
 					.addClass(result);
+				if (result == "fail") optionalIsOk = false;
 			}
 			
 			if (!configIsOk) {
 				$('#btNext').attr({'disabled':'disabled','class':'button little disabled'});
-				$('h3#resultConfig'+isUpdate).html(txtConfigIsNotOk).slideDown('slow');
+				$('h3#resultConfig'+isUpdate).html(txtConfigIsNotOk).removeClass('okBlock').addClass('errorBlock').slideDown('slow');
 				$('h3#resultConfigHelper').show();
 				$("div#sheet_require"+isUpdate+" > ul").slideDown("1500");
+				$('#stepList_2 li:contains("Etape 2")').addClass('ko');
 			} else {
 				$("#btNext").removeAttr('disabled');
 				$('#btNext').removeClass('disabled');
 				$("input#btNext").focus();
 				var firsttime = ret.getElementsByTagName('firsttime');
-				if (firsttime && firsttime[0].getAttribute("value") == 1)
+				if (firsttime && firsttime[0].getAttribute("value") == 1 && optionalIsOk)
 					$("input#btNext").click();
 				else
 				{
-					$('h3#resultConfig'+isUpdate).html(txtConfigIsOk).slideDown('slow');
+					$('h3#resultConfig'+isUpdate).html(txtConfigIsOk).removeClass('errorBlock').addClass('okBlock').slideDown('slow');
 					$('h3#resultConfigHelper').hide();
 					$("div#sheet_require"+isUpdate+" > ul").slideDown("1500");
+					$('#stepList_2 li:contains("Etape 2")').removeClass('ko');
 				}
 			}
 		}
@@ -320,32 +326,38 @@ function verifyDbAccess ()
 	//local verifications
 	if($("#dbServer[value=]").length > 0)
 	{
-		$("#dbResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtDbServerEmpty).show('slow');
+		$("#dbResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtDbServerEmpty).slideDown('slow');
+		$('#stepList_3 li:contains("Etape 3")').addClass('ko');
 		return false;
 	}
 	else
 	{
-		$("#dbResultCheck").removeClass("fail").removeClass("ok").removeClass('userInfos').html('');
+		$("#dbResultCheck").removeClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html('');
+		$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
 	}
 	
 	if($("#dbLogin[value=]").length > 0)
 	{
-		$("#dbResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtDbLoginEmpty).show('slow');
+		$("#dbResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtDbLoginEmpty).slideDown('slow');
+		$('#stepList_3 li:contains("Etape 3")').addClass('ko');
 		return false;
 	}
 	else
 	{
-		$("#dbResultCheck").removeClass("fail").removeClass("ok").removeClass('userInfos').html('');
+		$("#dbResultCheck").removeClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html('');
+		$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
 	}
 	
 	if($("#dbName[value=]").length > 0)
 	{
-		$("#dbResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtDbNameEmpty).show('slow');
+		$("#dbResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtDbNameEmpty).slideDown('slow');
+		$('#stepList_3 li:contains("Etape 3")').addClass('ko');
 		return false;
 	}
 	else
 	{
-		$("#dbResultCheck").removeClass("fail").removeClass("ok").removeClass('userInfos').html('');
+		$("#dbResultCheck").removeClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html('');
+		$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
 	}
 	
 	//external verifications and sets
@@ -367,21 +379,23 @@ function verifyDbAccess ()
 			if (ret.getAttribute("result") == "ok")
 			{
 				$("#dbResultCheck")
-					.addClass("ok")
-					.removeClass("fail")
+					.addClass("okBlock")
+					.removeClass("errorBlock")
 					.html(txtError[23])
-					.show('slow');
+					.slideDown('slow');
 				$("#dbCreateResultCheck")
-					.hide('slow');
+					.slideUp('slow');
+				$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
 			} else
 			{
 				$("#dbResultCheck")
-					.addClass("fail")
-					.removeClass("ok")
+					.addClass("errorBlock")
+					.removeClass("okBlock")
 					.html(txtError[parseInt(ret.getAttribute("error"))])
-					.show('slow');
+					.slideDown('slow');
 				$("#dbCreateResultCheck")
-					.hide('slow');
+					.slideUp('slow');
+				$('#stepList_3 li:contains("Etape 3")').addClass('ko');
 			}
 		}
 	 }
@@ -416,11 +430,12 @@ function createDB()
 				action_ret = ret.getElementsByTagName('action')[0];
 			} catch (e) {
 				$("#dbCreateResultCheck")
-					.addClass("fail")
-					.removeClass("ok")
-					.removeClass('userInfos')
+					.addClass("errorBlock")
+					.removeClass("okBlock")
+					.removeClass('infosBlock')
 					.html(ret)
 					.show();
+				$('#stepList_3 li:contains("Etape 3")').addClass('ko');
 				return;
 			}
 			if (action_ret.getAttribute("result") == "ok")
@@ -452,9 +467,9 @@ function createDB()
 				if (action_ret.getAttribute("error") == "11")
 				{
 					$("#dbCreateResultCheck")
-						.addClass("fail")
-						.removeClass("ok")
-						.removeClass('userInfos')
+						.addClass("errorBlock")
+						.removeClass("okBlock")
+						.removeClass('infosBlock')
 						.html(
 							txtError[11]+ "<br />\'"+
 							action_ret.getAttribute("sqlQuery") + "\'<br/>"+
@@ -465,12 +480,13 @@ function createDB()
 				else
 				{
 					$("#dbCreateResultCheck")
-						.addClass("fail")
-						.removeClass("ok")
-						.removeClass('userInfos')
+						.addClass("errorBlock")
+						.removeClass("okBlock")
+						.removeClass('infosBlock')
 						.html(txtError[parseInt(action_ret.getAttribute("error"))])
 						.show();
 				}
+				$('#stepList_3 li:contains("Etape 3")').addClass('ko');
 			}
 	   }
 	});
@@ -482,29 +498,27 @@ function verifyMail()
 	//local verifications
 	if ($("#testEmail[value=]").length > 0)
 	{
-		$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtError[0]);
+		$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtError[0]);
 		return false;
 	}
 	else if (!verifMailREGEX.test( $("#testEmail").val() ))
 	{ 
-		$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtError[3]);
+		$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtError[3]);
 		return false;
 	}
 	else
 	{
-		
 		if (smtpChecked)
 		{
 			//local verifications
 			if($("#smtpSrv[value=]").length > 0)
 			{
-				$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtSmtpSrvEmpty);
+				$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtSmtpSrvEmpty);
 				smtpIsOk = false;
 				return false;
 			}
 		}
 		
-		
 		//external verifications and sets
 		$.ajax(
 		{
@@ -528,13 +542,13 @@ function verifyMail()
 				
 				if (ret.getAttribute("result") == "ok")
 				{
-					$("#mailResultCheck").addClass("ok").removeClass("fail").removeClass('userInfos').html(mailSended);
+					$("#mailResultCheck").addClass("okBlock").removeClass("errorBlock").removeClass('infosBlock').html(mailSended);
 					mailIsOk = true;
 				}
 				else
 				{
 					mailIsOk = false;
-					$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtError[26]);
+					$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtError[26]);
 				}
 		   }
 		 }
@@ -559,13 +573,13 @@ function uploadLogo ()
 						{
 							if(data.error != '')
 							{
-								$("#resultInfosLogo").html( txtError[parseInt(data.error)] ).addClass("fail").show();
+								$("#resultInfosLogo").html( txtError[parseInt(data.error)] ).addClass("errorBlock").show();
 							}
 							else
 							{
 								$(this).attr('src', ps_base_uri + 'img/logo.jpg?' + (new Date()))
 								$(this).show('slow');
-								$("#resultInfosLogo").html("").removeClass("fail").hide();
+								$("#resultInfosLogo").html("").removeClass("errorBlock").hide();
 							}
 						});
 					}
@@ -573,7 +587,7 @@ function uploadLogo ()
 				error: function (data, status, e)
 				{
 					$("#uploadedImage").attr('src', ps_base_uri + 'img/logo.jpg?' + (new Date()));
-					$("#resultInfosLogo").html("").addClass("fail");
+					$("#resultInfosLogo").html("").addClass("errorBlock");
 				}
 			}
 		)
@@ -621,7 +635,7 @@ function ajaxRefreshField(nthField, idResultField, fieldsList, inputId)
 	{
 		$("#"+idResultField)
 			.html( txtError[parseInt(fieldsList[nthField].getAttribute("error"))] )
-			.addClass("fail")
+			.addClass("errorBlock")
 			.show("slow");
 		if (validShopInfos)
 			$("#"+inputId).focus();
@@ -631,7 +645,7 @@ function ajaxRefreshField(nthField, idResultField, fieldsList, inputId)
 	{
 		$("#"+idResultField)
 			.html("")
-			.removeClass("fail")
+			.removeClass("errorBlock")
 			.show("slow");
 		return true;
 	}
@@ -651,7 +665,7 @@ function verifyShopInfos()
 	$.ajax(
 	{
 	   url: "model.php",
-	   async: false,
+	   async: true,
 	   cache: false,
 	   data:
 		"method=checkShopInfos"+
@@ -676,9 +690,7 @@ function verifyShopInfos()
 		"&smtpPort="+ encodeURIComponent($("input#smtpPort").val())+
 		"&smtpEnc="+ encodeURIComponent($("select#smtpEnc option:selected").val())+
 		"&mailSubject="+ encodeURIComponent(mailSubject)+
-		"&isoCodeLocalLanguage="+isoCodeLocalLanguage
-	   ,
-	   
+		"&isoCodeLocalLanguage="+isoCodeLocalLanguage,
 	   success: function(ret)
 	   {
 			fieldsList = ret.getElementsByTagName('shopConfig')[0].getElementsByTagName('field');
@@ -702,6 +714,7 @@ function verifyShopInfos()
 				$('#endFirstName').html($('input#infosFirstname').val());
 				$('#endName').html($('input#infosName').val());
 				$('#endEmail').html($('input#infosEmail').val());
+				showStep(5);
 			}
 	   }
 	 }
@@ -719,14 +732,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 				{
 					$(idResultSpan)
 						.show("slow")
-						.addClass("fail")
+						.addClass("errorBlock")
 						.html(txtError[0]);
 				}
 				else
 				{
 					$(idResultSpan)
 						.hide("slow")
-						.removeClass("fail")
+						.removeClass("errorBlock")
 						.html("");
 				}
 			}
@@ -741,14 +754,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 					{
 						$(idResultSpan)
 							.show("slow")
-							.addClass("fail")
+							.addClass("errorBlock")
 							.html(txtError[3]);
 					}
 					else
 					{
 						$(idResultSpan)
 							.hide("slow")
-							.removeClass("fail")
+							.removeClass("errorBlock")
 							.html("");
 					}
 				}
@@ -763,14 +776,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 					{
 						$(idResultSpan)
 							.show("slow")
-							.addClass("fail")
+							.addClass("errorBlock")
 							.html(txtError[47]);
 					}
 					else
 					{
 						$(idResultSpan)
 							.hide("slow")
-							.removeClass("fail")
+							.removeClass("errorBlock")
 							.html("");
 					}
 				}
@@ -785,14 +798,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 					{
 						$(idResultSpan)
 							.show("slow")
-							.addClass("fail")
+							.addClass("errorBlock")
 							.html(txtError[48]);
 					}
 					else
 					{
 						$(idResultSpan)
 							.hide("slow")
-							.removeClass("fail")
+							.removeClass("errorBlock")
 							.html("");
 					}
 				}
@@ -841,8 +854,7 @@ function doUpgrade()
 	   url: "model.php",
 	   cache: false,
 	   data:
-	   	"method=doUpgrade&customModule=" + customModule+ ""
-	   ,
+	   	"method=doUpgrade&customModule=" + customModule+ "",
 	   success: function(ret)
 	   {
 	   		var ret;
@@ -859,18 +871,19 @@ function doUpgrade()
 			{
 				requests = ret.getElementsByTagName('request');
 				$("#updateLog").empty();
-				
+				$("#updateLog").hide();
 				$(requests).each(function()
 				{
-					$("#updateLog").append("<div class='request'>" + $(this).children("sqlQuery").text() + "</div><br/>");
+					var html = "<div class='request'>" + $(this).children("sqlQuery").text();
 					if($(this).attr("result") == "fail")
 					{
 						countSqlError++;
-						$("#updateLog").append("<span class='fail'>(" + $(this).children("sqlNumberError").text() + ") " + $(this).children("sqlMsgError").text() + "</span><br/>");
+						html += "<br /><span class='fail'>(" + $(this).children("sqlNumberError").text() + ") " + $(this).children("sqlMsgError").text() + "</span><br style='clear:both;'/>";
 					}
+					$("#updateLog").append(html+"</div><br/>");
 				});
 				if (ret.getAttribute("error") == "34")
-					$("#txtErrorUpdateSQL").html(txtError[35]+" "+countSqlError+" "+txtError[36]);
+					$("#txtErrorUpdateSQL").html(txtError[35]+" "+countSqlError+" "+txtError[36]).show();
 				showStep(9);
 			}
 			else
@@ -905,29 +918,18 @@ $(document).ready(
 		$("#container").show();
 		
 		//ajax animation
-		$("#loader").ajaxStart(
+		$("#loaderSpace").ajaxStart(
 			function()
 			{
-				$(this).fadeIn();
-				$("#btNext[disabled!=1], #btBack[disabled!=1]").attr("disabled", "disabled").addClass("disabled").addClass("lockedForAjax");
+				$(this).fadeIn('slow');
+				$(this).children('div').fadeIn('slow');
 			}
 		);
-		$("#loader").ajaxComplete(
+		$("#loaderSpace").ajaxComplete(
 			function(e, xhr, settings)
 			{
-				$(this).fadeOut();
-				if (!errorOccured)
-				{
-				$(".lockedForAjax").removeAttr("disabled").removeClass("disabled").removeClass("lockedForAjax");
-					if (step == 1)
-					$("#btNext[disabled!=1], #btBack[disabled!=1]").attr("disabled", "disabled").addClass("disabled").addClass("lockedForAjax");
-					if (step == 6)
-					{
-						$('#btNext, #btBack').removeAttr('disabled').removeClass('disabled');
-						if (!$('#btDisclaimerOk').is(':checked'))
-							$("#btNext[disabled!=1]").attr("disabled", "disabled").addClass("disabled").addClass("lockedForAjax");
-			}
-				}
+				$(this).fadeOut('slow');
+				$(this).children('div').fadeOut('slow');
 				errorOccured = false;
 			}
 		);
@@ -950,6 +952,7 @@ $(document).ready(
 		);

 		//set SMTP pannels states
+		$("div#mailSMTPParam").hide();
 		$("#set_stmp").bind("click",
 			function()
 			{
@@ -958,13 +961,10 @@ $(document).ready(
 					case 0 :
 					$("div#mailSMTPParam").slideUp('slow');
 					smtpChecked = false;
-					$("#mailResultCheck").addClass("userInfos").removeClass("ok").removeClass('fail').html("");
 					break;
-					
 					case 1 :
 					$("div#mailSMTPParam").slideDown('slow');
 					smtpChecked = true;
-					$("#mailResultCheck").addClass("userInfos").removeClass("ok").removeClass('fail').html("");
 					break;
 				}
 			}
@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
@@ -25,7 +25,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date dans le passé
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past

 if (function_exists('date_default_timezone_set'))
 	date_default_timezone_set('Europe/Paris');
@@ -73,6 +73,20 @@ if (file_exists(INSTALL_PATH.'/../config/settings.inc.php'))
 {
 	include(INSTALL_PATH.'/../config/settings.inc.php');
 	$oldversion =_PS_VERSION_;
+	
+	// fix : complete version number if there is not all 4 numbers
+	// for example replace 1.4.3 by 1.4.3.0
+	// consequences : file 1.4.3.0.sql will be skipped if oldversion = 1.4.3
+	// @since 1.4.4.0
+	$arrayVersion = preg_split('#\.#', $oldversion);
+	$versionNumbers = sizeof($arrayVersion);
+
+	if ($versionNumbers != 4)
+		$arrayVersion = array_pad($arrayVersion, 4, '0');
+
+	$oldversion = implode('.', $arrayVersion);
+	// end of fix
+	
 	$tooOld = (version_compare($oldversion, MINIMUM_VERSION_TO_UPDATE) == -1);
 	$sameVersions = (version_compare($oldversion, INSTALL_VERSION) == 0);
 	$installOfOldVersion = (version_compare($oldversion, INSTALL_VERSION) == 1);
@@ -99,7 +113,7 @@ if ($lm->getIncludeTradFilename())
 	<meta http-equiv="Cache" content="no store" />
 	<meta http-equiv="Expires" content="-1" />
 	<meta name="robots" content="noindex" />
-	<title><?php echo lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?></title>
+	<title><?php echo sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?></title>
 	<link rel="stylesheet" type="text/css" media="all" href="view.css"/>
 	<script type="text/javascript" src="<?php echo PS_BASE_URI ?>js/jquery/jquery-1.4.4.min.js"></script>
 	<script type="text/javascript" src="<?php echo PS_BASE_URI ?>js/jquery/ajaxfileupload.js"></script>
@@ -113,15 +127,15 @@ if ($lm->getIncludeTradFilename())
 		var id_lang = "<?php echo (isset($_GET['language']) ? (int)($_GET['language']) : 0); ?>";

 		//localWords
-		var Step1Title = "<?php echo lang('Welcome').' - '.lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?>";
-		var step2title = "<?php echo lang('System Compatibility').' - '.lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?>";
-		var step3title = "<?php echo lang('System Configuration').' - '.lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?>";
-		var step4title = "<?php echo lang('Shop Configuration').' - '.lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?>";
-		var step5title = "<?php echo lang('Ready, set, go!').' - '.lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?>";
-		var step6title = "<?php echo lang('Disclaimer').' - '.lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?>";
-		var step7title = "<?php echo lang('System Compatibility').' - '.lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?>";
-		var step8title = "<?php echo lang('Errors while updating...').' - '.lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?>";
-		var step9title = "<?php echo lang('Ready, set, go!').' - '.lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?>";
+		var Step1Title = "<?php echo lang('Welcome').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
+		var step2title = "<?php echo lang('System Compatibility').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
+		var step3title = "<?php echo lang('System Configuration').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
+		var step4title = "<?php echo lang('Shop Configuration').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
+		var step5title = "<?php echo lang('Ready, set, go!').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
+		var step6title = "<?php echo lang('Disclaimer').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
+		var step7title = "<?php echo lang('System Compatibility').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
+		var step8title = "<?php echo lang('Errors while updating...').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
+		var step9title = "<?php echo lang('Ready, set, go!').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
 		var txtNext = "<?php echo lang('Next')?>"
 		var txtDbLoginEmpty = "<?php echo lang('Please set a database login'); ?>";
 		var txtDbNameEmpty = "<?php echo lang('Please set a database name'); ?>";
@@ -194,7 +208,7 @@ if ($lm->getIncludeTradFilename())
 		txtError[999] = "<?php echo lang('No error code available.'); ?>";
 		//upgrader
 		txtError[27] = "<?php echo lang('This installer is too old.'); ?>";
-		txtError[28] = "<?php echo lang('You already have the '.INSTALL_VERSION.' version.'); ?>";
+		txtError[28] = "<?php echo sprintf(lang('You already have the %s version.'), INSTALL_VERSION); ?>";
 		txtError[29] = "<?php echo lang('There is no older version. Did you delete or rename the config/settings.inc.php file?'); ?>";
 		txtError[30] = "<?php echo lang('The config/settings.inc.php file was not found. Did you delete or rename this file?'); ?>";
 		txtError[31] = "<?php echo lang('Can\'t find the sql upgrade files. Please verify that the /install/sql/upgrade folder is not empty)'); ?>";
@@ -245,18 +259,30 @@ if ($lm->getIncludeTradFilename())
 </div>

 <div id="container">
+<div id="header" class="clearfix">
+	<ul id="headerLinks">
+		<li class="lnk_forum"><a href="http://www.prestashop.com/forums/" target="_blank"><?php echo lang('Forum'); ?></a></li>
+		<li class="lnk_blog last"><a href="http://www.prestashop.com/blog/"><?php echo lang('Blog'); ?></a></li>
+		<?php if ((isset($_GET['language']) AND $_GET['language'] == 1) OR $lm->getIsoCodeSelectedLang() == 'fr'): ?>
+		<li id="phone_block" class="last">
+			<div><?php echo '<span>'.lang('Contact us!').'</span><br />'.lang('+33 (0)1.40.18.30.04'); ?></div>
+		</li>
+		<?php endif; ?>
+	</ul>
+
+	<div id="PrestaShopLogo">PrestaShop</div>
+	
+	<div id="infosSup">
+		<div class="installerVersion" id="installerVersion-<?php echo $lm->getIsoCodeSelectedLang()?>">PrestaShop <?php echo INSTALL_VERSION.'<br />'.lang('Installer'); ?></div>
+		<div class="updaterVersion" id="updaterVersion-<?php echo $lm->getIsoCodeSelectedLang()?>">PrestaShop <?php echo INSTALL_VERSION.'<br />'.lang('Updater'); ?></div>
+	</div>
+</div><!-- /end header -->

 <div id="loaderSpace">
 	<div id="loader">&nbsp;</div>
-</div>
+</div><!-- /end loaderSpace -->

 <div id="leftpannel">
-	<h1>
-		<div id="PrestaShopLogo">&nbsp;</div>
-		<div class="installerVersion" id="installerVersion-<?php echo $lm->getIsoCodeSelectedLang()?>">PrestaShop <?php echo INSTALL_VERSION.'<br />'.lang('Installer'); ?></div>
-		<div class="updaterVersion" id="updaterVersion-<?php echo $lm->getIsoCodeSelectedLang()?>">PrestaShop <?php echo INSTALL_VERSION.'<br />'.lang('Updater'); ?></div>
-	</h1>
-
 	<ol id="tabs"><li>&nbsp;</li></ol>

 	<div id="help">
@@ -265,27 +291,28 @@ if ($lm->getIncludeTradFilename())
 		<div class="content">
 			<p class="title"><?php echo lang('Need help?'); ?></p>
 			<p class="title_down"><?php echo lang('All tips and advice about PrestaShop'); ?></p>
-
-			<ul>
-				<li><img src="img/puce.gif" alt="" /> <a href="http://www.prestashop.com/forums/" target="_blank"><?php echo lang('Forum'); ?></a><br class="clear" /></li>
-				<li><img src="img/puce.gif" alt="" /> <a href="http://www.prestashop.com/blog/"><?php echo lang('Blog'); ?></a><br class="clear" /></li>
-			</ul>
 		</div>
-	</div>
-
-	<?php if ((isset($_GET['language']) AND $_GET['language'] == 1) OR $lm->getIsoCodeSelectedLang() == 'fr'): ?>
-	<p id="phone_block">
-		<?php echo '<span>'.lang('A question about PrestaShop or issues during installation or upgrade? Call us!').'</span><br /><img src="img/phone.png" style="vertical-align: middle;" alt="" /> '.lang('+33 (0)1.40.18.30.04'); ?>
-	</p>
-	<?php endif; ?>
-</div>
+	</div><!-- /end help -->
+</div><!-- /end leftpannel -->


 <div id="sheets">

 	<div class="sheet shown" id="sheet_lang">
-		<h2><?php echo lang('Welcome')?></h2>
-		<h3><?php echo lang('Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.')?><br /><?php echo lang('Please allow 5-15 minutes to complete the installation process.')?></h3>
+		<div class="contentTitle">
+			<h1><?php echo lang('Welcome')?></h1>
+			
+			<ul id="stepList_1" class="stepList clearfix">
+				<li>Etape 1</li>
+				<li>Etape 2</li>
+				<li>Etape 3</li>
+				<li>Etape 4</li>
+				<li>Etape 5</li>
+			</ul>
+		</div>
+		
+		<h2><?php echo lang('Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.')?></h2>
+		<p><?php echo lang('Please allow 5-15 minutes to complete the installation process.')?></p>
 		<p><?php echo lang('The PrestaShop Installer will do most of the work in just a few clicks.')?><br /><?php echo lang('However, you must know how to do the following manually:')?></p>
 		<ul>
 			<li><?php echo lang('Set permissions on folders & subfolders using Terminal or an FTP client')?></li>
@@ -296,7 +323,7 @@ if ($lm->getIncludeTradFilename())
 			<?php echo lang('For more information, please consult our') ?> <a href="http://www.prestashop.com/wiki/Getting_Started/"><?php echo lang('online documentation') ?></a>.
 		</p>

-		<h3><?php echo lang('Choose the installer language:')?></h3>
+		<h2><?php echo lang('Choose the installer language:')?></h2>
 		<form id="formSetInstallerLanguage" action="<?php $_SERVER['REQUEST_URI']; ?>" method="get">
 			<ul id="langList" style="line-height: 20px;">
 			<?php foreach ($lm->getAvailableLangs() as $lang): ?>
@@ -314,14 +341,15 @@ if ($lm->getIncludeTradFilename())
 			<?php echo lang('Prestashop and community offers over 40 different languages for free download on'); ?> <a href="http://www.prestashop.com" target="_blank">http://www.prestashop.com</a>
 		</p>

-		<h3><?php echo lang('Installation method')?></h3>
+		<h2><?php echo lang('Installation method')?></h2>
 		<form id="formSetMethod" action="<?php $_SERVER['REQUEST_URI']; ?>" method="post">
 			<p><input <?php echo (!($oldversion AND !$tooOld AND !$sameVersions AND !$installOfOldVersion)) ? 'checked="checked"' : '' ?> type="radio" value="install" name="typeInstall" id="typeInstallInstall"/><label for="typeInstallInstall"><?php echo lang('Installation : complete install of the PrestaShop Solution')?></label></p>
 			<p <?php echo ($oldversion AND !$tooOld AND !$sameVersions AND !$installOfOldVersion) ? '' : 'class="disabled"'; ?>><input <?php echo ($oldversion AND !$tooOld AND !$sameVersions AND !$installOfOldVersion) ? 'checked="checked"' : 'disabled="disabled"'; ?> type="radio" value="upgrade" name="typeInstall" id="typeInstallUpgrade"/><label <?php echo ($oldversion === false) ? 'class="disabled"' : ''; ?> for="typeInstallUpgrade"><?php echo lang('Upgrade: get the latest stable version!')?> <?php echo ($oldversion === false) ? lang('(no old version detected)') : ("(".(  ($tooOld) ? lang('the already installed version detected is too old, no more update available') : ($installOfOldVersion ? lang('the already installed version detected is too recent, no update available') : lang('installed version detected').' : '.$oldversion    )).")") ?></label></p>
 		</form>
-		<h2><?php echo lang('License Agreement')?></h2>
+		<h2><?php echo lang('Licenses Agreement')?></h2>
 		<div style="height:200px; border:1px solid #ccc; margin-bottom:8px; padding:5px; background:#fff; overflow: auto; overflow-x:hidden; overflow-y:scroll;">
-			<h3>Open Software License ("OSL") v. 3.0</h3>
+			<strong><?php echo lang('PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.')?></strong>
+			<h3>Core: Open Software License ("OSL") v. 3.0</h3>
 			<p>This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
 			<h4>Licensed under the Open Software License version 3.0</h4>
 			<p><strong>1. Grant of Copyright License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:</p>
@@ -347,17 +375,53 @@ if ($lm->getIncludeTradFilename())
 			<p><strong>14. Definition of "You" in This License.</strong> "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.</p>
 			<p><strong>15. Right to Use.</strong> You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.</p>
 			<p><strong>16. Modification of This License.</strong> This License is Copyright &copy; 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under Open Software License ("OSL") v. 3.0" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.</p>
+			
+			<h3>Modules and Themes: Academic Free License ("AFL") v. 3.0</h3>
+			<p>This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
+			<h4>Licensed under the Academic Free License version 3.0</h4>
+			<p><strong>1. Grant of Copyright License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:</p>
+			<ol type="a">
+				<li>to reproduce the Original Work in copies, either alone or as part of a collective work;</li>
+				<li>to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;</li>
+				<li>to distribute or communicate copies of the Original Work and Derivative Works to the public, <u>under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License</u>;</li>
+				<li>to perform the Original Work publicly; and</li>
+				<li>to display the Original Work publicly.</li>
+			</ol>
+			<p><strong>2. Grant of Patent License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.</p>
+			<p><strong>3. Grant of Source Code License.</strong> The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.</p>
+			<p><strong>4. Exclusions From License Grant.</strong> Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.</p>
+			<p><strong>5. External Deployment.</strong> The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).</p>
+			<p><strong>6. Attribution Rights.</strong> You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.</p>
+			<p><strong>7. Warranty of Provenance and Disclaimer of Warranty.</strong> Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.</p>
+			<p><strong>8. Limitation of Liability.</strong> Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.</p>
+			<p><strong>9. Acceptance and Termination.</strong> If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).</p>
+			<p><strong>10. Termination for Patent Action.</strong> This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.</p>
+			<p><strong>11. Jurisdiction, Venue and Governing Law.</strong> Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.</p>
+			<p><strong>12. Attorneys' Fees.</strong> In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.</p>
+			<p><strong>13. Miscellaneous.</strong> If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.</p>
+			<p><strong>14. Definition of "You" in This License.</strong> "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.</p>
+			<p><strong>15. Right to Use.</strong> You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.</p>
+			<p><strong>16. Modification of This License.</strong> This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.</p>
 		</div>
 		<p>
 			<input type="checkbox" id="set_license" class="required" style="vertical-align: middle;" /><label for="set_license"><strong><?php echo lang('I agree to the above terms and conditions.'); ?></strong></label><br/>
 		</p>
 	</div>

-		<div class="sheet" id="sheet_require">
+		<div class="sheet clearfix" id="sheet_require">
+			<div class="contentTitle">
+				<h1><?php echo lang('System and permissions')?></h1>

-			<h2><?php echo lang('System and permissions')?></h2>
+			<ul id="stepList_2" class="stepList clearfix">
+				<li class="ok">Etape 1</li>
+				<li>Etape 2</li>
+				<li>Etape 3</li>
+				<li>Etape 4</li>
+				<li>Etape 5</li>
+			</ul>
+			</div>

-			<h3><?php echo lang('Required set-up. Please verify the following checklist items are true.')?></h3>
+			<h2><?php echo lang('Required set-up. Please verify the following checklist items are true.')?></h2>

 			<p>
 				<?php echo lang('If you have any questions, please visit our '); ?>
@@ -366,7 +430,7 @@ if ($lm->getIncludeTradFilename())
 				<a href="http://www.prestashop.com/forums/" target="_blank"><?php echo lang('Community Forum'); ?></a><?php echo lang('.'); ?>
 			</p>

-			<h3 id="resultConfig" style="font-size: 20px; text-align: center; padding: 0px; display: none;"></h3>
+			<h3 id="resultConfig"></h3>
 			<ul id="required">
 				<li class="title"><?php echo lang('PHP parameters:')?></li>
 				<li class="required"><?php echo lang('PHP 5.0 or later installed')?></li>
@@ -401,19 +465,31 @@ if ($lm->getIncludeTradFilename())
 				<li class="optional"><?php echo lang('GZIP compression is on (recommended)')?></li>
 				<li class="optional"><?php echo lang('Mcrypt is available (recommended)')?></li>
 				<li class="optional"><?php echo lang('PHP magic quotes option is off (recommended)')?></li>
+				<li class="optional"><?php echo lang('Dom extension loaded')?></li>
 			</ul>
 			<h3 style="display:none;" id="resultConfigHelper"><?php echo lang('If you do not know how to fix these issues, use turnkey solution PrestaBox at');?> <a href="http://www.prestabox.com">http://www.prestabox.com</a></h3>
 			<p><input class="button" value="<?php echo lang('Refresh these settings')?>" type="button" id="req_bt_refresh"/></p>

 		</div>

-		<div class="sheet" id="sheet_db">
-			<h2><?php echo lang('Database configuration')?></h2>
+		<div class="sheet clearfix" id="sheet_db">
+			<div class="contentTitle">
+				<h1><?php echo lang('Database configuration')?></h1>

-			<p><?php echo lang('Configure your database by filling out the following fields:')?></p>
+			<ul id="stepList_3" class="stepList clearfix">
+				<li class="ok">Etape 1</li>
+				<li class="ok">Etape 2</li>
+				<li>Etape 3</li>
+				<li>Etape 4</li>
+				<li>Etape 5</li>
+			</ul>
+			</div>
+			
+			<div id="dbPart">
+				<h2><?php echo lang('Configure your database by filling out the following fields:')?></h2>
+				<p><?php echo lang('You have to create a database, help available in readme_en.txt'); ?></p>
 			<form id="formCheckSQL" class="aligned" action="<?php $_SERVER['REQUEST_URI']; ?>" onsubmit="verifyDbAccess(); return false;" method="post">
-				<h3 style="padding:0;margin:0;"><?php echo lang('You have to create a database, help available in readme_en.txt'); ?></h3>
-				<p style="margin-top: 15px;">
+					<p class="first" style="margin-top: 15px;">
 					<label for="dbServer"><?php echo lang('Server:')?> </label>
 					<input size="25" class="text" type="text" id="dbServer" value="localhost"/>
 				</p>
@@ -436,27 +512,32 @@ if ($lm->getIncludeTradFilename())
 						<option value="MyISAM">MyISAM</option>
 					</select>
 				</p>
+					<p class="last">
+						<label for="db_prefix"><?php echo lang('Tables prefix:')?></label> 
+						<input class="text" type="text" id="db_prefix" value="ps_"/>
+					</p>
 				<p class="aligned">
 					<input id="btTestDB" class="button" type="submit" value="<?php echo lang('Verify now!')?>"/>
 				</p>
 				<p id="dbResultCheck"></p>
 			</form>
+			</div>

 			<div id="dbTableParam">
 				<form action="#" method="post" onsubmit="createDB(); return false;">
-				<p><label for="db_prefix"><?php echo lang('Tables prefix:')?> </label><input class="text" type="text" id="db_prefix" value="ps_"/></p>
 				<h2><?php echo lang('Installation type')?></h2>
 				<p id="dbModeSetter" style="line-height: 20px;">
-					<input value="lite" type="radio" name="db_mode" id="db_mode_simple" style="vertical-align: middle;" /><label for="db_mode_simple"><?php echo lang('Simple mode: Basic installation')?> <span style="color: #CC0000; font-weight: bold;"><?php echo lang('(FREE)'); ?></span></label><br />
-					<input value="full" type="radio" name="db_mode" checked="checked" id="db_mode_complet" style="vertical-align: middle;" /><label for="db_mode_complet"><?php echo lang('Full mode: includes').' <b>'.lang('100+ additional modules').'</b> '.lang('and demo products'); ?> <span style="color: #CC0000; font-weight: bold;"><?php echo lang('(FREE too!)'); ?></span></label>
+					<input value="lite" type="radio" name="db_mode" id="db_mode_simple" style="vertical-align: middle;" /> <label for="db_mode_simple"><?php echo lang('Simple mode: Basic installation')?> <span><?php echo lang('(FREE)'); ?></span></label><br />
+					<input value="full" type="radio" name="db_mode" checked="checked" id="db_mode_complet" style="vertical-align: middle;" /> <label for="db_mode_complet"><?php echo lang('Full mode: includes').' <b>'.lang('100+ additional modules').'</b> '.lang('and demo products'); ?> <span><?php echo lang('(FREE too!)'); ?></span></label>
 				</p>
 				</form>
 				<p id="dbCreateResultCheck"></p>
 			</div>
+			
 			<div id="mailPart">
 				<h2><?php echo lang('E-mail delivery set-up')?></h2>

-				<p>
+				<p id="configsmtp">
 					<input type="checkbox" id="set_stmp" style="vertical-align: middle;" /><label for="set_stmp"><?php echo lang('Configure SMTP manually (advanced users only)'); ?></label><br/>
 					<span class="userInfos"><?php echo lang('By default, the PHP \'mail()\' function is used'); ?></span>
 				</p>
@@ -478,7 +559,7 @@ if ($lm->getIncludeTradFilename())

 						<p>
 							<label for="smtpPort"><?php echo lang('Port:'); ?></label>
-							<input type="text" size="5" id="smtpPort" value="25" />
+							<input type="text" size="5" id="smtpPort" value="25" class="text" />
 						</p>

 						<p>
@@ -494,27 +575,41 @@ if ($lm->getIncludeTradFilename())
 					</form>
 				</div>
 				<p>
-					<input class="text" id="testEmail" type="text" size="15" value="<?php echo lang('enter@your.email'); ?>"></input>
-					<input id="btVerifyMail" class="button" type="submit" value="<?php echo lang('Send me a test email!'); ?>"></input>
+					<input class="text" id="testEmail" type="text" size="15" value="<?php echo lang('enter@your.email'); ?>" /> &nbsp; 
+					<input id="btVerifyMail" class="button" type="submit" value="<?php echo lang('Send me a test email!'); ?>" />
 				</p>

-				<p id="mailResultCheck" class="userInfos"></p>
+				<p id="mailResultCheck"></p>
 			</div>
 		</div>

-		<div class="sheet" id="sheet_infos">
+		<div class="sheet clearfix" id="sheet_infos">
 			<form action="<?php $_SERVER['REQUEST_URI']; ?>" method="post" onsubmit="return false;" enctype="multipart/form-data">
+				<div class="contentTitle">
+					<h1><?php echo lang('Shop configuration')?></h1>

-				<h2><?php echo lang('Shop configuration'); ?></h2>
+					<ul id="stepList_4" class="stepList clearfix">
+						<li class="ok">Etape 1 ok</li>
+						<li class="ok">Etape 2 ok</li>
+						<li class="ok">Etape 3 ok</li>
+						<li>Etape 4</li>
+						<li>Etape 5</li>
+					</ul>
+				</div>

-				<h3><?php echo lang('Merchant info'); ?></h3>
+				<div id="infosShopBlock">
+					<h2><?php echo lang('Merchant info'); ?></h2>
 				<div class="field">
-					<label for="infosShop" class="aligned"><?php echo lang('Shop name:'); ?> </label><input class="text required" type="text" id="infosShop" value=""/><br/>
+						<label for="infosShop" class="aligned"><?php echo lang('Shop name:'); ?> </label>
+						<span class="contentinput">
+							<input class="text required" type="text" id="infosShop" value=""/> <sup class="required">*</sup>
+						</span>
 					<span id="resultInfosShop" class="result aligned"></span>
 				</div>
 				<div class="field">
 					<label for="infosActivity" class="aligned"><?php echo lang('Main activity:'); ?></label>
-					<select id="infosActivity" style="border:1px solid #D41958">
+						<span class="contentinput">
+							<select id="infosActivity">
 						<option value="0"><?php echo lang('-- Please choose your main activity --'); ?></option>
 						<option value="1"><?php echo lang('Adult'); ?></option>
 						<option value="2"><?php echo lang('Animals and Pets'); ?></option>
@@ -538,64 +633,96 @@ if ($lm->getIncludeTradFilename())
 						<option value="20"><?php echo lang('Travel'); ?></option>
 						<option value="0"><?php echo lang('Other activity...'); ?></option>
 					</select>
+						</span>
 					<p class="userInfos aligned"><?php echo lang('This information isn\'t required, it will be used for statistical purposes. This information doesn\'t change anything in your store.'); ?></p>
 				</div>
 				<div class="field">
 					<label for="infosCountry" class="aligned"><?php echo lang('Default country:'); ?></label>
-					<select id="infosCountry" style="width:175px;border:1px solid #D41958">
+						<span class="contentinput">
+							<select id="infosCountry">
 					</select>
+						</span>
 				</div>
 				<div class="field">
 					<label for="infosTimezone" class="aligned"><?php echo lang('Shop\'s timezone:'); ?></label>
-					<select id="infosTimezone" style="width:175px;border:1px solid #D41958">
+						<span class="contentinput">
+							<select id="infosTimezone">
 					</select>
+						</span>
 				</div>
 				<div class="field">
 					<label for="infosLogo" class="aligned logo"><?php echo lang('Shop logo'); ?> : </label>
+						<span class="contentinput">
+							<p id="alignedLogo"><img id="uploadedImage" src="<?php echo PS_BASE_URI ?>img/logo.jpg" alt="Logo" /></p>
+						</span>
+						<p class="userInfos aligned"><?php echo lang('recommended dimensions: 230px X 75px'); ?></p>
+						
+						<span id="inputFileLogo" class="contentinput">
 					<input type="file" onchange="uploadLogo()" name="fileToUpload" id="fileToUpload"/>
+						</span>
 					<span id="resultInfosLogo" class="result"></span>
-					<p class="userInfos aligned"><?php echo lang('recommended dimensions: 230px X 75px'); ?></p>
-					<p id="alignedLogo"><img id="uploadedImage" src="<?php echo PS_BASE_URI ?>img/logo.jpg" alt="Logo" /></p>
 				</div>
 				<div class="field">
 					<label for="catalogMode" class="aligned"><?php echo lang('Catalog mode:'); ?></label>
+						<span class="contentinput">
 					<input type="radio" name="catalogMode" id="catalogMode_1" value="1" />
-					<label for="catalogMode_1"><?php echo lang('Yes'); ?></label>
+							<label for="catalogMode_1" class="radiolabel"><?php echo lang('Yes'); ?></label>&nbsp; &nbsp;
 					<input type="radio" name="catalogMode" id="catalogMode_0" value="0" checked="checked"/>
-					<label for="catalogMode_0"><?php echo lang('No'); ?></label>
+							<label for="catalogMode_0" class="radiolabel"><?php echo lang('No'); ?></label>
+						</span>
 					<p class="userInfos aligned"><?php echo lang('If you activate this feature, all purchase features will be disabled. You can activate this feature later in your back office'); ?></p>
 				</div>

 				<div class="field">
-					<label for="infosFirstname" class="aligned"><?php echo lang('First name:'); ?> </label><input class="text required" type="text" id="infosFirstname"/><br/>
+						<label for="infosFirstname" class="aligned"><?php echo lang('First name:'); ?> </label>
+						<span class="contentinput">
+							<input class="text required" type="text" id="infosFirstname"/> <sup class="required">*</sup>
+						</span>
 					<span id="resultInfosFirstname" class="result aligned"></span>
 				</div>

 				<div class="field">
-					<label for="infosName" class="aligned"><?php echo lang('Last name:'); ?> </label><input class="text required" type="text" id="infosName"/><br/>
+						<label for="infosName" class="aligned"><?php echo lang('Last name:'); ?> </label>
+						<span class="contentinput">
+							<input class="text required" type="text" id="infosName"/> <sup class="required">*</sup>
+						</span>
 					<span id="resultInfosName" class="result aligned"></span>
 				</div>

 				<div class="field">
-					<label for="infosEmail" class="aligned"><?php echo lang('E-mail address:'); ?> </label><input type="text" class="text required" id="infosEmail"/><br/>
+						<label for="infosEmail" class="aligned"><?php echo lang('E-mail address:'); ?> </label>
+						<span class="contentinput">
+							<input type="text" class="text required" id="infosEmail"/> <sup class="required">*</sup>
+						</span>
 					<span id="resultInfosEmail" class="result aligned"></span>
 				</div>

 				<div class="field">
-					<label for="infosPassword" class="aligned"><?php echo lang('Shop password:'); ?> </label><input autocomplete="off" type="password" class="text required" id="infosPassword"/><br/>
+						<label for="infosPassword" class="aligned"><?php echo lang('Shop password:'); ?> </label>
+						<span class="contentinput">
+							<input autocomplete="off" type="password" class="text required" id="infosPassword"/> <sup class="required">*</sup>
+						</span>
 					<span id="resultInfosPassword" class="result aligned"></span>
 				</div>
 				<div class="field">
-					<label class="aligned" for="infosPasswordRepeat"><?php echo lang('Re-type to confirm:'); ?> </label><input type="password" autocomplete="off" class="text required" id="infosPasswordRepeat"/><br/>
+						<label class="aligned" for="infosPasswordRepeat"><?php echo lang('Re-type to confirm:'); ?> </label>
+						<span class="contentinput">
+							<input type="password" autocomplete="off" class="text required" id="infosPasswordRepeat"/> <sup class="required">*</sup>
+						</span>
 					<span id="resultInfosPasswordRepeat" class="result aligned"></span>
 				</div>

-				<div class="field">
+					<div class="field" id="contentInfosNotification">
+						<span class="contentinput">
 					<input type="checkbox" id="infosNotification" class="aligned" style="vertical-align: middle;" /><label for="infosNotification"><?php echo lang('Receive notifications by e-mail'); ?></label><br/>
 					<span id="resultInfosNotification" class="result aligned"></span>
+						</span>
+						
 					<p class="userInfos aligned"><?php echo lang('If you check this box and your mail configuration is wrong, your installation might be blocked. If so, please uncheck the box to go to the next step.'); ?></p>
 				</div>
+				</div>

+				<div id="benefitsBlock">
 				<!-- Partner Modules -->
 				<?php
 					if (!isset($_GET['language']))
@@ -603,11 +730,7 @@ if ($lm->getIncludeTradFilename())
 				?>
 				<link href="../css/jquery.fancybox-1.3.4.css" rel="stylesheet" type="text/css" media="screen" />
 				<script src="../js/jquery/jquery.fancybox-1.3.4.js" type="text/javascript"></script>
-				<style>
-					.installModuleList { display: none; }
-					.installModuleList.selected { display: block; }
-				</style>
-				<script>
+					<script type="text/javascript">
 					var moduleChecked = new Array();
 					$(document).ready(function() {
 						$('#infosCountry').change(function() {
@@ -662,6 +785,14 @@ if ($lm->getIncludeTradFilename())
 									foreach ($p->prechecked as $country_iso_code)
 										$modulesPrechecked[trim($p->key)][trim($country_iso_code)] = 1;
 							}
+								echo '<table cellpadding="0" callspacing="0" border="0" class="moduleTable">
+									<tr>
+										<th style="width: 30px;"></th>
+										<th style="width: 100px;">Modules</th>
+										<th style="padding: 12px; width: 430px;">Avantages</th>
+										</tr>
+									</table>
+								';

 							foreach ($modulesHelpInstall as $country_iso_code => $modulesList)
 							{
@@ -669,21 +800,20 @@ if ($lm->getIncludeTradFilename())
 								foreach ($modulesList as $module)
 								{
 									echo '
-									<table style="border: 1px solid #CCC; padding: 5px; width: 650px">
+										<table cellpadding="0" callspacing="0" border="0" class="moduleTable">
 									<tr>
-									<td style="width: 100px; text-align: center;"><img src="'.$modulesDescription[$module]['logo'].'" alt="'.$modulesDescription[$module]['name'].'" title="'.$modulesDescription[$module]['name'].'">'.(isset($modulesDescription[$module]['more']) ? $modulesDescription[$module]['more'] : '').'</td>
-									<td style="padding-left: 15px; width: 430px;">
-									'.$modulesDescription[$module]['description'].'
-									</td>
-									<td style="text-align: center; width: 30px; background: #FFF;">
-									<span style="padding: 3px 4px 6px 2px; background: none repeat scroll 0pt 0pt #7EB423;">
+										<td valign="top" style="text-align: center; padding-top:10px; width: 30px; background: #FFF;">
+										<span style="padding: 12px 4px 6px 2px;">
 									<input type="checkbox" id="preInstallModules_'.$country_iso_code.'_'.$module.'" value="'.$module.'" class="'.$module.' preInstallModules_'.$country_iso_code.'" style="vertical-align: middle;" />
 									</span>
 									</td>
+										<td valign="top" style="width: 100px; text-align: center;"><img src="'.$modulesDescription[$module]['logo'].'" alt="'.$modulesDescription[$module]['name'].'" title="'.$modulesDescription[$module]['name'].'">'.(isset($modulesDescription[$module]['more']) ? $modulesDescription[$module]['more'] : '').'</td>
+										<td style="padding: 15px; width: 430px;">
+										'.$modulesDescription[$module]['description'].'
+										</td>
 									</tr>
-									<tr><td colspan="3"><div id="divForm_'.$country_iso_code.'_'.$module.'">&nbsp;</div></td></tr>
-									</table>
-									<br />';
+										<tr><td colspan="3"><div id="divForm_'.$country_iso_code.'_'.$module.'">&nbsp;</div></td></tr></table>
+										';
 									echo "<script>
 										moduleChecked['".$country_iso_code.'_'.$module."'] = 0;
 										$(document).ready(function() {
@@ -745,7 +875,6 @@ if ($lm->getIncludeTradFilename())
 												});
 											});";
 										}
-
 										echo "</script>";
 								}
 								echo '</div>';
@@ -754,13 +883,8 @@ if ($lm->getIncludeTradFilename())
 					}

 				?>
-
 				<!-- Partner Modules -->

-
-
-
-
 				<!--<h3><?php echo lang('Shop\'s languages'); ?></h3>
 				<p class="userInfos"><?php echo lang('Select the different languages available for your shop'); ?></p>-->
 				<div id="availablesLanguages" style=" float:left; text-align: center; display:none;">
@@ -798,31 +922,44 @@ if ($lm->getIncludeTradFilename())
 						<?php }} ?>
 					</select>
 				</div>
+				
+				</div>
 			</form>

 			<div id="resultEnd">
 				<span id="resultInfosSQL" class="result"></span>
 				<span id="resultInfosLanguages" class="result"></span>
 			</div>
-
 		</div>

-		<div class="sheet" id="sheet_end" style="padding:0">
-			<div style="padding:1em">
-				<h2><?php echo lang('PrestaShop is ready!'); ?></h2>
-				<h3><?php echo lang('Your installation is finished!'); ?></h3>
+		<div class="sheet clearfix" id="sheet_end">
+			
+			<div class="contentTitle">
+				<h1><?php echo lang('PrestaShop is ready!'); ?></h1>
+				
+				<ul id="stepList_5" class="stepList clearfix">
+					<li class="ok">Etape 1 ok</li>
+					<li class="ok">Etape 2 ok</li>
+					<li class="ok">Etape 3 ok</li>
+					<li class="ok">Etape 4 ok</li>
+					<li class="ok">Etape 5</li>
+				</ul>
+		</div>
+
+			<div class="clearfix">
+				<h2><?php echo lang('Your installation is finished!'); ?></h2>
 				<p><?php echo lang('You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'); ?></p>
 				<p><?php echo lang('Here are your shop information. You can modify them once logged in.'); ?></p>
-				<table id="resultInstall" cellspacing="0">
-					<tr>
-						<td class="label"><?php echo lang('Shop name:'); ?></td>
-						<td id="endShopName" class="resultEnd">&nbsp;</td>
+				<table cellpadding="0" cellspacing="0" border="0" id="resultInstall" width="620">
+					<tr class="odd">
+						<td width="220" class="label"><?php echo lang('Shop name:'); ?></td>
+						<td width="400" id="endShopName" class="resultEnd">&nbsp;</td>
 					</tr>
 					<tr>
 						<td class="label"><?php echo lang('First name:'); ?></td>
 						<td id="endFirstName" class="resultEnd">&nbsp;</td>
 					</tr>
-					<tr>
+					<tr class="odd">
 						<td class="label"><?php echo lang('Last name:'); ?></td>
 						<td id="endName" class="resultEnd">&nbsp;</td>
 					</tr>
@@ -831,23 +968,26 @@ if ($lm->getIncludeTradFilename())
 						<td id="endEmail" class="resultEnd">&nbsp;</td>
 					</tr>
 				</table>
-				<h3><?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?></h3>

-				<a href="../admin" id="access" class="BO" target="_blank">
-					<span class="title"><?php echo lang('Back Office'); ?></span>
-					<span class="description"><?php echo lang('Manage your store with your back office. Manage your orders and customers, add modules, change your theme, etc...'); ?></span>
-					<span class="message"><?php echo lang('Manage your store'); ?></span>
-				</a>
-				<a href="../" id="access" class="FO" target="_blank">
-					<span class="title"><?php echo lang('Front Office'); ?></span>
-					<span class="description"><?php echo lang('Find your store as your future customers will see!'); ?></span>
-					<span class="message"><?php echo lang('Discover your store'); ?></span>
-				</a>
+				<h3 class="infosBlock"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?></h3>
+				
+				<div id="boBlock" class="blockInfoEnd clearfix">
+						<img src="img/visu_boBlock.png" />
+						<h3><?php echo lang('Back Office'); ?></h3>
+						<p class="description"><?php echo lang('Manage your store with your back office. Manage your orders and customers, add modules, change your theme, etc...'); ?></p>
+						<a href="../admin" id="access" class="BO" target="_blank"><span><?php echo lang('Manage your store'); ?></span></a>
+				</div>
+				<div id="foBlock" class="blockInfoEnd last clearfix">
+						<img src="img/visu_foBlock.png" />
+						<h3><?php echo lang('Front Office'); ?></h3>
+						<p class="description"><?php echo lang('Find your store as your future customers will see!'); ?></p>
+						<a href="../" id="access" class="FO" target="_blank"><span><?php echo lang('Discover your store'); ?></span></a>
+				</div>
+				
 				<div id="resultEnd"></div>
 			</div>
 			<?php
 			if (@fsockopen('addons.prestashop.com', 80, $errno, $errst, 3)): ?>
-
 			<iframe src="http://addons.prestashop.com/psinstall.php?lang=<?php echo $lm->getIsoCodeSelectedLang()?>" scrolling="no" id="prestastore">
 				<p>Your browser does not support iframes.</p>
 			</iframe>
@@ -856,9 +996,18 @@ if ($lm->getIncludeTradFilename())

 		</div>

-		<div class="sheet" id="sheet_disclaimer">
-			<h2><?php echo lang('Disclaimer'); ?></h2>
-			<h3><?php echo lang('Warning: a manual backup is HIGHLY recommended before continuing!'); ?></h3>
+		<div class="sheet clearfix" id="sheet_disclaimer">
+			<div class="contentTitle">
+				<h1><?php echo lang('Disclaimer'); ?></h1>
+		
+				<ul id="stepList_6" class="stepList clearfix">
+					<li class="ok">Etape 1</li>
+					<li>Etape 2</li>
+					<li>Etape 3</li>
+					<li>Etape 4</li>
+				</ul>
+			</div>
+			<h2><?php echo lang('Warning: a manual backup is HIGHLY recommended before continuing!'); ?></h2>
 			<p><?php echo lang('Please backup the database and application files.'); ?></p>
 			<p><?php echo lang('When your files and database are saving in an other support, please certify that your shop is really backed up.'); ?><br /><br /></p>

@@ -879,7 +1028,7 @@ if ($lm->getIncludeTradFilename())
 					$(document).ready(function() {
 						$.ajax({
 							url: 'xml/getNonNativeModules.php',
-							async: false,
+							async: true,
 							dataType: "json",
 							success: function (json) 
 							{
@@ -962,20 +1111,20 @@ if ($lm->getIncludeTradFilename())
 					if (sizeof($upgradeFiles))
 					{
 						echo '
-						<table cellpadding="5" border="1" style="font-size: 11px; margin-top: 10px;">
+						<table cellpadding="0" cellspacing="0" border="0">
 							<tr>
 								<th>'.lang('Upgrade file').'</th>
-								<th style="width: 100px;">'.lang('Modifications to process').'</th>
+								<th  style="text-align: right;">'.lang('Modifications to process').'</th>
 							</tr>';

 						uasort($upgradeFiles, 'sortnatversion');
 						$totalInstructions = 0;
 						foreach ($upgradeFiles AS $file)
 						{
-							echo '<tr><td style="'.($file['is_major'] ? 'font-weight: bold;' : 'padding-left: 12px;').'">v'.$file['version'].($file['is_major'] ? ' '.lang('(major)') : '').'</td><td style="text-align: right; padding-right: 5px;">'.(int)$file['instructions'].'</td></tr>';
+							echo '<tr><td style="'.($file['is_major'] ? 'font-weight: bold;' : '').'">v'.$file['version'].($file['is_major'] ? ' '.lang('(major)') : '').'</td><td style="text-align: right;">'.(int)$file['instructions'].'</td></tr>';
 							$totalInstructions += (int)$file['instructions'];
 						}
-						echo '<tr style="font-weight: bold;"><td>'.lang('TOTAL').'</td><td style="text-align: right; padding-right: 5px;">'.(int)$totalInstructions.'</td></tr>';
+						echo '<tr style="font-weight: bold;"><td>'.lang('TOTAL').'</td><td style="text-align: right;">'.(int)$totalInstructions.'</td></tr>';
 						echo '
 						</table>';

@@ -983,7 +1132,7 @@ if ($lm->getIncludeTradFilename())
 						$minutes = (int)($upgradeTime / 60);
 						$seconds = (int)($upgradeTime - ($minutes * 60));

-						echo '<p><img src="../img/admin/time.gif" alt="" style="vertical-align: middle;" /> '.lang('Estimated time to complete the').' '.(int)$totalInstructions.' '.lang('modifications:').' <b style="font-size: 14px;">'.(int)$minutes.' '.($minutes > 1 ? lang('minutes') : lang('minute')).' '.(int)$seconds.' '.($seconds > 1 ? lang('seconds') : lang('second')).'</b><br />
+						echo '<p><img src="../img/admin/time.gif" alt="" style="vertical-align: absmiddle;" /> '.lang('Estimated time to complete the').' '.(int)$totalInstructions.' '.lang('modifications:').' <b style="font-size: 14px;">'.(int)$minutes.' '.($minutes > 1 ? lang('minutes') : lang('minute')).' '.(int)$seconds.' '.($seconds > 1 ? lang('seconds') : lang('second')).'</b><br />
 						<i style="font-size: 11px;">'.lang('Depending on your server and the size of your shop').'</i></p>';

 						if ($majorReleases > 1)
@@ -1011,7 +1160,7 @@ if ($lm->getIncludeTradFilename())
 				<br />
 				<h2>'.lang('Hosting parameters').'</h2>
 				<p>'.lang('PrestaShop tries to automatically set the best settings for your server in order the update to be successful.').'</p>
-				<table cellpadding="5" border="1" style="font-size: 11px;">
+				<table cellpadding="0" cellspacing="0" border="0">
 					<tr>
 						<th>'.lang('PHP parameter').'</th>
 						<th>'.lang('Description').'</th>
@@ -1028,28 +1177,32 @@ if ($lm->getIncludeTradFilename())
 						<td style="text-align: right;">'.ini_get('memory_limit').'</td>
 					</tr>
 				</table>
-				<div style="font-weight: bold; background: '.$color.'; color: #000; padding: 10px; border: 1px solid #999; margin-top: 10px;">';
+				<div class="infosBlock">';

 				if ($color == '#D9F2D0')
-					echo '<img src="../img/admin/ok.gif" alt="" style="vertical-align: middle;" /> '.lang('All your settings seem to be OK, go for it!');
+					echo '<img src="../img/admin/ok.gif" alt="" style="vertical-align: absmiddle;" /> '.lang('All your settings seem to be OK, go for it!');
 				elseif ($color == '#FFDEB7')
-					echo '<img src="../img/admin/warning.gif" alt="" style="vertical-align: middle;" /> '.lang('Beware, your settings look correct but are not optimal, if you encounter problems (upgrade too long, memory error...), please ask your hosting provider to increase the values of these parameters (max_execution_time & memory_limit).');
+					echo '<img src="../img/admin/warning.gif" alt="" style="vertical-align: absmiddle;" /> '.lang('Beware, your settings look correct but are not optimal, if you encounter problems (upgrade too long, memory error...), please ask your hosting provider to increase the values of these parameters (max_execution_time & memory_limit).');
 				elseif ($color == '#FAE2E3')
-					echo '<img src="../img/admin/error2.png" alt="" style="vertical-align: middle;" /> '.lang('We strongly recommend that you inform your hosting provider to modify the settings before process to the update.');
-
-				echo '
-				</div><br />';
-
+					echo '<img src="../img/admin/error2.png" alt="" style="vertical-align: absmiddle;" /> '.lang('We strongly recommend that you inform your hosting provider to modify the settings before process to the update.');
+				echo '</div>';

 				?>
 			</div>
 		</div>

-		<div class="sheet" id="sheet_require_update">
+		<div class="sheet clearfix" id="sheet_require_update">
+			<div class="contentTitle">
+				<h1><?php echo lang('System and permissions')?></h1>

-			<h2><?php echo lang('System and permissions'); ?></h2>
-
-			<h3><?php echo lang('Required set-up. Please verify the following checklist items are true.'); ?></h3>
+				<ul id="stepList_7" class="stepList clearfix">
+					<li class="ok">Etape 1 ok</li>
+					<li class="ok">Etape 2 ok</li>
+					<li>Etape 3</li>
+					<li>Etape 4</li>
+				</ul>
+			</div>
+			<h2><?php echo lang('Required set-up. Please verify the following checklist items are true.'); ?></h2>

 			<p>
 				<?php echo lang('If you have any questions, please visit our '); ?>
@@ -1058,7 +1211,7 @@ if ($lm->getIncludeTradFilename())
 				<a href="http://www.prestashop.com/forums/" target="_blank"><?php echo lang('Community Forum'); ?></a><?php echo lang('.'); ?>
 			</p>

-			<h3 id="resultConfig_update" style="font-size: 20px; text-align: center; padding: 0px; display: none;"></h3>
+			<h3 id="resultConfig_update"></h3>
 			<ul id="required_update">
 				<li class="title"><?php echo lang('PHP parameters:')?></li>
 				<li class="required"><?php echo lang('PHP 5.0 or later installed')?></li>
@@ -1093,27 +1246,51 @@ if ($lm->getIncludeTradFilename())
 				<li class="optional"><?php echo lang('GZIP compression is on (recommended)')?></li>
 				<li class="optional"><?php echo lang('Mcrypt is available (recommended)')?></li>
 				<li class="optional"><?php echo lang('PHP magic quotes option is off (recommended)')?></li>
+				<li class="optional"><?php echo lang('Dom extension loaded')?></li>
 			</ul>

 			<p><input class="button" value="<?php echo lang('Refresh these settings'); ?>" type="button" id="req_bt_refresh_update"/></p>

 		</div>

-		<div class="sheet" id="sheet_updateErrors">
-			<h2><?php echo lang('Error!'); ?></h2>
+		<div class="sheet clearfix" id="sheet_updateErrors">
+			<div class="contentTitle">
+				<h1><?php echo lang('Error!'); ?></h1>
+
+				<ul id="stepList_8" class="stepList clearfix">
+					<li class="ok">Etape 1 ok</li>
+					<li class="ok">Etape 2 ok</li>
+					<li class="ko">Etape 3</li>
+					<li>Etape 4</li>
+				</ul>
+			</div>
+			
 			<h3><?php echo lang('One or more errors have occurred, you can find more informations below or in the log/installation.log file.'); ?></h3>
-			<p id="resultUpdate"></p>
-			<p id="detailsError"></p>
+			
+			<p id="resultUpdate" class="errorBlock"></p>
+			<br />
+			<p id="detailsError" class="infosBlock"><?php echo lang('No more informations'); ?></p>
 		</div>

-		<div class="sheet" id="sheet_end_update" style="padding:0px;">
-			<div style="padding:1em;">
+		<div class="sheet clearfix" id="sheet_end_update">
+			<div>
+				<div class="contentTitle">
 				<h1><?php echo lang('Your update is completed!'); ?></h1>
-				<h3><?php echo lang('Your shop version is now').' '.INSTALL_VERSION; ?></h3>
-				<p class="fail" id="txtErrorUpdateSQL"></p>
-				<p><a href="javascript:showUpdateLog()"><?php echo lang('view the log'); ?></a></p>
+
+					<ul id="stepList_7" class="stepList clearfix">
+						<li class="ok">Etape 1 ok</li>
+						<li class="ok">Etape 2 ok</li>
+						<li class="ok">Etape 3</li>
+						<li class="ok">Etape 4</li>
+					</ul>
+				</div>
+				<div class="okBlock">
+					<?php echo lang('Your shop version is now').' '.INSTALL_VERSION; ?>
+				</div>
+				<p class="errorBlock" id="txtErrorUpdateSQL" style="display:none;"></p>
+				<p style="padding-bottom: 5px;"><a href="javascript:showUpdateLog()"><?php echo lang('view the log'); ?></a></p>
 				<div id="updateLog"></div>
-				<p><?php echo lang('You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'); ?></p><br />
+				<p><?php echo lang('You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'); ?></p>

 				<?php

@@ -1121,19 +1298,23 @@ if ($lm->getIncludeTradFilename())
 					{
 						echo '
 						<h2>'.lang('New features in PrestaShop v').INSTALL_VERSION.'</h2>
-						<iframe style="width: 595px; margin-top: 5px; padding: 5px; border: 1px solid #BBB;" src="http://features.prestashop.com/lang/'.$lm->getIsoCodeSelectedLang().'/version/'.INSTALL_VERSION.'">
+						<iframe style="width: 638px; margin-top: 5px; padding: 5px; border: 1px solid #BBB;" src="http://features.prestashop.com/lang/'.$lm->getIsoCodeSelectedLang().'/version/'.INSTALL_VERSION.'">
 							<p>Your browser does not support iframes.</p>
 						</iframe>';
 					}

 				?>

-				<h3 style="margin-top: 15px;"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?></h3>
-				<a href="../" id="access_update" target="_blank">
-					<span class="title"><?php echo lang('Front Office'); ?></span>
-					<span class="description"><?php echo lang('Find your store as your future customers will see!'); ?></span>
-					<span class="message"><?php echo lang('Discover your store'); ?></span>
-				</a>
+				<div class="infosBlock">
+					<?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?>
+			</div>
+				
+				<div id="foBlock" class="blockInfoEnd clearfix">
+						<img src="img/visu_foBlock.png" />
+						<h3><?php echo lang('Front Office'); ?></h3>
+						<p class="description"><?php echo lang('Find your store as your future customers will see!'); ?></p>
+						<a href="../" id="access" class="FO" target="_blank"><span><?php echo lang('Discover your store'); ?></span></a>
+				</div>
 			</div>
 			<?php
 			if (@fsockopen('addons.prestashop.com', 80, $errno, $errst, 3)): ?>
@@ -92,7 +92,7 @@ $_LANG['Please set a database login'] = 'Geben Sie die SQL-Anmeldung ein';
 $_LANG['Please set a database name'] = 'Geben Sie den Namen der Datenbank ein';
 $_LANG['Please set a database server name'] = 'Geben Sie den Namen des Datenbank-Servers ein';
 $_LANG['Port:'] = 'Port:';
-$_LANG['PrestaShop ".INSTALL_VERSION." Installer'] = 'Installation der PrestaShop-Version "INSTALL_VERSION."';
+$_LANG['PrestaShop %s Installer'] = 'Installation der PrestaShop-Version %s';
 $_LANG['PrestaShop is ready!'] = 'PrestaShop ist fertig!';
 $_LANG['Re-type to confirm:'] = 'Bestätigen Sie das Kennwort:';
 $_LANG['Ready, set, go!'] = 'PrestaShop ist installiert!';
@@ -143,12 +143,12 @@ $_LANG['Verify system compatibility'] = 'Systemkompatibilität';
 $_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'VORSICHT: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\' und die readme-Dateien (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Vorsicht: eine manuelle Sicherung ist UNERLÄSSLICH, bevor mit der Aktualisierung der PrestaShop-Anwendung begonnen wird, um jeglichen versehentlichen Datenverlust zu verhindern';
 $_LANG['Welcome'] = 'Willkommen';
-$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Bienvenue dans l\'installation de PrestaShop '.INSTALL_VERSION;
+$_LANG['Welcome to the PrestaShop %s Installer.'] = 'Bienvenue dans l\'installation de PrestaShop %s';
 $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Sobald die Anwendungsdateien und Ihre Datenbank gesichert sind, werden wir Sie um Bestätigung bitten. Damit übernehmen Sie die gesamte Haftung eines möglichen Datenverlusts durch die Aktualisierung der PrestaShop-Anwendung.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'Schreibberechtigung für die Ordner (und deren Unterordner):';
 $_LANG['Write permissions on files and folders:'] = 'Schreibberechtigung für die Dateien und Ordner:';
 $_LANG['Write permissions on folders:'] = 'Schreibberechtigung für die Ordner';
-$_LANG['You already have the ".INSTALL_VERSION." version.'] = 'Sie besitzen bereits die Version. ".INSTALL_VERSION."';
+$_LANG['You already have the %s version.'] = 'Sie besitzen bereits die Version. %s';
 $_LANG['You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Sie haben gerade Ihren Online-Shop installiert und konfiguriert, wir danken Ihnen.';
 $_LANG['You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Sie haben gerade Ihren Online-Shop aktualisiert wir danken Ihnen.';
 $_LANG['Your installation is finished!'] = 'Die Installation ist abgeschlossen!';
@@ -282,4 +282,4 @@ $_LANG['version'] = 'Version';
 $_LANG['In this aim, use our'] = 'Verwenden Sie dazu unseren';
 $_LANG['Additional Benefits'] = 'Exklusiv Angebot';
 $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Exklusiv Angebot für die Verkäufer PrestaShop';
-$_LANG['PHP magic quotes option is off (recommended)'] = 'Die PHP-Option "magic quotes" ist deaktiviert (empfohlen)';
+$_LANG['PHP magic quotes option is off (recommended)'] = 'Die PHP-Option "magic quotes" ist deaktiviert (empfohlen)';
@@ -91,7 +91,7 @@ $_LANG['Please set a database login'] = 'Introduzca el inicio de sesión de SQL'
 $_LANG['Please set a database name'] = 'Introduzca el nombre de la base de datos';
 $_LANG['Please set a database server name'] = 'Introduzca el nombre del servidor de la base de datos';
 $_LANG['Port:'] = 'Puerto:';
-$_LANG['PrestaShop ".INSTALL_VERSION." Installer'] = 'Instalación de PrestaShop ".INSTALL_VERSION."';
+$_LANG['PrestaShop %s Installer'] = 'Instalación de PrestaShop %s';
 $_LANG['PrestaShop is ready!'] = '¡PrestaShop está listo!';
 $_LANG['Re-type to confirm:'] = 'Confirmar la contraseña:';
 $_LANG['Ready, set, go!'] = '¡PrestaShop está instalado!';
@@ -141,12 +141,12 @@ $_LANG['Verify system compatibility'] = 'Compatibilidad sistema';
 $_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATENCION : para más seguridad, por favor suprima la carpeta \'/install\' y los archivos readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG)..';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = '¡Atención: se recomienda hacer una copia de seguridad manual antes de continuar!';
 $_LANG['Welcome'] = 'Bienvenido';
-$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Bienvenido a la instalación de PrestaShop '.INSTALL_VERSION;
+$_LANG['Welcome to the PrestaShop %s Installer.'] = 'Bienvenido a la instalación de PrestaShop %s';
 $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Una vez que los archivos de aplicación y su base de datos se hayan guardado, le pediremos que los certifique. Por lo tanto, usted asume plenamente su responsabilidad por cualquier pérdida de datos debido a la actualización de la aplicación PrestaShop.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'en escritura en las carpetas (y sus subcarpetas) :';
 $_LANG['Write permissions on files and folders:'] = 'Derechos en escritura en los archivos y carpetas :';
 $_LANG['Write permissions on folders:'] = 'Permiso de escritura en los archivos de';
-$_LANG['You already have the ".INSTALL_VERSION." version.'] = 'Ya está en posesión de la versión ".INSTALL_VERSION."';
+$_LANG['You already have the %s version.'] = 'Ya está en posesión de la versión %s';
 $_LANG['You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Acaba de instalar y de configurar su tienda en línea y se lo agradecemos.';
 $_LANG['You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Deba actualizar su tienda en línea. Se lo agradecemos.';
 $_LANG['Your installation is finished!'] = '¡La instalación está terminada!';
@@ -282,4 +282,4 @@ $_LANG['version'] = 'versión';
 $_LANG['In this aim, use our'] = 'En este objetivo, utilice nuestro';
 $_LANG['Additional Benefits'] = 'Otros beneficios';
 $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Ofertas exclusivas dedicadas a los comerciantes PrestaShop';
-$_LANG['PHP magic quotes option is off (recommended)'] = 'La opción PHP "magic quotes" está desactivada (aconsejable)';
+$_LANG['PHP magic quotes option is off (recommended)'] = 'La opción PHP "magic quotes" está desactivada (aconsejable)';
@@ -63,7 +63,8 @@ $_LANG['Installation : complete install of the PrestaShop Solution'] = 'Installa
 $_LANG['Installation is complete!'] = 'Installation terminée !';
 $_LANG['Installation method'] = 'Méthode d\'installation';
 $_LANG['Last name:'] = 'Nom :';
-$_LANG['License Agreement'] = 'Contrat de Licence';
+$_LANG['Licenses Agreement'] = 'Contrat de Licences';
+$_LANG['PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.'] = 'Le coeur de PrestaShop est publié sous licence OSL 3.0 tandis que les modules et thèmes sont publiés sous licence AFL 3.0.';
 $_LANG['Login:'] = 'Identifiant :';
 $_LANG['Merchant info'] = 'Informations à propos du vendeur';
 $_LANG['Missing a temporary folder'] = 'Il manque le dossier temporaire de réception de vos envois de fichiers. Merci de consulter votre administrateur système.';
@@ -92,7 +93,7 @@ $_LANG['Please set a database login'] = 'Entrez le login SQL';
 $_LANG['Please set a database name'] = 'Entrez le nom de la base de données';
 $_LANG['Please set a database server name'] = 'Entrez le nom du serveur de la base de données';
 $_LANG['Port:'] = 'Port :';
-$_LANG['PrestaShop ".INSTALL_VERSION." Installer'] = 'Installation de PrestaShop ".INSTALL_VERSION."';
+$_LANG['PrestaShop %s Installer'] = 'Installation de PrestaShop %s';
 $_LANG['PrestaShop is ready!'] = 'PrestaShop est prêt!';
 $_LANG['Re-type to confirm:'] = 'Confirmez le mot de passe :';
 $_LANG['Ready, set, go!'] = 'PrestaShop est installé !';
@@ -143,12 +144,12 @@ $_LANG['Verify system compatibility'] = 'Compatibilité système';
 $_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\' et les fichiers readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attention : une sauvegarde manuelle est INDISPENSABLE avant de procéder à la mise à jour de l\'application PrestaShop, cela afin de prévenir toute perte de données accidentelle';
 $_LANG['Welcome'] = 'Bienvenue';
-$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Bienvenue dans l\'installation de PrestaShop '.INSTALL_VERSION;
+$_LANG['Welcome to the PrestaShop %s Installer.'] = 'Bienvenue dans l\'installation de PrestaShop %s';
 $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Une fois que les fichiers de l\'application et votre base de données seront sauvegardés, nous vous demanderons de le certifier. De ce fait, vous assumerez l\'entière responsabilité d\'une éventuelle perte de données liée à la mise à jour de l\'application PrestaShop.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'Droits en écriture sur les dossiers (et leurs sous-dossiers) :';
 $_LANG['Write permissions on files and folders:'] = 'Droits en écriture sur les fichiers et dossiers:';
 $_LANG['Write permissions on folders:'] = 'Droits en écriture sur les dossiers';
-$_LANG['You already have the ".INSTALL_VERSION." version.'] = 'Vous êtes déjà en possession de la version ".INSTALL_VERSION."';
+$_LANG['You already have the %s version.'] = 'Vous êtes déjà en possession de la version %s';
 $_LANG['You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Vous venez d\'installer et de configurer votre boutique en ligne, nous vous en remercions.';
 $_LANG['You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Vous venez de mettre à jour votre boutique en ligne. Nous vous en remercions.';
 $_LANG['Your installation is finished!'] = 'L\'installation est terminée !';
@@ -177,8 +178,8 @@ $_LANG['Did you know?'] = 'Le saviez-vous ?';
 $_LANG['Prestashop and community offers over 40 different languages for free download on'] = 'Prestashop et sa communauté propose plus de 40 langues différentes en téléchargement gratuit sur';
 $_LANG['Default country:'] = 'Pays par défaut :';
 $_LANG['Shop\'s timezone:'] = 'Fuseau horaire de la boutique :';
-$_LANG['Your configuration is valid, click next to continue!'] = 'Votre configuration est valide,<br />cliquez sur suivant pour continuer !';
-$_LANG['Your configuration is invalid. Please fix the issues below:'] = 'Votre configuration n\'est pas valide,<br />merci de corriger ces problèmes :';
+$_LANG['Your configuration is valid, click next to continue!'] = 'Votre configuration est valide, cliquez sur suivant pour continuer !';
+$_LANG['Your configuration is invalid. Please fix the issues below:'] = 'Votre configuration n\'est pas valide, merci de corriger ces problèmes :';
 $_LANG['You have to create a database, help available in readme_en.txt'] = 'Vous devez au préalable créer une base de données (aide disponible dans le fichier readme.txt)';
 $_LANG['If you check this box and your mail configuration is wrong, your installation might be blocked. If so, please uncheck the box to go to the next step.'] = 'Cette option peut être bloquante si votre configuration e-mail est erronée, merci de la désactiver si vous ne pouvez pas passer à l\'étape suivante.';
 $_LANG['Mcrypt is available (recommended)'] = 'Mcrypt est disponible (recommandé)';
@@ -216,7 +217,7 @@ $_LANG['This information isn\'t required, it will be used for statistical purpos
 $_LANG['Invalid shop name'] = 'Nom de boutique invalide';
 $_LANG['Your firstname contains some invalid characters'] = 'Votre prénom contient des caractères invalides';
 $_LANG['Your lastname contains some invalid characters'] = 'Votre nom contient des caractères invalides';
-$_LANG['PrestaShop '.INSTALL_VERSION.' Installer'] = '';
+$_LANG['PrestaShop %s Installer'] = '';
 $_LANG['+33 (0)1.40.18.30.04'] = '+33 (0)1.40.18.30.04';
 $_LANG['(FREE)'] = '(GRATUIT)';
 $_LANG['(FREE too!)'] = '(GRATUIT AUSSI !)';
@@ -286,4 +287,5 @@ $_LANG['Warning, the installer was unable to detect what is your current PrestaS
 $_LANG['However the installer has detected that the version stored in your configuration table is %1$s'] = "Cependant l'installeur a détecté que la version sauvée dans votre table de configuration est %1\$s";
 $_LANG['Additional Benefits'] = 'Avantages exclusifs PrestaShop';
 $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Offres réservées aux marchands PrestaShop';
-$_LANG['PHP magic quotes option is off (recommended)'] = 'L\'option PHP "magic quotes" est désactivée (recommandé)';
+$_LANG['PHP magic quotes option is off (recommended)'] = 'L\'option PHP "magic quotes" est désactivée (recommandé)';
+$_LANG['Dom extension loaded'] = 'L\'extension Dom est activée';
@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
@@ -92,7 +92,7 @@ $_LANG['Please set a database login'] = 'Inserire il login SQL';
 $_LANG['Please set a database name'] = 'Inserire il nome del database.';
 $_LANG['Please set a database server name'] = 'Inserire il nome del server del database.';
 $_LANG['Port:'] = 'Porta:';
-$_LANG['PrestaShop ".INSTALL_VERSION." Installer'] = 'Installazione di PrestaShop ".INSTALL_VERSION."';
+$_LANG['PrestaShop %s Installer'] = 'Installazione di PrestaShop %s';
 $_LANG['PrestaShop is ready!'] = 'PrestaShop è pronto!';
 $_LANG['Re-type to confirm:'] = 'Conferma la password:';
 $_LANG['Ready, set, go!'] = 'PrestaShop è installato!';
@@ -143,12 +143,12 @@ $_LANG['Verify system compatibility'] = 'Compatibilità sistema';
 $_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\'  e i file readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attenzione: E\' FONDAMENTALE un backup manuale prima di continuare l\'aggiornamento dell\'applicazione Prestashop, al fine di evitare la perdita accidentale di dati.';
 $_LANG['Welcome'] = 'Benvenuto';
-$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Benvenuto nell\'installazione di PrestaShop '.INSTALL_VERSION;
+$_LANG['Welcome to the PrestaShop %s Installer.'] = 'Benvenuto nell\'installazione di PrestaShop %s';
 $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Una volta salvati i tuoi file applicazione e il database, ti chiederemo di certificarlo.  Così facendo, ti assumerai tutte le responsabilità per qualsiasi perdita di dati dovuti ad un aggiornamento del software PrestaShop.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'Scrivi i permessi sulle cartelle (e le loro sottocartelle):';
 $_LANG['Write permissions on files and folders:'] = 'Permessi di scrittura su file e cartelle:';
 $_LANG['Write permissions on folders:'] = 'Permessi di scrittura sulle cartelle';
-$_LANG['You already have the ".INSTALL_VERSION." version.'] = 'Sei già in possesso della versione ".INSTALL_VERSION."';
+$_LANG['You already have the %s version.'] = 'Sei già in possesso della versione %s';
 $_LANG['You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Hai appena installato e configurato il tuo negozio online, grazie.';
 $_LANG['You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Hai appena aggiornato il tuo negozio online. Grazie.';
 $_LANG['Your installation is finished!'] = 'Installazione terminata!';
@@ -269,4 +269,4 @@ $_LANG['New features in PrestaShop v'] = 'Nuove caratteristiche in PrestaShop v'
 $_LANG['In this aim, use our'] = 'A questo scopo, utilizzare il nostro';
 $_LANG['Additional Benefits'] = 'Ulteriori vantaggi';
 $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Offerte esclusivo dedicato ai venditori PrestaShop';
-$_LANG['PHP magic quotes option is off (recommended)'] = 'Opzione magic quotes PHP è disattivata (consigliato)';
+$_LANG['PHP magic quotes option is off (recommended)'] = 'Opzione magic quotes PHP è disattivata (consigliato)';
@@ -63,6 +63,7 @@ if ($tmp = strpos($_SERVER['REQUEST_URI'], '?'))
 $_SERVER['REQUEST_URI'] = str_replace('//', '/', $_SERVER['REQUEST_URI']);

 define('INSTALL_VERSION', '1.5.0.0');
+
 define('PS_INSTALLATION_IN_PROGRESS', true);
 include_once(INSTALL_PATH.'/classes/ToolsInstall.php');
 define('SETTINGS_FILE', INSTALL_PATH.'/../config/settings.inc.php');
@@ -34,6 +34,7 @@ function add_missing_rewrite_value()
 	WHERE ml.`url_rewrite` = \'\'
 	AND m.`page` != "index"
 	');
+	if (sizeof($pages) && is_array($pages))
 	foreach ($pages as $page)
 	{
 		Db::getInstance()->Execute('
@@ -0,0 +1,63 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+function add_order_state($conf_name, $name, $invoice, $send_email, $color, $unremovable, $logable, $delivery, $template = null)
+{
+	$name_lang = array();
+	$template_lang = array();
+	foreach (explode('|', $name) AS $item)
+	{
+		$temp = explode(':', $item);
+		$name_lang[$temp[0]] = $temp[1];
+	}
+	
+	if ($template)
+		foreach (explode('|', $template) AS $item)
+		{
+			$temp = explode(':', $item);
+			$template_lang[$temp[0]] = $temp[1];
+		}
+	
+	Db::getInstance()->Execute('
+		INSERT INTO `'._DB_PREFIX_.'order_state` (`invoice`, `send_email`, `color`, `unremovable`, `logable`, `delivery`) 
+		VALUES ('.(int)$invoice.', '.(int)$send_email.', \''.pSQL($color).'\', '.(int)$unremovable.', '.(int)$logable.', '.(int)$delivery.')');
+	
+	$id_order_state = Db::getInstance()->getValue('
+		SELECT MAX(`id_order_state`)
+		FROM `'._DB_PREFIX_.'order_state`
+	');
+	
+	foreach (Language::getLanguages() AS $lang)
+	{
+		Db::getInstance()->Execute('
+		INSERT IGNORE INTO `'._DB_PREFIX_.'order_state_lang` (`id_lang`, `id_order_state`, `name`, `template`) 
+		VALUES ('.(int)$lang['id_lang'].', '.(int)$id_order_state.', \''.pSQL(isset($name_lang[$lang['iso_code']]) ? $name_lang[$lang['iso_code']] : $name_lang['en']).'\', \''.pSQL(isset($template_lang[$lang['iso_code']]) ? $template_lang[$lang['iso_code']] : (isset($template_lang['en']) ? $template_lang['en'] : '')).'\')
+		');
+	}
+	
+	Configuration::updateValue($conf_name, $id_order_state);
+}
@@ -0,0 +1,39 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+function alter_productcomments_guest_index()
+{
+	Configuration::loadConfiguration();
+	$productcomments = Module::getInstanceByName('productcomments');
+	if (!$productcomments->id)
+		return;
+	
+	DB::getInstance()->Execute('
+	ALTER TABLE `'._DB_PREFIX_.'product_comment` DROP INDEX `id_guest`,
+	ADD INDEX `id_guest` USING BTREE(`id_guest`);');
+}
+
@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
@@ -24,6 +24,8 @@
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
+
+if(!defined('_PS_MAGIC_QUOTES_GPC_'))
 define('_PS_MAGIC_QUOTES_GPC_', get_magic_quotes_gpc());

 function latin1_database_to_utf8()
@@ -61,7 +61,7 @@ CREATE TABLE `PREFIX_attachment` (
  `id_attachment` int(10) unsigned NOT NULL auto_increment,
  `file` varchar(40) NOT NULL,
  `file_name` varchar(128) NOT NULL,
-  `mime` varchar(64) NOT NULL,
+  `mime` varchar(128) NOT NULL,
  PRIMARY KEY  (`id_attachment`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;

@@ -290,6 +290,16 @@ CREATE TABLE `PREFIX_cms_category_lang` (
  KEY `category_name` (`name`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;

+CREATE TABLE `PREFIX_compare_product` (
+  `id_compare_product` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id_product` int(10) unsigned NOT NULL,
+  `id_guest` int(10) unsigned NOT NULL,
+  `id_customer` int(10) unsigned NOT NULL,
+  `date_add` datetime NOT NULL,
+  `date_upd` datetime NOT NULL,
+  PRIMARY KEY  (`id_compare_product`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
 CREATE TABLE `PREFIX_configuration` (
  `id_configuration` int(10) unsigned NOT NULL auto_increment,
  `id_group_shop` INT(11) UNSIGNED DEFAULT NULL,
@@ -739,7 +749,7 @@ CREATE TABLE `PREFIX_hook_module_exceptions` (
 CREATE TABLE `PREFIX_image` (
  `id_image` int(10) unsigned NOT NULL auto_increment,
  `id_product` int(10) unsigned NOT NULL,
-  `position` tinyint(2) unsigned NOT NULL default '0',
+  `position` smallint(2) unsigned NOT NULL default '0',
  `cover` tinyint(1) unsigned NOT NULL default '0',
  PRIMARY KEY  (`id_image`),
  KEY `image_product` (`id_product`),
@@ -776,6 +786,7 @@ CREATE TABLE `PREFIX_lang` (
  `active` tinyint(3) unsigned NOT NULL default '0',
  `iso_code` char(2) NOT NULL,
  `language_code` char(5) NOT NULL,
+  `is_rtl` TINYINT(1) NOT NULL default '0',
  PRIMARY KEY  (`id_lang`),
  KEY `lang_iso_code` (`iso_code`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
@@ -45,6 +45,7 @@ INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VAL
 	('CHECKUP_STOCK_GT', '3', NOW(), NOW()),
 	('FOOTER_CMS', '0_3|0_4', NOW(), NOW()),
 	('FOOTER_BLOCK_ACTIVATION', '0_3|0_4', NOW(), NOW()),
+	('FOOTER_POWEREDBY', 1, NOW(), NOW()),
 	('BLOCKADVERT_LINK', 0, NOW(), NOW()),
 	('BLOCKSTORE_IMG', 'store.jpg', NOW(), NOW());

@@ -109,7 +110,7 @@ CREATE TABLE `PREFIX_cms_block` (
 	`name` varchar(40) NOT NULL,
 	`location` tinyint(1) unsigned NOT NULL,
 	`position` int(10) unsigned NOT NULL default '0',
-	`display_store` tinyint(1) NOT NULL DEFAULT '1',
+	`display_store` tinyint(1) unsigned NOT NULL DEFAULT '1',
 	PRIMARY KEY (`id_cms_block`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;

@@ -185,7 +185,24 @@ INSERT INTO `PREFIX_configuration` (`id_configuration`, `name`, `value`, `date_a
 (114, 'PS_CANONICAL_REDIRECT', '1', NOW(), NOW()),
 (115, 'PS_IMG_UPDATE_TIME', UNIX_TIMESTAMP(), NOW(), NOW()),
 (116, 'PS_BACKUP_DROP_TABLE', 1, NOW(), NOW()),
-(117, 'PS_LEGACY_IMAGES', '1', NOW(), NOW());
+(117, 'PS_OS_CHEQUE', '1', NOW(), NOW()),
+(118, 'PS_OS_PAYMENT', '2', NOW(), NOW()),
+(119, 'PS_OS_PREPARATION', '3', NOW(), NOW()),
+(120, 'PS_OS_SHIPPING', '4', NOW(), NOW()),
+(121, 'PS_OS_DELIVERED', '5', NOW(), NOW()),
+(122, 'PS_OS_CANCELED', '6', NOW(), NOW()),
+(123, 'PS_OS_REFUND', '7', NOW(), NOW()),
+(124, 'PS_OS_ERROR', '8', NOW(), NOW()),
+(125, 'PS_OS_OUTOFSTOCK', '9', NOW(), NOW()),
+(126, 'PS_OS_BANKWIRE', '10', NOW(), NOW()),
+(127, 'PS_OS_PAYPAL', '11', NOW(), NOW()),
+(128, 'PS_OS_WS_PAYMENT', '12', NOW(), NOW()),
+(129, 'PS_LEGACY_IMAGES', '1', NOW(), NOW()),
+(130, 'PS_IMAGE_QUALITY', 'jpg', NOW(), NOW()),
+(131, 'PS_PNG_QUALITY', '7', NOW(), NOW()),
+(132, 'PS_JPEG_QUALITY', '90', NOW(), NOW()),
+(133, 'PS_COOKIE_LIFETIME_FO', '480', NOW(), NOW()),
+(134, 'PS_COOKIE_LIFETIME_BO', '480', NOW(), NOW());

 INSERT INTO `PREFIX_configuration_lang` (`id_configuration`, `id_lang`, `value`, `date_upd`) VALUES
 (36, 1, 'IN', NOW()),(36, 2, 'FA', NOW()),(36, 3, 'CU', NOW()),(36, 4, 'FA', NOW()),(36, 5, 'FA', NOW()),
@@ -712,8 +729,8 @@ INSERT INTO `PREFIX_tab` (`id_tab`, `class_name`, `id_parent`, `position`) VALUE
 (53, 'AdminBackup', 9, 8),(57, 'AdminCMSContent', 9, 9),(64, 'AdminGenerator', 9, 10),(43, 'AdminSearch', -1, 0),(69, 'AdminInformation', 9, 11),
 (70, 'AdminPerformance', 8, 11),(71, 'AdminCustomerThreads', 29, 4),(72, 'AdminWebservice', 9, 12),(73, 'AdminStockMvt', 1, 9),
 (80, 'AdminAddonsCatalog', 7, 1),(81, 'AdminAddonsMyAccount', 7, 2),(83, 'AdminThemes', 7, 3),(84, 'AdminGeolocation', 8, 12),
-(85, 'AdminTaxRulesGroup', 4, 3),(86, 'AdminLogs', 9, 13), (87, 'AdminCounty', 5, 4),(88,'AdminHome',-1,0),(89,'AdminShop', 0, 11), (90,'AdminGroupShop', 89, 1),
-(91, 'AdminShopUrl', 89, 2);
+(85, 'AdminTaxRulesGroup', 4, 3),(86, 'AdminLogs', 9, 13), (87, 'AdminCounty', 5, 4),(88,'AdminHome',-1,0),(89,'AdminUpgrade',9,14),
+(90,'AdminShop', 0, 11), (91,'AdminGroupShop', 90, 1),(92, 'AdminShopUrl', 90, 2);

 INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 1, id_tab, 1, 1, 1, 1 FROM PREFIX_tab);

@@ -723,29 +740,29 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (1, 12, 'Addresses'),(1, 13, 'Statuses'),(1, 14, 'Vouchers'),(1, 15, 'Currencies'),(1, 16, 'Taxes'),(1, 17, 'Carriers'),(1, 18, 'Countries'),
 (1, 19, 'Zones'),(1, 20, 'Price Ranges'),(1, 21, 'Weight Ranges'),(1, 22, 'Positions'),(1, 23, 'Database'),(1, 24, 'E-mail'),(1, 26, 'Image'),
 (1, 27, 'Products'),(1, 28, 'Contacts'),(1, 29, 'Employees'),(1, 30, 'Profiles'),(1, 31, 'Permissions'),(1, 32, 'Languages'),(1, 33, 'Translations'),
-(1, 34, 'Suppliers'),(1, 35, 'Tabs'),(1, 36, 'Features'),(1, 37, 'Quick Access'),(1, 38, 'Appearance'),(1, 39, 'Contact Information'),(1, 40, 'Aliases'),
+(1, 34, 'Suppliers'),(1, 35, 'Tabs'),(1, 36, 'Features'),(1, 37, 'Quick Access'),(1, 38, 'Appearance'),(1, 39, 'Contact Information'),(1, 40, 'Alias Research'),
 (1, 41, 'Import'),(1, 42, 'Invoices'),(1, 43, 'Search'),(1, 44, 'Localization'),(1, 46, 'States'),(1, 47, 'Merchandise Returns'),(1, 48, 'PDF'),
 (1, 49, 'Credit Slips'),(1, 51, 'Settings'),(1, 52, 'Subdomains'),(1, 53, 'DB backup'),(1, 54, 'Order Messages'),
 (1, 55, 'Delivery Slips'),(1, 56, 'SEO & URLs'),(1, 57, 'CMS'),(1, 58, 'Image Mapping'),(1, 59, 'Customer Messages'),(1, 60, 'Tracking'),
 (1, 61, 'Search Engines'),(1, 62, 'Referrers'),(1, 63, 'Groups'),(1, 64, 'Generators'),(1, 65, 'Shopping Carts'),(1, 66, 'Tags'),(1, 67, 'Search'),
 (1, 68, 'Attachments'),(1, 69, 'Configuration Information'),(1, 70, 'Performance'),(1, 71, 'Customer Service'),(1, 72, 'Webservice'),(1, 73, 'Stock Movements'),
 (1, 80, 'Modules & Themes Catalog'),(1, 81, 'My Account'),(1, 82, 'Stores'),(1, 83, 'Themes'),(1, 84, 'Geolocation'),(1, 85, 'Tax Rules'),(1, 86, 'Log'),
-(1, 87, 'Counties'),(1, 88, 'Home'), (1, 89, 'Shops'), (1, 90, 'Group Shops'), (1, 91, 'Shop Urls');
+(1, 87, 'Counties'),(1, 88, 'Home'),(1, 89, 'Upgrade'), (1, 90, 'Shops'), (1, 91, 'Group Shops'), (1, 92, 'Shop Urls');

 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (2, 1, 'Catalogue'),(2, 2, 'Clients'),(2, 3, 'Commandes'),(2, 4, 'Paiement'),(2, 5, 'Transport'),
-(2, 6, 'Stats'),(2, 7, 'Modules'),(2, 8, 'Préférences'),(2, 9, 'Outils'),(2, 10, 'Fabricants'),(2, 11, 'Attributs et groupes'),(2, 12, 'Adresses'),(2, 13, 'Statuts'),
+(2, 6, 'Stats'),(2, 7, 'Modules'),(2, 8, 'Préférences'),(2, 9, 'Outils'),(2, 10, 'Marques'),(2, 11, 'Attributs et groupes'),(2, 12, 'Adresses'),(2, 13, 'Statuts'),
 (2, 14, 'Bons de réduction'),(2, 15, 'Devises'),(2, 16, 'Taxes'),(2, 17, 'Transporteurs'),(2, 18, 'Pays'),(2, 19, 'Zones'),(2, 20, 'Tranches de prix'),
 (2, 21, 'Tranches de poids'),(2, 22, 'Positions'),(2, 23, 'Base de données'),(2, 24, 'Emails'),(2, 26, 'Images'),(2, 27, 'Produits'),(2, 28, 'Contacts'),
 (2, 29, 'Employés'),(2, 30, 'Profils'),(2, 31, 'Permissions'),(2, 32, 'Langues'),(2, 33, 'Traductions'),(2, 34, 'Fournisseurs'),(2, 35, 'Onglets'),
-(2, 36, 'Caractéristiques'),(2, 37, 'Accès rapide'),(2, 38, 'Apparence'),(2, 39, 'Coordonnées'),(2, 40, 'Alias'),(2, 41, 'Import'),(2, 42, 'Factures'),
+(2, 36, 'Caractéristiques'),(2, 37, 'Accès rapide'),(2, 38, 'Apparence'),(2, 39, 'Coordonnées'),(2, 40, 'Alias de recherche'),(2, 41, 'Import'),(2, 42, 'Factures'),
 (2, 43, 'Recherche'),(2, 44, 'Localisation'),(2, 46, 'Etats'),(2, 47, 'Retours produits'),(2, 48, 'PDF'),(2, 49, 'Avoirs'),
 (2, 51, 'Configuration'),(2, 52, 'Sous domaines'),(2, 53, 'Sauvegarde BDD'),(2, 54, 'Messages prédéfinis'),(2, 55, 'Bons de livraison'),
 (2, 56, 'SEO & URLs'),(2, 57, 'CMS'),(2, 58, 'Scènes'),(2, 59, 'Messages clients'),(2, 60, 'Suivi'),(2, 61, 'Moteurs de recherche'),
 (2, 62, 'Sites affluents'),(2, 63, 'Groupes'),(2, 64, 'Générateurs'),(2, 65, 'Paniers'),(2, 66, 'Tags'),(2, 67, 'Recherche'),
 (2, 68, 'Documents joints'),(2, 69, 'Informations'),(2, 70, 'Performances'),(2, 71, 'SAV'),(2, 72, 'Service web'),(2, 73, 'Mouvements de Stock'),
 (2, 80, 'Catalogue de modules et thèmes'),(2, 81, 'Mon compte'),(2, 82, 'Magasins'),(2, 83, 'Thèmes'),(2, 84, 'Géolocalisation'),(2, 85, 'Règles de taxes'),(2, 86, 'Log'),
-(2, 87, 'Comtés'),(2,88,'Accueil'), (2, 89, 'Boutiques'), (2, 90, 'Groupes de boutique'), (2, 91, 'URLs de boutique');
+(2, 87, 'Comtés'),(2,88,'Accueil'),(2, 89, 'Mise à jour'), (2, 90, 'Boutiques'), (2, 91, 'Groupes de boutique'), (2, 92, 'URLs de boutique');

 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (3, 1, 'Catálogo'),(3, 2, 'Clientes'),(3, 3, 'Pedidos'),(3, 4, 'Pago'),(3, 5, 'Transporte'),
@@ -753,13 +770,13 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (3, 13, 'Estados'),(3, 14, 'Vales de descuento'),(3, 15, 'Divisas'),(3, 16, 'Impuestos'),(3, 17, 'Transportistas'),(3, 18, 'Países'),(3, 19, 'Zonas'),
 (3, 20, 'Franja de precios'),(3, 21, 'Franja de pesos'),(3, 22, 'Posiciones'),(3, 23, 'Base de datos'),(3, 24, 'Emails'),(3, 26, 'Imágenes'),
 (3, 27, 'Productos'),(3, 28, 'Contactos'),(3, 29, 'Empleados'),(3, 30, 'Perfiles'),(3, 31, 'Permisos'),(3, 32, 'Idiomas'),(3, 33, 'Traducciones'),
-(3, 34, 'Proovedores'),(3, 35, 'Pestañas'),(3, 36, 'Características'),(3, 37, 'Acceso rápido'),(3, 38, 'Aspecto'),(3, 39, 'Datos'),(3, 40, 'Alias'),
+(3, 34, 'Proveedores'),(3, 35, 'Pestañas'),(3, 36, 'Características'),(3, 37, 'Acceso rápido'),(3, 38, 'Aspecto'),(3, 39, 'Datos'),(3, 40, 'Alias de Investigación'),
 (3, 41, 'Importar'),(3, 42, 'Facturas'),(3, 43, 'Búsqueda'),(3, 44, 'Ubicación'),(3, 46, 'Estados'),(3, 47, 'Devolución productos'),(3, 48, 'PDF'),
 (3, 49, 'Vales'),(3, 51, 'Configuración'),(3, 52, 'Subcampos'),(3, 53, 'Copia de seguridad'),(3, 54, 'Mensajes de Orden'),
 (3, 55, 'Albaranes de entrega'),(3, 56, 'SEO & URLs'),(3, 57, 'CMS'),(3, 58, 'Mapeo de la imagen'),(3, 59, 'Mensajes del cliente'),(3, 60, 'Rastreo'),
 (3, 61, 'Motores de búsqueda'),(3, 62, 'Referido'),(3, 63, 'Grupos'),(3, 64, 'Generadores'),(3, 65, 'Carritos'),(3, 66, 'Etiquetas'),(3, 67, 'Búsqueda'),(3, 68, 'Adjuntos'),
-(3, 69, 'Informations'),(3, 70, 'Rendimiento'),(3, 72, 'Web service'),(3, 71, 'Servicio al cliente'),(3, 73, 'Movimiento de Stock'), (3, 82, 'Tiendas'),(3, 83, 'Temas'),(3, 84, 'Geolocalización'),(3, 85, 'Reglas de Impuestos'),(3, 86, 'Log'),
-(3, 87, 'Condados'),(3,88,'Home'), (3, 89, 'Shops'), (3, 90, 'Group Shops'), (3, 91, 'Shop Urls');
+(3, 69, 'Informaciones'),(3, 70, 'Rendimiento'),(3, 72, 'Web service'),(3, 71, 'Servicio al cliente'),(3, 73, 'Movimiento de Stock'), (3, 82, 'Tiendas'),(3, 83, 'Temas'),(3, 84, 'Geolocalización'),(3, 85, 'Reglas de Impuestos'),(3, 86, 'Log'),
+(3, 87, 'Condados'),(3,88,'Home'),(3, 89, 'Mejorar'), (3, 90, 'Shops'), (3, 91, 'Group Shops'), (3, 92, 'Shop Urls');

 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 1, 'Katalog'),(4, 2, 'Kunden'),(4, 3, 'Bestellungen'),(4, 4, 'Zahlung'),
@@ -767,14 +784,14 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 12, 'Adressen'),(4, 13, 'Status'),(4, 14, 'Gutscheine'),(4, 15, 'Währungen'),(4, 16, 'Steuern'),(4, 17, 'Lieferanten'),(4, 18, 'Länder'),
 (4, 19, 'Zonen'),(4, 20, 'Preislagen'),(4, 21, 'Gewichtsklassen'),(4, 22, 'Positionen'),(4, 23, 'Datenbank'),(4, 24, 'E-Mail'),(4, 26, 'Bild'),
 (4, 27, 'Produkte'),(4, 28, 'Kontakte'),(4, 29, 'Mitarbeiter'),(4, 30, 'Profile'),(4, 31, 'Berechtigungen'),(4, 32, 'Sprachen'),(4, 33, 'Übersetzungen'),
-(4, 34, 'Zulieferer'),(4, 35, 'Tabs'),(4, 36, 'Funktionen'),(4, 37, 'Schnellzugriff'),(4, 38, 'Aussehen'),(4, 39, 'Kontaktinformation'),(4, 40, 'Alias'),
+(4, 34, 'Zulieferer'),(4, 35, 'Tabs'),(4, 36, 'Funktionen'),(4, 37, 'Schnellzugriff'),(4, 38, 'Aussehen'),(4, 39, 'Kontaktinformation'),(4, 40, 'Suchname'),
 (4, 41, 'Import'),(4, 42, 'Rechnungen'),(4, 43, 'Suche'),(4, 44, 'Lokalisierung'),(4, 46, 'Staaten'),(4, 47, 'Warenrücksendungen'),(4, 48, 'PDF'),
 (4, 49, 'Gutscheine'),(4, 51, 'Einstellungen'),(4, 52, 'Subdomains'),(4, 53, 'DB-Backup'),(4, 54, 'Bestellnachrichten'),
 (4, 55, 'Lieferscheine'),(4, 56, 'SEO & URLs'),(4, 57, 'CMS'),(4, 58, 'Image Mapping'),(4, 59, 'Kundennachrichten'),(4, 60, 'Tracking'),
 (4, 61, 'Suchmaschinen'),(4, 62, 'Referrer'),(4, 63, 'Gruppen'),(4, 64, 'Generatoren'),(4, 65, 'Warenkörbe'),(4, 66, 'Tags'),(4, 67, 'Suche'),
 (4, 68, 'Anhänge'),(4, 69, 'Konfigurationsinformationen'),(4, 70, 'Leistung'),(4, 71, 'Kundenservice'),(4, 72, 'Webservice'),(4, 73, 'Lagerbewegungen'),
 (4, 80, 'Module und Themenkatalog'),(4, 81, 'Mein Konto'),(4, 82, 'Shops'),(4, 83, 'Themen'),(4, 84, 'Geotargeting'),(4, 85, 'Steuerregeln'),(4, 86, 'Log'),
-(4,87,'Counties'),(4,88,'Home'), (4, 89, 'Shops'), (4, 90, 'Group Shops'), (4, 91, 'Shop Urls');
+(4,87,'Counties'),(4,88,'Home'),(4, 89, 'Upgrade'), (4, 90, 'Shops'), (4, 91, 'Group Shops'), (4, 92, 'Shop Urls');

 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (5, 1, 'Catalogo'),(5, 2, 'Clienti'),(5, 3, 'Ordini'),(5, 4, 'Pagamento'),
@@ -782,14 +799,14 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (5, 12, 'Indirizzi'),(5, 13, 'Status'),(5, 14, 'Voucher'),(5, 15, 'Valute'),(5, 16, 'Tasse'),(5, 17, 'Corrieri'),(5, 18, 'Nazioni'),
 (5, 19, 'Zone'),(5, 20, 'Fasce di prezzo'),(5, 21, 'Fasce di peso'),(5, 22, 'Posizioni'),(5, 23, 'Database'),(5, 24, 'E-mail'),(5, 26, 'Immagine'),
 (5, 27, 'Prodotti'),(5, 28, 'Contatti'),(5, 29, 'Impiegati'),(5, 30, 'Profili'),(5, 31, 'Permessi'),(5, 32, 'Lingue'),(5, 33, 'Traduzioni'),
-(5, 34, 'Fornitori'),(5, 35, 'Tab'),(5, 36, 'Caratteristiche'),(5, 37, 'Accesso rapido'),(5, 38, 'Aspetto'),(5, 39, 'Informazioni di contatto'),(5, 40, 'Alias'),
+(5, 34, 'Fornitori'),(5, 35, 'Tab'),(5, 36, 'Caratteristiche'),(5, 37, 'Accesso rapido'),(5, 38, 'Aspetto'),(5, 39, 'Informazioni di contatto'),(5, 40, 'Alias di ricerca'),
 (5, 41, 'Importa'),(5, 42, 'Fatture'),(5, 43, 'Cerca'),(5, 44, 'Localizzazione'),(5, 46, 'Stati'),(5, 47, 'Resi merci'),(5, 48, 'PDF'),
 (5, 49, 'Note di credito'),(5, 51, 'Impostazioni'),(5, 52, 'Sottodomini'),(5, 53, 'DB backup'),(5, 54, 'Messaggi ordine'),
 (5, 55, 'Note di consegna'),(5, 56, 'SEO & URLs'),(5, 57, 'CMS'),(5, 58, 'Mappatura immagine'),(5, 59, 'Messaggi cliente'),(5, 60, 'Rintracciare'),
 (5, 61, 'Motori di ricerca'),(5, 62, 'Referenti'),(5, 63, 'Gruppi'),(5, 64, 'Generatori'),(5, 65, 'Carrelli shopping'),(5, 66, 'Tag'),(5, 67, 'Cerca'),
 (5, 68, 'Allegati'),(5, 69, 'Informazioni di configurazione'),(5, 70, 'Performance'),(5, 71, 'Servizio clienti'),(5, 72, 'Webservice'),(5, 73, 'Movimenti magazzino'),
 (5, 80, 'Moduli & Temi catalogo'),(5, 81, 'Il mio Account'),(5, 82, 'Negozi'),(5, 83, 'Temi'),(5, 84, 'Geolocalizzazione'),(5, 85, 'Regimi fiscali'),(5, 86, 'Log'),
-(5,87,'Counties'),(5,88,'Home'), (5, 89, 'Shops'), (5, 90, 'Group Shops'), (5, 91, 'Shop Urls');
+(5,87,'Counties'),(5,88,'Home'),(5, 89, 'Aggiornamento'), (5, 90, 'Shops'), (5, 91, 'Group Shops'), (5, 92, 'Shop Urls');

 INSERT IGNORE INTO `PREFIX_tab_lang` (`id_tab`, `id_lang`, `name`)
    (SELECT `id_tab`, id_lang, (SELECT tl.`name`
@@ -1160,10 +1177,10 @@ INSERT INTO `PREFIX_stock_mvt_reason_lang` (`id_stock_mvt_reason`, `id_lang`, `n
 INSERT INTO `PREFIX_address_format` (`id_country`, `format`)
 (SELECT `id_country` as id_country, 'firstname lastname\ncompany\nvat_number\naddress1\naddress2\npostcode city\nCountry:name\nphone' as format FROM `PREFIX_country`);

-UPDATE `PREFIX_address_format` set `format`='company
-firstname lastname
+UPDATE `PREFIX_address_format` set `format`='firstname lastname
+company
 address1 address2
-city State:name postcode 
+city, State:name postcode 
 Country:name
 phone' where `id_country`=21;

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

 ALTER TABLE `PREFIX_tax_rule` ADD `county_behavior` INT NOT NULL AFTER `state_behavior`;
-ALTER TABLE `PREFIX_tax_rule` ADD `id_county` INT NOT NULL AFTER `state_behavior`;
+ALTER TABLE `PREFIX_tax_rule` ADD `id_county` INT NOT NULL AFTER `id_country`;

 ALTER TABLE `PREFIX_tax_rule` ADD UNIQUE (
 `id_tax_rules_group` ,
@@ -1,6 +1,6 @@
 SET NAMES 'utf8';

-ALTER TABLE `PREFIX_stock_mvt_reason` ADD `sign` TINYINT(1) NOT NULL AFTER `id_stock_mvt_reason`;
+ALTER TABLE `PREFIX_stock_mvt_reason` ADD `sign` TINYINT(1) NOT NULL DEFAULT '1' AFTER `id_stock_mvt_reason`;
 UPDATE `PREFIX_stock_mvt_reason` SET `sign`=-1;
 UPDATE `PREFIX_stock_mvt_reason` SET `sign`=1 WHERE `id_stock_mvt_reason`=3;
 UPDATE `PREFIX_stock_mvt_reason` SET `id_stock_mvt_reason`=`id_stock_mvt_reason`+2 ORDER BY `id_stock_mvt_reason` DESC;
@@ -12,15 +12,7 @@ ALTER TABLE `PREFIX_orders` ADD INDEX `date_add`(`date_add`);
 INSERT IGNORE INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES
 ('PS_STOCK_MVT_REASON_DEFAULT', 3, NOW(), NOW());

-INSERT IGNORE INTO `PREFIX_order_state` (`id_order_state`, `invoice`, `send_email`, `color`, `unremovable`, `logable`, `delivery`) VALUES (12, 0, 0, 'lightblue', 1, 0, 0);
-
-INSERT IGNORE INTO `PREFIX_order_state_lang` (`id_order_state`, `id_lang`, `name`, `template`) VALUES
-(12, 1, 'Payment remotely accepted', ''),
-(12, 2, 'Paiement à distance accepté', ''),
-(12, 3, 'Payment remotely accepted', ''),
-(12, 4, 'Payment remotely accepted', ''),
-(12, 5, 'Payment remotely accepted', '');
-
+/* PHP:add_order_state(PS_OS_WS_PAYMENT, en:Payment remotely accepted|fr:Paiement à distance accepté, 0, 0, lightblue, 1, 0, 0); */;
 /* PHP:alter_blocklink(); */;
 /* PHP:update_module_loyalty(); */;
 /* PHP:remove_module_from_hook(blockcategories, afterCreateHtaccess); */;
@@ -8,7 +8,7 @@ city
 State:name
 postcode
 Country:name' 
-WHERE id_country = (SELECT id_country FROM `PREFIX_country` WHERE `iso_code`='GB');
+WHERE `id_country` = (SELECT `id_country` FROM `PREFIX_country` WHERE `iso_code`='GB');

 UPDATE `PREFIX_country` SET `contains_states` = 1 WHERE `id_country` = 145;

@@ -0,0 +1,80 @@
+SET NAMES 'utf8';
+
+ALTER TABLE `PREFIX_image` MODIFY COLUMN `position` SMALLINT(2) UNSIGNED NOT NULL DEFAULT 0;
+
+INSERT IGNORE INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES
+('PS_OS_CHEQUE', '1', NOW(), NOW()),
+('PS_OS_PAYMENT', '2', NOW(), NOW()),
+('PS_OS_PREPARATION', '3', NOW(), NOW()),
+('PS_OS_SHIPPING', '4', NOW(), NOW()),
+('PS_OS_DELIVERED', '5', NOW(), NOW()),
+('PS_OS_CANCELED', '6', NOW(), NOW()),
+('PS_OS_REFUND', '7', NOW(), NOW()),
+('PS_OS_ERROR', '8', NOW(), NOW()),
+('PS_OS_OUTOFSTOCK', '9', NOW(), NOW()),
+('PS_OS_BANKWIRE', '10', NOW(), NOW()),
+('PS_OS_PAYPAL', '11', NOW(), NOW()),
+('PS_OS_WS_PAYMENT', '12', NOW(), NOW()),
+('PS_IMAGE_QUALITY', 'jpg', NOW(), NOW()),
+('PS_PNG_QUALITY', '7', NOW(), NOW()),
+('PS_JPEG_QUALITY', '90', NOW(), NOW()),
+('PS_COOKIE_LIFETIME_FO', '480', NOW(), NOW()),
+('PS_COOKIE_LIFETIME_BO', '480', NOW(), NOW());
+
+ALTER TABLE `PREFIX_lang` ADD `is_rtl` TINYINT(1) NOT NULL DEFAULT '0';
+
+UPDATE `PREFIX_country_lang`
+SET `name` = 'United State'
+WHERE `name` = 'USA'
+AND `id_lang` = (
+	SELECT `id_lang`
+	FROM `PREFIX_lang`
+	WHERE `iso_code` = 'en'
+	LIMIT 1
+);
+
+UPDATE `PREFIX_hook`
+SET `live_edit` = 1
+WHERE `name` = 'leftColumn'
+OR `name` = 'home'
+OR `name` = 'rightColumn'
+OR `name` = 'productfooter'
+OR `name` = 'payment';
+
+ALTER TABLE `PREFIX_stock_mvt_reason` MODIFY `sign` TINYINT(1) NOT NULL DEFAULT '1' AFTER `id_stock_mvt_reason`;
+
+UPDATE `PREFIX_tab_lang`
+SET `name` = 'Geolocation'
+WHERE `name` = 'Geolocalization';
+
+UPDATE `PREFIX_tab_lang`
+SET `name` = 'Counties'
+WHERE `name` = 'County';
+
+ALTER TABLE `PREFIX_tax_rule` MODIFY `id_county` INT NOT NULL AFTER `id_country`;
+
+UPDATE `PREFIX_address_format` set `format`='firstname lastname
+company
+address1 address2
+city, State:name postcode 
+Country:name
+phone' 
+WHERE `id_country` = (SELECT `id_country` FROM `PREFIX_country` WHERE `iso_code`='US');
+
+ALTER TABLE `PREFIX_attachment` CHANGE `mime` `mime` VARCHAR(128) NOT NULL;
+
+CREATE TABLE IF NOT EXISTS `PREFIX_compare_product` (
+  `id_compare_product` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id_product` int(10) unsigned NOT NULL,
+  `id_guest` int(10) unsigned NOT NULL,
+  `id_customer` int(10) unsigned NOT NULL,
+  `date_add` datetime NOT NULL,
+  `date_upd` datetime NOT NULL,
+  PRIMARY KEY  (`id_compare_product`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
+DELETE FROM `PREFIX_configuration` WHERE name = 'PS_LAYERED_NAVIGATION_CHECKBOXES' LIMIT 1;
+
+/* PHP:add_new_tab(AdminUpgrade, en:Upgrade|fr:Mise à jour,  9); */;
+
+/* PHP:alter_productcomments_guest_index(); */;
@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
@@ -26,7 +26,7 @@
 */
 header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date dans le passé
-include_once(INSTALL_PATH.'/classes/ConfigurationTest.php');
+include_once(INSTALL_PATH.'/../classes/ConfigurationTest.php');

 // Functions list to test with 'test_system'
 $funcs = array('fopen', 'fclose', 'fread', 'fwrite', 'rename', 'file_exists', 'unlink', 'rmdir', 'mkdir', 'getcwd', 'chdir', 'chmod');
@@ -60,6 +60,7 @@ $tests_op = array(
 	'gz' => false,
 	'mcrypt' => false,
 	'magicquotes' => false,
+	'dom' => false,
 );

 // Execute tests
@@ -31,8 +31,15 @@ $engineType = 'ENGINE_TYPE';
 if (function_exists('date_default_timezone_set'))
 	date_default_timezone_set('Europe/Paris');
 	
-define('_PS_MODULE_DIR_', realpath(INSTALL_PATH).'/../modules/');
-define('_PS_INSTALLER_PHP_UPGRADE_DIR_', realpath(INSTALL_PATH).'/php/');
+// if _PS_ROOT_DIR_ is defined, use it instead of "guessing" the module dir.
+if (defined('_PS_ROOT_DIR_') AND !defined('_PS_MODULE_DIR_'))
+	define('_PS_MODULE_DIR_', _PS_ROOT_DIR_.'/modules/');
+else if (!defined('_PS_MODULE_DIR_'))
+	define('_PS_MODULE_DIR_', INSTALL_PATH.'/../modules/');
+
+if(!defined('_PS_INSTALLER_PHP_UPGRADE_DIR_'))
+	define('_PS_INSTALLER_PHP_UPGRADE_DIR_',  INSTALL_PATH.DIRECTORY_SEPARATOR.'php/');
+
 // Only if loyalty module is installed
 require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_module_loyalty.php');
 // desactivate non-native module
@@ -104,6 +111,8 @@ require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'alter_cms_block.php');

 require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'alter_blocklink.php');

+require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'alter_productcomments_guest_index.php');
+
 require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_module_loyalty.php');

 require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_module_followup.php');
@@ -122,6 +131,8 @@ require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'migrate_block_info_to_cms_block.php

 require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'create_multistore.php');

+require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_order_state.php');
+
 //old version detection
 global $oldversion, $logger;
 $oldversion = false;
@@ -133,14 +144,14 @@ if (file_exists(SETTINGS_FILE) AND file_exists(DEFINES_FILE))
 }
 else
 {
-	die('<action result="fail" error="30" />'."\n");
 	$logger->logError('The config/settings.inc.php file was not found.');
+	die('<action result="fail" error="30" />'."\n");
 }

 if (!file_exists(DEFINES_FILE))
 {
-	die('<action result="fail" error="37" />'."\n");
 	$logger->logError('The config/settings.inc.php file was not found.');
+	die('<action result="fail" error="37" />'."\n");
 }
 include_once(SETTINGS_FILE);

@@ -156,7 +167,8 @@ include_once(DEFINES_FILE);

 $oldversion = _PS_VERSION_;

-$versionCompare =  version_compare(INSTALL_VERSION, _PS_VERSION_);
+$versionCompare =  version_compare(INSTALL_VERSION, $oldversion);
+
 if ($versionCompare == '-1')
 {
 	$logger->logError('This installer is too old.');
@@ -164,7 +176,7 @@ if ($versionCompare == '-1')
 }
 elseif ($versionCompare == 0)
 {
-	$logger->logError('You already have the '.INSTALL_VERSION.' version.');
+	$logger->logError(sprintf('You already have the %s version.',INSTALL_VERSION));
 	die('<action result="fail" error="28" />'."\n");
 }
 elseif ($versionCompare === false)
@@ -198,9 +210,27 @@ if (empty($upgradeFiles))
 }
 natcasesort($upgradeFiles);
 $neededUpgradeFiles = array();
+
+// fix : complete version number if there is not all 4 numbers
+// for example replace 1.4.3 by 1.4.3.0
+// consequences : file 1.4.3.0.sql will be skipped if oldversion = 1.4.3
+// @since 1.4.4.0
+$arrayVersion = preg_split('#\.#', $oldversion);
+$versionNumbers = sizeof($arrayVersion);
+
+if ($versionNumbers != 4)
+	$arrayVersion = array_pad($arrayVersion, 4, '0');
+
+$oldversion = implode('.', $arrayVersion);
+// end of fix
+
 foreach ($upgradeFiles AS $version)
-	if (version_compare($version, _PS_VERSION_) == 1 AND version_compare(INSTALL_VERSION, $version) != -1)
+{
+
+	if (version_compare($version, $oldversion) == 1 AND version_compare(INSTALL_VERSION, $version) != -1)
 		$neededUpgradeFiles[] = $version;
+}
+
 if (empty($neededUpgradeFiles))
 {
 	$logger->logError('No upgrade is possible.');
@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;