From 6338c2200083fe890b91336037ad47a68ac8116a Mon Sep 17 00:00:00 2001
From: Fabrice Creuzot <code@luigifab.fr>
Date: Sun, 11 Oct 2015 20:00:00 +0200
Subject: [PATCH] Version 3.1.0

---
 README.md                                     |  2 +-
 .../Block/Adminhtml/Config/Heading.php        | 16 +++++------
 .../Luigifab/Versioning/Model/Scm/Git.php     | 16 ++++++-----
 .../Luigifab/Versioning/Model/Upgrade.php     | 27 ++++++++++++-------
 .../Luigifab/Versioning/etc/adminhtml.xml     | 10 +++++--
 .../Luigifab/Versioning/etc/config.xml        |  4 +--
 .../Luigifab/Versioning/etc/system.xml        | 26 +++++++++---------
 app/locale/fr_CA/Luigifab_Versioning.csv      | 16 ++++++-----
 app/locale/fr_FR/Luigifab_Versioning.csv      | 16 ++++++-----
 errors/processor.php                          |  9 +++++--
 package.xml                                   | 13 +++++----
 .../css/luigifab/versioning/styles.css        |  5 ++--
 .../css/luigifab/versioning/styles.min.css    |  5 ++--
 13 files changed, 96 insertions(+), 69 deletions(-)

diff --git a/README.md b/README.md
index f4fe375..9683591 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,4 @@ For more information, go to https://www.luigifab.fr/magento/versioning (IPv6 is
 
 This repository is a mirror. To install the module, please use the extension key available in the documentation. If you like, take some of your time to improve the translations, go to https://bit.ly/2HyCCEc.
 
-Version 3.0.3 released on 14/05/2015.
+Version 3.1.0 released on 11/10/2015.
diff --git a/app/code/community/Luigifab/Versioning/Block/Adminhtml/Config/Heading.php b/app/code/community/Luigifab/Versioning/Block/Adminhtml/Config/Heading.php
index 32bc22c..8bbc7cb 100644
--- a/app/code/community/Luigifab/Versioning/Block/Adminhtml/Config/Heading.php
+++ b/app/code/community/Luigifab/Versioning/Block/Adminhtml/Config/Heading.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * Created J/07/02/2013
- * Updated S/11/04/2015
- * Version 8
+ * Updated S/16/05/2015
+ * Version 9
  *
  * Copyright 2011-2015 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://redmine.luigifab.info/projects/magento/wiki/versioning
