some fixups in registration when triggered by marketing

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-376

diff --git a/htdocs/register/index.php b/htdocs/register/index.php
index a45c506..7d583b4 100644 (file)
--- a/htdocs/register/index.php
+++ b/htdocs/register/index.php
@@ -31,11 +31,12 @@ if (Get::has('back') && Get::getInt('back') < $sub_state['step']) {
 
 if (Env::has('hash')) {
     $res = $globals->xdb->query(
-            "SELECT  m.uid, u.promo, u.prenom, u.nom, u.matricule
+            "SELECT  m.uid, u.promo, u.nom, u.prenom, u.matricule
                FROM  register_marketing AS m
          INNER JOIN  auth_user_md5      AS u ON u.user_id = m.uid
               WHERE  m.hash={?}", Env::get('hash'));
     if (list($uid, $promo, $nom, $prenom, $ourmat) = $res->fetchOneRow()) {
+        $sub_state['uid']    = $uid;
         $sub_state['hash']   = Env::get('hash');
         $sub_state['promo']  = $promo;
         $sub_state['nom']    = $nom;
@@ -54,8 +55,9 @@ switch ($sub_state['step']) {
     case 0:
         if (Post::has('step1')) {
             $sub_state['step'] = 1;
-            if (isset($sub_date['hash'])) {
+            if (isset($sub_state['hash'])) {
                 $sub_state['step'] = 3;
+                require_once('register.inc.php');
                 create_aliases($sub_state);
             }
         }

diff --git a/include/register.inc.php b/include/register.inc.php
index 6edc58c..32ef79a 100644 (file)
--- a/include/register.inc.php
+++ b/include/register.inc.php
@@ -239,6 +239,7 @@ function finish_ins($sub_state)
             "REPLACE INTO  register_pending (uid, forlife, bestalias, mailorg2, password, email, date, relance, naissance, hash)
                    VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, NOW(), 0, {?}, {?})",
             $uid, $forlife, $bestalias, $mailorg2, $pass_md5, $email, $naissance, $hash);
+            echo mysql_error();
 
     require_once('xorg.mailer.inc.php');
     $mymail = new XOrgMailer('inscrire.mail.tpl');