Backport

[platal.git] / modules / search.php

diff --git a/modules/search.php b/modules/search.php
index e48af11..0db2640 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -29,6 +29,12 @@ class SearchModule extends PLModule
         );
     }
 
+    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 +55,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' : '')
@@ -71,6 +77,8 @@ class SearchModule extends PLModule
 
     function form_prepare()
     {
+        global $page;
+
         $page->assign('formulaire',1);
         $page->assign('choix_nats',
                       XDB::iterator('SELECT a2 AS id,IF(nat=\'\',pays,nat) AS text
@@ -90,7 +98,7 @@ class SearchModule extends PLModule
                       XDB::iterator('SELECT id,label FROM emploi_secteur ORDER BY label'));
 
         if (Env::has('school')) {
-            $sql = 'SELECT type FROM applis_def WHERE id='.Env::getInt('school');
+            $sql = 'SELECT type FROM applis_def WHERE id='.Env::i('school');
         } else {
             $sql = 'DESCRIBE applis_def type';
         }
@@ -137,6 +145,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'))).'
@@ -197,7 +206,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();