<?php
/***************************************************************************
- * Copyright (C) 2003-2009 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
} else {
$res = XDB::query("SELECT * FROM newsletter WHERE bits='new'");
if (!$res->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();
public function saveArticle(&$a)
{
+ $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;
+ XDB::execute('UPDATE newsletter_art
+ SET cid = {?}, pos = {?}, title = {?}, body = {?}, append = {?}
+ WHERE id = {?} AND aid = {?}',
+ $a->_cid, $a->_pos, $a->_title, $a->_body, $a->_append, $this->_id, $a->_aid);
} else {
- XDB::execute('INSERT INTO newsletter_art
- SELECT {?}, MAX(aid)+1, {?}, '
- . ($a->_pos ? intval($a->_pos) : 'MAX(pos)+1')
- . ', {?}, {?}, {?}
- FROM newsletter_art AS a
- WHERE a.id = {?}',
- $this->_id, $a->_cid, $a->_title, $a->_body, $a->_append, $this->_id);
- $this->_arts['a' . $a->_aid] = $a;
+ XDB::startTransaction();
+ list($aid, $pos) = XDB::fetchOneRow('SELECT MAX(aid) AS aid, MAX(pos) AS pos
+ FROM newsletter_art AS a
+ WHERE a.id = {?}',
+ $this->_id);
+ $a->_aid = ++$aid;
+ $a->_pos = ($a->_pos ? $a->_pos : ++$pos);
+ XDB::execute('INSERT 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);
+ XDB::commit();
}
+ $this->_arts['a' . $a->_aid] = $a;
}
public function delArticle($aid)
$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();
}
{
$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('INSERT IGNORE INTO newsletter_ins (uid, last, hash)
+ VALUES ({?}, NULL, NULL)', $user);
}
protected function subscriptionWhere()
// }}}
// {{{ function getLinkIps()
- public function getLinkIps(&$gethostbyname_count)
+ public function getLinkIps(&$blacklist_host_resolution_count)
{
$matches = $this->parseUrlsFromArticle();
$article_ips = array();
list(, $host) = explode('@', $match);
}
- if ($gethostbyname_count < $globals->mail->blacklist_host_resolution_limit) {
+ if ($blacklist_host_resolution_count >= $globals->mail->blacklist_host_resolution_limit) {
break;
}
- if ($host != $globals->mail->alias_dom && $host != $globals->mail->alias_dom2
- && $host != $globals->mail->domain && $host != $globals->mail->domain2) {
+ if (!preg_match('/^(' . str_replace(' ', '|', $globals->mail->domain_whitelist) . ')$/i', $host)) {
$article_ips = array_merge($article_ips, array(gethostbyname($host) => $host));
- ++$gethostbyname_count;
+ ++$blacklist_host_resolution_count;
}
}
}