From 2d1ed661965b2c6533a3a8839d14b9939cddb77e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Sun, 20 Feb 2011 02:06:16 +0100
Subject: [PATCH] Prevent erasing a newsletter if no Post data was received
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 modules/newsletter.php        | 4 ++--
 templates/newsletter/edit.tpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/newsletter.php b/modules/newsletter.php
index f827c71..6d18e7e 100644
--- a/modules/newsletter.php
+++ b/modules/newsletter.php
@@ -127,7 +127,7 @@ class NewsletterModule extends PLModule
             return PL_NOT_FOUND;
         }
 
-        if($new) {
+        if ($new == 'new') {
             $id = $nl->createPending();
             pl_redirect($nl->adminPrefix() . '/edit/' . $id);
         }
@@ -173,7 +173,7 @@ class NewsletterModule extends PLModule
         );
 
         // Update the current issue
-        if($aid == 'update') {
+        if($aid == 'update' && Post::has('submit')) {
 
             // Save common fields
             $issue->title      = Post::s('title');
diff --git a/templates/newsletter/edit.tpl b/templates/newsletter/edit.tpl
index f470439..4bd93c1 100644
--- a/templates/newsletter/edit.tpl
+++ b/templates/newsletter/edit.tpl
@@ -138,7 +138,7 @@
         {if $issue->isEditable()}
         Le {valid_date name="send_before_date" value=$issue->getSendBeforeDate() from=3 to=15} vers {html_select_time prefix="send_before_time_" time=$issue->getSendBeforeTime() display_hours=true display_minutes=false display_seconds=false display_meridian=false use_24_hours=true} heures
         {else}
-        Le {$issue->send_before|date_format:"%X vers %Hh"}
+        Le {$issue->send_before|date_format:"%d/%m/%Y vers %Hh"}
         {/if}
       </td>
     </tr>
@@ -191,7 +191,7 @@
     {/if}
     <tr class='center'>
       <td colspan='2'>
-        <input type='submit' value='Sauver' />
+        <input type='submit' name='submit' value='Sauver' />
       </td>
     </tr>
   </table>
-- 
2.1.4