X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=8d65239b9c5b3fc7a9fde7aa46f945847e3a4635;hb=d667c548989db9d77b9abb0efe46d89c60369fc1;hp=fb6c5e8940b34295b72fdbd4deab5e5410ce795c;hpb=913a4e9004e7c0558dc79f3600b8f712b2f216fd;p=platal.git

diff --git a/include/userset.inc.php b/include/userset.inc.php
index fb6c5e8..8d65239 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -53,8 +53,6 @@ class SearchSet extends ProfileSet
 
     public function __construct($quick = false, $no_search = false, PlFilterCondition $cond = null)
     {
-        Platal::load('search', 'search.inc.php');
-
         if ($no_search) {
             return;
         }
@@ -93,13 +91,11 @@ class SearchSet extends ProfileSet
         $this->conds->addChild($ufc);
 
         $orders = $ufb->getOrders();
-        $orders[] = new UFO_Promo(UserFilter::DISPLAY, true);
-        $orders[] = new UFO_Name(Profile::DN_SORT);
 
         if (S::logged() && Env::has('nonins')) {
             $this->conds = new PFC_And($this->conds,
-                new UFC_Not(new UFC_Dead()),
-                new UFC_Registered()
+                new PFC_Not(new UFC_Dead()),
+                new PFC_Not(new UFC_Registered())
             );
         }
 
@@ -119,21 +115,14 @@ class SearchSet extends ProfileSet
         $this->conds->addChild($ufb->getUFC());
     }
 
-    public function &get(PlLimit $limit = null, $orders = array())
+    protected function &getFilterResults(PlFilter &$pf, PlLimit $limit)
     {
-        $orders = array_merge($orders, $this->orders);
-
-        $uf = $this->buildFilter($this->conds, $orders);
-        if (is_null($limit)) {
-            $limit = new PlLimit(20, 0);
-        }
-        $it          = $uf->getProfiles($limit);
-        $this->count = $uf->getTotalCount();
-        return $it;
+        $profiles = $pf->getProfiles($limit, Profile::FETCH_MINIFICHES);
+        return $profiles;
     }
 }
 
-class ArraySet extends UserSet
+class ArraySet extends ProfileSet
 {
     public function __construct(array $users)
     {
@@ -147,44 +136,15 @@ class ArraySet extends UserSet
     }
 }
 
