Forgotten files in last commit

[platal.git] / include / user.func.inc.php

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index f481ff1..9d23e74 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -36,27 +36,38 @@ function user_clear_all_subs($user_id, $really_del=true)
     $res   = XDB::query("SELECT alias FROM aliases WHERE type='a_vie' AND id={?}", $uid);
     $alias = $res->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);
@@ -95,7 +106,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={?})
@@ -658,7 +669,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('/<a href="[^"]*">([^<]+)</a>/', $groupex, $a)) $groupex = $a[1];
+            if (preg_match('/<a href="[^"]*">([^<]+)</a>/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",
@@ -682,7 +693,7 @@ 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, score) VALUES({?}, {?}, {?})", $token, $uid, $score);
             $first = 0;
         }
     }
@@ -741,5 +752,5 @@ function get_X_mat($ourmat)
 // }}}
 
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>