hide untargeted comments

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

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 9a846f8..fb7ac34 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -68,7 +68,7 @@ function user_clear_all_subs($user_id, $really_del=true)
 function get_user_login($data, $get_forlife = false) {
     global $globals, $page;
 
-    if (preg_match(',^[0-9]*$,', $data)) {
+    if (is_numeric($data)) {
         $res = XDB::query("SELECT alias FROM aliases WHERE type='a_vie' AND id={?}", $data);
         if ($res->numRows()) {
             return $res->fetchOneCell();
@@ -88,22 +88,32 @@ function get_user_login($data, $get_forlife = false) {
     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);
+                             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;
-        } else {
-            $page->trig("il n'y a pas d'utilisateur avec ce login");
-            return false;
         }
 
+        if (preg_match('/^(.*)\.([0-9]{4})$/', $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();
+            }
+        }
+        $page->trig("il n'y a pas d'utilisateur avec ce login");
+        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);
+                             FROM  virtual_redirect
+                       INNER JOIN  virtual USING(vid)
+                            WHERE  alias={?}", $mbox.'@'.$globals->mail->alias_dom);
         if ($redir = $res->fetchOneCell()) {
             list($alias) = explode('@', $redir);
         } else {
@@ -308,7 +318,7 @@ function get_user_details_adr($uid, $view = 'private') {
 function &get_user_details($login, $from_uid = '', $view = 'private')
 {
     $reqsql = "SELECT  u.user_id, u.promo, u.promo_sortie, u.prenom, u.nom, u.nom_usage, u.date, u.cv,
-                       u.perms IN ('admin','user') AS inscrit,  FIND_IN_SET('femme', u.flags) AS sexe, u.deces != 0 AS dcd, u.deces,
+                       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_mobile AS mobile, q.profile_web AS web, q.profile_freetext AS freetext,
                        q.profile_mobile_pub AS mobile_pub, q.profile_web_pub AS web_pub, q.profile_freetext_pub AS freetext_pub,
                        q.profile_medals_pub AS medals_pub,
@@ -376,21 +386,23 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
         $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);
+                                FROM  groupesx_ins
+                           LEFT JOIN  groupesx_def ON groupesx_ins.gid = groupesx_def.id
+                               WHERE  guid = {?}", $uid);
         $user['gpxs'] = Array();
+        $user['gpxs_name'] = Array();
         while (list($gxt, $gxu) = $res->next()) {
             $user['gpxs'][] = $gxu ? "<a href=\"$gxu\">$gxt</a>" : $gxt;
+            $user['gpxs_name'][] = $gxt;
         } 
         $user['gpxs_join'] = join(', ', $user['gpxs']);
     }
 
     $res = XDB::iterRow("SELECT  applis_def.text, applis_def.url, applis_ins.type
-                                     FROM  applis_ins
-                               INNER JOIN  applis_def ON applis_def.id = applis_ins.aid
-                                    WHERE  uid={?}
-                                 ORDER BY  ordre", $uid);
+                           FROM  applis_ins
+                     INNER JOIN  applis_def ON applis_def.id = applis_ins.aid
+                          WHERE  uid={?}
+                       ORDER BY  ordre", $uid);
     
     $user['applis_fmt'] = Array();
     $user['formation'] = Array();
@@ -403,10 +415,10 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
 
     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
-                                          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 )
-                                         WHERE  s.uid = {?}", $uid);
+                                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 )
+                               WHERE  s.uid = {?}", $uid);
         $user['medals'] = Array();
         while ($tmp = $res->next()) {
             $user['medals'][] = $tmp;