backport fix #486 change ?force_login=1 en profil/private/xxx

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@955 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index dcc86df..dab3f04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@ From 0.9.11 branch:
     * Payment:
         - #482: fix action in the form.                                     -MC
 
+    * Profile:
+        - #486: fix force login to see private fiche.                      -Car
+
 ================================================================================
 VERSION 0.9.11                                                 18 Septembre 2006
 

diff --git a/bin/cron/notifs.send.php b/bin/cron/notifs.send.php
index 67f0919..9a393aa 100755 (executable)
--- a/bin/cron/notifs.send.php
+++ b/bin/cron/notifs.send.php
@@ -54,8 +54,8 @@ EOF;
             require_once('../../plugins/modifier.date_format.php');
             $date  = smarty_modifier_date_format($x['date'], '%d %b %Y');
             $text .= "    - (X{$x['promo']}) {$x['prenom']} {$x['nom']} le $date\n";
-            $text .= "      https://www.polytechnique.org/profile/{$x['bestalias']}?force_login=1\n\n";
-            $html .= "<li>(X{$x['promo']}) <a href='https://www.polytechnique.org/profile/{$x['bestalias']}?force_login=1'>{$x['prenom']} {$x['nom']}</a> le $date</li>\n";
+            $text .= "      https://www.polytechnique.org/profile/private/{$x['bestalias']}\n\n";
+            $html .= "<li>(X{$x['promo']}) <a href='https://www.polytechnique.org/profile/private/{$x['bestalias']}'>{$x['prenom']} {$x['nom']}</a> le $date</li>\n";
         }
         $text .= "\n";
         $html .= "</ul>\n";

diff --git a/modules/profile.php b/modules/profile.php
index 429fc09..d710722 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -29,6 +29,7 @@ class ProfileModule extends PLModule
 
             'fiche.php'        => $this->make_hook('fiche',      AUTH_PUBLIC),
             'profile'          => $this->make_hook('profile',    AUTH_PUBLIC),
+            'profile/private'  => $this->make_hook('profile',    AUTH_MDP),
             'profile/edit'     => $this->make_hook('p_edit',     AUTH_MDP),
             'profile/orange'   => $this->make_hook('p_orange',   AUTH_MDP),
             'profile/usage'    => $this->make_hook('p_usage',    AUTH_MDP),

diff --git a/templates/carnet/rss.tpl b/templates/carnet/rss.tpl
index 81b744a..23c041c 100644 (file)
--- a/templates/carnet/rss.tpl
+++ b/templates/carnet/rss.tpl
@@ -58,7 +58,7 @@
       <title>
         [{$notifs->_cats[$cid].short}] {$x.prenom} {$x.nom} ({$x.promo}) - le {$x.date|date_format|utf8_encode}
       </title>
-      <link>{#globals.baseurl#}/profile/{$x.bestalias}?force_login=1</link>
+      <link>{#globals.baseurl#}/profile/private/{$x.bestalias}</link>
       <description><![CDATA[
         {if !$x.contact and !$x.dcd}
         <a href="{#globals.baseurl#}/carnet/contacts?action=ajouter&amp;user={$x.bestalias}">