X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fuser.func.inc.php;h=c1872ce98991de5dbe79968a0c4f85e4bb22cbc1;hb=6d1747b3dbcf944c995dc2d87e8561c7a66f3aa6;hp=a839455cd06101de4dd9867fc20b846df71ace66;hpb=86aa4b4cccd01fa073f3d46bc7890bc0debb270c;p=platal.git

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index a839455..c1872ce 100644
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -104,8 +104,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) = {?}';
@@ -257,7 +259,7 @@ function get_user_details_adr($uid, $view = 'private') {
 
 function &get_user_details($login, $from_uid = '', $view = 'private')
 {
-    $reqsql = "SELECT  u.user_id, d.promo_display, u.prenom, u.nom, u.nom_usage, u.date, u.cv,
+    $reqsql = "SELECT  u.user_id, d.promo, 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_freetext AS freetext,
                        q.profile_freetext_pub AS freetext_pub,
@@ -271,7 +273,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
                        u.matricule_ax,
                        m.expertise != '' AS is_referent,
                        (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
+                       d.public_name, d.private_name
                  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')
@@ -285,8 +287,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
             LEFT JOIN  photo                 AS p   ON (p.uid = u.user_id)
             LEFT JOIN  profile_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)
-           INNER JOIN  profile_display       AS d   ON (d.uid = u.user_id)
+           INNER JOIN  profile_display       AS d   ON (d.pid = u.user_id)
                 WHERE  a.alias = {?}
              GROUP BY  u.user_id";
     $res  = XDB::query($reqsql, $from_uid, $login);
@@ -591,18 +592,17 @@ function remove_user_pro($uid, $entrid) {
 // }}}
 // {{{ 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();
+    $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';
@@ -613,17 +613,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;
         }
     }
 }
@@ -686,57 +686,40 @@ function set_user_details($uid, $details) {
 // }}}
 // {{{ function _user_reindex
 
-function _user_reindex($uid, $keys, $muls, $pubs)
+function _user_reindex($uid, $keys)
 {
     foreach ($keys as $i => $key) {
-        if ($key == '') {
+        if ($key['name'] == '') {
             continue;
         }
-        $toks  = preg_split('/[ \'\-]+/', $key);
+        $toks  = preg_split('/[ \'\-]+/', $key['name']);
         $token = "";
         $first = 5;
         while ($toks) {
             $token = strtolower(replace_accent(array_pop($toks) . $token));
-            $score = ($toks ? 0 : 10 + $first) * $muls[$i];
+            $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, $pubs[$i] ? 'public' : '');
+                         $token, $uid, soundex_fr($token), $score, $key['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);
 }
 
 // }}}
 // {{{ function user_reindex
 
 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);
-    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));
-      }
-    }
+    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);
 }
 
 // }}}