- 'Revenir sur polytechnique.org' :
- 'Revenir sur polytechnique.net');
-
- $info_client = Array(
- 'first_name' => S::v('prenom'),
- 'last_name' => $name,
- 'email' => S::v('bestalias').'@' . $globals->mail->domain);
-
- $res = XDB::query(
- "SELECT a.adr1 AS address1, a.adr2 AS address2,
- a.city, a.postcode AS zip, a.country,
- IF(t.tel, t.tel, q.profile_mobile) AS night_phone_b
- FROM auth_user_quick AS q
- LEFT JOIN adresses AS a ON (q.user_id = a.uid AND FIND_IN_SET('active', a.statut))
- LEFT JOIN tels AS t ON (t.uid = a.uid AND t.adrid = a.adrid)
- WHERE q.user_id = {?}
- LIMIT 1", S::v('uid'));
- $this->infos['client'] = array_merge($info_client, $res->fetchOneAssoc());
+ 'Revenir sur polytechnique.org' :
+ 'Revenir sur polytechnique.net');
+
+ $info_client = Array(
+ 'first_name' => S::v('prenom'),
+ 'last_name' => $name,
+ 'email' => S::user()->bestEmail());
+
+ $res = XDB::query(
+ "SELECT a.adr1 AS address1, a.adr2 AS address2,
+ a.city, a.postcode AS zip, a.country,
+ IF(t1.display_tel != '', t1.display_tel, t2.display_tel) AS night_phone_b
+ FROM auth_user_quick AS q
+ LEFT JOIN adresses AS a ON (q.user_id = a.uid AND FIND_IN_SET('active', a.statut))
+ LEFT JOIN profile_phones AS t1 ON (t1.uid = a.uid AND t1.link_type = 'address' AND t1.link_id = a.adrid)
+ LEFT JOIN profile_phones AS t2 ON (t2.uid = a.uid AND t2.link_type = 'user' AND t2.link_id = 0)
+ WHERE q.user_id = {?}
+ LIMIT 1", S::v('uid'));
+ $this->infos['client'] = array_map('replace_accent', array_merge($info_client, $res->fetchOneAssoc()));