From d8faa4e7e3fb74e554f6c9339f6fe4e2883c3bf1 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 18 Sep 2015 13:43:03 -0400
Subject: [PATCH] Fix by dirkd: Since file() doesn't remove "\n" from the lines read the condition $lines[$l] == '' never evaluated to true. So $mailHeaders would always contain every line from the template while $mailBody contained none of them.

---
 interface/web/sites/database_del.php |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/interface/web/sites/database_del.php b/interface/web/sites/database_del.php
index f5f8dbc..ba079e2 100644
--- a/interface/web/sites/database_del.php
+++ b/interface/web/sites/database_del.php
@@ -39,13 +39,25 @@
 * End Form configuration
 ******************************************/
 
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
 
 //* Check permissions for module
 $app->auth->check_module_permissions('sites');
 
 $app->uses("tform_actions");
-$app->tform_actions->onDelete();
+class page_action extends tform_actions {
+	function onBeforeDelete() {
+		global $app; $conf;
+		if($app->tform->checkPerm($this->id, 'd') == false) $app->error($app->lng('error_no_delete_permission'));
 
-?>
\ No newline at end of file
+		$app->uses('sites_database_plugin');
+		//$app->sites_database_plugin->processDatabaseDelete($this->id);
+	}
+
+}
+
+$page = new page_action;
+$page->onDelete();
+
+?>

--
Gitblit v1.9.1