[PLUGINS] ~maj redirhttps v0.1.0-->0.1.1

diff --git a/www/plugins/redirhttps.bak/images/redirhttps-128.png b/www/plugins/redirhttps.bak/images/redirhttps-128.png
deleted file mode 100644 (file)
index 34ac983..0000000
Binary files a/www/plugins/redirhttps.bak/images/redirhttps-128.png and /dev/null differ

diff --git a/www/plugins/redirhttps.bak/lang/paquet-redirhttps.xml b/www/plugins/redirhttps.bak/lang/paquet-redirhttps.xml
deleted file mode 100644 (file)
index b2c0649..0000000
--- a/www/plugins/redirhttps.bak/lang/paquet-redirhttps.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<traduction module="paquet-redirhttps" gestionnaire="salvatore" url="http://trad.spip.net" source="svn://zone.spip.org/spip-zone/_plugins_/redirhttps/lang/" reference="fr">
-       <langue code="en" url="http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=en">
-               <traducteur nom="Benitron" lien="http://trad.spip.net/auteur/benitron" />
-       </langue>
-       <langue code="es" />
-       <langue code="fr" />
-       <langue code="sk" url="http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=sk">
-               <traducteur nom="jaro" lien="http://trad.spip.net/auteur/jaro" />
-       </langue>
-</traduction>

diff --git a/www/plugins/redirhttps.bak/lang/paquet-redirhttps_en.php b/www/plugins/redirhttps.bak/lang/paquet-redirhttps_en.php
deleted file mode 100644 (file)
index f599062..0000000
--- a/www/plugins/redirhttps.bak/lang/paquet-redirhttps_en.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// This is a SPIP language file  --  Ceci est un fichier langue de SPIP
-// extrait automatiquement de http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=en
-// ** ne pas modifier le fichier **
-
-if (!defined('_ECRIRE_INC_VERSION')) return;
-
-$GLOBALS[$GLOBALS['idx_lang']] = array(
-
-       // R
-       'redirhttps_description' => 'Redirect to HTTPS when the content requires it (private area, login, public pages with user logged in)',
-       'redirhttps_nom' => 'HTTPS redirections',
-       'redirhttps_slogan' => 'Secure access to certain pages of the site'
-);
-
-?>

diff --git a/www/plugins/redirhttps.bak/lang/paquet-redirhttps_es.php b/www/plugins/redirhttps.bak/lang/paquet-redirhttps_es.php
deleted file mode 100644 (file)
index 27ec800..0000000
--- a/www/plugins/redirhttps.bak/lang/paquet-redirhttps_es.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// This is a SPIP language file  --  Ceci est un fichier langue de SPIP
-// extrait automatiquement de http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=es
-// ** ne pas modifier le fichier **
-
-if (!defined('_ECRIRE_INC_VERSION')) return;
-
-$GLOBALS[$GLOBALS['idx_lang']] = array(
-
-       // R
-       'redirhttps_description' => 'Redirección hacía HTTPS cuando el contendio le necesita (espacio privado, login, páginas públicas con el usuario conectado)',
-       'redirhttps_nom' => 'Redireciones HTTPS',
-       'redirhttps_slogan' => 'Sécuriser l\'accès à certaines pages du site' # NEW
-);
-
-?>

diff --git a/www/plugins/redirhttps.bak/lang/paquet-redirhttps_fr.php b/www/plugins/redirhttps.bak/lang/paquet-redirhttps_fr.php
deleted file mode 100644 (file)
index 95734c6..0000000
--- a/www/plugins/redirhttps.bak/lang/paquet-redirhttps_fr.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// This is a SPIP language file  --  Ceci est un fichier langue de SPIP
-// Fichier source, a modifier dans svn://zone.spip.org/spip-zone/_plugins_/redirhttps/lang/
-if (!defined('_ECRIRE_INC_VERSION')) return;
-
-$GLOBALS[$GLOBALS['idx_lang']] = array(
-
-       // R
-       'redirhttps_description' => 'Redirection vers HTTPS quand le contenu le nécessite (espace privé, login, pages publiques avec utilisateur connecté)',
-       'redirhttps_nom' => 'Redirections HTTPS',
-       'redirhttps_slogan' => 'Sécuriser l\'accès à certaines pages du site'
-);
-
-?>

