mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-01-27 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #151 : marquer lus les articles du futur

Browse Source 
On peut désormais marquer comme lu les articles parus dans le futur
This commit is contained in:
Marien Fressinaud
2013-09-14 19:26:01 +02:00
parent ff8531fb64
commit 73fe0eabbe
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/entryController.php
View File

@@ -36,7 +36,7 @@ class entryController extends ActionController {
$is_read = Request::param ('is_read');
$get = Request::param ('get');
$nextGet = Request::param ('nextGet', $get);
$dateMax = Request::param ('dateMax', time ());
$dateMax = Request::param ('dateMax', 0);
$is_read = !!$is_read;

39
app/models/Entry.php
View File

@@ -251,11 +251,16 @@ class EntryDAO extends Model_pdo {
}
}
public function markReadEntries ($read, $dateMax) {
$sql = 'UPDATE ' . $this->prefix . 'entry e INNER JOIN ' . $this->prefix . 'feed f ON e.id_feed = f.id SET is_read = ? WHERE date < ? AND priority > 0';
$stm = $this->bd->prepare ($sql);
public function markReadEntries ($read, $dateMax = 0) {
$sql = 'UPDATE ' . $this->prefix . 'entry e INNER JOIN ' . $this->prefix . 'feed f ON e.id_feed = f.id SET is_read = ? WHERE priority > 0';
$values = array ($read, $dateMax);
$values = array ($read);
if ($dateMax > 0) {
$sql .= ' AND date < ?';
$values[] = $dateMax;
}
$stm = $this->bd->prepare ($sql);
if ($stm && $stm->execute ($values)) {
return true;
@@ -265,11 +270,16 @@ class EntryDAO extends Model_pdo {
return false;
}
}
public function markReadCat ($id, $read, $dateMax) {
$sql = 'UPDATE ' . $this->prefix . 'entry e INNER JOIN ' . $this->prefix . 'feed f ON e.id_feed = f.id SET is_read = ? WHERE category = ? AND date < ?';
$stm = $this->bd->prepare ($sql);
public function markReadCat ($id, $read, $dateMax = 0) {
$sql = 'UPDATE ' . $this->prefix . 'entry e INNER JOIN ' . $this->prefix . 'feed f ON e.id_feed = f.id SET is_read = ? WHERE category = ?';
$values = array ($read, $id, $dateMax);
$values = array ($read, $id);
if ($dateMax > 0) {
$sql .= ' AND date < ?';
$values[] = $dateMax;
}
$stm = $this->bd->prepare ($sql);
if ($stm && $stm->execute ($values)) {
return true;
@@ -279,11 +289,16 @@ class EntryDAO extends Model_pdo {
return false;
}
}
public function markReadFeed ($id, $read, $dateMax) {
$sql = 'UPDATE ' . $this->prefix . 'entry SET is_read = ? WHERE id_feed = ? AND date < ?';
$stm = $this->bd->prepare ($sql);
public function markReadFeed ($id, $read, $dateMax = 0) {
$sql = 'UPDATE ' . $this->prefix . 'entry SET is_read = ? WHERE id_feed = ?';
$values = array ($read, $id, $dateMax);
$values = array ($read, $id);
if ($dateMax > 0) {
$sql .= ' AND date < ?';
$values[] = $dateMax;
}
$stm = $this->bd->prepare ($sql);
if ($stm && $stm->execute ($values)) {
return true;