X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fgeneral.inc.php;h=470d7ec0b61055700ddaaa3db2277b54ef335415;hb=7996ae8cd41fbb3ccd748eaed71a50f866269c6e;hp=cac45ec4f4ed26adc6aa8796d51eadb9161699e6;hpb=ce0b2c6f3fc4e7c524df32f56f1bc8e8d573bb1a;p=platal.git diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index cac45ec..470d7ec 100644 --- a/modules/profile/general.inc.php +++ b/modules/profile/general.inc.php @@ -19,10 +19,17 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -class ProfileSearchNames implements ProfileSetting +require_once 'name.func.inc.php'; + +class ProfileSettingSearchNames implements ProfileSetting { private $private_name_end; private $search_names; + private $name_types; + + public function __construct() { + $this->name_types = DirEnum::getOptions(DirEnum::NAMES); + } private function matchWord($old, $new, $newLen) { @@ -33,8 +40,7 @@ class ProfileSearchNames implements ProfileSetting private function prepareField($value) { - $value = mb_strtoupper($value); - return preg_replace('/[^A-Z]/', ' ', $value); + return name_to_basename($value); } private function prepare(ProfilePage &$page, $field, $value, $init, &$success) @@ -47,12 +53,33 @@ class ProfileSearchNames implements ProfileSetting || ($field == 'lastname' && $new == 'DE ' . $ini); if (!$success) { $field = strtolower($field); - Platal::page()->trigError("Le " . $field . " que tu as choisi (" . $value . - ") est trop loin de ton " . $field . " initial (" . $init . ")."); + Platal::page()->trigError("Le " . $this->name_types[$field] . " que tu as choisi (" . $value . + ") est trop loin de ton " . $this->name_types[$field] . " initial (" . $init . ")."); } return $success ? $value : $init; } + /* Removes duplicated entries for the fields that do not allow them. */ + private function clean($value) + { + $single_types = XDB::fetchAllAssoc('id', + 'SELECT id, 0 + FROM profile_name_enum + WHERE NOT FIND_IN_SET(\'allow_duplicates\', flags)'); + + foreach ($value as $key => $item) { + if (isset($single_types[$item['typeid']])) { + if ($single_types[$item['typeid']] === true) { + unset($value[$key]); + } else { + $single_types[$item['typeid']] = true; + } + } + } + + return $value; + } + public function value(ProfilePage &$page, $field, $value, &$success) { $success = true; @@ -101,9 +128,11 @@ class ProfileSearchNames implements ProfileSetting $value[] = $sn; } while ($sn = $sn_all->next()); } + $value = $this->clean($value); } else { require_once 'name.func.inc.php'; + $value = $this->clean($value); $res = XDB::query("SELECT s.particle, s.name FROM profile_name AS s INNER JOIN profile_name_enum AS e ON (e.id = s.typeid) @@ -125,11 +154,18 @@ class ProfileSearchNames implements ProfileSetting } if ($sn['pub']) { if (isset($sn['particle']) && ($sn['particle'] != '')) { + // particle is before first blank list($particle, $name) = explode(' ', $sn['name'], 2); $particle = trim($particle) . ' '; if (!$name) { + // particle is before first quote list($particle, $name) = explode('\'', $sn['name'], 2); $particle = trim($particle); + if (!$name) { + // actually there is no particle + $particle = ''; + $name = $sn['name']; + } } } else { $particle = ''; @@ -172,29 +208,30 @@ class ProfileSearchNames implements ProfileSetting public function save(ProfilePage &$page, $field, $value) { require_once 'name.func.inc.php'; - $sn_old = build_sn_pub(); + $sn_old = build_sn_pub($page->pid()); XDB::execute("DELETE FROM s USING profile_name AS s INNER JOIN profile_name_enum AS e ON (s.typeid = e.id) WHERE s.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)", $page->pid()); - $has_new = set_alias_names($this->search_names, $sn_old); + $has_new = set_alias_names($this->search_names, $sn_old, $page->pid(), $page->owner->id()); // Only requires validation if modification in public names if ($has_new) { $new_names = new NamesReq(S::user(), $this->search_names, $this->private_name_end); $new_names->submit(); - Platal::page()->trigWarning("La demande de modification de tes noms a bien été prise en compte." . - " Tu recevras un email dès que ces changements auront été effectués."); + Platal::page()->trigWarning('La demande de modification de tes noms a bien été prise en compte.' . + ' Tu recevras un email dès que ces changements auront été effectués.'); } else { $display_names = array(); - build_display_names($display_names, $this->search_names, $this->private_name_end); - set_profile_display($display_names); + build_display_names($display_names, $this->search_names, + $page->profile->isFemale(), $this->private_name_end); + set_profile_display($display_names, $page->pid()); } } } -class ProfileEdu implements ProfileSetting +class ProfileSettingEdu implements ProfileSetting { public function __construct() { } @@ -232,7 +269,7 @@ class ProfileEdu implements ProfileSetting } $i++; } - usort($value, array("ProfileEdu", "sortByGradYear")); + usort($value, array("ProfileSettingEdu", "sortByGradYear")); } return $value; } @@ -254,7 +291,7 @@ class ProfileEdu implements ProfileSetting } } -class ProfileEmailDirectory implements ProfileSetting +class ProfileSettingEmailDirectory implements ProfileSetting { public function __construct(){} public function save(ProfilePage &$page, $field, $value){} @@ -279,7 +316,7 @@ class ProfileEmailDirectory implements ProfileSetting } } -class ProfileNetworking implements ProfileSetting +class ProfileSettingNetworking implements ProfileSetting { private $email; private $pub; @@ -288,10 +325,10 @@ class ProfileNetworking implements ProfileSetting public function __construct() { - $this->email = new ProfileEmail(); - $this->pub = new ProfilePub(); - $this->web = new ProfileWeb(); - $this->number = new ProfileNumber(); + $this->email = new ProfileSettingEmail(); + $this->pub = new ProfileSettingPub(); + $this->web = new ProfileSettingWeb(); + $this->number = new ProfileSettingNumber(); } public function value(ProfilePage &$page, $field, $value, &$success) @@ -352,7 +389,74 @@ class ProfileNetworking implements ProfileSetting } } -class ProfileGeneral extends ProfilePage +class ProfileSettingPromo implements ProfileSetting +{ + public function __construct(){} + + public function save(ProfilePage &$page, $field, $value) + { + $gradYearNew = $value; + if ($page->profile->mainEducation() == 'X') { + $gradYearNew += $page->profile->mainEducationDuration(); + } + if ($value == $page->profile->entry_year + $page->profile->mainEducationDuration()) { + XDB::execute('UPDATE profile_display + SET promo = {?} + WHERE pid = {?}', + $page->profile->mainEducation() . strval($value), $page->profile->id()); + XDB::execute('UPDATE profile_education + SET grad_year = {?} + WHERE pid = {?} AND FIND_IN_SET(\'primary\', flags)', + $gradYearNew, $page->profile->id()); + $page->trigSuccess('Ton statut "orange" a été supprimé.'); + } else { + require_once 'validations.inc.php'; + + $myorange = new OrangeReq(S::user(), $gradYearNew); + $myorange->submit(); + Platal::page()->trigSuccess('Tu pourras changer l\'affichage de ta promotion dès que ta nouvelle promotion aura été validée.'); + } + } + + public function value(ProfilePage &$page, $field, $value, &$success) + { + $entryYear = $page->profile->entry_year; + $gradYear = $page->profile->grad_year; + $success = true; + if (is_null($value) || $value == $page->profile->yearpromo()) { + if ($gradYear != $entryYear + $page->profile->mainEducationDuration()) { + $promoChoice = array(); + for ($i = $entryYear + $page->profile->mainEducationDuration(); $i <= $gradYear; ++$i) { + $promoChoice[] = $page->profile->mainEducation() . strval($i); + } + Platal::page()->assign('promo_choice', $promoChoice); + } + if ($page->profile->mainEducation() == 'X') { + return $page->profile->grad_year - $page->profile->mainEducationDuration(); + } + return $page->profile->yearpromo(); + } + + // If this profile belongs to an X, $promoNew needs to be changed to + // the graduation year. + $gradYearNew = $value; + if ($page->profile->mainEducation() == 'X') { + $gradYearNew += $page->profile->mainEducationDuration(); + } + + if ($value < 1000 || $value > 9999) { + Platal::page()->trigError('L\'année de sortie doit être un nombre de quatre chiffres.'); + $success = false; + } elseif ($gradYearNew < $entryYear + $page->profile->mainEducationDuration()) { + Platal::page()->trigError('Trop tôt !'); + $success = false; + } + return intval($value); + } +} + + +class ProfileSettingGeneral extends ProfilePage { protected $pg_template = 'profile/general.tpl'; @@ -360,25 +464,26 @@ class ProfileGeneral extends ProfilePage { parent::__construct($wiz); $this->settings['search_names'] - = new ProfileSearchNames(); - $this->settings['birthdate'] = new ProfileDate(); + = new ProfileSettingSearchNames(); + $this->settings['birthdate'] = new ProfileSettingDate(); $this->settings['freetext_pub'] = $this->settings['photo_pub'] - = new ProfilePub(); + = new ProfileSettingPub(); $this->settings['freetext'] = $this->settings['nationality1'] = $this->settings['nationality2'] = $this->settings['nationality3'] = $this->settings['yourself'] - = $this->settings['promo'] + = $this->settings['promo_display'] = null; $this->settings['email_directory'] - = new ProfileEmail(); + = new ProfileSettingEmail(); $this->settings['email_directory_new'] - = new ProfileEmailDirectory(); - $this->settings['networking'] = new ProfileNetworking(); - $this->settings['tels'] = new ProfilePhones('user', 0); - $this->settings['edus'] = new ProfileEdu(); + = new ProfileSettingEmailDirectory(); + $this->settings['networking'] = new ProfileSettingNetworking(); + $this->settings['tels'] = new ProfileSettingPhones('user', 0); + $this->settings['edus'] = new ProfileSettingEdu(); + $this->settings['promo'] = new ProfileSettingPromo(); $this->watched= array('freetext' => true, 'tels' => true, 'networking' => true, 'edus' => true, 'nationality1' => true, 'nationality2' => true, @@ -388,16 +493,14 @@ class ProfileGeneral extends ProfilePage protected function _fetchData() { // Checkout all data... - $res = XDB::query("SELECT p.promo, e.entry_year AS entry_year, e.grad_year AS grad_year, - pr.nationality1, pr.nationality2, pr.nationality3, pr.birthdate, - t.display_tel as mobile, t.pub as mobile_pub, - pr.email_directory as email_directory, - pr.freetext, pr.freetext_pub, pr.ax_id AS matricule_ax, p.yourself - FROM profiles AS pr - INNER JOIN profile_display AS p ON (p.pid = pr.pid) - INNER JOIN profile_education AS e ON (e.pid = pr.pid AND FIND_IN_SET('primary', e.flags)) - LEFT JOIN profile_phones AS t ON (t.pid = pr.pid AND link_type = 'user') - WHERE pr.pid = {?}", $this->pid()); + $res = XDB::query("SELECT p.nationality1, p.nationality2, p.nationality3, p.birthdate, + pp.display_tel as mobile, pp.pub as mobile_pub, + p.email_directory as email_directory, pd.promo AS promo_display, + p.freetext, p.freetext_pub, p.ax_id AS matricule_ax, pd.yourself + FROM profiles AS p + INNER JOIN profile_display AS pd ON (pd.pid = p.pid) + LEFT JOIN profile_phones AS pp ON (pp.pid = p.pid AND link_type = 'user') + WHERE p.pid = {?}", $this->pid()); $this->values = $res->fetchOneAssoc(); if ($this->owner) { $this->values['yourself'] = $this->owner->displayName(); @@ -412,19 +515,12 @@ class ProfileGeneral extends ProfilePage if ($this->owner) { $res = XDB::query("SELECT COUNT(*) FROM requests - WHERE type='photo' AND user_id = {?}", + WHERE type = 'photo' AND uid = {?}", $this->owner->id()); $this->values['nouvellephoto'] = $res->fetchOneCell(); } else { $this->values['nouvellephoto'] = 0; } - - // Proposes choice for promotion - if ($this->values['entry_year'] != $this->values['grad_year'] - 3) { - for ($i = $this->values['entry_year']; $i < $this->values['grad_year'] - 2; $i++) { - $this->values['promo_choice'][] = "X" . $i; - } - } } protected function _saveData() @@ -467,13 +563,17 @@ class ProfileGeneral extends ProfilePage if ($this->changed['yourself']) { XDB::execute('UPDATE accounts SET display_name = {?} - WHERE pid = {?}', $this->pid()); + WHERE uid = {?}', + $this->values['yourself'], $this->owner->id()); } - if ($this->changed['promo']) { - XDB::execute("UPDATE profile_display - SET promo = {?} - WHERE pid = {?}", - $this->values['promo'], $this->pid()); + if ($this->changed['promo_display']) { + if ($this->values['promo_display']{0} == $this->profile->mainEducation() + && intval(substr($this->values['promo_display'], 1, 4)) >= $this->profile->entry_year + $this->profile->mainEducationDuration()) { + XDB::execute('UPDATE profile_display + SET promo = {?} + WHERE pid = {?}', + $this->values['promo_display'], $this->pid()); + } } } @@ -501,6 +601,7 @@ class ProfileGeneral extends ProfilePage $res = $res->fetchOneRow(); $page->assign('public_name', $res[0]); $page->assign('private_name', $res[1]); + $page->assign('isFemale', $this->profile->isFemale() ? 1 : 0); } }