retrait de la table ins_confirmees qui ne sert à rien

diff --git a/htdocs/inscription/step4.php b/htdocs/inscription/step4.php
index 52d8611..65c2f62 100644 (file)
--- a/htdocs/inscription/step4.php
+++ b/htdocs/inscription/step4.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: step4.php,v 1.14 2004-11-18 13:45:47 x2000habouzit Exp $
+        $Id: step4.php,v 1.15 2004-11-20 19:07:00 x2000chevalier Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -124,23 +124,22 @@ if (!empty($_REQUEST['ref'])) {
     // effacer la pré-inscription devenue 
     $globals->db->query("update en_cours set loginbis='INSCRIT' WHERE username='$forlife'");
 
-    // insérer l'inscription dans la table des inscriptions confirmé
-    $globals->db->query("INSERT INTO ins_confirmees SET id=$uid");
+    // insérer l'inscription dans la table des notifications
     require_once('notifs.inc.php');
     register_watch_op($uid,WATCH_INSCR);
     inscription_notifs_base($uid);
 
-    // insérer une ligne dans user_changes pour que les coordonnées complè
-    // soient envoyées a l'
+    // insérer une ligne dans user_changes pour que les coordonnées complètes
+    // soient envoyées a l'AX
     $globals->db->query("insert into user_changes ($uid)");
 
-    // envoi du mail à l'
+    // envoi du mail à l'inscrit
     $mymail = new TplMailer('inscription.reussie.tpl');
     $mymail->assign('forlife', $forlife);
     $mymail->assign('prenom', $prenom);
     $mymail->send();
 
-    // s'il est dans la table envoidirect, on le marque comme 
+    // s'il est dans la table envoidirect, on le marque comme inscrit
     $globals->db->query("update envoidirect set date_succes=NOW() where matricule = $matricule");
     start_connexion($uid,false);
 } else

diff --git a/htdocs/marketing/index.php b/htdocs/marketing/index.php
index d5c079a..9816e19 100644 (file)
--- a/htdocs/marketing/index.php
+++ b/htdocs/marketing/index.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: index.php,v 1.4 2004-10-31 17:58:32 x2000chevalier Exp $
+        $Id: index.php,v 1.5 2004-11-20 19:07:02 x2000chevalier Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -45,7 +45,7 @@ $stats = mysql_fetch_assoc($res);
 $page->assign('stats', $stats);
 mysql_free_result($res);
 
-$res = $globals->db->query("SELECT count(*) FROM ins_confirmees");
+$res = $globals->db->query("SELECT count(*) FROM auth_user_md5 WHERE date_ins > ".date("Ymd", strtotime ("last Monday"))."*1000000");
 list($nbInsSem) = mysql_fetch_row($res);
 mysql_free_result($res);
 

diff --git a/htdocs/marketing/ins_confirmees.php b/htdocs/marketing/ins_confirmees.php
index 9282d00..ed5a133 100644 (file)
--- a/htdocs/marketing/ins_confirmees.php
+++ b/htdocs/marketing/ins_confirmees.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: ins_confirmees.php,v 1.5 2004-11-13 14:16:21 x2000habouzit Exp $
+        $Id: ins_confirmees.php,v 1.6 2004-11-20 19:07:03 x2000chevalier Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -27,9 +27,9 @@ new_admin_page('marketing/ins_confirmees.tpl');
 if (!isset($_GET["sort"]) || $_GET["sort"] != "promo") $_GET["sort"] = "date_ins";
 
 $sql = "SELECT a.alias AS forlife,u.date_ins,u.promo,u.nom,u.prenom
-        FROM       ins_confirmees AS i
-        INNER JOIN auth_user_md5  AS u ON i.id=u.user_id
+        FROM auth_user_md5  AS u
         INNER JOIN aliases        AS a ON (u.user_id = a.id AND a.type='a_vie')
+       WHERE u.date_ins > ".date("Ymd", strtotime ("last Monday"))."*1000000
         ORDER BY u.{$_GET['sort']} DESC";
 $page->mysql_assign($sql, 'ins', 'nb_ins');
 

diff --git a/scripts/cron/rapports_inscription.php b/scripts/cron/rapports_inscription.php
index 85b8626..978a6e6 100755 (executable)
--- a/scripts/cron/rapports_inscription.php
+++ b/scripts/cron/rapports_inscription.php
@@ -6,10 +6,10 @@ $MESSAGE = '';
 // ---------------------------------------
 
 $result=mysql_query("SELECT  a.alias, u.promo, email
-                       FROM  ins_confirmees AS i
-                 LEFT JOIN  auth_user_md5  AS u ON( i.id = u.user_id )
-                 LEFT JOIN  aliases        AS a ON( i.id=a.id AND a.type='a_vie' )
+                      FROM  auth_user_md5  AS u
+                 LEFT JOIN  aliases        AS a ON( u.user_id=a.id AND a.type='a_vie' )
                  LEFT JOIN  emails         AS e ON( e.uid = u.user_id AND NOT FIND_IN_SET('filter',e.flags) )
+                     WHERE  u.date_ins > ".date("Ymd", strtotime ("last Monday"))."*1000000
                   GROUP BY  alias
                   ORDER BY  promo");
 $a = mysql_num_rows($result);
@@ -65,5 +65,4 @@ $HEADER="From: register\nReply-To: register@polytechnique.org\n".
         "Content-Disposition: inline\n".
         "Content-Transfer-Encoding: 8bit\n";
 mail("register@polytechnique.org, jean-michel.yolin+register@polytechnique.org","$a confirmées, $b en attente et $c sollicitées",$MESSAGE,$HEADER);
-mysql_query("DELETE FROM ins_confirmees");
 ?>

diff --git a/scripts/migration/0.9.3/40_ins_confirmees.sql b/scripts/migration/0.9.3/40_ins_confirmees.sql
new file mode 100644 (file)
index 0000000..1904b8a
--- /dev/null
+++ b/scripts/migration/0.9.3/40_ins_confirmees.sql
@@ -0,0 +1 @@
+DROP TABLE ins_confirmees;