I forgot to commit the sql script for last commits.

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

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 88028d6..c590527 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -144,10 +144,10 @@ class ProfileArraySet extends ProfileSet
 }
 
 
-/** A multipage view for profiles
+/** A multipage view for profiles or users
  * Allows the display of bounds when sorting by name or promo.
  */
-abstract class ProfileView extends MultipageView
+abstract class MixedView extends MultipageView
 {
     protected function getBoundValue($obj)
     {
@@ -161,6 +161,20 @@ abstract class ProfileView extends MultipageView
             default:
                 return null;
             }
+        } elseif ($obj instanceof User) {
+            switch ($this->bound_field) {
+            case 'name':
+                $name = $obj->lastName();
+                return strtoupper($name);
+            case 'promo':
+                if ($obj->hasProfile()) {
+                    return $obj->profile()->promo();
+                } else {
+                    return 'ext';
+                }
+            default:
+                return null;
+            }
         }
         return null;
     }
@@ -194,7 +208,7 @@ abstract class ProfileView extends MultipageView
  * - 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
+class MinificheView extends MixedView
 {
     public function __construct(PlSet $set, array $params)
     {
@@ -244,7 +258,7 @@ class MinificheView extends ProfileView
     }
 }
 
-class MentorView extends ProfileView
+class MentorView extends MixedView
 {
     public function __construct(PlSet $set, array $params)
     {
@@ -269,92 +283,30 @@ class MentorView extends ProfileView
     }
 }
 
-class TrombiView extends ProfileView
+class GroupMemberView extends MixedView
 {
     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),
-                            new UFO_ProfileUpdate(true),
-                            new UFO_Promo(UserFilter::DISPLAY, true),
-                            new UFO_Name(Profile::DN_SORT),
-            ), 'pertinence'));
-        }
-        $set->addCond(new UFC_Photo());
+        $this->entriesPerPage = 20;
         $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'));
+                    new UFO_Promo(UserFilter::DISPLAY, true),
+                    new UFO_Name(Profile::DN_SORT),
+                ), 'promotion'));
         parent::__construct($set, $params);
     }
 
     public function templateName()
     {
-        return 'include/plview.trombi.tpl';
-    }
-
-    public function apply(PlPage $page)
-    {
-        if (!empty($GLOBALS['IS_XNET_SITE'])) {
-            global $globals;
-            $page->assign('mainsiteurl', 'https://' . $globals->core->secure_domain . '/');
-        }
-        return parent::apply($page);
-    }
-}
-
-/** A multipage view for users
- * Allows the display of bounds when sorting by name or promo.
- */
-abstract class UserView extends MultipageView
-{
-    protected function getBoundValue($user)
-    {
-        if ($user instanceof User) {
-            switch ($this->bound_field) {
-            case 'name':
-                $name = $user->lastName();
-                return strtoupper($name);
-            case 'promo':
-                if ($user->hasProfile()) {
-                    return $user->profile()->promo();
-                } else {
-                    return null;
-                }
-            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 = "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;
+        return 'include/plview.groupmember.tpl';
     }
 }
 
-class GroupMemberView extends UserView
+class ListMemberView extends MixedView
 {
     public function __construct(PlSet $set, array $params)
     {
-        $this->entriesPerPage = 20;
+        $this->entriesPerPage = 100;
         $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),
@@ -365,26 +317,45 @@ class GroupMemberView extends UserView
 
     public function templateName()
     {
-        return 'include/plview.groupmember.tpl';
+        return 'include/plview.listmember.tpl';
     }
 }
 
-class ListMemberView extends UserView
+class TrombiView extends MixedView
 {
     public function __construct(PlSet $set, array $params)
     {
-        $this->entriesPerPage = 100;
+        $this->entriesPerPage = 24;
+        $this->defaultkey = 'name';
+        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'));
+        }
+        $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'));
+                        new UFO_Promo(UserFilter::DISPLAY, true),
+                        new UFO_Name(Profile::DN_SORT),
+                    ), 'promotion'));
         parent::__construct($set, $params);
     }
 
     public function templateName()
     {
-        return 'include/plview.listmember.tpl';
+        return 'include/plview.trombi.tpl';
+    }
+
+    public function apply(PlPage $page)
+    {
+        if (!empty($GLOBALS['IS_XNET_SITE'])) {
+            global $globals;
+            $page->assign('mainsiteurl', 'https://' . $globals->core->secure_domain . '/');
+        }
+        return parent::apply($page);
     }
 }