aboutsummaryrefslogtreecommitdiff
path: root/p/api/greader.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-07-05 01:52:41 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-07-05 01:52:41 +0200
commit805c91da98c2f582e279f3c853fba9e43f572419 (patch)
tree4f81b17c32a896e0b6b66f4622f31dc550d7b872 /p/api/greader.php
parent1b43167fb8206dfd17923c389de1e3bd6b76045e (diff)
Add support for SQLite
https://github.com/marienfressinaud/FreshRSS/issues/100 Warning: MySQL has been changed too, so bugs may have been introduced
Diffstat (limited to 'p/api/greader.php')
-rw-r--r--p/api/greader.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/p/api/greader.php b/p/api/greader.php
index 843cd93c4..7a961225f 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -364,7 +364,7 @@ function streamContents($path, $include_target, $start_time, $count, $order, $ex
$count++; //Shift by one element
}
- $entryDAO = new FreshRSS_EntryDAO();
+ $entryDAO = FreshRSS_Factory::createEntryDao();
$entries = $entryDAO->listWhere($type, $include_target, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, '', $start_time);
$items = array();
@@ -458,7 +458,7 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
break;
}
- $entryDAO = new FreshRSS_EntryDAO();
+ $entryDAO = FreshRSS_Factory::createEntryDao();
$ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, '', '', $start_time);
$itemRefs = array();
@@ -481,7 +481,7 @@ function editTag($e_ids, $a, $r) {
$e_ids[$i] = hex2dec(basename($e_id)); //Strip prefix 'tag:google.com,2005:reader/item/'
}
- $entryDAO = new FreshRSS_EntryDAO();
+ $entryDAO = FreshRSS_Factory::createEntryDao();
switch ($a) {
case 'user/-/state/com.google/read':
@@ -512,13 +512,15 @@ function editTag($e_ids, $a, $r) {
function markAllAsRead($streamId, $olderThanId) {
logMe("markAllAsRead($streamId, $olderThanId)\n");
- $entryDAO = new FreshRSS_EntryDAO();
+ $entryDAO = FreshRSS_Factory::createEntryDao();
if (strpos($streamId, 'feed/') === 0) {
$f_id = basename($streamId);
$entryDAO->markReadFeed($f_id, $olderThanId);
} elseif (strpos($streamId, 'user/-/label/') === 0) {
$c_name = basename($streamId);
- $entryDAO->markReadCatName($c_name, $olderThanId);
+ $categoryDAO = new FreshRSS_CategoryDAO();
+ $cat = $categoryDAO->searchByName($c_name);
+ $entryDAO->markReadCat($cat === null ? -1 : $cat->id(), $olderThanId);
} elseif ($streamId === 'user/-/state/com.google/reading-list') {
$entryDAO->markReadEntries($olderThanId, false, -1);
}