Version 3.7.0

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.6.4 released on 07/07/2018.
+Version 3.7.0 released on 08/08/2018.

app/code/community/Luigifab/Versioning/Block/Adminhtml/Config/Help.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Created V/23/05/2014
- * Updated M/22/05/2018
+ * Updated J/26/07/2018
  *
  * Copyright 2011-2018 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://www.luigifab.info/magento/versioning
@@ -20,7 +20,30 @@
 class Luigifab_Versioning_Block_Adminhtml_Config_Help extends Mage_Adminhtml_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface {
 
 	public function render(Varien_Data_Form_Element_Abstract $element) {
-		return sprintf('<p class="box">Luigifab/Versioning %s <a href="https://www.%s" style="float:right;">%2$s</a></p>',
-			$this->helper('versioning')->getVersion(), 'luigifab.info/magento/versioning');
+
+		if (($msg = $this->checkChanges()) === true) {
+			return sprintf('<p class="box">Luigifab/Versioning %s <a href="https://www.%s" style="float:right;">%2$s</a></p>',
+				$this->helper('versioning')->getVersion(), 'luigifab.info/magento/versioning');
+		}
+		else {
+			return sprintf('<p class="box">Luigifab/Versioning %s <a href="https://www.%s" style="float:right;">%2$s</a></p>'.
+				'<p class="box" style="margin-top:-5px; color:white; background-color:#E60000;"><strong>%s</strong><br />%s</p>',
+				$this->helper('versioning')->getVersion(), 'luigifab.info/magento/versioning',
+				$this->__('INCOMPLETE MODULE INSTALLATION'),
+				$this->__('Changes in <em>%s</em> are not present. Please read the documentation.', $msg));
+		}
+	}
+
+	private function checkChanges() {
+
+		$index = file_get_contents(BP.'/index.php');
+		if (strpos($index, 'trim(array_pop($ip))') === false)
+			return 'index.php';
+		if (strpos($index, 'trim(getenv(\'REMOTE_ADDR\'))') === false)
+			return 'index.php';
+		if (strpos($index, 'config/upgrade.ip') === false)
+			return 'index.php';
+
+		return true;
 	}
 }

app/code/community/Luigifab/Versioning/Helper/Data.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Created S/03/12/2011
- * Updated J/21/06/2018
+ * Updated L/16/07/2018
  *
  * Copyright 2011-2018 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://www.luigifab.info/magento/versioning
