fix aurel's bug

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

diff --git a/classes/Session.php b/classes/Session.php
index f87face..2a72b2e 100644 (file)
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -55,6 +55,11 @@ class Session
         return isset($_SESSION[$key]) ? $_SESSION[$key] : $default;
     }
 
+    function i($key, $default = 0)
+    {
+        $i = Session::v($key, $default);
+        return is_numeric($i) ? intval($i) : $default;
+    }
 
     function has_perms()
     {

diff --git a/modules/search.php b/modules/search.php
index 7cd0c58..fb14ea8 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -49,10 +49,10 @@ class SearchModule extends PLModule
                 '.$fields->get_select_statement().'
                 LEFT JOIN  auth_user_quick AS q  ON (u.user_id = q.user_id)
                 LEFT JOIN  aliases         AS a  ON (u.user_id = a.id AND a.type="a_vie")
-                LEFT JOIN  contacts        AS c  ON (c.uid='.S::v('uid').'
+                LEFT JOIN  contacts        AS c  ON (c.uid='.S::i('uid', -1).'
                                                      AND c.contact=u.user_id)
                 LEFT JOIN  watch_nonins    AS w  ON (w.ni_id=u.user_id
-                                                     AND w.uid='.S::v('uid').')
+                                                     AND w.uid='.S::i('uid', -1).')
                 '.$globals->search->result_where_statement.'
                     WHERE  '.$fields->get_where_statement()
                     .(S::logged() && Env::has('nonins') ? ' AND u.perms="pending" AND u.deces=0' : '')

diff --git a/templates/skin/common.menu.tpl b/templates/skin/common.menu.tpl
index 28bef32..6fcc6c8 100644 (file)
--- a/templates/skin/common.menu.tpl
+++ b/templates/skin/common.menu.tpl
@@ -35,7 +35,8 @@
 <div class="menu_item"><a href="Docs/APropos">A propos du site</a></div>
 <div class="menu_item"><a href="Docs/NousContacter">Nous contacter</a></div>
 <div class="menu_item"><a href="Docs/FAQ">FAQ</a></div>
-{/if}
+
+{else}
 
 {if $smarty.session.auth == AUTH_MDP}
 <div class="menu_item"><a href="exit">Déconnexion</a></div>
@@ -88,5 +89,6 @@
   </tr>
 </table>
 {/if}
+{/if}
 
 {* vim:set et sw=2 sts=2 sws=2: *}