From cfa48e23b690e86369b91627e13f9a185eae78ab Mon Sep 17 00:00:00 2001
From: dg9vh <kim@huebel-online.de>
Date: Wed, 25 May 2016 15:08:36 +0000
Subject: [PATCH] Check old-styled-config and check write-permissions

---
 include/tools.php | 13 ++++++++++---
 setup.php         |  7 ++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/include/tools.php b/include/tools.php
index ebd41cd..07da051 100644
--- a/include/tools.php
+++ b/include/tools.php
@@ -55,10 +55,17 @@ function createConfigLines() {
 } 
 
 function checkSetup() {
-	if (file_exists ("setup.php")) {
+	if (null == DISTRIBUTION) {
 ?>
-<div class="alert alert-danger" role="alert">You forgot to remove setup.php in root-directory of your dashboard! Please delete the file!</div>
+<div class="alert alert-danger" role="alert">You are using an old config.php. Please configure your Dashboard by calling <a href="setup.php">setup.php</a>!</div>
 <?php
-	}
+		
+		} else {
+		if (file_exists ("setup.php")) {
+	?>
+	<div class="alert alert-danger" role="alert">You forgot to remove setup.php in root-directory of your dashboard or you forgot to configure it! Please delete the file or configure your Dashboard by calling <a href="setup.php">setup.php</a>!</div>
+	<?php
+		}
+		}
 }
 ?>
\ No newline at end of file
diff --git a/setup.php b/setup.php
index 586c187..bbb3c8e 100644
--- a/setup.php
+++ b/setup.php
@@ -20,7 +20,12 @@ include "include/tools.php";
 <?php
 	if ($_GET['cmd'] =="writeconfig") {
 		if (!file_exists('./config')) {
-		    mkdir('./config', 0777, true);
+		    if (!mkdir('./config', 0777, true)) {
+?>
+<div class="alert alert-danger" role="alert">You forgot to give write-permissions to your webserver-user, see point 3 in <a href="linux-step-by-step.md">linux-step-by-step.md</a>!</div>
+
+<?php
+		    }
 		}
 		$configfile = fopen("config/config.php", 'w');
 		fwrite($configfile,"<?php\n");