From d88165c8c17e6ff6860cf113b486108ba6d45e6c Mon Sep 17 00:00:00 2001 From: filip <filip@ispconfig3> Date: Tue, 12 Oct 2010 06:46:36 -0400 Subject: [PATCH] Added admin_name and admin_email to mail system config tab. Using these variables in welcome email from admin, when mailbox is created. --- 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