X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=aba0254f54ffaca2d037d814916bb5d3cef59a02;hb=6720bd539b442abebd1064af458fd55fbbae8f95;hp=7201181cfb255ffb2f426d530d97a9a458af6c62;hpb=8c4a0c30c699f190cb7906746e22f67014df3368;p=platal.git

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 7201181..aba0254 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -19,13 +19,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once('plset.php');
 require_once('xorg.misc.inc.php');
 require_once('user.func.inc.php');
 
 global $globals;
 
-$globals->search->result_where_statement = '
+@$globals->search->result_where_statement = '
     LEFT JOIN  applis_ins     AS ai0 ON (u.user_id = ai0.uid AND ai0.ordre = 0)
     LEFT JOIN  applis_def     AS ad0 ON (ad0.id = ai0.aid)
     LEFT JOIN  applis_ins     AS ai1 ON (u.user_id = ai1.uid AND ai1.ordre = 1)
@@ -58,6 +57,8 @@ class UserSet extends PlSet
 
 class SearchSet extends UserSet
 {
+    public  $advanced = false;
+    private $score = null;
     private $order = null;
     private $quick = false;
 
@@ -89,7 +90,8 @@ class SearchSet extends UserSet
         if ($qSearch->isEmpty()) {
             new ThrowError('Recherche trop générale.');
         }
-        parent::__construct($fields->get_select_statement()  . ' ' . $globals->search->result_where_statement,
+        $this->score = $qSearch->get_score_statement();
+        parent::__construct("{$fields->get_select_statement()}",
                             $fields->get_where_statement() .
                             (S::logged() && Env::has('nonins') ? ' AND u.perms="pending" AND u.deces=0' : ''));
 
@@ -100,15 +102,47 @@ class SearchSet extends UserSet
     private function getAdvanced()
     {
         global $globals;
+        $this->advanced = true;
         $fields = new SFieldGroup(true, advancedSearchFromInput());
         if ($fields->too_large()) {
             new ThrowError('Recherche trop générale.');
         }
-        parent::__construct($fields->get_select_statement() . ' ' . $globals->search->result_where_statement,
+        parent::__construct($fields->get_select_statement(),
                             $fields->get_where_statement());
         $this->order = implode(',',array_filter(array($fields->get_order_statement(),
                                                       'promo DESC, NomSortKey, prenom')));
     }
+
+    public function &get($fields, $joins, $where, $groupby, $order, $limitcount = null, $limitfrom = null)
+    {
+        if ($this->score) {
+            $fields .= ', ' . $this->score;
+        }
+        return parent::get($fields, $joins, $where, $groupby, $order, $limitcount, $limitfrom);
+    }
+}
+
+class ArraySet extends UserSet
+{
+    public function __construct(array $users)
+    {
+        $where = $this->getUids($users);
+        if ($where) {
+            $where = "a.alias IN ($where)";
+        } else {
+            $where = " 0 ";
+        }
+        parent::__construct('', $where);
+    }
+
+    private function getUids(array $users)
+    {
+        $users = get_users_forlife_list($users, true, '_silent_user_callback');
+        if (is_null($users)) {
+            return '';
+        }
+        return '\'' . implode('\', \'', $users) . '\'';
+    }
 }
 
 class MinificheView extends MultipageView
@@ -118,7 +152,12 @@ class MinificheView extends MultipageView
         require_once 'applis.func.inc.php';
         global $globals;
         $this->entriesPerPage = $globals->search->per_page;
-        $this->order = explode(',', Env::v('order', 'nom,prenom,promo'));
+        if (@$params['with_score']) {
+            $this->addSortKey('score', array('-score', '-watch_last', '-promo', 'nom', 'prenom'), 'pertinence');
+        }
+        $this->addSortKey('name', array('nom', 'prenom'), 'nom');
+        $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), 'promotion');
+        $this->addSortKey('date', array('-watch_last', '-promo', 'nom', 'prenom'), 'dernière modification');
         parent::__construct($set, $data, $params);
     }
 
@@ -141,8 +180,7 @@ class MinificheView extends MultipageView
 
     public function joins()
     {
-        return  ($this->set instanceof SearchSet ? "" :
-                "LEFT JOIN  entreprises    AS e   ON (e.entrid = 0 AND e.uid = u.user_id)
+        return  "LEFT JOIN  entreprises    AS e   ON (e.entrid = 0 AND e.uid = u.user_id)
                  LEFT JOIN  emploi_secteur AS es  ON (e.secteur = es.id)
                  LEFT JOIN  fonctions_def  AS ef  ON (e.fonction = ef.id)
                  LEFT JOIN  geoloc_pays    AS n   ON (u.nationalite = n.a2)
@@ -154,10 +192,10 @@ class MinificheView extends MultipageView
                                                       AND FIND_IN_SET('active', adr.statut))
                  LEFT JOIN  geoloc_pays    AS gp  ON (adr.country = gp.a2)
                  LEFT JOIN  geoloc_region  AS gr  ON (adr.country = gr.a2 AND adr.region = gr.region)
-                 LEFT JOIN  emails         AS em  ON (em.uid = u.user_id AND em.flags = 'active')
-                ") . (S::logged() ? 
-                        "LEFT JOIN  contacts       AS c   On (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")"
-                        : ""); 
+                 LEFT JOIN  emails         AS em  ON (em.uid = u.user_id AND em.flags = 'active')" .
+                (S::logged() ? 
+                 "LEFT JOIN  contacts       AS c   On (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")"
+                 : "");
     }
 
     public function templateName()
