Cookie : sous-répertoire pour index (changements de répertoires !)

Implémente https://github.com/marienfressinaud/FreshRSS/issues/333 /public/ est renommé /p/ /public/index.php est déplacé dans /p/i/index.php Le cookie de session est limité à /p/i/
author: Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-26 01:56:58 +0100
committer: Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-26 01:56:58 +0100
commit: 58300c36ad77e8d788e99825d509fe8657a36854 (patch)
tree: 6167a28a3c728c65c30256c1f29fd0a0552d8676
parent: 1da74b1eddfafd9191548e0fde150690b80f694b (diff)
66 files changed, 48 insertions, 33 deletions
diff --git a/README.md b/README.md
index 716859ccf..62d7e0c25 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Privilégiez pour cela des demandes sur GitHub
 
 # Installation
 1. Récupérez l’application FreshRSS via la commande git ou [en téléchargeant l’archive](https://github.com/marienfressinaud/FreshRSS/archive/master.zip)
-2. Placez l’application sur votre serveur (la partie à exposer au Web est le répertoire `./public/`)
+2. Placez l’application sur votre serveur (la partie à exposer au Web est le répertoire `./p/`)
 3. Le serveur Web doit avoir les droits d’écriture dans le répertoire `./data/`
 4. Accédez à FreshRSS à travers votre navigateur Web et suivez les instructions d’installation
 5. Tout devrait fonctionner :) En cas de problème, n’hésitez pas à me contacter.
