various updates, prepare database for new marketing pages

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

diff --git a/hooks/tmp.inc.php b/hooks/tmp.inc.php
index 5244f29..2dfc311 100644 (file)
--- a/hooks/tmp.inc.php
+++ b/hooks/tmp.inc.php
@@ -35,4 +35,17 @@ function tmp_menu()
     $globals->menu->addPublicEntry(XOM_INFOS, 10, 'Nous contacter',         'docs/contacts.php');
     $globals->menu->addPublicEntry(XOM_INFOS, 20, 'FAQ',                    'docs/faq.php');
 }
+
+// {{{ subscribe HOOK
+
+function tmp_subscribe($forlife, $uid, $promo, $password)
+{
+
+    require_once('notifs.inc.php');
+    register_watch_op($uid, WATCH_INSCR);
+    inscription_notifs_base($uid);
+}
+
+// }}}
+
 ?>

diff --git a/htdocs/register/end.php b/htdocs/register/end.php
index 721ab85..0465eae 100644 (file)
--- a/htdocs/register/end.php
+++ b/htdocs/register/end.php
@@ -65,6 +65,7 @@ $globals->xdb->execute('INSERT INTO aliases (id,alias,type,flags) VALUES ({?}, {
 if ($mailorg2) {
     $globals->xdb->execute('INSERT INTO aliases (id,alias,type) VALUES ({?}, {?}, "alias")', $uid, $mailorg2);
 }
+
 require_once('emails.inc.php');
 $redirect = new Redirect($uid);
 $redirect->add_email($email);
@@ -75,10 +76,6 @@ $logger->log('inscription', $email);
 
 $globals->xdb->execute('UPDATE register_pending SET hash="INSCRIT" WHERE uid={?}', $uid);
 
-require_once('notifs.inc.php');
-register_watch_op($uid, WATCH_INSCR);
-inscription_notifs_base($uid);
-
 $globals->hook->subscribe($forlife, $uid, $promo, $password);
 
 require_once('xorg.mailer.inc.php');
@@ -109,7 +106,6 @@ while (list($sender_usern, $sender_date) = $res->next()) {
 // s'il est dans la table envoidirect, on le marque comme inscrit
 $globals->xdb->execute('UPDATE envoidirect SET date_succes=NOW() WHERE matricule = {?}', $matricule);
 
-
 $page->assign('forlife',$forlife);
 $page->run();
 ?>

diff --git a/upgrade/0.9.4/20_register.sql b/upgrade/0.9.4/20_register.sql
index 0fbc85d..87fc357 100644 (file)
--- a/upgrade/0.9.4/20_register.sql
+++ b/upgrade/0.9.4/20_register.sql
@@ -5,19 +5,40 @@
 --
 
 CREATE TABLE register_pending (
-  uid        varchar(32)  NOT NULL default '',
-  forlife    varchar(255) NOT NULL default '',
-  bestalias  varchar(255) NOT NULL default '',
-  mailorg2   varchar(255)          default null,
-  password   varchar(32)  NOT NULL default '',
-  email      varchar(255) NOT NULL default '',
-  date       date         NOT NULL default '0000-00-00',
-  relance    date         NOT NULL default '0000-00-00',
-  naissance  date         NOT NULL default '0000-00-00',
-  hash       varchar(12)  NOT NULL default '',
-  PRIMARY KEY (uid),
-  UNIQUE KEY  (forlife),
-  UNIQUE KEY  (bestalias),
-  INDEX       (hash)
+    uid         int          NOT NULL default '0',
+    forlife     varchar(255) NOT NULL default '',
+    bestalias   varchar(255) NOT NULL default '',
+    mailorg2    varchar(255)          default null,
+    password    varchar(32)  NOT NULL default '',
+    email       varchar(255) NOT NULL default '',
+    date        date         NOT NULL default '0000-00-00',
+    relance     date         NOT NULL default '0000-00-00',
+    naissance   date         NOT NULL default '0000-00-00',
+    hash        varchar(12)  NOT NULL default '',
+    PRIMARY KEY (uid),
+    UNIQUE KEY  (forlife),
+    UNIQUE KEY  (bestalias),
+    INDEX       (hash)
 );
 
+create table register_marketing (
+    uid         int          not null default 0,
+    sender      int          not null default 0,
+    email       varchar(255) not null default '',
+    date        date         not null default '0000-00-00',
+    last        date         not null default '0000-00-00',
+    nb          tinyint      not null default 0,
+    type        set('user', 'staff') not null default 'user',
+    INDEX (uid),
+    INDEX (date),
+    INDEX (last),
+    INDEX (nb)
+);
+
+create table register_mstats (
+    uid         int          not null default 0,
+    sender      int          not null default 0,
+    success     date         not null default '0000-00-00',
+    PRIMARY KEY (uid)
+);
+