X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fgeneral.inc.php;h=33e99157d0be6a40b8571c19243c1e2e8c50ad8b;hb=4a55e7da9dd68b35034d207a25d8ffb292f30403;hp=945c54f6847d76336f8001de6b5c8ff5ff717a9d;hpb=8320b6fba6fa245dd71ae9c11b2a2a03f923d15d;p=platal.git diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index 945c54f..33e9915 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 : $current; - } - - public function save(ProfilePage &$page, $field, $new_value) - { - $_SESSION[$field] = $new_value; - } -} - -class ProfileSearchName implements ProfileSetting -{ - - public function __construct() - { + 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", + S::v('uid')); + + $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; + $sn = $sn_all->next(); + } else { + $value[] = array('typeid' => $sn_type['id'], + 'type' => $sn_type['type'], + 'type_name' => $sn_type['name'], + 'pub' => 1, + 'has_particle' => $sn_type['has_particle'], + 'always_displayed' => 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'", + S::i('uid')); + $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 $value; } - public function save(ProfilePage &$page, $field, $new_value) + public function save(ProfilePage &$page, $field, $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)", + S::i('uid')); + $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é prises 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); + } } } @@ -255,9 +362,10 @@ class ProfileGeneral extends ProfilePage public function __construct(PlWizard &$wiz) { parent::__construct($wiz); - $this->settings['nom'] = $this->settings['prenom'] - = new ProfileNom(); - $this->settings['naissance'] = new ProfileDate(); + $this->settings['search_names'] + = new ProfileSearchNames(); + $this->settings['naissance'] + = new ProfileDate(); $this->settings['freetext_pub'] = $this->settings['photo_pub'] = new ProfilePub(); @@ -265,12 +373,8 @@ class ProfileGeneral extends ProfilePage = $this->settings['nationalite'] = $this->settings['nationalite2'] = $this->settings['nationalite3'] - = $this->settings['nick'] = $this->settings['yourself'] - = $this->settings['display_name'] - = $this->settings['sort_name'] - = $this->settings['tooltip_name'] - = $this->settings['promo_display'] + = $this->settings['promo'] = null; $this->settings['synchro_ax'] = new ProfileBool(); @@ -281,26 +385,23 @@ class ProfileGeneral extends ProfilePage $this->settings['networking'] = new ProfileNetworking(); $this->settings['tels'] = new ProfilePhones('user', 0); $this->settings['edus'] = new ProfileEdu(); - $this->watched= array('nom' => true, 'freetext' => true, 'tels' => true, + $this->watched= array('freetext' => true, 'tels' => true, 'networking' => true, 'edus' => true, 'nationalite' => true, 'nationalite2' => true, - 'nationalite3' => true, 'nick' => true); + 'nationalite3' => 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, - u.nom_usage, u.nationalite, u.nationalite2, u.nationalite3, u.naissance, + $res = XDB::query("SELECT p.promo, e.entry_year AS entry_year, e.grad_year AS grad_year, + u.nationalite, u.nationalite2, u.nationalite3, u.naissance, t.display_tel as mobile, t.pub as mobile_pub, d.email_directory as email_directory, q.profile_freetext as freetext, q.profile_freetext_pub as freetext_pub, - q.profile_nick as nick, q.profile_from_ax as synchro_ax, u.matricule_ax, - n.yourself, n.display AS display_name, n.sort AS sort_name, - n.tooltip AS tooltip_name + q.profile_from_ax as synchro_ax, u.matricule_ax, p.yourself FROM auth_user_md5 AS u INNER JOIN auth_user_quick AS q ON (u.user_id = q.user_id) - INNER JOIN profile_names_display AS n ON (n.user_id = u.user_id) INNER JOIN profile_display AS p ON (p.pid = u.user_id) INNER JOIN profile_education AS e ON (e.uid = u.user_id AND FIND_IN_SET('primary', e.flags)) LEFT JOIN profile_phones AS t ON (u.user_id = t.uid AND link_type = 'user') @@ -320,15 +421,7 @@ class ProfileGeneral extends ProfilePage S::v('uid')); $this->values['nouvellephoto'] = $res->fetchOneCell(); - // Retreive search names info - $this->values['search_names'] = XDB::iterator(" - SELECT sn.search_name, sn.name_type, sn.pub, sn.sn_id - FROM profile_names_search AS sn - WHERE sn.user_id = {?} - ORDER BY sn.name_type, search_score, search_name", - S::v('uid')); - - // 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; @@ -339,7 +432,7 @@ class ProfileGeneral extends ProfilePage protected function _saveData() { if ($this->changed['nationalite'] || $this->changed['nationalite2'] || $this->changed['nationalite3'] - || $this->changed['nom'] || $this->changed['prenom'] || $this->changed['naissance']) { + || $this->changed['naissance']) { if ($this->values['nationalite3'] == "") { $this->values['nationalite3'] = NULL; } @@ -354,20 +447,16 @@ class ProfileGeneral extends ProfilePage } XDB::execute("UPDATE auth_user_md5 - SET nationalite = {?}, nationalite2 = {?}, nationalite3 = {?}, nom={?}, prenom={?}, naissance={?} + SET nationalite = {?}, nationalite2 = {?}, nationalite3 = {?}, naissance={?} WHERE user_id = {?}", - $this->values['nationalite'], $this->values['nationalite2'], $this->values['nationalite3'], - $this->values['nom'], $this->values['prenom'], - preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $this->values['naissance']), - S::v('uid')); + $this->values['nationalite'], $this->values['nationalite2'], $this->values['nationalite3'], + preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $this->values['naissance']), + S::v('uid')); } - if ($this->changed['nick'] || $this->changed['freetext'] || $this->changed['freetext_pub'] || $this->changed['synchro_ax']) { + if ($this->changed['freetext'] || $this->changed['freetext_pub'] || $this->changed['synchro_ax']) { XDB::execute("UPDATE auth_user_quick - SET profile_nick= {?}, - profile_freetext={?}, - profile_freetext_pub={?}, profile_from_ax = {?} - WHERE user_id = {?}", - $this->values['nick'], + SET profile_freetext={?}, profile_freetext_pub={?}, profile_from_ax = {?} + WHERE user_id = {?}", $this->values['freetext'], $this->values['freetext_pub'], $this->values['synchro_ax'], S::v('uid')); } @@ -381,35 +470,23 @@ class ProfileGeneral extends ProfilePage VALUES ({?}, {?})", S::v('uid'), $new_email); } - if ($this->changed['nick']) { - require_once('user.func.inc.php'); - user_reindex(S::v('uid')); - } if ($this->changed['photo_pub']) { XDB::execute("UPDATE photo SET pub = {?} WHERE uid = {?}", $this->values['photo_pub'], S::v('uid')); } - if ($this->changed['yourself'] || $this->changed['sort_name'] || - $this-> changed['display_name'] || $this->changed['tooltip_name']) { - XDB::execute("UPDATE profile_names_display AS n - SET n.yourself = {?}, - n.sort = {?}, ". // SET - "n.display = {?}, ". // SET - "n.tooltip = {?} ". // SET - "WHERE n.user_id = {?}", - $this->values['yourself'], - $this->values['sort_name'], - $this->values['display_name'], - $this->values['tooltip_name'], - S::v('uid')); + if ($this->changed['yourself']) { + XDB::execute("UPDATE profile_display + SET yourself = {?} + WHERE pid = {?}", + $this->values['yourself'], S::v('uid')); } - if ($this->changed['promo_display']) { + if ($this->changed['promo']) { XDB::execute("UPDATE profile_display SET promo = {?} WHERE pid = {?}", - $this->values['promo_display'], S::v('uid')); + $this->values['promo'], S::v('uid')); } } @@ -429,6 +506,14 @@ class ProfileGeneral extends ProfilePage 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 = {?}", + S::v('uid')); + $res = $res->fetchOneRow(); + $page->assign('public_name', $res[0]); + $page->assign('private_name', $res[1]); } }