X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuser.func.inc.php;h=8ee201e4bac31dcef504634d39d73a1a2d7d7857;hb=7f12e3b4113791f3372f11572a205925d7bb6b97;hp=75f38c5c8263e55c9dcb837969c17fbc003c4d33;hpb=a14159bffdc1ea08c97e6634dc1480619bdc478a;p=platal.git
diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 75f38c5..8ee201e 100644
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -1,6 +1,6 @@
array('requests', 'user_changes'));
if ($really_del) {
- array_push($tables_to_clear['uid'], 'emails', 'groupex.membres', 'contacts', 'adresses', 'tels',
+ array_push($tables_to_clear['uid'], 'emails', 'groupex.membres', 'contacts', 'adresses', 'profile_phones',
'photo', 'perte_pass', 'langues_ins', 'forums.abos', 'forums.profils');
array_push($tables_to_clear['user_id'], 'newsletter_ins', 'auth_user_quick', 'binets_ins');
- $tables_to_clear['id'] = array('aliases');
+ $tables_to_clear['id'] = array('aliases');
$tables_to_clear['contact'] = array('contacts');
- $tables_to_clear['guid'] = array('groupesx_ins');
XDB::execute("UPDATE auth_user_md5
SET date_ins = 0, promo_sortie = 0, nom_usage = '', password = '', perms = 'pending',
- nationalite = '', cv = '', section = 0, date = 0, smtppass = ''
+ nationalite = '', cv = '', section = 0, date = 0, smtppass = '', mail_storage = ''
WHERE user_id = {?}", $uid);
XDB::execute("DELETE virtual.* FROM virtual INNER JOIN virtual_redirect AS r USING(vid) WHERE redirect = {?}",
$alias.'@'.$globals->mail->domain);
@@ -71,20 +70,42 @@ function user_clear_all_subs($user_id, $really_del=true)
$mmlist = new MMList(S::v('uid'), S::v('password'));
$mmlist->kill($alias, $really_del);
+
+ // Deactivates, when available, the Google Apps account of the user.
+ if ($globals->mailstorage->googleapps_domain) {
+ require_once 'googleapps.inc.php';
+ if (GoogleAppsAccount::account_status($uid)) {
+ $account = new GoogleAppsAccount($uid, $alias);
+ $account->suspend();
+ }
+ }
}
// }}}
// {{{ function get_user_login()
-function get_user_login($data, $get_forlife = false) {
- global $globals, $page;
+// Defaut callback to call when a login is not found
+function _default_user_callback($login)
+{
+ Platal::page()->trigError("Il n'y a pas d'utilisateur avec l'identifiant : $login");
+ return;
+}
+
+function _silent_user_callback($login)
+{
+ return;
+}
+
+function get_user_login($data, $get_forlife = false, $callback = '_default_user_callback')
+{
+ global $globals;
if (is_numeric($data)) {
$res = XDB::query("SELECT alias FROM aliases WHERE type='a_vie' AND id={?}", $data);
if ($res->numRows()) {
return $res->fetchOneCell();
} else {
- $page->trig("il n'y a pas d'utilisateur avec cet id");
+ call_user_func($callback, $data);
return false;
}
}
@@ -94,7 +115,7 @@ function get_user_login($data, $get_forlife = false) {
if (strstr($data, '@')===false) {
$data = $data.'@'.$globals->mail->domain;
}
-
+
list($mbox, $fqdn) = explode('@', $data);
if ($fqdn == $globals->mail->domain || $fqdn == $globals->mail->domain2) {
@@ -116,11 +137,11 @@ function get_user_login($data, $get_forlife = false) {
return $res->fetchOneCell();
}
}
- $page->trig("il n'y a pas d'utilisateur avec ce login");
+ call_user_func($callback, $data);
return false;
} elseif ($fqdn == $globals->mail->alias_dom || $fqdn == $globals->mail->alias_dom2) {
-
+
$res = XDB::query("SELECT redirect
FROM virtual_redirect
INNER JOIN virtual USING(vid)
@@ -128,11 +149,10 @@ function get_user_login($data, $get_forlife = false) {
if ($redir = $res->fetchOneCell()) {
list($alias) = explode('@', $redir);
} else {
- $page->trig("il n'y a pas d'utilisateur avec cet alias");
+ call_user_func($callback, $data);
$alias = false;
}
return $alias;
-
} else {
$res = XDB::query("SELECT alias
@@ -141,48 +161,63 @@ function get_user_login($data, $get_forlife = false) {
WHERE e.email={?} AND a.type='a_vie'", $data);
switch ($i = $res->numRows()) {
case 0:
- $page->trig("il n'y a pas d'utilisateur avec cette addresse mail");
+ call_user_func($callback, $data);
return false;
-
+
case 1:
return $res->fetchOneCell();
-
+
default:
if (S::has_perms()) {
$aliases = $res->fetchColumn();
- $page->trig("Il y a $i utilisateurs avec cette adresse mail : ".join(', ', $aliases));
+ Platal::page()->trigError("Il y a $i utilisateurs avec cette adresse mail : ".join(', ', $aliases));
} else {
$res->free();
}
}
}
-
+
return false;
}
// }}}
// {{{ function get_user_forlife()
-function get_user_forlife($data) {
- return get_user_login($data, true);
+function get_user_forlife($data, $callback = '_default_user_callback')
+{
+ return get_user_login($data, true, $callback);
}
// }}}
// {{{ function get_users_forlife_list()
-function get_users_forlife_list($members, $strict = false)
+function get_users_forlife_list($members, $strict = false, $callback = '_default_user_callback')
{
- if (strlen(trim($members)) == 0) {
- return null;
+ if (!is_array($members)) {
+ if (strlen(trim($members)) == 0) {
+ return null;
+ }
+ $members = split("[; ,\r\n\|]+", $members);
}
- $members = explode(' ', $members);
if ($members) {
$list = array();
foreach ($members as $i => $alias) {
- if (($login = get_user_forlife($alias)) !== false) {
+ $alias = trim($alias);
+ if (empty($alias)) {
+ continue;
+ }
+ if (($login = get_user_forlife($alias, $callback)) !== false) {
$list[$i] = $login;
- } else if(!$strict) {
+ } else if (!$strict) {
$list[$i] = $alias;
+ } else {
+ global $globals;
+ if (strpos($alias, '@') !== false) {
+ list($user, $dom) = explode('@', $alias);
+ if ($dom != $globals->mail->domain && $dom != $globals->mail->domain2) {
+ $list[$i] = $alias;
+ }
+ }
}
}
return $list;
@@ -194,13 +229,45 @@ function get_users_forlife_list($members, $strict = false)
// {{{ function has_user_right()
function has_user_right($pub, $view = 'private') {
if ($pub == $view) return true;
- // all infos available for private
+ // all infos available for private
if ($view == 'private') return true;
- // public infos available for all
+ // public infos available for all
if ($pub == 'public') return true;
// here we have view = ax or public, and pub = ax or private, and pub != view
- return false;
+ return false;
+}
+// }}}
+// {{{ function get_not_registered_user()
+
+function get_not_registered_user($login, $iterator = false)
+{
+ global $globals;
+ @list($login, $domain) = explode('@', $login);
+ if ($domain && $domain != $globals->mail->domain && $domain != $globals->mail->domain2) {
+ return null;
+ }
+ @list($prenom, $nom, $promo) = explode('.', $login);
+ $where = 'REPLACE(REPLACE(REPLACE(nom, " ", ""), "-", ""), "\'", "") LIKE CONCAT("%", {?}, "%")
+ AND REPLACE(REPLACE(REPLACE(prenom, " ", ""), "-", ""), "\'", "") LIKE CONCAT("%", {?}, "%")';
+ if ($promo) {
+ if (preg_match('/^[0-9]{2}$/', $promo)) {
+ $where .= 'AND MOD(promo, 100) = {?}';
+ } elseif (preg_match('/^[0-9]{4}$/', $promo)) {
+ $where .= 'AND promo = {?}';
+ }
+ }
+ $sql = "SELECT user_id, nom, prenom, promo
+ FROM auth_user_md5
+ WHERE $where AND perms = 'pending'
+ ORDER BY promo, nom, prenom";
+ if ($iterator) {
+ return XDB::iterator($sql, $nom, $prenom, $promo);
+ } else {
+ $res = XDB::query($sql, $nom, $prenom, $promo);
+ return $res->fetchAllAssoc();
+ }
}
+
// }}}
// {{{ function get_user_details_pro()
@@ -208,8 +275,8 @@ function get_user_details_pro($uid, $view = 'private')
{
$sql = "SELECT e.entreprise, s.label as secteur , ss.label as sous_secteur , f.fonction_fr as fonction,
e.poste, e.adr1, e.adr2, e.adr3, e.postcode, e.city, e.entrid,
- gp.pays AS countrytxt, gr.name AS region, e.tel, e.fax, e.mobile, e.entrid,
- e.pub, e.adr_pub, e.tel_pub, e.email, e.email_pub, e.web
+ gp.pays AS countrytxt, gr.name AS region, e.entrid,
+ e.pub, e.adr_pub, e.email, e.email_pub, e.web
FROM entreprises AS e
LEFT JOIN emploi_secteur AS s ON(e.secteur = s.id)
LEFT JOIN emploi_ss_secteur AS ss ON(e.ss_secteur = ss.id AND e.secteur = ss.secteur)
@@ -243,16 +310,18 @@ function get_user_details_pro($uid, $view = 'private')
$all_pro[$i]['region'] = '';
}
}
- if (!has_user_right($pro['tel_pub'], $view)) {
- // if no tel was defined, then the viewer will be able to write it
- if ($pro['tel'] == '' &&
- $pro['fax'] == '' &&
- $pro['mobile'] == '') {
- $all_pro[$i]['tel_pub'] = $view;
- } else {
- $all_pro[$i]['tel'] = '';
- $all_pro[$i]['fax'] = '';
- $all_pro[$i]['mobile'] = '';
+ $sql = "SELECT pub AS tel_pub, tel_type, display_tel AS tel, comment
+ FROM profile_phones AS t
+ WHERE uid = {?} AND link_type = 'pro' AND link_id = {?}
+ ORDER BY link_id, tel_type DESC, tel_id";
+ $restel = XDB::iterator($sql, $uid, $pro['entrid']);
+ while ($nexttel = $restel->next()) {
+ if (has_user_right($nexttel['tel_pub'], $view)) {
+ if (!isset($all_pro[$i]['tels'])) {
+ $all_pro[$i]['tels'] = array($nexttel);
+ } else {
+ $all_pro[$i]['tels'][] = $nexttel;
+ }
}
}
if (!has_user_right($pro['email_pub'], $view)) {
@@ -272,9 +341,7 @@ function get_user_details_pro($uid, $view = 'private')
$all_pro[$i]['fonction'] == '' &&
$all_pro[$i]['secteur'] == '' &&
$all_pro[$i]['poste'] == '' &&
- $all_pro[$i]['tel'] == '' &&
- $all_pro[$i]['fax'] == '' &&
- $all_pro[$i]['mobile'] == '' &&
+ (!isset($all_pro[$i]['tels'])) &&
$all_pro[$i]['email'] == '')
unset($all_pro[$i]);
}
@@ -291,7 +358,7 @@ function get_user_details_adr($uid, $view = 'private') {
gp.pays AS countrytxt,a.region, a.regiontxt,
FIND_IN_SET('active', a.statut) AS active, a.adrid,
FIND_IN_SET('res-secondaire', a.statut) AS secondaire,
- a.pub, gp.display
+ a.pub, gp.display, a.comment
FROM adresses AS a
LEFT JOIN geoloc_pays AS gp ON (gp.a2=a.country)
WHERE uid= {?} AND NOT FIND_IN_SET('pro',a.statut)
@@ -305,19 +372,18 @@ function get_user_details_adr($uid, $view = 'private') {
else
$adrid_index[$adr['adrid']] = $i;
}
-
- $sql = "SELECT t.adrid, t.tel_pub, t.tel_type, t.tel, t.telid
- FROM tels AS t
- INNER JOIN adresses AS a ON (a.uid = t.uid) AND (a.adrid = t.adrid)
- WHERE t.uid = {?} AND NOT FIND_IN_SET('pro',a.statut)
- ORDER BY t.adrid, t.tel_type DESC, t.telid";
+
+ $sql = "SELECT link_id AS adrid, pub AS tel_pub, tel_type, display_tel AS tel, tel_id AS telid, comment
+ FROM profile_phones AS t
+ WHERE uid = {?} AND link_type = 'address'
+ ORDER BY link_id, tel_type DESC, tel_id";
$restel = XDB::iterator($sql, $uid);
while ($nexttel = $restel->next()) {
if (has_user_right($nexttel['tel_pub'], $view)) {
$adrid = $nexttel['adrid'];
unset($nexttel['adrid']);
if (isset($adrid_index[$adrid])) {
- if (!isset($all_adr[$adrid_index[$adrid]]['tels']))
+ if (!isset($all_adr[$adrid_index[$adrid]]['tels']))
$all_adr[$adrid_index[$adrid]]['tels'] = array($nexttel);
else
$all_adr[$adrid_index[$adrid]]['tels'][] = $nexttel;
@@ -334,8 +400,8 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
{
$reqsql = "SELECT u.user_id, u.promo, u.promo_sortie, u.prenom, u.nom, u.nom_usage, u.date, u.cv,
u.perms IN ('admin','user','disabled') AS inscrit, FIND_IN_SET('femme', u.flags) AS sexe, u.deces != 0 AS dcd, u.deces,
- q.profile_nick AS nickname, q.profile_from_ax, q.profile_mobile AS mobile, q.profile_web AS web, q.profile_freetext AS freetext,
- q.profile_mobile_pub AS mobile_pub, q.profile_web_pub AS web_pub, q.profile_freetext_pub AS freetext_pub,
+ q.profile_nick AS nickname, q.profile_from_ax, q.profile_freetext AS freetext,
+ q.profile_freetext_pub AS freetext_pub,
q.profile_medals_pub AS medals_pub,
IF(gp.nat='',gp.pays,gp.nat) AS nationalite, gp.a2 AS iso3166,
a.alias AS forlife, a2.alias AS bestalias,
@@ -343,7 +409,8 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
s.text AS section, p.x, p.y, p.pub AS photo_pub,
u.matricule_ax,
m.expertise != '' AS is_referent,
- COUNT(e.email) > 0 AS actif
+ (COUNT(e.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 0) AS actif,
+ nd.display AS name_display, nd.tooltip AS name_tooltip
FROM auth_user_md5 AS u
INNER JOIN auth_user_quick AS q USING(user_id)
INNER JOIN aliases AS a ON (u.user_id=a.id AND a.type='a_vie')
@@ -351,9 +418,10 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
LEFT JOIN contacts AS c ON (c.uid = {?} and c.contact = u.user_id)
LEFT JOIN geoloc_pays AS gp ON (gp.a2 = u.nationalite)
INNER JOIN sections AS s ON (s.id = u.section)
- LEFT JOIN photo AS p ON (p.uid = u.user_id)
+ LEFT JOIN photo AS p ON (p.uid = u.user_id)
LEFT JOIN mentor AS m ON (m.uid = u.user_id)
LEFT JOIN emails AS e ON (e.uid = u.user_id AND e.flags='active')
+ INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id)
WHERE a.alias = {?}
GROUP BY u.user_id";
$res = XDB::query($reqsql, $from_uid, $login);
@@ -366,20 +434,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
$user['nickname'] = '';
$user['section'] = '';
}
- // hide mobile
- if (!has_user_right($user['mobile_pub'], $view)) {
- if ($user['mobile'] == '')
- $user['mobile_pub'] = $view;
- else
- $user['mobile'] = '';
- }
- // hide web
- if (!has_user_right($user['web_pub'], $view)) {
- if ($user['web'] == '')
- $user['web_pub'] = $view;
- else
- $user['web'] = '';
- }
+
// hide freetext
if (!has_user_right($user['freetext_pub'], $view)) {
if ($user['freetext'] == '')
@@ -388,6 +443,21 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
$user['freetext'] = '';
}
+ $sql = "SELECT pub AS tel_pub, tel_type, display_tel AS tel, comment
+ FROM profile_phones AS t
+ WHERE uid = {?} AND link_type = 'user'
+ ORDER BY tel_type DESC, tel_id";
+ $restel = XDB::iterator($sql, $uid);
+ while ($nexttel = $restel->next()) {
+ if (has_user_right($nexttel['tel_pub'], $view)) {
+ if (!isset($user['tels'])) {
+ $user['tels'] = array($nexttel);
+ } else {
+ $user['tels'][] = $nexttel;
+ }
+ }
+ }
+
$user['adr_pro'] = get_user_details_pro($uid, $view);
$user['adr'] = get_user_details_adr($uid, $view);
@@ -399,17 +469,21 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
$res = XDB::query($sql, $uid);
$user['binets'] = $res->fetchColumn();
$user['binets_join'] = join(', ', $user['binets']);
-
- $res = XDB::iterRow("SELECT text, url
- FROM groupesx_ins
- LEFT JOIN groupesx_def ON groupesx_ins.gid = groupesx_def.id
- WHERE guid = {?}", $uid);
+
+ $res = XDB::iterRow("SELECT a.diminutif, a.nom, a.site
+ FROM groupex.asso AS a
+ LEFT JOIN groupex.membres AS m ON (m.asso_id = a.id)
+ WHERE m.uid = {?} AND (a.cat = 'GroupesX' OR a.cat = 'Institutions')
+ AND pub = 'public'", $uid);
$user['gpxs'] = Array();
$user['gpxs_name'] = Array();
- while (list($gxt, $gxu) = $res->next()) {
- $user['gpxs'][] = $gxu ? "$gxt" : $gxt;
+ while (list($gxd, $gxt, $gxu) = $res->next()) {
+ if (!$gxu) {
+ $gxu = 'http://www.polytechnique.net/' . $gxd;
+ }
+ $user['gpxs'][] = '$gxd";
$user['gpxs_name'][] = $gxt;
- }
+ }
$user['gpxs_join'] = join(', ', $user['gpxs']);
}
@@ -418,7 +492,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
INNER JOIN applis_def ON applis_def.id = applis_ins.aid
WHERE uid={?}
ORDER BY ordre", $uid);
-
+
$user['applis_fmt'] = Array();
$user['formation'] = Array();
while (list($txt, $url, $type) = $res->next()) {
@@ -429,7 +503,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
$user['applis_join'] = join(', ', $user['applis_fmt']);
if (has_user_right($user['medals_pub'], $view)) {
- $res = XDB::iterator("SELECT m.id, m.text AS medal, m.type, m.img, s.gid, g.text AS grade
+ $res = XDB::iterator("SELECT m.id, m.text AS medal, m.type, s.gid, g.text AS grade
FROM profile_medals_sub AS s
INNER JOIN profile_medals AS m ON ( s.mid = m.id )
LEFT JOIN profile_medals_grades AS g ON ( s.mid = g.mid AND s.gid = g.gid )
@@ -440,6 +514,19 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
}
}
+ $user['networking'] = Array();
+ $res = XDB::iterator("SELECT n.address, n.pub, m.network_type AS type, m.name, m.filter, m.link
+ FROM profile_networking AS n
+ INNER JOIN profile_networking_enum AS m ON (n.network_type = m.network_type)
+ WHERE n.uid = {?}", $uid);
+ while($network = $res->next())
+ {
+ if (has_user_right($network['pub'], $view)) {
+ $network['link'] = str_replace('%s', $network['address'], $network['link']);
+ $user['networking'][] = $network;
+ }
+ }
+
return $user;
}
// }}}
@@ -456,7 +543,7 @@ function add_user_address($uid, $adrid, $adr) {
if (isset($adr['tels']) && is_array($adr['tels'])) {
$telid = 0;
foreach ($adr['tels'] as $tel) if ($tel['tel']) {
- add_user_tel($uid, $adrid, $telid, $tel);
+ add_user_tel($uid, 'address', $adrid, $telid, $tel);
$telid ++;
}
}
@@ -466,7 +553,7 @@ function add_user_address($uid, $adrid, $adr) {
function update_user_address($uid, $adrid, $adr) {
// update address
XDB::execute(
- "UPDATE adresses AS a LEFT JOIN geoloc_pays AS gp ON (gp.pays = {?})
+ "UPDATE adresses AS a LEFT JOIN geoloc_pays AS gp ON (gp.pays = {?})
SET `adr1` = {?}, `adr2` = {?}, `adr3` = {?},
`postcode` = {?}, `city` = {?}, a.`country` = gp.a2, `datemaj` = NOW(), `pub` = {?}
WHERE adrid = {?} AND uid = {?}",
@@ -474,17 +561,17 @@ function update_user_address($uid, $adrid, $adr) {
$adr['adr1'], $adr['adr2'], $adr['adr3'],
$adr['postcode'], $adr['city'], $adr['pub'], $adrid, $uid);
if (isset($adr['tels']) && is_array($adr['tels'])) {
- $res = XDB::query("SELECT telid FROM tels WHERE uid = {?} AND adrid = {?} ORDER BY telid", $uid, $adrid);
+ $res = XDB::query("SELECT tel_id FROM profile_phones WHERE uid = {?} AND link_type = 'address' AND link_id = {?} ORDER BY tel_id", $uid, $adrid);
$telids = $res->fetchColumn();
foreach ($adr['tels'] as $tel) {
if (isset($tel['telid']) && isset($tel['remove']) && $tel['remove']) {
- remove_user_tel($uid, $adrid, $tel['telid']);
+ remove_user_tel($uid, 'address', $adrid, $tel['telid']);
if (isset($telids[$tel['telid']])) unset($telids[$tel['telid']]);
} else if (isset($tel['telid'])) {
- update_user_tel($uid, $adrid, $tel['telid'], $tel);
+ update_user_tel($uid, 'address', $adrid, $tel['telid'], $tel);
} else {
for ($telid = 0; isset($telids[$telid]) && ($telids[$telid] == $telid); $telid++);
- add_user_tel($uid, $adrid, $telid, $tel);
+ add_user_tel($uid, 'address', $adrid, $telid, $tel);
}
}
}
@@ -493,36 +580,41 @@ function update_user_address($uid, $adrid, $adr) {
// {{{ function remove_user_address()
function remove_user_address($uid, $adrid) {
XDB::execute("DELETE FROM adresses WHERE adrid = {?} AND uid = {?}", $adrid, $uid);
- XDB::execute("DELETE FROM tels WHERE adrid = {?} AND uid = {?}", $adrid, $uid);
+ XDB::execute("DELETE FROM profile_phones WHERE link_id = {?} AND uid = {?} AND link_type = 'address'", $adrid, $uid);
}
// }}}
// {{{ function add_user_tel()
-function add_user_tel($uid, $adrid, $telid, $tel) {
- XDB::execute(
- "INSERT INTO tels SET uid = {?}, adrid = {?}, telid = {?}, tel = {?}, tel_type = {?}, tel_pub = {?}",
- $uid, $adrid, $telid, $tel['tel'], $tel['tel_type'], $tel['tel_pub']);
+function add_user_tel($uid, $link_type, $link_id, $telid, $tel) {
+ require('profil.func.inc.php');
+ $fmt_phone = format_phone_number($tel['tel']);
+ $disp_phone = format_display_number($fmt_phone, $error);
+ XDB::execute("INSERT INTO profile_phones (uid, link_type, link_id, tel_id, tel_type, search_tel, display_tel, pub)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})",
+ $uid, $link_type, $link_id, $telid, $tel['tel_type'], $fmt_phone, $disp_phone, $tel['tel_pub']);
}
// }}}
// {{{ function update_user_tel()
-function update_user_tel($uid, $adrid, $telid, $tel) {
- XDB::execute(
- "UPDATE tels SET tel = {?}, tel_type = {?}, tel_pub = {?}
- WHERE telid = {?} AND adrid = {?} AND uid = {?}",
- $tel['tel'], $tel['tel_type'], $tel['tel_pub'],
- $telid, $adrid, $uid);
+function update_user_tel($uid, $link_type, $link_id, $telid, $tel) {
+ require('profil.func.inc.php');
+ $fmt_phone = format_phone_number($tel['tel']);
+ $disp_phone = format_display_number($fmt_phone, $error);
+ XDB::execute("UPDATE profile_phones SET search_tel = {?}, display_tel = {?}, tel_type = {?}, pub = {?}
+ WHERE link_type = {?} AND tel_id = {?} AND link_id = {?} AND uid = {?}",
+ $fmt_phone, $disp_phone, $tel['tel_type'], $tel['tel_pub'],
+ $link_type, $telid, $link_id, $uid);
}
// }}}
// {{{ function remove_user_tel()
-function remove_user_tel($uid, $adrid, $telid) {
- XDB::execute("DELETE FROM tels WHERE telid = {?} AND adrid = {?} AND uid = {?}",
- $telid, $adrid, $uid);
+function remove_user_tel($uid, $link_type, $link_id, $telid) {
+ XDB::execute("DELETE FROM profile_phones WHERE tel_id = {?} AND link_id = {?} AND uid = {?} AND link_type = {?}",
+ $telid, $link_id, $uid, $link_type);
}
// }}}
// {{{ function add_user_pro()
function add_user_pro($uid, $entrid, $pro) {
XDB::execute(
"INSERT INTO entreprises (`uid`, `entrid`, `entreprise`, `poste`, `secteur`, `ss_secteur`, `fonction`,
- `adr1`, `adr2`, `adr3`, `postcode`, `city`, `country`, `region`, `tel`, `fax`, `mobile`, `email`, `web`, `pub`, `adr_pub`, `tel_pub`, `email_pub`)
+ `adr1`, `adr2`, `adr3`, `postcode`, `city`, `country`, `region`, `email`, `web`, `pub`, `adr_pub`, `email_pub`)
SELECT u.user_id, {?}, {?}, {?}, s.id, ss.id, f.id,
{?}, {?}, {?}, {?}, {?}, gp.a2, gr.region, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}
FROM auth_user_md5 AS u
@@ -534,10 +626,19 @@ function add_user_pro($uid, $entrid, $pro) {
WHERE u.user_id = {?}
LIMIT 1",
$entrid, $pro['entreprise'], $pro['poste'],
- $pro['adr1'], $pro['adr2'], $pro['adr3'], $pro['postcode'], $pro['city'], $pro['tel'], $pro['fax'], $pro['mobile'], $pro['email'], $pro['web'], $pro['pub'], $pro['adr_pub'], $pro['tel_pub'], $pro['email_pub'],
+ $pro['adr1'], $pro['adr2'], $pro['adr3'], $pro['postcode'], $pro['city'], $pro['email'], $pro['web'], $pro['pub'], $pro['adr_pub'], $pro['email_pub'],
$pro['secteur'], $pro['sous_secteur'], $pro['fonction'], $pro['fonction'],
$pro['countrytxt'], $pro['countrytxt'], $pro['region'],
$uid);
+ if (isset($pro['tels']) && is_array($pro['tels'])) {
+ $telid = 0;
+ foreach ($pro['tels'] as $tel) {
+ if ($pro['tel']) {
+ add_user_tel($uid, 'pro', $entrid, $telid, $tel);
+ $telid ++;
+ }
+ }
+ }
}
// }}}
// {{{ function update_user_pro()
@@ -546,7 +647,7 @@ function update_user_pro($uid, $entrid, $pro) {
$set = "";
$args_join = array();
$args_set = array();
-
+
$join .= "LEFT JOIN emploi_secteur AS s ON(s.label LIKE {?})
LEFT JOIN emploi_ss_secteur AS ss ON(s.id = ss.secteur AND ss.label LIKE {?})
LEFT JOIN fonctions_def AS f ON(f.fonction_fr LIKE {?} OR f.fonction_en LIKE {?})";
@@ -559,7 +660,7 @@ function update_user_pro($uid, $entrid, $pro) {
$args_set[] = $pro['poste'];
$args_set[] = $pro['web'];
$args_set[] = $pro['pub'];
-
+
if (isset($pro['adr1'])) {
$join .= "LEFT JOIN geoloc_pays AS gp ON (gp.country LIKE {?} OR gp.pays LIKE {?})
LEFT JOIN geoloc_region AS gr ON (gr.a2 = gp.a2 AND gr.name LIKE {?})";
@@ -574,31 +675,42 @@ function update_user_pro($uid, $entrid, $pro) {
$args_set[] = $pro['city'];
$args_set[] = $pro['adr_pub'];
}
-
- if (isset($pro['tel'])) {
- $set .= ", e.`tel` = {?}, e.`fax` = {?}, e.`mobile` = {?}, e.tel_pub = {?}";
- $args_set[] = $pro['tel'];
- $args_set[] = $pro['fax'];
- $args_set[] = $pro['mobile'];
- $args_set[] = $pro['tel_pub'];
- }
+
if (isset($pro['email'])) {
$set .= ", e.`email` = {?}, e.`email_pub` = {?}";
$args_set[] = $pro['email'];
$args_set[] = $pro['email_pub'];
- }
+ }
$query = "UPDATE entreprises AS e ".$join." SET ".substr($set,1)." WHERE e.uid = {?} AND e.entrid = {?}";
$args_where = array($uid, $entrid);
$args = array_merge(array($query), $args_join, $args_set, $args_where);
call_user_func_array(array('XDB', 'execute'), $args);
+
+
+ if (isset($pro['tels']) && is_array($pro['tels'])) {
+ $res = XDB::query("SELECT tel_id FROM profile_phones WHERE uid = {?} AND link_type = 'pro' AND link_id = {?} ORDER BY tel_id", $uid, $entrid);
+ $telids = $res->fetchColumn();
+ foreach ($pro['tels'] as $tel) {
+ if (isset($tel['telid']) && isset($tel['remove']) && $tel['remove']) {
+ remove_user_tel($uid, 'pro', $entrid, $tel['telid']);
+ if (isset($telids[$tel['telid']])) unset($telids[$tel['telid']]);
+ } else if (isset($tel['telid'])) {
+ update_user_tel($uid, 'pro', $entrid, $tel['telid'], $tel);
+ } else {
+ for ($telid = 0; isset($telids[$telid]) && ($telids[$telid] == $telid); $telid++);
+ add_user_tel($uid, 'pro', $entrid, $telid, $tel);
+ }
+ }
+ }
}
// }}}
// {{{ function remove_user_pro()
function remove_user_pro($uid, $entrid) {
XDB::execute("DELETE FROM entreprises WHERE entrid = {?} AND uid = {?}", $entrid, $uid);
+ XDB::execute("DELETE FROM profile_phones WHERE link_id = {?} AND uid = {?} AND link_type = 'pro'", $entrid, $uid);
}
// }}}
-// {{{ function set_user_details()
+// {{{ function set_user_details_addresses()
function set_user_details_addresses($uid, $adrs) {
$res = XDB::query("SELECT adrid FROM adresses WHERE uid = {?} AND adrid >= 1 ORDER BY adrid", $uid);
$adrids = $res->fetchColumn();
@@ -643,9 +755,6 @@ function set_user_details($uid, $details) {
if (isset($details['nom_usage'])) {
XDB::execute("UPDATE auth_user_md5 SET nom_usage = {?} WHERE user_id = {?}", strtoupper($details['nom_usage']), $uid);
}
- if (isset($details['mobile'])) {
- XDB::execute("UPDATE auth_user_quick SET profile_mobile = {?} WHERE user_id = {?}", $details['mobile'], $uid);
- }
if (isset($details['nationalite'])) {
XDB::execute(
"UPDATE auth_user_md5 AS u
@@ -664,7 +773,7 @@ function set_user_details($uid, $details) {
XDB::execute(
"INSERT INTO binets_ins (`user_id`, `binet_id`)
SELECT {?}, id FROM binets_def WHERE text = {?} LIMIT 1",
- $uid, $binet);
+ $uid, $binet);
}
if (isset($details['gpxs']) && is_array($details['gpxs'])) {
XDB::execute("DELETE FROM groupesx_ins WHERE user_id = {?}", $uid);
@@ -674,15 +783,32 @@ function set_user_details($uid, $details) {
"INSERT INTO groupesx_ins (`user_id`, `binet_id`)
SELECT {?}, id FROM groupesx_def WHERE text = {?} LIMIT 1",
$uid, $groupex);
- }
+ }
}
+ if (isset($details['tels']) && is_array($details['tels'])) {
+ $res = XDB::query("SELECT tel_id FROM profile_phones WHERE uid = {?} AND link_type = 'user' ORDER BY tel_id", $uid);
+ $telids = $res->fetchColumn();
+ foreach ($details['tels'] as $tel) {
+ if (isset($tel['telid']) && isset($tel['remove']) && $tel['remove']) {
+ remove_user_tel($uid, 'user', 0, $tel['telid']);
+ if (isset($telids[$tel['telid']])) unset($telids[$tel['telid']]);
+ } else if (isset($tel['telid'])) {
+ update_user_tel($uid, 'user', 0, $tel['telid'], $tel);
+ } else {
+ for ($telid = 0; isset($telids[$telid]) && ($telids[$telid] == $telid); $telid++);
+ add_user_tel($uid, 'user', 0, $telid, $tel);
+ }
+ }
+ }
+
// applis
// medals
}
// }}}
// {{{ function _user_reindex
-function _user_reindex($uid, $keys, $muls) {
+function _user_reindex($uid, $keys, $muls, $pubs)
+{
foreach ($keys as $i => $key) {
if ($key == '') {
continue;
@@ -693,10 +819,29 @@ function _user_reindex($uid, $keys, $muls) {
while ($toks) {
$token = strtolower(replace_accent(array_pop($toks) . $token));
$score = ($toks ? 0 : 10 + $first) * $muls[$i];
- mysql_query("REPLACE INTO search_name (token, uid, score) VALUES('$token',$uid,$score)");
+ XDB::execute("REPLACE INTO search_name (token, uid, soundex, score, flags)
+ VALUES ({?}, {?}, {?}, {?}, {?})",
+ $token, $uid, soundex_fr($token), $score, $pubs[$i] ? 'public' : '');
$first = 0;
}
}
+ $res = XDB::query("SELECT nom_ini, nom, nom_usage, prenom_ini, prenom, promo, matricule
+ FROM auth_user_md5
+ WHERE user_id = {?}", $uid);
+ if (!$res->numRows()) {
+ unset($res);
+ return;
+ }
+ $array = $res->fetchOneRow();
+ $promo = intval(array_pop($array));
+ $mat = array_shift($array);
+ array_walk($array, 'soundex_fr');
+ XDB::execute("REPLACE INTO recherche_soundex
+ SET matricule = {?}, nom1_soundex = {?}, nom2_soundex= {?}, nom3_soundex = {?},
+ prenom1_soundex = {?}, prenom2_soundex= {?}, promo = {?}",
+ $mat, $array[0], $array[1], $array[2], $array[3], $array[4], $promo);
+ unset($res);
+ unset($array);
}
// }}}
@@ -705,13 +850,21 @@ function _user_reindex($uid, $keys, $muls) {
function user_reindex($uid) {
XDB::execute("DELETE FROM search_name WHERE uid={?}", $uid);
$res = XDB::query("SELECT prenom, nom, nom_usage, profile_nick FROM auth_user_md5 INNER JOIN auth_user_quick USING(user_id) WHERE auth_user_md5.user_id = {?}", $uid);
- _user_reindex($uid, $res->fetchOneRow(), array(1,1,1,0.2));
+ if ($res->numRows()) {
+ _user_reindex($uid, $res->fetchOneRow(), array(1,1,1,0.2), array(true, true, true, false));
+ } else { // not in auth_user_quick => still "pending"
+ $res = XDB::query("SELECT prenom, nom, nom_usage FROM auth_user_md5 WHERE auth_user_md5.user_id = {?}", $uid);
+ if ($res->numRows()) {
+ _user_reindex($uid, $res->fetchOneRow(), array(1,1,1), array(true, true, true));
+ }
+ }
}
// }}}
// {{{ function set_new_usage()
-function set_new_usage($uid, $usage, $alias=false) {
+function set_new_usage($uid, $usage, $alias=false)
+{
XDB::execute("UPDATE auth_user_md5 set nom_usage={?} WHERE user_id={?}",$usage ,$uid);
XDB::execute("DELETE FROM aliases WHERE FIND_IN_SET('usage',flags) AND id={?}", $uid);
if ($alias && $usage) {
@@ -720,26 +873,27 @@ function set_new_usage($uid, $usage, $alias=false) {
$alias, $uid);
}
$r = XDB::query("SELECT alias FROM aliases WHERE FIND_IN_SET('bestalias', flags) AND id = {?}", $uid);
- if ($r->fetchOneCell() == "") {
+ if ($r->numRows() == "") {
XDB::execute("UPDATE aliases SET flags = 1 | flags WHERE id = {?} LIMIT 1", $uid);
+ $r = XDB::query("SELECT alias FROM aliases WHERE FIND_IN_SET('bestalias', flags) AND id = {?}", $uid);
}
- require_once 'user.func.inc.php';
user_reindex($uid);
+ return $r->fetchOneCell();
}
// }}}
// {{{ function get_X_mat
function get_X_mat($ourmat)
{
- if (!preg_match('/^[0-9]{8}$/', $ourmat)) {
+ if (!preg_match('/^[0-9]{8}$/', $ourmat)) {
// le matricule de notre base doit comporter 8 chiffres
return 0;
- }
-
+ }
+
$year = intval(substr($ourmat, 0, 4));
$rang = intval(substr($ourmat, 5, 3));
if ($year < 1996) {
- return;
+ return;
} elseif ($year < 2000) {
$year = intval(substr(1900 - $year, 1, 3));
return sprintf('%02u0%03u', $year, $rang);
@@ -747,8 +901,8 @@ function get_X_mat($ourmat)
$year = intval(substr(1900 - $year, 1, 3));
return sprintf('%03u%03u', $year, $rang);
}
-}
-
+}
+
// }}}