Add @m4x.org to have real mail

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

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 4f7a40a..8cd8954 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -37,8 +37,8 @@ function user_clear_all_subs($user_id, $really_del=true)
     $alias = $res->fetchOneCell();
 
     if ($really_del) {
-       XDB::execute("DELETE FROM emails WHERE uid={?}", $uid);
-       XDB::execute("DELETE FROM newsletter_ins WHERE user_id={?}", $uid);
+       XDB::execute("DELETE FROM emails WHERE uid={?}", $uid);
+           XDB::execute("DELETE FROM newsletter_ins WHERE user_id={?}", $uid);
     }
 
     XDB::execute("DELETE FROM virtual_redirect WHERE redirect = {?}", $alias.'@'.$globals->mail->domain);
@@ -51,14 +51,14 @@ function user_clear_all_subs($user_id, $really_del=true)
     XDB::execute("DELETE FROM entreprises     WHERE uid={?}", $uid);
     XDB::execute("DELETE FROM langues_ins     WHERE uid={?}", $uid);
     XDB::execute("DELETE FROM mentor_pays     WHERE uid={?}", $uid);
-    XDB::execute("DELETE FROM mentor_secteur  WHERE uid={?}", $uid);
+    XDB::execute("DELETE FROM mentor_secteurs WHERE uid={?}", $uid);
     XDB::execute("DELETE FROM mentor          WHERE uid={?}", $uid);
     XDB::execute("DELETE FROM perte_pass      WHERE uid={?}", $uid);
     XDB::execute("DELETE FROM requests        WHERE user_id={?}", $uid);
     XDB::execute("DELETE FROM user_changes    WHERE user_id={?}", $uid);
     XDB::execute("DELETE FROM watch_sub       WHERE uid={?}", $uid);
 
-    $mmlist = new MMList(S::v('id'), S::v('password'));
+    $mmlist = new MMList(S::v('uid'), S::v('password'));
     $mmlist->kill($alias, $really_del);
 }
 
@@ -386,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();
@@ -413,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;