X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fgeneral.inc.php;h=5e70adc0853807156803f5e04652c9194d032963;hb=5c4ea53f1c66590a34fc10ae5767469c58b90a24;hp=baa845de94cd1a74db8c20a87ca6314ab072d8c0;hpb=be638e733bce413df4324d985297d9a4d94dcbca;p=platal.git diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index baa845d..5e70adc 100644 --- a/modules/profile/general.inc.php +++ b/modules/profile/general.inc.php @@ -1,6 +1,6 @@ prepareField($init); - $old = $this->prepareField($current); - $new = $this->prepareField($value); - $newLen = strlen($new); - $success = $this->matchWord($old, $new, $newLen) - || $this->matchWord($ini, $new, $newLen) - || ($field == 'nom' && $new == 'DE ' . $old); + $ini = $this->prepareField($init); + $new = $this->prepareField($value); + $newLen = strlen($new); + $success = $this->matchWord($ini, $new, $newLen) + || ($field == 'lastname' && $new == 'DE ' . $ini); if (!$success) { - Platal::page()->trigError("Le $field que tu as choisi ($value) est trop loin de ton $field initial ($init)" - . (($init == $current)? "" : " et de ton prénom précédent ($current)")); + $field = strtolower($field); + Platal::page()->trigError("Le " . $field . " que tu as choisi (" . $value . + ") est trop loin de ton " . $field . " initial (" . $init . ")."); + } + return $success ? $value : $init; + } + + public function value(ProfilePage &$page, $field, $value, &$success) + { + $success = true; + $success_tmp = true; + + if (is_null($value)) { + $sn_all = XDB::iterator("SELECT CONCAT(sn.particle, sn.name) AS name, + sn.particle, sn.typeid, e.type, e.name AS type_name, + FIND_IN_SET('has_particle', e.flags) AS has_particle, + FIND_IN_SET('always_displayed', e.flags) AS always_displayed, + FIND_IN_SET('public', e.flags) AS pub + FROM profile_name AS sn + INNER JOIN profile_name_enum AS e ON (e.id = sn.typeid) + WHERE sn.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags) + ORDER BY NOT FIND_IN_SET('always_displayed', e.flags), e.id, sn.name", + $page->pid()); + + $sn_types = XDB::iterator("SELECT id, type, name, + FIND_IN_SET('has_particle', flags) AS has_particle + FROM profile_name_enum + WHERE NOT FIND_IN_SET('not_displayed', flags) + AND FIND_IN_SET('always_displayed', flags) + ORDER BY id"); + + $value = array(); + $sn = $sn_all->next(); + while ($sn_type = $sn_types->next()) { + if ($sn_type['id'] == $sn['typeid']) { + $value[] = $sn; + if ($sn) { + $sn = $sn_all->next(); + } + } else { + $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, + 'pub' => 1); + } + } + if ($sn) { + do { + $value[] = $sn; + } while ($sn = $sn_all->next()); + } + } else { + require_once 'name.func.inc.php'; + + $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) + WHERE s.pid = {?} AND e.type LIKE '%ini' + ORDER BY e.type = 'firstname_ini'", + $page->pid()); + $res = $res->fetchAllAssoc(); + $initial = array(); + $initial['lastname'] = $res[0]['particle'] . $res[0]['name']; + $initial['firstname'] = $res[1]['name']; + $sn_types = build_types(); + $this->search_names = array(); + foreach ($value as &$sn) { + $sn['name'] = trim($sn['name']); + if ($sn['type'] == 'firstname' || $sn['type'] == 'lastname') { + $sn['name'] = $this->prepare($page, $sn['type'], $sn['name'], + $initial[$sn['type']], $success_tmp); + $success = $success && $success_tmp; + } + if ($sn['pub']) { + if (isset($sn['particle']) && ($sn['particle'] != '')) { + list($particle, $name) = explode(' ', $sn['name'], 2); + $particle = trim($particle) . ' '; + if (!$name) { + list($particle, $name) = explode('\'', $sn['name'], 2); + $particle = trim($particle); + } + } else { + $particle = ''; + $name = $sn['name']; + } + } + if ($sn['name'] != '') { + if ($sn['pub']) { + $this->search_names[$sn['typeid']] = array('fullname' => $sn['name'], + 'name' => $name, + 'particle' => $particle, + 'pub' => $sn['pub']); + } else { + if (isset($this->search_names[$sn['typeid']])) { + $this->search_names[$sn['typeid']][] = $sn['name']; + } else { + $this->search_names[$sn['typeid']] = array('fullname' => $sn['name']); + } + $sn['type_name'] = $sn_types[$sn['typeid']]; + } + } + } + $res = XDB::query("SELECT public_name, private_name + FROM profile_display + WHERE pid = {?}", + S::v('uid')); + list($public_name, $private_name) = $res->fetchOneRow(); + if ($success) { + $sn_types_private = build_types('private'); + $this->private_name_end = build_private_name($this->search_names, $sn_types_private); + $private_name = $public_name . $this->private_name_end; + } + Platal::page()->assign('public_name', $public_name); + Platal::page()->assign('private_name', $private_name); } - return $success ? $value : $current; + + return $value; } - public function save(ProfilePage &$page, $field, $new_value) + public function save(ProfilePage &$page, $field, $value) { - $_SESSION[$field] = $new_value; + require_once 'name.func.inc.php'; + $sn_old = build_sn_pub(); + 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); + + // 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."); + } else { + $display_names = array(); + build_display_names($display_names, $this->search_names, $this->private_name_end); + set_profile_display($display_names); + } } } @@ -84,14 +213,11 @@ class ProfileEdu implements ProfileSetting $success = true; if (is_null($value) || !is_array($value)) { $value = array(); - $res = XDB::iterator("SELECT eduid, degreeid, fieldid, grad_year, program - FROM profile_education - WHERE uid = {?} AND !FIND_IN_SET('primary', flags) - ORDER BY id", - $page->pid()); - while($edu = $res->next()) { - $value[] = $edu; - } + $value = XDB::fetchAllAssoc("SELECT eduid, degreeid, fieldid, grad_year, program + FROM profile_education + WHERE uid = {?} AND !FIND_IN_SET('primary', flags) + ORDER BY id", + $page->pid()); } else { $i = 0; foreach ($value as $key=>&$edu) { @@ -171,25 +297,17 @@ class ProfileNetworking implements ProfileSetting public function value(ProfilePage &$page, $field, $value, &$success) { if (is_null($value)) { - $value = array(); - $res = XDB::iterator("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 = {?}", - $page->pid()); - while($network = $res->next()) { - $value[] = $network; - } + $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 = {?}", + $page->pid()); } if (!is_array($value)) { $value = array(); } - $res = XDB::iterator("SELECT filter, network_type AS type - FROM profile_networking_enum;"); - $filters = array(); - while($filter = $res->next()) { - $filters[$filter['type']] = $filter['filter']; - } + $filters = XDB::fetchAllAssoc('type', 'SELECT filter, network_type AS type + FROM profile_networking_enum;'); $success = true; foreach($value as $i=>&$network) { if (!trim($network['address'])) { @@ -241,6 +359,8 @@ class ProfileGeneral extends ProfilePage public function __construct(PlWizard &$wiz) { parent::__construct($wiz); + $this->settings['search_names'] + = new ProfileSearchNames(); $this->settings['birthdate'] = new ProfileDate(); $this->settings['freetext_pub'] = $this->settings['photo_pub'] @@ -249,16 +369,9 @@ class ProfileGeneral extends ProfilePage = $this->settings['nationality1'] = $this->settings['nationality2'] = $this->settings['nationality3'] - = $this->settings['nick'] = $this->settings['yourself'] - = $this->settings['display_name'] - = $this->settings['sort_name'] - = $this->settings['tooltip_name'] - = $this->settings['promo_display'] - = $this->settings['search_names'] + = $this->settings['promo'] = null; - $this->settings['synchro_ax'] - = new ProfileBool(); $this->settings['email_directory'] = new ProfileEmail(); $this->settings['email_directory_new'] @@ -269,32 +382,32 @@ class ProfileGeneral extends ProfilePage $this->watched= array('freetext' => true, 'tels' => true, 'networking' => true, 'edus' => true, 'nationality1' => true, 'nationality2' => true, - 'nationality3' => true, 'nick' => true); + 'nationality3' => true, 'search_names' => true); } protected function _fetchData() { // Checkout all data... - $res = XDB::query("SELECT p.promo AS promo_display, e.entry_year AS entry_year, e.grad_year AS grad_year, + $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, - n.yourself, n.display AS display_name, n.sort AS sort_name, - n.tooltip AS tooltip_name + pr.freetext, pr.freetext_pub, pr.ax_id AS matricule_ax, p.yourself FROM profiles AS pr - INNER JOIN profile_names_display AS n ON (n.user_id = pr.pid) 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()); $this->values = $res->fetchOneAssoc(); + if ($this->owner) { + $this->values['yourself'] = $this->owner->displayName(); + } // 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) { @@ -307,43 +420,7 @@ class ProfileGeneral extends ProfilePage $this->values['nouvellephoto'] = 0; } - // Retreive search names info - $sn_all = XDB::iterator("SELECT IF(sn.particle = '', sn.name, CONCAT(sn.particle, ' ', sn.name)) AS name, - sn.particle, sn.typeid, e.name AS type, - FIND_IN_SET('has_particle', e.flags) AS has_particle, - FIND_IN_SET('always_displayed', e.flags) AS always_displayed, - FIND_IN_SET('public', e.flags) AS pub - FROM profile_name_search AS sn - INNER JOIN profile_name_search_enum AS e ON (e.id = sn.typeid) - WHERE sn.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags) - ORDER BY NOT FIND_IN_SET('always_displayed', e.flags), e.id, sn.name", - $this->pid()); - - $sn_types = XDB::iterator("SELECT id, name, FIND_IN_SET('has_particle', flags) AS has_particle - FROM profile_name_search_enum - WHERE NOT FIND_IN_SET('not_displayed', flags) - AND FIND_IN_SET('always_displayed', flags) - ORDER BY id"); - - $this->values['search_names'] = array(); - $sn = $sn_all->next(); - while ($sn_type = $sn_types->next()) { - if ($sn_type['id'] == $sn['typeid']) { - $this->values['search_names'][] = $sn; - $sn = $sn_all->next(); - } else { - $this->values['search_names'][] = array('typeid' => $sn_type['id'], - 'type' => $sn_type['name'], - 'pub' => 1, - 'has_particle' => $sn_type['has_particle'], - 'always_displayed' => 1); - } - } - do { - $this->values['search_names'][] = $sn; - } while ($sn = $sn_all->next()); - - // Proposes choice for promo_display + // 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; @@ -371,11 +448,10 @@ class ProfileGeneral extends ProfilePage XDB::execute("UPDATE profiles SET nationality1 = {?}, nationality2 = {?}, nationality3 = {?}, birthdate = {?}, freetext = {?}, freetext_pub = {?} - WHERE user_id = {?}", + 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'], - $this->pid()); + $this->values['freetext'], $this->values['freetext_pub'], $this->pid()); } if ($this->changed['email_directory']) { $new_email = ($this->values['email_directory'] == "new@example.org") ? @@ -388,77 +464,21 @@ class ProfileGeneral extends ProfilePage $this->pid(), $new_email); } 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'] || $this->changed['search_names']) { - if ($this->changed['search_names']) { - XDB::execute("DELETE FROM s - USING profile_name_search AS s - INNER JOIN profile_name_search_enum AS e ON (s.typeid = e.id) - WHERE s.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)", - $this->pid()); - $search_names = array(); - foreach ($this->values['search_names'] as $sn) { - if ($sn['name'] != '') { - if ($sn['particle']) { - list($particle, $name) = explode(' ', $sn['name'], 2); - if (!$name) { - list($particle, $name) = explode('\'', $sn['name'], 2); - } - } else { - $particle = ''; - $name = $sn['name']; - } - $particle = trim($particle); - $name = trim($name); - $sn['name'] = trim($sn['name']); - XDB::execute("INSERT INTO profile_name_search (particle, name, typeid, pid) - VALUES ({?}, {?}, {?}, {?})", - $particle, $name, $sn['typeid'], $this->pid()); - if (!isset($search_names[$sn['typeid']])) { - $search_names[$sn['typeid']] = array($sn['name'], $name); - } else { - $search_names[$sn['typeid']] = array_merge($search_names[$sn['typeid']], array($name)); - } - } - } - - require_once 'name.func.inc.php'; - $sn_types_public = build_types('public'); - $sn_types_private = build_types('private'); - $full_name = build_full_name($search_names, $sn_types_public); - $directory_name = build_directory_name($search_names, $sn_types_public, $full_name); - $short_name = short_name($search_names, $sn_types_public); - $sort_name = short_name($search_names, $sn_types_public); - $this->values['public_name'] = build_public_name($search_names, $sn_types_public, $full_name); - $this->values['private_name'] = $public_name . build_private_name($search_names, $sn_types_private); - XDB::execute("UPDATE profile_display - SET yourself = {?}, public_name = {?}, private_name = {?}, - directory_name = {?}, short_name = {?}, sort_name = {?} - WHERE pid = {?}", - $this->values['yourself'], $this->values['public_name'], - $this->values['private_name'], $directory_name, $short_name, - $sort_name, $this->pid()); - /*if ($this->changed['search_names']) { - require_once('user.func.inc.php'); - user_reindex(S::v('uid')); - }*/ - } else { - XDB::execute("UPDATE profile_display - SET yourself = {?} - WHERE pid = {?}", - $this->values['yourself'], $this->pid()); - } + if ($this->changed['yourself']) { + XDB::execute('UPDATE accounts + SET display_name = {?} + WHERE pid = {?}', $this->pid()); } - if ($this->changed['promo_display']) { + if ($this->changed['promo']) { XDB::execute("UPDATE profile_display SET promo = {?} WHERE pid = {?}", - $this->values['promo_display'], $this->pid()); + $this->values['promo'], $this->pid()); } } @@ -466,18 +486,26 @@ class ProfileGeneral extends ProfilePage { require_once "education.func.inc.php"; - $res = XDB::iterator("SELECT id, field - FROM profile_education_field_enum - ORDER BY field"); + $res = XDB::query("SELECT id, field + FROM profile_education_field_enum + ORDER BY field"); $page->assign('edu_fields', $res->fetchAllAssoc()); require_once "emails.combobox.inc.php"; fill_email_combobox($page, $this->owner, $this->profile); - $res = XDB::iterator("SELECT nw.network_type AS type, nw.name - FROM profile_networking_enum AS nw - ORDER BY name"); + $res = XDB::query("SELECT nw.network_type AS type, nw.name + FROM profile_networking_enum AS nw + ORDER BY name"); $page->assign('network_list', $res->fetchAllAssoc()); + + $res = XDB::query("SELECT public_name, private_name + FROM profile_display + WHERE pid = {?}", + $this->pid()); + $res = $res->fetchOneRow(); + $page->assign('public_name', $res[0]); + $page->assign('private_name', $res[1]); } }