X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fprofile.php;h=249de86e58336680d22dfaaf180472609c63ea34;hb=e4860774e45eac2d62cf80d4fd70fac2e0cf1da1;hp=c26a545712f24f38ceafd040e17c8a4c78fc2326;hpb=15f9cd37fa5df85b022756f0071a5b637dd7e6cc;p=platal.git diff --git a/classes/profile.php b/classes/profile.php index c26a545..249de86 100644 --- a/classes/profile.php +++ b/classes/profile.php @@ -1,6 +1,6 @@ array(self::VIS_PUBLIC), - self::VIS_AX => array(self::VIS_AX, self::VIS_PUBLIC), - self::VIS_PRIVATE => array(self::VIS_PRIVATE, self::VIS_AX, self::VIS_PUBLIC)); - - const VIS_PUBLIC = 'public'; - const VIS_AX = 'ax'; - const VIS_PRIVATE = 'private'; - - private $level; - - public function __construct($level = null) - { - $this->setLevel($level); - } - - public function setLevel($level = self::VIS_PUBLIC) - { - if ($level != null && $level != self::VIS_PRIVATE && $level != self::VIS_AX && $level != self::VIS_PUBLIC) { - Platal::page()->kill("Invalid visibility: " . $level); - } - - // Unlogged or not allowed to view directory_ax or requesting public - // => public view - if (!S::logged() || !S::user()->checkPerms('directory_ax') || $level == self::VIS_PUBLIC) { - $level = self::VIS_PUBLIC; - // Not allowed to view directory_private or requesting ax - } else if (!S::user()->checkPerms('directory_private') || $level == self::VIS_AX) { - $level = self::VIS_AX; - } else { - $level = self::VIS_PRIVATE; - } - - if ($this->level == null || $this->level == self::VIS_PRIVATE) { - $this->level = $level; - } else if ($this->level == self::VIS_AX && $level == self::VIS_PRIVATE) { - return; - } else { - $this->level = self::VIS_PUBLIC; - } - } - - public function level() - { - if ($this->level == null) { - return self::VIS_PUBLIC; - } else { - return $this->level; - } - } - - public function levels() - { - return self::$v_values[$this->level()]; - } - - public function isVisible($visibility) - { - return in_array($visibility, $this->levels()); - } -} - -class Profile +class Profile implements PlExportable { /* name tokens */ @@ -111,6 +48,17 @@ class Profile const DEGREE_M = 'Master'; const DEGREE_D = 'Doctorat'; + static public $cycles = array( + self::DEGREE_X => 'polytechnicien', + self::DEGREE_M => 'master', + self::DEGREE_D => 'docteur' + ); + static public $cycle_prefixes = array( + self::DEGREE_X => 'X', + self::DEGREE_M => 'M', + self::DEGREE_D => 'D' + ); + static public $name_variants = array( self::LASTNAME => array(self::VN_MARITAL, self::VN_ORDINARY), self::FIRSTNAME => array(self::VN_ORDINARY, self::VN_INI, self::VN_OTHER) @@ -157,7 +105,6 @@ class Profile const FETCH_JOBS = 0x000008; const FETCH_MEDALS = 0x000010; const FETCH_NETWORKING = 0x000020; - const FETCH_MENTOR_SECTOR = 0x000040; const FETCH_MENTOR_COUNTRY = 0x000080; const FETCH_PHONES = 0x000100; const FETCH_JOB_TERMS = 0x000200; @@ -167,6 +114,39 @@ class Profile const FETCH_ALL = 0x0007FF; // OR of FETCH_* + static public $descriptions = array( + 'search_names' => 'Noms', + 'nationality1' => 'Nationalité', + 'nationality2' => '2e nationalité', + 'nationality3' => '3e nationalité', + 'promo_display' => 'Promotion affichée', + 'email_directory' => 'Email annuaire papier', + 'networking' => 'Messageries…', + 'tels' => 'Téléphones', + 'edus' => 'Formations', + 'main_edus' => 'Formations à l\'X', + 'promo' => 'Promotion de sortie', + 'birthdate' => 'Date de naissance', + 'yourself' => 'Nom affiché', + 'freetext' => 'Commentaire', + 'freetext_pub' => 'Affichage du commentaire', + 'photo' => 'Photographie', + 'photo_pub' => 'Affichage de la photographie', + 'addresses' => 'Adresses', + 'corps' => 'Corps', + 'cv' => 'CV', + 'jobs' => 'Emplois', + 'section' => 'Section', + 'binets' => 'Binets', + 'medals' => 'Décorations', + 'medals_pub' => 'Affichage des décorations', + 'competences' => 'Compétences', + 'langues' => 'Langues', + 'expertise' => 'Expertises (mentoring)', + 'terms' => 'Compétences (mentoring)', + 'countries' => 'Pays (mentoring)' + ); + private $fetched_fields = 0x000000; private $pid; @@ -213,14 +193,26 @@ class Profile return false; } - public function promo() + public function promo($details = false) { + if ($details && ($this->program || $this->fieldid)) { + $text = array(); + if ($this->program) { + $text[] = $this->program; + } + if ($this->fieldid) { + $fieldsList = DirEnum::getOptions(DirEnum::EDUFIELDS); + $text[] = $fieldsList[$this->fieldid]; + } + return $this->promo . ' (' . implode(', ', $text) . ')'; + } + return $this->promo; } public function yearpromo() { - return intval(substr($this->promo, 1, 4)); + return $this->promo_year; } /** Check if user is an orange (associated with several promos) @@ -486,10 +478,12 @@ class Profile $this->fetched_fields = $fields; } + /** Have we already fetched this field ? + */ private function fetched($field) { - if (($fields | self::FETCH_ALL) != self::FETCH_ALL) { - Platal::page()->kill("Invalid fetched fields: $fields"); + if (!array_key_exists($field, ProfileField::$fields)) { + Platal::page()->kill("Invalid field: $field"); } return ($this->fetched_fields & $field); @@ -519,6 +513,7 @@ class Profile */ private function consolidateFields() { + // Link phones to addresses if ($this->phones != null) { if ($this->addresses != null) { $this->addresses->addPhones($this->phones); @@ -529,9 +524,12 @@ class Profile } } + // Link addresses to jobs if ($this->addresses != null && $this->jobs != null) { $this->jobs->addAddresses($this->addresses); } + + // Link jobterms to jobs if ($this->jobs != null && $this->jobterms != null) { $this->jobs->addJobTerms($this->jobterms); } @@ -544,17 +542,19 @@ class Profile { if ($this->has_photo) { if ($data && ($this->photo == null || $this->photo->mimeType == null)) { - $res = XDB::fetchOneAssoc('SELECT attach, attachmime, x, y + $res = XDB::fetchOneAssoc('SELECT attach, attachmime, x, y, last_update FROM profile_photos WHERE pid = {?}', $this->pid); - $this->photo = PlImage::fromData($res['attach'], $res['attachmime'], $res['x'], $res['y']); + $this->photo = PlImage::fromData($res['attach'], 'image/' .$res['attachmime'], $res['x'], $res['y'], $res['last_update']); } else if ($this->photo == null) { $this->photo = PlImage::fromData(null, null, $this->photo_width, $this->photo_height); } return $this->photo; } else if ($fallback) { - return PlImage::fromFile(dirname(__FILE__).'/../htdocs/images/none.png', - 'image/png'); + if ($this->mainEducation() == 'X') { + return PlImage::fromFile(dirname(__FILE__) . '/../htdocs/images/none_x.png', 'image/png'); + } + return PlImage::fromFile(dirname(__FILE__) . '/../htdocs/images/none_md.png', 'image/png'); } return null; } @@ -596,11 +596,15 @@ class Profile public function getMainAddress() { - $addr = $this->getAddresses(self::ADDRESS_PERSO | self::ADDRESS_MAIN); - if (count($addr) == 0) { - return null; + $main = $this->getAddresses(self::ADDRESS_MAIN); + $perso = $this->getAddresses(self::ADDRESS_PERSO); + + if (count($main)) { + return array_pop($main); + } else if (count($perso)) { + return array_pop($perso); } else { - return array_pop($addr); + return null; } } @@ -754,27 +758,6 @@ class Profile $this->consolidateFields(); } - /* Mentoring - */ - private $mentor_sectors = null; - public function setMentoringSectors(ProfileMentoringSectors $sectors) - { - $this->mentor_sectors = $sectors; - } - - public function getMentoringSectors() - { - if ($this->mentor_sectors == null && !$this->fetched(self::FETCH_MENTOR_SECTOR)) { - $this->setMentoringSectors($this->getProfileField(self::FETCH_MENTOR_SECTOR)); - } - - if ($this->mentor_sectors == null) { - return array(); - } else { - return $this->mentor_sectors->sectors; - } - } - private $mentor_countries = null; public function setMentoringCountries(ProfileMentoringCountries $countries) { @@ -884,6 +867,24 @@ class Profile return ($isOk && ($maxlen > 2 || $maxlen == strlen($_lastname))); } + /* Export to JSON + */ + public function export() + { + return array( + 'hrpid' => $this->hrid(), + 'display_name' => $this->shortName(), + 'full_name' => $this->fullName(), + 'directory_name' => $this->directory_name, + 'promo' => $this->promo(), + 'year_promo' => $this->yearpromo(), + 'is_active' => $this->isActive(), + 'first_name' => $this->firstName(), + 'last_name' => $this->lastName(), + 'is_female' => $this->isFemale(), + ); + } + private static function fetchProfileData(array $pids, $respect_order = true, $fields = 0x0000, $visibility = null) { if (count($pids) == 0) { @@ -903,7 +904,7 @@ class Profile IF ({?}, p.cv, NULL) AS cv, p.medals_pub, p.alias_pub, p.email_directory, p.last_change, p.nationality1, p.nationality2, p.nationality3, IF (p.freetext_pub IN {?}, p.freetext, NULL) AS freetext, - pe.entry_year, pe.grad_year, + pe.entry_year, pe.grad_year, pe.promo_year, pe.program, pe.fieldid, IF ({?}, pse.text, NULL) AS section, pn_f.name AS firstname, pn_l.name AS lastname, IF( {?}, pn_n.name, NULL) AS nickname, @@ -1086,34 +1087,61 @@ class Profile } } - public static function rebuildSearchTokens($pid) + public static function rebuildSearchTokens($pids, $transaction = true) { - XDB::execute('DELETE FROM search_name - WHERE pid = {?}', - $pid); - $keys = XDB::iterator("SELECT CONCAT(n.particle, n.name) AS name, e.score, - FIND_IN_SET('public', e.flags) AS public - FROM profile_name AS n - INNER JOIN profile_name_enum AS e ON (n.typeid = e.id) - WHERE n.pid = {?}", - $pid); - + if (!is_array($pids)) { + $pids = array($pids); + } + $keys = XDB::iterator("(SELECT n.pid AS pid, n.name AS name, e.score AS score, + IF(FIND_IN_SET('public', e.flags), 'public', '') AS public + FROM profile_name AS n + INNER JOIN profile_name_enum AS e ON (n.typeid = e.id) + WHERE n.pid IN {?} AND NOT FIND_IN_SET('not_displayed', e.flags)) + UNION + (SELECT n.pid AS pid, n.particle AS name, 0 AS score, + IF(FIND_IN_SET('public', e.flags), 'public', '') AS public + FROM profile_name AS n + INNER JOIN profile_name_enum AS e ON (n.typeid = e.id) + WHERE n.pid IN {?} AND NOT FIND_IN_SET('not_displayed', e.flags)) + ", + $pids, $pids); + $names = array(); while ($key = $keys->next()) { if ($key['name'] == '') { continue; } - $toks = preg_split('/[ \'\-]+/', $key['name']); + $pid = $key['pid']; + require_once 'name.func.inc.php'; + $toks = split_name_for_search($key['name']); + $toks = array_reverse($toks); + + /* Split the score between the tokens to avoid the user to be over-rated. + * Let says my user name is "Machin-Truc Bidule" and I also have a user named + * 'Machin Truc'. Distributing the score force "Machin Truc" to be displayed + * before "Machin-Truc" for both "Machin Truc" and "Machin" searches. + */ + $eltScore = ceil(((float)$key['score'])/((float)count($toks))); $token = ''; - $first = 5; - while ($toks) { - $token = strtolower(replace_accent(array_pop($toks) . $token)); - $score = ($toks ? 0 : 10 + $first) * ($key['score'] / 10); - XDB::execute('REPLACE INTO search_name (token, pid, soundex, score, flags) - VALUES ({?}, {?}, {?}, {?}, {?})', - $token, $pid, soundex_fr($token), $score, $key['public']); - $first = 0; + foreach ($toks as $tok) { + $token = $tok . $token; + $names["$pid-$token"] = XDB::format('({?}, {?}, {?}, {?}, {?})', + $token, $pid, soundex_fr($token), + $eltScore, $key['public']); } } + if ($transaction) { + XDB::startTransaction(); + } + XDB::execute('DELETE FROM search_name + WHERE pid IN {?}', + $pids); + if (count($names) > 0) { + XDB::rawExecute('INSERT INTO search_name (token, pid, soundex, score, flags) + VALUES ' . implode(', ', $names)); + } + if ($transaction) { + XDB::commit(); + } } /** The school identifier consists of 6 digits. The first 3 represent the