X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=62b5a02e151d823f869fdfe0e654ea628d1e5336;hb=4a29ad42791b15f7d17f672ce511a2baf22a9b6e;hp=21ad42d9de90b6ab606910d67c1542fc10f86889;hpb=290dca06a494e75001f2bde2e5836938dacac88d;p=platal.git

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 21ad42d..62b5a02 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,12 +21,12 @@
 
 class UserSet extends PlSet
 {
-    public function __construct(PlFilterCondition &$cond, $orders = null)
+    public function __construct(PlFilterCondition $cond, $orders = null)
     {
         parent::__construct($cond, $orders);
     }
 
-    protected function buildFilter(PlFilterCondition &$cond, $orders)
+    protected function buildFilter(PlFilterCondition $cond, $orders)
     {
         return new UserFilter($cond, $orders);
     }
@@ -34,12 +34,12 @@ class UserSet extends PlSet
 
 class ProfileSet extends PlSet
 {
-    public function __construct(PlFilterCondition &$cond, $orders = null)
+    public function __construct(PlFilterCondition $cond, $orders = null)
     {
         parent::__construct($cond, $orders);
     }
 
-    protected function buildFilter(PlFilterCondition &$cond, $orders)
+    protected function buildFilter(PlFilterCondition $cond, $orders)
     {
         return new ProfileFilter($cond, $orders);
     }
@@ -52,7 +52,7 @@ class SearchSet extends ProfileSet
     protected $score    = null;
     protected $valid    = true;
 
-    public function __construct(UserFilterBuilder &$ufb, PlFilterCondition $cond = null)
+    public function __construct(UserFilterBuilder $ufb, PlFilterCondition $cond = null)
     {
         if (is_null($cond)) {
             $conds = new PFC_And();
@@ -92,7 +92,7 @@ class SearchSet extends ProfileSet
         return $args;
     }
 
-    protected function &getFilterResults(PlFilter &$pf, PlLimit $limit)
+    protected function &getFilterResults(PlFilter $pf, PlLimit $limit)
     {
         $profiles = $pf->getProfiles($limit, Profile::FETCH_MINIFICHES);
         return $profiles;
@@ -123,26 +123,31 @@ class AdvancedSearchSet extends SearchSet
     }
 }
 
-/** Simple set based on an array of User objects
+/** Simple set based on an array of User emails
  */
-class ArraySet extends ProfileSet
+class UserArraySet extends UserSet
 {
-    public function __construct(array $users)
+    public function __construct(array $emails)
     {
-        $hruids = User::getBulkHruid($users, array('User', '_silent_user_callback'));
-        if (is_null($hruids) || count($hruids) == 0) {
-            $cond = new PFC_False();
-        } else {
-            $cond = new UFC_Hruid($hruids);
-        }
-        parent::__construct($cond);
+        parent::__construct(new UFC_Email($emails));
+    }
+}
+
+/** Simple set based on an array of Profile emails
+ */
+class ProfileArraySet extends ProfileSet
+{
+    public function __construct(array $emails)
+    {
+        parent::__construct(new UFC_Email($emails));
     }
 }
 
-/** 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)
     {
@@ -156,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;
     }
@@ -189,9 +208,9 @@ 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)
+    public function __construct(PlSet $set, array $params)
     {
         global $globals;
         $this->entriesPerPage = $globals->search->per_page;
@@ -200,34 +219,33 @@ class MinificheView extends ProfileView
                     new UFO_Score(true),
                     new UFO_ProfileUpdate(true),
                     new UFO_Promo(UserFilter::DISPLAY, true),
-                    new UFO_Name(Profile::DN_SORT),
+                    new UFO_Name(),
                 ), 'pertinence'));
         }
         $this->addSort(new PlViewOrder(
                             'name',
-                            array(new UFO_Name(Profile::DN_SORT)),
+                            array(new UFO_Name()),
                             'nom'));
         $this->addSort(new PlViewOrder('promo', array(
                     new UFO_Promo(UserFilter::DISPLAY, true),
-                    new UFO_Name(Profile::DN_SORT),
+                    new UFO_Name(),
                 ), 'promotion'));
         $this->addSort(new PlViewOrder('date_mod', array(
                     new UFO_ProfileUpdate(true),
                     new UFO_Promo(UserFilter::DISPLAY, true),
-                    new UFO_Name(Profile::DN_SORT),
+                    new UFO_Name(),
                 ), 'dernière modification'));
         parent::__construct($set, $params);
     }
 
-    public function apply(PlPage &$page)
+    public function apply(PlPage $page)
     {
         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)
+                new UFC_NameInitial($this->params['starts_with'])
             );
         }
         return parent::apply($page);
@@ -239,21 +257,21 @@ class MinificheView extends ProfileView
     }
 }
 
-class MentorView extends ProfileView
+class MentorView extends MixedView
 {
-    public function __construct(PlSet &$set, 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'));
-        $this->addSort(new PlViewOrder('name', array(new UFO_Name(Profile::DN_SORT)), 'nom'));
+        $this->addSort(new PlViewOrder('name', array(new UFO_Name()), 'nom'));
         $this->addSort(new PlViewOrder('promo', array(
                     new UFO_Promo(UserFilter::DISPLAY, true),
-                    new UFO_Name(Profile::DN_SORT),
+                    new UFO_Name(),
                 ), 'promotion'));
         $this->addSort(new PlViewOrder('date_mod', array(
                     new UFO_ProfileUpdate(true),
                     new UFO_Promo(UserFilter::DISPLAY, true),
-                    new UFO_Name(Profile::DN_SORT),
+                    new UFO_Name(),
                 ), 'dernière modification'));
         parent::__construct($set, $params);
     }
@@ -264,9 +282,52 @@ class MentorView extends ProfileView
     }
 }
 
-class TrombiView extends ProfileView
+class GroupMemberView extends MixedView
+{
+    public function __construct(PlSet $set, array $params)
+    {
+        $this->entriesPerPage = 20;
+        $this->addSort(new PlViewOrder('name', array(new UFO_Name()), 'nom'));
+        $this->addSort(new PlViewOrder('promo', array(
+                    new UFO_Promo(UserFilter::DISPLAY, true),
+                    new UFO_Name(),
+                ), 'promotion'));
+        $this->addSort(new PlViewOrder('date_mod', array(
+                    new UFO_ProfileUpdate(true),
+                    new UFO_Promo(UserFilter::DISPLAY, true),
+                    new UFO_Name(),
+                ), 'dernière modification'));
+        parent::__construct($set, $params);
+    }
+
+    public function templateName()
+    {
+        return 'include/plview.groupmember.tpl';
+    }
+}
+
+class ListMemberView extends MixedView
+{
+    public function __construct(PlSet $set, array $params)
+    {
+        $this->entriesPerPage = 100;
+        $this->addSort(new PlViewOrder('name', array(new UFO_Name()), 'nom'));
+        $this->addSort(new PlViewOrder('promo', array(
+                    new UFO_Promo(UserFilter::DISPLAY, true),
+                    new UFO_Name(),
+                ), 'promotion'));
+        parent::__construct($set, $params);
+    }
+
+    public function templateName()
+    {
+        return 'include/plview.listmember.tpl';
+    }
+}
+
+class TrombiView extends MixedView
 {
-    public function __construct(PlSet &$set, array $params)
+    public function __construct(PlSet $set, array $params)
     {
         $this->entriesPerPage = 24;
         $this->defaultkey = 'name';
@@ -275,14 +336,14 @@ class TrombiView extends ProfileView
                             new UFO_Score(true),
                             new UFO_ProfileUpdate(true),
                             new UFO_Promo(UserFilter::DISPLAY, true),
-                            new UFO_Name(Profile::DN_SORT),
+                            new UFO_Name(),
             ), 'pertinence'));
         }
         $set->addCond(new UFC_Photo());
-        $this->addSort(new PlViewOrder('name', array(new UFO_Name(Profile::DN_SORT)), 'nom'));
+        $this->addSort(new PlViewOrder('name', array(new UFO_Name()), 'nom'));
         $this->addSort(new PlViewOrder('promo', array(
                         new UFO_Promo(UserFilter::DISPLAY, true),
-                        new UFO_Name(Profile::DN_SORT),
+                        new UFO_Name(),
                     ), 'promotion'));
         parent::__construct($set, $params);
     }
@@ -292,7 +353,7 @@ class TrombiView extends ProfileView
         return 'include/plview.trombi.tpl';
     }
 
-    public function apply(PlPage &$page)
+    public function apply(PlPage $page)
     {
         if (!empty($GLOBALS['IS_XNET_SITE'])) {
             global $globals;
@@ -302,14 +363,45 @@ class TrombiView extends ProfileView
     }
 }
 
+class MapView implements PlView
+{
+    private $set;
+
+    public function __construct(PlSet $set, array $params)
+    {
+        $this->set = $set;
+    }
+
+    public function apply(PlPage $page)
+    {
+        Platal::load('geoloc');
+
+        if (Get::b('ajax')) {
+            $pids = $this->set->getIds(new PlLimit());
+            GeolocModule::assign_json_to_map($page, $pids);
+            $page->runJSON();
+            exit;
+        } else {
+            $this->set->getIds(new PlLimit());
+            GeolocModule::prepare_map($page);
+            return 'geoloc/index.tpl';
+        }
+    }
+
+    public function args()
+    {
+        return $this->set->args();
+    }
+}
+
 class GadgetView implements PlView
 {
-    public function __construct(PlSet &$set, array $params)
+    public function __construct(PlSet $set, array $params)
     {
         $this->set =& $set;
     }
 
-    public function apply(PlPage &$page)
+    public function apply(PlPage $page)
     {
         $page->assign_by_ref('set', $this->set->get(new PlLimit(5, 0)));
     }
@@ -324,16 +416,16 @@ class AddressesView implements PlView
 {
     private $set;
 
-    public function __construct(PlSet &$set, array $params)
+    public function __construct(PlSet $set, array $params)
     {
         $this->set =& $set;
     }
 
-    public function apply(PlPage &$page)
+    public function apply(PlPage $page)
     {
         $pids = $this->set->getIds(new PlLimit());
-        $visibility = new ProfileVisibility(ProfileVisibility::VIS_AX);
-        pl_content_headers('text/x-csv');
+        $visibility = Visibility::defaultForRead(Visibility::VIEW_AX);
+        pl_cached_content_headers('text/x-csv', 1);
 
         $csv = fopen('php://output', 'w');
         fputcsv($csv, array('adresses'), ';');
@@ -355,5 +447,35 @@ class AddressesView implements PlView
     }
 }
 
+class JSonView implements PlView
+{
+    private $set;
+    private $params;
+
+    public function __construct(PlSet $set, array $params)
+    {
+        $this->set    = $set;
+        $this->params = $params;
+    }
+
+    public function apply(PlPage $page)
+    {
+        $export = array();
+        $start  = isset($this->params['offset']) ? $this->params['offset'] : 0;
+        $count  = isset($this->params['count'])  ? $this->params['count']  : 10;
+        $profiles = $this->set->get(new PlLimit($start, $count));
+        foreach ($profiles as $profile) {
+            $export[] = $profile->export();
+        }
+        $page->jsonAssign('profile_count', $this->set->count());
+        $page->jsonAssign('profiles', $export);
+    }
+
+    public function args()
+    {
+        return $this->set->args();
+    }
+}
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>