X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=77dff4d4467cdea02260d2f4004b00925cd59866;hb=0baf0741b59974981aced47c7196a7a319b7f3e8;hp=92fc139d67d613f285f2fb474b27bb24b09acfb6;hpb=0be07aa610451e9c9e6f45425cae68eac31dbd7e;p=platal.git

diff --git a/modules/register.php b/modules/register.php
index 92fc139..77dff4d 100644
--- a/modules/register.php
+++ b/modules/register.php
@@ -326,6 +326,8 @@ class RegisterModule extends PLModule
             $mymail->setTxtBody(wordwrap($msg, 72));
             $mymail->send();
         }
+
+        /**** send a mail to X.org administrators ****/
         if ($globals->register->notif) {
             $mymail = new PlMailer();
             $mymail->setSubject("Inscription de $prenom $nom (X$promo)");
@@ -338,12 +340,15 @@ class RegisterModule extends PLModule
                  . " - naissance : $naissance\n"
                  . " - forlife   : $forlife\n"
                  . " - email     : $email\n"
-                 . " - sexe      : $femme\n"; 
+                 . " - sexe      : $femme\n"
+                 . " - ip        : " . (@$_SERVER['HTTP_X_FORWARDED_FOR'] ? $_SERVER['HTTP_X_FORWARDED_FOR']
+                                                                          : $_SERVER['REMOTE_ADDR']) . "\n"
+                 . " - proxy     : " . (@$_SERVER['HTTP_X_FORWARDED_FOR'] ? $_SERVER['REMOTE_ADDR'] : "") . "\n";
             $mymail->setTxtBody($msg);
             $mymail->send(); 
         }
 
-        XDB::execute("DELETE FROM register_marketing WHERE uid = {?}", $uid);
+        Marketing::clear($uid);
 
         pl_redirect('register/success');
         $page->assign('uid', $uid);
@@ -361,7 +366,7 @@ class RegisterModule extends PLModule
                                      WHERE user_id={?}', $password,
                                    S::v('uid'));
 
-            $log =& S::v('log');
+            $log = S::v('log');
             $log->log('passwd', '');
 
             if (Cookie::v('ORGaccess')) {
@@ -372,6 +377,23 @@ class RegisterModule extends PLModule
             $page->assign('mdpok', true);
         }
 
+        $res = XDB::iterRow("SELECT  sub, domain
+                               FROM  register_subs
+                              WHERE  uid = {?} AND type = 'list'
+                           ORDER BY  domain",
+                            S::i('uid'));
+        $current_domain = null;
+        $lists = array();
+        while (list($sub, $domain) = $res->next()) {
+            if ($current_domain != $domain) {
+                $current_domain = $domain;
+                $client = new MMList(S::v('uid'), S::v('password'), $domain);
+            }
+            list($details, ) = $client->get_members($sub);
+            $lists["$sub@$domain"] = $details;
+        }
+        $page->assign_by_ref('lists', $lists);
+
         $page->addJsLink('motdepasse.js');
     }
 }