wibble

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

diff --git a/hooks/banana.inc.php b/hooks/banana.inc.php
index d8e06f9..669312c 100644 (file)
--- a/hooks/banana.inc.php
+++ b/hooks/banana.inc.php
@@ -77,8 +77,6 @@ function banana_subscribe($forlife, $uid, $promo, $password)
        }
     }
 
-    echo "$promo, $uid, ";
-    var_export($cible);
     while (list ($key, $val) = each ($cible)) {
         $globals->xdb->execute("INSERT INTO  forums.abos (fid,uid)
                                      SELECT  fid,{?} FROM forums.list WHERE nom={?}", $uid, $val);

diff --git a/htdocs/marketing/relance.php b/htdocs/marketing/relance.php
index c6345ed..aa77a9e 100644 (file)
--- a/htdocs/marketing/relance.php
+++ b/htdocs/marketing/relance.php
@@ -29,9 +29,9 @@ if (Post::has('relancer')) {
     $res   = $globals->xdb->query("SELECT COUNT(*) FROM auth_user_md5 WHERE deces=0");
     $nbdix = $res->fetchOneCell();
     $res   = $globals->xdb->iterRow(
-            "SELECT  r.date, u.promo, u.nom, u.prenom, r.user_id, r.email, r.bestalias
+            "SELECT  r.date, u.promo, u.nom, u.prenom, r.uid, r.email, r.bestalias
                FROM  register_pending AS r
-         INNER JOIN  auth_user_md5    AS u ON u.user_id = e.uid");
+         INNER JOIN  auth_user_md5    AS u ON u.user_id = r.uid");
 
     $sent = Array();
 
@@ -53,7 +53,7 @@ if (Post::has('relancer')) {
             $mymail->assign('subj',       $lusername."@polytechnique.org");
 
             $globals->xdb->execute("UPDATE register_pending SET hash={?}, password={?}, relance=NOW() WHERE uid={?}",
-                    $lins_id, $lpass, $uid);
+                    $hash, $pass, $uid);
             $mymail->send();
 
             $sent[] = "$lprenom $lnom ($lpromo) a été relancé !";

diff --git a/htdocs/register/end.php b/htdocs/register/end.php
index 5d9869a..5d75eed 100644 (file)
--- a/htdocs/register/end.php
+++ b/htdocs/register/end.php
@@ -24,7 +24,7 @@ new_skinned_page('register/end.tpl', AUTH_PUBLIC);
 require_once('user.func.inc.php');
 
 if (Env::has('hash')) {
-    $res = $globals->xdb->execute(
+    $res = $globals->xdb->query(
             "SELECT  r.uid, r.forlife, r.bestalias, r.mailorg2, r.password, r.email, r.relance, r.naissance,
                      u.prenom, u.nom, u.promo
                FROM  register_pending AS r
@@ -32,8 +32,8 @@ if (Env::has('hash')) {
               WHERE  hash={?} AND hash!='INSCRIT'", Env::get('hash'));
 }
 
-if ( !Env::has('ref') ||
-        !list( $uid, $forlife, $bestalias, $mailorg2, $password, $email, $naissance, $nom, $prenom, $promo) = $res->fetchOneRow())
+if ( !Env::has('hash') ||
+        !list($uid, $forlife, $bestalias, $mailorg2, $password, $email, $naissance, $nom, $prenom, $promo) = $res->fetchOneRow())
 {
     $page->kill("<p>Cette adresse n'existe pas, ou plus, sur le serveur.</p>
                  <p>Causes probables :</p>