From 878e96202e8a22e4857b98e29b0a1fce68eccbc9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 15 Dec 2013 03:30:24 +0100
Subject: Grosse refactorisation pour permettre le chargement automatique des
 classes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

C'est parti de changements pour
https://github.com/marienfressinaud/FreshRSS/issues/255 et finalement
j'ai continué la refactorisation...

Ajout de préfixes FreshRSS_ et Minz_ sur le modèle de SimplePie_.
Toutes les classes sont maintenant en chargement automatique (devrait
améliorer les performances en évitant de charger plein de classes
inutilisées, et faciliter la maintenance).
Suppression de set_include_path().
Si souhaité, certaines classes de Minz pourraient être déplacées dans un
sous-répertoire, par exemple les exceptions.

Tests et relecture nécessaires.
---
 app/Models/CategoryDAO.php | 252 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 252 insertions(+)
 create mode 100644 app/Models/CategoryDAO.php

(limited to 'app/Models/CategoryDAO.php')

diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
new file mode 100644
index 000000000..793e593c3
--- /dev/null
+++ b/app/Models/CategoryDAO.php
@@ -0,0 +1,252 @@
+<?php
+class FreshRSS_CategoryDAO extends Minz_ModelPdo {
+	public function addCategory ($valuesTmp) {
+		$sql = 'INSERT INTO `' . $this->prefix . 'category` (name, color) VALUES(?, ?)';
+		$stm = $this->bd->prepare ($sql);
+
+		$values = array (
+			substr($valuesTmp['name'], 0, 255),
+			substr($valuesTmp['color'], 0, 7),
+		);
+
+		if ($stm && $stm->execute ($values)) {
+			return $this->bd->lastInsertId();
+		} else {
+			$info = $stm->errorInfo();
+			Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
+			return false;
+		}
+	}
+
+	public function updateCategory ($id, $valuesTmp) {
+		$sql = 'UPDATE `' . $this->prefix . 'category` SET name=?, color=? WHERE id=?';
+		$stm = $this->bd->prepare ($sql);
+
+		$values = array (
+			$valuesTmp['name'],
+			$valuesTmp['color'],
+			$id
+		);
+
+		if ($stm && $stm->execute ($values)) {
+			return $stm->rowCount();
+		} else {
+			$info = $stm->errorInfo();
+			Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
+			return false;
+		}
+	}
+
+	public function deleteCategory ($id) {
+		$sql = 'DELETE FROM `' . $this->prefix . 'category` WHERE id=?';
+		$stm = $this->bd->prepare ($sql);
+
+		$values = array ($id);
+
+		if ($stm && $stm->execute ($values)) {
+			return $stm->rowCount();
+		} else {
+			$info = $stm->errorInfo();
+			Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
+			return false;
+		}
+	}
+
+	public function searchById ($id) {
+		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE id=?';
+		$stm = $this->bd->prepare ($sql);
+
+		$values = array ($id);
+
+		$stm->execute ($values);
+		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$cat = HelperCategory::daoToCategory ($res);
+
+		if (isset ($cat[0])) {
+			return $cat[0];
+		} else {
+			return false;
+		}
+	}
+	public function searchByName ($name) {
+		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE name=?';
+		$stm = $this->bd->prepare ($sql);
+
+		$values = array ($name);
+
+		$stm->execute ($values);
+		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$cat = HelperCategory::daoToCategory ($res);
+
+		if (isset ($cat[0])) {
+			return $cat[0];
+		} else {
+			return false;
+		}
+	}
+
+	public function listCategories ($prePopulateFeeds = true, $details = false) {
+		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 ')
+			     . 'FROM `' . $this->prefix . 'category` c '
+			     . 'LEFT OUTER JOIN `' . $this->prefix . 'feed` f ON f.category = c.id '
+			     . 'GROUP BY f.id '
+			     . 'ORDER BY c.name, f.name';
+			$stm = $this->bd->prepare ($sql);
+			$stm->execute ();
+			return HelperCategory::daoToCategoryPrepopulated ($stm->fetchAll (PDO::FETCH_ASSOC));
+		} else {
+			$sql = 'SELECT * FROM `' . $this->prefix . 'category` ORDER BY name';
+			$stm = $this->bd->prepare ($sql);
+			$stm->execute ();
+			return HelperCategory::daoToCategory ($stm->fetchAll (PDO::FETCH_ASSOC));
+		}
+	}
+
+	public function getDefault () {
+		$sql = 'SELECT * FROM `' . $this->prefix . 'category` WHERE id=1';
+		$stm = $this->bd->prepare ($sql);
+
+		$stm->execute ();
+		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$cat = HelperCategory::daoToCategory ($res);
+
+		if (isset ($cat[0])) {
+			return $cat[0];
+		} else {
+			return false;
+		}
+	}
+	public function checkDefault () {
+		$def_cat = $this->searchById (1);
+
+		if ($def_cat === false) {
+			$cat = new FreshRSS_Category (Minz_Translate::t ('default_category'));
+			$cat->_id (1);
+
+			$values = array (
+				'id' => $cat->id (),
+				'name' => $cat->name (),
+				'color' => $cat->color ()
+			);
+
+			$this->addCategory ($values);
+		}
+	}
+
+	public function count () {
+		$sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'category`';
+		$stm = $this->bd->prepare ($sql);
+		$stm->execute ();
+		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+
+		return $res[0]['count'];
+	}
+
+	public function countFeed ($id) {
+		$sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'feed` WHERE category=?';
+		$stm = $this->bd->prepare ($sql);
+		$values = array ($id);
+		$stm->execute ($values);
+		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+
+		return $res[0]['count'];
+	}
+
+	public function countNotRead ($id) {
+		$sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed = f.id WHERE category=? AND e.is_read=0';
+		$stm = $this->bd->prepare ($sql);
+		$values = array ($id);
+		$stm->execute ($values);
+		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+
+		return $res[0]['count'];
+	}
+}
+
+class HelperCategory {
+	public static function findFeed($categories, $feed_id) {
+		foreach ($categories as $category) {
+			foreach ($category->feeds () as $feed) {
+				if ($feed->id () === $feed_id) {
+					return $feed;
+				}
+			}
+		}
+		return null;
+	}
+
+	public static function CountUnreads($categories, $minPriority = 0) {
+		$n = 0;
+		foreach ($categories as $category) {
+			foreach ($category->feeds () as $feed) {
+				if ($feed->priority () >= $minPriority) {
+					$n += $feed->nbNotRead();
+				}
+			}
+		}
+		return $n;
+	}
+
+	public static function daoToCategoryPrepopulated ($listDAO) {
+		$list = array ();
+
+		if (!is_array ($listDAO)) {
+			$listDAO = array ($listDAO);
+		}
+
+		$previousLine = null;
+		$feedsDao = array();
+		foreach ($listDAO as $line) {
+			if ($previousLine['c_id'] != null && $line['c_id'] !== $previousLine['c_id']) {
+				// End of the current category, we add it to the $list
+				$cat = new FreshRSS_Category (
+					$previousLine['c_name'],
+					isset($previousLine['c_color']) ? $previousLine['c_color'] : '',
+					HelperFeed::daoToFeed ($feedsDao, $previousLine['c_id'])
+				);
+				$cat->_id ($previousLine['c_id']);
+				$list[$previousLine['c_id']] = $cat;
+
+				$feedsDao = array();	//Prepare for next category
+			}
+
+			$previousLine = $line;
+			$feedsDao[] = $line;
+		}
+
+		// add the last category
+		if ($previousLine != null) {
+			$cat = new FreshRSS_Category (
+				$previousLine['c_name'],
+				isset($previousLine['c_color']) ? $previousLine['c_color'] : '',
+				HelperFeed::daoToFeed ($feedsDao, $previousLine['c_id'])
+			);
+			$cat->_id ($previousLine['c_id']);
+			$list[$previousLine['c_id']] = $cat;
+		}
+
+		return $list;
+	}
+
+	public static function daoToCategory ($listDAO) {
+		$list = array ();
+
+		if (!is_array ($listDAO)) {
+			$listDAO = array ($listDAO);
+		}
+
+		foreach ($listDAO as $key => $dao) {
+			$cat = new FreshRSS_Category (
+				$dao['name'],
+				$dao['color']
+			);
+			$cat->_id ($dao['id']);
+			$list[$key] = $cat;
+		}
+
+		return $list;
+	}
+}
-- 
cgit v1.2.3


