X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fuserset.inc.php;h=62b5a02e151d823f869fdfe0e654ea628d1e5336;hb=b0653ad8f359685deb843d14f3103288997ec0c3;hp=55521c7f9357be8e458cbc9ebed5dcce1f50c028;hpb=0a928a2f2d5ded38bb30237efa6037397538e049;p=platal.git

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 55521c7..62b5a02 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -219,21 +219,21 @@ class MinificheView extends MixedView
                     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);
     }
@@ -245,8 +245,7 @@ class MinificheView extends MixedView
             && $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);
@@ -264,15 +263,15 @@ class MentorView extends MixedView
     {
         $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);
     }
@@ -288,11 +287,16 @@ class GroupMemberView extends MixedView
     public function __construct(PlSet $set, array $params)
     {
         $this->entriesPerPage = 20;
-        $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(),
+                ), 'dernière modification'));
         parent::__construct($set, $params);
     }
 
@@ -307,10 +311,10 @@ class ListMemberView extends MixedView
     public function __construct(PlSet $set, array $params)
     {
         $this->entriesPerPage = 100;
-        $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);
     }
@@ -332,14 +336,14 @@ class TrombiView extends MixedView
                             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);
     }
@@ -420,7 +424,7 @@ class AddressesView implements PlView
     public function apply(PlPage $page)
     {
         $pids = $this->set->getIds(new PlLimit());
-        $visibility = new ProfileVisibility(ProfileVisibility::VIS_AX);
+        $visibility = Visibility::defaultForRead(Visibility::VIEW_AX);
         pl_cached_content_headers('text/x-csv', 1);
 
         $csv = fopen('php://output', 'w');