X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=83dcd899260862b2ad8075056df0e7497be613e0;hb=d7610c358d074c78e1e8dc25fe0cf0e5e7e1c55e;hp=4ce614eb0362f2de028b6689c3befdcafb4f3f79;hpb=7c8a4874cd0e972cee31d1a27b6b7279631f62af;p=platal.git diff --git a/modules/marketing.php b/modules/marketing.php index 4ce614e..83dcd89 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -1,6 +1,6 @@ $this->make_hook('private', AUTH_MDP, 'admin'), 'marketing/public' => $this->make_hook('public', AUTH_COOKIE), + 'marketing/broken' => $this->make_hook('broken', AUTH_COOKIE), ); } function handler_marketing(&$page) { - global $globals; - $page->changeTpl('marketing/index.tpl'); $page->assign('xorg_title','Polytechnique.org - Marketing'); // Quelques statistiques - $res = $globals->xdb->query( + $res = XDB::query( "SELECT COUNT(*) AS vivants, COUNT(NULLIF(perms='admin' OR perms='user', 0)) AS inscrits, 100*COUNT(NULLIF(perms='admin' OR perms='user', 0))/COUNT(*) AS ins_rate, @@ -62,28 +61,25 @@ class MarketingModule extends PLModule $stats = $res->fetchOneAssoc(); $page->assign('stats', $stats); - $res = $globals->xdb->query("SELECT count(*) FROM auth_user_md5 WHERE date_ins > ". + $res = XDB::query("SELECT count(*) FROM auth_user_md5 WHERE date_ins > ". date('Ymd000000', strtotime('1 week ago'))); $page->assign('nbInsSem', $res->fetchOneCell()); - $res = $globals->xdb->query("SELECT count(*) FROM register_pending WHERE hash != 'INSCRIT'"); + $res = XDB::query("SELECT count(*) FROM register_pending WHERE hash != 'INSCRIT'"); $page->assign('nbInsEnCours', $res->fetchOneCell()); - $res = $globals->xdb->query("SELECT count(*) FROM register_marketing"); + $res = XDB::query("SELECT count(*) FROM register_marketing"); $page->assign('nbInsMarket', $res->fetchOneCell()); - $res = $globals->xdb->query("SELECT count(*) FROM register_mstats + $res = XDB::query("SELECT count(*) FROM register_mstats WHERE TO_DAYS(NOW()) - TO_DAYS(success) <= 7"); $page->assign('nbInsMarkOK', $res->fetchOneCell()); - - return PL_OK; } function handler_private(&$page, $uid = null, $action = null, $value = null) { global $globals; - $page->changeTpl('marketing/private.tpl'); if (is_null($uid)) { @@ -92,12 +88,12 @@ class MarketingModule extends PLModule $page->assign('path', 'marketing/private/'.$uid); - $res = $globals->xdb->query("SELECT nom, prenom, promo, matricule - FROM auth_user_md5 - WHERE user_id={?} AND perms='pending'", $uid); + $res = XDB::query("SELECT nom, prenom, promo, matricule + FROM auth_user_md5 + WHERE user_id={?} AND perms='pending'", $uid); if (list($nom, $prenom, $promo, $matricule) = $res->fetchOneRow()) { - require_once('register.inc.php'); + require_once('user.func.inc.php'); $matricule_X = get_X_mat($matricule); $page->assign('nom', $nom); $page->assign('prenom', $prenom); @@ -109,46 +105,49 @@ class MarketingModule extends PLModule } if ($action == 'del') { - $globals->xdb->execute('DELETE FROM register_marketing WHERE uid={?} AND email={?}', - $uid, $value); + Marketing::clear($uid, $value); } if ($action == 'rel') { - require_once('marketing.inc.php'); - list($to, $title, $text) = mark_text_mail($uid, $value); - $from = mark_from_mail($uid, $value); - $page->assign('rel_from_user', $from); - $page->assign('rel_from_staff', - "\"Equipe Polytechnique.org\" "); - $page->assign('rel_to', $to); - $page->assign('rel_title', $title); - $page->assign('rel_text', $text); - $page->assign('rel_email', $value); + $market = Marketing::get($uid, $value); + if ($market == null) { + $page->trigWarning("Aucun marketing n'a été effectué vers $value"); + } else { + $to = $market->user['to']; + $title = $market->getTitle(); + $text = $market->getText(); + $from = $market->sender_mail; + $page->assign('rel_from_user', $from); + $page->assign('rel_from_staff', + '"Equipe Polytechnique.org" mail->domain . '>'); + $page->assign('rel_to', $to); + $page->assign('rel_title', $title); + $page->assign('rel_text', $text); + $page->assign('rel_email', $value); + } } if ($action == 'relforce') { - require_once('marketing.inc.php'); - mark_send_mail($uid, $value, Post::get('from'), Post::get('to'), - Post::get('title'), Post::get('message')); - $page->trig("Mail envoyé"); + $market = Marketing::get($uid, Post::v('to')); + if (is_null($market)) { + $market = new Marketing($uid, Post::v('to'), 'default', null, 'staff'); + } + $market->send(Post::v('title'), Post::v('message')); + $page->trigSuccess("Mail envoyé"); } if ($action == 'insrel') { - require_once('marketing.inc.php'); - if (relance($uid)) { - $page->trig('relance faite'); + if (Marketing::relance($uid)) { + $page->trigSuccess('relance faite'); } } if ($action == 'add' && Post::has('email') && Post::has('type')) { - $globals->xdb->execute( - "INSERT INTO register_marketing - SET uid = {?}, sender = {?}, email = {?}, - date = NOW(), type = {?}", - $uid, Session::get('uid'), Post::get('email'), Post::get('type')); + $market = new Marketing($uid, Post::v('email'), 'default', null, Post::v('type'), S::v('uid')); + $market->add(false); } - $res = $globals->xdb->iterator( + $res = XDB::iterator( "SELECT r.*, a.alias FROM register_marketing AS r INNER JOIN aliases AS a ON (r.sender=a.id AND a.type = 'a_vie') @@ -156,51 +155,104 @@ class MarketingModule extends PLModule ORDER BY date", $uid); $page->assign('addr', $res); - $res = $globals->xdb->query("SELECT date, relance FROM register_pending - WHERE uid = {?}", $uid); - if (list($pending, $relance) = $res->fetchOneCell()) { + $res = XDB::query("SELECT date, relance FROM register_pending + WHERE uid = {?}", $uid); + if (list($pending, $relance) = $res->fetchOneRow()) { $page->assign('pending', $pending); $page->assign('relance', $relance); } + } + + function handler_broken(&$page, $uid = null) + { + require_once('user.func.inc.php'); + $page->changeTpl('marketing/broken.tpl'); + + if (is_null($uid)) { + return PL_NOT_FOUND; + } + $forlife = get_user_forlife($uid); + if (!$forlife) { + return PL_NOT_FOUND; + } elseif ($forlife == S::v('forlife')) { + pl_redirect('emails/redirect'); + } + + $res = Xdb::query("SELECT u.nom, u.prenom, u.promo, FIND_IN_SET('femme', u.flags) AS sexe, + u.deces = '0000-00-00' AS alive, a.alias AS forlife, b.alias AS bestalias, + IF(e.email IS NOT NULL, e.email, IF(FIND_IN_SET('googleapps', u.mail_storage), 'googleapps', NULL)) AS email, e.last + FROM auth_user_md5 AS u + INNER JOIN aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie') + INNER JOIN aliases AS b ON (b.id = u.user_id AND FIND_IN_SET('bestalias', b.flags)) + LEFT JOIN emails AS e ON (e.flags = 'active' AND e.uid = u.user_id) + WHERE a.alias = {?} + ORDER BY e.panne_level, e.last", $forlife); + if (!$res->numRows()) { + return PL_NOT_FOUND; + } + $user = $res->fetchOneAssoc(); + $page->assign('user', $user); - return PL_OK; + $email = null; + if (Post::has('mail')) { + require_once 'emails.inc.php'; + $email = valide_email(Post::v('mail')); + } + if (Post::has('valide') && isvalid_email_redirection($email)) { + // security stuff + check_email($email, "Proposition d'une adresse surveillee pour " . $user['forlife'] . " par " . S::v('forlife')); + $res = XDB::query("SELECT e.flags + FROM emails AS e + INNER JOIN aliases AS a ON (a.id = e.uid) + WHERE e.email = {?} AND a.alias = {?}", $email, $user['forlife']); + $state = $res->numRows() ? $res->fetchOneCell() : null; + if ($state == 'panne') { + $page->trigWarning("L'adresse que tu as fournie est l'adresse actuelle de {$user['prenom']} et est en panne."); + } elseif ($state == 'active') { + $page->trigWarning("L'adresse que tu as fournie est l'adresse actuelle de {$user['prenom']}"); + } elseif ($user['email'] && !trim(Post::v('comment'))) { + $page->trigError("Il faut que tu ajoutes un commentaire à ta proposition pour justifier le " + ."besoin de changer la redirection de " . $user['prenom']); + } else { + require_once 'validations.inc.php'; + $valid = new BrokenReq(S::i('uid'), $user, $email, trim(Post::v('comment'))); + $valid->submit(); + $page->assign('sent', true); + } + } elseif ($email) { + $page->trigError("L'adresse proposée n'est pas une adresse acceptable pour une redirection"); + } } function handler_promo(&$page, $promo = null) { - global $globals; - $page->changeTpl('marketing/promo.tpl'); if (is_null($promo)) { - $promo = Session::getInt('promo'); + $promo = S::v('promo'); } $page->assign('promo', $promo); $sql = "SELECT u.user_id, u.nom, u.prenom, u.last_known_email, u.matricule_ax, - IF(MAX(m.last)>p.relance, MAX(m.last), p.relance) AS dern_rel, p.email + IF(MAX(m.last) > p.relance, MAX(m.last), p.relance) AS dern_rel, p.email FROM auth_user_md5 AS u LEFT JOIN register_pending AS p ON p.uid = u.user_id LEFT JOIN register_marketing AS m ON m.uid = u.user_id WHERE u.promo = {?} AND u.deces = 0 AND u.perms='pending' GROUP BY u.user_id ORDER BY nom, prenom"; - $page->assign('nonins', $globals->xdb->iterator($sql, $promo)); - - return PL_OK; + $page->assign('nonins', XDB::iterator($sql, $promo)); } function handler_public(&$page, $uid = null) { - global $globals; - $page->changeTpl('marketing/public.tpl'); if (is_null($uid)) { return PL_NOT_FOUND; } - $res = $globals->xdb->query("SELECT nom, prenom, promo FROM auth_user_md5 + $res = XDB::query("SELECT nom, prenom, promo FROM auth_user_md5 WHERE user_id={?} AND perms='pending'", $uid); if (list($nom, $prenom, $promo) = $res->fetchOneRow()) { @@ -210,36 +262,29 @@ class MarketingModule extends PLModule if (Post::has('valide')) { require_once('xorg.misc.inc.php'); - - $email = trim(Post::get('mail')); - $res = $globals->xdb->query('SELECT COUNT(*) FROM register_marketing - WHERE uid={?} AND email={?}', $uid, $email); + $email = trim(Post::v('mail')); if (!isvalid_email_redirection($email)) { - $page->trig("Email invalide !"); - } elseif ($res->fetchOneCell()) { - $page->assign('already', true); + $page->trigError("Email invalide !"); } else { - $page->assign('ok', true); - $globals->xdb->execute( - "INSERT INTO register_marketing (uid,sender,email,date,last,nb,type,hash) - VALUES ({?}, {?}, {?}, NOW(), 0, 0, {?}, '')", - $uid, Session::getInt('uid'), $email, Post::get('origine')); - require_once('validations.inc.php'); - $req = new MarkReq(Session::getInt('uid'), $uid, $email, - Post::get('origine')=='user'); - $req->submit(); + // On cherche les marketings précédents sur cette adresse + // email, en se restreignant au dernier mois + + if (Marketing::get($uid, $email, true)) { + $page->assign('already', true); + } else { + $page->assign('ok', true); + check_email($email, "Une adresse surveillée est proposée au marketing par " . S::v('forlife')); + $market = new Marketing($uid, $email, 'default', null, Post::v('origine'), S::v('uid')); + $market->add(); + } } } } - - return PL_OK; } function handler_week(&$page, $sorting = 'per_promo') { - global $globals; - $page->changeTpl('marketing/this_week.tpl'); $sort = $sorting == 'per_promo' ? 'promo' : 'date_ins'; @@ -249,18 +294,14 @@ class MarketingModule extends PLModule INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') WHERE u.date_ins > ".date("Ymd000000", strtotime ('1 week ago'))." ORDER BY u.$sort DESC"; - $page->assign('ins', $globals->xdb->iterator($sql)); - - return PL_OK; + $page->assign('ins', XDB::iterator($sql)); } function handler_volontaire(&$page, $promo = null) { - global $globals; - $page->changeTpl('marketing/volontaire.tpl'); - $res = $globals->xdb->query( + $res = XDB::query( "SELECT DISTINCT a.promo FROM register_marketing AS m @@ -276,25 +317,21 @@ class MarketingModule extends PLModule INNER JOIN auth_user_md5 AS a ON a.user_id = m.uid AND a.promo = {?} INNER JOIN aliases AS sa ON (m.sender = sa.id AND sa.type='a_vie') ORDER BY a.nom"; - $page->assign('addr', $globals->xdb->iterator($sql, $promo)); + $page->assign('addr', XDB::iterator($sql, $promo)); } - - return PL_OK; } function handler_relance(&$page) { - global $globals; - $page->changeTpl('marketing/relance.tpl'); if (Post::has('relancer')) { - $res = $globals->xdb->query("SELECT COUNT(*) FROM auth_user_md5 WHERE deces=0"); + $res = XDB::query("SELECT COUNT(*) FROM auth_user_md5 WHERE deces=0"); $nbdix = $res->fetchOneCell(); $sent = Array(); foreach (array_keys($_POST['relance']) as $uid) { - if ($tmp = relance($uid, $nbdix)) { + if ($tmp = Marketing::relance($uid, $nbdix)) { $sent[] = $tmp.' a été relancé'; } } @@ -306,10 +343,9 @@ class MarketingModule extends PLModule INNER JOIN auth_user_md5 AS u ON r. uid = u.user_id WHERE hash!='INSCRIT' ORDER BY date DESC"; - $page->assign('relance', $globals->xdb->iterator($sql)); - - return PL_OK; + $page->assign('relance', XDB::iterator($sql)); } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>