Changeset 54233 in spip-zone

Timestamp:

Nov 9, 2011, 9:42:02 AM (8 years ago)

Author:

cedric@…

Message:

homogeneiser les autorisations modifier en tenant compte du statut passe en option

Location:

_core_/plugins

Files:

• breves/breves_autoriser.php (modified) (1 diff)
• sites/sites_autoriser.php (modified) (1 diff)

_core_/plugins/breves/breves_autoriser.php

@@ -46 +46 @@
         $r = sql_fetsel("id_rubrique,statut", "spip_breves", "id_breve=".intval($id));
         return
-                ($r['statut'] == 'publie')
+                $r AND (
+                ($r['statut'] == 'publie' OR (isset($opt['statut']) AND $opt['statut']=='publie'))
                         ? autoriser('publierdans', 'rubrique', $r['id_rubrique'], $qui, $opt)
-                        : in_array($qui['statut'], array('0minirezo', '1comite'));
+                        : in_array($qui['statut'], array('0minirezo', '1comite'))
+                );
 }
 

_core_/plugins/sites/sites_autoriser.php

@@ -68 +68 @@
                 return true;
 
-        $t = sql_fetsel("id_rubrique,statut", "spip_syndic", "id_syndic=".intval($id));
-        return ($t
-                AND autoriser('voir','rubrique',$t['id_rubrique'])
-                AND ($t['statut'] == 'prop'
-                        OR autoriser('modifier', 'rubrique', $t['id_rubrique'])
-                )
+        $r = sql_fetsel("id_rubrique,statut", "spip_syndic", "id_syndic=".intval($id));
+        return ($r
+                AND autoriser('voir','rubrique',$r['id_rubrique'])
+                AND
+                ($r['statut'] == 'publie' OR (isset($opt['statut']) AND $opt['statut']=='publie'))
+                        ? autoriser('publierdans', 'rubrique', $r['id_rubrique'], $qui, $opt)
+                        : in_array($qui['statut'], array('0minirezo', '1comite'))
         );
 }