// REVERT MERGE

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

install-dev/classes/ConfigurationTest.php

@@ -0,0 +1,225 @@
+<?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');
+	}
+}

install-dev/classes/GetVersionFromDb.php

@@ -463,9 +463,7 @@ class GetVersionFromDb
 			// List keys
 			$struct[$virtualTable]['@keys'] = array();
 			$sql = 'SHOW INDEX FROM ' . $table;
-			$results = Db::getInstance()->executeS($sql);
-			if($results)
-				foreach ($results as $rowIndex)
+			foreach (Db::getInstance()->executeS($sql) as $rowIndex)
 			{
 				$keyName = strtolower($rowIndex['Key_name']);
 				$type = 'index';

install-dev/classes/ToolsInstall.php

@@ -28,15 +28,9 @@ class ToolsInstall
 {
 	public static function checkDB ($srv, $login, $password, $name, $posted = true, $engine = false)
 	{
-		// 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');
+		include_once(INSTALL_PATH.'/../classes/Validate.php');
+		include_once(INSTALL_PATH.'/../classes/Db.php');
+		include_once(INSTALL_PATH.'/../classes/MySQL.php');
 		
 		if($posted)
 		{

install-dev/controller.js

@@ -73,9 +73,6 @@ 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");
 		}
@@ -109,7 +106,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("finished");
+				$('#tabs li:nth-child(4)').addClass("selected").removeClass("finished");
 				break;
 				
 			}
@@ -279,26 +276,26 @@ 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") ? "okBlock" : "errorBlock" )
+				.removeClass( (result == "fail") ? "ok" : "fail" )
 				.addClass(result);
 				if (result == "fail") configIsOk = false;
 			}
 			
+			
 			testListOptional = testLists[1].getElementsByTagName('test');
 			
 			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") ? "okBlock" : "errorBlock" )
+					.removeClass( (result == "fail") ? "ok" : "fail" )
 					.addClass(result);
 			}
 			
 			if (!configIsOk) {
 				$('#btNext').attr({'disabled':'disabled','class':'button little disabled'});
-				$('h3#resultConfig'+isUpdate).html(txtConfigIsNotOk).removeClass('okBlock').addClass('errorBlock').slideDown('slow');
+				$('h3#resultConfig'+isUpdate).html(txtConfigIsNotOk).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');
@@ -308,10 +305,9 @@ function verifyAndSetRequire(firsttime)
 					$("input#btNext").click();
 				else
 				{
-					$('h3#resultConfig'+isUpdate).html(txtConfigIsOk).removeClass('errorBlock').addClass('okBlock').slideDown('slow');
+					$('h3#resultConfig'+isUpdate).html(txtConfigIsOk).slideDown('slow');
 					$('h3#resultConfigHelper').hide();
 					$("div#sheet_require"+isUpdate+" > ul").slideDown("1500");
-					$('#stepList_2 li:contains("Etape 2")').removeClass('ko');
 				}
 			}
 		}
