X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuser.func.inc.php;h=e1b3b884328455db856e0ffc58177c5d1d408ff3;hb=0baf0741b59974981aced47c7196a7a319b7f3e8;hp=8cd895405e2a027bc7c59f23df8641340afc6547;hpb=c53b596408c72a60815ff7f35b10c8c082ffae42;p=platal.git
diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 8cd8954..e1b3b88 100644
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -1,6 +1,6 @@
fetchOneCell();
+ $tables_to_clear = array('uid' => array('competences_ins', 'entreprises', 'langues_ins', 'mentor_pays',
+ 'mentor_secteurs', 'mentor', 'perte_pass', 'watch_sub'),
+ 'user_id' => array('requests', 'user_changes'));
+
if ($really_del) {
- XDB::execute("DELETE FROM emails WHERE uid={?}", $uid);
- XDB::execute("DELETE FROM newsletter_ins WHERE user_id={?}", $uid);
+ array_push($tables_to_clear['uid'], 'emails', 'groupex.membres', 'contacts', 'adresses', 'tels',
+ '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['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 = ''
+ WHERE user_id = {?}", $uid);
+ XDB::execute("DELETE virtual.* FROM virtual INNER JOIN virtual_redirect AS r USING(vid) WHERE redirect = {?}",
+ $alias.'@'.$globals->mail->domain);
+ XDB::execute("DELETE virtual.* FROM virtual INNER JOIN virtual_redirect AS r USING(vid) WHERE redirect = {?}",
+ $alias.'@'.$globals->mail->domain2);
+ } else {
+ XDB::execute("UPDATE auth_user_md5 SET password='',smtppass='' WHERE user_id={?}", $uid);
+ XDB::execute("UPDATE auth_user_quick SET watch_flags='' WHERE user_id={?}", $uid);
}
XDB::execute("DELETE FROM virtual_redirect WHERE redirect = {?}", $alias.'@'.$globals->mail->domain);
XDB::execute("DELETE FROM virtual_redirect WHERE redirect = {?}", $alias.'@'.$globals->mail->domain2);
- XDB::execute("UPDATE auth_user_md5 SET password='',smtppass='' WHERE user_id={?}", $uid);
- XDB::execute("UPDATE auth_user_quick SET watch_flags='' WHERE user_id={?}", $uid);
-
- XDB::execute("DELETE FROM competences_ins WHERE uid={?}", $uid);
- XDB::execute("DELETE FROM entreprises WHERE uid={?}", $uid);
- XDB::execute("DELETE FROM langues_ins WHERE uid={?}", $uid);
- XDB::execute("DELETE FROM mentor_pays WHERE uid={?}", $uid);
- XDB::execute("DELETE FROM mentor_secteurs WHERE uid={?}", $uid);
- XDB::execute("DELETE FROM mentor WHERE uid={?}", $uid);
- XDB::execute("DELETE FROM perte_pass WHERE uid={?}", $uid);
- XDB::execute("DELETE FROM requests WHERE user_id={?}", $uid);
- XDB::execute("DELETE FROM user_changes WHERE user_id={?}", $uid);
- XDB::execute("DELETE FROM watch_sub WHERE uid={?}", $uid);
+ foreach ($tables_to_clear as $key=>&$tables) {
+ foreach ($tables as $table) {
+ XDB::execute("DELETE FROM $table WHERE $key={?}", $uid);
+ }
+ }
$mmlist = new MMList(S::v('uid'), S::v('password'));
$mmlist->kill($alias, $really_del);
@@ -65,7 +76,16 @@ function user_clear_all_subs($user_id, $really_del=true)
// }}}
// {{{ function get_user_login()
-function get_user_login($data, $get_forlife = false) {
+// 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 get_user_login($data, $get_forlife = false, $callback = '_default_user_callback')
+{
global $globals, $page;
if (is_numeric($data)) {
@@ -73,7 +93,7 @@ function get_user_login($data, $get_forlife = false) {
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;
}
}
@@ -95,7 +115,7 @@ function get_user_login($data, $get_forlife = false) {
return $get_forlife ? $res->fetchOneCell() : $mbox;
}
- if (preg_match('/^(.*)\.([0-9]{4})$/', $mbox, $matches)) {
+ 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={?})
@@ -105,7 +125,7 @@ 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) {
@@ -117,11 +137,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
@@ -130,7 +149,7 @@ 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:
@@ -152,14 +171,15 @@ function get_user_login($data, $get_forlife = 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;
@@ -168,7 +188,7 @@ function get_users_forlife_list($members, $strict = false)
if ($members) {
$list = array();
foreach ($members as $i => $alias) {
- if (($login = get_user_forlife($alias)) !== false) {
+ if (($login = get_user_forlife($alias, $callback)) !== false) {
$list[$i] = $login;
} else if(!$strict) {
$list[$i] = $alias;
@@ -191,6 +211,38 @@ function has_user_right($pub, $view = 'private') {
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
+ 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()
function get_user_details_pro($uid, $view = 'private')
@@ -273,6 +325,8 @@ function get_user_details_pro($uid, $view = 'private')
}
// }}}
+// {{{ function get_user_details_adr()
+
function get_user_details_adr($uid, $view = 'private') {
$sql = "SELECT a.adrid, a.adr1,a.adr2,a.adr3,a.postcode,a.city,
gp.pays AS countrytxt,a.region, a.regiontxt,
@@ -313,6 +367,8 @@ function get_user_details_adr($uid, $view = 'private') {
}
return $all_adr;
}
+
+// }}}
// {{{ function get_user_details()
function &get_user_details($login, $from_uid = '', $view = 'private')
@@ -654,7 +710,7 @@ function set_user_details($uid, $details) {
if (isset($details['gpxs']) && is_array($details['gpxs'])) {
XDB::execute("DELETE FROM groupesx_ins WHERE user_id = {?}", $uid);
foreach ($details['gpxs'] as $groupex) {
- if (preg_match('/([^<]+)/', $groupex, $a)) $groupex = $a[1];
+ if (preg_match('/([^<]+)/u', $groupex, $a)) $groupex = $a[1];
XDB::execute(
"INSERT INTO groupesx_ins (`user_id`, `binet_id`)
SELECT {?}, id FROM groupesx_def WHERE text = {?} LIMIT 1",
@@ -667,7 +723,8 @@ function set_user_details($uid, $details) {
// }}}
// {{{ function _user_reindex
-function _user_reindex($uid, $keys, $muls) {
+function _user_reindex($uid, $keys, $muls)
+{
foreach ($keys as $i => $key) {
if ($key == '') {
continue;
@@ -678,10 +735,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)
+ VALUES ({?}, {?}, {?}, {?})",
+ $token, $uid, soundex_fr($token), $score);
$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);
}
// }}}
@@ -690,12 +766,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));
+ } 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));
+ }
+ }
}
// }}}
+// {{{ 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) {
@@ -704,12 +789,38 @@ 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();
}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+// }}}
+// {{{ function get_X_mat
+function get_X_mat($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;
+ } elseif ($year < 2000) {
+ $year = intval(substr(1900 - $year, 1, 3));
+ return sprintf('%02u0%03u', $year, $rang);
+ } else {
+ $year = intval(substr(1900 - $year, 1, 3));
+ return sprintf('%03u%03u', $year, $rang);
+ }
+}
+
+// }}}
+
+
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>