diff --git a/.gitattributes b/.gitattributes index 763ee0c525ad05667408cb8740785b1ca76d2b72..8bc84425b60536fa598b8bcabdf0adf02609d1e2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -58,7 +58,7 @@ ecrire/exec/convert_utf8.php -text ecrire/exec/delete_all.php -text ecrire/exec/documents_liste.php -text ecrire/exec/export_all.php -text -ecrire/exec/forum_admin.php -text +ecrire/exec/forum.php -text ecrire/exec/forum_envoi.php -text ecrire/exec/import_all.php -text ecrire/exec/install.php -text diff --git a/ecrire/exec/controle_forum.php b/ecrire/exec/controle_forum.php index 956da2c4d2557a9e79d0810fd7beb2b1a9d09adc..b5d0336cd9e3856a13a5aa23a53080b87607c83f 100644 --- a/ecrire/exec/controle_forum.php +++ b/ecrire/exec/controle_forum.php @@ -97,14 +97,14 @@ SELECT * FROM spip_breves WHERE id_breve='$forum_id_breve'")); $retour = forum_parent($forum_id_parent); if ($retour) return $retour; else return array('pref' => _T('info_message'), - 'url' => generer_url_ecrire('forum_admin','admin=admin'), + 'url' => generer_url_ecrire('forum_admin'), 'titre' => _T('info_forum_administrateur')); } else { $retour = forum_parent($forum_id_parent); if ($retour) return $retour; else return array('pref' => _T('info_message'), - 'url' => generer_url_ecrire('forum_admin'), + 'url' => generer_url_ecrire('forum'), 'titre' => _T('info_forum_interne')); } } diff --git a/ecrire/exec/forum_admin.php b/ecrire/exec/forum.php similarity index 91% rename from ecrire/exec/forum_admin.php rename to ecrire/exec/forum.php index 28407acc8ec506d99be9f89482ce46942e79d8de..c371a484ad483e56a2c12f62c44b5092d1019022 100644 --- a/ecrire/exec/forum_admin.php +++ b/ecrire/exec/forum.php @@ -30,7 +30,7 @@ function liste_numeros_forum($urlforum, $debut, $total) echo "\n</p>\n"; } -function forum_admin_dist() +function forum_dist() { global $connect_statut, $debut, $admin; @@ -40,24 +40,24 @@ function forum_admin_dist() debut_page(_T('titre_page_forum'), "redacteurs", "privadm"); $statutforum = 'privadm'; $logo = "forum-admin-24.gif"; - $urlforum = generer_url_ecrire('forum_admin', 'admin=admin'); + $urlforum = generer_url_ecrire('forum_admin'); } else { debut_page(_T('titre_forum'), "redacteurs", "forum-interne"); $statutforum = 'privrac'; $logo = "forum-interne-24.gif"; - $urlforum = generer_url_ecrire('forum_admin', 'admin='); + $urlforum = generer_url_ecrire('forum','', true); } debut_gauche(); debut_droite(); - if ($admin=='oui') + if ($admin) gros_titre(_T('titre_cadre_forum_administrateur')); else gros_titre(_T('titre_cadre_forum_interne')); - if ($admin == 'oui' AND $connect_statut != "0minirezo") { + if ($admin AND $connect_statut != "0minirezo") { echo _T('avis_non_acces_page'); exit; } diff --git a/ecrire/img_pack/presentation.js b/ecrire/img_pack/presentation.js index e602368bf7b3f39795f161799456635e6d242ca3..2b1a4f63e518a3abcd602332ea8b31a1dff0a447 100644 --- a/ecrire/img_pack/presentation.js +++ b/ecrire/img_pack/presentation.js @@ -5,7 +5,7 @@ function changestyle(id_couche, element, style) { if (admin) { hide_obj("bandeauaccueil"); hide_obj("bandeaunaviguer"); - hide_obj("bandeauforum_admin"); + hide_obj("bandeauforum"); hide_obj("bandeauauteurs"); if (stat) { hide_obj("bandeaustatistiques_visites"); } hide_obj("bandeauconfiguration"); @@ -27,7 +27,7 @@ function changestyle(id_couche, element, style) { if (admin) { decalerCouche('bandeauaccueil'); decalerCouche('bandeaunaviguer'); - decalerCouche('bandeauforum_admin'); + decalerCouche('bandeauforum'); decalerCouche('bandeauauteurs'); if (stat) decalerCouche('bandeaustatistiques_visites'); decalerCouche('bandeauconfiguration'); diff --git a/ecrire/inc_boutons.php b/ecrire/inc_boutons.php index fb9fa645fb59a3e0ea48f040ddef78c87d9a7183..e42ad6e4e613b6e1ab498bc4ce7b6c390482553a 100644 --- a/ecrire/inc_boutons.php +++ b/ecrire/inc_boutons.php @@ -59,7 +59,7 @@ function definir_barre_boutons() { 'accueil' => new Bouton('asuivre-48.png', 'icone_a_suivre'), 'naviguer' => new Bouton("documents-48$spip_lang_rtl.png", 'icone_edition_site'), - 'forum_admin' => new Bouton('messagerie-48.png', 'titre_forum'), + 'forum' => new Bouton('messagerie-48.png', 'titre_forum'), 'auteurs' => new Bouton('redacteurs-48.png', 'icone_auteurs') ); @@ -133,7 +133,7 @@ function definir_barre_boutons() { $sousmenu['controle_petition']= new Bouton("suivi-petition-24.gif", "icone_suivi_pettions"); - $boutons_admin['forum_admin']->sousmenu= $sousmenu; + $boutons_admin['forum']->sousmenu= $sousmenu; // sous menu auteurs diff --git a/ecrire/inc_presentation.php b/ecrire/inc_presentation.php index 211c1d3bf0e3131e641c8a44d643ad5353ef30c7..e1fcd46665b799815218f5c3aa6b883b56623eda 100644 --- a/ecrire/inc_presentation.php +++ b/ecrire/inc_presentation.php @@ -2223,7 +2223,7 @@ function init_body($rubrique='asuivre', $sous_rubrique='asuivre', $onLoad='') { echo "<ul>"; echo "<li><a href='./'>"._T('icone_a_suivre')."</a>"; echo "<li><a href='" . generer_url_ecrire("naviguer") . "'>"._T('icone_edition_site')."</a>"; - echo "<li><a href='" . generer_url_ecrire("forum_admin"). "'>"._T('titre_forum')."</a>"; + echo "<li><a href='" . generer_url_ecrire("forum"). "'>"._T('titre_forum')."</a>"; echo "<li><a href='" . generer_url_ecrire("auteurs") . "'>"._T('icone_auteurs')."</a>"; echo "<li><a href=\"$adresse_site/\">"._T('icone_visiter_site')."</a>"; echo "</ul>";