Réorganisation des fichiers utilisateur

Implémente https://github.com/marienfressinaud/FreshRSS/issues/248

3 files changed, 10 insertions, 12 deletions

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index e4518ab4b..33f8641e1 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -168,9 +168,9 @@ function get_content_by_parsing ($url, $path) {
 /* Télécharge le favicon d'un site, le place sur le serveur et retourne l'URL */
 function dowload_favicon ($website, $id) {
 	$url = 'http://g.etfv.co/' . $website;
-	$favicons_dir = PUBLIC_PATH . '/data/favicons';
+	$favicons_dir = PUBLIC_PATH . '/favicons';
 	$dest = $favicons_dir . '/' . $id . '.ico';
-	$favicon_url = '/data/favicons/' . $id . '.ico';
+	$favicon_url = '/favicons/' . $id . '.ico';
 
 	if (!is_dir ($favicons_dir)) {
 		if (!mkdir ($favicons_dir, 0755, true)) {
@@ -211,7 +211,7 @@ function dowload_favicon ($website, $id) {
 function lazyimg($content) {
 	return preg_replace(
 		'/<img([^>]+?)src=[\'"]([^"\']+)[\'"]([^>]*)>/i',
-		'<img$1src="' . Url::display('/data/grey.gif') . '" data-original="$2"$3>',
+		'<img$1src="' . Url::display('/themes/icons/grey.gif') . '" data-original="$2"$3>',
 		$content
 	);
 }
diff --git a/lib/minz/Configuration.php b/lib/minz/Configuration.php
index b296ec378..bdd6af0fb 100755
--- a/lib/minz/Configuration.php
+++ b/lib/minz/Configuration.php
@@ -8,7 +8,7 @@
  * La classe Configuration permet de gérer la configuration de l'application
  */
 class Configuration {
-	const CONF_PATH_NAME = '/configuration/application.ini';
+	const CONF_PATH_NAME = '/application.ini';
 
 	/**
 	 * VERSION est la version actuelle de MINZ
@@ -111,21 +111,21 @@ class Configuration {
 	 * @exception BadConfigurationException si CONF_PATH_NAME mal formaté
 	 */
 	private static function parseFile () {
-		if (!file_exists (APP_PATH . self::CONF_PATH_NAME)) {
+		if (!file_exists (DATA_PATH . self::CONF_PATH_NAME)) {
 			throw new FileNotExistException (
-				APP_PATH . self::CONF_PATH_NAME,
+				DATA_PATH . self::CONF_PATH_NAME,
 				MinzException::ERROR
 			);
 		}
 
 		$ini_array = parse_ini_file (
-			APP_PATH . self::CONF_PATH_NAME,
+			DATA_PATH . self::CONF_PATH_NAME,
 			true
 		);
 
 		if (!$ini_array) {
 			throw new PermissionDeniedException (
-				APP_PATH . self::CONF_PATH_NAME,
+				DATA_PATH . self::CONF_PATH_NAME,
 				MinzException::ERROR
 			);
 		}
diff --git a/lib/minz/dao/Model_pdo.php b/lib/minz/dao/Model_pdo.php
index dd75153be..beeb65ea8 100755
--- a/lib/minz/dao/Model_pdo.php
+++ b/lib/minz/dao/Model_pdo.php
@@ -49,9 +49,7 @@ class Model_pdo {
 					PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'
 				);
 			} elseif($type == 'sqlite') {
-				$string = $type
-				        . ':/' . PUBLIC_PATH
-				        . '/data/' . $db['base'] . '.sqlite';	//TODO: DEBUG UTF-8 http://www.siteduzero.com/forum/sujet/sqlite-connexion-utf-8-18797
+				$string = $type . ':/' . DATA_PATH . $db['base'] . '.sqlite';	//TODO: DEBUG UTF-8 http://www.siteduzero.com/forum/sujet/sqlite-connexion-utf-8-18797
 			}
 
 			$this->bd = new FreshPDO (
@@ -86,7 +84,7 @@ class Model_pdo {
 class FreshPDO extends PDO {
 	private static function check($statement) {
 		if (preg_match('/^(?:UPDATE|INSERT|DELETE)/i', $statement)) {
-			touch(PUBLIC_PATH . '/data/touch.txt');
+			touch(DATA_PATH . '/touch.txt');
 		}
 	}