X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fgeneral.inc.php;h=2449a6c6097cb086396af52e2d65b7dc53bdaa98;hb=cfaae9fbe4df3c6b9447584e431db394ce4f28ad;hp=9856dc83d588ec0c9487e42931f87d74fcf80b0d;hpb=6d1747b3dbcf944c995dc2d87e8561c7a66f3aa6;p=platal.git diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index 9856dc8..2449a6c 100644 --- a/modules/profile/general.inc.php +++ b/modules/profile/general.inc.php @@ -1,6 +1,6 @@ next(); } } else { - $value[] = array('typeid' => $sn_type['id'], - 'type' => $sn_type['type'], - 'type_name' => $sn_type['name'], - 'pub' => 1, + $value[] = array('name' => '', + 'particle' => '', + 'typeid' => $sn_type['id'], + 'type' => $sn_type['type'], + 'type_name' => $sn_type['name'], 'has_particle' => $sn_type['has_particle'], - 'always_displayed' => 1); + 'always_displayed' => 1, + 'pub' => 1); } } if ($sn) { @@ -162,6 +165,7 @@ class ProfileSearchNames implements ProfileSetting Platal::page()->assign('public_name', $public_name); Platal::page()->assign('private_name', $private_name); } + return $value; } @@ -180,7 +184,7 @@ class ProfileSearchNames implements ProfileSetting 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é prises en compte." . + 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(); @@ -190,7 +194,7 @@ class ProfileSearchNames implements ProfileSetting } } -class ProfileEdu implements ProfileSetting +class ProfileSettingEdu implements ProfileSetting { public function __construct() { } @@ -211,7 +215,7 @@ class ProfileEdu implements ProfileSetting $value = array(); $value = XDB::fetchAllAssoc("SELECT eduid, degreeid, fieldid, grad_year, program FROM profile_education - WHERE uid = {?} AND !FIND_IN_SET('primary', flags) + WHERE pid = {?} AND !FIND_IN_SET('primary', flags) ORDER BY id", $page->pid()); } else { @@ -228,7 +232,7 @@ class ProfileEdu implements ProfileSetting } $i++; } - usort($value, array("ProfileEdu", "sortByGradYear")); + usort($value, array("ProfileSettingEdu", "sortByGradYear")); } return $value; } @@ -236,12 +240,12 @@ class ProfileEdu implements ProfileSetting public function save(ProfilePage &$page, $field, $value) { XDB::execute("DELETE FROM profile_education - WHERE uid = {?} AND !FIND_IN_SET('primary', flags)", + WHERE pid = {?} AND !FIND_IN_SET('primary', flags)", $page->pid()); foreach ($value as $eduid=>&$edu) { if ($edu['eduid'] != '') { XDB::execute("INSERT INTO profile_education - SET id = {?}, uid = {?}, eduid = {?}, degreeid = {?}, + SET id = {?}, pid = {?}, eduid = {?}, degreeid = {?}, fieldid = {?}, grad_year = {?}, program = {?}", $eduid, $page->pid(), $edu['eduid'], $edu['degreeid'], $edu['fieldid'], $edu['grad_year'], $edu['program']); @@ -250,7 +254,7 @@ class ProfileEdu implements ProfileSetting } } -class ProfileEmailDirectory implements ProfileSetting +class ProfileSettingEmailDirectory implements ProfileSetting { public function __construct(){} public function save(ProfilePage &$page, $field, $value){} @@ -275,7 +279,7 @@ class ProfileEmailDirectory implements ProfileSetting } } -class ProfileNetworking implements ProfileSetting +class ProfileSettingNetworking implements ProfileSetting { private $email; private $pub; @@ -284,10 +288,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) @@ -296,7 +300,7 @@ class ProfileNetworking implements ProfileSetting $value = XDB::fetchAllAssoc("SELECT n.address, n.network_type AS type, n.pub, m.name FROM profile_networking AS n INNER JOIN profile_networking_enum AS m ON (n.network_type = m.network_type) - WHERE n.uid = {?}", + WHERE n.pid = {?}", $page->pid()); } if (!is_array($value)) { @@ -334,21 +338,88 @@ class ProfileNetworking implements ProfileSetting public function save(ProfilePage &$page, $field, $value) { XDB::execute("DELETE FROM profile_networking - WHERE uid = {?}", + WHERE pid = {?}", $page->pid()); if (!count($value)) { return; } $insert = array(); foreach ($value as $id=>$network) { - XDB::execute("INSERT INTO profile_networking (uid, nwid, network_type, address, pub) + XDB::execute("INSERT INTO profile_networking (pid, nwid, network_type, address, pub) VALUES ({?}, {?}, {?}, {?}, {?})", $page->pid(), $id, $network['type'], $network['address'], $network['pub']); } } } -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'; @@ -356,27 +427,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['synchro_ax'] - = new ProfileBool(); $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, @@ -386,17 +456,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, - d.email_directory as email_directory, - pr.freetext, pr.freetext_pub as freetext_pub - FROM profiles AS pr - INNER JOIN profile_display AS p ON (p.pid = pr.pid) - INNER JOIN profile_education AS e ON (e.uid = pr.pid AND FIND_IN_SET('primary', e.flags)) - LEFT JOIN profile_phones AS t ON (t.uid = pr.pid AND link_type = 'user') - LEFT JOIN profile_directory AS d ON (d.uid = pr.pid) - 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(); @@ -404,32 +471,26 @@ class ProfileGeneral extends ProfilePage // Retreive photo informations $res = XDB::query("SELECT pub - FROM photo - WHERE uid = {?}", $this->pid()); + FROM profile_photos + WHERE pid = {?}", $this->pid()); $this->values['photo_pub'] = $res->fetchOneCell(); 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() { if ($this->changed['nationality1'] || $this->changed['nationality2'] || $this->changed['nationality3'] - || $this->changed['birthdate'] || $this->changed['freetext'] || $this->changed['freetext_pub']) { + || $this->changed['birthdate'] || $this->changed['freetext'] || $this->changed['freetext_pub'] + || $this->changed['email_directory']) { if ($this->values['nationality3'] == "") { $this->values['nationality3'] = NULL; } @@ -442,30 +503,24 @@ class ProfileGeneral extends ProfilePage $this->values['nationality2'] = $this->values['nationality3']; $this->values['nationality3'] = NULL; } - - XDB::execute("UPDATE profiles - SET nationality1 = {?}, nationality2 = {?}, nationality3 = {?}, birthdate = {?}, - freetext = {?}, freetext_pub = {?} - WHERE user_id = {?}", - $this->values['nationality1'], $this->values['nationality2'], $this->values['nationality3'], - preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $this->values['birthdate']), - $this->values['freetext'], $this->values['freetext_pub'], - $this->pid()); - } - if ($this->changed['email_directory']) { $new_email = ($this->values['email_directory'] == "new@example.org") ? $this->values['email_directory_new'] : $this->values['email_directory']; if ($new_email == "") { $new_email = NULL; } - XDB::execute("REPLACE INTO profile_directory (uid, email_directory) - VALUES ({?}, {?})", - $this->pid(), $new_email); + + XDB::execute("UPDATE profiles + SET nationality1 = {?}, nationality2 = {?}, nationality3 = {?}, birthdate = {?}, + freetext = {?}, freetext_pub = {?}, email_directory = {?} + WHERE pid = {?}", + $this->values['nationality1'], $this->values['nationality2'], $this->values['nationality3'], + preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $this->values['birthdate']), + $this->values['freetext'], $this->values['freetext_pub'], $new_email, $this->pid()); } if ($this->changed['photo_pub']) { - XDB::execute("UPDATE photo + XDB::execute("UPDATE profile_photos SET pub = {?} - WHERE uid = {?}", + WHERE pid = {?}", $this->values['photo_pub'], $this->pid()); } if ($this->changed['yourself']) { @@ -473,11 +528,14 @@ class ProfileGeneral extends ProfilePage SET display_name = {?} WHERE pid = {?}', $this->pid()); } - 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()); + } } }