@@ -324,38 +320,32 @@ function verifyDbAccess ()
 	//local verifications
 	if($("#dbServer[value=]").length > 0)
 	{
-		$("#dbResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtDbServerEmpty).slideDown('slow');
-		$('#stepList_3 li:contains("Etape 3")').addClass('ko');
+		$("#dbResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtDbServerEmpty).show('slow');
 		return false;
 	}
 	else
 	{
-		$("#dbResultCheck").removeClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html('');
-		$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
+		$("#dbResultCheck").removeClass("fail").removeClass("ok").removeClass('userInfos').html('');
 	}
 	
 	if($("#dbLogin[value=]").length > 0)
 	{
-		$("#dbResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtDbLoginEmpty).slideDown('slow');
-		$('#stepList_3 li:contains("Etape 3")').addClass('ko');
+		$("#dbResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtDbLoginEmpty).show('slow');
 		return false;
 	}
 	else
 	{
-		$("#dbResultCheck").removeClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html('');
-		$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
+		$("#dbResultCheck").removeClass("fail").removeClass("ok").removeClass('userInfos').html('');
 	}
 	
 	if($("#dbName[value=]").length > 0)
 	{
-		$("#dbResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtDbNameEmpty).slideDown('slow');
-		$('#stepList_3 li:contains("Etape 3")').addClass('ko');
+		$("#dbResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtDbNameEmpty).show('slow');
 		return false;
 	}
 	else
 	{
-		$("#dbResultCheck").removeClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html('');
-		$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
+		$("#dbResultCheck").removeClass("fail").removeClass("ok").removeClass('userInfos').html('');
 	}
 	
 	//external verifications and sets
@@ -377,23 +367,21 @@ function verifyDbAccess ()
 			if (ret.getAttribute("result") == "ok")
 			{
 				$("#dbResultCheck")
-					.addClass("okBlock")
-					.removeClass("errorBlock")
+					.addClass("ok")
+					.removeClass("fail")
 					.html(txtError[23])
-					.slideDown('slow');
+					.show('slow');
 				$("#dbCreateResultCheck")
-					.slideUp('slow');
-				$('#stepList_3 li:contains("Etape 3")').removeClass('ko');
+					.hide('slow');
 			} else
 			{
 				$("#dbResultCheck")
-					.addClass("errorBlock")
-					.removeClass("okBlock")
+					.addClass("fail")
+					.removeClass("ok")
 					.html(txtError[parseInt(ret.getAttribute("error"))])
-					.slideDown('slow');
+					.show('slow');
 				$("#dbCreateResultCheck")
-					.slideUp('slow');
-				$('#stepList_3 li:contains("Etape 3")').addClass('ko');
+					.hide('slow');
 			}
 		}
 	 }
@@ -428,12 +416,11 @@ function createDB()
 				action_ret = ret.getElementsByTagName('action')[0];
 			} catch (e) {
 				$("#dbCreateResultCheck")
-					.addClass("errorBlock")
-					.removeClass("okBlock")
-					.removeClass('infosBlock')
+					.addClass("fail")
+					.removeClass("ok")
+					.removeClass('userInfos')
 					.html(ret)
 					.show();
-				$('#stepList_3 li:contains("Etape 3")').addClass('ko');
 				return;
 			}
 			if (action_ret.getAttribute("result") == "ok")
@@ -465,9 +452,9 @@ function createDB()
 				if (action_ret.getAttribute("error") == "11")
 				{
 					$("#dbCreateResultCheck")
-						.addClass("errorBlock")
-						.removeClass("okBlock")
-						.removeClass('infosBlock')
+						.addClass("fail")
+						.removeClass("ok")
+						.removeClass('userInfos')
 						.html(
 							txtError[11]+ "<br />\'"+
 							action_ret.getAttribute("sqlQuery") + "\'<br/>"+
@@ -478,13 +465,12 @@ function createDB()
 				else
 				{
 					$("#dbCreateResultCheck")
-						.addClass("errorBlock")
-						.removeClass("okBlock")
-						.removeClass('infosBlock')
+						.addClass("fail")
+						.removeClass("ok")
+						.removeClass('userInfos')
 						.html(txtError[parseInt(action_ret.getAttribute("error"))])
 						.show();
 				}
-				$('#stepList_3 li:contains("Etape 3")').addClass('ko');
 			}
 	   }
 	});
@@ -496,27 +482,29 @@ function verifyMail()
 	//local verifications
 	if ($("#testEmail[value=]").length > 0)
 	{
-		$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtError[0]);
+		$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtError[0]);
 		return false;
 	}
 	else if (!verifMailREGEX.test( $("#testEmail").val() ))
 	{ 
-		$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtError[3]);
+		$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtError[3]);
 		return false;
 	}
 	else
 	{
+		
 		if (smtpChecked)
 		{
 			//local verifications
 			if($("#smtpSrv[value=]").length > 0)
 			{
-				$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtSmtpSrvEmpty);
+				$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtSmtpSrvEmpty);
 				smtpIsOk = false;
 				return false;
 			}
 		}
 		
+		
 		//external verifications and sets
 		$.ajax(
 		{
@@ -540,13 +528,13 @@ function verifyMail()
 				
 				if (ret.getAttribute("result") == "ok")
 				{
-					$("#mailResultCheck").addClass("okBlock").removeClass("errorBlock").removeClass('infosBlock').html(mailSended);
+					$("#mailResultCheck").addClass("ok").removeClass("fail").removeClass('userInfos').html(mailSended);
 					mailIsOk = true;
 				}
 				else
 				{
 					mailIsOk = false;
-					$("#mailResultCheck").addClass("errorBlock").removeClass("okBlock").removeClass('infosBlock').html(txtError[26]);
+					$("#mailResultCheck").addClass("fail").removeClass("ok").removeClass('userInfos').html(txtError[26]);
 				}
 		   }
 		 }