diff --git a/www/plugins/redirhttps.bak/lang/paquet-redirhttps_sk.php b/www/plugins/redirhttps.bak/lang/paquet-redirhttps_sk.php
deleted file mode 100644 (file)
index 722b7b0..0000000
--- a/www/plugins/redirhttps.bak/lang/paquet-redirhttps_sk.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// This is a SPIP language file  --  Ceci est un fichier langue de SPIP
-// extrait automatiquement de http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=sk
-// ** ne pas modifier le fichier **
-
-if (!defined('_ECRIRE_INC_VERSION')) return;
-
-$GLOBALS[$GLOBALS['idx_lang']] = array(
-
-       // R
-       'redirhttps_description' => 'Presmerovanie na HTTPS, ak si to vyžaduje obsah (súkromná zóna, prihlásenie, používateľ prihlásený cez verejne prístupné stránky)',
-       'redirhttps_nom' => 'Presmerovania HTTPS',
-       'redirhttps_slogan' => 'Zabezpečiť prístup na určité stránky'
-);
-
-?>

diff --git a/www/plugins/redirhttps.bak/lang/redirhttps.xml b/www/plugins/redirhttps.bak/lang/redirhttps.xml
deleted file mode 100644 (file)
index afd3348..0000000
--- a/www/plugins/redirhttps.bak/lang/redirhttps.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<traduction module="redirhttps" gestionnaire="salvatore" url="" source="svn://zone.spip.org/spip-zone/_plugins_/redirhttps/lang/" reference="fr">
-</traduction>

diff --git a/www/plugins/redirhttps.bak/paquet.xml b/www/plugins/redirhttps.bak/paquet.xml
deleted file mode 100644 (file)
index c5301e5..0000000
--- a/www/plugins/redirhttps.bak/paquet.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<paquet
-       prefix="redirhttps"
-       categorie="performance"
-       version="0.1.0"
-       etat="test"
-       compatibilite="[2.1.11;["
-       logo="images/redirhttps-128.png"
-       documentation="http://www.spip-contrib.net/Rediriger-en-HTTPS-quand-l-utilisateur-est-connecte"
->      
-
-       <nom>Redirections HTTPS</nom>
-       <!-- Sécuriser l'accès à certaines pages du site -->
-
-       <auteur>Severo</auteur>
-       <credit lien="http://www.iconfinder.com/icondetails/25388/128/high_security_thick_icon">Oliver Scholtz</credit>
-       <licence lien="http://www.gnu.org/licenses/gpl-3.0.html">GPL 3</licence>
-
-       <traduire gestionnaire="salvatore" module="redirhttps" reference="fr" />
-</paquet>

diff --git a/www/plugins/redirhttps.bak/plugin.xml b/www/plugins/redirhttps.bak/plugin.xml
deleted file mode 100755 (executable)
index d593135..0000000
--- a/www/plugins/redirhttps.bak/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<plugin>\r
-       <nom><multi>[fr]Redirections HTTPS[es]Redireciones HTTPS</multi></nom>\r
-       <auteur>Severo</auteur>\r
-       <licence>GNU/GPL</licence>\r
-       <version>0.1.0</version>\r
-       <etat>test</etat>\r
-       <prefix>redirhttps</prefix>\r
-       <categorie>performance</categorie>\r
-       <slogan>S&#233;curiser l'acc&#232;s &#224; certaines pages du site</slogan>\r
-       <description>\r
-               <multi>\r
-                       [fr]Redirection vers HTTPS quand le contenu le n&#233;cessite (espace priv&#233;, login, pages publiques avec utilisateur connect&#233;)\r
-                       [es]Redirecci&#243;n hac&#237;a HTTPS cuando el contendio le necesita (espacio privado, login, p&#225;ginas p&#250;blicas con el usuario conectado)\r
-               </multi>\r
-       </description>\r
-       <lien>http://www.spip-contrib.net/Rediriger-en-HTTPS-quand-l-utilisateur-est-connecte</lien>\r
-       <icon>images/redirhttps-128.png</icon> <!-- http://www.iconfinder.com/icondetails/25388/128/high_security_thick_icon -->\r
-\r
-       <options>redirhttps_options.php</options>\r
-\r
-       <necessite id="SPIP" version="[2.1.11;3.0.99]" />\r
-</plugin>\r

