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(-)

(limited to 'app/Models')

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


From 574d37bddc4e00ddbc6af57c28838e1dea6a730b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 26 Dec 2013 19:58:17 +0100
Subject: Favicons compatibles multi-utilisateurs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Contribue à https://github.com/marienfressinaud/FreshRSS/issues/126
---
 app/Controllers/feedController.php |  2 +-
 app/Models/CategoryDAO.php         |  2 +-
 app/Models/Feed.php                | 13 +++++++++----
 lib/Minz/Configuration.php         |  2 +-
 p/f.php                            |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'app/Models')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 04d0aa98b..dc8a854a9 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -395,7 +395,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						'type' => 'good',
 						'content' => Minz_Translate::t ('feed_deleted')
 					);
-					FreshRSS_Feed::faviconDelete($id);
+					//TODO: Delete old favicon
 				} else {
 					$notif = array (
 						'type' => 'bad',
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 6b07ab063..1cc616ac0 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -90,7 +90,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		if ($prePopulateFeeds) {
 			$sql = 'SELECT c.id AS c_id, c.name AS c_name, '
 			     . ($details ? 'c.color AS c_color, ' : '')
-			     . ($details ? 'f.* ' : 'f.id, f.name, f.website, f.priority, f.error, f.cache_nbEntries, f.cache_nbUnreads ')
+			     . ($details ? 'f.* ' : 'f.id, f.name, f.url, f.website, f.priority, f.error, f.cache_nbEntries, f.cache_nbUnreads ')
 			     . 'FROM `' . $this->prefix . 'category` c '
 			     . 'LEFT OUTER JOIN `' . $this->prefix . 'feed` f ON f.category = c.id '
 			     . 'GROUP BY f.id '
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 3008e33d7..f9a586122 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -28,6 +28,11 @@ class FreshRSS_Feed extends Minz_Model {
 	public function id () {
 		return $this->id;
 	}
+
+	public function hash() {
+		return hash('crc32b', Minz_Configuration::salt() . $this->url);
+	}
+
 	public function url () {
 		return $this->url;
 	}
@@ -96,7 +101,7 @@ class FreshRSS_Feed extends Minz_Model {
 		return $this->nbNotRead;
 	}
 	public function faviconPrepare() {
-		$file = DATA_PATH . '/favicons/' . $this->id () . '.txt';
+		$file = DATA_PATH . '/favicons/' . $this->hash() . '.txt';
 		if (!file_exists ($file)) {
 			$t = $this->website;
 			if (empty($t)) {
@@ -105,13 +110,13 @@ class FreshRSS_Feed extends Minz_Model {
 			file_put_contents($file, $t);
 		}
 	}
-	public static function faviconDelete($id) {
-		$path = DATA_PATH . '/favicons/' . $id;
+	public static function faviconDelete($hash) {
+		$path = DATA_PATH . '/favicons/' . $hash;
 		@unlink($path . '.ico');
 		@unlink($path . '.txt');
 	}
 	public function favicon () {
-		return Minz_Url::display ('/f.php?' . $this->id ());
+		return Minz_Url::display ('/f.php?' . $this->hash());
 	}
 
 	public function _id ($value) {
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 1b108dcdf..6c7206988 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -63,7 +63,7 @@ class Minz_Configuration {
 	/*
 	 * Getteurs
 	 */
-	public static function selApplication () {
+	public static function salt () {
 		return self::$sel_application;
 	}
 	public static function environment () {
diff --git a/p/f.php b/p/f.php
index a56d58617..872b8cc2c 100644
--- a/p/f.php
+++ b/p/f.php
@@ -37,7 +37,7 @@ function download_favicon ($website, $dest) {
 }
 
 $id = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '0';
-if (!ctype_digit($id)) {
+if (!ctype_xdigit($id)) {
 	$id = '0';
 }
 
-- 
cgit v1.2.3


From 2c57e7254d613683ec20076d37b33ea2a7dd2d83 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 26 Dec 2013 20:11:18 +0100
Subject: Favicons : test pour améliorer le cache HTTP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test d'utilisation de PATH_INFO plutôt que QUERY_STRING pour améliorer
la mise en cache.
À tester sur différents serveurs
---
 app/Models/Feed.php | 2 +-
 p/f.php             | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'app/Models')

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index f9a586122..4f90b9872 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -116,7 +116,7 @@ class FreshRSS_Feed extends Minz_Model {
 		@unlink($path . '.txt');
 	}
 	public function favicon () {
-		return Minz_Url::display ('/f.php?' . $this->hash());
+		return Minz_Url::display ('/f.php/' . $this->hash());
 	}
 
 	public function _id ($value) {
diff --git a/p/f.php b/p/f.php
index 872b8cc2c..660128a59 100644
--- a/p/f.php
+++ b/p/f.php
@@ -36,7 +36,14 @@ function download_favicon ($website, $dest) {
 	return true;
 }
 
-$id = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '0';
+if (isset($_SERVER['PATH_INFO'])) {
+	$id = substr($_SERVER['PATH_INFO'], 1);
+} elseif (isset($_SERVER['QUERY_STRING'])) {
+	$id = $_SERVER['QUERY_STRING'];
+} else {
+	$id = '0';
+}
+
 if (!ctype_xdigit($id)) {
 	$id = '0';
 }
-- 
cgit v1.2.3


From 43fd0a543900866f4feaf0713e1726b98a60b22d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 26 Dec 2013 22:20:24 +0100
Subject: Mise à jour de f.url en base de données lorsque SimplePie découvre
 que l'adresse a changé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Et correction problème favicon lorsque l'adresse du flux a changé du
point de vue de SimplePie.
Plus petites optimisations.
---
 app/Controllers/entryController.php |  2 +-
 app/Controllers/feedController.php  | 27 ++++++++++-----------------
 app/Models/Feed.php                 | 18 ++++++++++++------
 3 files changed, 23 insertions(+), 24 deletions(-)

(limited to 'app/Models')

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index 1c3c56c4d..26f3422ca 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -131,7 +131,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 				$nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, $feedHistory);
 				if ($nb > 0) {
 					$nbTotal += $nb;
-					Minz_Log::record($nb . ' old entries cleaned in feed ' . $feed->id(), Minz_Log::DEBUG);
+					Minz_Log::record($nb . ' old entries cleaned in feed [' . $feed->url() . ']', Minz_Log::DEBUG);
 					$feedDAO->updateLastUpdate($feed->id());
 				}
 			}
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index dc8a854a9..ca230232f 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -20,15 +20,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$this->catDAO->checkDefault ();
 	}
 
-	private static function entryDateComparer($e1, $e2) {
-		$d1 = $e1->date(true);
-		$d2 = $e2->date(true);
-		if ($d1 === $d2) {
-			return 0;
-		}
-		return ($d1 < $d2) ? -1 : 1;
-	}
-
 	public function addAction () {
 		@set_time_limit(300);
 
@@ -55,7 +46,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				}
 				$feed->_httpAuth ($httpAuth);
 
-				$feed->load ();
+				$feed->load(true);
 
 				$feedDAO = new FreshRSS_FeedDAO ();
 				$values = array (
@@ -91,8 +82,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						$is_read = $this->view->conf->markUponReception() === 'yes' ? 1 : 0;
 
 						$entryDAO = new FreshRSS_EntryDAO ();
-						$entries = $feed->entries ();
-						usort($entries, 'self::entryDateComparer');
+						$entries = array_reverse($feed->entries());	//We want chronological order and SimplePie uses reverse order
 
 						// on calcule la date des articles les plus anciens qu'on accepte
 						$nb_month_old = $this->view->conf->oldEntries ();
@@ -199,10 +189,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$flux_update = 0;
 		foreach ($feeds as $feed) {
 			try {
-				$feed->load ();
-				$feed->faviconPrepare();
-				$entries = $feed->entries ();
-				usort($entries, 'self::entryDateComparer');
+				$url = $feed->url();
+				$feed->load(false);
+				$entries = array_reverse($feed->entries());	//We want chronological order and SimplePie uses reverse order
 
 				$is_read = $this->view->conf->markUponReception() === 'yes' ? 1 : 0;
 
@@ -231,7 +220,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				if (($feedHistory >= 0) && (rand(0, 30) === 1)) {
 					$nb = $feedDAO->cleanOldEntries ($feed->id (), $date_min, max($feedHistory, count($entries) + 10));
 					if ($nb > 0) {
-						Minz_Log::record ($nb . ' old entries cleaned in feed ' . $feed->id (), Minz_Log::DEBUG);
+						Minz_Log::record ($nb . ' old entries cleaned in feed [' . $feed->url() . ']', Minz_Log::DEBUG);
 					}
 				}
 
@@ -239,6 +228,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feedDAO->updateLastUpdate ($feed->id ());
 				$feedDAO->commit ();
 				$flux_update++;
+				if ($feed->url() !== $url) {	//URL has changed (auto-discovery)
+					$feedDAO->updateFeed($feed->id(), array('url' => $feed->url()));
+				}
+				$feed->faviconPrepare();
 			} catch (FreshRSS_Feed_Exception $e) {
 				Minz_Log::record ($e->getMessage (), Minz_Log::NOTICE);
 				$feedDAO->updateLastUpdate ($feed->id (), 1);
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 4f90b9872..0f467f776 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -16,6 +16,7 @@ class FreshRSS_Feed extends Minz_Model {
 	private $httpAuth = '';
 	private $error = false;
 	private $keep_history = -2;
+	private $hash = null;
 
 	public function __construct ($url, $validate=true) {
 		if ($validate) {
@@ -30,7 +31,10 @@ class FreshRSS_Feed extends Minz_Model {
 	}
 
 	public function hash() {
-		return hash('crc32b', Minz_Configuration::salt() . $this->url);
+		if ($this->hash === null) {
+			$this->hash = hash('crc32b', Minz_Configuration::salt() . $this->url);
+		}
+		return $this->hash;
 	}
 
 	public function url () {
@@ -184,7 +188,7 @@ class FreshRSS_Feed extends Minz_Model {
 		$this->nbEntries = intval($value);
 	}
 
-	public function load () {
+	public function load ($loadDetails = false) {
 		if (!is_null ($this->url)) {
 			if (CACHE_PATH === false) {
 				throw new Minz_FileNotExistException (
@@ -256,11 +260,13 @@ class FreshRSS_Feed extends Minz_Model {
 					$this->_url ($subscribe_url);
 				}
 
-				$title = htmlspecialchars(html_only_entity_decode($feed->get_title()), ENT_COMPAT, 'UTF-8');
-				$this->_name (!is_null ($title) ? $title : $this->url);
+				if ($loadDetails) {
+					$title = htmlspecialchars(html_only_entity_decode($feed->get_title()), ENT_COMPAT, 'UTF-8');
+					$this->_name (!is_null ($title) ? $title : $this->url);
 
-				$this->_website(html_only_entity_decode($feed->get_link()));
-				$this->_description(html_only_entity_decode($feed->get_description()));
+					$this->_website(html_only_entity_decode($feed->get_link()));
+					$this->_description(html_only_entity_decode($feed->get_description()));
+				}
 
 				// et on charge les articles du flux
 				$this->loadEntries ($feed);
-- 
cgit v1.2.3


From b99979cef78f7cd0c1cb4ae81115d09881e85926 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 27 Dec 2013 14:11:17 +0100
Subject: Bug affichage ID category introduit récemment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Feed.php    | 3 ++-
 app/Models/FeedDAO.php | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/Models')

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 0f467f776..32f8546dd 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -136,7 +136,8 @@ class FreshRSS_Feed extends Minz_Model {
 		$this->url = $value;
 	}
 	public function _category ($value) {
-		$this->category = $value;
+		$value = intval($value);
+		$this->category = $value >= 0 ? $value : 0;
 	}
 	public function _name ($value) {
 		if (is_null ($value)) {
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index d517f9580..e102da4ec 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -316,11 +316,13 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 				$key = $dao['id'];
 			}
 			if ($catID === null) {
-				$catID = isset($dao['category']) ? $dao['category'] : 0;
+				$category = isset($dao['category']) ? $dao['category'] : 0;
+			} else {
+				$category = $catID ;
 			}
 
 			$myFeed = new FreshRSS_Feed(isset($dao['url']) ? $dao['url'] : '', false);
-			$myFeed->_category(intval($catID));
+			$myFeed->_category($category);
 			$myFeed->_name($dao['name']);
 			$myFeed->_website(isset($dao['website']) ? $dao['website'] : '', false);
 			$myFeed->_description(isset($dao['description']) ? $dao['description'] : '');
-- 
cgit v1.2.3