X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=096b61e9c48d147188e1bcdb638449379f70c320;hb=2ce6d1a63b8a0943937aac9ee21a71ccb35b7c96;hp=db1eb6aeeb83e0727ddda24eb4be030f2a677ac2;hpb=d25e0f0badf597442580d746e6c0dd3d527981f3;p=platal.git

diff --git a/modules/search.php b/modules/search.php
index db1eb6a..096b61e 100644
--- a/modules/search.php
+++ b/modules/search.php
@@ -26,9 +26,22 @@ class SearchModule extends PLModule
         return array(
             'search'     => $this->make_hook('quick', AUTH_PUBLIC),
             'search/adv' => $this->make_hook('advanced', AUTH_COOKIE),
+            'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC),
         );
     }
 
+    function handler_redir_advanced(&$page, $mode = null)
+    {
+        pl_redirect('search/adv');
+        exit;
+    }
+
+    function on_subscribe($forlife, $uid, $promo, $pass)
+    {
+        require_once 'user.func.inc.php';
+        user_reindex($uid);
+    }
+
     function get_quick($offset, $limit, $order)
     {
         global $globals;
@@ -49,10 +62,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' : '')
@@ -139,6 +152,7 @@ class SearchModule extends PLModule
                                                    AND w.uid='.S::v('uid').')
                 '.$globals->search->result_where_statement."
                     $where
+                 GROUP BY  u.user_id
                  ORDER BY  ".($order?($order.', '):'')
                 .implode(',',array_filter(array($fields->get_order_statement(),
                                                 'promo DESC, NomSortKey, prenom'))).'
@@ -199,7 +213,6 @@ class SearchModule extends PLModule
 
         $page->assign('advanced',1);
         $page->assign('public_directory',0);
-        $page->assign('use_map', $globals->geoloc->use_map());
 
         if (!Env::has('rechercher')) {
             $this->form_prepare();