From 096f0dca3a94c949b4fc3b917a1c145ea2edd839 Mon Sep 17 00:00:00 2001
From: x2001corpet <x2001corpet@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Tue, 19 Sep 2006 17:58:39 +0000
Subject: [PATCH] backports

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@876 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 configs/pmwiki.intermap.txt | 2 +-
 modules/events.php          | 6 ++++--
 templates/login.tpl         | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/configs/pmwiki.intermap.txt b/configs/pmwiki.intermap.txt
index 7394f48..3eff507 100644
--- a/configs/pmwiki.intermap.txt
+++ b/configs/pmwiki.intermap.txt
@@ -1,2 +1,2 @@
-Xorg		http://www.polytechnique.org/
+Xorg		https://www.polytechnique.org/
 Xnet		http://www.polytechnique.net/
diff --git a/modules/events.php b/modules/events.php
index af01c70..7c96566 100644
--- 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
diff --git a/templates/login.tpl b/templates/login.tpl
index b63745e..a104701 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -87,7 +87,7 @@ Bienvenue {$smarty.session.prenom}
           {if $smarty.session.perms eq 'admin'}
           <a href="admin/events/edit/{$ev.id}">{icon name=page_edit title="Editer cet article"}</a>
           {/if}
-          <a href="events/read/{$ev.id}{if $previd}#newsid{$previd}{/if}">{icon name=cross title="Cacher cet article"}</a>
+          <a href="events/read/{$ev.id}{if $previd}/newsid{$previd}{/if}">{icon name=cross title="Cacher cet article"}</a>
         </div>
         {assign var="previd" value=$ev.id}
         <a id="newsid{$ev.id}"></a>
@@ -133,7 +133,7 @@ Bienvenue {$smarty.session.prenom}
     <tr class="{cycle values="impair,pair"}">
       <td class="half">
         &bull;
-        <a href="{if !$ev.nonlu}events/unread/{$ev.id}{/if}#newsid{$ev.id}">
+        <a href="events{if !$ev.nonlu}/unread/{$ev.id}{else}#newsid{$ev.id}{/if}">
         {if $ev.nonlu}<strong>{/if}
       	 {tidy}
       	   {$ev.titre|nl2br}
-- 
2.1.4