X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuser.func.inc.php;h=d9232a3457f9ee30ea3dbde66dd2d7800ac91b56;hb=5d42c993d85a2f1fa3595eb1591a921c0f89d8cd;hp=03e437e24e0a1bb8a3aa731e4b88addc47b7b77c;hpb=c0c9f7720a593412356950b6653e2962e71f86b9;p=platal.git

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 03e437e..d9232a3 100644
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -44,12 +44,11 @@ function user_clear_all_subs($user_id, $really_del=true)
         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['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 = ''
+                             nationalite = '', cv = '', section = 0, date = 0, smtppass = '', mail_storage = ''
                        WHERE user_id = {?}", $uid);
         XDB::execute("DELETE virtual.* FROM virtual INNER JOIN virtual_redirect AS r USING(vid) WHERE redirect = {?}",
                      $alias.'@'.$globals->mail->domain);
@@ -71,6 +70,15 @@ function user_clear_all_subs($user_id, $really_del=true)
 
     $mmlist = new MMList(S::v('uid'), S::v('password'));
     $mmlist->kill($alias, $really_del);
+
+    // Deactivates, when available, the Google Apps account of the user.
+    if ($globals->mailstorage->googleapps_domain) {
+        require_once 'googleapps.inc.php';
+        if (GoogleAppsAccount::account_status($uid)) {
+            $account = new GoogleAppsAccount($uid, $alias);
+            $account->suspend();
+        }
+    }
 }
 
 // }}}
@@ -79,8 +87,7 @@ function user_clear_all_subs($user_id, $really_del=true)
 // Defaut callback to call when a login is not found
 function _default_user_callback($login)
 {
-    global $page;
-    $page->trig("Il n'y a pas d'utilisateur avec l'identifiant : $login");
+    Platal::page()->trigError("Il n'y a pas d'utilisateur avec l'identifiant : $login");
     return;
 }
 
