X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=5c52a44e43e28441f57e39003425e3d79212be13;hb=3dad95dda6e1f531a98ef326c6c43fde036d4727;hp=19865687a6a3bfe3a6331493e23b61e99ccd6432;hpb=c441b5ed3338eed23141f510d89da30fbd81f48a;p=platal.git diff --git a/modules/marketing.php b/modules/marketing.php index 1986568..5c52a44 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -1,6 +1,6 @@ changeTpl('marketing/private.tpl'); if (is_null($uid)) { @@ -87,12 +88,12 @@ class MarketingModule extends PLModule $page->assign('path', 'marketing/private/'.$uid); - $res = 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); @@ -104,43 +105,46 @@ class MarketingModule extends PLModule } if ($action == 'del') { - 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::v('from'), Post::v('to'), - Post::v('title'), Post::v('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')) { - XDB::execute( - "INSERT INTO register_marketing - SET uid = {?}, sender = {?}, email = {?}, - date = NOW(), type = {?}", - $uid, S::v('uid'), Post::v('email'), Post::v('type')); + $market = new Marketing($uid, Post::v('email'), 'default', null, Post::v('type'), S::v('uid')); + $market->add(false); } $res = XDB::iterator( @@ -152,8 +156,8 @@ class MarketingModule extends PLModule $page->assign('addr', $res); $res = XDB::query("SELECT date, relance FROM register_pending - WHERE uid = {?}", $uid); - if (list($pending, $relance) = $res->fetchOneCell()) { + WHERE uid = {?}", $uid); + if (list($pending, $relance) = $res->fetchOneRow()) { $page->assign('pending', $pending); $page->assign('relance', $relance); } @@ -174,31 +178,49 @@ class MarketingModule extends PLModule pl_redirect('emails/redirect'); } - $res = Xdb::query("SELECT u.nom, u.prenom, u.promo, a.alias AS forlife + $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 - WHERE a.alias = {?}", $forlife); + 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); - $email = trim(Post::v('mail')); - if (Post::has('valide') && strlen($email) > 0) { - require_once('diogenes/diogenes.hermes.inc.php'); - $mailer = new HermesMailer(); - $mailer->setFrom(S::v('bestalias') . '@polytechnique.org'); - $mailer->addTo('resetpass@polytechnique.org'); - $mailer->setSubject("Proposition d'adresse mail pour " . $user['forlife']); - - $message = S::v('nom') . ' ' . S::v('prenom') . ' (X' . S::v('promo') . ') ' - . 'propose l\'adresse suivante pour un camarade qui n\'a plus de ' - . 'redirections actives :' . "\n\n" - . '* ' . $user['forlife'] . ' => ' . $email . "\n"; - $mailer->setTxtBody(wordwrap($message, 78)); - $mailer->send(); - $page->assign('sent', true); + $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 state + 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"); } } @@ -212,7 +234,7 @@ class MarketingModule extends PLModule $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 @@ -240,25 +262,22 @@ class MarketingModule extends PLModule if (Post::has('valide')) { require_once('xorg.misc.inc.php'); - $email = trim(Post::v('mail')); - $res = XDB::query('SELECT COUNT(*) FROM register_marketing - WHERE uid={?} AND email={?}', $uid, $email); 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); - XDB::execute( - "INSERT INTO register_marketing (uid,sender,email,date,last,nb,type,hash) - VALUES ({?}, {?}, {?}, NOW(), 0, 0, {?}, '')", - $uid, S::v('uid'), $email, Post::v('origine')); - require_once('validations.inc.php'); - $req = new MarkReq(S::v('uid'), $uid, $email, - Post::v('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(); + } } } } @@ -307,15 +326,13 @@ class MarketingModule extends PLModule $page->changeTpl('marketing/relance.tpl'); if (Post::has('relancer')) { - require_once 'marketing.inc.php'; - $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)) { - $sent[] = $tmp.' a été relancé'; + if ($tmp = Marketing::relance($uid, $nbdix)) { + $sent[] = $tmp.' a été relancé'; } } $page->assign('sent', $sent); @@ -330,4 +347,5 @@ class MarketingModule extends PLModule } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>