diff --git a/ecrire/exec/config_contenu.php b/ecrire/exec/config_contenu.php index d2a84baa7e96aae1bc9c6c31413f5aec32d909ae..3ad022c6ce90a3ba35f14f8bc17c8577eb1df2a8 100644 --- a/ecrire/exec/config_contenu.php +++ b/ecrire/exec/config_contenu.php @@ -88,12 +88,10 @@ echo "<TR><TD BACKGROUND='" . _DIR_IMG_PACK . "rien.gif' ALIGN='$spip_lang_left' else $block= "'block', 'none'"; echo bouton_radio("forums_publics", "priori", _T('bouton_radio_moderation_priori'), $forums_publics == "priori", "changeVisible(this.checked, 'config-options', $block);"); - if (tester_mail()) { - echo "<br />"; - if ($forums_publics == "abo") $block = "'none', 'block'"; - else $block= "'block', 'none'"; - echo bouton_radio("forums_publics", "abo", _T('bouton_radio_enregistrement_obligatoire'), $forums_publics == "abo", "changeVisible(this.checked, 'config-options', $block);"); - } + echo "<br />"; + if ($forums_publics == "abo") $block = "'none', 'block'"; + else $block= "'block', 'none'"; + echo bouton_radio("forums_publics", "abo", _T('bouton_radio_enregistrement_obligatoire'), $forums_publics == "abo", "changeVisible(this.checked, 'config-options', $block);"); echo "</TD></TR>\n"; @@ -201,7 +199,6 @@ if ($options == "avancees") { // // Activer/desactiver mails automatiques // -if (tester_mail()) { debut_cadre_trait_couleur("", false, "", _T('info_envoi_email_automatique').aide ("confmails")); $prevenir_auteurs=$GLOBALS['meta']["prevenir_auteurs"]; @@ -331,7 +328,6 @@ if (tester_mail()) { fin_cadre_trait_couleur(); echo "<p />"; -} // Activer forum admins diff --git a/ecrire/inc/envoyer_mail.php b/ecrire/inc/envoyer_mail.php index 7650fb894be7a110a8b75e8539e63f5ef4a0a53c..1404fa751d042e8cec69a81f7d0ec5714725aa32 100644 --- a/ecrire/inc/envoyer_mail.php +++ b/ecrire/inc/envoyer_mail.php @@ -63,15 +63,6 @@ if ($GLOBALS['hebergeur'] == 'lycos') { register_shutdown_function(envoyer_queue_mails); } -// Apparemment free etait le dernier hebergeur connu a ne pas offrir de mail -// cette fonction va donc pouvoir disparaitre -// http://doc.spip.org/@tester_mail -function tester_mail() { - global $hebergeur; - $test_mail = true; - return $test_mail; -} - // http://doc.spip.org/@nettoyer_caracteres_mail function nettoyer_caracteres_mail($t) {