[Agora-commits] agora/ecrire affichage_message.php3,1.13,1.14
maciek at adullact1.hosting.cri74.org
maciek at adullact1.hosting.cri74.org
Jeu 1 Sep 12:53:02 CEST 2005
Update of /cvsroot/agora/agora/ecrire
In directory adullact1:/tmp/cvs-serv13001/ecrire
Modified Files:
affichage_message.php3
Log Message:
Fixing forums.
Patches by Lukasz Zachulski. We're still waiting for his CVS access, by the way.
Index: affichage_message.php3
===================================================================
RCS file: /cvsroot/agora/agora/ecrire/affichage_message.php3,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- affichage_message.php3 7 Jul 2004 17:31:47 -0000 1.13
+++ affichage_message.php3 1 Sep 2005 10:52:59 -0000 1.14
@@ -143,49 +143,52 @@
}
+
function controle_forum($row) {
- global $couleur_foncee;
- global $mots_cles_forums;
- global $controle_sans;
- global $debut, $page;
- global $type_forum;
- global $id_current_forum;
- global $affMessage;
- global $ageMessage;
- global $affType;
+ global $couleur_foncee;
+ global $mots_cles_forums;
+ global $controle_sans;
+ global $debut, $page;
+ global $type_forum;
+ global $id_current_forum;
+ global $affMessage;
+ global $ageMessage;
+ global $affType;
global $connect_toutes_rubriques;
if(is_array($affMessage)) $affMessage = implode(",",$affMessage);
$controle = "<br /><br />";
- $id_forum = $row->getForumId();
- $forum_id_parent = $row->getParentId();
- $forum_id_rubrique = $row->getRubriqueId();
- $forum_id_article = $row->getArticleId();
- $forum_id_breve = $row->getBreveId();
- $forum_date_heure = $row->getDateHeure();
- $forum_titre = echapper_tags($row->getTitre());
- $forum_texte = echapper_tags($row->gettexte());
- $forum_auteur = echapper_tags($row->getAuteur());
- $forum_email_auteur = echapper_tags($row->getEmailAuteur());
- $forum_nom_site = echapper_tags($row->getNomSite());
- $forum_url_site = echapper_tags($row->getUrlSite);
- $forum_stat = $row->getStatut();
- $forum_ip = $row->getIp();
- $forum_id_auteur = $row->getAuteurId();
+ $id_forum = $row->getForumId();
+ $forum_id_parent = $row->getParentId();
+ $forum_id_rubrique = $row->getRubriqueId();
+ $forum_id_article = $row->getArticleId();
+ $forum_id_breve = $row->getBreveId();
+ $forum_date_heure = $row->getDateHeure();
+ $forum_titre = echapper_tags($row->getTitre());
+
+ $forum_texte = echapper_tags($row->getTexte());
+
+ $forum_auteur = echapper_tags($row->getAuteur());
+ $forum_email_auteur = echapper_tags($row->getEmailAuteur());
+ $forum_nom_site = echapper_tags($row->getNomSite());
+ $forum_url_site = echapper_tags($row->getUrlSite);
+ $forum_stat = $row->getStatut();
+ $forum_ip = $row->getIp();
+ $forum_id_auteur = $row->getAuteurId();
$controle .= icone(_T('icone_retour'), "controle_forum_suite.php3?affMessage[]=$affMessage&id_forum=$id_forum&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&ageMessage=$ageMessage&vierge=1", "racine-site-24.gif", "rien.gif");
- if ($forum_stat=="off" OR $forum_stat == "privoff")
- $controle .= "<div style='border: 2px #ff0000 dashed; background-color: white;'>";
- else if ($forum_stat=="prop")
- $controle .= "<div style='border: 2px yellow solid; background-color: white;'>";
- else {
- $controle .= "<div style='border-right: 1px solid #cccccc; border-bottom: 1px solid #cccccc;'>";
- $controle .= "<div style='border: 1px #999999 dashed; background-color: white;'>";
- }
+ if ($forum_stat=="off" OR $forum_stat == "privoff")
+ $controle .= "<div style='border: 2px #ff0000 dashed; background-color: white;'>";
+ else if ($forum_stat=="prop")
+ $controle .= "<div style='border: 2px yellow solid; background-color: white;'>";
+ else {
+ $controle .= "<div style='border-right: 1px solid #cccccc; border-bottom: 1px solid #cccccc;'>";
+ $controle .= "<div style='border: 1px #999999 dashed; background-color: white;'>";
+ }
- $controle .= "<table width=100% cellpadding=0 cellspacing=0 border=0><tr>";
- $controle .= "<td width=100% valign='top'>";
+ $controle .= "<table width=100% cellpadding=0 cellspacing=0 border=0><tr>";
+ $controle .= "<td width=100% valign='top'>";
$controle .= "<table width=100% cellpadding=5 cellspacing=0 border=0>";
@@ -200,80 +203,87 @@
if($forum_stat == 'publie') {
$controle .= "<td bgcolor='$couleur_foncee'><a href='editer_message.php3?affMessage[]=$affMessage&id_current_forum=$id_current_forum&id_forum=$id_forum&type_forum=$type_forum&ageMessage=$ageMessage&affType=$affType&debut=$debut$controle_sans&page=$page&new=oui'><font face='Verdana,Arial,Helvetica,sans-serif' size=2 color='#FFFFFF'>Répondre</font></a></td>";
}
- else {
+ else {
$controle .= "<td bgcolor='$couleur_foncee'> </td>";
}
- $controle .= "</tr><tr><td colspan=4>";
- $forumMetier = &recuperer_instance_forum();
- $controle .= "<font face='arial,helvetica' size='-2'>".$forumMetier->getBranch($id_forum, array_merge($_GET, $_POST))."</font>";
- $controle .= "<br /><br /><font face='arial,helvetica'>".affdate_heure($forum_date_heure)."</font>";
- if ($forum_auteur) {
- if ($forum_email_auteur)
- $forum_auteur="<a href=\"mailto:$forum_email_auteur?SUBJECT=".rawurlencode($forum_titre)."\">$forum_auteur</a>";
- $controle .= "<font face='arial,helvetica'> / <strong>$forum_auteur</strong></font>";
- }
+ $controle .= "</tr><tr><td colspan=4>";
+ $forumMetier = &recuperer_instance_forum();
+ $controle .= "<font face='arial,helvetica' size='-2'>".$forumMetier->getBranch($id_forum, array_merge($_GET, $_POST))."</font>";
+ $controle .= "<br /><br /><font face='arial,helvetica'>".affdate_heure($forum_date_heure)."</font>";
+ if ($forum_auteur) {
+ if ($forum_email_auteur)
+ $forum_auteur="<a href=\"mailto:$forum_email_auteur?SUBJECT=".rawurlencode($forum_titre)."\">$forum_auteur</a>";
+ $controle .= "<font face='arial,helvetica'> / <strong>$forum_auteur</strong></font>";
+ }
-
- $forumMetier = &recuperer_instance_forum();
- switch ($forum_stat) {
- case 'publie':
- if($forumMetier->changeStatutOK($id_forum, 'poubelle')) {
- $controle .= icone(_T('icone_supprimer_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&poub_forum=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer.gif", "right", 'non');
- }
- if($forumMetier->changeStatutOK($id_forum, 'off')) {
- $controle .= icone(_T('icone_desactiver_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&off_forum=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer_agora.gif", "right", 'non');
- }
- break;
-
- case 'prop':
+
+ $forumMetier = &recuperer_instance_forum();
+ switch ($forum_stat) {
+ case 'publie':
+ if($forumMetier->changeStatutOK($id_forum, 'poubelle')) {
+ $controle .= icone(_T('icone_supprimer_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&poub_forum=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer.gif", "right", 'non');
+ }
+ if($forumMetier->changeStatutOK($id_forum, 'off')) {
+ $controle .= icone(_T('icone_desactiver_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&off_forum=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer_agora.gif", "right", 'non');
+ }
+ break;
+
+ case 'prop':
if($forumMetier->changeStatutOK($id_forum, 'poubelle')) {
$controle .= icone(_T('icone_supprimer_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&poub_forum=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer.gif", "right", 'non');
}
if($forumMetier->changeStatutOK($id_forum, 'off')) {
$controle .= icone(_T('icone_desactiver_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&off_forum=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer_agora.gif", "right", 'non');
- }
- if($forumMetier->changeStatutOK($id_forum, 'publie')) {
- $controle .= icone(_T('icone_valider_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&valid_forum=$id_forum&debut=$debut&page=$page", "forum-interne-24.gif", "creer.gif", "right", 'non');
- }
- break;
-
- case 'off':
- if($forumMetier->changeStatutOK($id_forum, 'poubelle')) {
- $controle .= icone(_T('icone_supprimer_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&poub_forum=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer.gif", "right", 'non');
}
if($forumMetier->changeStatutOK($id_forum, 'publie')) {
$controle .= icone(_T('icone_valider_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&valid_forum=$id_forum&debut=$debut&page=$page", "forum-interne-24.gif", "creer.gif", "right", 'non');
- }
- break;
- }
-
- /*
- if ($forum_stat != "off" AND $forum_stat != "privoff") {
- if ($forum_stat == "publie" OR $forum_stat == "prop")
- $controle .= icone(_T('icone_supprimer_message'), "controle_forum.php3?supp_forum=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer.gif", "right", 'non');
- else if ($forum_stat == "prive" OR $forum_stat == "privrac" OR $forum_stat == "privadm")
- $controle .= icone(_T('icone_supprimer_message'), "controle_forum.php3?supp_forum_priv=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer.gif", "right", 'non');
- }
- else {
- $controle .= "<BR><FONT COLOR='red'><B>"._T('info_message_supprime')." $forum_ip</B></FONT>";
- if($forum_id_auteur>0)
- $controle .= " - <A HREF='auteurs_edit.php3?id_auteur=$forum_id_auteur'>"._T('lien_voir_auteur')."</A>";
- }
+ }
+ break;
+
+ case 'off':
+ if($forumMetier->changeStatutOK($id_forum, 'poubelle')) {
+ $controle .= icone(_T('icone_supprimer_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&poub_forum=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer.gif", "right", 'non');
+ }
+ if($forumMetier->changeStatutOK($id_forum, 'publie')) {
+ $controle .= icone(_T('icone_valider_message'), "controle_forum_suite.php3?affMessage[]=$affMessage&vierge=1&id_current_forum=$id_current_forum&type_forum=$type_forum&affType=$affType&valid_forum=$id_forum&debut=$debut&page=$page", "forum-interne-24.gif", "creer.gif", "right", 'non');
+ }
+ break;
+ }
+
+ /*
+ if ($forum_stat != "off" AND $forum_stat != "privoff") {
+ if ($forum_stat == "publie" OR $forum_stat == "prop")
+ $controle .= icone(_T('icone_supprimer_message'), "controle_forum.php3?supp_forum=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer.gif", "right", 'non');
+ else if ($forum_stat == "prive" OR $forum_stat == "privrac" OR $forum_stat == "privadm")
+ $controle .= icone(_T('icone_supprimer_message'), "controle_forum.php3?supp_forum_priv=$id_forum&debut=$debut$controle_sans&page=$page", "forum-interne-24.gif", "supprimer.gif", "right", 'non');
+ }
+ else {
+ $controle .= "<BR><FONT COLOR='red'><B>"._T('info_message_supprime')." $forum_ip</B></FONT>";
+ if($forum_id_auteur>0)
+ $controle .= " - <A HREF='auteurs_edit.php3?id_auteur=$forum_id_auteur'>"._T('lien_voir_auteur')."</A>";
+ }
if ($forum_stat=="prop")
- $controle .= icone(_T('icone_valider_message'), "controle_forum.php3?valid_forum=$id_forum&debut=$debut&page=$page", "forum-interne-24.gif", "creer.gif", "right", 'non');
+ $controle .= icone(_T('icone_valider_message'), "controle_forum.php3?valid_forum=$id_forum&debut=$debut&page=$page", "forum-interne-24.gif", "creer.gif", "right", 'non');
*/
- $controle .= "<br />".forum_parent($id_forum);
+ $controle .= "<br />".forum_parent($id_forum);
- $controle .= "<p align='justify'>".propre($forum_texte);
+ /*
+ Wrap html text.
+ */
+ include_once(dirname(__FILE__)."/../mes_fonctions_agora.php3");
+ $controle .= "<p align='justify'>".propre(htmlwrap($forum_texte,70));
+ /**
+ */
+ //$controle .= "<p align='justify'>".propre($forum_texte);
- if (strlen($forum_url_site) > 10 AND strlen($forum_nom_site) > 3)
- $controle .= "<p align='left'><font face='Verdana,Arial,Helvetica,sans-serif'><strong><a href='$forum_url_site'>$forum_nom_site</a></strong></font>";
+ if (strlen($forum_url_site) > 10 AND strlen($forum_nom_site) > 3)
+ $controle .= "<p align='left'><font face='Verdana,Arial,Helvetica,sans-serif'><strong><a href='$forum_url_site'>$forum_nom_site</a></strong></font>";
- if ($mots_cles_forums == "oui") {
+ if ($mots_cles_forums == "oui") {
$motMetier = &recuperer_instance_mot();
$allMots = $motMetier->getAllFromMotsAndAnotherTable("forum", "id_forum", $id_forum);
if(PEAR::isError($allMots)) {
@@ -281,27 +291,27 @@
}
if(sizeOf($allMots) > 0) $ret .= "<p>"._T('forum_avez_selectionne');
while (list(,$motMetier) = each($allMots)) {
- $id_mot = $motMetier->getMotId();
- $titre_mot = propre($motMetier->getTitre());
- $type_mot = propre($motMetier->getType());
- $les_mots[$id_mot] = true;
- $presence_mots = true;
+ $id_mot = $motMetier->getMotId();
+ $titre_mot = propre($motMetier->getTitre());
+ $type_mot = propre($motMetier->getType());
+ $les_mots[$id_mot] = true;
+ $presence_mots = true;
- $ret.= "<li> $type_mot : <b>$titre_mot</b>";
+ $ret.= "<li> $type_mot : <b>$titre_mot</b>";
}
- }
+ }
- $controle .= "</font>";
- $controle .= "</td></tr></table>";
+ $controle .= "</font>";
+ $controle .= "</td></tr></table>";
- $controle .= "</td></tr></table>\n";
+ $controle .= "</td></tr></table>\n";
- if (!($forum_stat == 'off' OR $forum_stat == 'privoff' OR $forum_stat=='prop'))
- $controle .= "</div>";
+ if (!($forum_stat == 'off' OR $forum_stat == 'privoff' OR $forum_stat=='prop'))
+ $controle .= "</div>";
$controle .= "</div>";
- return $controle;
+ return $controle;
}
Plus d'informations sur la liste de diffusion Agora-commits