X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=7ffe768f0f0e44ded71ca8fea8c2fc5de33a1aab;hb=654caec538912e37949b1942f81b8e7d0e2b2deb;hp=a403b8aa4412f46a89979371e39ece6c64145e16;hpb=8467def7b77245ec935d6ce64cf6e031595ccaa7;p=platal.git

diff --git a/include/userset.inc.php b/include/userset.inc.php
index a403b8a..7ffe768 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -50,8 +50,9 @@ class SearchSet extends ProfileSet
     public  $advanced = false;
     private $score    = null;
     private $quick    = false;
+    private $valid    = true;
 
-    public function __construct($quick = false, $no_search = false, PlFilterCondition $cond = null)
+    public function __construct($quick = false, PlFilterCondition $cond = null)
     {
         if ($no_search) {
             return;
@@ -60,21 +61,29 @@ class SearchSet extends ProfileSet
         $this->quick = $quick;
 
         if (is_null($cond)) {
-            $this->conds = new PFC_And();
+            $conds = new PFC_And();
         } else if ($cond instanceof PFC_And) {
-            $this->conds = $cond;
+            $conds = $cond;
         } else {
-            $this->conds = new PFC_And($cond);
+            $conds = new PFC_And($cond);
         }
 
         if ($quick) {
-            $this->getQuick();
+            $this->getQuick($conds);
         } else {
-            $this->getAdvanced();
+            $this->getAdvanced($conds);
         }
     }
 
-    private function getQuick()
+    public function isValid()
+    {
+        return $this->valid;
+    }
+
+    /** Sets up the conditions for a Quick Search
+     * @param $conds Additional conds (as a PFC_And)
+     */
+    private function getQuick($conds)
     {
         if (!S::logged()) {
             Env::kill('with_soundex');
@@ -84,44 +93,69 @@ class SearchSet extends ProfileSet
         $ufb = new UFB_QuickSearch();
 
         if (!$ufb->isValid()) {
+            $this->valid = false;
             return;
         }
 
         $ufc = $ufb->getUFC();
-        $this->conds->addChild($ufc);
+        $conds->addChild($ufc);
 
         $orders = $ufb->getOrders();
 
         if (S::logged() && Env::has('nonins')) {
-            $this->conds = new PFC_And($this->conds,
+            $conds = new PFC_And($conds,
                 new PFC_Not(new UFC_Dead()),
                 new PFC_Not(new UFC_Registered())
             );
         }
 
-        parent::__construct($this->conds, $orders);
+        parent::__construct($conds, $orders);
     }
 
-    private function getAdvanced()
+    /** Sets up the conditions for an Advanced Search
+     * @param $conds Additional conds (as a PFC_And)
+     */
+    private function getAdvanced($conds)
     {
         $this->advanced = true;
         require_once 'ufbuilder.inc.php';
         $ufb = new UFB_AdvancedSearch();
 
         if (!$ufb->isValid()) {
+            $this->valid = false;
             return;
         }
 
-        $this->conds->addChild($ufb->getUFC());
+        $ufc = $ufb->getUFC();
+        $conds->addChild($ufc);
+
+        $orders = $ufb->getOrders();
+
+        parent::__construct($conds, $orders);
+    }
+
+    /** Add a "rechercher=Chercher" field to the query to simulate the POST
+     * behaviour.
+     */
+    public function args()
+    {
+        $args = parent::args();
+        if (!isset($args['rechercher'])) {
+            $args['rechercher'] = 'Chercher';
+        }
+        return $args;
     }
 
     protected function &getFilterResults(PlFilter &$pf, PlLimit $limit)
     {
-        return $pf->getProfiles($limit, Profile::FETCH_MINIFICHES);
+        $profiles = $pf->getProfiles($limit, Profile::FETCH_MINIFICHES);
+        return $profiles;
     }
 }
 
-class ArraySet extends UserSet
+/** Simple set based on an array of User objects
+ */
+class ArraySet extends ProfileSet
 {
     public function __construct(array $users)
     {
@@ -135,6 +169,9 @@ class ArraySet extends UserSet
     }
 }
 
+/** A multipage view for profiles
+ * Allows the display of bounds when sorting by name or promo.
+ */
 abstract class ProfileView extends MultipageView
 {
     protected function getBoundValue($obj)
@@ -152,13 +189,40 @@ abstract class ProfileView extends MultipageView
         }
         return null;
     }
+
+    public function bounds()
+    {
+        $order = Env::v('order', $this->defaultkey);
+        $show_bounds = 0;
+        if (($order == "name") || ($order == "-name")) {
+            $this->bound_field = "name";
+            $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;
+    }
 }
 
+/** An extended multipage view for profiles, as minifiches.
+ * Allows to sort by:
+ * - score (for a search query)
+ * - name
+ * - promo
+ * - latest modification
+ *
+ * Paramaters for this view are:
+ * - with_score: whether to allow ordering by score (set only for a quick search)
+ * - starts_with: show only names beginning with the given letter
+ */
 class MinificheView extends ProfileView
 {
-    public function __construct(PlSet &$set, $data, array $params)
+    public function __construct(PlSet &$set, array $params)
     {
-        require_once 'education.func.inc.php';
         global $globals;
         $this->entriesPerPage = $globals->search->per_page;
         if (@$params['with_score']) {
@@ -182,24 +246,21 @@ class MinificheView extends ProfileView
                     new UFO_Promo(UserFilter::DISPLAY, true),
                     new UFO_Name(Profile::DN_SORT),
                 ), 'dernière modification'));
-        parent::__construct($set, $data, $params);
+        parent::__construct($set, $params);
     }
 
