Merge branch 'dev'

Conflicts:
	CHANGELOG
	README.fr.md
	README.md
	app/Controllers/feedController.php
	app/Controllers/indexController.php
	app/i18n/en.php
	app/i18n/fr.php
	app/views/helpers/view/normal_view.phtml
	app/views/stats/index.phtml
	app/views/stats/repartition.phtml
	constants.php
	p/scripts/main.js

1 files changed, 83 insertions, 0 deletions

diff --git a/app/Models/DatabaseDAO.php b/app/Models/DatabaseDAO.php
new file mode 100644
index 000000000..0d85718e3
--- /dev/null
+++ b/app/Models/DatabaseDAO.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * This class is used to test database is well-constructed.
+ */
+class FreshRSS_DatabaseDAO extends Minz_ModelPdo {
+	public function tablesAreCorrect() {
+		$sql = 'SHOW TABLES';
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
+		
+		$tables = array(
+			$this->prefix . 'category' => false,
+			$this->prefix . 'feed' => false,
+			$this->prefix . 'entry' => false,
+		);
+		foreach ($res as $value) {
+			$tables[array_pop($value)] = true;
+		}
+
+		return count(array_keys($tables, true, true)) == count($tables);
+	}
+
+	public function getSchema($table) {
+		$sql = 'DESC ' . $this->prefix . $table;
+		$stm = $this->bd->prepare($sql);
+		$stm->execute();
+
+		return $this->listDaoToSchema($stm->fetchAll(PDO::FETCH_ASSOC));
+	}
+
+	public function checkTable($table, $schema) {
+		$columns = $this->getSchema($table);
+
+		$ok = (count($columns) == count($schema));
+		foreach ($columns as $c) {
+			$ok &= in_array($c['name'], $schema);
+		}
+
+		return $ok;
+	}
+
+	public function categoryIsCorrect() {
+		return $this->checkTable('category', array(
+			'id', 'name'
+		));
+	}
+
+	public function feedIsCorrect() {
+		return $this->checkTable('feed', array(
+			'id', 'url', 'category', 'name', 'website', 'description', 'lastUpdate',
+			'priority', 'pathEntries', 'httpAuth', 'error', 'keep_history', 'ttl',
+			'cache_nbEntries', 'cache_nbUnreads'
+		));
+	}
+
+	public function entryIsCorrect() {
+		return $this->checkTable('entry', array(
+			'id', 'guid', 'title', 'author', 'content_bin', 'link', 'date', 'is_read',
+			'is_favorite', 'id_feed', 'tags'
+		));
+	}
+
+	public function daoToSchema($dao) {
+		return array(
+			'name' => $dao['Field'],
+			'type' => strtolower($dao['Type']),
+			'notnull' => (bool)$dao['Null'],
+			'default' => $dao['Default'],
+		);
+	}
+
+	public function listDaoToSchema($listDAO) {
+		$list = array();
+
+		foreach ($listDAO as $dao) {
+			$list[] = $this->daoToSchema($dao);
+		}
+
+		return $list;
+	}
+}