Amélioration de l'installateur + préfixe BDD

Fix issue #96 : on peut désormais choisir un préfixe aux tables de la
BDD lors de l'installation
Fix issue #115 : échappement des guillemets pendant la phase
d'installation
Fix issue #116 : le thème de l'installateur est désormais accessible
FIx issue #117 : rajout du test de la présence DOMDocument lors de
l'installation. Si non présent, on peut pas accéder aux flux RSS.
Normalement fourni sur un système RedHat-like par le paquet php-xml

3 files changed, 43 insertions, 43 deletions

diff --git a/app/models/Category.php b/app/models/Category.php
index 197c4df26..e733b15ba 100755
--- a/app/models/Category.php
+++ b/app/models/Category.php
@@ -65,7 +65,7 @@ class Category extends Model {
 
 class CategoryDAO extends Model_pdo {
 	public function addCategory ($valuesTmp) {
-		$sql = 'INSERT INTO category (id, name, color) VALUES(?, ?, ?)';
+		$sql = 'INSERT INTO ' . $this->prefix . 'category (id, name, color) VALUES(?, ?, ?)';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -84,7 +84,7 @@ class CategoryDAO extends Model_pdo {
 	}
 
 	public function updateCategory ($id, $valuesTmp) {
-		$sql = 'UPDATE category SET name=?, color=? WHERE id=?';
+		$sql = 'UPDATE ' . $this->prefix . 'category SET name=?, color=? WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -103,7 +103,7 @@ class CategoryDAO extends Model_pdo {
 	}
 
 	public function deleteCategory ($id) {
-		$sql = 'DELETE FROM category WHERE id=?';
+		$sql = 'DELETE FROM ' . $this->prefix . 'category WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($id);
@@ -118,7 +118,7 @@ class CategoryDAO extends Model_pdo {
 	}
 
 	public function searchById ($id) {
-		$sql = 'SELECT * FROM category WHERE id=?';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'category WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($id);
@@ -134,7 +134,7 @@ class CategoryDAO extends Model_pdo {
 		}
 	}
 	public function searchByName ($name) {
-		$sql = 'SELECT * FROM category WHERE name=?';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'category WHERE name=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($name);
@@ -151,7 +151,7 @@ class CategoryDAO extends Model_pdo {
 	}
 
 	public function listCategories () {
-		$sql = 'SELECT * FROM category ORDER BY name';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'category ORDER BY name';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 
@@ -159,7 +159,7 @@ class CategoryDAO extends Model_pdo {
 	}
 
 	public function getDefault () {
-		$sql = 'SELECT * FROM category WHERE id="000000"';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'category WHERE id="000000"';
 		$stm = $this->bd->prepare ($sql);
 
 		$stm->execute ();
@@ -190,7 +190,7 @@ class CategoryDAO extends Model_pdo {
 	}
 
 	public function count () {
-		$sql = 'SELECT COUNT(*) AS count FROM category';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'category';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
@@ -199,7 +199,7 @@ class CategoryDAO extends Model_pdo {
 	}
 
 	public function countFeed ($id) {
-		$sql = 'SELECT COUNT(*) AS count FROM feed WHERE category=?';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'feed WHERE category=?';
 		$stm = $this->bd->prepare ($sql);
 		$values = array ($id);
 		$stm->execute ($values);
@@ -209,7 +209,7 @@ class CategoryDAO extends Model_pdo {
 	}
 
 	public function countNotRead ($id) {
-		$sql = 'SELECT COUNT(*) AS count FROM entry e INNER JOIN feed f ON e.id_feed = f.id WHERE category=? AND e.is_read=0';
+		$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);
diff --git a/app/models/Entry.php b/app/models/Entry.php
index 1382a0d16..ae70bb58e 100755
--- a/app/models/Entry.php
+++ b/app/models/Entry.php
@@ -222,7 +222,7 @@ class Entry extends Model {
 
 class EntryDAO extends Model_pdo {
 	public function addEntry ($valuesTmp) {
-		$sql = 'INSERT INTO entry(id, guid, title, author, content, link, date, is_read, is_favorite, is_public, id_feed, lastUpdate, tags) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+		$sql = 'INSERT INTO ' . $this->prefix . 'entry(id, guid, title, author, content, link, date, is_read, is_favorite, is_public, id_feed, lastUpdate, tags) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -261,7 +261,7 @@ class EntryDAO extends Model_pdo {
 		}
 		$set = substr ($set, 0, -2);
 
-		$sql = 'UPDATE entry SET ' . $set . ' WHERE id=?';
+		$sql = 'UPDATE ' . $this->prefix . 'entry SET ' . $set . ' WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		foreach ($valuesTmp as $v) {
@@ -279,7 +279,7 @@ class EntryDAO extends Model_pdo {
 	}
 
 	public function markReadEntries ($read, $dateMax) {
-		$sql = 'UPDATE entry e INNER JOIN feed f ON e.id_feed = f.id SET is_read = ? WHERE date < ? AND priority > 0';
+		$sql = 'UPDATE ' . $this->prefix . 'entry e INNER JOIN ' . $this->prefix . 'feed f ON e.id_feed = f.id SET is_read = ? WHERE date < ? AND priority > 0';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($read, $dateMax);
@@ -293,7 +293,7 @@ class EntryDAO extends Model_pdo {
 		}
 	}
 	public function markReadCat ($id, $read, $dateMax) {
-		$sql = 'UPDATE entry e INNER JOIN feed f ON e.id_feed = f.id SET is_read = ? WHERE category = ? AND date < ?';
+		$sql = 'UPDATE ' . $this->prefix . 'entry e INNER JOIN ' . $this->prefix . 'feed f ON e.id_feed = f.id SET is_read = ? WHERE category = ? AND date < ?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($read, $id, $dateMax);
@@ -307,7 +307,7 @@ class EntryDAO extends Model_pdo {
 		}
 	}
 	public function markReadFeed ($id, $read, $dateMax) {
-		$sql = 'UPDATE entry SET is_read = ? WHERE id_feed = ? AND date < ?';
+		$sql = 'UPDATE ' . $this->prefix . 'entry SET is_read = ? WHERE id_feed = ? AND date < ?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($read, $id, $dateMax);
@@ -332,7 +332,7 @@ class EntryDAO extends Model_pdo {
 		}
 		$set = substr ($set, 0, -2);
 
-		$sql = 'UPDATE entry SET ' . $set;
+		$sql = 'UPDATE ' . $this->prefix . 'entry SET ' . $set;
 		$stm = $this->bd->prepare ($sql);
 
 		foreach ($valuesTmp as $v) {
@@ -350,7 +350,7 @@ class EntryDAO extends Model_pdo {
 
 	public function cleanOldEntries ($nb_month) {
 		$date = 60 * 60 * 24 * 30 * $nb_month;
-		$sql = 'DELETE FROM entry WHERE date <= ? AND is_favorite = 0 AND annotation = ""';
+		$sql = 'DELETE FROM ' . $this->prefix . 'entry WHERE date <= ? AND is_favorite = 0 AND annotation = ""';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -368,7 +368,7 @@ class EntryDAO extends Model_pdo {
 
 	public function searchByGuid ($feed_id, $id) {
 		// un guid est unique pour un flux donné
-		$sql = 'SELECT * FROM entry WHERE id_feed=? AND guid=?';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'entry WHERE id_feed=? AND guid=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -388,7 +388,7 @@ class EntryDAO extends Model_pdo {
 	}
 
 	public function searchById ($id) {
-		$sql = 'SELECT * FROM entry WHERE id=?';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'entry WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($id);
@@ -417,8 +417,8 @@ class EntryDAO extends Model_pdo {
 			$order = '';
 		}
 
-		$sql = 'SELECT e.* FROM entry e'
-		     . ' INNER JOIN feed f ON e.id_feed = f.id' . $where
+		$sql = 'SELECT e.* FROM ' . $this->prefix . 'entry e'
+		     . ' INNER JOIN  ' . $this->prefix . 'feed f ON e.id_feed = f.id' . $where
 		     . ' ORDER BY date' . $order;
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ($values);
@@ -442,7 +442,7 @@ class EntryDAO extends Model_pdo {
 	}
 
 	public function count () {
-		$sql = 'SELECT COUNT(*) AS count FROM entry e INNER JOIN feed f ON e.id_feed = f.id WHERE priority > 0';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'entry e INNER JOIN  ' . $this->prefix . 'feed f ON e.id_feed = f.id WHERE priority > 0';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
@@ -450,7 +450,7 @@ class EntryDAO extends Model_pdo {
 		return $res[0]['count'];
 	}
 	public function countNotRead () {
-		$sql = 'SELECT COUNT(*) AS count FROM entry e INNER JOIN feed f ON e.id_feed = f.id WHERE is_read=0 AND priority > 0';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'entry e INNER JOIN  ' . $this->prefix . 'feed f ON e.id_feed = f.id WHERE is_read=0 AND priority > 0';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
@@ -459,7 +459,7 @@ class EntryDAO extends Model_pdo {
 	}
 
 	public function countNotReadByFeed ($id) {
-		$sql = 'SELECT COUNT(*) AS count FROM entry WHERE is_read = 0 AND id_feed = ?';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'entry WHERE is_read = 0 AND id_feed = ?';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute (array ($id));
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
@@ -468,7 +468,7 @@ class EntryDAO extends Model_pdo {
 	}
 
 	public function countNotReadByCat ($id) {
-		$sql = 'SELECT COUNT(*) AS count FROM entry e INNER JOIN feed f ON e.id_feed = f.id WHERE is_read=0 AND category = ?';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'entry e INNER JOIN  ' . $this->prefix . 'feed f ON e.id_feed = f.id WHERE is_read=0 AND category = ?';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute (array ($id));
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
@@ -477,7 +477,7 @@ class EntryDAO extends Model_pdo {
 	}
 
 	public function countNotReadFavorites () {
-		$sql = 'SELECT COUNT(*) AS count FROM entry WHERE is_read=0 AND is_favorite=1';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'entry WHERE is_read=0 AND is_favorite=1';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
@@ -485,7 +485,7 @@ class EntryDAO extends Model_pdo {
 		return $res[0]['count'];
 	}
 	public function countFavorites () {
-		$sql = 'SELECT COUNT(*) AS count FROM entry WHERE is_favorite=1';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'entry WHERE is_favorite=1';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
@@ -494,7 +494,7 @@ class EntryDAO extends Model_pdo {
 	}
 
 	public function optimizeTable() {
-		$sql = 'OPTIMIZE TABLE entry';
+		$sql = 'OPTIMIZE TABLE ' . $this->prefix . 'entry';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 	}
diff --git a/app/models/Feed.php b/app/models/Feed.php
index 9d1047bd4..a7788df17 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -240,7 +240,7 @@ class Feed extends Model {
 
 class FeedDAO extends Model_pdo {
 	public function addFeed ($valuesTmp) {
-		$sql = 'INSERT INTO feed (id, url, category, name, website, description, lastUpdate, priority, httpAuth, error) VALUES(?, ?, ?, ?, ?, ?, ?, 10, ?, 0)';
+		$sql = 'INSERT INTO ' . $this->prefix . 'feed (id, url, category, name, website, description, lastUpdate, priority, httpAuth, error) VALUES(?, ?, ?, ?, ?, ?, ?, 10, ?, 0)';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -274,7 +274,7 @@ class FeedDAO extends Model_pdo {
 		}
 		$set = substr ($set, 0, -2);
 
-		$sql = 'UPDATE feed SET ' . $set . ' WHERE id=?';
+		$sql = 'UPDATE ' . $this->prefix . 'feed SET ' . $set . ' WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		foreach ($valuesTmp as $v) {
@@ -292,7 +292,7 @@ class FeedDAO extends Model_pdo {
 	}
 
 	public function updateLastUpdate ($id) {
-		$sql = 'UPDATE feed SET lastUpdate=?, error=0 WHERE id=?';
+		$sql = 'UPDATE ' . $this->prefix . 'feed SET lastUpdate=?, error=0 WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -310,7 +310,7 @@ class FeedDAO extends Model_pdo {
 	}
 
 	public function isInError ($id) {
-		$sql = 'UPDATE feed SET error=1 WHERE id=?';
+		$sql = 'UPDATE ' . $this->prefix . 'feed SET error=1 WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -333,7 +333,7 @@ class FeedDAO extends Model_pdo {
 			$newCat = $catDAO->getDefault ();
 		}
 
-		$sql = 'UPDATE feed SET category=? WHERE category=?';
+		$sql = 'UPDATE ' . $this->prefix . 'feed SET category=? WHERE category=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -351,7 +351,7 @@ class FeedDAO extends Model_pdo {
 	}
 
 	public function deleteFeed ($id) {
-		$sql = 'DELETE FROM feed WHERE id=?';
+		$sql = 'DELETE FROM ' . $this->prefix . 'feed WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($id);
@@ -365,7 +365,7 @@ class FeedDAO extends Model_pdo {
 		}
 	}
 	public function deleteFeedByCategory ($id) {
-		$sql = 'DELETE FROM feed WHERE category=?';
+		$sql = 'DELETE FROM ' . $this->prefix . 'feed WHERE category=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($id);
@@ -380,7 +380,7 @@ class FeedDAO extends Model_pdo {
 	}
 
 	public function searchById ($id) {
-		$sql = 'SELECT * FROM feed WHERE id=?';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'feed WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($id);
@@ -396,7 +396,7 @@ class FeedDAO extends Model_pdo {
 		}
 	}
 	public function searchByUrl ($url) {
-		$sql = 'SELECT * FROM feed WHERE url=?';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'feed WHERE url=?';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($url);
@@ -413,7 +413,7 @@ class FeedDAO extends Model_pdo {
 	}
 
 	public function listFeeds () {
-		$sql = 'SELECT * FROM feed ORDER BY name';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'feed ORDER BY name';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 
@@ -421,7 +421,7 @@ class FeedDAO extends Model_pdo {
 	}
 
 	public function listFeedsOrderUpdate () {
-		$sql = 'SELECT * FROM feed ORDER BY lastUpdate';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'feed ORDER BY lastUpdate';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 
@@ -429,7 +429,7 @@ class FeedDAO extends Model_pdo {
 	}
 
 	public function listByCategory ($cat) {
-		$sql = 'SELECT * FROM feed WHERE category=? ORDER BY name';
+		$sql = 'SELECT * FROM ' . $this->prefix . 'feed WHERE category=? ORDER BY name';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array ($cat);
@@ -440,7 +440,7 @@ class FeedDAO extends Model_pdo {
 	}
 
 	public function count () {
-		$sql = 'SELECT COUNT(*) AS count FROM feed';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'feed';
 		$stm = $this->bd->prepare ($sql);
 		$stm->execute ();
 		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
@@ -449,7 +449,7 @@ class FeedDAO extends Model_pdo {
 	}
 
 	public function countEntries ($id) {
-		$sql = 'SELECT COUNT(*) AS count FROM entry WHERE id_feed=?';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'entry WHERE id_feed=?';
 		$stm = $this->bd->prepare ($sql);
 		$values = array ($id);
 		$stm->execute ($values);
@@ -458,7 +458,7 @@ class FeedDAO extends Model_pdo {
 		return $res[0]['count'];
 	}
 	public function countNotRead ($id) {
-		$sql = 'SELECT COUNT(*) AS count FROM entry WHERE is_read=0 AND id_feed=?';
+		$sql = 'SELECT COUNT(*) AS count FROM ' . $this->prefix . 'entry WHERE is_read=0 AND id_feed=?';
 		$stm = $this->bd->prepare ($sql);
 		$values = array ($id);
 		$stm->execute ($values);