Moves getXorgId and getSchoolId to Profile.

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

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 7e98747..33869a6 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -42,7 +42,7 @@ function user_clear_all_subs($user_id, $really_del=true)
                              'user_id' => array('requests', 'user_changes'));
 
     if ($really_del) {
-        array_push($tables_to_clear['uid'], 'emails', 'groupex.membres', 'contacts', 'adresses', 'profile_phones',
+        array_push($tables_to_clear['uid'], 'emails', 'group_members', 'contacts', 'adresses', 'profile_phones',
                                             'photo', 'perte_pass', 'langues_ins', 'forum_subs', 'forum_profiles');
         array_push($tables_to_clear['user_id'], 'newsletter_ins', 'binets_ins');
         $tables_to_clear['id'] = array('aliases');
@@ -84,67 +84,6 @@ function user_clear_all_subs($user_id, $really_del=true)
 }
 
 // }}}
-// {{{ function _user_reindex
-
-function _user_reindex($uid, $keys)
-{
-    foreach ($keys as $i => $key) {
-        if ($key['name'] == '') {
-            continue;
-        }
-        $toks  = preg_split('/[ \'\-]+/', $key['name']);
-        $token = "";
-        $first = 5;
-        while ($toks) {
-            $token = strtolower(replace_accent(array_pop($toks) . $token));
-            $score = ($toks ? 0 : 10 + $first) * ($key['score'] / 10);
-            XDB::execute("REPLACE INTO  search_name (token, uid, soundex, score, flags)
-                                VALUES  ({?}, {?}, {?}, {?}, {?})",
-                         $token, $uid, soundex_fr($token), $score, $key['public']);
-            $first = 0;
-        }
-    }
-}
-
-// }}}
-// {{{ function user_reindex
-
-function user_reindex($uid) {
-    XDB::execute("DELETE FROM  search_name
-                        WHERE  uid = {?}",
-                 $uid);
-    $res = XDB::iterator("SELECT  CONCAT(n.particle, n.name) AS name, e.score,
-                                  FIND_IN_SET('public', e.flags) AS public
-                            FROM  profile_name      AS n
-                      INNER JOIN  profile_name_enum AS e ON (n.typeid = e.id)
-                           WHERE  n.pid = {?}",
-                         $uid);
-    _user_reindex($uid, $res);
-}
-
-// }}}
-// {{{ 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: