aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChristophe HENRY <christophe.henry@sbgodin.fr>2014-08-04 00:38:37 +0200
committerChristophe HENRY <christophe.henry@sbgodin.fr>2014-08-04 00:42:49 +0200
commit3bb684f59f04511ed157833d3d9552ee0e65d980 (patch)
treeae77468974990b2463bb4a4fc9a07ef4ce15398d
parente7416aba2c7a06fc96e37700f555c2b70a5ac859 (diff)
downloadShaarli-3bb684f59f04511ed157833d3d9552ee0e65d980.tar.gz
Shaarli-3bb684f59f04511ed157833d3d9552ee0e65d980.tar.zst
Shaarli-3bb684f59f04511ed157833d3d9552ee0e65d980.zip
Removes htaccess file creation and adds them in the repository
I also removed the previously created placeholders, which after all, have no more utility.
-rw-r--r--cache/.htaccess2
-rw-r--r--cache/.placeholder0
-rw-r--r--data/.htaccess2
-rw-r--r--data/.placeholder0
-rw-r--r--index.php7
-rw-r--r--pagecache/.htaccess2
-rw-r--r--pagecache/.placeholder0
-rw-r--r--tmp/.htaccess2
-rw-r--r--tmp/.placeholder0
9 files changed, 8 insertions, 7 deletions
diff --git a/cache/.htaccess b/cache/.htaccess
new file mode 100644
index 00000000..b584d98c
--- /dev/null
+++ b/cache/.htaccess
@@ -0,0 +1,2 @@
1Allow from none
2Deny from all
diff --git a/cache/.placeholder b/cache/.placeholder
deleted file mode 100644
index e69de29b..00000000
--- a/cache/.placeholder
+++ /dev/null
diff --git a/data/.htaccess b/data/.htaccess
new file mode 100644
index 00000000..b584d98c
--- /dev/null
+++ b/data/.htaccess
@@ -0,0 +1,2 @@
1Allow from none
2Deny from all
diff --git a/data/.placeholder b/data/.placeholder
deleted file mode 100644
index e69de29b..00000000
--- a/data/.placeholder
+++ /dev/null
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");
88 88
89// Directories creations (Note that your web host may require differents rights than 705.) 89// Directories creations (Note that your web host may require differents rights than 705.)
90if (!is_writable(realpath(dirname(__FILE__)))) die('<pre>ERROR: Shaarli does not have the right to write in its own directory ('.realpath(dirname(__FILE__)).').</pre>'); 90if (!is_writable(realpath(dirname(__FILE__)))) die('<pre>ERROR: Shaarli does not have the right to write in its own directory ('.realpath(dirname(__FILE__)).').</pre>');
91if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['DATADIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files.
92// Second check to see if Shaarli can write in its directory, because on some hosts is_writable() is not reliable.
93if (!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>');
94if ($GLOBALS['config']['ENABLE_LOCALCACHE'])
95{
96 if (!is_file($GLOBALS['config']['CACHEDIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['CACHEDIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files.
97}
98 91
99// Handling of old config file which do not have the new parameters. 92// Handling of old config file which do not have the new parameters.
100if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.htmlspecialchars(indexUrl()); 93if (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 @@
1Allow from none
2Deny from all
diff --git a/pagecache/.placeholder b/pagecache/.placeholder
deleted file mode 100644
index e69de29b..00000000
--- a/pagecache/.placeholder
+++ /dev/null
diff --git a/tmp/.htaccess b/tmp/.htaccess
new file mode 100644
index 00000000..b584d98c
--- /dev/null
+++ b/tmp/.htaccess
@@ -0,0 +1,2 @@
1Allow from none
2Deny from all
diff --git a/tmp/.placeholder b/tmp/.placeholder
deleted file mode 100644
index e69de29b..00000000
--- a/tmp/.placeholder
+++ /dev/null