From: Pierre Habouzit (MadCoder <pierre.habouzit@m4x.org>
Date: Fri, 3 Dec 2004 13:09:27 +0000 (+0000)
Subject: changelog and docs
X-Git-Tag: xorg/old~710
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=bac3ca5e1864164f9dec028e2808512c3b85f1cc;p=platal.git

changelog and docs

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-32
---

diff --git a/ChangeLog b/ChangeLog
index 1218788..602f232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,9 @@ Bug/Wish :
 		- #184 : Owners can now delete their lists.							-MC
 		- #231 : Add a link to the user's fiche on moderation page.			-MC
 
+	* Newsletter :
+		- #242 : Newsletter is standalone.									-MC
+
 	* Search :
 		- #56 : Search on referent.											-JS
 		- #189 : Selection of diplomas depends on schools.					-JS
diff --git a/include/conf.d/newsletter.globals.inc.php b/include/conf.d/newsletter.globals.inc.php
index 63ed7d7..210a271 100644
--- a/include/conf.d/newsletter.globals.inc.php
+++ b/include/conf.d/newsletter.globals.inc.php
@@ -23,8 +23,8 @@
 
 class NLConfig
 {
-    var $from         = "\"Lettre Mensuelle\" <null@example.org>";
-    var $replyto      = "null@example.org";
+    var $from    = "Lettre Mensuelle <null@example.org>";
+    var $replyto = "";
 }
 
 // }}}
diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php
index 22b624b..afbdd6b 100644
--- a/include/newsletter.inc.php
+++ b/include/newsletter.inc.php
@@ -324,7 +324,9 @@ EOF;
 	$mailer->setFrom($globals->newsletter->from);
 	$mailer->setSubject($this->title());
 	$mailer->addTo("\"$prenom $nom\" <$login@polytechnique.org>");
-	$mailer->addHeader('Reply-To',$globals->newsletter->replyto);
+        if (!empty($globals->newsletter->replyto)) {
+            $mailer->addHeader('Reply-To',$globals->newsletter->replyto);
+        }
 	$mailer->setTxtBody($this->toText($prenom,$nom,$sex));
 	if ($html) {
 	    $mailer->setHTMLBody($this->toHtml($prenom,$nom,$sex,true));
diff --git a/install.d/STATE b/install.d/STATE
index 931ac9f..307e1f8 100644
--- a/install.d/STATE
+++ b/install.d/STATE
@@ -5,6 +5,7 @@ skins.
 
     only one minor bug
 
+newsletter
 webredirect
 
 STILL NEED SOME WORK
@@ -15,11 +16,6 @@ banana
     quite good shape.
     converting banana into templates would be great though
 
-newsletter
-
-    it's mixed into the lists module ...
-    we have to repair this, and all will be OK
-
 
 IN PROGRESS
 -----------