@@ -91,7 +98,7 @@ function _silent_user_callback($login)
 
 function get_user_login($data, $get_forlife = false, $callback = '_default_user_callback')
 {
-    global $globals, $page;
+    global $globals;
 
     if (is_numeric($data)) {
         $res = XDB::query("SELECT alias FROM aliases WHERE type='a_vie' AND id={?}", $data);
@@ -108,7 +115,7 @@ function get_user_login($data, $get_forlife = false, $callback = '_default_user_
     if (strstr($data, '@')===false) {
         $data = $data.'@'.$globals->mail->domain;
     }
-    
+
     list($mbox, $fqdn) = explode('@', $data);
     if ($fqdn == $globals->mail->domain || $fqdn == $globals->mail->domain2) {
 
@@ -134,7 +141,7 @@ function get_user_login($data, $get_forlife = false, $callback = '_default_user_
         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)
@@ -156,20 +163,20 @@ function get_user_login($data, $get_forlife = false, $callback = '_default_user_
             case 0:
                 call_user_func($callback, $data);
                 return false;
-                
+
             case 1:
                 return $res->fetchOneCell();
-                
+
             default:
                 if (S::has_perms()) {
                     $aliases = $res->fetchColumn();
-                    $page->trig("Il y a $i utilisateurs avec cette adresse mail : ".join(', ', $aliases));
+                    Platal::page()->trigError("Il y a $i utilisateurs avec cette adresse mail : ".join(', ', $aliases));
                 } else {
                     $res->free();
                 }
         }
     }
-    
+
     return false;
 }
 
@@ -190,15 +197,27 @@ function get_users_forlife_list($members, $strict = false, $callback = '_default
         if (strlen(trim($members)) == 0) {
             return null;
         }
-        $members = explode(' ', $members);
+        $members = split("[; ,\r\n\|]+", $members);
     }
     if ($members) {
         $list = array();
         foreach ($members as $i => $alias) {
+            $alias = trim($alias);
+            if (empty($alias)) {
+                continue;
+            }
             if (($login = get_user_forlife($alias, $callback)) !== false) {
                 $list[$i] = $login;
-            } else if(!$strict) {
+            } else if (!$strict) {
                 $list[$i] = $alias;
+            } else {
+                global $globals;
+                if (strpos($alias, '@') !== false) {
+                    list($user, $dom) = explode('@', $alias);
+                    if ($dom != $globals->mail->domain && $dom != $globals->mail->domain2) {
+                        $list[$i] = $alias;
+                    }
+                }
             }
         }
         return $list;
@@ -210,12 +229,12 @@ function get_users_forlife_list($members, $strict = false, $callback = '_default
 // {{{ function has_user_right()
 function has_user_right($pub, $view = 'private') {
     if ($pub == $view) return true;
-    // all infos available for private 
+    // all infos available for private
     if ($view == 'private') return true;
-    // public infos available for all 
+    // public infos available for all
     if ($pub == 'public') return true;
     // here we have view = ax or public, and pub = ax or private, and pub != view
-    return false;    
+    return false;
 }
 // }}}
 // {{{ function get_not_registered_user()
@@ -239,8 +258,8 @@ function get_not_registered_user($login, $iterator = false)
     }
     $sql = "SELECT  user_id, nom, prenom, promo
               FROM  auth_user_md5
-             WHERE  $where
-          ORDER BY  promo, nom, prenom"; 
+             WHERE  $where AND perms = 'pending'
+          ORDER BY  promo, nom, prenom";
     if ($iterator) {
         return XDB::iterator($sql, $nom, $prenom, $promo);
     } else {
@@ -293,7 +312,7 @@ function get_user_details_pro($uid, $view = 'private')
             }
             if (!has_user_right($pro['tel_pub'], $view)) {
                 // if no tel was defined, then the viewer will be able to write it
-                if ($pro['tel'] == '' && 
+                if ($pro['tel'] == '' &&
                     $pro['fax'] == '' &&
                     $pro['mobile'] == '') {
                     $all_pro[$i]['tel_pub'] = $view;
@@ -339,6 +358,7 @@ function get_user_details_adr($uid, $view = 'private') {
                      gp.pays AS countrytxt,a.region, a.regiontxt,
                      FIND_IN_SET('active', a.statut) AS active, a.adrid,
                      FIND_IN_SET('res-secondaire', a.statut) AS secondaire,
+                     FIND_IN_SET('courrier', a.statut) AS courier,
                      a.pub, gp.display
                FROM  adresses AS a
           LEFT JOIN  geoloc_pays AS gp ON (gp.a2=a.country)
@@ -353,7 +373,7 @@ function get_user_details_adr($uid, $view = 'private') {
         else
             $adrid_index[$adr['adrid']] = $i;
     }
-    
+
     $sql = "SELECT  t.adrid, t.tel_pub, t.tel_type, t.tel, t.telid
               FROM  tels AS t
         INNER JOIN  adresses AS a ON (a.uid = t.uid) AND (a.adrid = t.adrid)
@@ -365,7 +385,7 @@ function get_user_details_adr($uid, $view = 'private') {
             $adrid = $nexttel['adrid'];
             unset($nexttel['adrid']);
             if (isset($adrid_index[$adrid])) {
-                if (!isset($all_adr[$adrid_index[$adrid]]['tels'])) 
+                if (!isset($all_adr[$adrid_index[$adrid]]['tels']))
                     $all_adr[$adrid_index[$adrid]]['tels'] = array($nexttel);
                 else
                     $all_adr[$adrid_index[$adrid]]['tels'][] = $nexttel;
@@ -391,7 +411,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
                        s.text AS section, p.x, p.y, p.pub AS photo_pub,
                        u.matricule_ax,
                        m.expertise != '' AS is_referent,
-                       COUNT(e.email) > 0 AS actif
+                       (COUNT(e.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 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')
@@ -399,7 +419,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
             LEFT JOIN  contacts        AS c  ON (c.uid = {?} and c.contact = u.user_id)
             LEFT JOIN  geoloc_pays     AS gp ON (gp.a2 = u.nationalite)
            INNER JOIN  sections        AS s  ON (s.id  = u.section)
-            LEFT JOIN  photo           AS p  ON (p.uid = u.user_id) 
+            LEFT JOIN  photo           AS p  ON (p.uid = u.user_id)
             LEFT JOIN  mentor          AS m  ON (m.uid = u.user_id)
             LEFT JOIN  emails          AS e  ON (e.uid = u.user_id AND e.flags='active')
                 WHERE  a.alias = {?}
@@ -447,17 +467,21 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
         $res  = XDB::query($sql, $uid);
         $user['binets']      = $res->fetchColumn();
         $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);
+
+        $res  = XDB::iterRow("SELECT  a.diminutif, a.nom, a.site
+                                FROM  groupex.asso    AS a
+                           LEFT JOIN  groupex.membres AS m ON (m.asso_id = a.id)
+                               WHERE  m.uid = {?} AND (a.cat = 'GroupesX' OR a.cat = 'Institutions')
+                                      AND pub = 'public'", $uid);
         $user['gpxs'] = Array();
         $user['gpxs_name'] = Array();
-        while (list($gxt, $gxu) = $res->next()) {
-            $user['gpxs'][] = $gxu ? "<a href=\"$gxu\">$gxt</a>" : $gxt;
+        while (list($gxd, $gxt, $gxu) = $res->next()) {
+            if (!$gxu) {
+                $gxu = 'http://www.polytechnique.net/' . $gxd;
+            }
+            $user['gpxs'][] = '<span title="' . pl_entities($gxt) . "\"><a href=\"$gxu\">$gxd</a></span>";
             $user['gpxs_name'][] = $gxt;
-        } 
+        }
         $user['gpxs_join'] = join(', ', $user['gpxs']);
     }
 
@@ -466,7 +490,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
                      INNER JOIN  applis_def ON applis_def.id = applis_ins.aid
                           WHERE  uid={?}
                        ORDER BY  ordre", $uid);
-    
+
     $user['applis_fmt'] = Array();
     $user['formation'] = Array();
     while (list($txt, $url, $type) = $res->next()) {
@@ -477,7 +501,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private')
     $user['applis_join'] = join(', ', $user['applis_fmt']);
 
     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
+        $res = XDB::iterator("SELECT  m.id, m.text AS medal, m.type, 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 )
@@ -514,7 +538,7 @@ function add_user_address($uid, $adrid, $adr) {
 function update_user_address($uid, $adrid, $adr) {
     // update address
     XDB::execute(
-        "UPDATE adresses AS a LEFT JOIN geoloc_pays AS gp ON (gp.pays = {?}) 
+        "UPDATE adresses AS a LEFT JOIN geoloc_pays AS gp ON (gp.pays = {?})
         SET `adr1` = {?}, `adr2` = {?}, `adr3` = {?},
         `postcode` = {?}, `city` = {?}, a.`country` = gp.a2, `datemaj` = NOW(), `pub` = {?}
         WHERE adrid = {?} AND uid = {?}",
@@ -594,7 +618,7 @@ function update_user_pro($uid, $entrid, $pro) {
     $set = "";
     $args_join = array();
     $args_set = array();
-    
+
     $join .= "LEFT JOIN  emploi_secteur AS s ON(s.label LIKE {?})
             LEFT JOIN  emploi_ss_secteur AS ss ON(s.id = ss.secteur AND ss.label LIKE {?})
             LEFT JOIN  fonctions_def AS f ON(f.fonction_fr LIKE {?} OR f.fonction_en LIKE {?})";
@@ -607,7 +631,7 @@ function update_user_pro($uid, $entrid, $pro) {
     $args_set[] = $pro['poste'];
     $args_set[] = $pro['web'];
     $args_set[] = $pro['pub'];
-    
+
     if (isset($pro['adr1'])) {
         $join .= "LEFT JOIN  geoloc_pays AS gp ON (gp.country LIKE {?} OR gp.pays LIKE {?})
                 LEFT JOIN  geoloc_region AS gr ON (gr.a2 = gp.a2 AND gr.name LIKE {?})";
@@ -622,7 +646,7 @@ function update_user_pro($uid, $entrid, $pro) {
         $args_set[] = $pro['city'];
         $args_set[] = $pro['adr_pub'];
     }
-    
+
     if (isset($pro['tel'])) {
         $set .= ", e.`tel` = {?}, e.`fax` = {?}, e.`mobile` = {?}, e.tel_pub = {?}";
         $args_set[] = $pro['tel'];
@@ -634,7 +658,7 @@ function update_user_pro($uid, $entrid, $pro) {
         $set .= ", e.`email` = {?}, e.`email_pub` = {?}";
         $args_set[] = $pro['email'];
         $args_set[] = $pro['email_pub'];
-    }    
+    }
     $query = "UPDATE entreprises AS e ".$join." SET ".substr($set,1)." WHERE e.uid = {?} AND e.entrid = {?}";
     $args_where = array($uid, $entrid);
     $args = array_merge(array($query), $args_join, $args_set, $args_where);
@@ -712,7 +736,7 @@ function set_user_details($uid, $details) {
             XDB::execute(
             "INSERT INTO binets_ins (`user_id`, `binet_id`)
                 SELECT {?}, id FROM binets_def WHERE text = {?} LIMIT 1",
-                $uid, $binet);                
+                $uid, $binet);
     }
     if (isset($details['gpxs']) && is_array($details['gpxs'])) {
         XDB::execute("DELETE FROM groupesx_ins WHERE user_id = {?}", $uid);
@@ -722,7 +746,7 @@ function set_user_details($uid, $details) {
             "INSERT INTO groupesx_ins (`user_id`, `binet_id`)
                 SELECT {?}, id FROM groupesx_def WHERE text = {?} LIMIT 1",
                 $uid, $groupex);
-        }                
+        }
     }
     // applis
     // medals
@@ -787,7 +811,7 @@ function user_reindex($uid) {
 // {{{ function set_new_usage()
 
 function set_new_usage($uid, $usage, $alias=false)
-{ 
+{
     XDB::execute("UPDATE auth_user_md5 set nom_usage={?} WHERE user_id={?}",$usage ,$uid);
     XDB::execute("DELETE FROM aliases WHERE FIND_IN_SET('usage',flags) AND id={?}", $uid);
     if ($alias && $usage) {
@@ -808,15 +832,15 @@ function set_new_usage($uid, $usage, $alias=false)
 // {{{ function get_X_mat
 function get_X_mat($ourmat)
 {
-    if (!preg_match('/^[0-9]{8}$/', $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; 
+        return;
     } elseif ($year < 2000) {
         $year = intval(substr(1900 - $year, 1, 3));
         return sprintf('%02u0%03u', $year, $rang);
@@ -824,8 +848,8 @@ function get_X_mat($ourmat)
         $year = intval(substr(1900 - $year, 1, 3));
         return sprintf('%03u%03u', $year, $rang);
     }
-}           
-    
+}
+
 // }}}