@@ -571,13 +559,13 @@ function uploadLogo ()
 						{
 							if(data.error != '')
 							{
-								$("#resultInfosLogo").html( txtError[parseInt(data.error)] ).addClass("errorBlock").show();
+								$("#resultInfosLogo").html( txtError[parseInt(data.error)] ).addClass("fail").show();
 							}
 							else
 							{
 								$(this).attr('src', ps_base_uri + 'img/logo.jpg?' + (new Date()))
 								$(this).show('slow');
-								$("#resultInfosLogo").html("").removeClass("errorBlock").hide();
+								$("#resultInfosLogo").html("").removeClass("fail").hide();
 							}
 						});
 					}
@@ -585,7 +573,7 @@ function uploadLogo ()
 				error: function (data, status, e)
 				{
 					$("#uploadedImage").attr('src', ps_base_uri + 'img/logo.jpg?' + (new Date()));
-					$("#resultInfosLogo").html("").addClass("errorBlock");
+					$("#resultInfosLogo").html("").addClass("fail");
 				}
 			}
 		)
@@ -633,7 +621,7 @@ function ajaxRefreshField(nthField, idResultField, fieldsList, inputId)
 	{
 		$("#"+idResultField)
 			.html( txtError[parseInt(fieldsList[nthField].getAttribute("error"))] )
-			.addClass("errorBlock")
+			.addClass("fail")
 			.show("slow");
 		if (validShopInfos)
 			$("#"+inputId).focus();
@@ -643,7 +631,7 @@ function ajaxRefreshField(nthField, idResultField, fieldsList, inputId)
 	{
 		$("#"+idResultField)
 			.html("")
-			.removeClass("errorBlock")
+			.removeClass("fail")
 			.show("slow");
 		return true;
 	}
@@ -663,7 +651,7 @@ function verifyShopInfos()
 	$.ajax(
 	{
 	   url: "model.php",
-	   async: true,
+	   async: false,
 	   cache: false,
 	   data:
 		"method=checkShopInfos"+
@@ -688,7 +676,9 @@ 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');
@@ -712,7 +702,6 @@ function verifyShopInfos()
 				$('#endFirstName').html($('input#infosFirstname').val());
 				$('#endName').html($('input#infosName').val());
 				$('#endEmail').html($('input#infosEmail').val());
-				showStep(5);
 			}
 	   }
 	 }
@@ -730,14 +719,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 				{
 					$(idResultSpan)
 						.show("slow")
-						.addClass("errorBlock")
+						.addClass("fail")
 						.html(txtError[0]);
 				}
 				else
 				{
 					$(idResultSpan)
 						.hide("slow")
-						.removeClass("errorBlock")
+						.removeClass("fail")
 						.html("");
 				}
 			}
@@ -752,14 +741,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 					{
 						$(idResultSpan)
 							.show("slow")
-							.addClass("errorBlock")
+							.addClass("fail")
 							.html(txtError[3]);
 					}
 					else
 					{
 						$(idResultSpan)
 							.hide("slow")
-							.removeClass("errorBlock")
+							.removeClass("fail")
 							.html("");
 					}
 				}
@@ -774,14 +763,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 					{
 						$(idResultSpan)
 							.show("slow")
-							.addClass("errorBlock")
+							.addClass("fail")
 							.html(txtError[47]);
 					}
 					else
 					{
 						$(idResultSpan)
 							.hide("slow")
-							.removeClass("errorBlock")
+							.removeClass("fail")
 							.html("");
 					}
 				}
@@ -796,14 +785,14 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 					{
 						$(idResultSpan)
 							.show("slow")
-							.addClass("errorBlock")
+							.addClass("fail")
 							.html(txtError[48]);
 					}
 					else
 					{
 						$(idResultSpan)
 							.hide("slow")
-							.removeClass("errorBlock")
+							.removeClass("fail")
 							.html("");
 					}
 				}
@@ -852,7 +841,8 @@ function doUpgrade()
 	   url: "model.php",
 	   cache: false,
 	   data:
