X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=3126d1ace34e5d4d5d57dfcf6396266f263609e9;hb=20934085ed6e05fc18aa83e3a91259e638128f53;hp=35491458de95664a3117b3c403b7091847e43f10;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git

diff --git a/modules/register.php b/modules/register.php
index 3549145..3126d1a 100644
--- a/modules/register.php
+++ b/modules/register.php
@@ -58,17 +58,18 @@ class RegisterModule extends PLModule
 
         if ($hash) {
             $res = XDB::query(
-                    "SELECT  m.uid, u.promo, u.nom, u.prenom, u.matricule
+                    "SELECT  m.uid, u.promo, u.nom, u.prenom, u.matricule, FIND_IN_SET('watch', u.flags)
                        FROM  register_marketing AS m
                  INNER JOIN  auth_user_md5      AS u ON u.user_id = m.uid
                       WHERE  m.hash={?}", $hash);
-            if (list($uid, $promo, $nom, $prenom, $ourmat) = $res->fetchOneRow()) {
+            if (list($uid, $promo, $nom, $prenom, $ourmat, $watch) = $res->fetchOneRow()) {
                 $sub_state['uid']    = $uid;
                 $sub_state['hash']   = $hash;
                 $sub_state['promo']  = $promo;
                 $sub_state['nom']    = $nom;
                 $sub_state['prenom'] = $prenom;
                 $sub_state['ourmat'] = $ourmat;
+                $sub_state['watch']  = $watch;
 
                 XDB::execute(
                         "REPLACE INTO  register_mstats (uid,sender,success)
@@ -168,6 +169,9 @@ class RegisterModule extends PLModule
                     if (count($aliases) != 0) {
                         $alert .= "Email surveille propose a l'inscription - ";
                     }
+                    if ($sub_state['watch']) {
+                        $alter .= "Inscription d'un utilisateur surveillé - ";
+                    }
 
                     if (check_ip('unsafe')) {
                         unset($err);
@@ -322,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)");
@@ -334,7 +340,10 @@ 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(); 
         }
@@ -357,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')) {