From 2788aaeb1a463012cfa90bf31f5efb4bf6ca7344 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 26 Dec 2013 02:50:58 +0100
Subject: Problème ctype_digit qui ne marche pas sur des variables qui sont
 déjà des entiers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Configuration.php | 16 +++++-----------
 app/Models/Entry.php         |  7 ++-----
 app/Models/Feed.php          |  7 ++++---
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 47509636f..cb2f90655 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -220,19 +220,13 @@ class FreshRSS_Configuration extends Minz_Model {
 	public function _sortOrder ($value) {
 		$this->sort_order = $value === 'ASC' ? 'ASC' : 'DESC';
 	}
-	public function _oldEntries ($value) {
-		if (ctype_digit ($value) && $value > 0) {
-			$this->old_entries = intval($value);
-		} else {
-			$this->old_entries = 3;
-		}
+	public function _oldEntries($value) {
+		$value = intval($value);
+		$this->old_entries = $value > 0 ? $value : 3;
 	}
 	public function _keepHistoryDefault($value) {
-		if (ctype_digit($value) && $value >= -1) {
-			$this->keep_history_default = intval($value);
-		} else {
-			$this->keep_history_default = 0;
-		}
+		$value = intval($value);
+		$this->keep_history_default = $value >= -1 ? $value : 0;
 	}
 	public function _shortcuts ($values) {
 		foreach ($values as $key => $value) {
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index ed31ef2b1..ab9605eb1 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -106,11 +106,8 @@ class FreshRSS_Entry extends Minz_Model {
 		$this->link = $value;
 	}
 	public function _date ($value) {
-		if (ctype_digit ($value)) {
-			$this->date = intval ($value);
-		} else {
-			$this->date = time ();
-		}
+		$value = intval($value);
+		$this->date = $value > 1 ? $value : time();
 	}
 	public function _isRead ($value) {
 		$this->is_read = $value;
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index dcf97d4ec..3008e33d7 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -154,7 +154,8 @@ class FreshRSS_Feed extends Minz_Model {
 		$this->lastUpdate = $value;
 	}
 	public function _priority ($value) {
-		$this->priority = ctype_digit ($value) ? intval ($value) : 10;
+		$value = intval($value);
+		$this->priority = $value >= 0 ? $value : 10;
 	}
 	public function _pathEntries ($value) {
 		$this->pathEntries = $value;
@@ -172,10 +173,10 @@ class FreshRSS_Feed extends Minz_Model {
 		$this->keep_history = $value;
 	}
 	public function _nbNotRead ($value) {
-		$this->nbNotRead = ctype_digit ($value) ? intval ($value) : -1;
+		$this->nbNotRead = intval($value);
 	}
 	public function _nbEntries ($value) {
-		$this->nbEntries = ctype_digit ($value) ? intval ($value) : -1;
+		$this->nbEntries = intval($value);
 	}
 
 	public function load () {
-- 
cgit v1.2.3