@@ -45,13 +45,13 @@ public function render(Varien_Data_Form_Element_Abstract $element) {
 
 	private function getStoreId() {
 
-		$pWebsite = Mage::app()->getRequest()->getParam('website');
-		$pStore = Mage::app()->getRequest()->getParam('store');
+		$website = $this->getRequest()->getParam('website');
+		$store = $this->getRequest()->getParam('store');
 
-		if (strlen($pStore) > 0)
-			$storeId = Mage::getModel('core/store')->load($pStore)->getStoreId();
-		else if (strlen($pWebsite) > 0)
-			$storeId = Mage::getModel('core/website')->load($pWebsite)->getDefaultStore()->getStoreId();
+		if (strlen($store) > 0)
+			$storeId = Mage::getModel('core/store')->load($store)->getStoreId();
+		else if (strlen($website) > 0)
+			$storeId = Mage::getModel('core/website')->load($website)->getDefaultStore()->getStoreId();
 		else
 			$storeId = Mage::app()->getDefaultStoreView()->getStoreId();
 
diff --git a/app/code/community/Luigifab/Versioning/Model/Scm/Git.php b/app/code/community/Luigifab/Versioning/Model/Scm/Git.php
index d40fbd9..1a3c2e0 100644
--- a/app/code/community/Luigifab/Versioning/Model/Scm/Git.php
+++ b/app/code/community/Luigifab/Versioning/Model/Scm/Git.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * Created S/03/12/2011
- * Updated D/05/04/2015
- * Version 27
+ * Updated D/06/09/2015
+ * Version 28
  *
  * Copyright 2011-2015 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://redmine.luigifab.info/projects/magento/wiki/versioning
@@ -46,7 +46,7 @@ public function getType() {
 
 
 	// #### Historique ############################################################## public ### //
-	// = révision : 67
+	// = révision : 68
 	// » Génère une collection à partir de l'historique des commits du dépôt
 	// » Met en forme les données à partir de la réponse de pleins de commandes
 	// » Utilise GIT_SSH si le fichier de configuration existe
@@ -114,7 +114,7 @@ public function getCommitCollection() {
 
 				if (strlen($refs) > 2) {
 					$refs = substr($refs, 1, -1);
-					$refs = str_replace(array('origin/','HEAD',' '), '', $refs);
+					$refs = str_replace(array('origin/','HEAD',' ','->'), '', $refs);
 					$refs = preg_replace('#,{2,}#', ',', $refs);
 					$refs = trim($refs, ' ,');
 					$refs = explode(',', $refs);
@@ -338,7 +338,7 @@ public function getCurrentBranch() {
 
 
 	// #### Mise à jour ############################################################# public ### //
-	// = révision : 10
+	// = révision : 11
 	// » Met à jour la copie locale avec 'git reset' (après avoir annulé les éventuelles modifications avec 'git clean')
 	// » Prend soin de vérifier le code de retour de la commande 'git reset' et d'enregistrer les détails de la mise à jour
 	// » N'utilise pas GIT_SSH étant donnée que tout est disponible sur le dépôt local
@@ -355,10 +355,12 @@ public function upgradeToRevision($obj, $log, $revision) {
 			git reset --hard '.$revision.' >> '.$log.' 2>&1;
 		', $data, $val);
 
-		$data = trim(file_get_contents($log));
+		$data  = trim(file_get_contents($log));
+		$lines = explode("\n", $data);
+
 		$obj->writeCommand($data);
 
-		foreach (explode("\n", $data) as $line) {
+		foreach ($lines as $line) {
 			if (strpos($line, 'fatal: ') === 0)
 				throw new Exception(str_replace('fatal: ', '', $line));
 		}
diff --git a/app/code/community/Luigifab/Versioning/Model/Upgrade.php b/app/code/community/Luigifab/Versioning/Model/Upgrade.php
index 7e3b9cc..31e0ab3 100644
--- a/app/code/community/Luigifab/Versioning/Model/Upgrade.php
+++ b/app/code/community/Luigifab/Versioning/Model/Upgrade.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * Created V/27/02/2015
- * Updated J/14/05/2015
- * Version 51
+ * Updated L/07/09/2015
+ * Version 52
  *
  * Copyright 2011-2015 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://redmine.luigifab.info/projects/magento/wiki/versioning
@@ -52,7 +52,7 @@ public function disableAllBuffer() {
 
 
 	// #### Gestion de la mise à jour ####################################### i18n ## public ### //
-	// = révision : 87
+	// = révision : 88
 	// » Log toutes les informations de la mise à jour
 	// » Déroule le processus de mise à jour
 	public function process($targetRevision, $useFlag) {
@@ -78,6 +78,12 @@ public function process($targetRevision, $useFlag) {
 			// ÉTAPE 1
 			$this->writeTitle($this->__('1) Locking and configuration check'));
 
+			if (Mage::getSingleton('admin/session')->isAllowed('tools/versioning_upgrade') !== true)
+				throw new Exception('Not authorized');
+
+			if (is_file($lock))
+				throw new Exception('An upgrade is already underway');
+
 			if (is_file($log))
 				unlink($log);
 
@@ -88,9 +94,6 @@ public function process($targetRevision, $useFlag) {
 				$this->writeNotice($this->__('Repository: %s / Current revision: %s / Requested revision: %s',
 					$repository->getType(), $H['current_rev'], $targetRevision));
 
-			if (is_file($lock))
-				throw new Exception('An upgrade is already underway');
-
 			if ($useFlag)
 				file_put_contents($this->getUpgradeFlag(), $H['current_rev'].' » '.$H['target_rev'].' from '.$H['remote_addr'].' by '.$H['user']);
 
@@ -134,7 +137,7 @@ public function process($targetRevision, $useFlag) {
 			$H['duration'] = ($H['duration'] < 1000) ? $H['duration'] : 1;
 			$H['status']   = (is_file($log) && is_readable($log)) ? $e->getMessage()."\n".trim(file_get_contents($log)) : $e->getMessage();
 
-			if ($e->getMessage() !== 'An upgrade is already underway') {
+			if (!in_array($e->getMessage(), array('Not authorized', 'An upgrade is already underway'))) {
 
 				$result = array(
 					'url'   => '*/versioning_repository/history',
@@ -161,8 +164,14 @@ public function process($targetRevision, $useFlag) {
 					'error' => true
 				);
 
-				$this->writeError($this->__('Stop! Stop! Stop! An upgrade is already underway.'));
-				Mage::getSingleton('adminhtml/session')->addError($this->__('Please wait, an upgrade is already underway.'));
+				if ($e->getMessage() === 'An upgrade is already underway') {
+					$this->writeError($this->__('Stop! Stop! Stop! An upgrade is already underway.'));
+					Mage::getSingleton('adminhtml/session')->addError($this->__('Please wait, an upgrade is already underway.'));
+				}
+				else {
+					$this->writeError($this->__('You are not authorized to perform this operation.'));
+					Mage::getSingleton('adminhtml/session')->addError($this->__('You are not authorized to perform this operation.'));
+				}
 			}
 		}
 
diff --git a/app/code/community/Luigifab/Versioning/etc/adminhtml.xml b/app/code/community/Luigifab/Versioning/etc/adminhtml.xml
index c61561b..52dd167 100644
--- a/app/code/community/Luigifab/Versioning/etc/adminhtml.xml
+++ b/app/code/community/Luigifab/Versioning/etc/adminhtml.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  * Created J/22/12/2011
- * Updated M/19/08/2014
- * Version 13
+ * Updated L/07/09/2015
+ * Version 14
  *
  * Copyright 2011-2015 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://redmine.luigifab.info/projects/magento/wiki/versioning
@@ -52,6 +52,12 @@
 							<versioning translate="title">
 								<title>Version control</title>
 								<sort_order>72</sort_order>
+								<children>
+									<upgrade translate="title">
+										<title>Perform upgrade</title>
+										<sort_order>1</sort_order>
+									</upgrade>
+								</children>
 							</versioning>
 						</children>
 					</tools>
diff --git a/app/code/community/Luigifab/Versioning/etc/config.xml b/app/code/community/Luigifab/Versioning/etc/config.xml
index 4ef37ee..df0ed84 100644
--- a/app/code/community/Luigifab/Versioning/etc/config.xml
+++ b/app/code/community/Luigifab/Versioning/etc/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  * Created S/03/12/2011
- * Updated J/14/05/2015
+ * Updated L/07/09/2015
  * Version 28
  *
  * Copyright 2011-2015 | Fabrice Creuzot (luigifab) <code~luigifab~info>
@@ -21,7 +21,7 @@
 <config>
 	<modules>
 		<Luigifab_Versioning>
-			<version>3.0.3</version>
+			<version>3.1.0</version>
 		</Luigifab_Versioning>
 	</modules>
 	<global>
diff --git a/app/code/community/Luigifab/Versioning/etc/system.xml b/app/code/community/Luigifab/Versioning/etc/system.xml
index 2289002..89096a9 100644
--- a/app/code/community/Luigifab/Versioning/etc/system.xml
+++ b/app/code/community/Luigifab/Versioning/etc/system.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  * Created S/03/12/2011
- * Updated S/04/04/2015
- * Version 45
+ * Updated M/01/09/2015
+ * Version 46
  *
  * Copyright 2011-2015 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://redmine.luigifab.info/projects/magento/wiki/versioning
@@ -121,7 +121,7 @@
 							<show_in_store>1</show_in_store>
 						</error503_pagetitle>
 						<error503_title translate="label">
-							<label>Title</label>
+							<label>Main title</label>
 							<frontend_type>text</frontend_type>
 							<sort_order>22</sort_order>
 							<show_in_default>1</show_in_default>
@@ -130,7 +130,7 @@
 						</error503_title>
 						<error503_content translate="label comment">
 							<label><![CDATA[Content text or <abbr title="HyperText Markup Language">HTML</abbr>]]></label>
-							<comment><![CDATA[Use %date[format]% to display start date.<br />Use format of <a href="http://us.php.net/strftime" onclick="window.open(this.href); return false;">strftime</a> function.]]></comment>
+							<comment><![CDATA[Use <b>%date[format]%</b> to display start date.<br />Use format of <a href="http://us.php.net/strftime" onclick="window.open(this.href); return false;">strftime</a> function.]]></comment>
 							<frontend_type>textarea</frontend_type>
 							<sort_order>23</sort_order>
 							<show_in_default>1</show_in_default>
@@ -139,7 +139,7 @@
 						</error503_content>
 						<error503_autoreload translate="label comment">
 							<label>Auto reload text and delay</label>
-							<comment>Use [10] for 10 seconds and delay.</comment>
+							<comment><![CDATA[Use <b>[10]</b> for 10 seconds and delay.]]></comment>
 							<frontend_type>text</frontend_type>
 							<source_model>adminhtml/system_config_source_yesno</source_model>
 							<sort_order>24</sort_order>
@@ -149,7 +149,7 @@
 						</error503_autoreload>
 						<error503_byip translate="label comment">
 							<label>Disable page from these IP addresses</label>
-							<comment>Addresses separated by space.</comment>
+							<comment>Separate addresses by space.</comment>
 							<sort_order>25</sort_order>
 							<frontend_type>text</frontend_type>
 							<show_in_default>1</show_in_default>
@@ -174,7 +174,7 @@
 							<show_in_store>1</show_in_store>
 						</upgrade_pagetitle>
 						<upgrade_title translate="label">
-							<label>Title</label>
+							<label>Main title</label>
 							<frontend_type>text</frontend_type>
 							<sort_order>32</sort_order>
 							<show_in_default>1</show_in_default>
@@ -183,7 +183,7 @@
 						</upgrade_title>
 						<upgrade_content translate="label comment">
 							<label><![CDATA[Content text or <abbr title="HyperText Markup Language">HTML</abbr>]]></label>
-							<comment><![CDATA[Use %date[format]% to display start date.<br />Use format of <a href="http://us.php.net/strftime" onclick="window.open(this.href); return false;">strftime</a> function.]]></comment>
+							<comment><![CDATA[Use <b>%date[format]%</b> to display start date.<br />Use format of <a href="http://us.php.net/strftime" onclick="window.open(this.href); return false;">strftime</a> function.]]></comment>
 							<frontend_type>textarea</frontend_type>
 							<sort_order>33</sort_order>
 							<show_in_default>1</show_in_default>
@@ -192,7 +192,7 @@
 						</upgrade_content>
 						<upgrade_autoreload translate="label comment">
 							<label>Auto reload text and delay</label>
-							<comment>Use [10] for 10 seconds and delay.</comment>
+							<comment><![CDATA[Use <b>[10]</b> for 10 seconds and delay.]]></comment>
 							<frontend_type>text</frontend_type>
 							<source_model>adminhtml/system_config_source_yesno</source_model>
 							<sort_order>34</sort_order>
@@ -202,7 +202,7 @@
 						</upgrade_autoreload>
 						<upgrade_byip translate="label comment">
 							<label>Disable page from these IP addresses</label>
-							<comment>Addresses separated by space.</comment>
+							<comment>Separate addresses by space.</comment>
 							<sort_order>35</sort_order>
 							<frontend_type>text</frontend_type>
 							<show_in_default>1</show_in_default>
@@ -227,7 +227,7 @@
 							<show_in_store>1</show_in_store>
 						</report_pagetitle>
 						<report_title translate="label">
-							<label>Title</label>
+							<label>Main title</label>
 							<frontend_type>text</frontend_type>
 							<sort_order>42</sort_order>
 							<show_in_default>1</show_in_default>
@@ -244,7 +244,7 @@
 						</report_content>
 						<report_email translate="label comment">
 							<label>Send report by email to</label>
-							<comment>Emails separated by space.</comment>
+							<comment>Separate addresses by space.</comment>
 							<frontend_type>text</frontend_type>
 							<!--backend_model>adminhtml/system_config_backend_email_address</backend_model-->
 							<sort_order>44</sort_order>
@@ -270,7 +270,7 @@
 							<show_in_store>1</show_in_store>
 						</error404_pagetitle>
 						<error404_title translate="label">
-							<label>Title</label>
+							<label>Main title</label>
 							<frontend_type>text</frontend_type>
 							<sort_order>52</sort_order>
 							<show_in_default>1</show_in_default>
diff --git a/app/locale/fr_CA/Luigifab_Versioning.csv b/app/locale/fr_CA/Luigifab_Versioning.csv
index 6873e31..3c03cfc 100644
--- a/app/locale/fr_CA/Luigifab_Versioning.csv
+++ b/app/locale/fr_CA/Luigifab_Versioning.csv
@@ -1,21 +1,22 @@
 "Version control","Gestionnaire de version"
+"Perform upgrade","Procéder aux mises à jour"
 "Versioning","Gestionnaire de version"
 "Number of commits per page","Nombre de commits par page"
 "Bug tracker","Gestionnaire de projet"
 "Downtime pages","Pages de maintenance"
-"Warning! Here, [store view] = [lang].<br />The <em>maintenace.flag</em> page takes priority over the <em>upgrade.flag</em> page.","Attention ! Ici, [vue magasin] = [langue].<br />La page <em>maintenace.flag</em> à priorité sur la page <em>upgrade.flag</em>."
-"Error 503 (maintenance.flag)","Erreur 503 (maintenance.flag)"
+"Warning! Here, [store view] = [lang].<br />The <em>maintenace.flag</em> page takes priority over the <em>upgrade.flag</em> page.","Attention ! Ici, [vue magasin] = [langue].<br />La page <em lang=""en"">maintenace.flag</em> à priorité sur la page <em lang=""en"">upgrade.flag</em>."
+"Error 503 (maintenance.flag)","Erreur 503 (<span lang=""en"">maintenance.flag</span>)"
 "Page title","Titre de la page"
+"Main title","Titre principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenu texte ou <abbr title=""Langage de balisage hypertexte (HyperText Markup Language)"">HTML</abbr>"
-"Use %date[format]% to display start date.<br />Use format of <a href=""http://us.php.net/strftime"" onclick=""window.open(this.href); return false;"">strftime</a> function.","Utiliser %date[format]% pour afficher la date de début.<br />Utiliser le format de la fonction <a href=""http://fr.php.net/strftime"" onclick=""window.open(this.href); return false;"">strftime</a>."
+"Use <b>%date[format]%</b> to display start date.<br />Use format of <a href=""http://us.php.net/strftime"" onclick=""window.open(this.href); return false;"">strftime</a> function.","Utiliser <b>%date[format]%</b> pour afficher la date de début.<br />Utiliser le format de la fonction <a href=""http://fr.php.net/strftime"" onclick=""window.open(this.href); return false;"" lang=""en"">strftime</a>."
 "Auto reload text and delay","Texte avec délai du rechargement automatique"
-"Use [10] for 10 seconds and delay.","Utiliser [10] pour 10 secondes de délai."
+"Use <b>[10]</b> for 10 seconds and delay.","Utiliser <b>[10]</b> pour 10 secondes de délai."
 "Disable page from these IP addresses","Désactiver la page à partir des adresses IP suivantes"
-"Addresses separated by space.","Adresses séparées par un espace."
-"Upgrade (upgrade.flag)","Mise à jour (upgrade.flag)"
+"Separate addresses by space.","Séparer les adresses par un espace."
+"Upgrade (upgrade.flag)","Mise à jour (<span lang=""en"">upgrade.flag</span>)"
 "Error report","Rapport d'erreur"
 "Send report by email to","Envoyer le rapport par email à"
-"Emails separated by space.","Adresses séparées par un espace."
 "System error 404","Erreur 404 système"
 "Versioning / Tools / Magento Admin","Gestionnaire de version / Outils / Admin Magento"
 "Preview in %s","Aperçu en %s"
@@ -63,6 +64,7 @@
 "Upgrade to revision %s completed.","Mise à jour vers la révision %s terminée."
 "Upgrade error (revision %s)","Échec de mise à jour (révision %s)"
 "Please wait, an upgrade is already underway.","Veuillez patienter, une mise à jour est en cours."
+"You are not authorized to perform this operation.","Vous n'êtes pas autorisé(e) à effectuer cette opération."
 "Please configure the module before use it.","Veuillez configurer le module avant de l'utiliser."
 "Upgrading","Mise à jour"
 "Starting upgrade (revision %s)","Démarrage de la mise à jour (révision %s)"
diff --git a/app/locale/fr_FR/Luigifab_Versioning.csv b/app/locale/fr_FR/Luigifab_Versioning.csv
index 6873e31..3c03cfc 100644
--- a/app/locale/fr_FR/Luigifab_Versioning.csv
+++ b/app/locale/fr_FR/Luigifab_Versioning.csv
@@ -1,21 +1,22 @@
 "Version control","Gestionnaire de version"
+"Perform upgrade","Procéder aux mises à jour"
 "Versioning","Gestionnaire de version"
 "Number of commits per page","Nombre de commits par page"
 "Bug tracker","Gestionnaire de projet"
 "Downtime pages","Pages de maintenance"
-"Warning! Here, [store view] = [lang].<br />The <em>maintenace.flag</em> page takes priority over the <em>upgrade.flag</em> page.","Attention ! Ici, [vue magasin] = [langue].<br />La page <em>maintenace.flag</em> à priorité sur la page <em>upgrade.flag</em>."
-"Error 503 (maintenance.flag)","Erreur 503 (maintenance.flag)"
+"Warning! Here, [store view] = [lang].<br />The <em>maintenace.flag</em> page takes priority over the <em>upgrade.flag</em> page.","Attention ! Ici, [vue magasin] = [langue].<br />La page <em lang=""en"">maintenace.flag</em> à priorité sur la page <em lang=""en"">upgrade.flag</em>."
+"Error 503 (maintenance.flag)","Erreur 503 (<span lang=""en"">maintenance.flag</span>)"
 "Page title","Titre de la page"
+"Main title","Titre principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenu texte ou <abbr title=""Langage de balisage hypertexte (HyperText Markup Language)"">HTML</abbr>"
-"Use %date[format]% to display start date.<br />Use format of <a href=""http://us.php.net/strftime"" onclick=""window.open(this.href); return false;"">strftime</a> function.","Utiliser %date[format]% pour afficher la date de début.<br />Utiliser le format de la fonction <a href=""http://fr.php.net/strftime"" onclick=""window.open(this.href); return false;"">strftime</a>."
+"Use <b>%date[format]%</b> to display start date.<br />Use format of <a href=""http://us.php.net/strftime"" onclick=""window.open(this.href); return false;"">strftime</a> function.","Utiliser <b>%date[format]%</b> pour afficher la date de début.<br />Utiliser le format de la fonction <a href=""http://fr.php.net/strftime"" onclick=""window.open(this.href); return false;"" lang=""en"">strftime</a>."
 "Auto reload text and delay","Texte avec délai du rechargement automatique"
-"Use [10] for 10 seconds and delay.","Utiliser [10] pour 10 secondes de délai."
+"Use <b>[10]</b> for 10 seconds and delay.","Utiliser <b>[10]</b> pour 10 secondes de délai."
 "Disable page from these IP addresses","Désactiver la page à partir des adresses IP suivantes"
-"Addresses separated by space.","Adresses séparées par un espace."
-"Upgrade (upgrade.flag)","Mise à jour (upgrade.flag)"
+"Separate addresses by space.","Séparer les adresses par un espace."
+"Upgrade (upgrade.flag)","Mise à jour (<span lang=""en"">upgrade.flag</span>)"
 "Error report","Rapport d'erreur"
 "Send report by email to","Envoyer le rapport par email à"
-"Emails separated by space.","Adresses séparées par un espace."
 "System error 404","Erreur 404 système"
 "Versioning / Tools / Magento Admin","Gestionnaire de version / Outils / Admin Magento"
 "Preview in %s","Aperçu en %s"
@@ -63,6 +64,7 @@
 "Upgrade to revision %s completed.","Mise à jour vers la révision %s terminée."
 "Upgrade error (revision %s)","Échec de mise à jour (révision %s)"
 "Please wait, an upgrade is already underway.","Veuillez patienter, une mise à jour est en cours."
+"You are not authorized to perform this operation.","Vous n'êtes pas autorisé(e) à effectuer cette opération."
 "Please configure the module before use it.","Veuillez configurer le module avant de l'utiliser."
 "Upgrading","Mise à jour"
 "Starting upgrade (revision %s)","Démarrage de la mise à jour (révision %s)"
diff --git a/errors/processor.php b/errors/processor.php
index 21b05cd..92b0fb9 100644
--- a/errors/processor.php
+++ b/errors/processor.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created J/12/08/2010
- * Updated V/03/04/2015
+ * Updated L/07/09/2015
  * Version 18
  *
  * Copyright 2011-2015 | Fabrice Creuzot (luigifab) <code~luigifab~info>
@@ -103,7 +103,7 @@ public function init($type) {
 
 
 	// #### Contenu de la page ############################################## i18n ## public ### //
-	// = révision : 15
+	// = révision : 16
 	// » Renvoi le contenu de la page (éventuellement en utilisant des expressions régulières)
 	// » En fonction de la configuration, en fonction du contexte
 	public function getPageTitle() {
@@ -131,6 +131,8 @@ public function getHtmlContent() {
 			$text = preg_replace_callback('#%date\[([^\]]+)\]%#', array($this, 'searchReplaceUpgrade'), $text);
 		else if (($this->getData('type') === 'error503') && is_file(ROOT.'/maintenance.flag'))
 			$text = preg_replace_callback('#%date\[([^\]]+)\]%#', array($this, 'searchReplaceMaintenance'), $text);
+		else if (($this->getData('type') === 'upgrade') || ($this->getData('type') === 'error503'))
+			$text = preg_replace_callback('#%date\[([^\]]+)\]%#', array($this, 'searchReplaceDemo'), $text);
 
 		return $text;
 	}
@@ -145,6 +147,9 @@ public function searchReplaceMaintenance($matches) {
 		return strftime($matches[1], $time);
 	}
 
+	public function searchReplaceDemo($matches) {
+		return strftime($matches[1]);
+	}
 
 	// #### Génération des adresses ################################################# public ### //
 	// = révision : 5
diff --git a/package.xml b/package.xml
index e549d1c..52c634d 100644
--- a/package.xml
+++ b/package.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0"?>
 <package>
     <name>Luigifab_Versioning</name>
-    <version>3.0.3</version>
+    <version>3.1.0</version>
     <stability>stable</stability>
     <license uri="http://www.opensource.org/licenses/GPL-2.0">GPL</license>
     <channel>luigifab</channel>
     <extends/>
-    <summary>Synchronize your Magento installation with your version control system.&#xD;
-</summary>
+    <summary>Synchronize your Magento installation with your version control system.</summary>
     <description>Synchronize your Magento installation with your version control system.</description>
     <notes>Oh yeah!</notes>
     <authors><author><name>Fabrice Creuzot</name><user>luigifab</user><email>code@luigifab.info</email></author></authors>
-    <date>2015-05-14</date>
-    <time>17:09:34</time>
-    <contents><target name="magecommunity"><dir name="Luigifab"><dir name="Versioning"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><file name="Heading.php" hash="a8da970abc3c5c14ee70a05bbacb2517"/><file name="Help.php" hash="74ed447cf4cbc64bbcbe0c3b77488989"/></dir><dir name="History"><file name="Grid.php" hash="abcc287eac8086838fd106369f6cc982"/></dir><file name="History.php" hash="a5098b339b39bf8694653bafc0788a6c"/><dir name="Repository"><file name="Grid.php" hash="8da1b3d6a6179deb058d123690322e9a"/></dir><file name="Repository.php" hash="f0e55fc75b3608f4b6f2af026e2c4513"/><file name="Status.php" hash="eafd274016b50a4e4a4058638b95123f"/></dir></dir><dir name="Helper"><file name="Data.php" hash="4d470f53cbf7ce9e53f8be5b64f181ca"/></dir><dir name="Model"><file name="Demo.php" hash="ee6be4071cd5ab0f38d09c73b903be52"/><file name="History.php" hash="42372e9a3f6e8eecbd6d5e1f12436559"/><file name="Observer.php" hash="2bae0af15e851581fbf2f93807388576"/><dir name="Scm"><file name="Git.php" hash="82c16ced8718c26d071738be8257da46"/></dir><dir name="Source"><file name="Number.php" hash="62a8b2485cc3f365e73d9e4408a94c55"/><file name="Type.php" hash="a553671fa6a11865ea62411419ec7702"/></dir><file name="Upgrade.php" hash="081e98aea1f30a1e5221d50fc86e2706"/></dir><dir name="controllers"><dir name="Versioning"><file name="RepositoryController.php" hash="9cdc832e4bbf07977976a27539b1e765"/></dir></dir><file name="copyright" hash="04ffea317d8dc36731be55df7037d041"/><dir name="etc"><file name="adminhtml.xml" hash="b4e8eae23253547f45f557ee15959bdb"/><file name="config.xml" hash="c716bad8d30f151d409abff4bb7574e5"/><file name="system.xml" hash="fbfce8843fcbc2219254aeeb0544de2a"/></dir><file name="license" hash="09c79391f5ec909e9bd0ad62c151b6d5"/><file name="readme" hash="bcda938bdd3e3cf444681d4862cea19b"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="luigifab"><file name="versioning.xml" hash="130c47ac39179dfca4851493f48e6392"/></dir></dir><dir name="template"><dir name="luigifab"><dir name="versioning"><file name="confirm.phtml" hash="d2514905efbc2f80c9c772a4dc8c0326"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="luigifab"><dir name="versioning"><file name="bzr.png" hash="21ad649857791fdb29bc195cea17862a"/><file name="darcs.png" hash="9bc3107a5648f318fde8a13230206c37"/><file name="git.png" hash="59f1ea6a722b1d6389de81cdca40b2ab"/><file name="hg.png" hash="4166da56378e51b3f100fbe15b4f3af2"/><file name="info.svg" hash="c09f8ff0f2e7d82c9add9da62f77f0c2"/><file name="mars-sunset.jpg" hash="bbc16598c54e35d810535233368e0a7c"/><file name="svn.png" hash="9cd58e8afade30c1c2e85a3ac66c05f9"/></dir></dir></dir><dir name="css"><dir name="luigifab"><dir name="versioning"><file name="styles.css" hash="852f87ecb7e9e2a26e3470baca34a255"/><file name="styles.min.css" hash="5d2703f5d71bab088c981e4007f3179b"/></dir></dir></dir><dir name="js"><dir name="luigifab"><dir name="versioning"><file name="app.js" hash="6b04f9b0881bd0cc9cc31c71f623be96"/><file name="app.min.js" hash="13505b6a4edb981f1b49f3de5d50875d"/><file name="innersvg.min.js" hash="943667b7875a86dbef0620c10ea079d1"/><file name="raphael.min.js" hash="597ebddec8c6b0485b64083e11c19090"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Luigifab_Versioning.xml" hash="279f5f8a9e49d7b2a276565fec0a4cae"/></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Luigifab_Versioning.csv" hash="b5243d2bda7cc8907e1bb2adec925353"/></dir><dir name="fr_CA"><file name="Luigifab_Versioning.csv" hash="b5243d2bda7cc8907e1bb2adec925353"/></dir></target><target name="mageweb"><dir name="errors"><file name="404.php" hash="b5ccbb63938c35dc4ab072d09108e740"/><file name="503.php" hash="99c19835d4d26cc7ccef093011f398c6"/><dir name="config"><file name="en.readme.txt" hash="9557bb9c6b4a941d92aaef6d2aa07f16"/><file name="fr.lisezmoi.txt" hash="4ff543b8148df24e004d2be830bb7453"/></dir><dir name="locale"><file name="en_US.csv" hash="5d1aa00abd1056e6f2de02fb86406f26"/><file name="fr_FR.csv" hash="fbf58f88474c88160014533a0bd96daf"/></dir><file name="page.phtml" hash="451337a2e5d6c809738afd09eef58e5e"/><file name="processor.php" hash="63770e49592db0f763a5a29b4cc663ad"/><file name="report.php" hash="26baf56364c08c80bbea030c87b6c92f"/><file name="upgrade.php" hash="163d5840b579513b96413f20d5ce6bfb"/></dir></target></contents>
+    <date>2015-09-12</date>
+    <time>17:05:56</time>
+    <contents><target name="magecommunity"><dir name="Luigifab"><dir name="Versioning"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><file name="Heading.php" hash="2b2731d3849b6e7a2d1374f01e8a7c18"/><file name="Help.php" hash="74ed447cf4cbc64bbcbe0c3b77488989"/></dir><dir name="History"><file name="Grid.php" hash="abcc287eac8086838fd106369f6cc982"/></dir><file name="History.php" hash="a5098b339b39bf8694653bafc0788a6c"/><dir name="Repository"><file name="Grid.php" hash="8da1b3d6a6179deb058d123690322e9a"/></dir><file name="Repository.php" hash="f0e55fc75b3608f4b6f2af026e2c4513"/><file name="Status.php" hash="eafd274016b50a4e4a4058638b95123f"/></dir></dir><dir name="Helper"><file name="Data.php" hash="4d470f53cbf7ce9e53f8be5b64f181ca"/></dir><dir name="Model"><file name="Demo.php" hash="ee6be4071cd5ab0f38d09c73b903be52"/><file name="History.php" hash="42372e9a3f6e8eecbd6d5e1f12436559"/><file name="Observer.php" hash="2bae0af15e851581fbf2f93807388576"/><dir name="Scm"><file name="Git.php" hash="d2ae4fbe03ad35f4aefb807b62643e5d"/></dir><dir name="Source"><file name="Number.php" hash="62a8b2485cc3f365e73d9e4408a94c55"/><file name="Type.php" hash="a553671fa6a11865ea62411419ec7702"/></dir><file name="Upgrade.php" hash="808aafa69a0452ab580d37ed126c4057"/></dir><dir name="controllers"><dir name="Versioning"><file name="RepositoryController.php" hash="9cdc832e4bbf07977976a27539b1e765"/></dir></dir><file name="copyright" hash="04ffea317d8dc36731be55df7037d041"/><dir name="etc"><file name="adminhtml.xml" hash="96e6b245ab784aab26469fc673d0b7fe"/><file name="config.xml" hash="d934f48ca169edf42758ba0333afaefd"/><file name="system.xml" hash="a0cbdf7c1f77449af8431f580dff06ec"/></dir><file name="license" hash="09c79391f5ec909e9bd0ad62c151b6d5"/><file name="readme" hash="34b02412914106543222542652074b9d"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="luigifab"><file name="versioning.xml" hash="130c47ac39179dfca4851493f48e6392"/></dir></dir><dir name="template"><dir name="luigifab"><dir name="versioning"><file name="confirm.phtml" hash="d2514905efbc2f80c9c772a4dc8c0326"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="luigifab"><dir name="versioning"><file name="bzr.png" hash="21ad649857791fdb29bc195cea17862a"/><file name="darcs.png" hash="9bc3107a5648f318fde8a13230206c37"/><file name="git.png" hash="59f1ea6a722b1d6389de81cdca40b2ab"/><file name="hg.png" hash="4166da56378e51b3f100fbe15b4f3af2"/><file name="info.svg" hash="c09f8ff0f2e7d82c9add9da62f77f0c2"/><file name="mars-sunset.jpg" hash="bbc16598c54e35d810535233368e0a7c"/><file name="svn.png" hash="9cd58e8afade30c1c2e85a3ac66c05f9"/></dir></dir></dir><dir name="css"><dir name="luigifab"><dir name="versioning"><file name="styles.css" hash="d2b1fd04847f2361176f97840904d0a7"/><file name="styles.min.css" hash="528c6a138d53854b6ef48cc3f6931245"/></dir></dir></dir><dir name="js"><dir name="luigifab"><dir name="versioning"><file name="app.js" hash="6b04f9b0881bd0cc9cc31c71f623be96"/><file name="app.min.js" hash="13505b6a4edb981f1b49f3de5d50875d"/><file name="innersvg.min.js" hash="943667b7875a86dbef0620c10ea079d1"/><file name="raphael.min.js" hash="597ebddec8c6b0485b64083e11c19090"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Luigifab_Versioning.xml" hash="279f5f8a9e49d7b2a276565fec0a4cae"/></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Luigifab_Versioning.csv" hash="b1d118f0fa354ef79862dbab366d0901"/></dir><dir name="fr_CA"><file name="Luigifab_Versioning.csv" hash="b1d118f0fa354ef79862dbab366d0901"/></dir></target><target name="mageweb"><dir name="errors"><file name="404.php" hash="b5ccbb63938c35dc4ab072d09108e740"/><file name="503.php" hash="99c19835d4d26cc7ccef093011f398c6"/><dir name="config"><file name="en.readme.txt" hash="9557bb9c6b4a941d92aaef6d2aa07f16"/><file name="fr.lisezmoi.txt" hash="4ff543b8148df24e004d2be830bb7453"/></dir><dir name="locale"><file name="en_US.csv" hash="5d1aa00abd1056e6f2de02fb86406f26"/><file name="fr_FR.csv" hash="fbf58f88474c88160014533a0bd96daf"/></dir><file name="page.phtml" hash="451337a2e5d6c809738afd09eef58e5e"/><file name="processor.php" hash="c4d06010fb301357c10608215e3203ac"/><file name="report.php" hash="26baf56364c08c80bbea030c87b6c92f"/><file name="upgrade.php" hash="163d5840b579513b96413f20d5ce6bfb"/></dir></target></contents>
     <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.9.9</max></php></required></dependencies>
+    <dependencies><required><php><min>5.2.0</min><max>7.9.9</max></php></required></dependencies>
 </package>
diff --git a/skin/adminhtml/default/default/css/luigifab/versioning/styles.css b/skin/adminhtml/default/default/css/luigifab/versioning/styles.css
index fceb416..39da5f4 100644
--- a/skin/adminhtml/default/default/css/luigifab/versioning/styles.css
+++ b/skin/adminhtml/default/default/css/luigifab/versioning/styles.css
@@ -1,6 +1,6 @@
 /**
  * Copyright 2011-2015 | Fabrice Creuzot (luigifab) <code~luigifab~info>
- * Created J/22/12/2011, updated J/14/05/2015, version 54
+ * Created J/22/12/2011, updated M/01/09/2015, version 56
  * https://redmine.luigifab.info/projects/magento/wiki/versioning
  *
  * This program is free software, you can redistribute it or modify
@@ -52,6 +52,7 @@ body.adminhtml-versioning-repository-history #loading_mask_loader { margin-left:
 #config_edit_form[action*="system_config/save/section/versioning"] p.note { padding-top:3px; line-height:135%; }
 #config_edit_form[action*="system_config/save/section/versioning"] [id*="downtime"] tr td.value input { width:400px; }
 #config_edit_form[action*="system_config/save/section/versioning"] [id*="downtime"] tr td.value textarea { width:400px; height:10em; }
+#config_edit_form[action*="system_config/save/section/versioning"] [id*="downtime"] tr td.value p.note { width:400px; }
 
 /* &&&&&&&&&&&&& versioning/repository/history,status &&& */
 body.adminhtml-versioning-repository-status pre ins { display:inline-block; width:100%; text-decoration:none; background-color:#CFC; }
@@ -111,7 +112,7 @@ body.adminhtml-versioning-repository-index #apijsDialog {
 }
 
 #apijsBox.versioning { background-color:rgba(255,255,255, 0.6); opacity:1; box-shadow:none; -moz-box-shadow:none; -webkit-box-shadow:none; }
-#apijsBox.versioning h1 { padding-left:23px; min-height:1.2em; font-size:1.2em; line-height:1.2em; color:#EB5E00; }
+#apijsBox.versioning h1 { padding-left:23px; height:1.2em; min-height:1.2em; font-size:1.2em; line-height:1.2em; color:#EB5E00; }
 #apijsBox.versioning.bzr h1 { background:url("../../../images/luigifab/versioning/bzr.png") no-repeat left center; }
 #apijsBox.versioning.git h1 { background:url("../../../images/luigifab/versioning/git.png") no-repeat left center; }
 #apijsBox.versioning.svn h1 { background:url("../../../images/luigifab/versioning/svn.png") no-repeat left center; }
diff --git a/skin/adminhtml/default/default/css/luigifab/versioning/styles.min.css b/skin/adminhtml/default/default/css/luigifab/versioning/styles.min.css
index 7b4c483..9130f38 100644
--- a/skin/adminhtml/default/default/css/luigifab/versioning/styles.min.css
+++ b/skin/adminhtml/default/default/css/luigifab/versioning/styles.min.css
@@ -1,7 +1,7 @@
 @charset "utf-8";
 /**
  * Copyright 2011-2015 | Fabrice Creuzot (luigifab) <code~luigifab~info>
- * Created J/22/12/2011,updated J/14/05/2015,version 54
+ * Created J/22/12/2011,updated M/01/09/2015,version 56
  * https://redmine.luigifab.info/projects/magento/wiki/versioning
  *
  * This program is free software,you can redistribute it or modify
@@ -22,6 +22,7 @@ body.adminhtml-versioning-repository-history #loading_mask_loader{margin-left:-1
 #config_edit_form[action*="system_config/save/section/versioning"] p.note{padding-top:3px;line-height:135%;}
 #config_edit_form[action*="system_config/save/section/versioning"] [id*="downtime"] tr td.value input{width:400px;}
 #config_edit_form[action*="system_config/save/section/versioning"] [id*="downtime"] tr td.value textarea{width:400px;height:10em;}
+#config_edit_form[action*="system_config/save/section/versioning"] [id*="downtime"] tr td.value p.note{width:400px;}
 body.adminhtml-versioning-repository-status pre ins{display:inline-block;width:100%;text-decoration:none;background-color:#CFC;}
 body.adminhtml-versioning-repository-status pre del{display:inline-block;width:100%;text-decoration:none;background-color:#FCC;}
 body.adminhtml-versioning-repository-status pre strong{display:inline-block;width:100%;}
@@ -50,7 +51,7 @@ body.adminhtml-versioning-repository-index div.grid div.hor-scroll svg{position:
 body.adminhtml-versioning-repository-index p.credits{position:absolute;bottom:1.2em;left:1em;color:#CCC;}
 body.adminhtml-versioning-repository-index #apijsDialog{background-color:#111;background-size:100% 100%;background-image:url("../../../images/luigifab/versioning/mars-sunset.jpg");}
 #apijsBox.versioning{background-color:rgba(255,255,255,.6);opacity:1;box-shadow:none;-moz-box-shadow:none;-webkit-box-shadow:none;}
-#apijsBox.versioning h1{padding-left:23px;min-height:1.2em;font-size:1.2em;line-height:1.2em;color:#EB5E00;}
+#apijsBox.versioning h1{padding-left:23px;height:1.2em;min-height:1.2em;font-size:1.2em;line-height:1.2em;color:#EB5E00;}
 #apijsBox.versioning.bzr h1{background:url("../../../images/luigifab/versioning/bzr.png") no-repeat left center;}
 #apijsBox.versioning.git h1{background:url("../../../images/luigifab/versioning/git.png") no-repeat left center;}
 #apijsBox.versioning.svn h1{background:url("../../../images/luigifab/versioning/svn.png") no-repeat left center;}