Réorganisation des fichiers utilisateur

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

8 files changed, 8 insertions, 9 deletions

diff --git a/app/configuration/.gitignore b/app/configuration/.gitignore
deleted file mode 100644
index 72e8ffc0d..000000000
--- a/app/configuration/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/app/controllers/entryController.php b/app/controllers/entryController.php
index 4d2d92c1b..8016d719f 100755
--- a/app/controllers/entryController.php
+++ b/app/controllers/entryController.php
@@ -84,7 +84,7 @@ class entryController extends ActionController {
 		$entryDAO = new EntryDAO();
 		$entryDAO->optimizeTable();
 
-		touch(PUBLIC_PATH . '/data/touch.txt');
+		touch(DATA_PATH . '/touch.txt');
 
 		$notif = array (
 			'type' => 'good',
diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index 224d6fb9e..392abd3e1 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -277,7 +277,7 @@ class indexController extends ActionController {
 		$res = json_decode ($result, true);
 		if ($res['status'] == 'okay' && $res['email'] == $this->view->conf->mailLogin ()) {
 			Session::_param ('mail', $res['email']);
-			touch(PUBLIC_PATH . '/data/touch.txt');
+			touch(DATA_PATH . '/touch.txt');
 		} else {
 			$res = array ();
 			$res['status'] = 'failure';
@@ -290,6 +290,6 @@ class indexController extends ActionController {
 	public function logoutAction () {
 		$this->view->_useLayout (false);
 		Session::_param ('mail');
-		touch(PUBLIC_PATH . '/data/touch.txt');
+		touch(DATA_PATH . '/touch.txt');
 	}
 }
diff --git a/app/i18n/en.php b/app/i18n/en.php
index eca1dd6d5..8243756bd 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -283,7 +283,7 @@ return array (
 	'dom_is_nok'			=> 'You haven’t the necessary to browse the DOM (php-xml package can be useful)',
 	'cache_is_ok'			=> 'Permissions on cache directory are good',
 	'log_is_ok'			=> 'Permissions on logs directory are good',
-	'conf_is_ok'			=> 'Permissions on configuration directory are good',
+	'favicons_is_ok'			=> 'Permissions on favicons directory are good',
 	'data_is_ok'			=> 'Permissions on data directory are good',
 	'file_is_nok'			=> 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
 	'fix_errors_before'		=> 'Fix errors before skip to the next step.',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 2cddd4083..8040a6a44 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -283,7 +283,7 @@ return array (
 	'dom_is_nok'			=> 'Vous ne disposez pas du nécessaire pour parcourir le DOM (voir du côté du paquet php-xml ?)',
 	'cache_is_ok'			=> 'Les droits sur le répertoire de cache sont bons',
 	'log_is_ok'			=> 'Les droits sur le répertoire des logs sont bons',
-	'conf_is_ok'			=> 'Les droits sur le répertoire de configuration sont bons',
+	'favicons_is_ok'			=> 'Les droits sur le répertoire des favicons sont bons',
 	'data_is_ok'			=> 'Les droits sur le répertoire de data sont bons',
 	'file_is_nok'			=> 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
 	'fix_errors_before'		=> 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index ba4df4834..4232b714d 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -32,7 +32,7 @@
 
 <?php
 	if (isset ($this->notification)) {
-		touch(PUBLIC_PATH . '/data/touch.txt', time() + 1);
+		touch(DATA_PATH . '/touch.txt', time() + 1);
 ?>
 <div class="notification <?php echo $this->notification['type']; ?>">
 	<?php echo $this->notification['content']; ?>
diff --git a/app/models/Feed.php b/app/models/Feed.php
index 2618d023f..adc8e1677 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -100,7 +100,7 @@ class Feed extends Model {
 		return $this->nbNotRead;
 	}
 	public function favicon () {
-		$file = '/data/favicons/' . $this->id () . '.ico';
+		$file = '/favicons/' . $this->id () . '.ico';
 
 		$favicon_url = Url::display ($file);
 		if (!file_exists (PUBLIC_PATH . $file)) {
diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php
index e79fd933b..f8379a625 100755
--- a/app/models/RSSConfiguration.php
+++ b/app/models/RSSConfiguration.php
@@ -348,7 +348,7 @@ class RSSConfigurationDAO extends Model_array {
 	public $bottomline_link = 'yes';
 
 	public function __construct () {
-		parent::__construct (PUBLIC_PATH . '/data/Configuration.array.php');
+		parent::__construct (DATA_PATH . '/Configuration.array.php');
 
 		// TODO : simplifier ce code, une boucle for() devrait suffir !
 		if (isset ($this->array['language'])) {