From e9370f1892b23ea7e40b7a4d6239df2975e3ae26 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 11 Mar 2013 12:31:28 +0100
Subject: [PATCH] // Improved pscleaner

---
 modules/pscleaner/pscleaner.php       | 56 ++++++++++++++++++++++-----
 modules/pscleaner/translations/fr.php | 14 +++++--
 2 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/modules/pscleaner/pscleaner.php b/modules/pscleaner/pscleaner.php
index 549ce1b4a..353f82f4f 100644
--- a/modules/pscleaner/pscleaner.php
+++ b/modules/pscleaner/pscleaner.php
@@ -53,31 +53,67 @@ class PSCleaner extends Module
 		if (Tools::isSubmit('submitTruncateCatalog'))
 		{
 			self::truncate('catalog');
-			$html .= $this->l('Catalog truncated').'<br /><br />';
+			$html .= '<div class="conf">'.$this->l('Catalog truncated').'</div>';
 		}
 		if (Tools::isSubmit('submitTruncateSales'))
 		{
 			self::truncate('sales');
-			$html .= $this->l('Orders and customers truncated').'<br /><br />';
+			$html .= '<div class="conf">'.$this->l('Orders and customers truncated').'</div>';
 		}
 
 		$html .= '
-		<form action="'.Tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']).'" method="post">
-			<fieldset><legend>'.$this->l('Functional integrity constraints').'</legend>
-				<input type="submit" class="button" name="submitCheckAndFix" value="'.$this->l('Check & fix').'" />
+		<script type="text/javascript">
+			$(document).ready(function(){
+				$("#submitTruncateCatalog").submit(function(){
+					if (!$(\'#checkTruncateCatalog\').attr(\'checked\'))
+						alert(\''.addslashes($this->l('Please tick the checkbox above')).'\');
+					else if (confirm(\''.addslashes($this->l('Are you sure that you want to delete all catalog data?')).'\'))
+						return true; 
+					return false;
+				});
+				$("#submitTruncateSales").submit(function(){
+					if (!$(\'#checkTruncateSales\').attr(\'checked\'))
+						alert(\''.addslashes($this->l('Please tick the checkbox above')).'\');
+					else if (confirm(\''.addslashes($this->l('Are you sure that you want to delete all sales data?')).'\'))
+						return true; 
+					return false;
+				});
+			});
+		</script>
+		<form id="submitTruncateCatalog" action="'.Tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']).'" method="post">
+			<fieldset><legend>'.$this->l('Catalog').'</legend>
+				<p>
+					<label style="float:none;width:auto">
+						<input id="checkTruncateCatalog" type="checkbox" />
+						'.$this->l('I understand that all the catalog data will be removed without possible rollback:').'
+						'.$this->l('products, features, categories, tags, images, prices, attachments, scenes, stocks, attribute groups and values, manufacturers, suppliers...').'
+					</label>
+				</p>
+				<input type="submit" class="button" name="submitTruncateCatalog" value="'.$this->l('Delete catalog').'" />
+			</fieldset>
+		</form>
+		<br /><br />
+		<form id="submitTruncateSales" action="'.Tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']).'" method="post">
+			<fieldset><legend>'.$this->l('Orders and customers').'</legend>
+				<p>
+					<label style="float:none;width:auto">
+						<input id="checkTruncateSales" type="checkbox" />
+						'.$this->l('I understand that all the orders and customers will be removed without possible rollback:').'
+						'.$this->l('customers, carts, orders, connections, guests, messages, stats...').'
+					</label>
+				</p>
+				<input type="submit" class="button" id="submitTruncateSales" name="submitTruncateSales" value="'.$this->l('Delete orders & customers').'"/>
 			</fieldset>
 		</form>
 		<br /><br />
 		<form action="'.Tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']).'" method="post">
-			<fieldset><legend>'.$this->l('Data').'</legend>
-				<input type="submit" class="button" name="submitTruncateCatalog" value="'.$this->l('Delete catalog').'" />
-				<br /><br />
-				<input type="submit" class="button" name="submitTruncateSales" value="'.$this->l('Delete orders & customers').'" />
+			<fieldset><legend>'.$this->l('Functional integrity constraints').'</legend>
+				<input type="submit" class="button" name="submitCheckAndFix" value="'.$this->l('Check & fix').'" />
 			</fieldset>
 		</form>';
 		return $html;
 	}
-	
+
 	public static function checkAndFix()
 	{
 		$db = Db::getInstance();
diff --git a/modules/pscleaner/translations/fr.php b/modules/pscleaner/translations/fr.php
index f66fd335a..9ab5efbb6 100644
--- a/modules/pscleaner/translations/fr.php
+++ b/modules/pscleaner/translations/fr.php
@@ -8,8 +8,16 @@ $_MODULE['<{pscleaner}prestashop>pscleaner_752369f18aebeed9ae8384d8f1b5dc5e'] =
 $_MODULE['<{pscleaner}prestashop>pscleaner_098c3581a731f08d24311bbf515adbbb'] = 'Rien qui ne nécessite d\'être nettoyer';
 $_MODULE['<{pscleaner}prestashop>pscleaner_1bb7c5eb8682aeada82c407b40ec09c8'] = 'Catalogue supprimé';
 $_MODULE['<{pscleaner}prestashop>pscleaner_ed6ecb7169d5476ef5251524bb17552a'] = 'Commandes et clients supprimés';
+$_MODULE['<{pscleaner}prestashop>pscleaner_dd9941a63f2ab06ce2ce783336c6a811'] = 'Merci de cocher la case ci-dessus';
+$_MODULE['<{pscleaner}prestashop>pscleaner_6c69628e1d57fa6e39162b039a82133b'] = 'Souhaitez-vous supprimer le catalogue produit ?';
+$_MODULE['<{pscleaner}prestashop>pscleaner_6a68264705f23c8e3d505fd2c93a87ba'] = 'Souhaitez-vous supprimer commandes et clients ?';
+$_MODULE['<{pscleaner}prestashop>pscleaner_c32516babc5b6c47eb8ce1bfc223253c'] = 'Catalogue';
+$_MODULE['<{pscleaner}prestashop>pscleaner_eb75fcd36740a94a399e925f7da722d3'] = 'Je comprends que tout le catalogue sera supprimé sans possibilité de retour en arrière :';
+$_MODULE['<{pscleaner}prestashop>pscleaner_b7b592ffce03366a32dc8edd5fdf06cf'] = 'produits, caractéristiques, catégories, tags, images, prix, fichiers joints, scènes, stocks, groupes et valeurs d\'attributs, marques, fournisseurs...';
+$_MODULE['<{pscleaner}prestashop>pscleaner_b2d7c99e984831bd36221baf34e9c26e'] = 'Supprimer le catalogue';
+$_MODULE['<{pscleaner}prestashop>pscleaner_3300d0bf086fa38cf593fe4feff351f1'] = 'Commandes et clients';
+$_MODULE['<{pscleaner}prestashop>pscleaner_1bc469bb2c64bc19a27796374da3a2a8'] = 'Je comprends que tous les clients et commandes seront supprimés sans possibilité de retour en arrière :';
+$_MODULE['<{pscleaner}prestashop>pscleaner_a9c01b717760cf9e17bccd8c5eb647e0'] = 'clients, paniers, commandes, connexions, visiteurs, stats...';
+$_MODULE['<{pscleaner}prestashop>pscleaner_17ca7f22baf84821b6b73462c96fb1e3'] = 'Supprimer les commandes et clients';
 $_MODULE['<{pscleaner}prestashop>pscleaner_3535aa31bd9005bde626ad4312b67d6b'] = 'Contraintes d\'intégrité fonctionnelle';
 $_MODULE['<{pscleaner}prestashop>pscleaner_e84c6595e849214a70b35ed8f95d7d16'] = 'Vérifier et réparer';
-$_MODULE['<{pscleaner}prestashop>pscleaner_f6068daa29dbb05a7ead1e3b5a48bbee'] = 'Données';
-$_MODULE['<{pscleaner}prestashop>pscleaner_b2d7c99e984831bd36221baf34e9c26e'] = 'Supprimer le catalogue';
-$_MODULE['<{pscleaner}prestashop>pscleaner_17ca7f22baf84821b6b73462c96fb1e3'] = 'Supprimer les commandes et clients';