From 6b7d96d0ea97579720ee6d560224cd80c2329d07 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 19 Dec 2013 21:19:45 +0100
Subject: Refactorisation : correction classes oubliées
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controllers/indexController.php      |  6 +++---
 app/Models/CategoryDAO.php               | 16 +++++++---------
 app/Models/EntryDAO.php                  |  8 +++-----
 app/Models/FeedDAO.php                   | 12 +++++-------
 app/views/helpers/view/normal_view.phtml |  2 +-
 app/views/helpers/view/reader_view.phtml |  2 +-
 6 files changed, 20 insertions(+), 26 deletions(-)

(limited to 'app/Models/CategoryDAO.php')

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 22c5683ea..e3c253518 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -77,7 +77,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			return;
 		}
 
-		$this->view->nb_not_read = HelperCategory::CountUnreads($this->view->cat_aside, 1);
+		$this->view->nb_not_read = FreshRSS_CategoryDAO::CountUnreads($this->view->cat_aside, 1);
 
 		// mise à jour des titres
 		$this->view->rss_title = $this->view->currentName . ' | ' . Minz_View::title();
@@ -112,7 +112,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 					$hasUnread = (!isset($this->view->cat_aside[$getId])) || ($this->view->cat_aside[$getId]->nbNotRead() > 0);
 					break;
 				case 'f':