-	   	"method=doUpgrade&customModule=" + customModule+ "",
+	   	"method=doUpgrade&customModule=" + customModule+ ""
+	   ,
 	   success: function(ret)
 	   {
 	   		var ret;
@@ -869,19 +859,18 @@ function doUpgrade()
 			{
 				requests = ret.getElementsByTagName('request');
 				$("#updateLog").empty();
-				$("#updateLog").hide();
+				
 				$(requests).each(function()
 				{
-					var html = "<div class='request'>" + $(this).children("sqlQuery").text();
+					$("#updateLog").append("<div class='request'>" + $(this).children("sqlQuery").text() + "</div><br/>");
 					if($(this).attr("result") == "fail")
 					{
 						countSqlError++;
-						html += "<br /><span class='fail'>(" + $(this).children("sqlNumberError").text() + ") " + $(this).children("sqlMsgError").text() + "</span><br style='clear:both;'/>";
+						$("#updateLog").append("<span class='fail'>(" + $(this).children("sqlNumberError").text() + ") " + $(this).children("sqlMsgError").text() + "</span><br/>");
 					}
-					$("#updateLog").append(html+"</div><br/>");
 				});
 				if (ret.getAttribute("error") == "34")
-					$("#txtErrorUpdateSQL").html(txtError[35]+" "+countSqlError+" "+txtError[36]).show();
+					$("#txtErrorUpdateSQL").html(txtError[35]+" "+countSqlError+" "+txtError[36]);
 				showStep(9);
 			}
 			else
@@ -916,18 +905,29 @@ $(document).ready(
 		$("#container").show();
 		
 		//ajax animation
-		$("#loaderSpace").ajaxStart(
+		$("#loader").ajaxStart(
 			function()
 			{
-				$(this).fadeIn('slow');
-				$(this).children('div').fadeIn('slow');
+				$(this).fadeIn();
+				$("#btNext[disabled!=1], #btBack[disabled!=1]").attr("disabled", "disabled").addClass("disabled").addClass("lockedForAjax");
 			}
 		);
-		$("#loaderSpace").ajaxComplete(
+		$("#loader").ajaxComplete(
 			function(e, xhr, settings)
 			{
-				$(this).fadeOut('slow');
-				$(this).children('div').fadeOut('slow');
+				$(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");
+			}
+				}
 				errorOccured = false;
 			}
 		);
@@ -950,7 +950,6 @@ $(document).ready(
 		);
 
 		//set SMTP pannels states
-		$("div#mailSMTPParam").hide();
 		$("#set_stmp").bind("click",
 			function()
 			{
@@ -959,10 +958,13 @@ $(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;
 				}
 			}

install-dev/index.php

@@ -245,30 +245,18 @@ 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><!-- /end loaderSpace -->
+</div>
 
 <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">
@@ -277,28 +265,27 @@ 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><!-- /end help -->
-</div><!-- /end leftpannel -->
+	</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 id="sheets">
 
 	<div class="sheet shown" id="sheet_lang">
-		<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>
+		<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>
 		<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>
@@ -309,7 +296,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>
 
-		<h2><?php echo lang('Choose the installer language:')?></h2>
+		<h3><?php echo lang('Choose the installer language:')?></h3>
 		<form id="formSetInstallerLanguage" action="<?php $_SERVER['REQUEST_URI']; ?>" method="get">
 			<ul id="langList" style="line-height: 20px;">
 			<?php foreach ($lm->getAvailableLangs() as $lang): ?>
@@ -327,7 +314,7 @@ 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>
 
-		<h2><?php echo lang('Installation method')?></h2>
+		<h3><?php echo lang('Installation method')?></h3>
 		<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>
@@ -366,20 +353,11 @@ if ($lm->getIncludeTradFilename())
 		</p>
 	</div>
 
-		<div class="sheet clearfix" id="sheet_require">
-			<div class="contentTitle">
-				<h1><?php echo lang('System and permissions')?></h1>
+		<div class="sheet" id="sheet_require">
 
-			<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>
+			<h2><?php echo lang('System and permissions')?></h2>
 
-			<h2><?php echo lang('Required set-up. Please verify the following checklist items are true.')?></h2>
+			<h3><?php echo lang('Required set-up. Please verify the following checklist items are true.')?></h3>
 
 			<p>
 				<?php echo lang('If you have any questions, please visit our '); ?>
@@ -388,7 +366,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"></h3>
+			<h3 id="resultConfig" style="font-size: 20px; text-align: center; padding: 0px; display: none;"></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>
@@ -429,24 +407,13 @@ if ($lm->getIncludeTradFilename())
 
 		</div>
 
-		<div class="sheet clearfix" id="sheet_db">
-			<div class="contentTitle">
-				<h1><?php echo lang('Database configuration')?></h1>
+		<div class="sheet" id="sheet_db">
+			<h2><?php echo lang('Database configuration')?></h2>
 
-			<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>
+			<p><?php echo lang('Configure your database by filling out the following fields:')?></p>
 			<form id="formCheckSQL" class="aligned" action="<?php $_SERVER['REQUEST_URI']; ?>" onsubmit="verifyDbAccess(); return false;" method="post">
-					<p class="first" style="margin-top: 15px;">
+				<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;">
 					<label for="dbServer"><?php echo lang('Server:')?> </label>
 					<input size="25" class="text" type="text" id="dbServer" value="localhost"/>
 				</p>
@@ -469,32 +436,27 @@ 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><?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>
+					<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>
 				</p>
 				</form>
 				<p id="dbCreateResultCheck"></p>
 			</div>
-			
 			<div id="mailPart">
 				<h2><?php echo lang('E-mail delivery set-up')?></h2>
 
-				<p id="configsmtp">
+				<p>
 					<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>
@@ -516,7 +478,7 @@ if ($lm->getIncludeTradFilename())
 
 						<p>
 							<label for="smtpPort"><?php echo lang('Port:'); ?></label>
-							<input type="text" size="5" id="smtpPort" value="25" class="text" />
+							<input type="text" size="5" id="smtpPort" value="25" />
 						</p>
 
 						<p>
@@ -532,41 +494,27 @@ if ($lm->getIncludeTradFilename())
 					</form>
 				</div>
 				<p>
-					<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!'); ?>" />
+					<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>
 				</p>
 
-				<p id="mailResultCheck"></p>
+				<p id="mailResultCheck" class="userInfos"></p>
 			</div>
 		</div>
 
-		<div class="sheet clearfix" id="sheet_infos">
+		<div class="sheet" 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>
 
-					<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>
+				<h2><?php echo lang('Shop configuration'); ?></h2>
 
-				<div id="infosShopBlock">
-					<h2><?php echo lang('Merchant info'); ?></h2>
+				<h3><?php echo lang('Merchant info'); ?></h3>
 				<div class="field">
-						<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>
+					<label for="infosShop" class="aligned"><?php echo lang('Shop name:'); ?> </label><input class="text required" type="text" id="infosShop" value=""/><br/>
 					<span id="resultInfosShop" class="result aligned"></span>
 				</div>
 				<div class="field">
 					<label for="infosActivity" class="aligned"><?php echo lang('Main activity:'); ?></label>
-						<span class="contentinput">
-							<select id="infosActivity">
+					<select id="infosActivity" style="border:1px solid #D41958">
 						<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>
@@ -590,96 +538,64 @@ 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>
-						<span class="contentinput">
-							<select id="infosCountry">
+					<select id="infosCountry" style="width:175px;border:1px solid #D41958">
 					</select>
-						</span>
 				</div>
 				<div class="field">
 					<label for="infosTimezone" class="aligned"><?php echo lang('Shop\'s timezone:'); ?></label>
-						<span class="contentinput">
-							<select id="infosTimezone">
+					<select id="infosTimezone" style="width:175px;border:1px solid #D41958">
 					</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" class="radiolabel"><?php echo lang('Yes'); ?></label>&nbsp; &nbsp;
+					<label for="catalogMode_1"><?php echo lang('Yes'); ?></label>
 					<input type="radio" name="catalogMode" id="catalogMode_0" value="0" checked="checked"/>
-							<label for="catalogMode_0" class="radiolabel"><?php echo lang('No'); ?></label>
-						</span>
+					<label for="catalogMode_0"><?php echo lang('No'); ?></label>
 					<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>
-						<span class="contentinput">
-							<input class="text required" type="text" id="infosFirstname"/> <sup class="required">*</sup>
-						</span>
+					<label for="infosFirstname" class="aligned"><?php echo lang('First name:'); ?> </label><input class="text required" type="text" id="infosFirstname"/><br/>
 					<span id="resultInfosFirstname" class="result aligned"></span>
 				</div>
 
 				<div class="field">
-						<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>
+					<label for="infosName" class="aligned"><?php echo lang('Last name:'); ?> </label><input class="text required" type="text" id="infosName"/><br/>
 					<span id="resultInfosName" class="result aligned"></span>
 				</div>
 
 				<div class="field">
-						<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>
+					<label for="infosEmail" class="aligned"><?php echo lang('E-mail address:'); ?> </label><input type="text" class="text required" id="infosEmail"/><br/>
 					<span id="resultInfosEmail" class="result aligned"></span>
 				</div>
 
 				<div class="field">
-						<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>
+					<label for="infosPassword" class="aligned"><?php echo lang('Shop password:'); ?> </label><input autocomplete="off" type="password" class="text required" id="infosPassword"/><br/>
 					<span id="resultInfosPassword" class="result aligned"></span>
 				</div>
 				<div class="field">
-						<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>
+					<label class="aligned" for="infosPasswordRepeat"><?php echo lang('Re-type to confirm:'); ?> </label><input type="password" autocomplete="off" class="text required" id="infosPasswordRepeat"/><br/>
 					<span id="resultInfosPasswordRepeat" class="result aligned"></span>
 				</div>
 
-					<div class="field" id="contentInfosNotification">
-						<span class="contentinput">
+				<div class="field">
 					<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']))
@@ -687,7 +603,11 @@ 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>
-					<script type="text/javascript">
+				<style>
+					.installModuleList { display: none; }
+					.installModuleList.selected { display: block; }
+				</style>
+				<script>
 					var moduleChecked = new Array();
 					$(document).ready(function() {
 						$('#infosCountry').change(function() {
@@ -742,14 +662,6 @@ 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)
 							{
@@ -757,20 +669,21 @@ if ($lm->getIncludeTradFilename())
 								foreach ($modulesList as $module)
 								{
 									echo '
-										<table cellpadding="0" callspacing="0" border="0" class="moduleTable">
+									<table style="border: 1px solid #CCC; padding: 5px; width: 650px">
 									<tr>
-										<td valign="top" style="text-align: center; padding-top:10px; width: 30px; background: #FFF;">
-										<span style="padding: 12px 4px 6px 2px;">
+									<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;">
 									<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>
-										';
+									<tr><td colspan="3"><div id="divForm_'.$country_iso_code.'_'.$module.'">&nbsp;</div></td></tr>
+									</table>
+									<br />';
 									echo "<script>
 										moduleChecked['".$country_iso_code.'_'.$module."'] = 0;
 										$(document).ready(function() {
@@ -832,6 +745,7 @@ if ($lm->getIncludeTradFilename())
 												});
 											});";
 										}
+
 										echo "</script>";
 								}
 								echo '</div>';
@@ -840,8 +754,13 @@ 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;">
@@ -879,44 +798,31 @@ 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 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>
+		<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>
 				<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 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>
+				<table id="resultInstall" cellspacing="0">
+					<tr>
+						<td class="label"><?php echo lang('Shop name:'); ?></td>
+						<td 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 class="odd">
+					<tr>
 						<td class="label"><?php echo lang('Last name:'); ?></td>
 						<td id="endName" class="resultEnd">&nbsp;</td>
 					</tr>
@@ -925,26 +831,23 @@ 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>
 
-				<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>
-				
+				<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>
 				<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>
@@ -953,18 +856,9 @@ if ($lm->getIncludeTradFilename())
 
 		</div>
 
-		<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>
+		<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>
 			<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>
 
@@ -985,7 +879,7 @@ if ($lm->getIncludeTradFilename())
 					$(document).ready(function() {
 						$.ajax({
 							url: 'xml/getNonNativeModules.php',
-							async: true,
+							async: false,
 							dataType: "json",
 							success: function (json) 
 							{
@@ -1068,20 +962,20 @@ if ($lm->getIncludeTradFilename())
 					if (sizeof($upgradeFiles))
 					{
 						echo '
-						<table cellpadding="0" cellspacing="0" border="0">
+						<table cellpadding="5" border="1" style="font-size: 11px; margin-top: 10px;">
 							<tr>
 								<th>'.lang('Upgrade file').'</th>
-								<th  style="text-align: right;">'.lang('Modifications to process').'</th>
+								<th style="width: 100px;">'.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;' : '').'">v'.$file['version'].($file['is_major'] ? ' '.lang('(major)') : '').'</td><td style="text-align: right;">'.(int)$file['instructions'].'</td></tr>';
+							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>';
 							$totalInstructions += (int)$file['instructions'];
 						}
-						echo '<tr style="font-weight: bold;"><td>'.lang('TOTAL').'</td><td style="text-align: right;">'.(int)$totalInstructions.'</td></tr>';
+						echo '<tr style="font-weight: bold;"><td>'.lang('TOTAL').'</td><td style="text-align: right; padding-right: 5px;">'.(int)$totalInstructions.'</td></tr>';
 						echo '
 						</table>';
 
@@ -1089,7 +983,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: 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 />
+						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 />
 						<i style="font-size: 11px;">'.lang('Depending on your server and the size of your shop').'</i></p>';
 
 						if ($majorReleases > 1)
@@ -1117,7 +1011,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="0" cellspacing="0" border="0">
+				<table cellpadding="5" border="1" style="font-size: 11px;">
 					<tr>
 						<th>'.lang('PHP parameter').'</th>
 						<th>'.lang('Description').'</th>
@@ -1134,32 +1028,28 @@ if ($lm->getIncludeTradFilename())
 						<td style="text-align: right;">'.ini_get('memory_limit').'</td>
 					</tr>
 				</table>
-				<div class="infosBlock">';
+				<div style="font-weight: bold; background: '.$color.'; color: #000; padding: 10px; border: 1px solid #999; margin-top: 10px;">';
 
 				if ($color == '#D9F2D0')
-					echo '<img src="../img/admin/ok.gif" alt="" style="vertical-align: absmiddle;" /> '.lang('All your settings seem to be OK, go for it!');
+					echo '<img src="../img/admin/ok.gif" alt="" style="vertical-align: middle;" /> '.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: 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).');
+					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).');
 				elseif ($color == '#FAE2E3')
-					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>';
+					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 />';
+
 
 				?>
 			</div>
 		</div>
 
-		<div class="sheet clearfix" id="sheet_require_update">
-			<div class="contentTitle">
-				<h1><?php echo lang('System and permissions')?></h1>
+		<div class="sheet" id="sheet_require_update">
 
-				<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>
+			<h2><?php echo lang('System and permissions'); ?></h2>
+
+			<h3><?php echo lang('Required set-up. Please verify the following checklist items are true.'); ?></h3>
 
 			<p>
 				<?php echo lang('If you have any questions, please visit our '); ?>
@@ -1168,7 +1058,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"></h3>
+			<h3 id="resultConfig_update" style="font-size: 20px; text-align: center; padding: 0px; display: none;"></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>
@@ -1209,44 +1099,21 @@ if ($lm->getIncludeTradFilename())
 
 		</div>
 
-		<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>
-			
+		<div class="sheet" id="sheet_updateErrors">
+			<h2><?php echo lang('Error!'); ?></h2>
 			<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" class="errorBlock"></p>
-			<br />
-			<p id="detailsError" class="infosBlock"><?php echo lang('No more informations'); ?></p>
+			<p id="resultUpdate"></p>
+			<p id="detailsError"></p>
 		</div>
 
-		<div class="sheet clearfix" id="sheet_end_update">
-			<div>
-				<div class="contentTitle">
+		<div class="sheet" id="sheet_end_update" style="padding:0px;">
+			<div style="padding:1em;">
 				<h1><?php echo lang('Your update is completed!'); ?></h1>
-
-					<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>
+				<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>
 				<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>
+				<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 />
 
 				<?php
 
@@ -1254,23 +1121,19 @@ if ($lm->getIncludeTradFilename())
 					{
 						echo '
 						<h2>'.lang('New features in PrestaShop v').INSTALL_VERSION.'</h2>
-						<iframe style="width: 638px; margin-top: 5px; padding: 5px; border: 1px solid #BBB;" src="http://features.prestashop.com/lang/'.$lm->getIsoCodeSelectedLang().'/version/'.INSTALL_VERSION.'">
+						<iframe style="width: 595px; 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>';
 					}
 
 				?>
 
-				<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>
+				<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>
 			<?php
 			if (@fsockopen('addons.prestashop.com', 80, $errno, $errst, 3)): ?>

install-dev/langs/fr.php

@@ -177,8 +177,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, 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['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['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é)';

install-dev/php/alter_productcomments_guest_index.php

@@ -1,39 +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$
-*  @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`);');
-}
-

install-dev/sql/db.sql

@@ -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(128) NOT NULL,
+  `mime` varchar(64) NOT NULL,
   PRIMARY KEY  (`id_attachment`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
@@ -290,16 +290,6 @@ 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,

install-dev/sql/db_settings_lite.sql

@@ -712,8 +712,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,'AdminUpgrade',9,14),(90,'AdminShop', 0, 11), (91,'AdminGroupShop', 90, 1),
-(92, 'AdminShopUrl', 90, 2);
+(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);
 
 INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 1, id_tab, 1, 1, 1, 1 FROM PREFIX_tab);
 
@@ -730,11 +730,11 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (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, 'Upgrade'),(1, 90, 'Shops'), (1, 91, 'Group Shops'), (1, 92, 'Shop Urls');
+(1, 87, 'Counties'),(1, 88, 'Home'), (1, 89, 'Shops'), (1, 90, 'Group Shops'), (1, 91, '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, 'Marques'),(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, 'Fabricants'),(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'),
@@ -745,7 +745,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (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, 'Mise à jour'), (2, 90, 'Boutiques'), (2, 91, 'Groupes de boutique'), (2, 92, 'URLs de boutique');
+(2, 87, 'Comtés'),(2,88,'Accueil'), (2, 89, 'Boutiques'), (2, 90, 'Groupes de boutique'), (2, 91, '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'),
@@ -758,8 +758,8 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (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, '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');
+(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');
 
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 1, 'Katalog'),(4, 2, 'Kunden'),(4, 3, 'Bestellungen'),(4, 4, 'Zahlung'),
@@ -774,7 +774,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (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, 'Upgrade'), (4, 90, 'Shops'), (4, 91, 'Group Shops'), (4, 92, 'Shop Urls');
+(4,87,'Counties'),(4,88,'Home'), (4, 89, 'Shops'), (4, 90, 'Group Shops'), (4, 91, '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'),
@@ -789,7 +789,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (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, 'Aggiornamento'), (5, 90, 'Shops'), (5, 91, 'Group Shops'), (5, 92, 'Shop Urls');
+(5,87,'Counties'),(5,88,'Home'), (5, 89, 'Shops'), (5, 90, 'Group Shops'), (5, 91, 'Shop Urls');
 
 INSERT IGNORE INTO `PREFIX_tab_lang` (`id_tab`, `id_lang`, `name`)
     (SELECT `id_tab`, id_lang, (SELECT tl.`name`

install-dev/xml/checkConfig.php

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

install-dev/xml/doUpgrade.php

@@ -31,11 +31,8 @@ $engineType = 'ENGINE_TYPE';
 if (function_exists('date_default_timezone_set'))
 	date_default_timezone_set('Europe/Paris');
 	
-		define('_PS_MODULE_DIR_', realpath(INSTALL_PATH.'/../').'/modules/');
-
-if(!defined('_PS_INSTALLER_PHP_UPGRADE_DIR_'))
-	define('_PS_INSTALLER_PHP_UPGRADE_DIR_',  INSTALL_PATH.DIRECTORY_SEPARATOR.'php/');
-
+define('_PS_MODULE_DIR_', realpath(INSTALL_PATH).'/../modules/');
+define('_PS_INSTALLER_PHP_UPGRADE_DIR_', realpath(INSTALL_PATH).'/php/');
 // Only if loyalty module is installed
 require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_module_loyalty.php');
 // desactivate non-native module
@@ -107,8 +104,6 @@ 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');
@@ -254,7 +249,6 @@ foreach($neededUpgradeFiles AS $version)
 	$file = INSTALL_PATH.'/sql/upgrade/'.$version.'.sql';
 	if (!file_exists($file))
 	{
-		error_log('here?'.$file);
 		$logger->logError('Error while loading sql upgrade file.');
 		die('<action result="fail" error="33" />'."\n");
 	}