@@ -128,8 +128,8 @@ public function getMaintenanceFlag() {
 	public function getIpAddr() {
 
 		$ip = (!empty(getenv('HTTP_X_FORWARDED_FOR'))) ? explode(',', getenv('HTTP_X_FORWARDED_FOR')) : false;
-		$ip = (!empty($ip)) ? array_pop($ip) : getenv('REMOTE_ADDR');
-		$ip = trim((preg_match('#^::ffff:[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$#', $ip) === 1) ? substr($ip, 7) : $ip);
+		$ip = (!empty($ip)) ? trim(array_pop($ip)) : trim(getenv('REMOTE_ADDR'));
+		$ip = (preg_match('#^::ffff:[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$#', $ip) === 1) ? substr($ip, 7) : $ip;
 
 		return $ip;
 	}

app/code/community/Luigifab/Versioning/Model/Observer.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Created J/31/05/2012
- * Updated J/21/06/2018
+ * Updated S/21/07/2018
  *
  * Copyright 2011-2018 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://www.luigifab.info/magento/versioning
@@ -147,7 +147,7 @@ private function updateIpConfig($global) {
 				continue;
 
 			if (strpos($key, '_byip') !== false) {
-				$value = preg_split('#\s#', $value);
+				$value = array_filter(preg_split('#\s+#', $value));
 				$config[substr($key, 0, strrpos($key, '_'))][] = '-'.implode("-\n-", $value).'-';
 			}
 		}

app/code/community/Luigifab/Versioning/Model/Scm/Git.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Created S/03/12/2011
- * Updated M/29/05/2018
+ * Updated D/22/07/2018
  *
  * Copyright 2011-2018 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://www.luigifab.info/magento/versioning
@@ -276,27 +276,25 @@ public function getCurrentStatus() {
 	// n'utilise pas GIT_SSH étant donnée que tout est disponible sur le dépôt local
 	public function upgradeToRevision($obj, $log, $revision) {
 
+		$revision = escapeshellarg($revision);
+
 		if (is_dir('../.git/')) {
-			exec('
-				export LANG='.Mage::getSingleton('core/translate')->getLocale().'.utf8;
+			exec('export LANG='.Mage::getSingleton('core/translate')->getLocale().'.utf8;
 				echo "<span>git fetch</span>" >> '.$log.';
 				git fetch;
 				echo "<span>git clean -f -d</span>" >> '.$log.';
 				git clean -f -d .. >> '.$log.' 2>&1;
 				echo "<span>git reset --hard '.$revision.'</span>" >> '.$log.';
-				git reset --hard '.escapeshellarg($revision).' >> '.$log.' 2>&1;
-			', $data, $val);
+				git reset --hard '.$revision.' >> '.$log.' 2>&1;', $data, $val);
 		}
 		else {
-			exec('
-				export LANG='.Mage::getSingleton('core/translate')->getLocale().'.utf8;
+			exec('export LANG='.Mage::getSingleton('core/translate')->getLocale().'.utf8;
 				echo "<span>git fetch</span>" >> '.$log.';
 				git fetch;
 				echo "<span>git clean -f -d</span>" >> '.$log.';
 				git clean -f -d >> '.$log.' 2>&1;
 				echo "<span>git reset --hard '.$revision.'</span>" >> '.$log.';
-				git reset --hard '.escapeshellarg($revision).' >> '.$log.' 2>&1;
-			', $data, $val);
+				git reset --hard '.$revision.' >> '.$log.' 2>&1;', $data, $val);
 		}
 
 		$data  = trim(file_get_contents($log));

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 D/20/05/2018
+ * Updated J/02/08/2018
  *
  * Copyright 2011-2018 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://www.luigifab.info/magento/versioning
@@ -20,7 +20,7 @@
 <config>
 	<modules>
 		<Luigifab_Versioning>
-			<version>3.6.4</version>
+			<version>3.7.0</version>
 		</Luigifab_Versioning>
 	</modules>
 	<global>

app/code/community/Luigifab/Versioning/etc/system.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  * Created S/03/12/2011
- * Updated V/23/02/2018
+ * Updated S/07/07/2018
  *
  * Copyright 2011-2018 | Fabrice Creuzot (luigifab) <code~luigifab~info>
  * https://www.luigifab.info/magento/versioning
@@ -150,7 +150,7 @@
 						</error503_content>
 						<error503_autoreload translate="label comment">
 							<label>Text with automatic reload period</label>
-							<comment><![CDATA[Use <strong>[10]</strong> for a 10-seconds delay.]]></comment>
+							<comment>Use [10] for a 10-seconds delay.</comment>
 							<frontend_type>text</frontend_type>
 							<frontend_model>versioning/adminhtml_config_fields</frontend_model>
 							<source_model>adminhtml/system_config_source_yesno</source_model>
@@ -214,7 +214,7 @@
 						</upgrade_content>
 						<upgrade_autoreload translate="label comment">
 							<label>Text with automatic reload period</label>
-							<comment><![CDATA[Use <strong>[10]</strong> for a 10-seconds delay.]]></comment>
+							<comment>Use [10] for a 10-seconds delay.</comment>
 							<frontend_type>text</frontend_type>
 							<frontend_model>versioning/adminhtml_config_fields</frontend_model>
 							<source_model>adminhtml/system_config_source_yesno</source_model>

app/locale/de_AT/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Haupttitel"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Textinhalt oder <abbr title=""Hypertext-Auszeichnungssprache (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Text mit automatischer Ladungsfrist"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Für einen 10-Sekunden-Frist <strong>[10]</strong> benutzen."
+"Use [10] for a 10-seconds delay.","Für einen 10-Sekunden-Frist [10] benutzen."
 "Disable the page from these IP addresses","Ab den folgenden IP-Adressen Seite deaktivieren"
 "Separate addresses by a space.","E-Mail-Adressen durch einen Abstand trennen."
 "Your IP address","Ihre IP-Adresse"

app/locale/de_CH/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Haupttitel"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Textinhalt oder <abbr title=""Hypertext-Auszeichnungssprache (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Text mit automatischer Ladungsfrist"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Für einen 10-Sekunden-Frist <strong>[10]</strong> benutzen."
+"Use [10] for a 10-seconds delay.","Für einen 10-Sekunden-Frist [10] benutzen."
 "Disable the page from these IP addresses","Ab den folgenden IP-Adressen Seite deaktivieren"
 "Separate addresses by a space.","E-Mail-Adressen durch einen Abstand trennen."
 "Your IP address","Ihre IP-Adresse"

app/locale/de_DE/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Haupttitel"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Textinhalt oder <abbr title=""Hypertext-Auszeichnungssprache (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Text mit automatischer Ladungsfrist"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Für einen 10-Sekunden-Frist <strong>[10]</strong> benutzen."
+"Use [10] for a 10-seconds delay.","Für einen 10-Sekunden-Frist [10] benutzen."
 "Disable the page from these IP addresses","Ab den folgenden IP-Adressen Seite deaktivieren"
 "Separate addresses by a space.","E-Mail-Adressen durch einen Abstand trennen."
 "Your IP address","Ihre IP-Adresse"

app/locale/es_AR/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Título principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenido texto o <abbr title=""Lenguaje de marcas de hipertexto (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Texto con periodo de recarga automática"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizar <strong>[10]</strong> por 10 segundos de espera."
+"Use [10] for a 10-seconds delay.","Utilizar [10] por 10 segundos de espera."
 "Disable the page from these IP addresses","Desactivar la página a partir de las siguientes direcciones IP"
 "Separate addresses by a space.","Separar las direcciones por un espacio."
 "Your IP address","Su dirección IP"

app/locale/es_CL/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Título principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenido texto o <abbr title=""Lenguaje de marcas de hipertexto (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Texto con periodo de recarga automática"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizar <strong>[10]</strong> por 10 segundos de espera."
+"Use [10] for a 10-seconds delay.","Utilizar [10] por 10 segundos de espera."
 "Disable the page from these IP addresses","Desactivar la página a partir de las siguientes direcciones IP"
 "Separate addresses by a space.","Separar las direcciones por un espacio."
 "Your IP address","Su dirección IP"

app/locale/es_CO/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Título principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenido texto o <abbr title=""Lenguaje de marcas de hipertexto (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Texto con periodo de recarga automática"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizar <strong>[10]</strong> por 10 segundos de espera."
+"Use [10] for a 10-seconds delay.","Utilizar [10] por 10 segundos de espera."
 "Disable the page from these IP addresses","Desactivar la página a partir de las siguientes direcciones IP"
 "Separate addresses by a space.","Separar las direcciones por un espacio."
 "Your IP address","Su dirección IP"

app/locale/es_CR/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Título principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenido texto o <abbr title=""Lenguaje de marcas de hipertexto (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Texto con periodo de recarga automática"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizar <strong>[10]</strong> por 10 segundos de espera."
+"Use [10] for a 10-seconds delay.","Utilizar [10] por 10 segundos de espera."
 "Disable the page from these IP addresses","Desactivar la página a partir de las siguientes direcciones IP"
 "Separate addresses by a space.","Separar las direcciones por un espacio."
 "Your IP address","Su dirección IP"

app/locale/es_ES/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Título principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenido texto o <abbr title=""Lenguaje de marcas de hipertexto (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Texto con periodo de recarga automática"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizar <strong>[10]</strong> por 10 segundos de espera."
+"Use [10] for a 10-seconds delay.","Utilizar [10] por 10 segundos de espera."
 "Disable the page from these IP addresses","Desactivar la página a partir de las siguientes direcciones IP"
 "Separate addresses by a space.","Separar las direcciones por un espacio."
 "Your IP address","Su dirección IP"

app/locale/es_MX/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Título principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenido texto o <abbr title=""Lenguaje de marcas de hipertexto (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Texto con periodo de recarga automática"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizar <strong>[10]</strong> por 10 segundos de espera."
+"Use [10] for a 10-seconds delay.","Utilizar [10] por 10 segundos de espera."
 "Disable the page from these IP addresses","Desactivar la página a partir de las siguientes direcciones IP"
 "Separate addresses by a space.","Separar las direcciones por un espacio."
 "Your IP address","Su dirección IP"

app/locale/es_PA/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Título principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenido texto o <abbr title=""Lenguaje de marcas de hipertexto (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Texto con periodo de recarga automática"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizar <strong>[10]</strong> por 10 segundos de espera."
+"Use [10] for a 10-seconds delay.","Utilizar [10] por 10 segundos de espera."
 "Disable the page from these IP addresses","Desactivar la página a partir de las siguientes direcciones IP"
 "Separate addresses by a space.","Separar las direcciones por un espacio."
 "Your IP address","Su dirección IP"

app/locale/es_PE/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Título principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenido texto o <abbr title=""Lenguaje de marcas de hipertexto (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Texto con periodo de recarga automática"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizar <strong>[10]</strong> por 10 segundos de espera."
+"Use [10] for a 10-seconds delay.","Utilizar [10] por 10 segundos de espera."
 "Disable the page from these IP addresses","Desactivar la página a partir de las siguientes direcciones IP"
 "Separate addresses by a space.","Separar las direcciones por un espacio."
 "Your IP address","Su dirección IP"

app/locale/es_VE/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Título principal"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenido texto o <abbr title=""Lenguaje de marcas de hipertexto (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Texto con periodo de recarga automática"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizar <strong>[10]</strong> por 10 segundos de espera."
+"Use [10] for a 10-seconds delay.","Utilizar [10] por 10 segundos de espera."
 "Disable the page from these IP addresses","Desactivar la página a partir de las siguientes direcciones IP"
 "Separate addresses by a space.","Separar las direcciones por un espacio."
 "Your IP address","Su dirección IP"

app/locale/fr_CA/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "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>"
 "Text with automatic reload period","Texte avec délai du rechargement automatique"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utiliser <strong>[10]</strong> pour 10 secondes de délai."
+"Use [10] for a 10-seconds delay.","Utiliser [10] pour 10 secondes de délai."
 "Disable the page from these IP addresses","Désactiver la page à partir des adresses IP suivantes"
 "Separate addresses by a space.","Séparer les adresses par un espace."
 "Your IP address","Votre adresse IP"
@@ -22,6 +22,8 @@
 "Version control / Tools / Magento Admin","Gestionnaire de version / Outils / Admin Magento"
 "[SPECIAL]","[SPÉCIAL]"
 "Preview in %s","Aperçu en %s"
+"INCOMPLETE MODULE INSTALLATION","INSTALLATION INCOMPLÈTE DU MODULE"
+"Changes in <em>%s</em> are not present. Please read the documentation.","Les changements dans <em>%s</em> ne sont pas présents. Veuillez lire la documentation."
 "Updates history (<span id=""scmtype"">%s</span>, %s)","Historique des mises à jour (<span id=""scmtype"">%s</span>, %s)"
 "Updates history (<span id=""scmtype"">%s</span>)","Historique des mises à jour (<span id=""scmtype"">%s</span>)"
 "Repository status","État du dépôt"

app/locale/fr_FR/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "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>"
 "Text with automatic reload period","Texte avec délai du rechargement automatique"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utiliser <strong>[10]</strong> pour 10 secondes de délai."
+"Use [10] for a 10-seconds delay.","Utiliser [10] pour 10 secondes de délai."
 "Disable the page from these IP addresses","Désactiver la page à partir des adresses IP suivantes"
 "Separate addresses by a space.","Séparer les adresses par un espace."
 "Your IP address","Votre adresse IP"
@@ -22,6 +22,8 @@
 "Version control / Tools / Magento Admin","Gestionnaire de version / Outils / Admin Magento"
 "[SPECIAL]","[SPÉCIAL]"
 "Preview in %s","Aperçu en %s"
+"INCOMPLETE MODULE INSTALLATION","INSTALLATION INCOMPLÈTE DU MODULE"
+"Changes in <em>%s</em> are not present. Please read the documentation.","Les changements dans <em>%s</em> ne sont pas présents. Veuillez lire la documentation."
 "Updates history (<span id=""scmtype"">%s</span>, %s)","Historique des mises à jour (<span id=""scmtype"">%s</span>, %s)"
 "Updates history (<span id=""scmtype"">%s</span>)","Historique des mises à jour (<span id=""scmtype"">%s</span>)"
 "Repository status","État du dépôt"

app/locale/it_CH/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Titolo principale"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenuto testo o <abbr title=""Linguaggio a marcatori per ipertesti (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Testo con proroga della ricarica automatica"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizzare <strong>[10]</strong> per 10 secondi di proroga."
+"Use [10] for a 10-seconds delay.","Utilizzare [10] per 10 secondi di proroga."
 "Disable the page from these IP addresses","Disabilitare la pagine a partire dai seguenti indirizzi IP"
 "Separate addresses by a space.","Separare gli indirizzi con uno spazio."
 "Your IP address","Il vostro indirizzo IP"

app/locale/it_IT/Luigifab_Versioning.csv

@@ -11,7 +11,7 @@
 "Main title","Titolo principale"
 "Content text or <abbr title=""HyperText Markup Language"">HTML</abbr>","Contenuto testo o <abbr title=""Linguaggio a marcatori per ipertesti (HyperText Markup Language)"">HTML</abbr>"
 "Text with automatic reload period","Testo con proroga della ricarica automatica"
-"Use <strong>[10]</strong> for a 10-seconds delay.","Utilizzare <strong>[10]</strong> per 10 secondi di proroga."
+"Use [10] for a 10-seconds delay.","Utilizzare [10] per 10 secondi di proroga."
 "Disable the page from these IP addresses","Disabilitare la pagine a partire dai seguenti indirizzi IP"
 "Separate addresses by a space.","Separare gli indirizzi con uno spazio."
 "Your IP address","Il vostro indirizzo IP"