@@ -49,7 +49,7 @@ Il est recommandé de limiter l’accès à votre FreshRSS, soit :
 ```
 
 # Conseils
-* Pour une meilleure sécurité, faites en sorte que seul le répertoire `./public` soit accessible depuis le Web, par exemple en faisant pointer un sous-domaine sur le répertoire `./public`.
+* Pour une meilleure sécurité, faites en sorte que seul le répertoire `./p/` soit accessible depuis le Web, par exemple en faisant pointer un sous-domaine sur le répertoire `./public`.
 * Les données personnelles se trouvent dans le répertoire `./data/` (déjà protégé par un .htaccess pour Apache - vérifiez que cela fonctionne -, à protéger vous-même dans le cas d’autres serveurs Web).
 * Le fichier `./constants.php` définit les chemins d’accès aux répertoires clés de l’application. Si vous les bougez, tout se passe ici.
 * En cas de problème, les logs peuvent être utile à lire, soit depuis l’interface de FreshRSS, soit manuellement depuis `./data/log/*.log`.
diff --git a/constants.php b/constants.php
index c22209efe..0c7adc57e 100644
--- a/constants.php
+++ b/constants.php
@@ -3,12 +3,15 @@ define('FRESHRSS_VERSION', '0.7-beta3');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 
 // Constantes de chemins
-define ('FRESHRSS_PATH', dirname(__FILE__));
+define('FRESHRSS_PATH', dirname(__FILE__));
 
-define ('PUBLIC_PATH', FRESHRSS_PATH . '/public');
-define ('DATA_PATH', FRESHRSS_PATH . '/data');
-define ('LIB_PATH', FRESHRSS_PATH . '/lib');
-define ('APP_PATH', FRESHRSS_PATH . '/app');
+	define('PUBLIC_PATH', FRESHRSS_PATH . '/p');
+		define('INDEX_PATH', PUBLIC_PATH . '/i');
+		define('PUBLIC_RELATIVE', '..');
 
-define ('LOG_PATH', DATA_PATH . '/log');
-define ('CACHE_PATH', DATA_PATH . '/cache');
+	define('DATA_PATH', FRESHRSS_PATH . '/data');
+		define('LOG_PATH', DATA_PATH . '/log');
+		define('CACHE_PATH', DATA_PATH . '/cache');
+
+	define('LIB_PATH', FRESHRSS_PATH . '/lib');
+		define('APP_PATH', FRESHRSS_PATH . '/app');
diff --git a/index.html b/index.html
index 937659d57..bbea573c7 100644
--- a/index.html
+++ b/index.html
@@ -2,12 +2,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
 <head>
 <meta charset="UTF-8" />
-<meta http-equiv="Refresh" content="0; url=public/" />
+<meta http-equiv="Refresh" content="0; url=p/i/" />
 <title>Redirection</title>
-<meta name="robots" content="noindex,follow" />
 </head>
 
 <body>
-<p><a href="./public/">FreshRSS</a></p>
+<p><a href="p/i/">FreshRSS</a></p>
 </body>
 </html>
diff --git a/index.php b/index.php
new file mode 100644
index 000000000..3fdae4285
--- /dev/null
+++ b/index.php
@@ -0,0 +1,3 @@
+<?php
+header('Location: p/i/', true, 301);
+include('index.html');
diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index c2af920df..f527322f5 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -18,6 +18,7 @@ class Minz_Session {
 	public static function init ($name) {
 		// démarre la session
 		session_name ($name);
+		session_set_cookie_params (0, './', null, false, true);
 		session_start ();
 
 		if (isset ($_SESSION)) {
diff --git a/lib/Minz/Url.php b/lib/Minz/Url.php
index 30f7f6231..17f1ddece 100644
--- a/lib/Minz/Url.php
+++ b/lib/Minz/Url.php
@@ -17,12 +17,16 @@ class Minz_Url {
 	 * @return l'url formatée
 	 */
 	public static function display ($url = array (), $encodage = 'html', $absolute = false) {
-		$url = self::checkUrl ($url);
+		$isArray = is_array($url);
+
+		if ($isArray) {
+			$url = self::checkUrl ($url);
+		}
 
 		$url_string = '';
 
 		if ($absolute) {
-			if (is_array ($url) && isset ($url['protocol'])) {
+			if ($isArray && isset ($url['protocol'])) {
 				$protocol = $url['protocol'];
 			} elseif (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
 				$protocol = 'https:';
@@ -30,12 +34,11 @@ class Minz_Url {
 				$protocol = 'http:';
 			}
 			$url_string = $protocol . '//' . Minz_Request::getDomainName () . Minz_Request::getBaseUrl ();
-		}
-		else {
-			$url_string = '.';
+		} else {
+			$url_string = $isArray ? '.' : PUBLIC_RELATIVE;
 		}
 
-		if (is_array ($url)) {
+		if ($isArray) {
 			$router = new Minz_Router ();
 
 			if (Minz_Configuration::useUrlRewriting ()) {
diff --git a/public/.htaccess b/p/.htaccess
index fefe8b226..fefe8b226 100644
--- a/public/.htaccess
+++ b/p/.htaccess
diff --git a/public/f.php b/p/f.php
index a56d58617..a56d58617 100644
--- a/public/f.php
+++ b/p/f.php
diff --git a/public/favicon.ico b/p/favicon.ico
index f7ae0a5b9..f7ae0a5b9 100644
--- a/public/favicon.ico
+++ b/p/favicon.ico
diff --git a/public/favicon.png b/p/favicon.png
index 3038dc3d1..3038dc3d1 100644
--- a/public/favicon.png
+++ b/p/favicon.png
diff --git a/public/index.php b/p/i/index.php
index c8b15b3d9..6c25b2c54 100755
--- a/public/index.php
+++ b/p/i/index.php
@@ -21,7 +21,7 @@
 if (file_exists ('install.php')) {
 	require('install.php');
 } else {
-	require('../constants.php');
+	require('../../constants.php');
 
 	session_cache_limiter('');
 	if (!file_exists(DATA_PATH . '/no-cache.txt')) {
diff --git a/public/install.php b/p/i/install.php
index ad5527765..fa37ae19a 100644
--- a/public/install.php
+++ b/p/i/install.php
@@ -1,8 +1,9 @@
 <?php
-require('../constants.php');
+require('../../constants.php');
 include(LIB_PATH . '/lib_rss.php');
 
 session_name('FreshRSS');
+session_set_cookie_params(0, './', null, false, true);
 session_start();
 
 if (isset ($_GET['step'])) {
@@ -381,7 +382,7 @@ function updateDatabase($perform = false) {
 }
 
 function deleteInstall () {
-	$res = unlink (PUBLIC_PATH . '/install.php');
+	$res = unlink (INDEX_PATH . '/install.php');
 	if ($res) {
 		header ('Location: index.php');
 	}
@@ -455,16 +456,6 @@ function delTree($dir) {	//http://php.net/rmdir#110489
 	return rmdir($dir);
 }
 
-function removeOldFiles() {
-	$oldDirs = array('/app/configuration/', '/cache/', '/log/', '/public/data/', '/public/themes/printer/');	//v0.6
-
-	$ok = true;
-	foreach ($oldDirs as $oldDir) {
-		$ok &= delTree(FRESHRSS_PATH . $oldDir);
-	}
-	return $ok;
-}
-
 /*** VÉRIFICATIONS ***/
 function checkStep () {
 	$s0 = checkStep0 ();
@@ -483,7 +474,7 @@ function checkStep () {
 	$_SESSION['actualize_feeds'] = true;
 }
 function checkStep0 () {
-	moveOldFiles() && removeOldFiles();
+	moveOldFiles();
 
 	if (file_exists(DATA_PATH . '/config.php')) {
 		$ini_array = include(DATA_PATH . '/config.php');
@@ -934,7 +925,7 @@ function printStep5 () {
 
 function printStep6 () {
 ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t ('oops'); ?></span> <?php echo _t ('install_not_deleted', PUBLIC_PATH . '/install.php'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t ('oops'); ?></span> <?php echo _t ('install_not_deleted', INDEX_PATH . '/install.php'); ?></p>
 <?php
 }
 
diff --git a/p/index.html b/p/index.html
new file mode 100644
index 000000000..af91b717e
--- /dev/null
+++ b/p/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
+<head>
+<meta charset="UTF-8" />
+<meta http-equiv="Refresh" content="0; url=i/" />
+<title>Redirection</title>
+</head>
+
+<body>
+<p><a href="i/">FreshRSS</a></p>
+</body>
+</html>
diff --git a/p/index.php b/p/index.php
new file mode 100644
index 000000000..e90662078
--- /dev/null
+++ b/p/index.php
@@ -0,0 +1,3 @@
+<?php
+header('Location: i/', true, 301);
+include('index.html');
diff --git a/public/robots.txt b/p/robots.txt
index 1f53798bb..1f53798bb 100644
--- a/public/robots.txt
+++ b/p/robots.txt
diff --git a/public/scripts/global_view.js b/p/scripts/global_view.js
index 0cdcdd3fa..0cdcdd3fa 100644
--- a/public/scripts/global_view.js
+++ b/p/scripts/global_view.js
diff --git a/public/scripts/jquery-2.0.3.min.map b/p/scripts/jquery-2.0.3.min.map
index 472d71bb0..472d71bb0 100644
--- a/public/scripts/jquery-2.0.3.min.map
+++ b/p/scripts/jquery-2.0.3.min.map
diff --git a/public/scripts/jquery.lazyload.min.js b/p/scripts/jquery.lazyload.min.js
index 8dd097dc3..8dd097dc3 100644
--- a/public/scripts/jquery.lazyload.min.js
+++ b/p/scripts/jquery.lazyload.min.js
diff --git a/public/scripts/jquery.min.js b/p/scripts/jquery.min.js
index 2be209dd2..2be209dd2 100644
--- a/public/scripts/jquery.min.js
+++ b/p/scripts/jquery.min.js
diff --git a/public/scripts/main.js b/p/scripts/main.js
index ef05eb2fb..ef05eb2fb 100644
--- a/public/scripts/main.js
+++ b/p/scripts/main.js
diff --git a/public/scripts/shortcut.js b/p/scripts/shortcut.js
index debaffbaa..debaffbaa 100644
--- a/public/scripts/shortcut.js
+++ b/p/scripts/shortcut.js
diff --git a/public/themes/default/freshrss.css b/p/themes/default/freshrss.css
index 2b157b27a..2b157b27a 100644
--- a/public/themes/default/freshrss.css
+++ b/p/themes/default/freshrss.css
diff --git a/public/themes/default/global.css b/p/themes/default/global.css
index 440fc6e41..440fc6e41 100644
--- a/public/themes/default/global.css
+++ b/p/themes/default/global.css
diff --git a/public/themes/default/loader.gif b/p/themes/default/loader.gif
index 5ff26f0e3..5ff26f0e3 100644
--- a/public/themes/default/loader.gif
+++ b/p/themes/default/loader.gif
diff --git a/public/themes/default/metadata.json b/p/themes/default/metadata.json
index d316ec517..d316ec517 100644
--- a/public/themes/default/metadata.json
+++ b/p/themes/default/metadata.json
diff --git a/public/themes/flat-design/freshrss.css b/p/themes/flat-design/freshrss.css
index 7e3f4c81a..7e3f4c81a 100644
--- a/public/themes/flat-design/freshrss.css
+++ b/p/themes/flat-design/freshrss.css
diff --git a/public/themes/flat-design/global.css b/p/themes/flat-design/global.css
index 90b59d002..90b59d002 100644
--- a/public/themes/flat-design/global.css
+++ b/p/themes/flat-design/global.css
diff --git a/public/themes/flat-design/icons/add.svg b/p/themes/flat-design/icons/add.svg
index 15767a3ad..15767a3ad 100644
--- a/public/themes/flat-design/icons/add.svg
+++ b/p/themes/flat-design/icons/add.svg
diff --git a/public/themes/flat-design/icons/all.svg b/p/themes/flat-design/icons/all.svg
index d20e0f5bf..d20e0f5bf 100644
--- a/public/themes/flat-design/icons/all.svg
+++ b/p/themes/flat-design/icons/all.svg
diff --git a/public/themes/flat-design/icons/close.svg b/p/themes/flat-design/icons/close.svg
index 629fda7ff..629fda7ff 100644
--- a/public/themes/flat-design/icons/close.svg
+++ b/p/themes/flat-design/icons/close.svg
diff --git a/public/themes/flat-design/icons/configure.svg b/p/themes/flat-design/icons/configure.svg
index 969c5719f..969c5719f 100644
--- a/public/themes/flat-design/icons/configure.svg
+++ b/p/themes/flat-design/icons/configure.svg
diff --git a/public/themes/flat-design/icons/down.svg b/p/themes/flat-design/icons/down.svg
index 31730626f..31730626f 100644
--- a/public/themes/flat-design/icons/down.svg
+++ b/p/themes/flat-design/icons/down.svg
diff --git a/public/themes/flat-design/icons/next.svg b/p/themes/flat-design/icons/next.svg
index d75cc40f5..d75cc40f5 100644
--- a/public/themes/flat-design/icons/next.svg
+++ b/p/themes/flat-design/icons/next.svg
diff --git a/public/themes/flat-design/icons/prev.svg b/p/themes/flat-design/icons/prev.svg
index 9ba03ceb2..9ba03ceb2 100644
--- a/public/themes/flat-design/icons/prev.svg
+++ b/p/themes/flat-design/icons/prev.svg
diff --git a/public/themes/flat-design/icons/refresh.svg b/p/themes/flat-design/icons/refresh.svg
index 8f95bf443..8f95bf443 100644
--- a/public/themes/flat-design/icons/refresh.svg
+++ b/p/themes/flat-design/icons/refresh.svg
diff --git a/public/themes/flat-design/icons/search.svg b/p/themes/flat-design/icons/search.svg
index bca7571b4..bca7571b4 100644
--- a/public/themes/flat-design/icons/search.svg
+++ b/p/themes/flat-design/icons/search.svg
diff --git a/public/themes/flat-design/icons/up.svg b/p/themes/flat-design/icons/up.svg
index 3ab11b168..3ab11b168 100644
--- a/public/themes/flat-design/icons/up.svg
+++ b/p/themes/flat-design/icons/up.svg
diff --git a/public/themes/flat-design/loader.gif b/p/themes/flat-design/loader.gif
index ce36565b3..ce36565b3 100644
--- a/public/themes/flat-design/loader.gif
+++ b/p/themes/flat-design/loader.gif
diff --git a/public/themes/flat-design/metadata.json b/p/themes/flat-design/metadata.json
index 6b94d11c2..6b94d11c2 100644
--- a/public/themes/flat-design/metadata.json
+++ b/p/themes/flat-design/metadata.json
diff --git a/public/themes/fonts/openSans.woff b/p/themes/fonts/openSans.woff
index 55b25f867..55b25f867 100644
--- a/public/themes/fonts/openSans.woff
+++ b/p/themes/fonts/openSans.woff
diff --git a/public/themes/icons/add.svg b/p/themes/icons/add.svg
index 425c9b4aa..425c9b4aa 100644
--- a/public/themes/icons/add.svg
+++ b/p/themes/icons/add.svg
diff --git a/public/themes/icons/all.svg b/p/themes/icons/all.svg
index 2180f7a4b..2180f7a4b 100644
--- a/public/themes/icons/all.svg
+++ b/p/themes/icons/all.svg
diff --git a/public/themes/icons/bookmark.svg b/p/themes/icons/bookmark.svg
index d6e2cebb5..d6e2cebb5 100644
--- a/public/themes/icons/bookmark.svg
+++ b/p/themes/icons/bookmark.svg
diff --git a/public/themes/icons/category-white.svg b/p/themes/icons/category-white.svg
index 5e61aeea5..5e61aeea5 100644
--- a/public/themes/icons/category-white.svg
+++ b/p/themes/icons/category-white.svg
diff --git a/public/themes/icons/category.svg b/p/themes/icons/category.svg
index 71f95490e..71f95490e 100644
--- a/public/themes/icons/category.svg
+++ b/p/themes/icons/category.svg
diff --git a/public/themes/icons/close.svg b/p/themes/icons/close.svg
index c0c786fd6..c0c786fd6 100644
--- a/public/themes/icons/close.svg
+++ b/p/themes/icons/close.svg
diff --git a/public/themes/icons/configure.svg b/p/themes/icons/configure.svg
index 52df8bca7..52df8bca7 100644
--- a/public/themes/icons/configure.svg
+++ b/p/themes/icons/configure.svg
diff --git a/public/themes/icons/down.svg b/p/themes/icons/down.svg
index 06d031fae..06d031fae 100644
--- a/public/themes/icons/down.svg
+++ b/p/themes/icons/down.svg
diff --git a/public/themes/icons/grey.gif b/p/themes/icons/grey.gif
index c7212bc1f..c7212bc1f 100644
--- a/public/themes/icons/grey.gif
+++ b/p/themes/icons/grey.gif
diff --git a/public/themes/icons/help.svg b/p/themes/icons/help.svg
index b103ec46d..b103ec46d 100644
--- a/public/themes/icons/help.svg
+++ b/p/themes/icons/help.svg
diff --git a/public/themes/icons/icon.svg b/p/themes/icons/icon.svg
index 8aefed2ad..8aefed2ad 100644
--- a/public/themes/icons/icon.svg
+++ b/p/themes/icons/icon.svg
diff --git a/public/themes/icons/link.svg b/p/themes/icons/link.svg
index ddc8e0706..ddc8e0706 100644
--- a/public/themes/icons/link.svg
+++ b/p/themes/icons/link.svg
diff --git a/public/themes/icons/login.svg b/p/themes/icons/login.svg
index 0a8af162f..0a8af162f 100644
--- a/public/themes/icons/login.svg
+++ b/p/themes/icons/login.svg
diff --git a/public/themes/icons/logout.svg b/p/themes/icons/logout.svg
index 284a67578..284a67578 100644
--- a/public/themes/icons/logout.svg
+++ b/p/themes/icons/logout.svg
diff --git a/public/themes/icons/next.svg b/p/themes/icons/next.svg
index 72637b4e6..72637b4e6 100644
--- a/public/themes/icons/next.svg
+++ b/p/themes/icons/next.svg
diff --git a/public/themes/icons/non-starred.svg b/p/themes/icons/non-starred.svg
index 346717f78..346717f78 100644
--- a/public/themes/icons/non-starred.svg
+++ b/p/themes/icons/non-starred.svg
diff --git a/public/themes/icons/prev.svg b/p/themes/icons/prev.svg
index 67685c50c..67685c50c 100644
--- a/public/themes/icons/prev.svg
+++ b/p/themes/icons/prev.svg
diff --git a/public/themes/icons/read.svg b/p/themes/icons/read.svg
index 932bfd860..932bfd860 100644
--- a/public/themes/icons/read.svg
+++ b/p/themes/icons/read.svg
diff --git a/public/themes/icons/refresh.svg b/p/themes/icons/refresh.svg
index 11728fc5d..11728fc5d 100644
--- a/public/themes/icons/refresh.svg
+++ b/p/themes/icons/refresh.svg
diff --git a/public/themes/icons/rss.svg b/p/themes/icons/rss.svg
index ceaddceee..ceaddceee 100644
--- a/public/themes/icons/rss.svg
+++ b/p/themes/icons/rss.svg
diff --git a/public/themes/icons/search.svg b/p/themes/icons/search.svg
index acfb364cc..acfb364cc 100644
--- a/public/themes/icons/search.svg
+++ b/p/themes/icons/search.svg
diff --git a/public/themes/icons/share.svg b/p/themes/icons/share.svg
index 443321882..443321882 100644
--- a/public/themes/icons/share.svg
+++ b/p/themes/icons/share.svg
diff --git a/public/themes/icons/starred.svg b/p/themes/icons/starred.svg
index d6e2cebb5..d6e2cebb5 100644
--- a/public/themes/icons/starred.svg
+++ b/p/themes/icons/starred.svg
diff --git a/public/themes/icons/tag.svg b/p/themes/icons/tag.svg
index 688aca7a4..688aca7a4 100644
--- a/public/themes/icons/tag.svg
+++ b/p/themes/icons/tag.svg
diff --git a/public/themes/icons/unread.svg b/p/themes/icons/unread.svg
index f541fb25b..f541fb25b 100644
--- a/public/themes/icons/unread.svg
+++ b/p/themes/icons/unread.svg
diff --git a/public/themes/icons/up.svg b/p/themes/icons/up.svg
index dab31a20d..dab31a20d 100644
--- a/public/themes/icons/up.svg
+++ b/p/themes/icons/up.svg
author	Alexandre Alapetite <alexandre@alapetite.fr>	2013-12-26 01:56:58 +0100
committer	Alexandre Alapetite <alexandre@alapetite.fr>	2013-12-26 01:56:58 +0100
commit	58300c36ad77e8d788e99825d509fe8657a36854 (patch)
tree	6167a28a3c728c65c30256c1f29fd0a0552d8676
parent	1da74b1eddfafd9191548e0fde150690b80f694b (diff)