Start assigning permissions to the hooks.

[platal.git] / classes / direnum.php

diff --git a/classes/direnum.php b/classes/direnum.php
index cce7e39..c6fbf0d 100644 (file)
--- a/classes/direnum.php
+++ b/classes/direnum.php
@@ -30,6 +30,7 @@ class DirEnum
      * being DE_$basename).
      */
     const NAMETYPES      = 'nametypes';
+    const NAMES          = 'names';
 
     const BINETS         = 'binets';
     const GROUPESX       = 'groupesx';
@@ -39,6 +40,9 @@ class DirEnum
     const EDUDEGREES     = 'educationdegrees';
     const EDUFIELDS      = 'educationfields';
 
+    const CORPS          = 'corps';
+    const CORPSRANKS     = 'corpsranks';
+
     const NATIONALITIES  = 'nationalities';
     const COUNTRIES      = 'countries';
     const ADMINAREAS     = 'adminareas';
@@ -50,6 +54,8 @@ class DirEnum
 
     const NETWORKS       = 'networking';
 
+    const MEDALS         = 'medals';
+
     static private $enumerations = array();
 
     static private function init($type)
@@ -93,8 +99,10 @@ class DirEnum
             self::init($type);
         }
         $obj = self::$enumerations[$type];
+        $args = func_get_args();
+        array_shift($args);
         if ($obj->capabilities & DirEnumeration::HAS_OPTIONS) {
-            return call_user_func(array($obj, 'getOptionsIter'));
+            return call_user_func_array(array($obj, 'getOptionsIter'), $args);
         } else {
             return PlIteratorUtils::fromArray(array());
         }
@@ -197,7 +205,9 @@ abstract class DirEnumeration
 
     public function getOptionsIter()
     {
-        return PlIteratorUtils::fromArray(self::expandArray($this->getOptions()), 1, true);
+        $options = $this->getOptions();
+        $options = self::expandArray($options);
+        return PlIteratorUtils::fromArray($options, 1, true);
     }
 
     // {{{ function getIDs
@@ -233,6 +243,9 @@ abstract class DirEnumeration
     }
     // }}}
 
+    /** Builds a list of query parts for searching @$text in @$field :
+     * field LIKE 'text%', field LIKE '% text%', field LIKE '%-text%'
+     */
     private function mkTests($field, $text)
     {
         $tests = array();
@@ -276,7 +289,7 @@ abstract class DirEnumeration
 
         return XDB::iterator('SELECT ' . $this->valfield . ' AS field'
                                        . ($this->ac_distinct ? (', COUNT(DISTINCT ' . $this->ac_unique . ') AS nb') : '')
-                                       . ($this->ac_withid ? (', ' . $this->from . '.' . $this->idfield . ' AS id') : '') . '
+                                       . ($this->ac_withid ? (', ' . $this->idfield . ' AS id') : '') . '
                                 FROM ' . $this->from . '
                                      ' . $this->ac_join . '
                                WHERE ' . $where . '
@@ -341,7 +354,7 @@ abstract class DE_WithSuboption extends DirEnumeration
         } else if (array_key_exists($subid, $this->suboptions)) {
             return $this->suboptions[$subid];
         } else {
-            return false;
+            return array();
         }
     }
 
@@ -425,6 +438,18 @@ class DE_NameTypes extends DirEnumeration
 }
 // }}}
 
+// {{{ class DE_Names
+// returns 'system' names ('lastname', 'lastname_marital', ...)
+class DE_Names extends DirEnumeration
+{
+    public $capabilities = 0x005; // self::HAS_OPTIONS | self::SAVE_IN_SESSION;
+
+    protected $from     = 'profile_name_enum';
+    protected $idfield  = 'type';
+    protected $valfield = 'name';
+}
+// }}}
+
 /** GROUPS
  */
 // {{{ class DE_Binets
@@ -456,7 +481,7 @@ class DE_GroupesX extends DirEnumeration
     protected $from      = 'groups';
     protected $where     = 'WHERE (cat = \'GroupesX\' OR cat = \'Institutions\') AND pub = \'public\'';
 
-    protected $ac_join   = "INNER JOIN group_members ON (groups.id = memb.asso_id
+    protected $ac_join   = "INNER JOIN group_members ON (groups.id = group_members.asso_id
                                     AND (groups.cat = 'GroupesX' OR groups.cat = 'Institutions')
                                     AND groups.pub = 'public')";
     protected $ac_unique = 'group_members.uid';
@@ -468,6 +493,7 @@ class DE_GroupesX extends DirEnumeration
 // {{{ class DE_EducationSchools
 class DE_EducationSchools extends DirEnumeration
 {
+    protected $idfield   = 'profile_education_enum.id';
     protected $valfield  = 'profile_education_enum.name';
     protected $valfield2 = 'profile_education_enum.abbreviation';
     protected $from      = 'profile_education_enum';
@@ -502,6 +528,32 @@ class DE_EducationFields extends DirEnumeration
 }
 // }}}
 
