X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Faxletter.php;h=67bdf555ac2d955c697bd8000ddedfc1441634e9;hb=12262f1306059765d8625a6752364679c8625d31;hp=9eb253ad60595960fa24d0c12870ec0f92660ee6;hpb=1f58ab8e0ad159b5a38c31da24c19288db254505;p=platal.git diff --git a/modules/axletter.php b/modules/axletter.php index 9eb253a..67bdf55 100644 --- a/modules/axletter.php +++ b/modules/axletter.php @@ -1,6 +1,6 @@ numRows()) { extract($res->fetchOneAssoc(), EXTR_OVERWRITE); - $subset_to = ($subset ? explode("\n", $subset) : null); + $subset_to = ($subset ? explode("\n", $subset) : array()); $subset = (count($subset_to) > 0); $saved = true; } else { @@ -153,18 +153,50 @@ class AXLetterModule extends PLModule } switch (@Post::v('valid')) { + case 'Vérifier les emails': + // Same as 'preview', but performs a test of all provided emails + if ($subset) { + require_once 'emails.inc.php'; + $ids = ids_from_mails($subset_to); + $nb_error = 0; + foreach ($subset_to as $e) { + if (!array_key_exists($e, $ids)) { + if ($nb_error == 0) { + $page->trigError("Emails inconnus :"); + } + $nb_error++; + $page->trigError($e); + } + } + if ($nb_error == 0) { + if (count($subset_to) == 1) { + $page->trigSuccess("L'email soumis a été reconnu avec succès."); + } else { + $page->trigSuccess("Les " . count($subset_to) . " emails soumis ont été reconnus avec succès."); + } + } else { + $page->trigError("Total : $nb_error erreur" . ($nb_error > 1 ? "s" : "") . " sur " . count($subset_to) . " adresses mail soumises."); + } + $page->trigSuccess("Les adresses soumises correspondent à un total de " . count(array_unique($ids)) . " camarades."); + } + // No break here, since Vérifier is a subcase of Aperçu. case 'Aperçu': $this->load('axletter.inc.php'); $al = new AXLetter(array($id, $short_name, $subject, $title, $body, $signature, $promo_min, $promo_max, $subset, $subset_rm, $echeance, 0, 'new')); - $al->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme')); + $al->toHtml($page, S::user()); break; case 'Confirmer': - XDB::execute("REPLACE INTO axletter - SET id = {?}, short_name = {?}, subject = {?}, title = {?}, body = {?}, - 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); + XDB::execute('INSERT INTO axletter (id, short_name, subject, title, body, signature, + promo_min, promo_max, echeance, subset, subset_rm) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}) + ON DUPLICATE KEY UPDATE short_name = VALUES(short_name), subject = VALUES(subject), title = VALUES(title), + body = VALUES(body), signature = VALUES(signature), promo_min = VALUES(promo_min), + promo_max = VALUES(promo_max), echeance = VALUES(echeance), subset = VALUES(subset), + subset_rm = VALUES(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(); @@ -180,14 +212,10 @@ class AXLetterModule extends PLModule . "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 uid + FROM axletter_rights')); + foreach ($users as $user) { + $mailer->addTo($user); } $mailer->send(); } @@ -278,15 +306,14 @@ class AXLetterModule extends PLModule try { $nl = new AXLetter($nid); + $user =& S::user(); if (Get::has('text')) { - $nl->toText($page, S::v('prenom'), S::v('nom'), S::v('femme')); + $nl->toText($page, $user); } else { - $nl->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme')); + $nl->toHtml($page, $user); } if (Post::has('send')) { - $nl->sendTo(S::user()->login(), S::user()->bestEmail(), - S::v('prenom'), S::v('nom'), - S::v('femme'), S::v('mail_fmt') != 'texte'); + $nl->sendTo($user); } } catch (MailNotFound $e) { return PL_NOT_FOUND; @@ -320,16 +347,13 @@ 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, u.hruid - FROM axletter_rights AS ar - INNER JOIN auth_user_md5 AS u USING(user_id)"); - $page->assign('admins', $res); + $page->assign('admins', User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT uid + FROM axletter_rights'))); $importer = new CSVImporter('axletter_ins'); - $importer->registerFunction('user_id', 'email vers Id X.org', array($this, 'idFromMail')); + $importer->registerFunction('uid', 'email vers Id X.org', array($this, 'idFromMail')); $importer->forceValue('hash', array($this, 'createHash')); - $importer->apply($page, "admin/axletter", array('user_id', 'email', 'prenom', 'nom', 'promo', 'flag', 'hash')); + $importer->apply($page, "admin/axletter", array('uid', 'email', 'prenom', 'nom', 'promo', 'flag', 'hash')); } function idFromMail($line, $key, $relation = null) @@ -345,36 +369,9 @@ 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, $relation)