Changeset 9886 in spip-zone

Timestamp:

Feb 25, 2007, 4:00:46 PM (14 years ago)

Author:

cedric@…

Message:

Baser la gestion des statuts des donnees sur autoriser('instituer','...._donnee', $id_donnee...)

Location:

_plugins_/_stable_/forms/forms_et_tables_1_9_1

Files:

• balise/forms.php (modified) (1 diff)
• forms_options.php (modified) (2 diffs)
• inc/forms.php (modified) (1 diff)
• inc/instituer_forms_donnee.php (modified) (8 diffs)
• lang/table_fr.php (modified) (1 diff)

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

@@ -51 +51 @@
         $valeurs = array('0'=>'0');
         $affiche_sondage = '';
-        $formactif = (_DIR_RESTREINT==_DIR_RESTREINT_ABS || preg_match(',donnees_edit$,',_request('exec')))?' ':'';
+        $formactif = (_DIR_RESTREINT==_DIR_RESTREINT_ABS || in_array(_request('exec'),$GLOBALS['forms_actif_exec']))?' ':'';
 
         $id_donnee = $id_donnee?$id_donnee:intval(_request('id_donnee'));

_plugins_/_stable_/forms/forms_et_tables_1_9_1/forms_options.php

@@ -16 +16 @@
 }
 include_spip('base/forms');
+$GLOBALS['forms_actif_exec'][] = 'donnees_edit';
 
 function autoriser_form_dist($faire, $type='', $id=0, $qui = NULL, $opt = NULL) {
@@ -55 +56 @@
         $dejareponse=Forms_verif_cookie_sondage_utilise($id_form);
         if ($dejareponse) return false;
+        return true;
+}
+function autoriser_table_donnee_instituer($faire,$type,$id_donnee,$qui,$opt) {
+        if (($qui['statut'] != '0minirezo')
+        OR !isset($opt['nouveau_statut'])
+        OR ($opt['nouveau_statut']=='prepa')) return false;
         return true;
 }

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

@@ -559 +559 @@
                         if ($moderation = 'posteriori') 
                                 $statut='publie';
-                        else 
-                                $statut = 'propose';
+                        else {
+                                $statut = 'prop';
+                                foreach(array('prepa','prop','publie','refuse') as $s)
+                                if (autoriser(
+                                                'instituer',
+                                                (in_array($row['type_form'],array('','sondage'))?'form':$row['type_form']).'_donnee',
+                                                0,NULL,array('id_form'=>$id_form,'statut'=>'prepa','nouveau_statut'=>$s))){
+                                        $statut = $s;
+                                        break;
+                                }
+                        }
                         // D'abord creer la reponse dans la base de donnees
                         if ($ok) {

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

@@ -15 +15 @@
 function inc_instituer_forms_donnee_dist($id_form, $id_donnee, $statut, $rang=NULL)
 {
+        $type_form = "form";
         $pi18n = "form";
         $res = spip_query("SELECT type_form FROM spip_forms WHERE id_form="._q($id_form));
@@ -20 +21 @@
                 AND $row['type_form']!=''
                 AND $rox['type_form']!='sondage')
-                        $pi18n = forms_prefixi18n($row['type_form']); 
+                        $type_form = $row['type_form'];
+        $pi18n = forms_prefixi18n($type_form); 
 
         $res =
@@ -34 +36 @@
         " setvisibility('valider_statut', 'visible');\">\n";
 
-        $atts = array("prepa"=>"",
+        $atts = array(
+        "prepa"=>"style='background-color: white'",
         "prop"=>"style='background-color: #FFF1C6'",
         "publie"=>"style='background-color: #B4E8C5'",
@@ -42 +45 @@
         foreach(array("prepa","prop","publie","poubelle","refuse") as $s) {
                 $lib = _T("$pi18n:texte_statut_$s");
-                if (strlen(trim($lib)))
+                if (
+                $s==$statut
+                OR autoriser('instituer',$type_form.'_donnee',$id_donnee,NULL,array('id_form'=>$id_form,'statut'=>$statut,'nouveau_statut'=>$s)) 
+                )
                         $res .= "<option"  . 
                                 mySel($s, $statut)  . " " .
                                 $atts[$s] . " >" .
-                                $lib .
+                                trim($lib) .
                                 "</option>\n";
         }
@@ -71 +77 @@
         static $script=NULL;
         static $pi18n = array();
+        static $type_form = array();
         
         if (!$id) {
@@ -77 +84 @@
         } else  $ajax_node = " id='imgstatutforms_donnee$id'";
 
-        if (!isset($pi18n[$id_form])){
-                $pi18n[$id_form] = "form";
+        if (!isset($type_form[$id_form])){
+                $type_form[$id_form] = "form";
                 $res = spip_query("SELECT type_form FROM spip_forms WHERE id_form="._q($id_form));
                 if ($row = spip_fetch_array($res)
                         AND $row['type_form']!=''
                         AND $rox['type_form']!='sondage')
-                                $pi18n[$id_form] = forms_prefixi18n($row['type_form']);
+                                $type_form[$id_form] = $row['type_form'];
         }
+        if (!isset($pi18n[$id_form]))
+                $pi18n[$id_form] = forms_prefixi18n($type_form[$id_form]);
 
         $p = $pi18n[$id_form];
@@ -99 +108 @@
         foreach($statuts as $s){
                 $lib[$s] = _T("$p:texte_statut_$s");
-                if (strlen(trim($lib[$s]))){
+                if ($lib[$s]{0}!=' ')
                         $clip[$s] = $c++;
-                }
-                else $clip[$s] = 0;
+                else 
+                        $clip[$s] = 0;
         }
         $width = 11*$c+1;
-        $inser_puce = http_img_pack($puce[$statut], $lib[$statut], " style='margin: 1px;'$ajax_node");
+        $inser_puce = http_img_pack($puce[$statut], trim($lib[$statut]), " style='margin: 1px;'$ajax_node");
 
         if (!autoriser('publierdans', 'form', $id_form))
@@ -117 +126 @@
                 . "<span class='puce_article_popup' id='statutdecalforms_donnee$id'\nonmouseout=\"cacher('statutdecalforms_donnee$id');\" style='margin-left: -".((11*$clip[$statut])+1)."px;width:{$width}px'>";
                 foreach($statuts as $s)
-                        if (strlen(trim($lib[$s])))
+                        if (autoriser('instituer',$type_form[$id_form].'_donnee',$id_donnee,NULL,array('id_form'=>$id_form,'statut'=>$statut,'nouveau_statut'=>$s)))
                         $res .= afficher_script_statut($id, 'forms_donnee', -((11*$clip[$s])+1), $puce[$s], $s, $lib[$s], $action);
                 $res .= "</span>";

_plugins_/_stable_/forms/forms_et_tables_1_9_1/lang/table_fr.php

@@ -24 +24 @@
 'nombre_reponses' => "@nombre@ données",
 'texte_donnee_statut' => "Statut de cette donnée",
-'texte_statut_prepa' => " ",
+'texte_statut_prepa' => "Donnée en cours de rédaction",
 'texte_statut_prop' => "Donnée proposée",
 'texte_statut_publie' => "Donnée publiée",