From 7e81b0bb5a0720f3a6450d87629a5411c7d3149f Mon Sep 17 00:00:00 2001
From: Michael Zangl <github@michael.fam-zangl.net>
Date: Sat, 3 Mar 2018 11:18:28 +0100
Subject: [PATCH 1/3] Froxlor installer: Use same file path for chmod.

---
 install/lib/class.FroxlorInstall.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install/lib/class.FroxlorInstall.php b/install/lib/class.FroxlorInstall.php
index 128a7104..1cbbd7ca 100644
--- a/install/lib/class.FroxlorInstall.php
+++ b/install/lib/class.FroxlorInstall.php
@@ -322,11 +322,12 @@ class FroxlorInstall
 		$userdata .= "?>";
 		
 		// test if we can store the userdata.inc.php in ../lib
-		if ($fp = @fopen(dirname(dirname(dirname(__FILE__))) . '/lib/userdata.inc.php', 'w')) {
+		$userdata_file = dirname(dirname(dirname(__FILE__))) . '/lib/userdata.inc.php';
+		if ($fp = @fopen($userdata_file, 'w')) {
 			$result = @fputs($fp, $userdata, strlen($userdata));
 			@fclose($fp);
 			$content .= $this->_status_message('green', 'OK');
-			chmod('../lib/userdata.inc.php', 0440);
+			chmod($userdata_file, 0440);
 		} elseif ($fp = @fopen('/tmp/userdata.inc.php', 'w')) {
 			$result = @fputs($fp, $userdata, strlen($userdata));
 			@fclose($fp);

From 8642254175096d73b80edbf27774c673ee1f11f0 Mon Sep 17 00:00:00 2001
From: Michael Zangl <github@michael.fam-zangl.net>
Date: Sat, 3 Mar 2018 11:48:26 +0100
Subject: [PATCH 2/3] Fix invalidhostname error message.

---
 lng/english.lng.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lng/english.lng.php b/lng/english.lng.php
index a5d33367..fe156bf9 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1648,7 +1648,7 @@ $lng['admin']['usedmax'] = 'Used / Max';
 $lng['admin']['used'] = 'Used';
 $lng['mysql']['size'] = 'Size';
 
-$lng['error']['invalidhostname'] = 'Hostname can\'t be empty nor can it consist only of whitespaces';
+$lng['error']['invalidhostname'] = 'Hostname needs to be avalid domain. It can\'t be empty nor can it consist only of whitespaces';
 
 $lng['traffic']['http'] = 'HTTP (MiB)';
 $lng['traffic']['ftp'] = 'FTP (MiB)';

From 909c983aec4ce6b89d06014cbe36abaeec5490ae Mon Sep 17 00:00:00 2001
From: Michael Zangl <github@michael.fam-zangl.net>
Date: Sat, 3 Mar 2018 11:49:58 +0100
Subject: [PATCH 3/3] Fix invalidhostname error message (de).

---
 lng/german.lng.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lng/german.lng.php b/lng/german.lng.php
index 0924c1ac..b2dbe82b 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1375,7 +1375,7 @@ $lng['admin']['usedmax'] = 'Benutzt / Max.';
 $lng['admin']['used'] = 'Benutzt';
 $lng['mysql']['size'] = 'Datenbankgröße';
 
-$lng['error']['invalidhostname'] = 'Hostname darf nicht leer sein oder nur aus Leerzeichen bestehen';
+$lng['error']['invalidhostname'] = 'Hostname muss eine gültige Domain sein. Er darf weder leer sein noch nur aus Leerzeichen bestehen';
 
 $lng['traffic']['http'] = 'HTTP (MiB)';
 $lng['traffic']['ftp'] = 'FTP (MiB)';