From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Thu, 27 May 2010 16:08:12 +0000 (+0200)
Subject: Fixes to axletter (correctly display number of emails sent)
X-Git-Tag: xorg/1.0.0~236
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8448002275a1ac653830cdcaca1b0e6e32b356d2;p=platal.git

Fixes to axletter (correctly display number of emails sent)

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---

diff --git a/bin/cron/axletter.send.php b/bin/cron/axletter.send.php
index e6bbcda..025e1fb 100755
--- a/bin/cron/axletter.send.php
+++ b/bin/cron/axletter.send.php
@@ -29,7 +29,7 @@ if ($al) {
     echo ' ' . date("H:i:s") . " -> début de l'envoi\n";
     $emailsCount = $al->sendToAll();
     echo ' ' . date("H:i:s") . " -> fin de l'envoi\n\n";
-    echo $emailsCount . "emails ont été envoyés lors de cet envoi.\n";
+    echo $emailsCount . " emails ont été envoyés lors de cet envoi.\n";
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
diff --git a/include/massmailer.inc.php b/include/massmailer.inc.php
index 3dde660..a6dc702 100644
--- a/include/massmailer.inc.php
+++ b/include/massmailer.inc.php
@@ -222,6 +222,7 @@ abstract class MassMailer
 
             sleep(60);
         }
+        return $emailsCount;
     }
 
     abstract protected function assignData(&$smarty);
diff --git a/templates/axletter/edit.tpl b/templates/axletter/edit.tpl
index 23cda37..34c538e 100644
--- a/templates/axletter/edit.tpl
+++ b/templates/axletter/edit.tpl
@@ -25,7 +25,7 @@
 <form action="{$platal->pl_self()}" method="post">
   {xsrf_token_field}
   {if $am}
-  {include file="axletter/letter.tpl"}
+  {include file="axletter/letter.mail.tpl"}
 
   <p class="center">
     <input type="hidden" name="id" value="{$id}" />