mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-24 03:58:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

FeverAPI 32-bit fixes (#1964)

Browse Source 
* FeverAPI 32-bit fixes

https://github.com/FreshRSS/FreshRSS/issues/1962

* Small fixes

https://github.com/FreshRSS/FreshRSS/pull/1964#discussion_r204213613
This commit is contained in:
Alexandre Alapetite authored and GitHub committed 2018-07-23 22:50:16 +02:00
1 parent 3bebc90474
commit 763ceff7ca
1 file changed
+13 -10
Download Patch File Download Diff File Expand all files Collapse all files
p/api/fever.php
+13 -10
View File
@@ -69,14 +69,16 @@ class FeverDAO extends Minz_ModelPdo
if (!empty($entry_ids)) {
$bindEntryIds = $this->bindParamArray('id', $entry_ids, $values);
$sql .= " id IN($bindEntryIds)";
} else if (!empty($max_id)) {
} elseif ($max_id != null) {
$sql .= ' id < :id';
$values[':id'] = $max_id;
$order = ' ORDER BY id DESC';
} else {
} elseif ($since_id != null) {
$sql .= ' id > :id';
$values[':id'] = $since_id;
$order = ' ORDER BY id ASC';
} else {
$sql .= ' 1=1';
}
if (!empty($feed_ids)) {
@@ -204,14 +206,14 @@ class FeverAPI
$response_arr['saved_item_ids'] = $this->getSavedItemIds();
}
if (isset($_REQUEST['mark'], $_REQUEST['as'], $_REQUEST['id']) && is_numeric($_REQUEST['id'])) {
$id = isset($_REQUEST['id']) ? '' . $_REQUEST['id'] : '';
if (isset($_REQUEST['mark'], $_REQUEST['as'], $_REQUEST['id']) && ctype_digit($id)) {
$method_name = 'set' . ucfirst($_REQUEST['mark']) . 'As' . ucfirst($_REQUEST['as']);
$allowedMethods = array(
'setFeedAsRead', 'setGroupAsRead', 'setItemAsRead',
'setItemAsSaved', 'setItemAsUnread', 'setItemAsUnsaved'
);
if (in_array($method_name, $allowedMethods)) {
$id = intval($_REQUEST['id']);
switch (strtolower($_REQUEST['mark'])) {
case 'item':
$this->{$method_name}($id);
@@ -471,17 +473,18 @@ class FeverAPI
if (isset($_REQUEST['max_id'])) {
// use the max_id argument to request the previous $item_limit items
if (is_numeric($_REQUEST['max_id'])) {
$max = $_REQUEST['max_id'] > 0 ? intval($_REQUEST['max_id']) : 0;
if ($max) {
$max_id = $max;
}
$max_id = '' . $_REQUEST['max_id'];
if (!ctype_digit($max_id)) {
$max_id = null;
}
} else if (isset($_REQUEST['with_ids'])) {
$entry_ids = explode(',', $_REQUEST['with_ids']);
} else {
// use the since_id argument to request the next $item_limit items
$since_id = isset($_REQUEST['since_id']) && is_numeric($_REQUEST['since_id']) ? intval($_REQUEST['since_id']) : 0;
$since_id = '' . $_REQUEST['since_id'];
if (!ctype_digit($since_id)) {
$since_id = null;
}
}
$items = array();