#536: Can use login.promo to identify a user

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

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index d0fe12e..4f7a40a 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,
@@ -317,8 +327,8 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
                        c.uid IS NOT NULL AS is_contact,
                        s.text AS section, p.x, p.y, p.pub AS photo_pub,
                        u.matricule_ax,
-                       m.expertise != '' AS is_referent
-                       
+                       m.expertise != '' AS is_referent,
+                       COUNT(e.email) > 0 AS actif
                  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')
@@ -328,7 +338,9 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
            INNER JOIN  sections        AS s  ON (s.id  = u.section)
             LEFT JOIN  photo           AS p  ON (p.uid = u.user_id) 
             LEFT JOIN  mentor          AS m  ON (m.uid = u.user_id)
-                WHERE  a.alias = {?}";
+            LEFT JOIN  emails          AS e  ON (e.uid = u.user_id AND e.flags='active')
+                WHERE  a.alias = {?}
+             GROUP BY  u.user_id";
     $res  = XDB::query($reqsql, $from_uid, $login);
     $user = $res->fetchOneAssoc();
     $uid  = $user['user_id'];