From b1aac20839f6e1f3e733774eeb5984ce7b08c246 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 3 May 2020 13:39:16 +0200
Subject: Fever integer type for numbers (#2946)

* Fever integer type for feed ID

#Fix
https://github.com/FreshRSS/FreshRSS/issues/2940#issuecomment-623022435

* Fix feed_id

* Ensure string for entry ID

To be compatible with 32-bit platforms.
Before, the type was inconsistent depending on architecture + database

* Integer for entry count functions
---
 app/Models/Category.php |  2 +-
 app/Models/Entry.php    |  2 +-
 app/Models/EntryDAO.php | 12 ++++++------
 app/Models/Feed.php     |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'app')

diff --git a/app/Models/Category.php b/app/Models/Category.php
index 6956029ad..cee137138 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -78,7 +78,7 @@ class FreshRSS_Category extends Minz_Model {
 	}
 
 	public function _id($id) {
-		$this->id = $id;
+		$this->id = intval($id);
 		if ($id == FreshRSS_CategoryDAO::DEFAULTCATEGORYID) {
 			$this->_name(_t('gen.short.default_category'));
 		}
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index f4cd82288..584a16862 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -212,7 +212,7 @@ class FreshRSS_Entry extends Minz_Model {
 	}
 	private function _feedId($value) {
 		$this->feed = null;
-		$this->feedId = $value;
+		$this->feedId = intval($value);
 	}
 	public function _tags($value) {
 		$this->hash = null;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 9ee59fc5a..db936479d 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -1031,8 +1031,8 @@ SQL;
 		}
 		$res = $stm->fetchAll(PDO::FETCH_COLUMN, 0);
 		rsort($res);
-		$all = empty($res[0]) ? 0 : $res[0];
-		$unread = empty($res[1]) ? 0 : $res[1];
+		$all = empty($res[0]) ? 0 : intval($res[0]);
+		$unread = empty($res[1]) ? 0 : intval($res[1]);
 		return array('all' => $all, 'unread' => $unread, 'read' => $all - $unread);
 	}
 
@@ -1047,7 +1047,7 @@ SQL;
 			return false;
 		}
 		$res = $stm->fetchAll(PDO::FETCH_COLUMN, 0);
-		return isset($res[0]) ? $res[0] : 0;
+		return isset($res[0]) ? intval($res[0]) : 0;
 	}
 
 	public function countNotRead($minPriority = null) {
@@ -1061,7 +1061,7 @@ SQL;
 		}
 		$stm = $this->pdo->query($sql);
 		$res = $stm->fetchAll(PDO::FETCH_COLUMN, 0);
-		return $res[0];
+		return isset($res[0]) ? intval($res[0]) : 0;
 	}
 
 	public function countUnreadReadFavorites() {
@@ -1089,8 +1089,8 @@ SQL;
 		$stm->execute();
 		$res = $stm->fetchAll(PDO::FETCH_COLUMN, 0);
 		rsort($res);
-		$all = empty($res[0]) ? 0 : $res[0];
-		$unread = empty($res[1]) ? 0 : $res[1];
+		$all = empty($res[0]) ? 0 : intval($res[0]);
+		$unread = empty($res[1]) ? 0 : intval($res[1]);
 		return array('all' => $all, 'unread' => $unread, 'read' => $all - $unread);
 	}
 
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index dd1c8ce22..34c036921 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -180,7 +180,7 @@ class FreshRSS_Feed extends Minz_Model {
 	}
 
 	public function _id($value) {
-		$this->id = $value;
+		$this->id = intval($value);
 	}
 	public function _url($value, $validate = true) {
 		$this->hash = null;
-- 
cgit v1.2.3