From 21fe3aa25cb835b4e41fb9e0753ad14b019fcd46 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Tue, 3 Nov 2020 16:22:26 +0100
Subject: [PATCH] Added README to /data/ folder

---
 _include.php   |  6 ++++--
 data/README.md |  2 ++
 release.php    | 11 +++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 data/README.md

diff --git a/_include.php b/_include.php
index 64cdd07c3..e89506d55 100644
--- a/_include.php
+++ b/_include.php
@@ -11,20 +11,22 @@
 //define('MULTIDOMAIN', 1);
 
 /**
+ * Custom 'data' folder path
  * @return string
  */
 function __get_custom_data_full_path()
 {
 	return '';
 	return dirname(__DIR__) . '/snappymail-data';
-	return '/var/external-snappymail-data-folder'; // custom data folder path
+	return '/var/external-snappymail-data-folder';
 }
 
 /**
+ * Additional configuration file name
  * @return string
  */
 function __get_additional_configuration_name()
 {
 	return '';
-	return defined('APP_SITE') && 0 < strlen(APP_SITE) ? APP_SITE.'.ini' : ''; // additional configuration file name
+	return defined('APP_SITE') && 0 < strlen(APP_SITE) ? APP_SITE.'.ini' : '';
 }
diff --git a/data/README.md b/data/README.md
new file mode 100644
index 000000000..3ed811d28
--- /dev/null
+++ b/data/README.md
@@ -0,0 +1,2 @@
+You can move this folder outside public http access for security.
+Edit and rename /_include.php to set the new location.
diff --git a/release.php b/release.php
index 72aa8035b..b2709974d 100755
--- a/release.php
+++ b/release.php
@@ -72,14 +72,17 @@ foreach ($files as $file) {
 
 $tar->buildFromDirectory('./', "@snappymail/v/{$package->version}@");
 
-$zip->addFromString('data/.htaccess', $package->version);
-$tar->addFromString('data/.htaccess', $package->version);
+$zip->addFile('data/.htaccess');
+$tar->addFile('data/.htaccess');
 
 $zip->addFromString('data/VERSION', $package->version);
 $tar->addFromString('data/VERSION', $package->version);
 
-//$zip->addFromString('data/EMPTY', $package->version);
-//$tar->addFromString('data/EMPTY', $package->version);
+$zip->addFile('data/README.md');
+$tar->addFile('data/README.md');
+
+//$zip->addFile('data/EMPTY');
+//$tar->addFile('data/EMPTY');
 
 $zip->addFile('_include.php');
 $tar->addFile('_include.php');