From 3bb684f59f04511ed157833d3d9552ee0e65d980 Mon Sep 17 00:00:00 2001
From: Christophe HENRY <christophe.henry@sbgodin.fr>
Date: Mon, 4 Aug 2014 00:38:37 +0200
Subject: [PATCH] Removes htaccess file creation and adds them in the
 repository

I also removed the previously created placeholders, which after all, have no more utility.
---
 cache/.htaccess        | 2 ++
 cache/.placeholder     | 0
 data/.htaccess         | 2 ++
 data/.placeholder      | 0
 index.php              | 7 -------
 pagecache/.htaccess    | 2 ++
 pagecache/.placeholder | 0
 tmp/.htaccess          | 2 ++
 tmp/.placeholder       | 0
 9 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 cache/.htaccess
 delete mode 100644 cache/.placeholder
 create mode 100644 data/.htaccess
 delete mode 100644 data/.placeholder
 create mode 100644 pagecache/.htaccess
 delete mode 100644 pagecache/.placeholder
 create mode 100644 tmp/.htaccess
 delete mode 100644 tmp/.placeholder

diff --git a/cache/.htaccess b/cache/.htaccess
new file mode 100644
index 00000000..b584d98c
--- /dev/null
+++ b/cache/.htaccess
@@ -0,0 +1,2 @@
+Allow from none
+Deny from all
diff --git a/cache/.placeholder b/cache/.placeholder
deleted file mode 100644
index e69de29b..00000000
diff --git a/data/.htaccess b/data/.htaccess
new file mode 100644
index 00000000..b584d98c
--- /dev/null
+++ b/data/.htaccess
@@ -0,0 +1,2 @@
+Allow from none
+Deny from all
diff --git a/data/.placeholder b/data/.placeholder
deleted file mode 100644
index e69de29b..00000000
diff --git a/index.php b/index.php
index 747f113a..3136193f 100644
--- a/index.php
+++ b/index.php
@@ -88,13 +88,6 @@ header("Pragma: no-cache");
 
 // Directories creations (Note that your web host may require differents rights than 705.)
 if (!is_writable(realpath(dirname(__FILE__)))) die('<pre>ERROR: Shaarli does not have the right to write in its own directory ('.realpath(dirname(__FILE__)).').</pre>');
-if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['DATADIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files.
-// Second check to see if Shaarli can write in its directory, because on some hosts is_writable() is not reliable.
-if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) die('<pre>ERROR: Shaarli does not have the right to write in its data directory ('.realpath($GLOBALS['config']['DATADIR']).').</pre>');
-if ($GLOBALS['config']['ENABLE_LOCALCACHE'])
-{
-    if (!is_file($GLOBALS['config']['CACHEDIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['CACHEDIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files.
-}
 
 // Handling of old config file which do not have the new parameters.
 if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.htmlspecialchars(indexUrl());
diff --git a/pagecache/.htaccess b/pagecache/.htaccess
new file mode 100644
index 00000000..b584d98c
--- /dev/null
+++ b/pagecache/.htaccess
@@ -0,0 +1,2 @@
+Allow from none
+Deny from all
diff --git a/pagecache/.placeholder b/pagecache/.placeholder
deleted file mode 100644
index e69de29b..00000000
diff --git a/tmp/.htaccess b/tmp/.htaccess
new file mode 100644
index 00000000..b584d98c
--- /dev/null
+++ b/tmp/.htaccess
@@ -0,0 +1,2 @@
+Allow from none
+Deny from all
diff --git a/tmp/.placeholder b/tmp/.placeholder
deleted file mode 100644
index e69de29b..00000000
-- 
2.41.0