Preparation for SQLite

https://github.com/marienfressinaud/FreshRSS/issues/100

6 files changed, 12 insertions, 10 deletions

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 89130cae4..cb8e6528f 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -291,7 +291,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 		Minz_View::prependTitle(Minz_Translate::t('archiving_configuration') . ' · ');
 
-		$entryDAO = new FreshRSS_EntryDAO();
+		$entryDAO = FreshRSS_Factory::createEntryDao();
 		$this->view->nb_total = $entryDAO->count();
 		$this->view->size_user = $entryDAO->size();
 
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index bbcb990f5..c2d897cf3 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -43,7 +43,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		$nextGet = Minz_Request::param ('nextGet', $get); 
 		$idMax = Minz_Request::param ('idMax', 0);
 
-		$entryDAO = new FreshRSS_EntryDAO ();
+		$entryDAO = FreshRSS_Factory::createEntryDao();
 		if ($id == false) {
 			if (!$get) {
 				$entryDAO->markReadEntries ($idMax);
@@ -85,7 +85,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 
 		$id = Minz_Request::param ('id');
 		if ($id) {
-			$entryDAO = new FreshRSS_EntryDAO ();
+			$entryDAO = FreshRSS_Factory::createEntryDao();
 			$entryDAO->markFavorite ($id, (bool)(Minz_Request::param ('is_favorite', true)));
 		}
 	}
@@ -97,7 +97,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 			// La table des entrées a tendance à grossir énormément
 			// Cette action permet d'optimiser cette table permettant de grapiller un peu de place
 			// Cette fonctionnalité n'est à appeler qu'occasionnellement
-			$entryDAO = new FreshRSS_EntryDAO();
+			$entryDAO = FreshRSS_Factory::createEntryDao();
 			$entryDAO->optimizeTable();
 
 			$feedDAO = new FreshRSS_FeedDAO();
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 5f5a40bc7..149557a48 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -102,7 +102,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 						$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
 
-						$entryDAO = new FreshRSS_EntryDAO ();
+						$entryDAO = FreshRSS_Factory::createEntryDao();
 						$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
@@ -217,7 +217,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		@set_time_limit(300);
 
 		$feedDAO = new FreshRSS_FeedDAO ();
-		$entryDAO = new FreshRSS_EntryDAO ();
+		$entryDAO = FreshRSS_Factory::createEntryDao();
 
 		Minz_Session::_param('actualize_feeds', false);
 		$id = Minz_Request::param ('id');
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 3cd791781..12154d9b6 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -12,7 +12,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 		require_once(LIB_PATH . '/lib_opml.php');
 
 		$this->catDAO = new FreshRSS_CategoryDAO();
-		$this->entryDAO = new FreshRSS_EntryDAO();
+		$this->entryDAO = FreshRSS_Factory::createEntryDao();
 		$this->feedDAO = new FreshRSS_FeedDAO();
 	}
 
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index c3f39fbe5..46c9518c9 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -45,7 +45,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		}
 
 		$catDAO = new FreshRSS_CategoryDAO();
-		$entryDAO = new FreshRSS_EntryDAO();
+		$entryDAO = FreshRSS_Factory::createEntryDao();
 
 		$this->view->cat_aside = $catDAO->listCategories ();
 		$this->view->nb_favorites = $entryDAO->countUnreadReadFavorites ();
diff --git a/app/Controllers/usersController.php b/app/Controllers/usersController.php
index 38b8f829b..35fa3675f 100644
--- a/app/Controllers/usersController.php
+++ b/app/Controllers/usersController.php
@@ -99,7 +99,8 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 
 	public function createAction() {
 		if (Minz_Request::isPost() && Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) {
-			require_once(APP_PATH . '/sql.php');
+			$db = Minz_Configuration::dataBase();
+			require_once(APP_PATH . '/SQL/sql.' . $db['type'] . '.php');
 
 			$new_user_language = Minz_Request::param('new_user_language', $this->view->conf->language);
 			if (!in_array($new_user_language, $this->view->conf->availableLanguages())) {
@@ -170,7 +171,8 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 
 	public function deleteAction() {
 		if (Minz_Request::isPost() && Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) {
-			require_once(APP_PATH . '/sql.php');
+			$db = Minz_Configuration::dataBase();
+			require_once(APP_PATH . '/SQL/sql.' . $db['type'] . '.php');
 
 			$username = Minz_Request::param('username');
 			$ok = ctype_alnum($username);