Merge remote branch 'origin/master' into account

[platal.git] / include / userset.inc.php

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 9bf11c9..73ba6c8 100644 (file)
--- 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_Promo(UserFilter::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())
             );
         }
 
@@ -147,7 +143,26 @@ class ArraySet extends UserSet
     }
 }
 
-class MinificheView extends MultipageView
+abstract class ProfileView extends MultipageView
+{
+    protected function getBoundValue($obj)
+    {
+        if ($obj instanceof Profile) {
+            switch ($this->bound_field) {
+            case 'name':
+                $name = $obj->name('%l');
+                return strtoupper($name);
+            case 'promo':
+                return $obj->promo();
+            default:
+                return null;
+            }
+        }
+        return null;
+    }
+}
+
+class MinificheView extends ProfileView
 {
     public function __construct(PlSet &$set, $data, array $params)
     {
@@ -159,41 +174,25 @@ class MinificheView extends MultipageView
                     new UFO_Score(true),
                     new UFO_ProfileUpdate(true),
                     new UFO_Promo(UserFilter::DISPLAY, true),
-                    new UFO_Name(UserFilter::DN_SORT),
+                    new UFO_Name(Profile::DN_SORT),
                 ), 'pertinence'));
         }
         $this->addSort(new PlViewOrder(
                             'name',
-                            array(new UFO_Name(UserFilter::DN_SORT)),
+                            array(new UFO_Name(Profile::DN_SORT)),
                             'nom'));
         $this->addSort(new PlViewOrder('promo', array(
                     new UFO_Promo(UserFilter::DISPLAY, true),
-                    new UFO_Name(UserFilter::DN_SORT),
+                    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(UserFilter::DN_SORT),
+                    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]);
-            case 'promo':
-                return $obj->promo();
-            default:
-                return null;
-            }
-        }
-        return null;
-    }
-
     public function bounds()
     {
         $order = Env::v('order', $this->defaultkey);
@@ -217,41 +216,25 @@ class MinificheView extends MultipageView
     }
 }
 
-class MentorView extends MultipageView
+class MentorView extends ProfileView
 {
     public function __construct(PlSet &$set, $data, array $params)
     {
         $this->entriesPerPage = 10;
         $this->addSort(new PlViewOrder('rand', array(new PFO_Random(S::i('uid'))), 'aléatoirement'));
-        $this->addSort(new PlViewOrder('name', array(new UFO_Name(UserFilter::DN_SORT)), 'nom'));
+        $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(UserFilter::DN_SORT),
+                    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(UserFilter::DN_SORT),
+                    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]);
-            case 'promo':
-                return $obj->promo();
-            default:
-                return null;
-            }
-        }
-        return null;
-    }
-
     public function bounds()
     {
         $order = Env::v('order', $this->defaultkey);
@@ -275,7 +258,7 @@ class MentorView extends MultipageView
     }
 }
 
-class TrombiView extends MultipageView
+class TrombiView extends ProfileView
 {
     public function __construct(PlSet &$set, $data, array $params)
     {
@@ -285,33 +268,17 @@ class TrombiView extends MultipageView
                             new UFO_Score(true),
                             new UFO_ProfileUpdate(true),
                             new UFO_Promo(UserFilter::DISPLAY, true),
-                            new UFO_Name(UserFilter::DN_SORT),
+                            new UFO_Name(Profile::DN_SORT),
             ), 'pertinence'));
         }
-        $this->addSort(new PlViewOrder('name', array(new UFO_Name(UserFilter::DN_SORT)), 'nom'));
+        $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(UserFilter::DN_SORT),
+                        new UFO_Name(Profile::DN_SORT),
                     ), 'promotion'));
         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);