X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fprofile.php;h=663f2f7a723ea33392cd3d96c6f2f5ea21b53188;hb=7996ae8cd41fbb3ccd748eaed71a50f866269c6e;hp=a397da7af79429ef4759e98d877553816c1e4702;hpb=963bc7fcaa3d52f5d4c91941a261857f91d8579d;p=platal.git diff --git a/classes/profile.php b/classes/profile.php index a397da7..663f2f7 100644 --- a/classes/profile.php +++ b/classes/profile.php @@ -195,9 +195,46 @@ class Profile return intval(substr($this->promo, 1, 4)); } + /** Check if user is an orange (associated with several promos) + */ + public function isMultiPromo() + { + return $this->grad_year != $this->entry_year + $this->mainEducationDuration(); + } + + /** Returns an array with all associated promo years. + */ + public function yearspromo() + { + $promos = array(); + $d = -$this->deltaPromoToGradYear(); + for ($g = $this->entry_year + $this->mainEducationDuration(); $g <= $this->grad_year; ++$g) { + $promos[] = $g + $d; + } + return $promos; + } + public function mainEducation() { - return $this->promo{0}; + if (empty($this->promo)) { + return null; + } else { + return $this->promo{0}; + } + } + + public function mainGrade() + { + switch ($this->mainEducation()) { + case 'X': + return UserFilter::GRADE_ING; + case 'M': + return UserFilter::GRADE_MST; + case 'D': + return UserFilter::GRADE_PHD; + default: + return null; + } } public function mainEducationDuration() @@ -214,6 +251,18 @@ class Profile } } + /** Number of years between the promotion year until the + * graduation year. In standard schools it's 0, but for + * Polytechnique the promo year is the entry year. + */ + public function deltaPromoToGradYear() + { + if ($this->mainEducation() == 'X') { + return $this->mainEducationDuration(); + } + return 0; + } + /** Print a name with the given formatting: * %s = • for women * %f = firstname @@ -339,6 +388,16 @@ class Profile return property_exists($this, $name) || isset($this->data[$name]); } + public function __unset($name) + { + if (property_exists($this, $name)) { + $this->$name = null; + } else { + unset($this->data[$name]); + } + } + + /** Sets the level of visibility of the profile * Sets $this->visibility to a list of valid visibilities. * @param one of the self::VIS_* values @@ -447,7 +506,10 @@ class Profile public function getAddresses($flags, $limit = null) { if ($this->addresses == null && !$this->fetched(self::FETCH_ADDRESSES)) { - $this->setAddresses($this->getProfileField(self::FETCH_ADDRESSES)); + $addr = $this->getProfileField(self::FETCH_ADDRESSES); + if ($addr) { + $this->setAddresses($addr); + } } if ($this->addresses == null) { @@ -544,7 +606,10 @@ class Profile public function getNetworking($flags, $limit = null) { if ($this->networks == null && !$this->fetched(self::FETCH_NETWORKING)) { - $this->setNetworking($this->getProfileField(self::FETCH_NETWORKING)); + $nw = $this->getProfileField(self::FETCH_NETWORKING); + if ($nw) { + $this->setNetworking($nw); + } } if ($this->networks == null) { return array(); @@ -559,7 +624,7 @@ class Profile return null; } $site = array_pop($site); - return $site['address']; + return $site; } @@ -575,7 +640,10 @@ class Profile public function getJobs($flags, $limit = null) { if ($this->jobs == null && !$this->fetched(self::FETCH_JOBS)) { - $this->setJobs($this->getProfileField(self::FETCH_JOBS)); + $jobs = $this->getProfileField(self::FETCH_JOBS); + if ($jobs) { + $this->setJobs($jobs); + } } if ($this->jobs == null) { @@ -637,16 +705,24 @@ class Profile */ public function getBinets() { - return XDB::fetchColumn('SELECT binet_id - FROM profile_binets - WHERE pid = {?}', $this->id()); + if ($this->visibility->isVisible(ProfileVisibility::VIS_PRIVATE)) { + return XDB::fetchColumn('SELECT binet_id + FROM profile_binets + WHERE pid = {?}', $this->id()); + } else { + return array(); + } } public function getBinetsNames() { - return XDB::fetchColumn('SELECT text - FROM profile_binets AS pb - LEFT JOIN profile_binet_enum AS pbe ON (pbe.id = pb.binet_id) - WHERE pb.pid = {?}', $this->id()); + if ($this->visibility->isVisible(ProfileVisibility::VIS_PRIVATE)) { + return XDB::fetchColumn('SELECT text + FROM profile_binets AS pb + LEFT JOIN profile_binet_enum AS pbe ON (pbe.id = pb.binet_id) + WHERE pb.pid = {?}', $this->id()); + } else { + return array(); + } } /* Medals @@ -701,7 +777,13 @@ class Profile $visibility = new ProfileVisibility($visibility); - $it = XDB::Iterator('SELECT p.*, p.sex = \'female\' AS sex, pe.entry_year, pe.grad_year, pse.text AS section, + $it = XDB::Iterator('SELECT p.pid, p.hrpid, p.xorg_id, p.ax_id, p.birthdate, p.birthdate_ref, + p.next_birthday, p.deathdate, p.deathdate_rec, p.sex = \'female\' AS sex, + p.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, + IF ({?} IN {?}, pse.text, NULL) AS section, pn_f.name AS firstname, pn_l.name AS lastname, pn_n.name AS nickname, IF(pn_uf.name IS NULL, pn_f.name, pn_uf.name) AS firstname_ordinary, IF(pn_ul.name IS NULL, pn_l.name, pn_ul.name) AS lastname_ordinary, @@ -730,9 +812,14 @@ class Profile LEFT JOIN profile_photos AS ph ON (ph.pid = p.pid) LEFT JOIN profile_mentor AS pm ON (pm.pid = p.pid) LEFT JOIN account_profiles AS ap ON (ap.pid = p.pid AND FIND_IN_SET(\'owner\', ap.perms)) - WHERE p.pid IN ' . XDB::formatArray($pids) . ' + WHERE p.pid IN {?} GROUP BY p.pid - ' . $order, $visibility->levels(), $visibility->levels()); + ' . $order, + $visibility->levels(), + ProfileVisibility::VIS_PRIVATE, $visibility->levels(), + $visibility->levels(), $visibility->levels(), + $pids + ); return new ProfileIterator($it, $pids, $fields, $visibility); } @@ -865,7 +952,7 @@ class Profile WHERE n.pid = {?}", $pid); - foreach ($keys as $i => $key) { + while ($key = $keys->next()) { if ($key['name'] == '') { continue; }