From ed3c7a240d22706fc9d9d0a8a015ddd063e16ff4 Mon Sep 17 00:00:00 2001
From: Antennipasi <Antennipasi@ispconfig3>
Date: Tue, 16 Nov 2010 01:32:57 -0500
Subject: [PATCH] Changed quota to use journaled version.
---
interface/web/mail/mail_user_edit.php | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 3bda442..11daf7a 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -242,6 +242,12 @@
$welcomeFromName = $app->tform->lng("welcome_mail_fromname_txt");
$welcomeFromEmail = $app->tform->lng("welcome_mail_fromemail_txt");
+
+ $app->uses('getconf');
+ $global_config = $app->getconf->get_global_config('mail');
+ if(!empty($global_config['admin_mail']))$welcomeFromEmail = $global_config['admin_mail'];
+ if(!empty($global_config['admin_name']))$welcomeFromName = $global_config['admin_name'];
+
$mailHeaders = "MIME-Version: 1.0" . "\n";
$mailHeaders .= "Content-type: text/plain; charset=utf-8" . "\n";
$mailHeaders .= "Content-Transfer-Encoding: 8bit" . "\n";
--
Gitblit v1.9.1