merge fix

[platal.git] / modules / events.php

diff --git a/modules/events.php b/modules/events.php
index af01c70..e6fe25f 100644 (file)
--- a/modules/events.php
+++ b/modules/events.php
@@ -43,7 +43,7 @@ class EventsModule extends PLModule
         subscribe_nl($uid);
     }
 
-    function handler_ev(&$page, $action = 'list', $eid = null)
+    function handler_ev(&$page, $action = 'list', $eid = null, $pound = null)
     {
         $page->changeTpl('login.tpl');
 
@@ -114,13 +114,15 @@ class EventsModule extends PLModule
                       INNER JOIN evenements AS e ON e.id = ev.evt_id
                            WHERE peremption < NOW()');
             XDB::execute('REPLACE INTO evenements_vus VALUES({?},{?})',
-                                   $eid, S::v('uid'));
+                $eid, S::v('uid'));
+            pl_redirect('events#'.$pound);
         }
 
         if ($action == 'unread' && $eid) {
             XDB::execute('DELETE FROM evenements_vus
                            WHERE evt_id = {?} AND user_id = {?}',
                                    $eid, S::v('uid'));
+            pl_redirect('events#newsid'.$eid);
         }
 
         // affichage des evenements
@@ -218,7 +220,7 @@ class EventsModule extends PLModule
         }
 
         $page->assign('nls', get_nl_state());
-        $page->assign_by_ref('nl_list', get_nl_list());
+        $page->assign('nl_list', get_nl_list());
     }
 
     function handler_nl_show(&$page, $nid = 'last')
@@ -357,7 +359,7 @@ class EventsModule extends PLModule
            pl_redirect("admin/newsletter");
         }
         
-        $page->assign_by_ref('nl_list', get_nl_slist());
+        $page->assign('nl_list', get_nl_slist());
     }
     
     function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {
@@ -400,7 +402,6 @@ class EventsModule extends PLModule
         $page->assign_by_ref('nl',$nl);
     }
     function handler_admin_nl_cat(&$page, $action = 'list', $id = null) {
-        require_once('../classes/PLTableEditor.php');
         $page->assign('xorg_title','Polytechnique.org - Administration - Newsletter : Catégories');
         $page->assign('title', 'Gestion des catégories de la newsletter');
         $table_editor = new PLTableEditor('admin/newsletter/categories','newsletter_cat','cid');