-class MinificheView extends MultipageView
+abstract class ProfileView extends MultipageView
 {
-    public function __construct(PlSet &$set, $data, array $params)
-    {
-        require_once 'education.func.inc.php';
-        global $globals;
-        $this->entriesPerPage = $globals->search->per_page;
-        if (@$params['with_score']) {
-            $this->addSort(new PlViewOrder('score', array(
-                    new UFO_Score(true),
-                    new UFO_ProfileUpdate(true),
-                    new UFO_Promo(UserFilter::DISPLAY, true),
-                    new UFO_Name(Profile::DN_SORT),
-                ), 'pertinence'));
-        }
-        $this->addSort(new PlViewOrder(
-                            'name',
-                            array(new UFO_Name(Profile::DN_SORT)),
-                            'nom'));
-        $this->addSort(new PlViewOrder('promo', array(
-                    new UFO_Promo(UserFilter::DISPLAY, true),
-                    new UFO_Name(Profile::DN_SORT),
-                ), 'promotion'));
-        $this->addSort(new PlViewOrder('date_mod', array(
-                    new UFO_ProfileUpdate(true),
-                    new UFO_Promo(UserFilter::DISPLAY, true),
-                    new UFO_Name(Profile::DN_SORT),
-                ), 'dernière modification'));
-        parent::__construct($set, $data, $params);
-    }
-
     protected function getBoundValue($obj)
     {
         if ($obj instanceof Profile) {
             switch ($this->bound_field) {
             case 'name':
                 $name = $obj->name('%l');
-                return strtoupper($name[0]);
+                return strtoupper($name);
             case 'promo':
                 return $obj->promo();
             default:
@@ -210,6 +170,38 @@ class MinificheView extends MultipageView
         }
         return $show_bounds;
     }
+}
+
+class MinificheView extends ProfileView
+{
+    public function __construct(PlSet &$set, $data, array $params)
+    {
+        require_once 'education.func.inc.php';
+        global $globals;
+        $this->entriesPerPage = $globals->search->per_page;
+        if (@$params['with_score']) {
+            $this->addSort(new PlViewOrder('score', array(
+                    new UFO_Score(true),
+                    new UFO_ProfileUpdate(true),
+                    new UFO_Promo(UserFilter::DISPLAY, true),
+                    new UFO_Name(Profile::DN_SORT),
+                ), 'pertinence'));
+        }
+        $this->addSort(new PlViewOrder(
+                            'name',
+                            array(new UFO_Name(Profile::DN_SORT)),
+                            'nom'));
+        $this->addSort(new PlViewOrder('promo', array(
+                    new UFO_Promo(UserFilter::DISPLAY, true),
+                    new UFO_Name(Profile::DN_SORT),
+                ), 'promotion'));
+        $this->addSort(new PlViewOrder('date_mod', array(
+                    new UFO_ProfileUpdate(true),
+                    new UFO_Promo(UserFilter::DISPLAY, true),
+                    new UFO_Name(Profile::DN_SORT),
+                ), 'dernière modification'));
+        parent::__construct($set, $data, $params);
+    }
 
     public function templateName()
     {
@@ -217,7 +209,7 @@ class MinificheView extends MultipageView
     }
 }
 
-class MentorView extends MultipageView
+class MentorView extends ProfileView
 {
     public function __construct(PlSet &$set, $data, array $params)
     {
@@ -236,50 +228,18 @@ class MentorView extends MultipageView
         parent::__construct($set, $data, $params);
     }
 
-    protected function getBoundValue($obj)
-    {
-        if ($obj instanceof Profile) {
-            switch ($this->bound_field) {
-            case 'name':
-                $name = $obj->name('%l');
-                return strtoupper($name[0]);
-            case 'promo':
-                return $obj->promo();
-            default:
-                return null;
-            }
-        }
-        return null;
-    }
-
-    public function bounds()
-    {
-        $order = Env::v('order', $this->defaultkey);
-        $show_bounds = 0;
-        if (($order == "name") || ($order == "-name")) {
-            $this->bound_field = "nom";
-            $show_bounds = 1;
-        } elseif (($order == "promo") || ($order == "-promo")) {
-            $this->bound_field = "promo";
-            $show_bounds = -1;
-        }
-        if ($order{0} == '-') {
-            $show_bounds = -$show_bounds;
-        }
-        return $show_bounds;
-    }
-
     public function templateName()
     {
         return 'include/plview.referent.tpl';
     }
 }
 
-class TrombiView extends MultipageView
+class TrombiView extends ProfileView
 {
     public function __construct(PlSet &$set, $data, array $params)
     {
         $this->entriesPerPage = 24;
+        $this->defaultkey = 'name';
         if (@$params['with_score']) {
             $this->addSort(new PlViewOrder('score', array(
                             new UFO_Score(true),
@@ -288,6 +248,7 @@ class TrombiView extends MultipageView
                             new UFO_Name(Profile::DN_SORT),
             ), 'pertinence'));
         }
+        $set->addCond(new UFC_Photo());
         $this->addSort(new PlViewOrder('name', array(new UFO_Name(Profile::DN_SORT)), 'nom'));
         $this->addSort(new PlViewOrder('promo', array(
                         new UFO_Promo(UserFilter::DISPLAY, true),
@@ -296,39 +257,6 @@ class TrombiView extends MultipageView
         parent::__construct($set, $data, $params);
     }
 
-    protected function getBoundValue($obj)
-    {
-        if ($obj instanceof Profile) {
-            switch ($this->bound_field) {
-            case 'name':
-                $name = $obj->name('%l');
-                return strtoupper($name[0]);
-            case 'promo':
-                return $obj->promo();
-            default:
-                return null;
-            }
-        }
-        return null;
-    }
-
-    public function bounds()
-    {
-        $order = Env::v('order', $this->defaultkey);
-        $show_bounds = 0;
-        if (($order == "name") || ($order == "-name")) {
-            $this->bound_field = "nom";
-            $show_bounds = 1;
-        } elseif (($order == "promo") || ($order == "-promo")) {
-            $this->bound_field = "promo";
-            $show_bounds = -1;
-        }
-        if ($order{0} == '-') {
-            $show_bounds = -$show_bounds;
-        }
-        return $show_bounds;
-    }
-
     public function templateName()
     {
         return 'include/plview.trombi.tpl';