From 03c0a3a7ae88f2c38702325824f7a41395bf64a3 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sat, 23 Aug 2008 17:44:52 +0200 Subject: [PATCH] No more on_subscribe. It fortunately didn't work. Signed-off-by: Florent Bruneau --- modules/carnet.php | 7 ------- modules/forums.php | 30 ++---------------------------- modules/lists.php | 6 ------ modules/register.php | 31 ++++++++++++++++++++++++++----- modules/search.php | 7 ------- 5 files changed, 28 insertions(+), 53 deletions(-) diff --git a/modules/carnet.php b/modules/carnet.php index 3a64bb8..32a71b9 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -37,13 +37,6 @@ class CarnetModule extends PLModule ); } - function on_subscribe($forlife, $uid, $promo, $password) - { - require_once 'notifs.inc.php'; - register_watch_op($uid, WATCH_INSCR); - inscription_notifs_base($uid); - } - function _add_rss_link(&$page) { if (!S::has('core_rss_hash')) { diff --git a/modules/forums.php b/modules/forums.php index 80ea2fd..e67966d 100644 --- a/modules/forums.php +++ b/modules/forums.php @@ -24,38 +24,12 @@ class ForumsModule extends PLModule function handlers() { return array( - 'banana' => $this->make_hook('banana', AUTH_COOKIE), - 'banana/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), + 'banana' => $this->make_hook('banana', AUTH_COOKIE), + 'banana/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), 'admin/forums' => $this->make_hook('forums_bans', AUTH_MDP, 'admin'), ); } - function on_subscribe($forlife, $uid, $promo, $password) - { - $cible = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements'); - $p_for = "xorg.promo.x$promo"; - - // récupération de l'id du forum promo - $res = XDB::query("SELECT fid FROM forums.list WHERE nom={?}", $p_for); - if ($res->numRows()) { - $cible[] = $p_for; - } else { // pas de forum promo, il faut le créer - $res = XDB::query("SELECT SUM(perms IN ('admin','user') AND deces=0),COUNT(*) - FROM auth_user_md5 WHERE promo={?}", $promo); - list($effau, $effid) = $res->fetchOneRow(); - if (5*$effau>$effid) { // + de 20% d'inscrits - $mymail = new PlMailer('admin/forums-promo.mail.tpl'); - $mymail->assign('promo', $promo); - $mymail->send(); - } - } - - while (list ($key, $val) = each ($cible)) { - XDB::execute("INSERT INTO forums.abos (fid,uid) - SELECT fid,{?} FROM forums.list WHERE nom={?}", $uid, $val); - } - } - function handler_banana(&$page, $group = null, $action = null, $artid = null) { $page->changeTpl('banana/index.tpl'); diff --git a/modules/lists.php b/modules/lists.php index a4ea356..36b247b 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -46,12 +46,6 @@ class ListsModule extends PLModule ); } - function on_subscribe($forlife, $uid, $promo, $password) - { - $this->prepare_client(null); - $this->client->subscribe("promo$promo"); - } - function prepare_client(&$page) { global $globals; diff --git a/modules/register.php b/modules/register.php index 6d1273b..8d30088 100644 --- a/modules/register.php +++ b/modules/register.php @@ -301,22 +301,43 @@ class RegisterModule extends PLModule $redirect->add_email($email); // on cree un objet logger et on log l'inscription - $logger = new PlLogger($uid); - S::logger()->log('inscription', $email); - + S::logger($uid)->log('inscription', $email); XDB::execute('UPDATE register_pending SET hash="INSCRIT" WHERE uid={?}', $uid); - global $platal; - $platal->on_subscribe($forlife, $uid, $promo, $password); $mymail = new PlMailer('register/inscription.reussie.tpl'); $mymail->assign('forlife', $forlife); $mymail->assign('prenom', $prenom); $mymail->send(); + // Enable search on the user require_once('user.func.inc.php'); user_reindex($uid); + // Add notification for people looking for this registration + require_once 'notifs.inc.php'; + register_watch_op($uid, WATCH_INSCR); + inscription_notifs_base($uid); + + // Default registration on forums + $p_for = 'xorg.promo.x' . $promo; + $cible = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements', $p_for); + foreach ($cible as $val) { + XDB::execute("INSERT INTO forums.abos (fid,uid) + SELECT fid, {?} FROM forums.list WHERE nom={?}", $uid, $val); + if (XDB::affectedRows() == 0 && $val == $p_for) { + $res = XDB::query("SELECT SUM(perms IN ('admin','user') AND deces = 0), COUNT(*) + FROM auth_user_md5 + WHERE promo = {?}", $promo); + list($effau, $effid) = $res->fetchOneRow(); + if (5 * $effau > $effid) { // + + $mymail = new PlMailer('admin/forums-promo.mail.tpl'); + $mymail->assign('promo', $promo); + $mymail->send(); + } + } + } + // update number of subscribers (perms has changed) $globals->updateNbIns(); diff --git a/modules/search.php b/modules/search.php index a89d3f6..c9ca317 100644 --- a/modules/search.php +++ b/modules/search.php @@ -38,13 +38,6 @@ class SearchModule extends PLModule exit; } - function on_subscribe($forlife, $uid, $promo, $pass) - { - require_once 'user.func.inc.php'; - user_reindex($uid); - } - - function form_prepare() { Platal::page()->assign('formulaire',1); -- 2.1.4