X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprofile%2Fgeneral.inc.php;h=5d4135e63f9866a21b7295065398fc079d094b20;hb=46cd778872eee0d7f7fa0be598f6ae6eb71f4f7e;hp=ac81f596ef10035f564813fa0a423eed97369087;hpb=756ff73fbb0cdd01cce2eda27ba18e1cc99bd735;p=platal.git diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index ac81f59..5d4135e 100644 --- a/modules/profile/general.inc.php +++ b/modules/profile/general.inc.php @@ -52,9 +52,8 @@ class ProfileNom implements ProfileSetting || $this->matchWord($ini, $new, $newLen) || ($field == 'nom' && $new == 'DE ' . $old); if (!$success) { - global $page; - $page->trig("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)")); + 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)")); } return $success ? $value : $current; } @@ -65,6 +64,22 @@ class ProfileNom implements ProfileSetting } } +class ProfileSearchName implements ProfileSetting +{ + + public function __construct() + { + } + + public function value(ProfilePage &$page, $field, $value, &$success) + { + } + + public function save(ProfilePage &$page, $field, $new_value) + { + } +} + class ProfileAppli implements ProfileSetting { public function value(ProfilePage &$page, $field, $value, &$success) @@ -78,7 +93,7 @@ class ProfileAppli implements ProfileSetting public function save(ProfilePage &$page, $field, $new_value) { - $index = ($field == 'appli1' ? 0 : 1); + $index = ($field == 'edu_0' ? 0 : 1); if ($new_value['id'] > 0) { XDB::execute("REPLACE INTO applis_ins SET uid = {?}, aid = {?}, type = {?}, ordre = {?}", @@ -91,6 +106,119 @@ class ProfileAppli implements ProfileSetting } } +class ProfileEmailDirectory implements ProfileSetting +{ + private $email; + + public function __construct() + { + } + + public function value(ProfilePage &$page, $field, $value, &$success) + { + $p = Platal::page(); + + $success = true; + if (!is_null($value)) { + $email_stripped = strtolower(trim($value)); + if ((!isvalid_email($email_stripped)) && ($email_stripped) && ($page->values['email_directory'] == "new@example.org")) { + $p->assign('email_error', '1'); + $p->assign('email_directory_error', $email_stripped); + $p->trigError('Adresse Email invalide'); + $success = false; + } else { + $p->assign('email_error', '0'); + } + } + return $value; + } + + public function save(ProfilePage &$page, $field, $value) + { + } +} + +class ProfileNetworking implements ProfileSetting +{ + private $email; + private $pub; + private $web; + private $number; + + public function __construct() + { + $this->email = new ProfileEmail(); + $this->pub = new ProfilePub(); + $this->web = new ProfileWeb(); + $this->number = new ProfileNumber(); + } + + 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 = {?}", + S::i('uid')); + while($network = $res->next()) { + $value[] = $network; + } + } + 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']; + } + $success = true; + foreach($value as $i=>&$network) { + if (!trim($network['address'])) { + unset($value[$i]); + } else { + if (!isset($network['pub'])) { + $network['pub'] = 'private'; + } + $network['error'] = false; + $network['pub'] = $this->pub->value($page, 'pub', $network['pub'], $s); + $s = true; + if ($filters[$network['type']] == 'web') { + $network['address'] = $this->web->value($page, 'address', $network['address'], $s); + } elseif ($filters[$network['type']] == 'email') { + $network['address'] = $this->email->value($page, 'address', $network['address'], $s); + } elseif ($filters[$network['type']] == 'number') { + $network['address'] = $this->number->value($page, 'address', $network['address'], $s); + } + if (!$s) { + $success = false; + $network['error'] = true; + } + } + } + return $value; + } + + public function save(ProfilePage &$page, $field, $value) + { + XDB::execute("DELETE FROM profile_networking + WHERE uid = {?}", + S::i('uid')); + if (!count($value)) { + return; + } + $insert = array(); + foreach ($value as $id=>$network) { + XDB::execute("INSERT INTO profile_networking (uid, nwid, network_type, address, pub) + VALUES ({?}, {?}, {?}, {?}, {?})", + S::i('uid'), $id, $network['type'], $network['address'], $network['pub']); + } + } +} + class ProfileGeneral extends ProfilePage { protected $pg_template = 'profile/general.tpl'; @@ -98,55 +226,71 @@ class ProfileGeneral extends ProfilePage public function __construct(PlWizard &$wiz) { parent::__construct($wiz); - $this->settings['nom'] = $this->settings['prenom'] - = new ProfileNom(); + $this->settings['nom'] = $this->settings['prenom'] + = new ProfileNom(); $this->settings['naissance'] = new ProfileDate(); - $this->settings['mobile_pub'] - = $this->settings['web_pub'] - = $this->settings['freetext_pub'] + $this->settings['freetext_pub'] = $this->settings['photo_pub'] = new ProfilePub(); $this->settings['freetext'] = $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'] = null; $this->settings['synchro_ax'] = new ProfileBool(); - $this->settings['mobile'] = new ProfileTel(); - $this->settings['web'] = new ProfileWeb(); - $this->settings['appli1'] - = $this->settings['appli2'] + $this->settings['email_directory'] + = new ProfileEmail(); + $this->settings['email_directory_new'] + = new ProfileEmailDirectory(); + $this->settings['networking'] = new ProfileNetworking(); + $this->settings['tels'] = new ProfilePhones('user', 0); + $this->settings['edu_0'] + = $this->settings['edu_1'] = new ProfileAppli(); - $this->watched= array('nom' => true, 'freetext' => true, 'mobile' => true, 'web' => true, - 'appli1' => true, 'appli2' => true, 'nationalite' => true, 'nick' => true); + $this->watched= array('nom' => true, 'freetext' => true, 'tels' => true, + 'networking' => true, 'edu_0' => true, 'edu_1' => true, + 'nationalite' => true, 'nationalite2' => true, + 'nationalite3' => true, 'nick' => true); } protected function _fetchData() { // Checkout all data... - $res = XDB::query("SELECT u.promo, u.promo_sortie, u.nom_usage, u.nationalite, u.naissance, - q.profile_mobile as mobile, q.profile_mobile_pub as mobile_pub, - q.profile_web as web, q.profile_web_pub as web_pub, + $res = XDB::query("SELECT u.promo, u.promo_sortie, u.nom_usage, 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, - IF(a1.aid IS NULL, -1, a1.aid) as appli_id1, a1.type as appli_type1, - IF(a2.aid IS NULL, -1, a2.aid) as appli_id2, a2.type as appli_type2 - FROM auth_user_md5 AS u - INNER JOIN auth_user_quick AS q USING(user_id) - LEFT JOIN applis_ins AS a1 ON(a1.uid = u.user_id and a1.ordre = 0) - LEFT JOIN applis_ins AS a2 ON(a2.uid = u.user_id and a2.ordre = 1) + IF(a1.aid IS NULL, -1, a1.aid) as edu_id1, a1.type as edu_type1, + IF(a2.aid IS NULL, -1, a2.aid) as edu_id2, a2.type as edu_type2, + n.yourself, n.display AS display_name, n.sort AS sort_name, + n.tooltip AS tooltip_name + 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) + LEFT JOIN profile_phones AS t ON(u.user_id = t.uid AND link_type = 'user') + LEFT JOIN profile_directory AS d ON(d.uid = u.user_id) + LEFT JOIN applis_ins AS a1 ON(a1.uid = u.user_id and a1.ordre = 0) + LEFT JOIN applis_ins AS a2 ON(a2.uid = u.user_id and a2.ordre = 1) WHERE u.user_id = {?}", S::v('uid', -1)); $this->values = $res->fetchOneAssoc(); // Reformat formation data - $this->values['appli1'] = array('id' => $this->values['appli_id1'], - 'type' => $this->values['appli_type1']); - unset($this->values['appli_id1']); - unset($this->values['appli_type1']); - $this->values['appli2'] = array('id' => $this->values['appli_id2'], - 'type' => $this->values['appli_type2']); - unset($this->values['appli_id2']); - unset($this->values['appli_type2']); + $this->values['edu_0'] = array('id' => $this->values['edu_id1'], + 'type' => $this->values['edu_type1']); + unset($this->values['edu_id1']); + unset($this->values['edu_type1']); + $this->values['edu_1'] = array('id' => $this->values['edu_id2'], + 'type' => $this->values['edu_type2']); + unset($this->values['edu_id2']); + unset($this->values['edu_type2']); // Retreive photo informations $res = XDB::query("SELECT pub @@ -159,32 +303,69 @@ class ProfileGeneral extends ProfilePage WHERE type='photo' AND user_id = {?}", 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')); + + // Retreive phones + $res = XDB::iterator("SELECT t.display_tel AS tel, t.tel_type AS type, t.pub, t.comment + FROM profile_phones AS t + WHERE t.uid = {?} AND t.link_type = 'user' + ORDER BY t.tel_id", + S::v('uid')); + $this->values['tels'] = $res->fetchAllAssoc(); } protected function _saveData() { - if ($this->changed['nationalite'] || $this->changed['nom'] || $this->changed['prenom'] - || $this->changed['naissance']) { + if ($this->changed['nationalite'] || $this->changed['nationalite2'] || $this->changed['nationalite3'] + || $this->changed['nom'] || $this->changed['prenom'] || $this->changed['naissance']) { + if ($this->values['nationalite3'] == "") { + $this->values['nationalite3'] = NULL; + } + if ($this->values['nationalite2'] == "") { + $this->values['nationalite2'] = $this->values['nationalite3']; + $this->values['nationalite3'] = NULL; + } + if ($this->values['nationalite'] == "") { + $this->values['nationalite'] = $this->values['nationalite2']; + $this->values['nationalite2'] = $this->values['nationalite3']; + $this->values['nationalite3'] = NULL; + } + XDB::execute("UPDATE auth_user_md5 - SET nationalite = {?}, nom={?}, prenom={?}, naissance={?} + SET nationalite = {?}, nationalite2 = {?}, nationalite3 = {?}, nom={?}, prenom={?}, naissance={?} WHERE user_id = {?}", - $this->values['nationalite'], $this->values['nom'], $this->values['prenom'], + $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')); } - if ($this->changed['nick'] || $this->changed['mobile'] || $this->changed['mobile_pub'] - || $this->changed['web'] || $this->changed['web_pub'] || $this->changed['freetext'] - || $this->changed['freetext_pub'] || $this->changed['synchro_ax']) { + if ($this->changed['nick'] || $this->changed['freetext'] || $this->changed['freetext_pub'] || $this->changed['synchro_ax']) { XDB::execute("UPDATE auth_user_quick - SET profile_nick= {?}, profile_mobile={?}, profile_mobile_pub={?}, - profile_web={?}, profile_web_pub={?}, profile_freetext={?}, + SET profile_nick= {?}, + profile_freetext={?}, profile_freetext_pub={?}, profile_from_ax = {?} WHERE user_id = {?}", - $this->values['nick'], $this->values['mobile'], $this->values['mobile_pub'], - $this->values['web'], $this->values['web_pub'], + $this->values['nick'], $this->values['freetext'], $this->values['freetext_pub'], $this->values['synchro_ax'], S::v('uid')); } + 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 ({?}, {?})", + S::v('uid'), $new_email); + } if ($this->changed['nick']) { require_once('user.func.inc.php'); user_reindex(S::v('uid')); @@ -195,11 +376,33 @@ class ProfileGeneral extends ProfilePage 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')); + } } - public function _prepare(PlatalPage &$page, $id) + public function _prepare(PlPage &$page, $id) { require_once "applis.func.inc.php"; + + require_once "emails.combobox.inc.php"; + fill_email_combobox($page); + + $res = XDB::iterator("SELECT nw.network_type AS type, nw.name + FROM profile_networking_enum AS nw + ORDER BY name"); + $page->assign('network_list', $res->fetchAllAssoc()); } }