@@ -166,12 +204,42 @@ class MinificheView extends MultipageView
     }
 }
 
+class MentorView extends MultipageView
+{
+    public function __construct(PlSet &$set, $data, array $params)
+    {
+        $this->entriesPerPage = 10; 
+        $this->addSortKey('rand', array('RAND(' . S::i('uid') . ')'), 'aléatoirement');
+        $this->addSortKey('name', array('nom', 'prenom'), 'nom'); 
+        $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), 'promotion'); 
+        $this->addSortKey('date', array('-watch_last', '-promo', 'nom', 'prenom'), 'dernière modification'); 
+        parent::__construct($set, $data, $params); 
+    }
+
+    public function fields()
+    {
+        return "m.uid, u.prenom, u.nom, u.promo,
+                a.alias AS bestalias, m.expertise, mp.pid,
+                ms.secteur, ms.ss_secteur";
+    }
+
+    public function templateName()
+    {
+        return 'include/plview.referent.tpl';
+    }
+}
+
 class TrombiView extends MultipageView
 {
     public function __construct(PlSet &$set, $data, array $params)
     {
         $this->entriesPerPage = 24;
         $this->order = explode(',', Env::v('order', 'nom,prenom,promo'));
+        if (@$params['with_score']) {
+            $this->addSortKey('score', array('-score', '-watch_last', '-promo', 'nom', 'prenom'), 'pertinence');
+        }
+        $this->addSortKey('name', array('nom', 'prenom'), 'nom');
+        $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), 'promotion');
         parent::__construct($set, $data, $params);
     }
 
@@ -219,19 +287,12 @@ class GeolocView implements PlView
                is_file(dirname(__FILE__) . '/../modules/geoloc/icon.swf');
     }
 
-    private function make_qs($urlencode = true)
+    public function args()
     {
-        $qs = "";
-        foreach ($_GET as $v=>$a) {
-            if ($v != 'initfile' && $v != 'n' && $v != 'mapid') {
-                if (!$urlencode) {
-                    $qs .= $v . '=' . $a . '&';
-                } else { 
-                    $qs .= urlencode($v) . '=' . urlencode($a) . '&';
-                }
-            }
-        }
-        return $qs;
+        $args = $this->set->args();
+        unset($args['initfile']);
+        unset($args['mapid']);
+        return $args;
     }
 
     public function apply(PlatalPage &$page)
@@ -259,7 +320,6 @@ class GeolocView implements PlView
             if (!empty($GLOBALS['IS_XNET_SITE'])) {
                 $page->assign('background', 0xF2E9D0);
             }
-            $page->assign('querystring', $this->make_qs()); 
             break;
 
           case 'city':
@@ -269,7 +329,7 @@ class GeolocView implements PlView
             $it =& $this->set->get('u.user_id AS id, u.prenom, u.nom, u.promo, al.alias',
                                    "INNER JOIN  adresses AS adrf  ON (adrf.uid = u.user_id)
                                      LEFT JOIN  aliases  AS al   ON (u.user_id = al.id
-                                                                   AND FIND_IN_SET(al.flags, 'bestalias'))
+                                                                   AND FIND_IN_SET('bestalias', al.flags))
                                     INNER JOIN  adresses AS av ON (" . getadr_join('av') . ")",
                                    'adrf.cityid = ' . Env::i('cityid'), null, null, 11);
             $page->assign('users', $it);
@@ -283,8 +343,6 @@ class GeolocView implements PlView
                 header('Content-Type: text/xml');
                 header('Pragma:');
             }
-            $querystring = $this->make_qs();
-            $page->assign('searchvars', $querystring);
             $mapid = Env::has('mapid') ? Env::i('mapid', -2) : false;
             list($countries, $cities) = geoloc_getData_subcountries($mapid, $this->set, 10);
             $page->assign('countries', $countries);
@@ -301,9 +359,6 @@ class GeolocView implements PlView
             }
             $page->assign('protocole', @$_SERVER['HTTPS'] ? 'https' : 'http');
             $this->set->get('u.user_id', null, "u.perms != 'pending' AND u.deces = 0", "u.user_id", null);
-            $url = '?' . $this->make_qs(false);
-            $page->assign('search_nourlencode', $url);
-            $page->assign('search', urlencode($url));
             return 'include/plview.geoloc.tpl';
         }
     }