diff --git a/.gitattributes b/.gitattributes
index e747ac5c96df926ee95ed3facd34f07cd8601539..234d149b2cfbff9b42eded860b1aae495c454e3b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -251,6 +251,7 @@ ecrire/inc_ajax.php3 -text
ecrire/inc_articles.php -text
ecrire/inc_barre.php3 -text
ecrire/inc_breves.php -text
+ecrire/inc_controle_forum.php -text
ecrire/inc_mini_nav.php -text
ecrire/inc_naviguer.php -text
ecrire/lang/ecrire_ru.php3 -text
diff --git a/ecrire/controle_forum.php3 b/ecrire/controle_forum.php3
index 613dfafe78dc44867a1530e1a2991964700c84ef..2add26d6b5ec464dbd695be14a14e8f86ac302c4 100644
--- a/ecrire/controle_forum.php3
+++ b/ecrire/controle_forum.php3
@@ -10,272 +10,15 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
-
include ("inc.php3");
-function forum_parent($id_forum) {
- $row=spip_fetch_array(spip_query("
-SELECT * FROM spip_forum WHERE id_forum=$id_forum AND statut != 'redac'
-"));
- if (!$row) return '';
- $id_forum=$row['id_forum'];
- $forum_id_parent=$row['id_parent'];
- $forum_id_rubrique=$row['id_rubrique'];
- $forum_id_article=$row['id_article'];
- $forum_id_breve=$row['id_breve'];
- $forum_id_syndic=$row['id_syndic'];
- $forum_stat=$row['statut'];
-
- if ($forum_id_article > 0) {
- $row=spip_fetch_array(spip_query("
-SELECT id_article, titre, statut FROM spip_articles WHERE id_article='$forum_id_article'"));
- $id_article = $row['id_article'];
- $titre = $row['titre'];
- $statut = $row['statut'];
- if ($forum_stat == "prive" OR $forum_stat == "privoff") {
- return array('pref' => _T('item_reponse_article'),
- 'url' => "articles.php3?id_article=$id_article",
- 'type' => 'id_article',
- 'valeur' => $id_article,
- 'titre' => $titre);
- } else {
- return array('pref' => _T('lien_reponse_article'),
- 'url' => generer_url_article($id_article),
- 'type' => 'id_article',
- 'valeur' => $id_article,
- 'titre' => $titre,
- 'avant' => "<a href='articles_forum.php3?id_article=$id_article'><font color='red'>"._T('lien_forum_public'). "</font></a><br>");
- }
- }
- else if ($forum_id_rubrique > 0) {
- $row = spip_fetch_array(spip_query("
-SELECT * FROM spip_rubriques WHERE id_rubrique='$forum_id_rubrique'"));
- $id_rubrique = $row['id_rubrique'];
- $titre = $row['titre'];
- return array('pref' => _T('lien_reponse_rubrique'),
- 'url' => generer_url_rubrique($id_rubrique),
- 'type' => 'id_rubrique',
- 'valeur' => $id_rubrique,
- 'titre' => $titre);
- }
- else if ($forum_id_syndic > 0) {
- $row = spip_fetch_array(spip_query("
-SELECT * FROM spip_syndic WHERE id_syndic='$forum_id_syndic'"));
- $id_syndic = $row['id_syndic'];
- $titre = $row['nom_site'];
- $statut = $row['statut'];
- return array('pref' => _T('lien_reponse_site_reference'),
- 'url' => "sites.php3?id_syndic=$id_syndic",
- 'type' => 'id_syndic',
- 'valeur' => $id_syndic,
- 'titre' => $titre);
- }
- else if ($forum_id_breve > 0) {
- $row = spip_fetch_array(spip_query("
-SELECT * FROM spip_breves WHERE id_breve='$forum_id_breve'"));
- $id_breve = $row['id_breve'];
- $date_heure = $row['date_heure'];
- $titre = $row['titre'];
- if ($forum_stat == "prive") {
- return array('pref' => _T('lien_reponse_breve'),
- 'url' => "breves_voir.php3?id_breve=$id_breve",
- 'type' => 'id_breve',
- 'valeur' => $id_breve,
- 'titre' => $titre);
- } else {
- return array('pref' => _T('lien_reponse_breve_2'),
- 'url' => generer_url_breve($id_breve),
- 'type' => 'id_breve',
- 'valeur' => $id_breve,
- 'titre' => $titre);
- }
- }
- else if ($forum_stat == "privadm") {
- $retour = forum_parent($forum_id_parent);
- if ($retour) return $retour;
- else return array('pref' => _T('info_message'),
- 'url' => 'forum_admin.php3',
- 'titre' => _T('info_forum_administrateur'));
- }
- else {
- $retour = forum_parent($forum_id_parent);
- if ($retour) return $retour;
- else return array('pref' => _T('info_message'),
- 'url' => 'forum.php3',
- 'titre' => _T('info_forum_interne'));
- }
-}
-
-
-function controle_forum($row, $rappel) {
- global $couleur_foncee;
- global $mots_cles_forums;
-
- $id_forum = $row['id_forum'];
- $forum_id_parent = $row['id_parent'];
- $forum_id_rubrique = $row['id_rubrique'];
- $forum_id_article = $row['id_article'];
- $forum_id_breve = $row['id_breve'];
- $forum_date_heure = $row['date_heure'];
- $forum_titre = echapper_tags($row['titre']);
- $forum_texte = echapper_tags($row['texte']);
- $forum_auteur = echapper_tags($row['auteur']);
- $forum_email_auteur = echapper_tags($row['email_auteur']);
- $forum_nom_site = echapper_tags($row['nom_site']);
- $forum_url_site = echapper_tags($row['url_site']);
- $forum_stat = $row['statut'];
- $forum_ip = $row['ip'];
- $forum_id_auteur = $row["id_auteur"];
-
- $r = forum_parent($id_forum);
- $avant = $r['avant'];
- $url = $r['url'];
- $titre = $r['titre'];
- $type = $r['type'];
- $valeur = $r['valeur'];
- $pref = $r['pref'];
-
- $cadre = "";
-
- $controle = "\n<br /><br /><a id='id$id_forum'></a>";
-
- $controle .= debut_cadre_thread_forum("", true, "", typo($forum_titre));
-
- if ($forum_stat=="off" OR $forum_stat == "privoff") {
- $controle .= "<div style='border: 2px #ff0000 dashed;'>";
- }
- else if ($forum_stat=="prop") {
- $controle .= "<div style='border: 2px yellow solid; background-color: white;'>";
- }
- else {
- $controle .= "<div>";
- }
-
- $controle .= "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n<tr><td width='100%' valign='top'><table width='100%' cellpadding='5' cellspacing='0'>\n<tr><td class='serif'><span class='arial2'>" .
- date_relative($forum_date_heure) .
- "</span>";
- if ($forum_auteur) {
- if ($forum_email_auteur)
- $forum_auteur="<a href='mailto:$forum_email_auteur?SUBJECT=".rawurlencode($forum_titre)."'>$forum_auteur</A>";
- $controle .= "<span class='arial2'> / <B>$forum_auteur</B></span>";
- }
-
- $controle .= boutons_controle_forum($id_forum, $forum_stat, $forum_id_auteur, "$type=$valeur", $forum_ip);
-
- $controle .= "\n<br />$avant<B>$pref <A HREF='$url'>$titre</A></B>" .
- "<P align='justify'>".propre($forum_texte);
-
- if (strlen($forum_url_site) > 10 AND strlen($forum_nom_site) > 3)
- $controle .= "\n<div align='left' class='serif'><B><A HREF='$forum_url_site'>$forum_nom_site</A></B></div>";
-
- if ($mots_cles_forums == "oui") {
- $query_mots = "SELECT * FROM spip_mots AS mots, spip_mots_forum AS lien WHERE lien.id_forum = '$id_forum' AND lien.id_mot = mots.id_mot";
- $result_mots = spip_query($query_mots);
-
- while ($row_mots = spip_fetch_array($result_mots)) {
- $titre_mot = propre($row_mots['titre']);
- $type_mot = propre($row_mots['type']);
- $controle .= "\n<li> <b>$type_mot :</b> $titre_mot";
- }
- }
-
- $controle .= "</TD></TR></TABLE>";
- $controle .= "</TD></TR></TABLE>\n";
-
- $controle .= "</div>".fin_cadre_thread_forum(true);
- return $controle;
-}
-
-debut_page(_T('titre_page_forum_suivi'), "redacteurs", "forum-controle");
-
-if (!$page) $page = "public";
-
-echo "<br><br><br>";
-gros_titre(_T('titre_forum_suivi'));
-barre_onglets("suivi_forum", $page);
-
-if ($connect_statut != "0minirezo" OR !$connect_toutes_rubriques) {
- echo "<B>"._T('avis_non_acces_page')."</B>";
- exit;
-}
-
-debut_gauche();
-debut_boite_info();
-echo "<FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=2>";
-echo _T('info_gauche_suivi_forum_2');
-echo aide("suiviforum");
-echo "</FONT>";
-
-// Afficher le lien RSS
-include_ecrire('inc_rss.php3');
-$op = 'forums';
-$args = array(
- 'page' => $page
-);
-echo "<div style='text-align: "
- . $GLOBALS['spip_lang_right']
- . ";'>"
- . bouton_spip_rss($op, $args)
- ."</div>";
-
-
-
-fin_boite_info();
-debut_droite();
-
-//
-// Debut de la page de controle
-//
-
-// recuperer le critere SQL qui selectionne nos forums
-$query_forum = critere_statut_controle_forum($page);
-
-// Si un id_controle_forum est demande, on adapte le debut
-if ($debut_id_forum = intval($debut_id_forum)
-AND $d = spip_fetch_array(spip_query("SELECT date_heure FROM spip_forum
-WHERE id_forum=$debut_id_forum"))) {
- $result_forum = spip_query("SELECT id_forum FROM spip_forum
- WHERE " . $query_forum . "
- AND date_heure > '".$d['date_heure']."'");
- $debut = spip_num_rows($result_forum);
-}
-if (!$debut=intval($debut)) $debut = 0;
-
-$pack = 20; // nb de forums affiches par page
-$enplus = 200; // intervalle affiche autour du debut
-$limitdeb = ($debut > $enplus) ? $debut-$enplus : 0;
-$limitnb = $debut + $enplus - $limitdeb;
-$rappel = "page=$page";
-$mots_cles_forums = lire_meta("mots_cles_forums");
-$controle = '';
-
-echo "<div class='serif2'>";
-$i = $limitdeb;
-if ($i>0) echo "<a href='controle_forum.php3?$rappel'>0</a> ... | ";
-
-$result_forum = spip_query("
-SELECT *
-FROM spip_forum
-WHERE " . $query_forum . "
-ORDER BY date_heure DESC LIMIT $limitnb OFFSET $limitdeb"
-);
-
-while ($row = spip_fetch_array($result_forum)) {
-
- // barre de navigation
- if ($i == $pack*floor($i/$pack)) {
- if ($i == $debut)
- echo "<FONT SIZE=3><B>$i</B></FONT>";
- else
- echo "<a href='controle_forum.php3?$rappel&debut=$i'>$i</a>";
- echo " | ";
- }
- // est-ce que ce message doit s'afficher dans la liste ?
- if (($i>=$debut) AND ($i<($debut + $pack)))
- $controle .= controle_forum($row, "$rappel&debut=$debut");
- $i ++;
- }
+$nom = "controle_forum";
+$f = find_in_path('inc_' . $nom . '.php');
+if ($f)
+ include($f);
+elseif (file_exists($f = (_DIR_INCLUDE . 'inc_' . $nom . '.php')))
+ include($f);
+if (function_exists($nom))
+ $nom($page, $debut, $debut_id_forum, $id_rubrique);
-echo "<a href='controle_forum.php3?$rappel&debut=$i'>...</a>$controle</div>";
-fin_page();
?>
diff --git a/ecrire/inc_controle_forum.php b/ecrire/inc_controle_forum.php
new file mode 100644
index 0000000000000000000000000000000000000000..c98d530dbfc32145c0c1987d2ddac03e7949b28b
--- /dev/null
+++ b/ecrire/inc_controle_forum.php
@@ -0,0 +1,310 @@
+<?php
+
+/***************************************************************************\
+ * SPIP, Systeme de publication pour l'internet *
+ * *
+ * Copyright (c) 2001-2005 *
+ * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
+ * *
+ * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
+ * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
+\***************************************************************************/
+
+function forum_parent($id_forum) {
+ $row=spip_fetch_array(spip_query("
+SELECT * FROM spip_forum WHERE id_forum=$id_forum AND statut != 'redac'
+"));
+ if (!$row) return '';
+ $id_forum=$row['id_forum'];
+ $forum_id_parent=$row['id_parent'];
+ $forum_id_rubrique=$row['id_rubrique'];
+ $forum_id_article=$row['id_article'];
+ $forum_id_breve=$row['id_breve'];
+ $forum_id_syndic=$row['id_syndic'];
+ $forum_stat=$row['statut'];
+
+ if ($forum_id_article > 0) {
+ $row=spip_fetch_array(spip_query("
+SELECT id_article, titre, statut FROM spip_articles WHERE id_article='$forum_id_article'"));
+ $id_article = $row['id_article'];
+ $titre = $row['titre'];
+ $statut = $row['statut'];
+ if ($forum_stat == "prive" OR $forum_stat == "privoff") {
+ return array('pref' => _T('item_reponse_article'),
+ 'url' => "articles.php3?id_article=$id_article",
+ 'type' => 'id_article',
+ 'valeur' => $id_article,
+ 'titre' => $titre);
+ } else {
+ return array('pref' => _T('lien_reponse_article'),
+ 'url' => generer_url_article($id_article),
+ 'type' => 'id_article',
+ 'valeur' => $id_article,
+ 'titre' => $titre,
+ 'avant' => "<a href='articles_forum.php3?id_article=$id_article'><font color='red'>"._T('lien_forum_public'). "</font></a><br>");
+ }
+ }
+ else if ($forum_id_rubrique > 0) {
+ $row = spip_fetch_array(spip_query("
+SELECT * FROM spip_rubriques WHERE id_rubrique='$forum_id_rubrique'"));
+ $id_rubrique = $row['id_rubrique'];
+ $titre = $row['titre'];
+ return array('pref' => _T('lien_reponse_rubrique'),
+ 'url' => generer_url_rubrique($id_rubrique),
+ 'type' => 'id_rubrique',
+ 'valeur' => $id_rubrique,
+ 'titre' => $titre);
+ }
+ else if ($forum_id_syndic > 0) {
+ $row = spip_fetch_array(spip_query("
+SELECT * FROM spip_syndic WHERE id_syndic='$forum_id_syndic'"));
+ $id_syndic = $row['id_syndic'];
+ $titre = $row['nom_site'];
+ $statut = $row['statut'];
+ return array('pref' => _T('lien_reponse_site_reference'),
+ 'url' => "sites.php3?id_syndic=$id_syndic",
+ 'type' => 'id_syndic',
+ 'valeur' => $id_syndic,
+ 'titre' => $titre);
+ }
+ else if ($forum_id_breve > 0) {
+ $row = spip_fetch_array(spip_query("
+SELECT * FROM spip_breves WHERE id_breve='$forum_id_breve'"));
+ $id_breve = $row['id_breve'];
+ $date_heure = $row['date_heure'];
+ $titre = $row['titre'];
+ if ($forum_stat == "prive") {
+ return array('pref' => _T('lien_reponse_breve'),
+ 'url' => "breves_voir.php3?id_breve=$id_breve",
+ 'type' => 'id_breve',
+ 'valeur' => $id_breve,
+ 'titre' => $titre);
+ } else {
+ return array('pref' => _T('lien_reponse_breve_2'),
+ 'url' => generer_url_breve($id_breve),
+ 'type' => 'id_breve',
+ 'valeur' => $id_breve,
+ 'titre' => $titre);
+ }
+ }
+ else if ($forum_stat == "privadm") {
+ $retour = forum_parent($forum_id_parent);
+ if ($retour) return $retour;
+ else return array('pref' => _T('info_message'),
+ 'url' => 'forum_admin.php3',
+ 'titre' => _T('info_forum_administrateur'));
+ }
+ else {
+ $retour = forum_parent($forum_id_parent);
+ if ($retour) return $retour;
+ else return array('pref' => _T('info_message'),
+ 'url' => 'forum.php3',
+ 'titre' => _T('info_forum_interne'));
+ }
+}
+
+
+function controle_un_forum($row, $rappel) {
+ global $couleur_foncee;
+
+ $id_forum = $row['id_forum'];
+ $forum_id_parent = $row['id_parent'];
+ $forum_id_rubrique = $row['id_rubrique'];
+ $forum_id_article = $row['id_article'];
+ $forum_id_breve = $row['id_breve'];
+ $forum_date_heure = $row['date_heure'];
+ $forum_titre = echapper_tags($row['titre']);
+ $forum_texte = echapper_tags($row['texte']);
+ $forum_auteur = echapper_tags($row['auteur']);
+ $forum_email_auteur = echapper_tags($row['email_auteur']);
+ $forum_nom_site = echapper_tags($row['nom_site']);
+ $forum_url_site = echapper_tags($row['url_site']);
+ $forum_stat = $row['statut'];
+ $forum_ip = $row['ip'];
+ $forum_id_auteur = $row["id_auteur"];
+
+ $r = forum_parent($id_forum);
+ $avant = $r['avant'];
+ $url = $r['url'];
+ $titre = $r['titre'];
+ $type = $r['type'];
+ $valeur = $r['valeur'];
+ $pref = $r['pref'];
+
+ $cadre = "";
+
+ $controle = "\n<br /><br /><a id='id$id_forum'></a>";
+
+ $controle .= debut_cadre_thread_forum("", true, "", typo($forum_titre));
+
+ if ($forum_stat=="off" OR $forum_stat == "privoff") {
+ $controle .= "<div style='border: 2px #ff0000 dashed;'>";
+ }
+ else if ($forum_stat=="prop") {
+ $controle .= "<div style='border: 2px yellow solid; background-color: white;'>";
+ }
+ else {
+ $controle .= "<div>";
+ }
+
+ $controle .= "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n<tr><td width='100%' valign='top'><table width='100%' cellpadding='5' cellspacing='0'>\n<tr><td class='serif'><span class='arial2'>" .
+ date_relative($forum_date_heure) .
+ "</span>";
+ if ($forum_auteur) {
+ if ($forum_email_auteur)
+ $forum_auteur="<a href='mailto:$forum_email_auteur?SUBJECT=".rawurlencode($forum_titre)."'>$forum_auteur</A>";
+ $controle .= "<span class='arial2'> / <B>$forum_auteur</B></span>";
+ }
+
+ $controle .= boutons_controle_forum($id_forum, $forum_stat, $forum_id_auteur, "$type=$valeur", $forum_ip);
+
+ $controle .= "\n<br />$avant<B>$pref <A HREF='$url'>$titre</A></B>" .
+ "<P align='justify'>".propre($forum_texte);
+
+ if (strlen($forum_url_site) > 10 AND strlen($forum_nom_site) > 3)
+ $controle .= "\n<div align='left' class='serif'><B><A HREF='$forum_url_site'>$forum_nom_site</A></B></div>";
+
+ if (lire_meta("mots_cles_forums") == "oui") {
+ $query_mots = "SELECT * FROM spip_mots AS mots, spip_mots_forum AS lien WHERE lien.id_forum = '$id_forum' AND lien.id_mot = mots.id_mot";
+ $result_mots = spip_query($query_mots);
+
+ while ($row_mots = spip_fetch_array($result_mots)) {
+ $titre_mot = propre($row_mots['titre']);
+ $type_mot = propre($row_mots['type']);
+ $controle .= "\n<li> <b>$type_mot :</b> $titre_mot";
+ }
+ }
+
+ $controle .= "</TD></TR></TABLE>";
+ $controle .= "</TD></TR></TABLE>\n";
+
+ $controle .= "</div>".fin_cadre_thread_forum(true);
+ return $controle;
+}
+
+//
+// Debut de la page de controle
+//
+
+function controle_forum($page, $debut, $debut_id_forum, $id_rubrique)
+{
+
+ global $connect_statut, $connect_toutes_rubriques;
+
+ debut_page(_T('titre_page_forum_suivi'), "redacteurs", "forum-controle");
+
+ if (!$page) $page = "public";
+
+ echo "<br><br><br>";
+ gros_titre(_T('titre_forum_suivi'));
+
+// faut rajouter id_rubrique donc on n'appelle plus
+// barre_onglets("suivi_forum", $page);
+// on expanse
+
+ $rappel = 'controle_forum.php3?' .
+ ($id_rubrique ? "id_rubrique=$id_rubrique&" : "") .
+ 'page=';
+
+ debut_onglet();
+ onglet(_T('onglet_messages_publics'), $rappel . "public", "public", $onglet, "forum-public-24.gif");
+ onglet(_T('onglet_messages_internes'), $rappel . "interne", "interne", $onglet, "forum-interne-24.gif");
+
+ if (spip_fetch_array(spip_query("SELECT id_forum FROM spip_forum WHERE statut='publie' AND texte='' LIMIT 1")))
+ onglet(_T('onglet_messages_vide'), $rappel . "vide", "vide", $onglet);
+
+ if (spip_fetch_array(spip_query("SELECT F.id_forum " .
+ critere_statut_controle_forum('prop', $id_rubrique) .
+ " LIMIT 1")))
+ onglet(_T('texte_statut_attente_validation'), $rappel . "prop", "prop", $onglet);
+
+ fin_onglet();
+
+ if (($connect_statut != "0minirezo") OR
+ (!$connect_toutes_rubriques AND
+ (!$id_rubrique OR !acces_rubrique($id_rubrique)))) {
+ echo "<B>"._T('avis_non_acces_page')."</B>";
+ exit;
+ }
+ $query_forum = critere_statut_controle_forum($page, $id_rubrique);
+// Si un id_controle_forum est demande, on adapte le debut
+if ($debut_id_forum = intval($debut_id_forum)
+AND $d = spip_fetch_array(spip_query("SELECT date_heure FROM spip_forum
+WHERE id_forum=$debut_id_forum"))) {
+ $result_forum = spip_query("SELECT F.id_forum " . $query_forum . " AND F.date_heure > '".$d['date_heure']."'");
+ $debut = spip_num_rows($result_forum);
+}
+if (!$debut=intval($debut)) $debut = 0;
+
+ $pack = 20; // nb de forums affiches par page
+ $enplus = 200; // intervalle affiche autour du debut
+ $limitdeb = ($debut > $enplus) ? $debut-$enplus : 0;
+ $limitnb = $debut + $enplus - $limitdeb;
+
+ $result_forum = spip_query("SELECT
+F.id_forum,
+F.id_parent,
+F.id_rubrique,
+F.id_article,
+F.id_breve,
+F.date_heure,
+F.titre,
+F.texte,
+F.auteur,
+F.email_auteur,
+F.nom_site,
+F.url_site,
+F.statut,
+F.ip,
+F.id_auteur
+$query_forum ORDER BY F.date_heure DESC LIMIT $limitnb OFFSET $limitdeb");
+
+ debut_gauche();
+ debut_boite_info();
+ echo "<FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=2>";
+ echo _T('info_gauche_suivi_forum_2');
+ echo aide("suiviforum");
+ echo "</FONT>";
+
+ // Afficher le lien RSS
+ include_ecrire('inc_rss.php3');
+ $op = 'forums';
+ $args = array(
+ 'page' => $page
+ );
+ echo "<div style='text-align: "
+ . $GLOBALS['spip_lang_right']
+ . ";'>"
+ . bouton_spip_rss($op, $args)
+ ."</div>";
+
+ fin_boite_info();
+ debut_droite();
+
+ echo "<div class='serif2'>";
+ $i = $limitdeb;
+ if ($i>0) echo "<a href='$rappel'>0</a> ... | ";
+ $controle = '';
+ $rappel .= $page;
+
+ while ($row = spip_fetch_array($result_forum)) {
+
+ // barre de navigation
+ if ($i == $pack*floor($i/$pack)) {
+ if ($i == $debut)
+ echo "<FONT SIZE=3><B>$i</B></FONT>";
+ else
+ echo "<a href='$rappel&debut=$i'>$i</a>";
+ echo " | ";
+ }
+ // est-ce que ce message doit s'afficher dans la liste ?
+ if (($i>=$debut) AND ($i<($debut + $pack)))
+ $controle .= controle_un_forum($row, "$rappel&debut=$debut");
+ $i ++;
+ }
+
+echo "<a href='$rappel&debut=$i'>...</a>$controle</div>";
+fin_page();
+}
+
+?>
diff --git a/ecrire/inc_documents.php3 b/ecrire/inc_documents.php3
index 17b4a3275ffd190e8881fbc9c13dfa6713e774b5..53f40111e257d774ef9a1981b4df3949be7503a2 100644
--- a/ecrire/inc_documents.php3
+++ b/ecrire/inc_documents.php3
@@ -488,7 +488,7 @@ function afficher_upload($link, $redirect='', $intitule, $inclus = '', $envoi_mu
echo debut_block_invisible("ftp$num_form");
- if ($connect_statut == '0minirezo' AND $connect_toutes_rubriques
+ if ($connect_statut == '0minirezo' # AND $connect_toutes_rubriques
AND $envoi_multiple) {
$texte_upload = texte_upload_manuel(_DIR_TRANSFERT, $inclus);
if ($texte_upload) {
diff --git a/ecrire/inc_forum.php3 b/ecrire/inc_forum.php3
index e4fea93c7aec91173250ea3c7ff36ab33cebd18d..e1b9abf619e25c326c7ef9e9972f2789e1105807 100644
--- a/ecrire/inc_forum.php3
+++ b/ecrire/inc_forum.php3
@@ -196,26 +196,30 @@ function boutons_controle_forum($id_forum, $forum_stat, $forum_id_auteur=0, $ref
return $controle;
}
-// Selon ce qu'on veut suivre depuis ecrire/controle_forum, retourner le SQL
-function critere_statut_controle_forum($page) {
- switch ($page) {
+// recuperer le critere SQL qui selectionne nos forums
+function critere_statut_controle_forum($page, $id_rubrique=0) {
+ if (!$id_rubrique)
+ $query_forum = "FROM spip_forum AS F WHERE ";
+ else
+ $query_forum = "FROM spip_forum AS F, spip_articles AS A WHERE A.id_secteur=$id_rubrique AND F.id_article=A.id_article AND ";
+
+ switch ($page) {
case 'public':
- $query_forum = "statut IN ('publie', 'off', 'prop') AND texte!=''";
+ $query_forum .= "F.statut IN ('publie', 'off', 'prop') AND F.texte!=''";
break;
case 'prop':
- $query_forum = "statut='prop'";
+ $query_forum .= "F.statut='prop'";
break;
case 'interne':
- $query_forum = "statut IN ('prive', 'privrac', 'privoff', 'privadm') AND texte!=''";
+ $query_forum .= "F.statut IN ('prive', 'privrac', 'privoff', 'privadm') AND F.texte!=''";
break;
case 'vide':
- $query_forum = "statut IN ('publie', 'off', 'prive', 'privrac', 'privoff', 'privadm') AND texte=''";
+ $query_forum .= "F.statut IN ('publie', 'off', 'prive', 'privrac', 'privoff', 'privadm') AND F.texte=''";
break;
default:
- $query_forum = "0=1";
+ $query_forum .= "0=1";
break;
}
-
return $query_forum;
}
diff --git a/ecrire/inc_naviguer.php b/ecrire/inc_naviguer.php
index 8b7e59894c4b7fc97034bfd48b54cbfa69680ee9..18bbb8aba2165c449bac354e026fb105020a6ff7 100644
--- a/ecrire/inc_naviguer.php
+++ b/ecrire/inc_naviguer.php
@@ -2,6 +2,7 @@
function infos_naviguer($id_rubrique, $statut)
{
+ global $connect_statut, $connect_toutes_rubriques;
if ($id_rubrique > 0) {
debut_boite_info();
@@ -12,6 +13,16 @@ function infos_naviguer($id_rubrique, $statut)
voir_en_ligne ('rubrique', $id_rubrique, $statut);
+ if ($connect_statut == "0minirezo" && acces_rubrique($id_rubrique)) {
+ list($id_parent) = spip_fetch_array(spip_query("SELECT id_parent FROM spip_rubriques WHERE id_rubrique=$id_rubrique"));
+ if (!$id_parent) {
+ list($n) = spip_fetch_array(spip_query("SELECT COUNT(*) " .
+ critere_statut_controle_forum('prop', $id_rubrique)));
+ if ($n)
+ icone_horizontale(_T('icone_suivi_forum', array('nb_forums' => $n)),
+ "controle_forum.php3?id_rubrique=$id_rubrique", "suivi-forum-24.gif", "");
+ }
+ }
fin_boite_info();
}
}
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index 5454d0d6e691dbd2a5d252f4fddaefb82f8cd53a..cc596c07502fa811b9db02daf948c73bec4e7e5a 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -2390,7 +2390,7 @@ else {
icone_bandeau_principal (_T('icone_edition_site'), "naviguer.php3", "documents-48$spip_lang_rtl.png", "documents", $rubrique, "", "rubriques", $sous_rubrique);
icone_bandeau_principal (_T('titre_forum'), "forum.php3", "messagerie-48.png", "redacteurs", $rubrique, "", "forum-interne", $sous_rubrique);
icone_bandeau_principal (_T('icone_auteurs'), "auteurs.php3", "redacteurs-48.png", "auteurs", $rubrique, "", "redacteurs", $sous_rubrique);
- if ($connect_statut == "0minirezo" AND $connect_toutes_rubriques AND lire_meta("activer_statistiques") != 'non') {
+ if ($connect_statut == "0minirezo" AND lire_meta("activer_statistiques") != 'non') {
//bandeau_barre_verticale();
icone_bandeau_principal (_T('icone_statistiques_visites'), "statistiques_visites.php3", "statistiques-48.png", "suivi", $rubrique, "", "statistiques", $sous_rubrique);
}