diff --git a/.gitattributes b/.gitattributes index 6737ffe1f47d17419bd702374a1d1d5e1f3a39dd..6dbe8105ab2b864280439119d9c6b5e75fdab476 100644 --- a/.gitattributes +++ b/.gitattributes @@ -429,6 +429,7 @@ ecrire/configuration/langue.php -text ecrire/configuration/locuteur.php -text ecrire/configuration/logos.php -text ecrire/configuration/mots.php -text +ecrire/configuration/notifications_forum.php -text ecrire/configuration/participants.php -text ecrire/configuration/previsualiseur.php -text ecrire/configuration/redacteurs.php -text diff --git a/ecrire/configuration/administrateurs.php b/ecrire/configuration/administrateurs.php index ed996de38555c1876ec1319a53f8a72707d3bc32..7da4f9a8b51d039d7ad1e245d05089bbea824fcd 100644 --- a/ecrire/configuration/administrateurs.php +++ b/ecrire/configuration/administrateurs.php @@ -17,7 +17,7 @@ include_spip('inc/config'); function configuration_administrateurs_dist() { - $res .= "<div class='verdana2'>" + $res = "<div class='verdana2'>" . _T('info_forum_ouvert') . "<br />\n" . afficher_choix('forum_prive_admin', $GLOBALS['meta']['forum_prive_admin'], diff --git a/ecrire/configuration/annonces.php b/ecrire/configuration/annonces.php index 87e64bc791603bbea674f7cd77f36d6d6ffbde73..f9ea1a77c4093f890ebd26cd0514d3e9728fb72c 100644 --- a/ecrire/configuration/annonces.php +++ b/ecrire/configuration/annonces.php @@ -25,19 +25,6 @@ function configuration_annonces_dist() . "<blockquote><p><i>"._T('info_hebergeur_desactiver_envoi_email')."</i></p></blockquote>" . "</td></tr></table>"; - $res .= debut_cadre_relief("", true, "", _T('info_envoi_forum')) - . "<table border='0' cellspacing='1' cellpadding='3' width=\"100%\">" - . "\n<tr><td class='verdana2'>" - . _T('info_option_email') - . "</td></tr>"; - - $res .= "\n<tr><td style='text-align: $spip_lang_left' class='verdana2'>" - . afficher_choix('prevenir_auteurs', $GLOBALS['meta']["prevenir_auteurs"], - array('oui' => _T('info_option_faire_suivre'), - 'non' => _T('info_option_ne_pas_faire_suivre'))) - . "</td></tr></table>\n" - . fin_cadre_relief(true); - // // Suivi editorial (articles proposes & publies) // diff --git a/ecrire/configuration/notifications_forum.php b/ecrire/configuration/notifications_forum.php new file mode 100644 index 0000000000000000000000000000000000000000..768479be1926cd3fb1d96e630265798f3ec42309 --- /dev/null +++ b/ecrire/configuration/notifications_forum.php @@ -0,0 +1,43 @@ +<?php + +/***************************************************************************\ + * SPIP, Systeme de publication pour l'internet * + * * + * Copyright (c) 2001-2007 * + * 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. * +\***************************************************************************/ + +if (!defined("_ECRIRE_INC_VERSION")) return; + +include_spip('inc/presentation'); +include_spip('inc/mail'); +include_spip('inc/config'); + +function configuration_notifications_forum_dist() +{ + global $spip_lang_left; + + $res = "<div class='verdana2'>" + . _T('info_option_email') + . "<br />\n"; + + $res .= afficher_choix( + 'prevenir_auteurs', + $GLOBALS['meta']["prevenir_auteurs"], + array('oui' => _T('info_option_faire_suivre'), + 'non' => _T('info_option_ne_pas_faire_suivre') + ) + ); + + $res .= "</div>\n"; + + $res = debut_cadre_trait_couleur("", true, "", _T('info_envoi_forum')) + . ajax_action_post('configurer', 'notifications_forum', 'config_contenu','',$res) + . fin_cadre_trait_couleur(true); + + return ajax_action_greffe('configurer-notifications_forum', '', $res); +} +?> \ No newline at end of file diff --git a/ecrire/exec/config_contenu.php b/ecrire/exec/config_contenu.php index 353f12cdaa37ec5e393d8e9911c4527d58254377..2f49f3170d052cc29275eb195058fdfc9d96ecbd 100644 --- a/ecrire/exec/config_contenu.php +++ b/ecrire/exec/config_contenu.php @@ -47,6 +47,7 @@ function exec_config_contenu_dist() $redacteurs = charger_fonction('redacteurs', 'configuration'); $visiteurs = charger_fonction('visiteurs', 'configuration'); $annonces = charger_fonction('annonces', 'configuration'); + $notifications_forum = charger_fonction('notifications_forum', 'configuration'); $administrateurs = charger_fonction('administrateurs', 'configuration'); // Mode de participation aux forums @@ -64,6 +65,8 @@ function exec_config_contenu_dist() // echo $annonces(), "<br />\n"; + echo $notifications_forum(), "<br />\n"; + // Activer forum admins echo $administrateurs();