X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fnewsletter.inc.php;h=7675813d60de78be035c723cf9c6c59b83964e42;hb=c9910f7559bb0cfd787b4fb73f864000f28e38cc;hp=1f42a2dd168cd41aaa32df415fae95608f356713;hpb=00278954793e5c63e09fa5d11f3b88f2da2f530b;p=platal.git diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index 1f42a2d..7675813 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -47,6 +47,11 @@ class NewsLetter const GROUP_AX = 'AX'; const GROUP_EP = 'Ecole'; + // Searches on mutiple fields + const SEARCH_ALL = 'all'; + const SEARCH_TITLE = 'title'; + + // {{{ Constructor, NewsLetter retrieval (forGroup, getAll) public function __construct($id) @@ -174,7 +179,7 @@ class NewsLetter } } - return new NLIssue($id, &$this); + return new NLIssue($id, $this); } /** Create a new, empty, pending newsletter issue @@ -231,22 +236,83 @@ class NewsLetter } /** Return the latest pending issue of the newsletter. + * @p $create Whether to create an empty issue if no pending issue exist. * @return Either null, or a NL object. */ - public function getPendingIssue() + public function getPendingIssue($create = false) { $res = XDB::query('SELECT MAX(id) FROM newsletter_issues WHERE nlid = {?} AND state = \'new\'', $this->id); - if ($res->numRows()) { - $id = $res->fetchOneCell(); + $id = $res->fetchOneCell(); + if ($id != null) { + return new NLIssue($id, $this); + } else if ($create) { + $id = $this->createPending(); return new NLIssue($id, $this); } else { return null; } } + /** Returns a list of either issues or articles corresponding to the search. + * @p $search The searched pattern. + * @p $field The fields where to search, if none given, search in all possible fields. + * @return The list of object found. + */ + public function issueSearch($search, $field, $user) + { + $search = XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $search); + if ($field == self::SEARCH_ALL) { + $where = '(title ' . $search . ' OR mail_title ' . $search . ' OR head ' . $search . ' OR signature ' . $search . ')'; + } elseif ($field == self::SEARCH_TITLE) { + $where = '(title ' . $search . ' OR mail_title ' . $search . ')'; + } else { + $where = $field . $search; + } + $list = XDB::fetchColumn('SELECT DISTINCT(id) + FROM newsletter_issues + WHERE nlid = {?} AND state = \'sent\' AND ' . $where . ' + ORDER BY date DESC', + $this->id); + + $issues = array(); + foreach ($list as $id) { + $issue = new NLIssue($id, $this, false); + if ($issue->checkUser($user)) { + $issues[] = $issue; + } + } + return $issues; + } + + public function articleSearch($search, $field, $user) + { + $search = XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $search); + if ($field == self::SEARCH_ALL) { + $where = '(a.title ' . $search . ' OR a.body ' . $search . ' OR a.append ' . $search . ')'; + } else { + $where = 'a.' . $field . $search; + } + $list = XDB::fetchAllAssoc('SELECT i.short_name, a.aid, i.id, a.title + FROM newsletter_art AS a + INNER JOIN newsletter_issues AS i ON (a.id = i.id) + WHERE i.nlid = {?} AND i.state = \'sent\' AND ' . $where . ' + GROUP BY a.id, a.aid + ORDER BY i.date DESC, a.aid', + $this->id); + + $articles = array(); + foreach ($list as $item) { + $issue = new NLIssue($item['id'], $this, false); + if ($issue->checkUser($user)) { + $articles[] = $item; + } + } + return $articles; + } + // }}} // {{{ Subscription related function @@ -429,7 +495,7 @@ class NewsLetter /** Get the prefix leading to the page for this NL * Only X.org / AX / X groups may be seen on X.org. */ - public function prefix() + public function prefix($enforce_xnet=true) { if (!empty($GLOBALS['IS_XNET_SITE'])) { return $this->group . '/nl'; @@ -443,13 +509,13 @@ class NewsLetter return 'epletter'; default: // Don't display groups NLs on X.org - assert(false); + assert(!$enforce_xnet); } } /** Get the prefix to use for all 'admin' pages of this NL. */ - public function adminPrefix() + public function adminPrefix($enforce_xnet=true) { if (!empty($GLOBALS['IS_XNET_SITE'])) { return $this->group . '/admin/nl'; @@ -463,7 +529,7 @@ class NewsLetter return 'epletter/admin'; default: // Don't display groups NLs on X.org - assert(false); + assert(!$enforce_xnet); } } @@ -662,6 +728,11 @@ class NLIssue WHERE id = {?}', $this->id); if ($success) { + global $globals; + $mailer = new PlMailer('newsletter/notify_scheduled.mail.tpl'); + $mailer->assign('issue', $this); + $mailer->assign('base', $globals->baseurl); + $mailer->send(); $this->refresh(); } return $success; @@ -677,7 +748,7 @@ class NLIssue { if ($this->state == self::STATE_PENDING) { $success = XDB::execute('UPDATE newsletter_issues - SET send_before = NULL, state = \'new\' + SET state = \'new\' WHERE id = {?}', $this->id); if ($success) { $this->refresh(); @@ -827,9 +898,9 @@ class NLIssue } /** Save an article - * @p &$a A reference to a NLArticle object (will be modified once saved) + * @p $a A reference to a NLArticle object (will be modified once saved) */ - public function saveArticle(&$a) + public function saveArticle($a) { $this->fetchArticles(); @@ -923,7 +994,7 @@ class NLIssue * @p $page Smarty object * @return Either 'true' (if CSS was added to a page) or the raw CSS to add (when $page is null) */ - public function css(&$page = null) + public function css($page = null) { if (!is_null($page)) { $page->addCssLink($this->nl->cssFile()); @@ -938,7 +1009,7 @@ class NLIssue * @p $page Smarty object (using the $this->nl->tplFile() template) * @p $user User to use when rendering the template */ - public function toText(&$page, $user) + public function toText($page, $user) { $this->fetchArticles(); @@ -955,7 +1026,7 @@ class NLIssue * @p $page Smarty object (using the $this->nl->tplFile() template) * @p $user User to use when rendering the template */ - public function toHtml(&$page, $user) + public function toHtml($page, $user) { $this->fetchArticles(); @@ -971,7 +1042,7 @@ class NLIssue /** Set all 'common' data for the page (those which are required for both web and email rendering) * @p $smarty Smarty object (e.g page) which should be filled */ - protected function assignData(&$smarty) + protected function assignData($smarty) { $this->fetchArticles(); @@ -981,7 +1052,15 @@ class NLIssue // }}} // {{{ Mailing - + + /** Check whether this issue is empty + * An issue is empty if the email has no title (or the default one), or no articles and an empty head. + */ + public function isEmpty() + { + return $this->title_mail == '' || $this->title_mail == 'to be continued' || (count($this->arts) == 0 && strlen($this->head) == 0); + } + /** Retrieve the 'Send before' date, in a clean format. */ public function getSendBeforeDate() @@ -1073,9 +1152,9 @@ class NLIssue WHERE id = {?}', $this->id); - $ufc = new PFC_And($this->getRecipientsUFC(), new UFC_NLSubscribed($this->nl->id, $this->id), new UFC_HasEmailRedirect()); + $ufc = new PFC_And($this->getRecipientsUFC(), new UFC_NLSubscribed($this->nl->id, $this->id), new UFC_HasValidEmail()); $emailsCount = 0; - $uf = new UserFilter($ufc); + $uf = new UserFilter($ufc, array(new UFO_IsAdmin(), new UFO_Uid())); $limit = new PlLimit(self::BATCH_SIZE); while (true) { @@ -1107,7 +1186,8 @@ class NLIssue class NLArticle { // Maximum number of lines per article - const MAX_LINES_PER_ARTICLE = 9; + const MAX_LINES_PER_ARTICLE = 8; + const MAX_CHARACTERS_PER_LINE = 68; // {{{ properties @@ -1195,17 +1275,30 @@ class NLArticle public function check() { - $text = MiniWiki::WikiToText($this->body); - $arr = explode("\n",wordwrap($text,68)); - $c = 0; - foreach ($arr as $line) { - if (trim($line)) { - $c++; + $rest = $this->remain(); + + return $rest['remaining_lines'] >= 0; + } + + // }}} + // {{{ function remain() + + public function remain() + { + $text = MiniWiki::WikiToText($this->body); + $array = explode("\n", wordwrap($text, self::MAX_CHARACTERS_PER_LINE)); + $lines_count = 0; + foreach ($array as $line) { + if (trim($line) != '') { + ++$lines_count; } } - return $c < self::MAX_LINES_PER_ARTICLE; - } + return array( + 'remaining_lines' => self::MAX_LINES_PER_ARTICLE - $lines_count, + 'remaining_characters_for_last_line' => self::MAX_CHARACTERS_PER_LINE - strlen($array[count($array) - 1]) + ); + } // }}} // {{{ function parseUrlsFromArticle()