X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Faxletter.php;h=206fe6218bdf7cbed845508bbc0653ac194bd453;hb=fe13bc1d7ba9f72d452ec07baf8538a74b7c67b8;hp=fd56ea15d3211c9f3ec9f962a61dbe356f0bda0e;hpb=2925df1bd6cb08c1f29822019fcb82e59f63f8a3;p=platal.git diff --git a/modules/axletter.php b/modules/axletter.php index fd56ea1..206fe62 100644 --- a/modules/axletter.php +++ b/modules/axletter.php @@ -1,6 +1,6 @@ $this->make_hook('index', AUTH_COOKIE), + 'ax' => $this->make_hook('index', AUTH_COOKIE), 'ax/out' => $this->make_hook('out', AUTH_PUBLIC), 'ax/show' => $this->make_hook('show', AUTH_COOKIE), 'ax/edit' => $this->make_hook('submit', AUTH_MDP), 'ax/edit/cancel' => $this->make_hook('cancel', AUTH_MDP), 'ax/edit/valid' => $this->make_hook('valid', AUTH_MDP), - 'admin/axletter' => $this->make_hook('admin', AUTH_MDP, 'admin'), + 'admin/axletter' => $this->make_hook('admin', AUTH_MDP, 'admin'), ); } @@ -43,17 +43,17 @@ class AXLetterModule extends PLModule return $this->handler_index($page, 'out'); } } - require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; + $this->load('axletter.inc.php'); $page->changeTpl('axletter/unsubscribe.tpl'); $page->assign('success', AXLetter::unsubscribe($hash, true)); } function handler_index(&$page, $action = null) { - require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; + $this->load('axletter.inc.php'); $page->changeTpl('axletter/index.tpl'); - $page->setTitle('Polytechnique.org - Envois de l\'AX'); + $page->setTitle('Envois de l\'AX'); switch ($action) { case 'in': AXLetter::subscribe(); break; @@ -73,7 +73,7 @@ class AXLetterModule extends PLModule function handler_submit(&$page, $action = null) { - require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; + $this->load('axletter.inc.php'); if (!AXLetter::hasPerms()) { return PL_FORBIDDEN; } @@ -90,6 +90,9 @@ class AXLetterModule extends PLModule $signature = trim(Post::v('signature')); $promo_min = Post::i('promo_min'); $promo_max = Post::i('promo_max'); + $subset_to = preg_split("/[ ,;\:\n\r]+/", Post::v('subset_to'), -1, PREG_SPLIT_NO_EMPTY); + $subset = (count($subset_to) > 0); + $subset_rm = Post::b('subset_rm'); $echeance = Post::has('echeance_date') ? preg_replace('/^(\d\d\d\d)(\d\d)(\d\d)$/', '\1-\2-\3', Post::v('echeance_date')) . ' ' . Post::v('echeance_time') : Post::v('echeance'); @@ -100,6 +103,8 @@ class AXLetterModule extends PLModule $res = XDB::query("SELECT * FROM axletter WHERE FIND_IN_SET('new', bits)"); if ($res->numRows()) { extract($res->fetchOneAssoc(), EXTR_OVERWRITE); + $subset_to = ($subset ? explode("\n", $subset) : null); + $subset = (count($subset_to) > 0); $saved = true; } else { XDB::execute("INSERT INTO axletter SET id = NULL"); @@ -149,40 +154,36 @@ class AXLetterModule extends PLModule switch (@Post::v('valid')) { case 'Aperçu': - require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; + $this->load('axletter.inc.php'); $al = new AXLetter(array($id, $short_name, $subject, $title, $body, $signature, - $promo_min, $promo_max, $echeance, 0, 'new')); + $promo_min, $promo_max, $subset, $subset_rm, $echeance, 0, 'new')); $al->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme')); break; case 'Confirmer': XDB::execute("REPLACE INTO axletter SET id = {?}, short_name = {?}, subject = {?}, title = {?}, body = {?}, - signature = {?}, promo_min = {?}, promo_max = {?}, echeance = {?}", - $id, $short_name, $subject, $title, $body, $signature, $promo_min, $promo_max, $echeance); + signature = {?}, promo_min = {?}, promo_max = {?}, echeance = {?}, subset = {?}, subset_rm = {?}", + $id, $short_name, $subject, $title, $body, $signature, $promo_min, $promo_max, $echeance, $subset ? implode("\n", $subset_to) : null, $subset_rm); if (!$saved) { global $globals; $mailer = new PlMailer(); $mailer->setFrom("support@" . $globals->mail->domain); - $mailer->setSubject("Un nouveau projet de mail de l'AX vient d'être proposé"); - $mailer->setTxtBody("Un nouveau mail vient d'être rédigé en prévision d'un envoi prochain. Vous pouvez " + $mailer->setSubject("Un nouveau projet d'email de l'AX vient d'être proposé"); + $mailer->setTxtBody("Un nouvel email vient d'être rédigé en prévision d'un envoi prochain. Vous pouvez " . "le modifier jusqu'à ce qu'il soit verrouillé pour l'envoi\n\n" - . "Le sujet du mail : $subject\n" + . "Le sujet de l'email : $subject\n" . "L'échéance d'envoi est fixée à $echeance.\n" - . "Le mail pourra néanmoins partir avant cette échéance si un administrateur de " + . "L'email pourra néanmoins partir avant cette échéance si un administrateur de " . "Polytechnique.org le valide.\n\n" - . "Pour modifier, valider ou annuler le mail :\n" + . "Pour modifier, valider ou annuler l'email :\n" . "https://www.polytechnique.org/ax/edit\n" . "-- \n" . "Association Polytechnique.org\n"); - $res = XDB::iterRow("SELECT IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, - u.prenom, a.alias AS bestalias - FROM axletter_rights AS ar - INNER JOIN auth_user_md5 AS u USING(user_id) - INNER JOIN aliases AS a ON (u.user_id = a.id - AND FIND_IN_SET('bestalias', a.flags))"); - while (list($nom, $prenom, $alias) = $res->next()) { - $mailer->addTo("$nom $prenom <$alias@{$globals->mail->domain}>"); + $users = User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT user_id + FROM axletter_rights')); + foreach ($users as $user) { + $mailer->addTo($user); } $mailer->send(); } @@ -201,12 +202,15 @@ class AXLetterModule extends PLModule $page->assign('signature', $signature); $page->assign('promo_min', $promo_min); $page->assign('promo_max', $promo_max); + $page->assign('subset_to', implode("\n", $subset_to)); + $page->assign('subset', $subset); + $page->assign('subset_rm', $subset_rm); $page->assign('echeance', $echeance); $page->assign('echeance_date', $echeance_date); $page->assign('echeance_time', $echeance_time); $page->assign('saved', $saved); $page->assign('new', $new); - $page->assign('is_xorg', S::has_perms()); + $page->assign('is_xorg', S::admin()); if (!$saved) { $select = ''; @@ -225,7 +229,7 @@ class AXLetterModule extends PLModule function handler_cancel(&$page, $force = null) { - require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; + $this->load('axletter.inc.php'); if (!AXLetter::hasPerms() || !S::has_xsrf_token()) { return PL_FORBIDDEN; } @@ -240,12 +244,12 @@ class AXLetterModule extends PLModule return; } - $page->kill("L'envoi de l'annonce {$al->title()} est annulé"); + $page->killSuccess("L'envoi de l'annonce {$al->title()} est annulé."); } function handler_valid(&$page, $force = null) { - require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; + $this->load('axletter.inc.php'); if (!AXLetter::hasPerms() || !S::has_xsrf_token()) { return PL_FORBIDDEN; } @@ -260,30 +264,33 @@ class AXLetterModule extends PLModule return; } - $page->kill("L'envoi de l'annonce aura lieu dans l'heure qui vient."); + $page->killSuccess("L'envoi de l'annonce aura lieu dans l'heure qui vient."); } function handler_show(&$page, $nid = 'last') { - require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; + $this->load('axletter.inc.php'); $page->changeTpl('axletter/show.tpl'); - $nl = new AXLetter($nid); - if (Get::has('text')) { - $nl->toText($page, S::v('prenom'), S::v('nom'), S::v('femme')); - } else { - $nl->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme')); - } - if (Post::has('send')) { - $nl->sendTo(S::v('prenom'), S::v('nom'), - S::v('bestalias'), S::v('femme'), - S::v('mail_fmt') != 'texte'); + try { + $nl = new AXLetter($nid); + $user =& S::user(); + if (Get::has('text')) { + $nl->toText($page, $user); + } else { + $nl->toHtml($page, $user); + } + if (Post::has('send')) { + $nl->sendTo($user); + } + } catch (MailNotFound $e) { + return PL_NOT_FOUND; } } function handler_admin(&$page, $action = null, $uid = null) { - require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; + $this->load('axletter.inc.php'); if (Post::has('action')) { $action = Post::v('action'); $uid = Post::v('uid'); @@ -308,12 +315,8 @@ class AXLetterModule extends PLModule } $page->changeTpl('axletter/admin.tpl'); - $res = XDB::iterator("SELECT IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, - u.prenom, u.promo, a.alias AS forlife - FROM axletter_rights AS ar - INNER JOIN auth_user_md5 AS u USING(user_id) - INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type = 'a_vie')"); - $page->assign('admins', $res); + $page->assign('admins', User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT user_id + FROM axletter_rights'))); $importer = new CSVImporter('axletter_ins'); $importer->registerFunction('user_id', 'email vers Id X.org', array($this, 'idFromMail')); @@ -321,7 +324,7 @@ class AXLetterModule extends PLModule $importer->apply($page, "admin/axletter", array('user_id', 'email', 'prenom', 'nom', 'promo', 'flag', 'hash')); } - function idFromMail($line, $key) + function idFromMail($line, $key, $relation = null) { static $field; global $globals; @@ -334,39 +337,12 @@ class AXLetterModule extends PLModule } } } - $email = $line[$field]; - if (strpos($email, '@') === false) { - $user = $email; - $domain = $globals->mail->domain2; - } else { - list($user, $domain) = explode('@', $email); - } - if ($domain != $globals->mail->domain && $domain != $globals->mail->domain2 - && $domain != $globals->mail->alias_dom && $domain != $globals->mail->alias_dom2) { - $res = XDB::query("SELECT uid FROM emails WHERE email = {?}", $email); - if ($res->numRows() == 1) { - return $res->fetchOneCell(); - } - return '0'; - } - list($user) = explode('+', $user); - list($user) = explode('_', $user); - if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) { - $res = XDB::query("SELECT a.id - FROM virtual AS v - INNER JOIN virtual_redirect AS r USING(vid) - INNER JOIN aliases AS a ON (a.type = 'a_vie' - AND r.redirect = CONCAT(a.alias, '@{$globals->mail->domain2}')) - WHERE v.alias = CONCAT({?}, '@{$globals->mail->alias_dom}')", $user); - $id = $res->fetchOneCell(); - return $id ? $id : '0'; - } - $res = XDB::query("SELECT id FROM aliases WHERE alias = {?}", $user); - $id = $res->fetchOneCell(); - return $id ? $id : '0'; + $uf = new UserFilter(new UFC_Email($line[$field])); + $id = $uf->getUIDs(); + return count($id) == 1 ? $id[0] : 0; } - function createHash($line, $key) + function createHash($line, $key, $relation) { $hash = implode(time(), $line) . rand(); $hash = md5($hash);