-					$myFeed = HelperCategory::findFeed($this->view->cat_aside, $getId);
+					$myFeed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
 					$hasUnread = ($myFeed === null) || ($myFeed->nbNotRead() > 0);
 					break;
 				default:
@@ -188,7 +188,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 					return false;
 				}
 			case 'f':
-				$feed = HelperCategory::findFeed($this->view->cat_aside, $getId);
+				$feed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
 				if (empty($feed)) {
 					$feed = $this->feedDAO->searchById ($getId);
 				}
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 793e593c3..3a810e9f0 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -60,7 +60,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 
 		$stm->execute ($values);
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
-		$cat = HelperCategory::daoToCategory ($res);
+		$cat = self::daoToCategory ($res);
 
 		if (isset ($cat[0])) {
 			return $cat[0];
@@ -76,7 +76,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 
 		$stm->execute ($values);
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
-		$cat = HelperCategory::daoToCategory ($res);
+		$cat = self::daoToCategory ($res);
 
 		if (isset ($cat[0])) {
 			return $cat[0];
@@ -96,12 +96,12 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 			     . 'ORDER BY c.name, f.name';
 			$stm = $this->bd->prepare ($sql);
 			$stm->execute ();
-			return HelperCategory::daoToCategoryPrepopulated ($stm->fetchAll (PDO::FETCH_ASSOC));
+			return self::daoToCategoryPrepopulated ($stm->fetchAll (PDO::FETCH_ASSOC));
 		} else {
 			$sql = 'SELECT * FROM `' . $this->prefix . 'category` ORDER BY name';
 			$stm = $this->bd->prepare ($sql);
 			$stm->execute ();
-			return HelperCategory::daoToCategory ($stm->fetchAll (PDO::FETCH_ASSOC));
+			return self::daoToCategory ($stm->fetchAll (PDO::FETCH_ASSOC));
 		}
 	}
 
@@ -111,7 +111,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 
 		$stm->execute ();
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
-		$cat = HelperCategory::daoToCategory ($res);
+		$cat = self::daoToCategory ($res);
 
 		if (isset ($cat[0])) {
 			return $cat[0];
@@ -164,9 +164,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 
 		return $res[0]['count'];
 	}
