diff --git a/action/supprimer_gamuform.php b/action/supprimer_gamuform.php deleted file mode 100644 index 3e5b443..0000000 --- a/action/supprimer_gamuform.php +++ /dev/null @@ -1,41 +0,0 @@ - 'gamuform', - 'principale' => 'oui', - 'field'=> array( - 'id_gamuform' => 'bigint(21) NOT NULL', - 'objet' => 'VARCHAR(25) DEFAULT "" NOT NULL', - 'titre' => 'varchar(255) NOT NULL DEFAULT ""', - 'label' => 'varchar(255) NOT NULL DEFAULT ""', - 'type' => 'varchar(255) NOT NULL DEFAULT ""', - 'class_container' => 'varchar(255) NOT NULL DEFAULT ""', - 'class' => 'varchar(255) NOT NULL DEFAULT ""', - 'choix' => "text NOT NULL", - 'defaut' => 'varchar(255) NOT NULL DEFAULT ""', - 'statut' => 'varchar(20) DEFAULT "0" NOT NULL', - 'date' => 'datetime NOT NULL DEFAULT "0000-00-00 00:00:00"', - 'rang' => 'tinyint(4) NOT NULL', - 'maj' => 'TIMESTAMP' - ), - 'key' => array( - 'PRIMARY KEY' => 'id_gamuform', - 'KEY objet' => 'objet', - 'KEY statut' => 'statut', - ), - 'titre' => 'titre AS titre, "" AS lang', - 'date' => 'date', - //'champs_editables' => array('titre'), - //'champs_versionnes' => array('titre'), - //'rechercher_champs' => array(), - 'tables_jointures' => array('spip_gamuforms_valeurs'), - 'statut_textes_instituer' => array( - 'prepa' => 'texte_statut_en_cours_redaction', - 'publie' => 'texte_statut_publie', - 'poubelle' => 'texte_statut_poubelle', - ), - 'statut'=> array( - array( - 'champ' => 'statut', - 'publie' => 'publie', - 'exception' => array('statut','tout') - ) - ), - 'texte_changer_statut' => 'gamuform:texte_changer_statut_gamuform', - - - ); - return $tables; } @@ -103,18 +57,5 @@ function gamuform_declarer_tables_objets_sql($tables) { */ function gamuform_declarer_tables_auxiliaires($tables) { - $tables['spip_gamuforms_valeurs'] = array( - 'field' => array( - 'id_gamuform' => 'bigint(21) DEFAULT "0" NOT NULL', - 'id_objet' => 'bigint(21) DEFAULT "0" NOT NULL', - 'objet' => 'VARCHAR(25) DEFAULT "" NOT NULL', - 'valeur' => "text NOT NULL", - ), - 'key' => array( - 'PRIMARY KEY' => 'id_gamuform,id_objet,objet', - 'KEY id_gamuform' => 'id_gamuform', - ) - ); - return $tables; } diff --git a/content/creer_gamuform.html b/content/creer_gamuform.html deleted file mode 100644 index 61f2392..0000000 --- a/content/creer_gamuform.html +++ /dev/null @@ -1,6 +0,0 @@ -
-

creer formulaire pour les clients

