Update of /home/spip-cvs/spip/ecrire
In directory alan:/tmp/cvs-serv28193/ecrire
Modified Files:
articles_edit.php3 articles_forum.php3 inc_presentation.php3
sites_edit.php3
Log Message:
des modifs sur le suivi des forums (notamment, je pense que ça permet aux admins restreints de suivre les forums de leurs articles -- mais c'était peut-être déjà le cas auparavant.)
Index: sites_edit.php3
RCS file: /home/spip-cvs/spip/ecrire/sites_edit.php3,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- sites_edit.php3 3 Jul 2004 19:35:17 -0000 1.20
+++ sites_edit.php3 14 Jul 2004 09:29:12 -0000 1.21
@@ -33,7 +33,6 @@
static $i = 0, $premier = 1;
global $statut;
global $connect_toutes_rubriques;
- global $connect_id_rubriques;
global $couleur_claire, $spip_lang_left;
global $browser_name;
Index: articles_edit.php3
RCS file: /home/spip-cvs/spip/ecrire/articles_edit.php3,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- articles_edit.php3 3 Jul 2004 19:35:17 -0000 1.89
+++ articles_edit.php3 14 Jul 2004 09:29:12 -0000 1.90
@@ -264,7 +264,6 @@
static $i = 0, $premier = 1;
global $statut;
global $connect_toutes_rubriques;
- global $connect_id_rubriques;
global $couleur_claire, $spip_lang_left;
global $browser_name;
Index: inc_presentation.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_presentation.php3,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -d -r1.406 -r1.407
--- inc_presentation.php3 14 Jul 2004 00:45:31 -0000 1.406
+++ inc_presentation.php3 14 Jul 2004 09:29:12 -0000 1.407
@@ -1051,7 +1051,7 @@
// Afficher les forums
//
-function afficher_forum($request, $adresse_retour, $controle = "non", $recurrence = "oui") {
+function afficher_forum($request, $adresse_retour, $controle_id_article = 0) {
global $debut;
static $compteur_forum;
static $nb_forum;
@@ -1087,7 +1087,7 @@
$id_auteur=$row["id_auteur"];
if ($compteur_forum==1) echo "\n<br /><br />";
- $afficher = ($controle=="oui") ? ($statut!="perso") :
+ $afficher = ($controle_id_article) ? ($statut!="perso") :
(($statut=="prive" OR $statut=="privrac" OR $statut=="privadm" OR $statut=="perso")
OR ($statut=="publie" AND $id_parent > 0));
@@ -1134,39 +1134,29 @@
if ($bouton) echo " ".$bouton;
}
- if ($controle == "oui") {
+ if ($controle_id_article) {
if ($statut != "off") {
- echo controle_cache_forum('supp_forum',
- $id_forum,
- _T('icone_supprimer_message'),
- "articles_forum.php3?id_article=$id_article&debut=$debut#$id_forum",
- "forum-interne-24.gif",
- "supprimer.gif");
+ echo controle_cache_forum('supp_forum',
+ $id_forum,
+ _T('icone_supprimer_message'),
+ "articles_forum.php3?id_article=$controle_id_article&debut=$debut#$id_forum",
+ "forum-interne-24.gif",
+ "supprimer.gif");
}
else {
echo "<br><font color='red'><b>"._T('info_message_supprime')." $ip</b></font>";
if ($id_auteur) {
- echo " - <a href='auteurs_edit.php3?id_auteur=$id_auteur'>"._T('lien_voir_auteur')."</A>";
+ echo " - <a href='auteurs_edit.php3?id_auteur=$id_auteur'>"._T('lien_voir_auteur')."</a>";
}
}
if ($statut == "prop" OR $statut == "off") {
- $appelant= "forum.php3?$type=$valeur&id_forum=$id_forum";
- echo controle_cache_forum('valid_forum',
- $id_forum,
- _T('icone_valider_message'),
- "articles_forum.php3?id_article=$id_article&debut=$debut#$id_forum",
- "forum-interne-24.gif",
- "creer.gif"),
- controle_cache_forum('valid_forum',
- $id_forum,
- _T('icone_valider_message') . " & " .
- _T('lien_repondre_message'),
- "../$appelant&url=" .
- rawurlencode($appelant) .
- "&retour=" .
- rawurlencode("ecrire/controle_forum.php3?$rappel&#$id_forum"),
- "../img_pack/messagerie-24.gif",
- "creer.gif");
+ $appelant= "forum.php3?$type=$valeur&id_forum=$id_forum";
+ echo controle_cache_forum('valid_forum',
+ $id_forum,
+ _T('icone_valider_message'),
+ "articles_forum.php3?id_article=$id_article&debut=$debut#$id_forum",
+ "forum-interne-24.gif",
+ "creer.gif");
}
}
echo justifier(propre($texte));
@@ -1175,7 +1165,7 @@
echo "<div align='left' class='verdana2'><b><a href='$url_site'>$nom_site</a></b></div>";
}
- if ($controle != "oui") {
+ if (!$controle_id_article) {
echo "<div align='right' class='verdana1'>";
$url = "forum_envoi.php3?id_parent=$id_forum&adresse_retour=".rawurlencode($adresse_retour)
."&titre_message=".rawurlencode($titre);
@@ -1203,7 +1193,8 @@
}
echo "</td></tr></table>\n";
- if ($recurrence == "oui") forum($id_forum,$adresse_retour,$controle);
+ afficher_thread_forum($id_forum,$adresse_retour,$controle_id_article);
+
}
$i[$compteur_forum]++;
}
@@ -1211,10 +1202,10 @@
$compteur_forum--;
}
-function forum($le_forum, $adresse_retour, $controle = "non") {
- echo "<div class='serif2'>";
+function afficher_thread_forum($le_forum, $adresse_retour, $controle = 0) {
+ echo "<div class='serif2'>";
- if ($controle == "oui") {
+ if ($controle) {
$query_forum2 = "SELECT * FROM spip_forum WHERE id_parent='$le_forum' ORDER BY date_heure";
}
else {
@@ -1226,6 +1217,7 @@
echo "</div>";
}
+
//
// un bouton (en POST) a partir d'un URL en format GET
//
@@ -2954,15 +2946,16 @@
// a partir de l'espace des redacteurs (prive)
// utilisee aussi par controle_forum
-function controle_cache_forum($action, $id, $texte, $lien, $fond, $fonc)
-{
- return icone($texte,
- "../spip_cache.php3?$action=$id&redirect=" .
- rawurlencode($lien),
- $fond,
- $fonction,
- "right",
- 'non');
+function controle_cache_forum($action, $id, $texte, $lien, $fond, $fonc) {
+ global $connect_id_auteur;
+ $hash = calculer_action_auteur("$action $id");
+ return icone($texte,
+ "../spip_cache.php3?$action=$id&hash=$hash&id_auteur=$connect_id_auteur&redirect=" .
+ rawurlencode($lien),
+ $fond,
+ $fonction,
+ "right",
+ 'non');
}
?>
\ No newline at end of file
Index: articles_forum.php3
RCS file: /home/spip-cvs/spip/ecrire/articles_forum.php3,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- articles_forum.php3 3 Dec 2003 23:04:04 -0000 1.15
+++ articles_forum.php3 14 Jul 2004 09:29:12 -0000 1.16
@@ -63,6 +63,9 @@
echo "</td></tr></table>";
echo "<p>";
+// Ne pas donner les cles du forum a des non-admins
+if (! ($connect_statut=='0minirezo' AND acces_rubrique($id_rubrique)))
+ return;
echo "<div class='serif2'>";
@@ -97,18 +100,15 @@
}
echo "<A HREF='articles_forum.php3?id_article=$id_article&debut=$i&page=$page'>...</A>";
-echo $controle;
-
echo "</div>";
-
$mots_cles_forums = lire_meta("mots_cles_forums");
if ($connect_statut == "0minirezo") {
$query_forum = "SELECT * FROM spip_forum WHERE id_article='$id_article' AND id_parent=0 AND statut IN ('publie', 'off', 'prop') ORDER BY date_heure DESC LIMIT $debut, $pack";
$result_forum = spip_query($query_forum);
- afficher_forum($result_forum, $forum_retour, 'oui');
+ afficher_forum($result_forum, $forum_retour, $id_article);
}
echo "</FONT>";