-}
 
-class HelperCategory {
 	public static function findFeed($categories, $feed_id) {
 		foreach ($categories as $category) {
 			foreach ($category->feeds () as $feed) {
@@ -205,7 +203,7 @@ class HelperCategory {
 				$cat = new FreshRSS_Category (
 					$previousLine['c_name'],
 					isset($previousLine['c_color']) ? $previousLine['c_color'] : '',
-					HelperFeed::daoToFeed ($feedsDao, $previousLine['c_id'])
+					FreshRSS_FeedDAO::daoToFeed ($feedsDao, $previousLine['c_id'])
 				);
 				$cat->_id ($previousLine['c_id']);
 				$list[$previousLine['c_id']] = $cat;
@@ -222,7 +220,7 @@ class HelperCategory {
 			$cat = new FreshRSS_Category (
 				$previousLine['c_name'],
 				isset($previousLine['c_color']) ? $previousLine['c_color'] : '',
-				HelperFeed::daoToFeed ($feedsDao, $previousLine['c_id'])
+				FreshRSS_FeedDAO::daoToFeed ($feedsDao, $previousLine['c_id'])
 			);
 			$cat->_id ($previousLine['c_id']);
 			$list[$previousLine['c_id']] = $cat;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index c9989622a..d8bc869ae 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -242,7 +242,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 
 		$stm->execute ($values);
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
-		$entries = HelperEntry::daoToEntry ($res);
+		$entries = self::daoToEntry ($res);
 		return isset ($entries[0]) ? $entries[0] : false;
 	}
 
@@ -255,7 +255,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 
 		$stm->execute ($values);
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
-		$entries = HelperEntry::daoToEntry ($res);
+		$entries = self::daoToEntry ($res);
 		return isset ($entries[0]) ? $entries[0] : false;
 	}
 
@@ -372,7 +372,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ($values);
 
-		return HelperEntry::daoToEntry ($stm->fetchAll (PDO::FETCH_ASSOC));
+		return self::daoToEntry ($stm->fetchAll (PDO::FETCH_ASSOC));
 	}
 
 	public function listLastGuidsByFeed($id, $n) {
@@ -430,9 +430,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 	}
-}
 
-class HelperEntry {
 	public static function daoToEntry ($listDAO) {
 		$list = array ();
 
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 8f59b1c76..9ebea4a47 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -158,7 +158,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 
 		$stm->execute ($values);
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
-		$feed = HelperFeed::daoToFeed ($res);
+		$feed = self::daoToFeed ($res);
 
 		if (isset ($feed[$id])) {
 			return $feed[$id];
@@ -174,7 +174,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 
 		$stm->execute ($values);
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
-		$feed = current (HelperFeed::daoToFeed ($res));
+		$feed = current (self::daoToFeed ($res));
 
 		if (isset ($feed)) {
 			return $feed;
@@ -188,7 +188,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 
-		return HelperFeed::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
+		return self::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
 	}
 
 	public function listFeedsOrderUpdate () {
@@ -196,7 +196,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 
-		return HelperFeed::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
+		return self::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
 	}
 
 	public function listByCategory ($cat) {
@@ -207,7 +207,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 
 		$stm->execute ($values);
 
-		return HelperFeed::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
+		return self::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
 	}
 
 	public function countEntries ($id) {
@@ -299,9 +299,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 			return false;
 		}
 	}
-}
 
-class HelperFeed {
 	public static function daoToFeed ($listDAO, $catID = null) {
 		$list = array ();
 
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index d5328651d..f21a2bdd9 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -62,7 +62,7 @@ if (!empty($this->entries)) {
 					?></li><?php
 				}
 			}
-			$feed = HelperCategory::findFeed($this->cat_aside, $item->feed ());	//We most likely already have the feed object in cache
+			$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed ());	//We most likely already have the feed object in cache
 			if (empty($feed)) $feed = $item->feed (true);
 			?>
 			<li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
index 29b2be04c..e28af6ade 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/helpers/view/reader_view.phtml
@@ -11,7 +11,7 @@ if (!empty($this->entries)) {
 		<div class="flux_content">
 			<div class="content">
 				<?php
-					$feed = HelperCategory::findFeed($this->cat_aside, $item->feed ());	//We most likely already have the feed object in cache
+					$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed ());	//We most likely already have the feed object in cache
 					if (empty($feed)) $feed = $item->feed (true);
 				?>
 				<a href="<?php echo $item->link (); ?>">
-- 
cgit v1.2.3


From 7b7acf5c8738e949109672748dbd9f39a6e5a2c4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 23 Dec 2013 13:35:54 +0100
Subject: Synchronisation quelques lignes blanches

---
 README.md                       | 4 ++--
 app/Models/CategoryDAO.php      | 1 +
 app/Models/Configuration.php    | 1 +
 app/Models/ConfigurationDAO.php | 1 +
 app/Models/Entry.php            | 1 +
 app/Models/EntryDAO.php         | 1 +
 app/Models/Feed.php             | 1 +
 app/Models/FeedDAO.php          | 1 +
 app/Models/LogDAO.php           | 1 +
 public/install.php              | 1 +
 10 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'app/Models/CategoryDAO.php')

diff --git a/README.md b/README.md
index a45c8e67c..87ed9de99 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@ Il se veut léger et facile à prendre en main tout en étant un outil puissant
 * Site officiel : http://marienfressinaud.github.io/FreshRSS/
 * Démo : http://marienfressinaud.fr/projets/freshrss/
 * Développeur : Marien Fressinaud <dev@marienfressinaud.fr>
-* Version actuelle : 0.7-dev
-* Date de publication 2013-12-xx
+* Version actuelle : 0.7-beta
+* Date de publication 2014-01-xx
 * License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
 ![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 3a810e9f0..6b07ab063 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 	public function addCategory ($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'category` (name, color) VALUES(?, ?)';
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 7ef76b522..d5f69601f 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Configuration extends Minz_Model {
 	private $available_languages = array (
 		'en' => 'English',
diff --git a/app/Models/ConfigurationDAO.php b/app/Models/ConfigurationDAO.php
index 57fc98047..0eebf2d90 100644
--- a/app/Models/ConfigurationDAO.php
+++ b/app/Models/ConfigurationDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
 	public $language = 'en';
 	public $posts_per_page = 20;
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 983f94727..ed31ef2b1 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Entry extends Minz_Model {
 
 	private $id = 0;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index d8bc869ae..c6bd5c404 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_EntryDAO extends Minz_ModelPdo {
 	public function addEntry ($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'entry`(id, guid, title, author, content_bin, link, date, is_read, is_favorite, id_feed, tags) '
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index e63ac8c7a..70efb0fa3 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_Feed extends Minz_Model {
 	private $id = 0;
 	private $url;
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 9ebea4a47..9bd480544 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_FeedDAO extends Minz_ModelPdo {
 	public function addFeed ($valuesTmp) {
 		$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, 0)';
diff --git a/app/Models/LogDAO.php b/app/Models/LogDAO.php
index bf043fd6d..06855ec66 100644
--- a/app/Models/LogDAO.php
+++ b/app/Models/LogDAO.php
@@ -1,4 +1,5 @@
 <?php
+
 class FreshRSS_LogDAO extends Minz_ModelTxt {
 	public function __construct () {
 		parent::__construct (LOG_PATH . '/application.log', 'r+');
diff --git a/public/install.php b/public/install.php
index 377b2916d..642692cd0 100644
--- a/public/install.php
+++ b/public/install.php
@@ -164,6 +164,7 @@ function initTranslate () {
 		$translates = array_merge($translates, include($file));
 	}
 }
+
 function getBetterLanguage ($fallback) {
 	$available = availableLanguages ();
 	$accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-- 
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/CategoryDAO.php')

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