-    public function bounds()
+    public function apply(PlPage &$page)
     {
-        $order = Env::v('order', $this->defaultkey);
-        $show_bounds = 0;
-        if (($order == "name") || ($order == "-name")) {
-            $this->bound_field = "name";
-            $show_bounds = 1;
-        } elseif (($order == "promo") || ($order == "-promo")) {
-            $this->bound_field = "promo";
-            $show_bounds = -1;
-        }
-        if ($order{0} == '-') {
-            $show_bounds = -$show_bounds;
+        if (array_key_exists('starts_with', $this->params)
+            && $this->params['starts_with'] != ""
+            && $this->params['starts_with'] != null) {
+
+            $this->set->addCond(
+                new UFC_Name(Profile::LASTNAME,
+                    $this->params['starts_with'], UFC_Name::PREFIX)
+            );
         }
-        return $show_bounds;
+        return parent::apply($page);
     }
 
     public function templateName()
@@ -210,7 +271,7 @@ class MinificheView extends ProfileView
 
 class MentorView extends ProfileView
 {
-    public function __construct(PlSet &$set, $data, array $params)
+    public function __construct(PlSet &$set, array $params)
     {
         $this->entriesPerPage = 10;
         $this->addSort(new PlViewOrder('rand', array(new PFO_Random(S::i('uid'))), 'aléatoirement'));
@@ -224,24 +285,7 @@ class MentorView extends ProfileView
                     new UFO_Promo(UserFilter::DISPLAY, true),
                     new UFO_Name(Profile::DN_SORT),
                 ), 'dernière modification'));
-        parent::__construct($set, $data, $params);
-    }
-
-    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;
+        parent::__construct($set, $params);
     }
 
     public function templateName()
@@ -252,9 +296,10 @@ class MentorView extends ProfileView
 
 class TrombiView extends ProfileView
 {
-    public function __construct(PlSet &$set, $data, array $params)
+    public function __construct(PlSet &$set, array $params)
     {
         $this->entriesPerPage = 24;
+        $this->defaultkey = 'name';
         if (@$params['with_score']) {
             $this->addSort(new PlViewOrder('score', array(
                             new UFO_Score(true),
@@ -263,29 +308,13 @@ class TrombiView extends ProfileView
                             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),
                         new UFO_Name(Profile::DN_SORT),
                     ), 'promotion'));
-        parent::__construct($set, $data, $params);
-    }
-
-    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;
+        parent::__construct($set, $params);
     }
 
     public function templateName()
@@ -305,7 +334,7 @@ class TrombiView extends ProfileView
 
 class GadgetView implements PlView
 {
-    public function __construct(PlSet &$set, $data, array $params)
+    public function __construct(PlSet &$set, array $params)
     {
         $this->set =& $set;
     }