Merge pull request #721 from Zankaria/dockerize

Dockerize Vichan

install.php

@@ -5,6 +5,11 @@ define('VERSION', '5.1.4');
 require 'inc/bootstrap.php';
 loadConfig();
 
+if (!is_writable('inc/secrets.php') || !is_writable('inc/')) {
+	echo 'install.php does not have permission to write to /inc/secrets.php and/or /inc/, without permission the installer cannot continue';
+	exit();
+}
+
 // Salt generators
 class SaltGen {
 	public $salt_length = 128;
@@ -856,14 +861,14 @@ if ($step == 0) {
 		array(
 			'category' => 'File permissions',
 			'name' => getcwd() . '/templates/cache',
-			'result' => is_writable('templates') || (is_dir('templates/cache') && is_writable('templates/cache')),
+			'result' => is_dir('templates/cache/') && is_writable('templates/cache/'),
 			'required' => true,
 			'message' => 'You must give vichan permission to create (and write to) the <code>templates/cache</code> directory or performance will be drastically reduced.'
 		),
 		array(
 			'category' => 'File permissions',
 			'name' => getcwd() . '/tmp/cache',
-			'result' => is_dir('tmp/cache') && is_writable('tmp/cache'),
+			'result' => is_dir('tmp/cache/') && is_writable('tmp/cache/'),
 			'required' => true,
 			'message' => 'You must give vichan permission to write to the <code>tmp/cache</code> directory.'
 		),
@@ -1036,4 +1041,3 @@ if ($step == 0) {
 
 	echo Element('page.html', $page);
 }
-