diff --git a/www/plugins/redirhttps.bak/redirhttps_options.php b/www/plugins/redirhttps.bak/redirhttps_options.php
deleted file mode 100755 (executable)
index 6315b2d..0000000
--- a/www/plugins/redirhttps.bak/redirhttps_options.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// Le traffic HTTP est redirige en HTTPS quand l'utilisateur est connecte ou pour la page de login
-// a noter: il faut avoir applique le patch: http://core.spip.org/projects/spip/repository/revisions/17941
-//    -> dans le core depuis la version 2.1.11
-if (
-        (
-               ($_COOKIE['spip_session']) OR
-               (strpos($_SERVER['REQUEST_URI'], '/spip.php?page=login')===0)
-       ) AND
-        (!$_SERVER['HTTPS']) AND
-        ($_SERVER['REQUEST_METHOD'] == 'GET')
-        ) {
-        include_spip('inc/headers');
-        redirige_par_entete('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-}
-?>

diff --git a/www/plugins/redirhttps.bak/svn.revision b/www/plugins/redirhttps.bak/svn.revision
deleted file mode 100644 (file)
index d1b8b23..0000000
--- a/www/plugins/redirhttps.bak/svn.revision
+++ /dev/null
@@ -1,10 +0,0 @@
-<svn_revision>
-<text_version>
-Origine: file:///home/svn/repository/spip-zone/_plugins_/redirhttps
-Revision: 69253
-Dernier commit: 2013-01-24 03:41:22 +0100 
-</text_version>
-<origine>file:///home/svn/repository/spip-zone/_plugins_/redirhttps</origine>
-<revision>69253</revision>
-<commit>2013-01-24 03:41:22 +0100 </commit>
-</svn_revision>
\ No newline at end of file

diff --git a/www/plugins/redirhttps/images/redirhttps-128.png b/www/plugins/redirhttps/images/redirhttps-128.png
new file mode 100644 (file)
index 0000000..34ac983
Binary files /dev/null and b/www/plugins/redirhttps/images/redirhttps-128.png differ

diff --git a/www/plugins/redirhttps/lang/paquet-redirhttps.xml b/www/plugins/redirhttps/lang/paquet-redirhttps.xml
new file mode 100644 (file)
index 0000000..742f3fc
--- /dev/null
+++ b/www/plugins/redirhttps/lang/paquet-redirhttps.xml
@@ -0,0 +1,13 @@
+<traduction module="paquet-redirhttps" gestionnaire="salvatore" url="http://trad.spip.net" source="svn://zone.spip.org/spip-zone/_plugins_/redirhttps/lang/" reference="fr">
+       <langue code="en" url="http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=en" total="3" traduits="3" relire="0" modifs="0" nouveaux="0" pourcent="100.00">
+               <traducteur nom="Benitron" lien="http://trad.spip.net/auteur/benitron" />
+       </langue>
+       <langue code="es" url="http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=es" total="3" traduits="3" relire="0" modifs="0" nouveaux="0" pourcent="100.00">
+               <traducteur nom="severo" lien="http://trad.spip.net/auteur/severo" />
+       </langue>
+       <langue code="fr" url="http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=fr" total="3" traduits="3" relire="0" modifs="0" nouveaux="0" pourcent="100.00">
+       </langue>
+       <langue code="sk" url="http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=sk" total="3" traduits="3" relire="0" modifs="0" nouveaux="0" pourcent="100.00">
+               <traducteur nom="jaro" lien="http://trad.spip.net/auteur/jaro" />
+       </langue>
+</traduction>

diff --git a/www/plugins/redirhttps/lang/paquet-redirhttps_en.php b/www/plugins/redirhttps/lang/paquet-redirhttps_en.php
new file mode 100644 (file)
index 0000000..2fbf3b0
--- /dev/null
+++ b/www/plugins/redirhttps/lang/paquet-redirhttps_en.php
@@ -0,0 +1,16 @@
+<?php
+// This is a SPIP language file  --  Ceci est un fichier langue de SPIP
+// extrait automatiquement de http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=en
+// ** ne pas modifier le fichier **
+
+if (!defined('_ECRIRE_INC_VERSION')) {
+       return;
+}
+
+$GLOBALS[$GLOBALS['idx_lang']] = array(
+
+       // R
+       'redirhttps_description' => 'Redirect to HTTPS when the content requires it (private area, login, public pages with user logged in)',
+       'redirhttps_nom' => 'HTTPS redirections',
+       'redirhttps_slogan' => 'Secure access to certain pages of the site'
+);

diff --git a/www/plugins/redirhttps/lang/paquet-redirhttps_es.php b/www/plugins/redirhttps/lang/paquet-redirhttps_es.php
new file mode 100644 (file)
index 0000000..081b04c
--- /dev/null
+++ b/www/plugins/redirhttps/lang/paquet-redirhttps_es.php
@@ -0,0 +1,16 @@
+<?php
+// This is a SPIP language file  --  Ceci est un fichier langue de SPIP
+// extrait automatiquement de http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=es
+// ** ne pas modifier le fichier **
+
+if (!defined('_ECRIRE_INC_VERSION')) {
+       return;
+}
+
+$GLOBALS[$GLOBALS['idx_lang']] = array(
+
+       // R
+       'redirhttps_description' => 'Redirección hacía HTTPS cuando el contendio le necesita (espacio privado, login, páginas públicas con el usuario conectado)',
+       'redirhttps_nom' => 'Redireciones HTTPS',
+       'redirhttps_slogan' => 'Asegurar el acceso a ciertas páginas del sitio'
+);

diff --git a/www/plugins/redirhttps/lang/paquet-redirhttps_fr.php b/www/plugins/redirhttps/lang/paquet-redirhttps_fr.php
new file mode 100644 (file)
index 0000000..83600a7
--- /dev/null
+++ b/www/plugins/redirhttps/lang/paquet-redirhttps_fr.php
@@ -0,0 +1,14 @@
+<?php
+// This is a SPIP language file  --  Ceci est un fichier langue de SPIP
+// Fichier source, a modifier dans svn://zone.spip.org/spip-zone/_plugins_/redirhttps/lang/
+if (!defined('_ECRIRE_INC_VERSION')) {
+       return;
+}
+
+$GLOBALS[$GLOBALS['idx_lang']] = array(
+
+       // R
+       'redirhttps_description' => 'Redirection vers HTTPS quand le contenu le nécessite (espace privé, login, pages publiques avec utilisateur connecté)',
+       'redirhttps_nom' => 'Redirections HTTPS',
+       'redirhttps_slogan' => 'Sécuriser l’accès à certaines pages du site'
+);

diff --git a/www/plugins/redirhttps/lang/paquet-redirhttps_sk.php b/www/plugins/redirhttps/lang/paquet-redirhttps_sk.php
new file mode 100644 (file)
index 0000000..ba003ec
--- /dev/null
+++ b/www/plugins/redirhttps/lang/paquet-redirhttps_sk.php
@@ -0,0 +1,16 @@
+<?php
+// This is a SPIP language file  --  Ceci est un fichier langue de SPIP
+// extrait automatiquement de http://trad.spip.net/tradlang_module/paquet-redirhttps?lang_cible=sk
+// ** ne pas modifier le fichier **
+
+if (!defined('_ECRIRE_INC_VERSION')) {
+       return;
+}
+
+$GLOBALS[$GLOBALS['idx_lang']] = array(
+
+       // R
+       'redirhttps_description' => 'Presmerovanie na HTTPS, ak si to vyžaduje obsah (súkromná zóna, prihlásenie, používateľ prihlásený cez verejne prístupné stránky)',
+       'redirhttps_nom' => 'Presmerovania HTTPS',
+       'redirhttps_slogan' => 'Zabezpečiť prístup na určité stránky'
+);

diff --git a/www/plugins/redirhttps/lang/redirhttps.xml b/www/plugins/redirhttps/lang/redirhttps.xml
new file mode 100644 (file)
index 0000000..afd3348
--- /dev/null
+++ b/www/plugins/redirhttps/lang/redirhttps.xml
@@ -0,0 +1,2 @@
+<traduction module="redirhttps" gestionnaire="salvatore" url="" source="svn://zone.spip.org/spip-zone/_plugins_/redirhttps/lang/" reference="fr">
+</traduction>

diff --git a/www/plugins/redirhttps/paquet.xml b/www/plugins/redirhttps/paquet.xml
new file mode 100644 (file)
index 0000000..841c145
--- /dev/null
+++ b/www/plugins/redirhttps/paquet.xml
@@ -0,0 +1,19 @@
+<paquet
+       prefix="redirhttps"
+       categorie="performance"
+       version="0.1.1"
+       etat="test"
+       compatibilite="[2.1.11;3.1.*]"
+       logo="images/redirhttps-128.png"
+       documentation="http://contrib.spip.net/Rediriger-en-HTTPS-quand-l-utilisateur-est-connecte"
+>
+
+       <nom>Redirections HTTPS</nom>
+       <!-- Sécuriser l'acc&#232;s à certaines pages du site -->
+
+       <auteur>Severo</auteur>
+       <credit lien="http://www.iconfinder.com/icondetails/25388/128/high_security_thick_icon">Oliver Scholtz</credit>
+       <licence lien="http://www.gnu.org/licenses/gpl-3.0.html">GPL 3</licence>
+
+       <traduire gestionnaire="salvatore" module="redirhttps" reference="fr" />
+</paquet>

diff --git a/www/plugins/redirhttps/plugin.xml b/www/plugins/redirhttps/plugin.xml
new file mode 100755 (executable)
index 0000000..e34b03b
--- /dev/null
+++ b/www/plugins/redirhttps/plugin.xml
@@ -0,0 +1,22 @@
+<plugin>\r
+       <nom><multi>[fr]Redirections HTTPS[es]Redireciones HTTPS</multi></nom>\r
+       <auteur>Severo</auteur>\r
+       <licence>GNU/GPL</licence>\r
+       <version>0.1.1</version>\r
+       <etat>test</etat>\r
+       <prefix>redirhttps</prefix>\r
+       <categorie>performance</categorie>\r
+       <slogan>S&#233;curiser l'acc&#232;s &#224; certaines pages du site</slogan>\r
+       <description>\r
+               <multi>\r
+                       [fr]Redirection vers HTTPS quand le contenu le n&#233;cessite (espace priv&#233;, login, pages publiques avec utilisateur connect&#233;)\r
+                       [es]Redirecci&#243;n hac&#237;a HTTPS cuando el contendio le necesita (espacio privado, login, p&#225;ginas p&#250;blicas con el usuario conectado)\r
+               </multi>\r
+       </description>\r
+       <lien>http://contrib.spip.net/Rediriger-en-HTTPS-quand-l-utilisateur-est-connecte</lien>\r
+       <icon>images/redirhttps-128.png</icon> <!-- http://www.iconfinder.com/icondetails/25388/128/high_security_thick_icon -->\r
+\r
+       <options>redirhttps_options.php</options>\r
+\r
+       <necessite id="SPIP" version="[2.1.11;3.1.99]" />\r
+</plugin>\r

diff --git a/www/plugins/redirhttps/redirhttps_options.php b/www/plugins/redirhttps/redirhttps_options.php
new file mode 100755 (executable)
index 0000000..6315b2d
--- /dev/null
+++ b/www/plugins/redirhttps/redirhttps_options.php
@@ -0,0 +1,16 @@
+<?php
+// Le traffic HTTP est redirige en HTTPS quand l'utilisateur est connecte ou pour la page de login
+// a noter: il faut avoir applique le patch: http://core.spip.org/projects/spip/repository/revisions/17941
+//    -> dans le core depuis la version 2.1.11
+if (
+        (
+               ($_COOKIE['spip_session']) OR
+               (strpos($_SERVER['REQUEST_URI'], '/spip.php?page=login')===0)
+       ) AND
+        (!$_SERVER['HTTPS']) AND
+        ($_SERVER['REQUEST_METHOD'] == 'GET')
+        ) {
+        include_spip('inc/headers');
+        redirige_par_entete('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+}
+?>

diff --git a/www/plugins/redirhttps/svn.revision b/www/plugins/redirhttps/svn.revision
new file mode 100644 (file)
index 0000000..d4baca2
--- /dev/null
+++ b/www/plugins/redirhttps/svn.revision
@@ -0,0 +1,10 @@
+<svn_revision>
+<text_version>
+Origine: file:///home/svn/repository/spip-zone/_plugins_/redirhttps
+Revision: 97495
+Dernier commit: 2016-05-07 22:05:22 +0200 
+</text_version>
+<origine>file:///home/svn/repository/spip-zone/_plugins_/redirhttps</origine>
+<revision>97495</revision>
+<commit>2016-05-07 22:05:22 +0200 </commit>
+</svn_revision>
\ No newline at end of file