X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fufbuilder.inc.php;h=73997e9aef9b9f15812df3cd34c932b697c7956d;hb=e5b254d5b406a2ed6c15e27aa3d05e6f729178ca;hp=9385cb15d117b0330302993e5541b5cce9a65e01;hpb=0073747ac81cc9cff9e43847eb008f0e815255f0;p=platal.git diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php index 9385cb1..73997e9 100644 --- a/include/ufbuilder.inc.php +++ b/include/ufbuilder.inc.php @@ -1,6 +1,6 @@ s($key); + return preg_match('/[a-z0-9]/i', $str); + } + + public function hasAlpha($key) + { + $str = $this->s($key); + return preg_match('/[a-z]/i', $str); + } + public function isOn($key) { return $this->has($key) && $this->t($key) == 'on'; @@ -154,6 +166,7 @@ class UFB_QuickSearch extends UserFilterBuilder { $fields = array( new UFBF_Quick('quick', 'Recherche rapide'), + new UFBF_NotRegistered('nonins', 'Non inscrits'), ); parent::__construct($fields, $envprefix); } @@ -163,7 +176,12 @@ class UFB_QuickSearch extends UserFilterBuilder // {{{ class UFB_AdvancedSearch class UFB_AdvancedSearch extends UserFilterBuilder { - public function __construct($envprefix = '') + /** Create a UFB_AdvancedSearch. + * @param $include_admin Whether to include 'admin-only' fields + * @param $include_ax Whether to include 'ax-only' fields + * @param $envprefix Optional prefix for form field names. + */ + public function __construct($include_admin = false, $include_ax = false, $envprefix = '') { $fields = array( new UFBF_Name('name', 'Nom'), @@ -175,12 +193,13 @@ class UFB_AdvancedSearch extends UserFilterBuilder new UFBF_Town('city', 'Ville / Code Postal'), new UFBF_Country('countryTxt', 'country', 'Pays'), - new UFBF_AdminArea('region', 'Région'), + new UFBF_AdminArea('administrativearea', 'Région'), + new UFBF_SubAdminArea('subadministrativearea', 'Département'), new UFBF_JobCompany('entreprise', 'Entreprise'), - new UFBF_JobSector('sector', 'Poste'), new UFBF_JobDescription('jobdescription', 'Fonction'), new UFBF_JobCv('cv', 'CV'), + new UFBF_JobTerms('jobterm', 'Mots-clefs'), new UFBF_Nationality('nationaliteTxt', 'nationalite', 'Nationalité'), new UFBF_Binet('binetTxt', 'binet', 'Binet'), @@ -194,7 +213,14 @@ class UFB_AdvancedSearch extends UserFilterBuilder new UFBF_Comment('free', 'Commentaire'), new UFBF_Phone('phone_number', 'Téléphone'), new UFBF_Networking('networking_address', 'networking_type', 'Networking et sites webs'), + + new UFBF_Mentor('only_referent', 'Référent'), ); + + if ($include_admin || $include_ax) { + $fields[] = new UFBF_SchoolIds('schoolid_ax', 'Matricule AX', UFC_SchoolId::AX); + } + parent::__construct($fields, $envprefix); } } @@ -206,9 +232,8 @@ class UFB_MentorSearch extends UserFilterBuilder public function __construct($envprefix = '') { $fields = array( - new UFBF_MentorCountry('pays_sel'), - new UFBF_MentorSectorization('sector', '', UFC_Mentor_Sectorization::SECTOR), - new UFBF_MentorSectorization('subSector', '', UFC_Mentor_Sectorization::SUBSECTOR), + new UFBF_MentorCountry('country'), + new UFBF_MentorTerm('jobterm', 'jobtermText'), new UFBF_MentorExpertise('expertise'), ); parent::__construct($fields, $envprefix); @@ -255,7 +280,7 @@ abstract class UFB_Field return false; } - if (!$this->empty) { + if (!$this->isEmpty()) { $ufc = $this->buildUFC($ufb); if ($ufc != null) { $ufb->addCond($ufc); @@ -308,7 +333,7 @@ abstract class UFBF_Text extends UFB_Field return $this->raise("Le champ %s est trop court (minimum {$this->minlength})."); } else if (strlen($this->val) > $this->maxlength) { return $this->raise("Le champ %s est trop long (maximum {$this->maxlength})."); - } else if (preg_match(":[\]\[<>{}~/§_`|%$^=+]|\*\*:u", $this->val)) { + } else if (preg_match(":[\]\[<>{}~§_`|%$^=]|\*\*:u", $this->val)) { return $this->raise('Le champ %s contient un caractère interdit rendant la recherche impossible.'); } @@ -436,7 +461,7 @@ abstract class UFBF_Mixed extends UFB_Field protected function check(UserFilterBuilder &$ufb) { - if ($ufb->blank($this->envfieldindex) && $ufb->blank($this->envfield)) { + if ($ufb->blank($this->envfieldindex) && !$ufb->hasAlnum($this->envfield)) { $this->empty = true; return true; } @@ -450,7 +475,7 @@ abstract class UFBF_Mixed extends UFB_Field } $this->val = array($index); } else { - $indexes = DirEnum::getIDs($this->direnum, $ufb->t($this->envfield), + $indexes = DirEnum::getIDs($this->direnum, $ufb->t($this->envfield), $ufb->b('exact') ? XDB::WILDCARD_EXACT : XDB::WILDCARD_CONTAINS); if (count($indexes) == 0) { return false; @@ -487,8 +512,7 @@ class UFBF_Quick extends UFB_Field if (S::admin() && strpos($s, '@') !== false) { return new UFC_Email($s); } else if (S::admin() && preg_match('/[0-9]+\.([0-9]+|%)\.([0-9]+|%)\.([0-9]+|%)/', $s)) { - $this->conds->addChild(new UFC_Ip($s)); - return; + return new UFC_Ip($s); } $conds = new PFC_And(); @@ -508,18 +532,8 @@ class UFBF_Quick extends UFB_Field } else { $flags = array('public'); } - if ($ufb->b('with_soundex')) { - $soundex = true; - $st = array(); - foreach ($strings as $string) { - $st[] = soundex_fr($string); - } - } else { - $soundex = false; - $st = $strings; - } $exact =$ufb->b('exact'); - $conds->addChild(new UFC_NameTokens($st, $flags, $soundex, $exact)); + $conds->addChild(new UFC_NameTokens($strings, $flags, $ufb->b('with_soundex'), $exact)); $ufb->addOrder(new UFO_Score()); } @@ -561,6 +575,48 @@ class UFBF_Quick extends UFB_Field } // }}} +// {{{ class UFBF_SchoolIds +class UFBF_SchoolIds extends UFB_Field +{ + // One of UFC_SchoolId types + protected $type; + + public function __construct($envfield, $formtext, $type = UFC_SchoolId::AX) + { + parent::__construct($envfield, $formtext); + $this->type = $type; + } + + protected function check(UserFilterBuilder &$ufb) + { + if ($ufb->blank($this->envfield)) { + $this->empty = true; + return true; + } + + $value = $ufb->t($this->envfield); + $values = explode("\n", $value); + $ids = array(); + foreach ($values as $val) { + if (preg_match('/^[0-9A-Z]{0,8}$/', $val)) { + $ids[] = $val; + } + } + if (count($ids) == 0) { + return $this->raise("Le champ %s ne contient aucune valeur valide."); + } + + $this->val = $ids; + return true; + } + + protected function buildUFC(UserFilterBuilder &$ufb) + { + return new UFC_SchoolId($this->type, $this->val); + } +} +// }}} + // {{{ class UFBF_Name class UFBF_Name extends UFBF_Text { @@ -604,8 +660,8 @@ class UFBF_Promo extends UFB_Field return true; } - $this->val = $ubf->i($this->envfield); - $this->comp = $ubf->v($this->envfieldcomp); + $this->val = $ufb->i($this->envfield); + $this->comp = $ufb->v($this->envfieldcomp); if (!in_array($this->comp, self::$validcomps)) { return $this->raise("Le critère {$this->comp} n'est pas valide pour le champ %s"); @@ -621,7 +677,7 @@ class UFBF_Promo extends UFB_Field } protected function buildUFC(UserFilterBuilder &$ufb) { - return new UFC_Promo($this->comp, UserFilter::DISPLAY, 'X' . $this->val); + return new UFC_Promo($this->comp, UserFilter::GRADE_ING, $this->val); } } // }}} @@ -653,6 +709,22 @@ class UFBF_Sex extends UFBF_Enum } // }}} +// {{{ class UFBF_NotRegistered +// Simple field for selecting only alive, not registered users (for quick search) +class UFBF_NotRegistered extends UFBF_Bool +{ + protected function buildUFC(UserFilterBuilder &$ufb) + { + if ($this->val) { + return new PFC_And( + new PFC_Not(new UFC_Dead()), + new PFC_Not(new UFC_Registered()) + ); + } + } +} +// }}} + // {{{ class UFBF_Registered class UFBF_Registered extends UFBF_Enum { @@ -666,7 +738,7 @@ class UFBF_Registered extends UFBF_Enum if ($this->val == 1) { return new UFC_Registered(); } else if ($this->val == 2) { - return new PFC_Not(UFC_Registered()); + return new PFC_Not(new UFC_Registered()); } } } @@ -683,7 +755,7 @@ class UFBF_Dead extends UFBF_Enum protected function buildUFC(UserFilterBuilder &$ufb) { if ($this->val == 1) { - return new PFC_Not(UFC_Dead()); + return new PFC_Not(new UFC_Dead()); } else if ($this->val == 2) { return new UFC_Dead(); } @@ -725,7 +797,7 @@ class UFBF_Town extends UFBF_Text return new PFC_False(); } } else { - $byname = new UFC_AddressText(null, UFC_Address::CONTAINS, UFC_Address::TYPE_ANY, $flags, null, $this->val); + $byname = new UFC_AddressText(null, XDB::WILDCARD_CONTAINS, UFC_Address::TYPE_ANY, $flags, null, $this->val); $byzip = new UFC_AddressField($this->val, UFC_AddressField::FIELD_ZIPCODE, UFC_Address::TYPE_ANY, $flags); if ($this->type & self::TYPE_ANY) { return new PFC_Or($byname, $byzip); @@ -765,14 +837,14 @@ class UFBF_Country extends UFBF_Mixed // }}} // {{{ class UFBF_AdminArea -class UFBF_AdminArea extends UFBF_Mixed +class UFBF_AdminArea extends UFBF_Index { protected $direnum = DirEnum::ADMINAREAS; protected $onlycurrentfield; - public function __construct($envfieldtext, $envfieldindex, $formtext = '', $onlycurrentfield = 'only_current') + public function __construct($envfield, $formtext = '', $onlycurrentfield = 'only_current') { - parent::__construct($envfieldtext, $envfieldindex, $formtext); + parent::__construct($envfield, $formtext); $this->onlycurrentfield = $onlycurrentfield; } @@ -790,6 +862,32 @@ class UFBF_AdminArea extends UFBF_Mixed } // }}} +// {{{ class UFBF_SubAdminArea +class UFBF_SubAdminArea extends UFBF_Index +{ + protected $direnum = DirEnum::SUBADMINAREAS; + protected $onlycurrentfield; + + public function __construct($envfield, $formtext = '', $onlycurrentfield = 'only_current') + { + parent::__construct($envfield, $formtext); + $this->onlycurrentfield = $onlycurrentfield; + } + + + protected function buildUFC(UserFilterBuilder &$ufb) + { + if ($ufb->isOn($this->onlycurrentfield)) { + $flags = UFC_Address::FLAG_CURRENT; + } else { + $flags = UFC_Address::FLAG_ANY; + } + + return new UFC_AddressField($this->val, UFC_AddressField::FIELD_SUBADMAREA, UFC_Address::TYPE_ANY, $flags); + } +} +// }}} + // {{{ class UFBF_JobCompany class UFBF_JobCompany extends UFBF_Text { @@ -820,25 +918,12 @@ class UFBF_JobCompany extends UFBF_Text } // }}} -// {{{ class UFBF_JobSector -class UFBF_JobSector extends UFBF_Mixed +// {{{ class UFBF_JobTerms +class UFBF_JobTerms extends UFBF_Index { - protected $direnum = DirEnum::SECTORS; - private $onlymentorfield; - - public function __construct($envfieldtext, $envfieldindex, $formtext = '', $onlymentorfield = 'only_referent') - { - parent::__construct($envfieldtext, $envfieldindex, $formtext); - $this->onlymentorfield = $onlymentorfield; - } - protected function buildUFC(UserFilterBuilder &$ufb) { - if ($ufb->isOn($this->onlymentorfield)) { - return new UFC_Mentor_Sectorization($this->val, UserFilter::JOB_SUBSECTOR); - } else { - return new UFC_Job_Sectorization($this->val, UserFilter::JOB_SUBSUBSECTOR); - } + return new UFC_Job_Terms($this->val); } } // }}} @@ -932,7 +1017,7 @@ class UFBF_Group extends UFBF_Mixed // }}} // {{{ class UFBF_Section -class UFBF_Section extends UFBF_Index +class UFBF_Section extends UFBF_Mixed { protected $direnum = DirEnum::SECTIONS; @@ -1021,6 +1106,11 @@ class UFBF_Networking extends UFBF_Text } } + public function isEmpty() + { + return parent::isEmpty() || $this->nwtype == 0; + } + public function buildUFC(UserFilterBuilder &$ufb) { return new UFC_Networking($this->nwtype, $this->val); @@ -1028,30 +1118,32 @@ class UFBF_Networking extends UFBF_Text } // }}} -// {{{ class UFBF_MentorCountry -class UFBF_MentorCountry extends UFBF_Index +// {{{ class UFBF_Mentor +class UFBF_Mentor extends UFBF_Bool { protected function buildUFC(UserFilterBuilder &$ufb) { - return new UFC_Mentor_Country($this->val); + return new UFC_Mentor(); } } // }}} -// {{{ class UFBF_MentorSectorization -class UFBF_MentorSectorization extends UFBF_Index +// {{{ class UFBF_MentorCountry +class UFBF_MentorCountry extends UFBF_Text { - protected $type; - - public function __construct($envfield, $formtext = '', $type = UFC_Mentor_Sectorization::SECTOR) + protected function buildUFC(UserFilterBuilder &$ufb) { - parent::__construct($envfield, $formtext); - $this->type = $type; + return new UFC_Mentor_Country($this->val); } +} +// }}} +// {{{ class UFBF_Mentorterm +class UFBF_MentorTerm extends UFBF_Index +{ protected function buildUFC(UserFilterBuilder &$ufb) { - return new UFC_Mentor_Sectorization($this->val, $this->type); + return new UFC_Mentor_Terms($this->val); } } // }}}