X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Faxletter.php;h=b47f1c5b7430e0c69bfab50240d738791698e244;hb=0554f70a322c69cf35b622bcf76f2c25013c43c1;hp=d3f1aa422b71ba7804a1b1e62c7b1b37f8346c3d;hpb=5b2c99878fc75a6acffb2239e284f2cb1782142c;p=platal.git diff --git a/modules/axletter.php b/modules/axletter.php index d3f1aa4..b47f1c5 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'), ); } @@ -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) : array()); + $subset = (count($subset_to) > 0); $saved = true; } else { XDB::execute("INSERT INTO axletter SET id = NULL"); @@ -148,18 +153,45 @@ 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."); + } + // XXX : 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, $echeance, 0, 'new')); - $al->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme')); + $promo_min, $promo_max, $subset, $subset_rm, $echeance, 0, 'new')); + $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 = {?}", - $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(); @@ -175,7 +207,7 @@ class AXLetterModule extends PLModule . "https://www.polytechnique.org/ax/edit\n" . "-- \n" . "Association Polytechnique.org\n"); - $users = User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT user_id + $users = User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT uid FROM axletter_rights')); foreach ($users as $user) { $mailer->addTo($user); @@ -197,12 +229,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 = ''; @@ -307,16 +342,16 @@ class AXLetterModule extends PLModule } $page->changeTpl('axletter/admin.tpl'); - $page->assign('admins', User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT user_id + $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) + function idFromMail($line, $key, $relation = null) { static $field; global $globals; @@ -334,7 +369,7 @@ class AXLetterModule extends PLModule return count($id) == 1 ? $id[0] : 0; } - function createHash($line, $key) + function createHash($line, $key, $relation) { $hash = implode(time(), $line) . rand(); $hash = md5($hash);