X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fnewsletter.inc.php;h=a51aeae68a207905c4864c3fc02e9d9013c89b10;hb=468a27eb3d72b30bb84a244eb4d02ab9fb36610b;hp=0b521b4a1ed2d8c73b4b3f6e2726a27a77c95541;hpb=b0653ad8f359685deb843d14f3103288997ec0c3;p=platal.git diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index 0b521b4..a51aeae 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -46,6 +46,7 @@ class NewsLetter const GROUP_XORG = 'Polytechnique.org'; const GROUP_AX = 'AX'; const GROUP_EP = 'Ecole'; + const GROUP_FX = 'FX'; // Searches on mutiple fields const SEARCH_ALL = 'all'; @@ -105,15 +106,13 @@ class NewsLetter /** Retrieve all newsletters * @return An array of $id => NewsLetter objects */ - public static function getAll() + public static function getAll($sort = 'id', $order = 'ASC') { - $res = XDB::query('SELECT id - FROM newsletters'); - $nls = array(); - foreach ($res->fetchColumn() as $id) { - $nls[$id] = new NewsLetter($id); - } - return $nls; + $res = XDB::fetchAllAssoc('SELECT n.id, g.nom AS group_name, n.name, n.custom_css, n.criteria, g.diminutif AS group_link + FROM newsletters AS n + INNER JOIN groups AS g ON (n.group_id = g.id) + ORDER BY ' . $sort . ' ' . $order); + return $res; } // }}} @@ -400,25 +399,32 @@ class NewsLetter /** Get the count of subscribers to the NL. * @return Number of subscribers. */ - public function subscriberCount() + public function subscriberCount($lost = null, $sex = null, $grade = null, $first_promo = null, $last_promo = null) { - return XDB::fetchOneCell('SELECT COUNT(uid) - FROM newsletter_ins - WHERE nlid = {?}', $this->id); + $cond = new PFC_And(new UFC_NLSubscribed($this->id)); + if (!is_null($sex)) { + $cond->addChild(new UFC_Sex($sex)); + } + if (!is_null($grade)) { + $cond->addChild(new UFC_Promo('>=', $grade, $first_promo)); + $cond->addChild(new UFC_Promo('<=', $grade, $last_promo)); + } + if (!($lost === null)) { + if ($lost === true) { + $cond->addChild(new PFC_Not(new UFC_HasEmailRedirect())); + } else { + $cond->addChild(new UFC_HasEmailRedirect()); + } + } + $uf = new UserFilter($cond); + return $uf->getTotalCount(); } /** Get the count of subscribers with non valid redirection. */ - public function lostSubscriberCount() - { - return XDB::fetchOneCell('SELECT COUNT(DISTINCT(n.uid)) - FROM newsletter_ins AS n - INNER JOIN accounts AS a ON (n.uid = a.uid) - INNER JOIN account_types AS t ON (t.type = a.type) - LEFT JOIN email_redirect_account AS r ON (r.uid = a.uid AND r.flags = \'active\' AND r.broken_level < 3 - AND r.type != \'imap\' AND r.type != \'homonym\') - WHERE n.nlid = {?} AND r.redirect IS NULL AND a.state = \'active\' AND FIND_IN_SET(\'mail\', t.perms)', - $this->id); + public function lostSubscriberCount($sex = null) + { + return $this->subscriberCount(true, $sex); } /** Get the number of subscribers to the NL whose last received mailing was $last. @@ -546,6 +552,8 @@ class NewsLetter return 'ax'; case self::GROUP_EP: return 'epletter'; + case self::GROUP_FX: + return 'fxletter'; default: // Don't display groups NLs on X.org assert(!$enforce_xnet); @@ -570,12 +578,51 @@ class NewsLetter return 'ax/admin'; case self::GROUP_EP: return 'epletter/admin'; + case self::GROUP_FX: + return 'fxletter/admin'; default: // Don't display groups NLs on X.org assert(!$enforce_xnet); } } + /** Get the prefix to use for all 'stat' pages of this NL. + */ + public function statPrefix($enforce_xnet = true, $with_group = true) + { + if (!empty($GLOBALS['IS_XNET_SITE'])) { + if ($with_group) { + return $this->group . '/stat/nl'; + } else { + return 'stat/nl'; + } + } + switch ($this->group) { + case self::GROUP_XORG: + return 'stat/newsletter'; + case self::GROUP_AX: + return 'ax/stat'; + case self::GROUP_EP: + return 'epletter/stat'; + case self::GROUP_FX: + return 'fxletter/stat'; + default: + // Don't display groups NLs on X.org + assert(!$enforce_xnet); + } + } + + /** Get links for nl pages. + */ + public function adminLinks() + { + return array( + 'index' => array('link' => $this->prefix(), 'title' => 'Archives'), + 'admin' => array('link' => $this->adminPrefix(), 'title' => 'Administrer'), + 'stats' => array('link' => $this->statPrefix(), 'title' => 'Statistiques') + ); + } + /** Hack used to remove "admin" links on X.org page on X.net * The 'admin' links are enabled for all pages, except for X.org when accessing NL through X.net */ @@ -602,6 +649,7 @@ class NewsLetter case self::GROUP_XORG: case self::GROUP_AX: case self::GROUP_EP: + case self::GROUP_FX: return false; default: return true; @@ -637,6 +685,7 @@ class NLIssue public $send_before; // Date at which issue should be sent public $head; // Foreword of the issue (or body for letters with no articles) public $signature; // Signature of the letter + public $reply_to; // Adress to reply to the message (can be empty) public $arts = array(); // Articles of the issue const BATCH_SIZE = 60; // Number of emails to send every minute. @@ -661,7 +710,7 @@ class NLIssue { // Load this issue $res = XDB::query('SELECT nlid, short_name, date, send_before, state, sufb_json, - title, mail_title, head, signature + title, mail_title, head, signature, reply_to FROM newsletter_issues WHERE id = {?}', $id); @@ -684,6 +733,7 @@ class NLIssue $this->title_mail = $issue['mail_title']; $this->head = $issue['head']; $this->signature = $issue['signature']; + $this->reply_to = $issue['reply_to']; $this->sufb = $this->importJSonStoredUFB($issue['sufb_json']); if ($fetch_articles) { @@ -886,6 +936,7 @@ class NLIssue // }}} // {{{ Edition, articles + const ERROR_INVALID_REPLY_TO = 'invalid_reply_to'; const ERROR_INVALID_SHORTNAME = 'invalid_shortname'; const ERROR_INVALID_UFC = 'invalid_ufc'; const ERROR_TOO_LONG_UFC = 'too_long_ufc'; @@ -905,6 +956,12 @@ class NLIssue 'signature' => $this->signature, ); + if (!empty($this->reply_to) && !isvalid_email($this->reply_to)) { + $errors[] = self::ERROR_INVALID_REPLY_TO ; + } else { + $fields['reply_to'] = $this->reply_to; + } + if ($this->isEditable()) { $fields['date'] = $this->date; if (!preg_match('/^[-a-z0-9]+$/i', $this->shortname) || is_numeric($this->shortname)) { @@ -1181,6 +1238,9 @@ class NLIssue $mailer->assign('user', $user); $mailer->assign('prefix', null); $mailer->assign('hash', $hash); + if (!empty($this->reply_to)) { + $mailer->addHeader('Reply-To', $this->reply_to); + } $mailer->sendTo($user); } @@ -1219,7 +1279,7 @@ class NLIssue $this->id); $ufc = new PFC_And($this->getRecipientsUFC(), new UFC_NLSubscribed($this->nl->id, $this->id), new UFC_HasValidEmail()); - $uf = new UserFilter($ufc, array(new UFO_IsAdmin(), new UFO_Uid())); + $uf = new UserFilter($ufc, array(new UFO_IsAdmin(true), new UFO_Uid())); $limit = new PlLimit(self::BATCH_SIZE); $global_sent = array(); @@ -1231,7 +1291,7 @@ class NLIssue } foreach ($users as $user) { if (array_key_exists($user->id(), $global_sent)) { - Platal::kill('Sending the same newsletter issue ' . $this->id . ' to user ' . $user->id() . ' twice, something must be wrong.'); + Platal::page()->kill('Sending the same newsletter issue ' . $this->id . ' to user ' . $user->id() . ' twice, something must be wrong.'); } $sent[] = $user->id(); $global_sent[$user->id()] = true;