Changeset 10119 in spip-zone

Timestamp:

Mar 4, 2007, 5:39:09 PM (14 years ago)

Author:

cedric@…

Message:

"defaut de la boite de jointure"

Location:

_plugins_/_stable_/forms/forms_et_tables_1_9_1

Files:

• action/forms_lier_donnees.php (modified) (1 diff)
• balise/forms.php (modified) (1 diff)
• forms_fonctions.php (modified) (1 diff)
• forms_options.php (modified) (1 diff)
• inc/forms.php (modified) (1 diff)

_plugins_/_stable_/forms/forms_et_tables_1_9_1/action/forms_lier_donnees.php

@@ -65 +65 @@
                 }
         }
+        include_spip('inc/headers');
         redirige_par_entete(str_replace("&","&",urldecode($redirect)));
 }

_plugins_/_stable_/forms/forms_et_tables_1_9_1/balise/forms.php

@@ -73 +73 @@
                           $reponse = _T($message_confirm,array('mail'=>$reponse));
                         if (!_DIR_RESTREINT 
-                          AND (($r=_request('id_donnee'))===NULL OR $r==$id_donnee OR $r<0) )
+                          AND (($r=_request('id_donnee'))===NULL OR $r==$id_donnee OR ($r<0 AND !in_array(_request('exec'),$GLOBALS['forms_saisie_km_exec']))) )
                                 $valeurs = Forms_valeurs($id_form,$id_donnee);
                         else

_plugins_/_stable_/forms/forms_et_tables_1_9_1/forms_fonctions.php

@@ -131 +131 @@
                 if (!_DIR_RESTREINT){
                         $forms_lier_donnees = charger_fonction('forms_lier_donnees','inc');
-                        $out = $forms_lier_donnees('donnee',"$id_donnee;$champ;$id_form",_request('exec'));
+                        $out = $forms_lier_donnees('donnee',"$id_donnee-$champ-$id_form",_request('exec'));
                 }
                 return $out;

_plugins_/_stable_/forms/forms_et_tables_1_9_1/forms_options.php

@@ -17 +17 @@
 include_spip('base/forms');
 $GLOBALS['forms_actif_exec'][] = 'donnees_edit';
+$GLOBALS['forms_saisie_km_exec'][] = 'donnees_edit';
 
 function autoriser_form_dist($faire, $type='', $id=0, $qui = NULL, $opt = NULL) {

_plugins_/_stable_/forms/forms_et_tables_1_9_1/inc/forms.php

@@ -93 +93 @@
         function forms_type_table_lier($type,$id){
                 $type_table = 'table';
-                if ($type == 'donnee'){
-                        $id = explode(';',$id);
-                        $id_donnee_source = $id[0];
-                        $champ = $id[1];
-                        $id_form = $id[2];
+                if ($type == 'donnee' AND preg_match(",^(-?[0-9]+)-([a-z_0-9]+)-([0-9]+)$,",$id,$reg)){
+                        $id_donnee_source = $reg[1];
+                        $champ = $reg[2];
+                        $id_form = $reg[3];
                         $res = spip_query("SELECT extra_info FROM spip_forms_champs WHERE id_form="._q($id_form)." AND champ="._q($champ));
                         if($row = spip_fetch_array($res))