X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fnewsletter.php;h=8ede54a402c4a6ae0fb8330d1fd55081ab6cd36f;hb=1970c12b2252d9357f59598e69b6c6044ef4e4c2;hp=a24757a5c6affb0b8274fc4d622c83405673bf65;hpb=d232ae0dd332202cffcde4beee0ff64d7d77b60a;p=platal.git

diff --git a/modules/newsletter.php b/modules/newsletter.php
index a24757a..8ede54a 100644
--- a/modules/newsletter.php
+++ b/modules/newsletter.php
@@ -30,12 +30,6 @@ class NewsletterModule extends PLModule
             'admin/newsletter'             => $this->make_hook('admin_nl', AUTH_MDP, 'admin'),
             'admin/newsletter/categories'  => $this->make_hook('admin_nl_cat', AUTH_MDP, 'admin'),
             'admin/newsletter/edit'        => $this->make_hook('admin_nl_edit', AUTH_MDP, 'admin'),
-
-            'ax'             => $this->make_hook('ax',        AUTH_COOKIE),
-            'ax/show'        => $this->make_hook('ax_show',   AUTH_COOKIE),
-            'ax/submit'      => $this->make_hook('ax_submit', AUTH_MDP),
-            'ax/edit'        => $this->make_hook('ax_submit', AUTH_MDP),
-            'admin/axletter/rights'        => $this->make_hook('admin_ax_rights', AUTH_MDP, 'admin'),
         );
     }
 
@@ -81,7 +75,10 @@ class NewsletterModule extends PLModule
 
         require_once 'newsletter.inc.php';
 
-        if (Post::has('see')) {
+        if (Post::has('see') || (Post::has('valid') && (!trim(Post::v('title')) || !trim(Post::v('body'))))) {
+            if (!Post::has('see')) {
+                $page->trig("L'article doit avoir un titre et un contenu");
+            }
             $art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'));
             $page->assign('art', $art);
         } elseif (Post::has('valid')) {
@@ -91,6 +88,7 @@ class NewsletterModule extends PLModule
             $art->submit();
             $page->assign('submited', true);
         }
+        $page->addCssLink('nl.css');
     }
 
     function handler_admin_nl(&$page, $new = false) {
@@ -161,40 +159,6 @@ class NewsletterModule extends PLModule
         $table_editor->describe('pos','position',true);
         $table_editor->apply($page, $action, $id);
     }
-
-    function handler_ax(&$page, $action = null)
-    {
-        require_once 'newsletter.inc.php';
-
-        $page->changeTpl('newsletter/ax.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Envois de l\'AX');
-
-        switch ($action) {
-          case 'out': AXLetter::unsubscribe(); break;
-          case 'in':  AXLetter::subscribe(); break;
-          default: ;
-        }
-
-        $perm = AXLetter::hasPerms();
-        if ($perm) {
-            $waiting = AXLetter::awaiting();
-            if ($waiting) {
-                $new = new AXLetter($waiting);
-                $page->assign('new', $new);
-            }
-        }
-        $page->assign('axs', AXLetter::subscriptionState());
-        $page->assign('ax_list', AXLetter::listSent());
-        $page->assign('ax_rights', AXLetter::hasPerms());
-    }
-
-    function handler_ax_submit(&$page)
-    {
-        require_once('newsletter.inc.php');
-        if (!AXLetter::hasPerms()) {
-            return PL_FORBIDDEN;
-        }
-    }
 }
 
 ?>