Fixes count in group directory title (Closes #1580).

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

diff --git a/include/userset.inc.php b/include/userset.inc.php
index c590527..f3286dd 100644 (file)
--- 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);
     }
@@ -323,8 +327,13 @@ class ListMemberView extends MixedView
 
 class TrombiView extends MixedView
 {
+    private $full_count;
+
     public function __construct(PlSet $set, array $params)
     {
+        $set->getIds();
+        $this->full_count = $set->count();
+
         $this->entriesPerPage = 24;
         $this->defaultkey = 'name';
         if (@$params['with_score']) {
@@ -332,14 +341,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);
     }
@@ -355,10 +364,42 @@ class TrombiView extends MixedView
             global $globals;
             $page->assign('mainsiteurl', 'https://' . $globals->core->secure_domain . '/');
         }
+        $page->assign('full_count', $this->full_count);
         return parent::apply($page);
     }
 }
 
+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)
@@ -389,18 +430,31 @@ class AddressesView implements PlView
     public function apply(PlPage $page)
     {
         $pids = $this->set->getIds(new PlLimit());
-        $visibility = new ProfileVisibility(ProfileVisibility::VIS_AX);
-        pl_cached_content_headers('text/x-csv', 1);
+        $visibility = Visibility::defaultForRead(Visibility::VIEW_AX);
+        pl_cached_content_headers('text/x-csv', 'iso-8859-1', 1, 'adresses.csv');
 
         $csv = fopen('php://output', 'w');
-        fputcsv($csv, array('adresses'), ';');
-        $res = XDB::query('SELECT  pd.public_name, pa.postalText
-                             FROM  profile_addresses AS pa
-                       INNER JOIN  profile_display   AS pd ON (pd.pid = pa.pid)
-                            WHERE  pa.type = \'home\' AND pa.pub IN (\'public\', \'ax\') AND FIND_IN_SET(\'mail\', pa.flags) AND pa.pid IN {?}
-                         GROUP BY  pa.pid', $pids);
-        foreach ($res->fetchAllAssoc() as $item) {
-            fputcsv($csv, $item, ';');
+        fputcsv($csv,  array('PROMOTION', 'CIVILITE', 'NOM', 'PRENOM', 'SOCIETE', 'ADRESSE', 'CP', 'EMAIL'), ';');
+        if (!empty($pids)) {
+            $res = XDB::query("SELECT  pd.promo, p.title,
+                                       IF (pn.firstname_ordinary = '', UPPER(pn.firstname_main), UPPER(pn.firstname_ordinary)) AS firstname,
+                                       IF (pn.lastname_ordinary = '', UPPER(pn.lastname_main), UPPER(pn.lastname_ordinary)) AS lastname,
+                                       UPPER(pje.name), pa.postalText, pa.postal_code_fr AS postal_code, p.email_directory
+                                 FROM  (SELECT  pid, postalText, jobid, groupid, type, id, postal_code_fr
+                                          FROM  profile_addresses
+                                         WHERE  pub IN ('public', 'ax') AND FIND_IN_SET('mail', flags) AND pid IN {?}
+                                      ORDER BY  pid, NOT FIND_IN_SET('current', flags),
+                                                FIND_IN_SET('secondary', flags), type = 'job') AS pa
+                           INNER JOIN  profiles                          AS p    ON (pa.pid = p.pid)
+                           INNER JOIN  profile_display                   AS pd   ON (pd.pid = pa.pid)
+                           INNER JOIN  profile_public_names              AS pn   ON (pn.pid = pa.pid)
+                            LEFT JOIN  profile_job                       AS pj   ON (pj.pid = pa.pid
+                                                                                     AND pj.id = IF(pa.type = 'job', pa.id, NULL))
+                            LEFT JOIN  profile_job_enum                  AS pje  ON (pj.jobid = pje.id)
+                             GROUP BY  pa.pid", $pids);
+            foreach ($res->fetchAllAssoc() as $item) {
+                fputcsv($csv, array_map('utf8_decode', $item), ';');
+            }
         }
         fclose($csv);
         exit();