From c2200099c162c9cff5b21d3dae3cfae326ef31dc Mon Sep 17 00:00:00 2001
From: tofulm <tofulm@gmail.com>
Date: Wed, 22 Jan 2020 11:27:23 +0100
Subject: [PATCH 1/5] ajout autorisation php dans le html

---
 UltiSnips/html.snippets | 6 ++++++
 html.json               | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index df311e3..a84bbfd 100755
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -4,6 +4,12 @@ extends fa
 ##########
 ## SPIP ##
 ##########
+snippet php "Autorisation <?php"
+<?php include_spip('inc/autoriser');
+	if (autoriser("${2:action}","${3:objet}")) {	?>
+	${1:${VISUAL}}
+<?php } ?>
+endsnippet
 
 #BOUCLE :
 #------------------------------------------------------
diff --git a/html.json b/html.json
index 651bed1..806cd8c 100644
--- a/html.json
+++ b/html.json
@@ -1,12 +1,17 @@
 {
+  "php": {
+    "prefix": "php",
+    "body": "<?php include_spip('inc/autoriser');\n\tif (autoriser(\"${2:action}\",\"${3:objet}\")) {\t?>\n\t1\n<?php } ?>",
+    "description": "Autorisation <?php"
+  },
   "b": {
     "prefix": "b",
-    "body": "<BOUCLE_${1:nom}(${2:ARTICLES}){${3:critere}}${4}>\n\t$0\n</BOUCLE_$1>",
+    "body": "`!p t[2] = t[2].upper()`<BOUCLE_${1:nom}(${2:ARTICLES}){${3:critere}}${4}>\n\t$0\n</BOUCLE_$1>",
     "description": "SPIP <BOUCLE_>"
   },
   "bb": {
     "prefix": "bb",
-    "body": "<B_$1>\n\t${5}\n<BOUCLE_${1:nom}(${2:ARTICLES}){${3:critere}}${4}>\n\t$0\n</BOUCLE_$1>\n\t${6}\n</B_$1>",
+    "body": "`!p t[2] = t[2].upper()`<B_$1>\n\t${5}\n<BOUCLE_${1:nom}(${2:ARTICLES}){${3:critere}}${4}>\n\t$0\n</BOUCLE_$1>\n\t${6}\n</B_$1>",
     "description": "SPIP <B_>"
   },
   "icon": {

From 14a71b06cb927b435df1bf7cd066be2e82aa2a13 Mon Sep 17 00:00:00 2001
From: tofulm <tofulm@gmail.com>
Date: Thu, 6 Feb 2020 16:53:32 +0100
Subject: [PATCH 2/5] modification valeur par defaut du texte pour eviter
 d'avoir ''

---
 UltiSnips/php.snippets | 4 ++--
 php.json               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 59d96a4..d129c53 100755
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -125,11 +125,11 @@ snippet decimal "SQL decimal(10,2)" w
 endsnippet
 
 snippet text "SQL text NOT NULL" w
-'text NOT NULL DEFAULT ""',${0}
+"text NOT NULL",${0}
 endsnippet
 
 snippet varchar "SQL varchar(25)" w
-'varchar(${1:255}) NOT NULL DEFAULT ""',${0}
+"varchar(${1:255}) NOT NULL",${0}
 endsnippet
 
 snippet datetime "SQL datetime" w
diff --git a/php.json b/php.json
index 544309c..0d7b070 100644
--- a/php.json
+++ b/php.json
@@ -36,12 +36,12 @@
   },
   "text": {
     "prefix": "text",
-    "body": "'text NOT NULL DEFAULT \"\"',${0}",
+    "body": "\"text NOT NULL\",${0}",
     "description": "SQL text NOT NULL"
   },
   "varchar": {
     "prefix": "varchar",
-    "body": "'varchar(${1:255}) NOT NULL DEFAULT \"\"',${0}",
+    "body": "\"varchar(${1:255}) NOT NULL\",${0}",
     "description": "SQL varchar(25)"
   },
   "datetime": {

From ddc3bb38a932b0e71ac3411818d4150c3664b2b4 Mon Sep 17 00:00:00 2001
From: tofulm <tofulm@gmail.com>
Date: Sun, 16 Feb 2020 17:38:36 +0100
Subject: [PATCH 3/5] =?UTF-8?q?ajout=20que=20pour=20vim=20de=20la=20possib?=
 =?UTF-8?q?ilit=C3=A9=20d'ajouter=20[(=20xxx=20)]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UltiSnips/html.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index a84bbfd..36f50f9 100755
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -29,6 +29,10 @@ snippet bb "SPIP <B_>"
 </B_$1>
 endsnippet
 
+snippet aa "[(xxx)]" w
+[(${1:${VISUAL}})]${0}
+endsnippet
+
 snippet icon "#ICON{}" w
 #ICON{img/sprite_symbol_pictos.svg#${1},${2:icon-font}${3:,mon title}}${0}
 endsnippet

From 4975e9f6aff9843efc0a80d7b4bb5f9b65f00df7 Mon Sep 17 00:00:00 2001
From: tofulm <tofulm@gmail.com>
Date: Mon, 17 Feb 2020 16:55:53 +0100
Subject: [PATCH 4/5] ajout redirect dans cvt

---
 UltiSnips/php.snippets | 10 ++++++----
 php.json               |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index d129c53..8fc1b19 100755
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -65,7 +65,7 @@ snippet cvt "SPIP"
 <?php
 if (!defined('_ECRIRE_INC_VERSION')) return;
 
-function formulaires_`!v vim_snippets#Filename()`_charger_dist($${1:variables}){
+function formulaires_`!v vim_snippets#Filename()`_charger_dist($${1:variables} $redirect = ''){
 	$valeurs = array(
 		"${2:nom_du_champ}"  => ${3:""},
 	);
@@ -73,7 +73,7 @@ function formulaires_`!v vim_snippets#Filename()`_charger_dist($${1:variables}){
 	return $valeurs;
 }
 
-function formulaires_`!v vim_snippets#Filename()`_verifier_dist($$1){
+function formulaires_`!v vim_snippets#Filename()`_verifier_dist($$1 $redirect = ''){
 	$$2   = _request('$2');
 
 	$erreurs = array();
@@ -93,12 +93,14 @@ function formulaires_`!v vim_snippets#Filename()`_verifier_dist($$1){
 	return $erreurs;
 }
 
-function formulaires_`!v vim_snippets#Filename()`_traiter_dist($$1){
+function formulaires_`!v vim_snippets#Filename()`_traiter_dist($$1 $redirect = ''){
 	$$2   = _request('$2');
 
 	$retour = array();
 	$retour['message_ok'] = "bravo";
-	$retour['redirect'] = "spip.php?page=perdu";
+	if ($redirect) {
+		$retour['redirect'] = $redirect;
+	}
 	$retour['editable'] = true;
 
 	return $retour;
diff --git a/php.json b/php.json
index 0d7b070..e307145 100644
--- a/php.json
+++ b/php.json
@@ -11,7 +11,7 @@
   },
   "cvt": {
     "prefix": "cvt",
-    "body": "<?php\nif (!defined('_ECRIRE_INC_VERSION')) return;\n\nfunction formulaires_`!v vim_snippets#Filename()`_charger_dist($${1:variables}){\n\t$valeurs = array(\n\t\t\"${2:nom_du_champ}\"  => ${3:\"\"},\n\t);\n\t${0}\n\treturn $valeurs;\n}\n\nfunction formulaires_`!v vim_snippets#Filename()`_verifier_dist($$1){\n\t$$2   = _request('$2');\n\n\t$erreurs = array();\n\t//champs obligatoire\n\tforeach (array ('$2') as $obligatoire) {\n\t\tif (!_request($obligatoire)) $erreurs[$obligatoire] = 'Ce champs est obligatoire';\n\t}\n\n\t//autres erreurs\n\t$erreurs['$2'] = \"Ce champ ne convient pas.\";\n\n\t//Il y a des erreurs\n\tif (count($erreurs)) {\n\t\t$erreurs['message_erreur'] = 'Votre saisie contient des erreurs !';\n\t}\n\n\treturn $erreurs;\n}\n\nfunction formulaires_`!v vim_snippets#Filename()`_traiter_dist($$1){\n\t$$2   = _request('$2');\n\n\t$retour = array();\n\t$retour['message_ok'] = \"bravo\";\n\t$retour['redirect'] = \"spip.php?page=perdu\";\n\t$retour['editable'] = true;\n\n\treturn $retour;\n}",
+    "body": "<?php\nif (!defined('_ECRIRE_INC_VERSION')) return;\n\nfunction formulaires_`!v vim_snippets#Filename()`_charger_dist($${1:variables} $redirect = ''){\n\t$valeurs = array(\n\t\t\"${2:nom_du_champ}\"  => ${3:\"\"},\n\t);\n\t${0}\n\treturn $valeurs;\n}\n\nfunction formulaires_`!v vim_snippets#Filename()`_verifier_dist($$1 $redirect = ''){\n\t$$2   = _request('$2');\n\n\t$erreurs = array();\n\t//champs obligatoire\n\tforeach (array ('$2') as $obligatoire) {\n\t\tif (!_request($obligatoire)) $erreurs[$obligatoire] = 'Ce champs est obligatoire';\n\t}\n\n\t//autres erreurs\n\t$erreurs['$2'] = \"Ce champ ne convient pas.\";\n\n\t//Il y a des erreurs\n\tif (count($erreurs)) {\n\t\t$erreurs['message_erreur'] = 'Votre saisie contient des erreurs !';\n\t}\n\n\treturn $erreurs;\n}\n\nfunction formulaires_`!v vim_snippets#Filename()`_traiter_dist($$1 $redirect = ''){\n\t$$2   = _request('$2');\n\n\t$retour = array();\n\t$retour['message_ok'] = \"bravo\";\n\tif ($redirect) {\n\t\t$retour['redirect'] = $redirect;\n\t}\n\t$retour['editable'] = true;\n\n\treturn $retour;\n}",
     "description": "SPIP"
   },
   "bigint": {

From b16c495f172cc04f267bd1cab2b49189f96fe8ef Mon Sep 17 00:00:00 2001
From: tofulm <tofulm@gmail.com>
Date: Tue, 18 Feb 2020 14:59:18 +0100
Subject: [PATCH 5/5] =?UTF-8?q?am=C3=A9lioration=20cvt=20button=20submit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UltiSnips/html.snippets | 7 ++++---
 html.json               | 7 ++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 36f50f9..06ec6b8 100755
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -165,13 +165,14 @@ snippet cvt "SPIP formulaire CVT"
 [<p class="reponse_formulaire reponse_formulaire_erreur">(#ENV*{message_erreur})</p>]
 [<p class="reponse_formulaire reponse_formulaire_ok">(#ENV*{message_ok})</p>]
 
-[(#ENV{editable}|oui)   ]
 	<form name="formulaire_#FORM" action="#ENV{action}" method="post"><div>
 		#ACTION_FORMULAIRE{#ENV{action}}
 
-			${1}
+			${0}
 
-	<p class="boutons"><input type="submit" class="submit" value="Envoyer" ></p>
+		<div class="boutons">
+			<button type="submit" class="btn"><:${1}:${2:valider}:></button>
+		</div>
 	</div></form>
 
 </div>
diff --git a/html.json b/html.json
index 806cd8c..c154f0a 100644
--- a/html.json
+++ b/html.json
@@ -14,6 +14,11 @@
     "body": "`!p t[2] = t[2].upper()`<B_$1>\n\t${5}\n<BOUCLE_${1:nom}(${2:ARTICLES}){${3:critere}}${4}>\n\t$0\n</BOUCLE_$1>\n\t${6}\n</B_$1>",
     "description": "SPIP <B_>"
   },
+  "aa": {
+    "prefix": "aa",
+    "body": "[(1)]${0}",
+    "description": "[(xxx)]"
+  },
   "icon": {
     "prefix": "icon",
     "body": "#ICON{img/sprite_symbol_pictos.svg#${1},${2:icon-font}${3:,mon title}}${0}",
@@ -125,7 +130,7 @@
   },
   "cvt": {
     "prefix": "cvt",
-    "body": "<div class=\"formulaire_spip formulaire_#FORM\">\n\n[<p class=\"reponse_formulaire reponse_formulaire_erreur\">(#ENV*{message_erreur})</p>]\n[<p class=\"reponse_formulaire reponse_formulaire_ok\">(#ENV*{message_ok})</p>]\n\n[(#ENV{editable}|oui)   ]\n\t<form name=\"formulaire_#FORM\" action=\"#ENV{action}\" method=\"post\"><div>\n\t\t#ACTION_FORMULAIRE{#ENV{action}}\n\n\t\t\t${1}\n\n\t<p class=\"boutons\"><input type=\"submit\" class=\"submit\" value=\"Envoyer\" ></p>\n\t</div></form>\n\n</div>",
+    "body": "<div class=\"formulaire_spip formulaire_#FORM\">\n\n[<p class=\"reponse_formulaire reponse_formulaire_erreur\">(#ENV*{message_erreur})</p>]\n[<p class=\"reponse_formulaire reponse_formulaire_ok\">(#ENV*{message_ok})</p>]\n\n\t<form name=\"formulaire_#FORM\" action=\"#ENV{action}\" method=\"post\"><div>\n\t\t#ACTION_FORMULAIRE{#ENV{action}}\n\n\t\t\t${0}\n\n\t\t<div class=\"boutons\">\n\t\t\t<button type=\"submit\" class=\"btn\"><:${1}:${2:valider}:></button>\n\t\t</div>\n\t</div></form>\n\n</div>",
     "description": "SPIP formulaire CVT"
   },
   "cvttext": {