X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuser.func.inc.php;h=1a07456a936ff7b9f9439d31e9c12bcffb5932a0;hb=f3a7456dbe1cbe78dfe0ccc2e99c299ad97203c5;hp=b515c0ce75e627ce5dcb84401e05db4aa9f34e4b;hpb=787bb3d745141f2f85bd947ad7dd775d2c63f908;p=platal.git
diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index b515c0c..1a07456 100644
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -1,6 +1,6 @@
fetchOneCell();
+ $uid = intval($user_id);
+ $user = User::getSilent($uid);
+ list($alias) = explode('@', $user->forlifeEmail());
$tables_to_clear = array('uid' => array('competences_ins', 'entreprises', 'langues_ins', 'mentor_pays',
'mentor_secteurs', 'mentor', 'perte_pass', 'watch_sub'),
@@ -46,10 +46,9 @@ function user_clear_all_subs($user_id, $really_del=true)
array_push($tables_to_clear['user_id'], 'newsletter_ins', 'auth_user_quick', 'binets_ins');
$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,139 +70,15 @@ function user_clear_all_subs($user_id, $really_del=true)
$mmlist = new MMList(S::v('uid'), S::v('password'));
$mmlist->kill($alias, $really_del);
-}
-
-// }}}
-// {{{ function get_user_login()
-
-// Defaut callback to call when a login is not found
-function _default_user_callback($login)
-{
- global $page;
- $page->trig("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, $page;
-
- 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 {
- call_user_func($callback, $data);
- return false;
- }
- }
-
- $data = trim(strtolower($data));
-
- if (strstr($data, '@')===false) {
- $data = $data.'@'.$globals->mail->domain;
- }
-
- list($mbox, $fqdn) = explode('@', $data);
- if ($fqdn == $globals->mail->domain || $fqdn == $globals->mail->domain2) {
-
- $res = XDB::query("SELECT a.alias
- FROM aliases AS a
- INNER JOIN aliases AS b ON (a.id = b.id AND b.type IN ('alias', 'a_vie') AND b.alias={?})
- WHERE a.type = 'a_vie'", $mbox);
- if ($res->numRows()) {
- return $get_forlife ? $res->fetchOneCell() : $mbox;
- }
-
- if (preg_match('/^(.*)\.([0-9]{4})$/u', $mbox, $matches)) {
- $res = XDB::query("SELECT a.alias
- FROM aliases AS a
- INNER JOIN aliases AS b ON (a.id = b.id AND b.type IN ('alias', 'a_vie') AND b.alias={?})
- INNER JOIN auth_user_md5 AS u ON (a.id = u.user_id AND promo = {?})
- WHERE a.type = 'a_vie'", $matches[1], $matches[2]);
- if ($res->numRows() == 1) {
- return $res->fetchOneCell();
- }
- }
- 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)
- WHERE alias={?}", $mbox.'@'.$globals->mail->alias_dom);
- if ($redir = $res->fetchOneCell()) {
- list($alias) = explode('@', $redir);
- } else {
- call_user_func($callback, $data);
- $alias = false;
- }
- return $alias;
- } else {
- $res = XDB::query("SELECT alias
- FROM aliases AS a
- INNER JOIN emails AS e ON e.uid=a.id
- WHERE e.email={?} AND a.type='a_vie'", $data);
- switch ($i = $res->numRows()) {
- case 0:
- 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));
- } else {
- $res->free();
- }
+ // 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($user);
+ $account->suspend();
}
}
-
- return false;
-}
-
-// }}}
-// {{{ function get_user_forlife()
-
-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, $callback = '_default_user_callback')
-{
- if (!is_array($members)) {
- if (strlen(trim($members)) == 0) {
- return null;
- }
- $members = explode(' ', $members);
- }
- if ($members) {
- $list = array();
- foreach ($members as $i => $alias) {
- if (($login = get_user_forlife($alias, $callback)) !== false) {
- $list[$i] = $login;
- } else if(!$strict) {
- $list[$i] = $alias;
- }
- }
- return $list;
- }
- return null;
}
// }}}
@@ -228,8 +103,10 @@ function get_not_registered_user($login, $iterator = false)
return null;
}
@list($prenom, $nom, $promo) = explode('.', $login);
- $where = 'REPLACE(REPLACE(REPLACE(nom, " ", ""), "-", ""), "\'", "") LIKE CONCAT("%", {?}, "%")
- AND REPLACE(REPLACE(REPLACE(prenom, " ", ""), "-", ""), "\'", "") LIKE CONCAT("%", {?}, "%")';
+ $where = 'REPLACE(REPLACE(REPLACE(nom, " ", ""), "-", ""), "\'", "")
+ LIKE CONCAT("%", REPLACE(REPLACE(REPLACE({?}, " ", ""), "-", ""), "\'", ""), "%")
+ AND REPLACE(REPLACE(REPLACE(prenom, " ", ""), "-", ""), "\'", "")
+ LIKE CONCAT("%", REPLACE(REPLACE(REPLACE({?}, " ", ""), "-", ""), "\'", ""), "%")';
if ($promo) {
if (preg_match('/^[0-9]{2}$/', $promo)) {
$where .= 'AND MOD(promo, 100) = {?}';
@@ -239,7 +116,7 @@ function get_not_registered_user($login, $iterator = false)
}
$sql = "SELECT user_id, nom, prenom, promo
FROM auth_user_md5
- WHERE $where
+ WHERE $where AND perms = 'pending'
ORDER BY promo, nom, prenom";
if ($iterator) {
return XDB::iterator($sql, $nom, $prenom, $promo);
@@ -339,6 +216,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,
+ FIND_IN_SET('courrier', a.statut) AS courier,
a.pub, gp.display
FROM adresses AS a
LEFT JOIN geoloc_pays AS gp ON (gp.a2=a.country)
@@ -391,7 +269,7 @@ 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
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')
@@ -448,14 +326,18 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
$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']);
@@ -477,7 +359,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 )
@@ -546,9 +428,11 @@ function remove_user_address($uid, $adrid) {
// }}}
// {{{ 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']);
+ $tel['tel_type'] = ($tel['tel_type'] ? $tel['tel_type'] : '');
+ 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 update_user_tel()
@@ -648,18 +532,17 @@ function remove_user_pro($uid, $entrid) {
// }}}
// {{{ function set_user_details()
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();
+ $req = XDB::query('SELECT MAX(adrid) + 1
+ FROM adresses
+ WHERE uid = {?}', $uid);
+ $adrid = $req->fetchOneCell();
+ if (is_null($adrid)) {
+ $adrid = 0;
+ }
foreach ($adrs as $adr) {
- if (isset($adr['adrid']) && isset($adr['remove']) && $adr['remove']) {
- remove_user_address($uid, $adr['adrid']);
- if (isset($adrids[$adr['adrid']])) unset($adrids[$adr['adrid']]);
- } else if (isset($adr['adrid'])) {
- update_user_address($uid, $adr['adrid'], $adr);
- } else {
- for ($adrid = 1; isset($adrids[$adrid-1]) && ($adrids[$adrid-1] == $adrid); $adrid++);
+ if (!@$adr['remove']) {
add_user_address($uid, $adrid, $adr);
- $adrids[$adrid-1] = $adrid;
+ ++$adrid;
}
}
require_once 'geoloc.inc.php';
@@ -670,17 +553,17 @@ function set_user_details_addresses($uid, $adrs) {
function set_user_details_pro($uid, $pros)
{
- $res = XDB::query("SELECT entrid FROM entreprises WHERE uid = {?} ORDER BY entrid", $uid);
- $entrids = $res->fetchColumn();
+ $req = XDB::query('SELECT MAX(entrid) + 1
+ FROM entreprises
+ WHERE uid = {?}', $uid);
+ $entrid = $req->fetchOneCell();
+ if (is_null($entrid)) {
+ $entrid = 0;
+ }
foreach ($pros as $pro) {
- if (isset($pro['entrid']) && isset($pro['remove']) && $pro['remove']) {
- remove_user_pro($uid, $pro['entrid']);
- if (isset($entrids[$pro['entrid']])) unset($entrids[$pro['entrid']]);
- } else if (isset($pro['entrid'])) {
- update_user_pro($uid, $pro['entrid'], $pro);
- } else {
- for ($entrid = 0; isset($entrids[$entrid]) && ($entrids[$entrid] == $entrid); $entrid++);
+ if (!@$pro['remove']) {
add_user_pro($uid, $entrid, $pro);
+ ++$entrid;
}
}
}
@@ -689,7 +572,7 @@ function set_user_details_pro($uid, $pros)
// {{{ function set_user_details()
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);
+ XDB::execute("UPDATE auth_user_md5 SET nom_usage = {?} WHERE user_id = {?}", mb_strtoupper($details['nom_usage']), $uid);
}
if (isset($details['mobile'])) {
XDB::execute("UPDATE auth_user_quick SET profile_mobile = {?} WHERE user_id = {?}", $details['mobile'], $uid);