From 03484b8dfafcd0a9f5db5f0c4a825ec1252d4e09 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sun, 8 Oct 2006 10:00:31 +0000
Subject: [PATCH] disparition de tester_mail qui ne servait deja plus a rien
(d'autant moins qu'une alternative smtp existe maintenant en plugin)
---
ecrire/exec/config_contenu.php | 12 ++++--------
ecrire/inc/envoyer_mail.php | 9 ---------
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/ecrire/exec/config_contenu.php b/ecrire/exec/config_contenu.php
index d2a84baa7e..3ad022c6ce 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 7650fb894b..1404fa751d 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) {
--
GitLab