X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fnewsletter.inc.php;h=86ce7122b01e7f52342667e0325d99df441ae7fe;hb=7d5c0b6878233e6009c6d765183591eefb6294d2;hp=1c58f0a42fd5b78cbd6165a7d54ddfcd3072a396;hpb=b71f7275d0abe31614da74e05524ac08033bbe18;p=platal.git diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index 1c58f0a..86ce712 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -1,6 +1,6 @@ numRows()) { - Newsletter::create(); + NewsLetter::create(); } - $res = XDB::query("SELECT * FROM newsletter WHERE bits='new'"); + $res = XDB::query("SELECT * FROM newsletter WHERE bits='new' ORDER BY id DESC LIMIT 1"); + } + if ($res->numRows() != 1) { + throw new MailNotFound(); } $nl = $res->fetchOneAssoc(); - $this->_id = $nl['id']; - $this->_shortname = $nl['short_name']; - $this->_date = $nl['date']; - $this->_title = $nl['titre']; + $this->_id = $nl['id']; + $this->_shortname = $nl['short_name']; + $this->_date = $nl['date']; + $this->_title = $nl['titre']; $this->_title_mail = $nl['titre_mail']; - $this->_head = $nl['head']; + $this->_head = $nl['head']; $res = XDB::iterRow("SELECT cid,titre FROM newsletter_cat ORDER BY pos"); while (list($cid, $title) = $res->next()) { @@ -89,19 +92,22 @@ class NewsLetter extends MassMailer public function saveArticle(&$a) { - if ($a->_aid>=0) { - XDB::execute('REPLACE INTO newsletter_art (id,aid,cid,pos,title,body,append) - VALUES ({?},{?},{?},{?},{?},{?},{?})', + $a->_cid = ($a->_cid == 0) ? null : $a->_cid; + if ($a->_aid >= 0) { + XDB::execute('REPLACE INTO newsletter_art (id, aid, cid, pos, title, body, append) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})', $this->_id, $a->_aid, $a->_cid, $a->_pos, $a->_title, $a->_body, $a->_append); - $this->_arts['a'.$a->_aid] = $a; + $this->_arts['a' . $a->_aid] = $a; } else { XDB::execute('INSERT INTO newsletter_art - SELECT {?},MAX(aid)+1,{?},'.($a->_pos ? intval($a->_pos) : 'MAX(pos)+1').',{?},{?},{?} + SELECT {?}, MAX(aid)+1, {?}, ' + . ($a->_pos ? intval($a->_pos) : 'MAX(pos)+1') + . ', {?}, {?}, {?} FROM newsletter_art AS a - WHERE a.id={?}', + WHERE a.id = {?}', $this->_id, $a->_cid, $a->_title, $a->_body, $a->_append, $this->_id); - $this->_arts['a'.$a->_aid] = $a; + $this->_arts['a' . $a->_aid] = $a; } } @@ -128,7 +134,7 @@ class NewsLetter extends MassMailer $user = is_null($uid) ? S::v('uid') : $uid; $res = XDB::query("SELECT 1 FROM newsletter_ins - WHERE user_id={?}", $user); + WHERE uid={?}", $user); return $res->fetchOneCell(); } @@ -136,14 +142,14 @@ class NewsLetter extends MassMailer { $user = is_null($uid) ? S::v('uid') : $uid; XDB::execute("DELETE FROM newsletter_ins - WHERE user_id={?}", $user); + WHERE uid={?}", $user); } static public function subscribe($uid = null) { $user = is_null($uid) ? S::v('uid') : $uid; - XDB::execute("REPLACE INTO newsletter_ins (user_id,last) - VALUES ({?}, 0)", $user); + XDB::execute("REPLACE INTO newsletter_ins (uid,last) + VALUES ({?}, NULL)", $user); } protected function subscriptionWhere() @@ -223,18 +229,24 @@ class NLArticle // }}} // {{{ function toText() - public function toText() + public function toText($hash = null, $login = null) { $title = '*'.$this->title().'*'; $body = MiniWiki::WikiToText($this->_body, true); $app = MiniWiki::WikiToText($this->_append,false,4); - return trim("$title\n\n$body\n\n$app")."\n"; + $text = trim("$title\n\n$body\n\n$app")."\n"; + if (!is_null($hash) && !is_null($login)) { + $text = str_replace('%HASH%', "$hash/$login", $text); + } else { + $text = str_replace('%HASH%', '', $text); + } + return $text; } // }}} // {{{ function toHtml() - public function toHtml() + public function toHtml($hash = null, $login = null) { $title = "