+// {{{ class DE_Corps
+class DE_Corps extends DirEnumeration
+{
+    protected $idfield   = 'corps_enum.id';
+    protected $valfield  = 'corps_enum.name';
+    protected $valfield2 = 'corps_enum.abbrev';
+    protected $from      = 'corps_enum';
+
+    protected $ac_unique = 'corps.pid';
+    protected $ac_join   = 'INNER JOIN corps ON (corps.current_corpsid = corps_enum.id)';
+}
+// }}}
+
+// {{{ class DE_CorpsRanks
+class DE_CorpsRanks extends DirEnumeration
+{
+    protected $idfield   = 'corps_rank_enum.id';
+    protected $valfield  = 'corps_rank_enum.name';
+    protected $valfield2 = 'corps_rank_enum.abbrev';
+    protected $from      = 'corps_rank_enum';
+
+    protected $ac_unique = 'corps.pid';
+    protected $ac_join   = 'INNER JOIN corps ON (corps.rankid = corps_rank_enum.id)';
+}
+// }}}
+
 /** GEOLOC
  */
 // {{{ class DE_Nationalities
@@ -526,7 +578,7 @@ class DE_Countries extends DirEnumeration
     protected $valfield2 = 'geoloc_countries.country';
     protected $from      = 'geoloc_countries';
 
-    protected $ac_join   = 'INNER JOIN profile_addresses ON (geoloc_countries.iso_3166_1_a2 = profile_addresses.countryFR';
+    protected $ac_join   = 'INNER JOIN profile_addresses ON (geoloc_countries.iso_3166_1_a2 = profile_addresses.countryId)';
     protected $ac_unique = 'profile_addresses.pid';
 }
 // }}}
@@ -547,10 +599,11 @@ class DE_AdminAreas extends DE_WithSuboption
 // {{{ class DE_Localities
 class DE_Localities extends DirEnumeration
 {
+    protected $idfield   = 'geoloc_localities.id';
     protected $valfield  = 'geoloc_localities.name';
     protected $from      = 'geoloc_localities';
 
-    protected $ac_join   = 'profile_addresses ON (profile_addresses.localityID = geoloc_localities.id)';
+    protected $ac_join   = 'INNER JOIN profile_addresses ON (profile_addresses.localityID = geoloc_localities.id)';
     protected $ac_unique = 'profile_addresses.pid';
 }
 // }}}
@@ -560,6 +613,7 @@ class DE_Localities extends DirEnumeration
 // {{{ class DE_Companies
 class DE_Companies extends DirEnumeration
 {
+    protected $idfield   = 'profile_job_enum.id';
     protected $valfield  = 'profile_job_enum.name';
     protected $valfield2 = 'profile_job_enum.acronym';
     protected $from      = 'profile_job_enum';
@@ -572,6 +626,7 @@ class DE_Companies extends DirEnumeration
 // {{{ class DE_Sectors
 class DE_Sectors extends DirEnumeration
 {
+    protected $idfield   = 'profile_job_sector_enum.id';
     protected $valfield  = 'profile_job_sector_enum.name';
     protected $from      = 'profile_job_sector_enum';
 
@@ -581,7 +636,7 @@ class DE_Sectors extends DirEnumeration
 // }}}
 
 // {{{ class DE_JobDescription
-class DE_JobDescription
+class DE_JobDescription extends DirEnumeration
 {
     protected $valfield = 'profile_job.description';
     protected $from     = 'profile_job';
@@ -596,15 +651,27 @@ class DE_JobDescription
 // {{{ class DE_Networking
 class DE_Networking extends DirEnumeration
 {
-    protected $idfield  = 'profile_networking_enum.network_type';
+    protected $idfield  = 'profile_networking_enum.nwid';
     protected $valfield = 'profile_networking_enum.name';
     protected $from     = 'profile_networking_enum';
 
 
-    protected $ac_join   = 'INNER JOIN profile_networking ON (profile_networking.network_type = profile_networking_enum.network_type';
+    protected $ac_join   = 'INNER JOIN profile_networking ON (profile_networking.nwid = profile_networking_enum.nwid)';
     protected $ac_unique = 'profile_networking.pid';
 }
 // }}}
 
+/** MEDALS
+ */
+// {{{ class DE_Medals
+class DE_Medals extends DirEnumeration
+{
+    protected $from = 'profile_medal_enum';
+
+    protected $ac_join = 'INNER JOIN profile_medals ON (profile_medals.mid = profile_medal_enum.id)';
+    protected $ac_unique = 'profile_medals.pid';
+}
+// }}}
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>