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/Models/CategoryDAO.php |  2 +-
 app/Models/Feed.php        | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'app/Models')

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) {
-- 
cgit v1.2.3