From b8727f5950daf78af0c9a468308cfdeeb4eaece1 Mon Sep 17 00:00:00 2001
From: "Pierre Habouzit (MadCoder" <pierre.habouzit@m4x.org>
Date: Tue, 18 Jan 2005 11:32:56 +0000
Subject: [PATCH] fix various bugs

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-377
---
 htdocs/register/end.php   | 7 ++++---
 htdocs/register/index.php | 2 +-
 include/register.inc.php  | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/register/end.php b/htdocs/register/end.php
index 8bb067c..d5a5af3 100644
--- a/htdocs/register/end.php
+++ b/htdocs/register/end.php
@@ -95,13 +95,14 @@ $res = $globals->xdb->iterRow(
      INNER JOIN  auth_user_md5      AS s  ON ( m.sender = s.user_id )
      INNER JOIN  aliases            AS sa ON ( sa.id = m.sender AND FIND_IN_SET('bestalias', sa.flags) )
           WHERE  m.uid = {?}", $uid);
+$globals->xdb->execute("UPDATE register_mstats SET success=NOW() WHERE uid={?}", $uid);
 
 while (list($salias, $snom, $sprenom) = $res->next()) {
     require_once('diogenes/diogenes.hermes.inc.php');
     $mymail = new HermesMailer();
     $mymail->setSubject("$prenom $nom s'est inscrit à Polytechnique.org !");
     $mymail->setFrom('"Marketing Polytechnique.org" <register@polytechnique.org>');
-    $mymail->addTo("\"$sprenom $snom\" <$alias@{$globals->mail->domain}");
+    $mymail->addTo("\"$sprenom $snom\" <$alias@{$globals->mail->domain}>");
     $msg = "Cher $sprenom,\n\n"
          . "Nous t'écrivons pour t'informer que {$prenom} {$nom} (X{$promo}), "
          . "que tu avais incité à s'inscrire à Polytechnique.org, "
@@ -113,9 +114,9 @@ while (list($salias, $snom, $sprenom) = $res->next()) {
     $mymail->send();
 }
 
-$globals->xdb->execute("DELETE FROM register_mstats WHERE uid = {?}", $uid);
+$globals->xdb->execute("DELETE FROM register_marketing WHERE uid = {?}", $uid);
 
-header('Location: success.php');
+#header('Location: success.php');
 $page->assign('uid', $uid);
 $page->run();
 
diff --git a/htdocs/register/index.php b/htdocs/register/index.php
index 7d583b4..4e4f114 100644
--- a/htdocs/register/index.php
+++ b/htdocs/register/index.php
@@ -45,7 +45,7 @@ if (Env::has('hash')) {
 
         $globals->xdb->execute(
                 "REPLACE INTO  register_mstats (uid,sender,success)
-                       SELECT  m.uid, m.sender, NOW()
+                       SELECT  m.uid, m.sender, 0
                          FROM  register_marketing AS m
                         WHERE  m.hash", $sub_state['hash']);
     }
diff --git a/include/register.inc.php b/include/register.inc.php
index 32ef79a..6edc58c 100644
--- a/include/register.inc.php
+++ b/include/register.inc.php
@@ -239,7 +239,6 @@ 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');
-- 
2.1.4