- - - -
diff --git a/content/editer_gamuform.html b/content/editer_gamuform.html new file mode 100644 index 0000000..ffe9d6d --- /dev/null +++ b/content/editer_gamuform.html @@ -0,0 +1 @@ + diff --git a/fabrique_diff.diff b/fabrique_diff.diff deleted file mode 100644 index b55af58..0000000 --- a/fabrique_diff.diff +++ /dev/null @@ -1,7 +0,0 @@ -diff -r -x . -x .. -x fabrique_diff.diff -x fabrique_gamuform.php ../tmp/cache/fabrique/.backup/gamuform/paquet.xml ../tmp/cache/fabrique/gamuform/paquet.xml -8a9 -> schema="1.0.0" -11c12 -< Paquet généré le 2020-03-30 14:52:00 ---- -> Paquet généré le 2020-03-30 14:54:11 \ No newline at end of file diff --git a/fabrique_gamuform.php b/fabrique_gamuform.php deleted file mode 100644 index ac0d05c..0000000 --- a/fabrique_gamuform.php +++ /dev/null @@ -1,198 +0,0 @@ - - array ( - 'version' => 7, - ), - 'paquet' => - array ( - 'prefixe' => 'gamuform', - 'nom' => 'GamuForm', - 'slogan' => '', - 'description' => '', - 'logo' => - array ( - 0 => '', - ), - 'credits' => - array ( - 'logo' => - array ( - 'texte' => 'tofulm', - 'url' => 'https://gamuza.fr', - ), - ), - 'version' => '1.0.0', - 'auteur' => 'tofulm', - 'auteur_lien' => 'https://gamuza.fr', - 'licence' => 'GNU/GPL', - 'categorie' => 'outil', - 'etat' => 'dev', - 'compatibilite' => '[3.3.0-dev;3.3.*]', - 'documentation' => '', - 'administrations' => 'on', - 'schema' => '1.0.0', - 'formulaire_config' => 'on', - 'formulaire_config_titre' => '', - 'fichiers' => - array ( - 0 => 'autorisations', - 1 => 'fonctions', - 2 => 'options', - 3 => 'pipelines', - ), - 'inserer' => - array ( - 'paquet' => '', - 'administrations' => - array ( - 'maj' => '', - 'desinstallation' => '', - 'fin' => '', - ), - 'base' => - array ( - 'tables' => - array ( - 'fin' => '', - ), - ), - ), - 'scripts' => - array ( - 'pre_copie' => '', - 'post_creation' => '', - ), - 'exemples' => '', - ), - 'objets' => - array ( - 0 => - array ( - 'nom' => 'Gamuforms', - 'nom_singulier' => 'Gamuform', - 'genre' => 'masculin', - 'logo' => - array ( - 0 => '', - 32 => '', - 24 => '', - 16 => '', - 12 => '', - ), - 'table' => 'spip_gamuforms', - 'cle_primaire' => 'id_gamuform', - 'cle_primaire_sql' => 'bigint(21) NOT NULL', - 'table_type' => 'gamuform', - 'champs' => - array ( - 0 => - array ( - 'nom' => 'Titre', - 'champ' => 'titre', - 'sql' => 'varchar(255) NOT NULL DEFAULT \'\'', - 'caracteristiques' => - array ( - 0 => 'editable', - 1 => 'versionne', - 2 => 'obligatoire', - ), - 'recherche' => '', - 'saisie' => '', - 'explication' => '', - 'saisie_options' => '', - ), - ), - 'champ_titre' => 'titre', - 'champ_date' => 'date', - 'statut' => 'on', - 'chaines' => - array ( - 'titre_objets' => 'Gamuforms', - 'titre_objet' => 'Gamuform', - 'info_aucun_objet' => 'Aucun gamuform', - 'info_1_objet' => 'Un gamuform', - 'info_nb_objets' => '@nb@ gamuforms', - 'icone_creer_objet' => 'Créer un gamuform', - 'icone_modifier_objet' => 'Modifier ce gamuform', - 'titre_logo_objet' => 'Logo de ce gamuform', - 'titre_langue_objet' => 'Langue de ce gamuform', - 'texte_definir_comme_traduction_objet' => 'Ce gamuform est une traduction du gamuform numéro :', - 'titre_\\objets_lies_objet' => 'Liés à ce gamuform', - 'titre_objets_rubrique' => 'Gamuforms de la rubrique', - 'info_objets_auteur' => 'Les gamuforms de cet auteur', - 'retirer_lien_objet' => 'Retirer ce gamuform', - 'retirer_tous_liens_objets' => 'Retirer tous les gamuforms', - 'ajouter_lien_objet' => 'Ajouter ce gamuform', - 'texte_ajouter_objet' => 'Ajouter un gamuform', - 'texte_creer_associer_objet' => 'Créer et associer un gamuform', - 'texte_changer_statut_objet' => 'Ce gamuform est :', - 'supprimer_objet' => 'Supprimer cet gamuform', - 'confirmer_supprimer_objet' => 'Confirmez-vous la suppression de cet gamuform ?', - ), - 'liaison_directe' => '', - 'table_liens' => 'on', - 'afficher_liens' => '', - 'roles' => '', - 'auteurs_liens' => '', - 'vue_auteurs_liens' => '', - 'fichiers' => - array ( - 'explicites' => - array ( - 0 => 'action/supprimer_objet.php', - ), - ), - 'autorisations' => - array ( - 'objet_creer' => '', - 'objet_voir' => '', - 'objet_modifier' => '', - 'objet_supprimer' => '', - 'associerobjet' => '', - ), - ), - ), - 'images' => - array ( - 'paquet' => - array ( - 'logo' => - array ( - 0 => - array ( - 'extension' => 'svg', - 'contenu' => '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   x="0px"
   y="0px"
   viewBox="0 0 76.879158 64"
   enable-background="new 0 0 80 80"
   xml:space="preserve"
   id="svg945"
   sodipodi:docname="gamuform.svg"
   width="76.879158"
   height="64"
   inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata
     id="metadata951"><rdf:RDF><cc:Work
         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
     id="defs949" /><sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="2556"
     inkscape:window-height="1416"
     id="namedview947"
     showgrid="false"
     inkscape:zoom="4.3734554"
     inkscape:cx="99.833633"
     inkscape:cy="-9.5846893"
     inkscape:window-x="0"
     inkscape:window-y="20"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg945" /><polygon
     style="fill:none"
     points="2414.859,707.488 2425.961,707.488 2398.799,494.079 "
     id="polygon2531"
     transform="translate(-2301.6673,-384.23461)" /><path
     style="fill:none"
     inkscape:connector-curvature="0"
     d="m 141.77966,316.39239 c 1.938,-3.397 7.364,-3.309 11.438,-4.572 -13.938,-64.775 3.722,-138.316 -2.287,-210.415 -10.714,1.424 -22.476,-0.266 -34.308,4.574 -0.412,55.561 12.27,117.852 13.723,169.247 0.424,15.002 -7.419,34.769 11.434,41.166 z"
     id="path2533" /><path
     style="fill:none"
     inkscape:connector-curvature="0"
     d="m 180.65966,323.25339 c 10.595,-18.686 -2.52,-38.718 -4.573,-61.753 -4.502,-50.48 7.472,-109.923 0,-160.097 -0.131,-1.396 -0.343,-2.708 -2.289,-2.287 -26.086,49.667 2.484,143.879 -13.722,205.84 7.416,5.544 7.882,18.04 20.584,18.297 z"
     id="path2535" /><g
     id="g2650"><polygon
       transform="translate(12.879156,-8)"
       stroke-miterlimit="10"
       points="17,9 63,9 63,59 51,71 17,71 "
       id="polygon915"
       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><polygon
       transform="translate(12.879156,-8)"
       stroke-miterlimit="10"
       points="50.999958,58.999958 51,71 63,59 "
       id="polygon917"
       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><rect
       x="34.879169"
       y="7.000082"
       stroke-miterlimit="10"
       width="35.999969"
       height="6"
       id="rect919"
       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><rect
       x="38.879139"
       y="19.000082"
       stroke-miterlimit="10"
       width="8"
       height="8"
       id="rect921"
       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><line
       stroke-miterlimit="10"
       x1="50.879139"
       y1="21.000082"
       x2="66.879143"
       y2="21.000082"
       id="line927"
       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><line
       stroke-miterlimit="10"
       x1="50.745491"
       y1="25.00008"
       x2="71.583008"
       y2="25.00008"
       id="line929"
       style="fill:none;stroke:#000000;stroke-width:1.86357689;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><line
       stroke-miterlimit="10"
       x1="46.879139"
       y1="49.00008"
       x2="59.879139"
       y2="49.00008"
       id="line935"
       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><line
       stroke-miterlimit="10"
       x1="46.879139"
       y1="53.00008"
       x2="63.879112"
       y2="53.00008"
       id="line937"
       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><rect
       x="38.628101"
       y="30.547615"
       stroke-miterlimit="10"
       width="8"
       height="8"
       id="rect921-8"
       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><line
       stroke-miterlimit="10"
       x1="50.628101"
       y1="32.547615"
       x2="66.628105"
       y2="32.547615"
       id="line927-9"
       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><line
       stroke-miterlimit="10"
       x1="50.494453"
       y1="36.547615"
       x2="71.33197"
       y2="36.547615"
       id="line929-2"
       style="fill:none;stroke:#000000;stroke-width:1.86357689;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><path
       sodipodi:nodetypes="cccccccccsccccscscccccccccccccccccccccccccccccccccccccscscccscscscccccccccccccccccccccccccccscsccccccssccsccscccccccscscccccc"
       inkscape:connector-curvature="0"
       id="path1061"
       d="M 30.935677,31.987669 V 2.034237 H 52.886284 74.83689 V 25.98555 49.936863 H 69.168955 63.50102 l -0.334184,0.334184 c -0.296038,0.296039 -0.334184,0.413487 -0.334184,1.028935 v 0.69475 h -8.211549 -8.211548 l -0.240107,0.257234 c -0.132058,0.141479 -0.273829,0.393171 -0.315047,0.559318 -0.08796,0.35456 0.180855,0.948004 0.508964,1.123603 0.144938,0.07757 2.990861,0.117715 8.34462,0.117715 h 8.124667 v 3.944249 3.94425 H 46.884165 30.935677 Z m 12.659158,23.748767 0.316852,-0.31687 0.03534,-4.141847 c 0.03881,-4.54907 0.0032,-4.884813 -0.548518,-5.170114 -0.485595,-0.25111 -8.538286,-0.256517 -9.022622,-0.0061 -0.573514,0.296575 -0.592884,0.472361 -0.557567,5.060212 l 0.03267,4.244589 0.271304,0.288663 c 0.23216,2.670051 0.911852,6.548079 4.899496,2.630898 2.970126,5.272955 3.619542,-0.675006 4.573045,-2.589431 z m 16.758741,-5.818247 c 0.384274,-0.204665 0.527926,-0.455757 0.531897,-0.929712 0.0026,-0.311496 -0.07554,-0.513092 -0.276983,-0.714538 L 60.327872,47.99332 h -6.959159 -6.959158 l -0.240107,0.257233 c -0.348165,0.373003 -0.42188,0.799727 -0.209198,1.21101 0.09943,0.192285 0.270823,0.402049 0.380863,0.466141 0.299952,0.174707 13.683638,0.165618 14.012463,-0.0095 z M 47.332401,39.313191 47.627284,39.036028 V 34.55024 30.064452 l -0.356326,-0.299829 -0.356327,-0.299829 -4.385141,0.03243 -4.385142,0.03243 -0.260298,0.260293 -0.260298,0.260293 -0.03263,4.30789 c -0.024,3.168363 0.0039,4.395974 0.105308,4.640891 0.259416,0.626285 0.435141,0.64762 5.091505,0.618188 l 4.249578,-0.02686 z M 71.546645,37.47024 c 0.77249,-0.214541 1.012231,-0.96402 0.499176,-1.560528 L 71.769927,35.588941 61.0991,35.558481 c -7.862239,-0.02245 -10.754728,0.0043 -10.989593,0.101425 -0.825505,0.341549 -0.688208,1.678599 0.190066,1.850923 0.569107,0.111663 20.838286,0.07295 21.247072,-0.04059 z m -4.214807,-4.162362 c 0.413383,-0.38311 0.423793,-1.094992 0.02189,-1.496894 L 67.07311,31.530365 h -8.455163 -8.455163 l -0.295979,0.35175 c -0.400902,0.476445 -0.387828,0.945901 0.03821,1.371935 l 0.334183,0.334184 h 8.395066 8.395067 z m -19.735617,-5.58133 0.316878,-0.316871 0.03534,-4.141846 c 0.03881,-4.54907 0.0032,-4.884814 -0.548518,-5.170115 -0.485594,-0.25111 -8.538285,-0.256517 -9.022621,-0.0061 -0.573482,0.29656 -0.592884,0.472549 -0.557567,5.057425 0.03125,4.056332 0.04267,4.252906 0.261326,4.495816 0.125758,0.13971 0.331545,0.297064 0.457304,0.349676 0.125759,0.05261 2.143926,0.08512 4.484816,0.07225 l 4.256165,-0.02341 0.316879,-0.316872 z m 24.717198,-2.099394 c 0.339936,-0.43216 0.3047,-0.906191 -0.09724,-1.308126 L 71.882001,23.984844 H 61.233365 c -10.973427,0 -10.942913,-0.0012 -11.287342,0.447397 -0.228128,0.297127 -0.175155,0.936487 0.102037,1.231544 l 0.248581,0.264602 H 61.186554 72.076469 Z M 67.42289,21.917772 c 0.303572,-0.162467 0.549125,-0.767316 0.473057,-1.165242 -0.03332,-0.174316 -0.189923,-0.418676 -0.348,-0.543019 -0.280387,-0.220552 -0.492317,-0.22608 -8.668586,-0.22608 h -8.381174 l -0.318174,0.273682 c -0.254343,0.218775 -0.318174,0.370293 -0.318174,0.755253 0,0.38496 0.06383,0.536477 0.318174,0.755253 l 0.318174,0.273682 h 8.346944 c 5.760537,0 8.418465,-0.03828 8.577759,-0.123529 z m 4.153327,-8.152338 c 0.150173,-0.150173 0.305058,-0.445992 0.34419,-0.657376 0.03913,-0.211383 0.0554,-1.764829 0.03616,-3.452103 L 71.921577,6.588184 71.548213,6.254754 71.174851,5.921324 H 52.935965 c -20.286963,0 -18.78537,-0.06094 -19.030755,0.772367 -0.08271,0.28088 -0.113701,1.522317 -0.09013,3.610661 l 0.03592,3.182604 0.320772,0.27576 0.320772,0.275759 h 18.405312 18.405319 z"
       style="fill:#896b3c;fill-opacity:1;stroke:#000000;stroke-width:0.20092583" /><rect
       x="33.965916"
       y="47.222553"
       stroke-miterlimit="10"
       width="8.9194059"
       height="12.185265"
       id="rect925"
       style="fill:none;stroke:#000000;stroke-width:2.60630655;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" /><g
       style="fill:#800000"
       transform="translate(0,7.105956)"
       id="g1002"><path
         id="path1000"
         d="m 20.284,37.554 c 0,-1.795 1.447,-3.241 3.242,-3.241 1.795,0 3.241,1.447 3.241,3.241 0,1.795 -1.447,3.241 -3.241,3.241 -1.795,10e-4 -3.242,-1.445 -3.242,-3.241 m 5.341,-12.779 h -8.87 V 15.409 H 21.77 Z M 8.989,34.313 c 1.795,0 3.241,1.447 3.241,3.241 0,1.795 -1.447,3.241 -3.241,3.241 -1.795,0 -3.242,-1.446 -3.242,-3.241 0,-1.794 1.447,-3.241 3.242,-3.241 z M 33.851,6.381 v 32.515 h 2.837 V 37.582 H 50 V 34.744 H 36.689 V 6.381 Z M 0,24.775 v 14.199 h 3.092 c 0.637,2.666 3.032,4.644 5.897,4.644 2.864,0 5.259,-1.978 5.897,-4.644 h 2.743 c 0.637,2.666 3.032,4.644 5.897,4.644 2.864,0 5.259,-1.978 5.896,-4.644 h 3.093 V 24.775 H 28.691 L 23.67,12.571 H 13.917 V 24.775 H 11.079 V 22.59 H 3.151 v 2.186 H 0 Z"
         inkscape:connector-curvature="0"
         style="clip-rule:evenodd;fill:#800000;fill-rule:evenodd" /></g><path
       style="stroke-width:0.01278245"
       id="path2537"
       d="m 39.808967,55.360584 c -0.08927,-0.08544 -0.267792,-0.148864 -0.321579,-0.263114 -0.08632,-0.183313 -0.114239,-0.634559 -0.116922,-0.906275 -0.0067,-0.67508 0.03532,-1.085141 0.08771,-1.695592 0.011,-0.128758 -0.02823,-0.257208 0,-0.350814 0.06538,-0.216995 0.343094,-0.335028 0.467762,-0.467761 0.365066,-0.388752 0.636781,-0.854583 0.672382,-1.549476 0.24086,-0.134829 0.6716,-0.217582 0.555471,-0.613915 -0.209657,-0.03426 -0.267994,0.08282 -0.438538,0.0877 -0.701244,-0.649795 -1.930279,-0.118506 -1.958732,0.789342 0.145338,-0.08441 0.10653,-0.274912 0.175441,-0.409281 0.176385,-0.344065 0.609029,-0.648044 1.140155,-0.43854 -0.572399,0.132694 -1.306776,0.757667 -0.847833,1.374023 -0.162491,-0.709873 0.526867,-1.400956 1.169401,-0.935509 -0.05755,0.588952 -0.3597,1.09731 -0.877043,1.198623 -0.4583,0.08975 -0.960703,-0.199623 -1.49097,-0.05847 -0.143252,-0.08087 -0.255739,-0.192542 -0.350829,-0.32158 0.01413,0.0837 -0.05477,0.300438 -0.02926,0.380047 0.58554,0.974559 0.610646,2.345848 0.701654,3.829762 -0.331012,0.07827 -0.462965,0.355608 -0.847793,0.380048 -0.697742,0.754292 -1.440124,1.463871 -1.9295,2.426492 -0.154092,0.05054 -0.165226,0.244068 -0.263113,0.350802 2.085404,-0.01946 4.248797,0.03899 6.285499,-0.02924 -0.575732,-0.791706 -1.032681,-2.058996 -1.78338,-2.77728 z M 39.224261,52.11553 c 0.02487,-0.0054 0.02757,0.01141 0.02926,0.02923 0.09551,0.641347 -0.05755,1.401148 0,2.046432 0.02628,0.294444 0.193896,0.550502 0.05847,0.789354 -0.162376,-0.0033 -0.168322,-0.163014 -0.263116,-0.23388 0.20714,-0.792026 -0.158055,-1.996273 0.175403,-2.631139 z m -0.730864,0.08771 c 0.151243,-0.06185 0.301588,-0.04026 0.438542,-0.05847 0.07681,0.921602 -0.148929,1.861636 0.02923,2.689619 -0.05205,0.01617 -0.121406,0.01502 -0.146206,0.05844 -0.240999,-0.08176 -0.140747,-0.33444 -0.146179,-0.526202 -0.01856,-0.65698 -0.180655,-1.453211 -0.175389,-2.163391 z m -0.24913,0.0494 0.347198,2.72789 h -0.141924 z m 1.367734,5.360486 c -0.194306,0.119835 -0.433324,0.179695 -0.717106,0.179695 -0.201989,0 -0.393726,-0.03192 -0.575211,-0.09587 -0.219895,-0.07412 -0.374551,-0.18275 -0.464002,-0.325952 -0.0026,-0.0051 -0.02557,-0.05752 -0.06901,-0.157224 -0.0179,-0.03319 -0.04093,-0.08438 -0.06902,-0.15339 -0.05117,-0.148238 -0.07669,-0.311853 -0.07669,-0.490833 0,-0.09972 0.0038,-0.171234 0.01151,-0.214758 0.0077,-0.02301 0.01919,-0.05879 0.03451,-0.10736 0.06387,-0.196824 0.14825,-0.33614 0.253105,-0.417973 0.339975,-0.265862 0.655738,-0.398812 0.947178,-0.398812 0.07921,0 0.180234,0.01667 0.302943,0.04984 0.115044,0.03066 0.240273,0.09845 0.375794,0.203229 0.02554,0.0205 0.0652,0.04985 0.118889,0.0882 0.02299,0.01282 0.0466,0.02684 0.07094,0.04218 0.02425,0.01534 0.04278,0.03584 0.05561,0.06135 -0.03583,0.07419 -0.05369,0.112537 -0.05369,0.115042 -0.02299,0.03835 -0.04984,0.06902 -0.08053,0.09203 -0.0997,-0.07154 -0.200708,-0.143125 -0.302943,-0.214745 -0.130366,-0.07921 -0.24417,-0.11889 -0.341278,-0.11889 l -0.0422,0.0038 c -0.403974,0 -0.714563,0.120181 -0.931826,0.360452 -0.0946,0.104855 -0.141899,0.245423 -0.141899,0.421821 0,0.224997 0.04727,0.411633 0.141899,0.559884 0.0562,0.08952 0.132897,0.170045 0.230083,0.241576 0.09714,0.07161 0.195572,0.118877 0.295289,0.141898 0.02299,0.0051 0.03702,0.0077 0.04218,0.0077 0.391143,0 0.656979,-0.03702 0.797612,-0.111194 0.08178,-0.04344 0.13547,-0.132887 0.161073,-0.268432 0.0077,-0.04344 0.01535,-0.15206 0.02299,-0.325952 -0.109954,-0.02045 -0.233918,-0.03067 -0.371967,-0.03067 -0.0026,0 -0.130381,0.0038 -0.383474,0.01149 -0.02557,-0.02045 -0.03835,-0.04984 -0.03835,-0.08819 v -0.122724 l 0.03835,-0.01917 c 0.02808,-0.0051 0.07028,-0.0077 0.126532,-0.0077 0.05369,0 0.136123,0.0052 0.247354,0.01534 0.111195,0.01024 0.194907,0.01533 0.251163,0.01533 0.08688,0 0.169994,-0.01019 0.249256,-0.03066 0.01018,0.0077 0.02686,0.01145 0.04984,0.01145 0.07921,0 0.12524,0.01024 0.13806,0.03061 -0.01026,0.191136 -0.02052,0.382336 -0.03067,0.573472 -0.02557,0.219193 -0.116383,0.377235 -0.272279,0.474062 z"
       inkscape:connector-curvature="0" /></g></svg>', - ), - ), - ), - 'objets' => - array ( - 0 => - array ( - ), - ), - ), -); diff --git a/formulaires/editer_gamuform.html b/formulaires/editer_gamuform.html index 3807ce3..6eb81ce 100644 --- a/formulaires/editer_gamuform.html +++ b/formulaires/editer_gamuform.html @@ -2,19 +2,13 @@ [

(#ENV**{message_ok})

] [

(#ENV*{message_erreur})

] - [(#ENV{editable})
#ACTION_FORMULAIRE - -
+
+ #GENERER_SAISIES{#ENV{_saisies}}
- - - [(#REM) ajouter les saisies supplementaires : extra et autre, a cet endroit ] -

- ]
diff --git a/formulaires/editer_gamuform.php b/formulaires/editer_gamuform.php index e93bc85..61ed648 100644 --- a/formulaires/editer_gamuform.php +++ b/formulaires/editer_gamuform.php @@ -1,124 +1,92 @@ array( + 'table' => $table, + 'id_objet' => $id_objet, + 'action' => 'gamuform', + 'update' => $update + ), + 'data' => $set + ) + ); + sql_updateq('spip_auteurs', $set, "$id=".intval($id_objet)); + } + } + + $retour = []; + if ($redirect === 'gamutable') { + $retour['redirect'] = ''; + if ($update) { + $retour['message_ok'] = gamutable_fermer_modalbox($id_objet); + } else { + $retour['message_ok'] = gamutable_fermer_modalbox(); + } + } else if ($redirect) { + $retour['redirect'] = $redirect; + } + + return $retour; } diff --git a/gamuform_administrations.php b/gamuform_administrations.php index 5fc5109..895eb92 100644 --- a/gamuform_administrations.php +++ b/gamuform_administrations.php @@ -26,7 +26,7 @@ if (!defined('_ECRIRE_INC_VERSION')) { function gamuform_upgrade($nom_meta_base_version, $version_cible) { $maj = array(); - $maj['create'] = array(array('maj_tables', array('spip_gamuforms', 'spip_gamuforms_valeurs'))); + // $maj['create'] = array(array('maj_tables', array('spip_gamuforms', 'spip_gamuforms_valeurs'))); include_spip('base/upgrade'); maj_plugin($nom_meta_base_version, $version_cible, $maj); @@ -41,18 +41,5 @@ function gamuform_upgrade($nom_meta_base_version, $version_cible) { * @return void **/ function gamuform_vider_tables($nom_meta_base_version) { - - sql_drop_table('spip_gamuforms'); - sql_drop_table('spip_gamuforms_valeurs'); - - # Nettoyer les liens courants (le génie optimiser_base_disparus se chargera de nettoyer toutes les tables de liens) - sql_delete('spip_documents_liens', sql_in('objet', array('gamuform'))); - sql_delete('spip_mots_liens', sql_in('objet', array('gamuform'))); - sql_delete('spip_auteurs_liens', sql_in('objet', array('gamuform'))); - # Nettoyer les versionnages et forums - sql_delete('spip_versions', sql_in('objet', array('gamuform'))); - sql_delete('spip_versions_fragments', sql_in('objet', array('gamuform'))); - sql_delete('spip_forum', sql_in('objet', array('gamuform'))); - effacer_meta($nom_meta_base_version); } diff --git a/gamuform_autorisations.php b/gamuform_autorisations.php index 1631836..8142eb1 100644 --- a/gamuform_autorisations.php +++ b/gamuform_autorisations.php @@ -20,81 +20,9 @@ if (!defined('_ECRIRE_INC_VERSION')) { function gamuform_autoriser() { } - -// ----------------- -// Objet gamuforms - - - - -/** - * Autorisation de créer (gamuform) - * - * @param string $faire Action demandée - * @param string $type Type d'objet sur lequel appliquer l'action - * @param int $id Identifiant de l'objet - * @param array $qui Description de l'auteur demandant l'autorisation - * @param array $opt Options de cette autorisation - * @return bool true s'il a le droit, false sinon -**/ -function autoriser_gamuform_creer_dist($faire, $type, $id, $qui, $opt) { - return in_array($qui['statut'], array('0minirezo', '1comite')); -} - -/** - * Autorisation de voir (gamuform) - * - * @param string $faire Action demandée - * @param string $type Type d'objet sur lequel appliquer l'action - * @param int $id Identifiant de l'objet - * @param array $qui Description de l'auteur demandant l'autorisation - * @param array $opt Options de cette autorisation - * @return bool true s'il a le droit, false sinon -**/ -function autoriser_gamuform_voir_dist($faire, $type, $id, $qui, $opt) { - return true; -} - -/** - * Autorisation de modifier (gamuform) - * - * @param string $faire Action demandée - * @param string $type Type d'objet sur lequel appliquer l'action - * @param int $id Identifiant de l'objet - * @param array $qui Description de l'auteur demandant l'autorisation - * @param array $opt Options de cette autorisation - * @return bool true s'il a le droit, false sinon -**/ function autoriser_gamuform_modifier_dist($faire, $type, $id, $qui, $opt) { - return in_array($qui['statut'], array('0minirezo', '1comite')); -} - -/** - * Autorisation de supprimer (gamuform) - * - * @param string $faire Action demandée - * @param string $type Type d'objet sur lequel appliquer l'action - * @param int $id Identifiant de l'objet - * @param array $qui Description de l'auteur demandant l'autorisation - * @param array $opt Options de cette autorisation - * @return bool true s'il a le droit, false sinon -**/ -function autoriser_gamuform_supprimer_dist($faire, $type, $id, $qui, $opt) { - return $qui['statut'] == '0minirezo' and !$qui['restreint']; + return in_array($qui['statut'], array('0minirezo')); } -/** - * Autorisation de lier/délier l'élément (gamuforms) - * - * @param string $faire Action demandée - * @param string $type Type d'objet sur lequel appliquer l'action - * @param int $id Identifiant de l'objet - * @param array $qui Description de l'auteur demandant l'autorisation - * @param array $opt Options de cette autorisation - * @return bool true s'il a le droit, false sinon -**/ -function autoriser_associergamuforms_dist($faire, $type, $id, $qui, $opt) { - return $qui['statut'] == '0minirezo' and !$qui['restreint']; -} diff --git a/gamuform_fonctions.php b/gamuform_fonctions.php index ed688ac..540e92d 100644 --- a/gamuform_fonctions.php +++ b/gamuform_fonctions.php @@ -12,3 +12,28 @@ if (!defined('_ECRIRE_INC_VERSION')) { return; } + +function gamuform_objet_autoriser(string $objet):bool { + if ( + !empty($GLOBALS['gamuform_objets']) + and !empty($objet) + and in_array($objet, $GLOBALS['gamuform_objets']) + ) { + return true; + } + return false; +} + +function gamuform_recup_champ($objet) { + $c = []; + + if (gamuform_objet_autoriser($objet)) { + $T = $GLOBALS['gamuform_'.$objet]; + if (!empty($T)) { + foreach ($T as $s) { + $c[] = $s['options']['nom']; + } + } + } + return $c; +} diff --git a/gamuform_options.php b/gamuform_options.php index 643a44d..3222223 100644 --- a/gamuform_options.php +++ b/gamuform_options.php @@ -12,3 +12,36 @@ if (!defined('_ECRIRE_INC_VERSION')) { return; } + + +$GLOBALS['gamuform_objets'] = [ 'auteur']; + + +$GLOBALS['gamuform_auteur'] = [ + [ + 'saisie' => 'input', + 'options' => array( + 'nom' => 'nom', + 'label' => 'Votre Nom', + 'obligatoire' => 'oui', + //'fonction' => 'ma_super_fonction' + //'modifier' => 'ma_super_fonction_pour_modifier' + ) + ], + [ + 'saisie' => 'input', + 'options' => array( + 'nom' => 'bio', + 'label' => 'Votre BIO', + 'obligatoire' => 'oui', + //'fonction' => 'ma_super_fonction' + ) + ], + [ + 'saisie' => 'input', + 'options' => array( + 'nom' => 'nom_site', + 'label' => 'Votre site perso', + ) + ] +]; diff --git a/gamuform_pipelines.php b/gamuform_pipelines.php index 060e564..3a48a65 100644 --- a/gamuform_pipelines.php +++ b/gamuform_pipelines.php @@ -13,26 +13,3 @@ if (!defined('_ECRIRE_INC_VERSION')) { return; } - - - - -/** - * Optimiser la base de données - * - * Supprime les liens orphelins de l'objet vers quelqu'un et de quelqu'un vers l'objet. - * Supprime les objets à la poubelle. - * - * @pipeline optimiser_base_disparus - * @param array $flux Données du pipeline - * @return array Données du pipeline - */ -function gamuform_optimiser_base_disparus($flux) { - - include_spip('action/editer_liens'); - $flux['data'] += objet_optimiser_liens(array('gamuform'=>'*'), '*'); - - sql_delete('spip_gamuforms', "statut='poubelle' AND maj < " . $flux['args']['date']); - - return $flux; -} diff --git a/inclure/creer_gamuform.html b/inclure/creer_gamuform.html deleted file mode 100644 index ae6a00a..0000000 --- a/inclure/creer_gamuform.html +++ /dev/null @@ -1,36 +0,0 @@ - -objet = #ENV{objet} - -
- - - - - - - - - - - - - - - - - - -
- - #ICON{plus,icon-lg} - - - #ICON{move,icon-lg,Rechercher} -
- -
diff --git a/inclure/editer_gamuform.html b/inclure/editer_gamuform.html new file mode 100644 index 0000000..774d3b3 --- /dev/null +++ b/inclure/editer_gamuform.html @@ -0,0 +1,8 @@ +#CACHE{0} +[(#AUTORISER{modifier,gamuform,#ENV{objet}}|sinon_interdire_acces)] + +
+
+ [(#FORMULAIRE_EDITER_GAMUFORM{#ENV{id}, #ENV{objet}, #ENV{redirect}})] +
+
diff --git a/inclure/gamuform.html b/inclure/gamuform.html deleted file mode 100644 index 56e2fb2..0000000 --- a/inclure/gamuform.html +++ /dev/null @@ -1,2 +0,0 @@ -[
(#ENV**|unserialize|print_r{1})
] - diff --git a/paquet.xml b/paquet.xml index 585de33..e750dda 100644 --- a/paquet.xml +++ b/paquet.xml @@ -3,30 +3,26 @@ categorie="outil" version="1.0.0" etat="dev" - compatibilite="[3.3.0-dev;3.3.*]" + compatibilite="[4.0.0;4.0.*]" logo="prive/themes/spip/images/gamuform-xx.svg" documentation="" - schema="1.0.0" > GamuForm - + tofulm - Logo : tofulm + Logo : tofulm GNU/GPL - + - + - - - -