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/admin/lib/lang/en_system_config.lng | 2 ++
interface/web/admin/lib/lang/cz_system_config.lng | 2 ++
interface/web/mail/mail_user_edit.php | 6 ++++++
interface/web/admin/templates/system_config_mail_edit.htm | 8 ++++++++
interface/web/admin/form/system_config.tform.php | 18 +++++++++++++++++-
5 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 2c0138e..db43fc8 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -180,6 +180,22 @@
'width' => '30',
'maxlength' => '255'
),
+ 'admin_mail' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
+ 'admin_name' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
##################################
# ENDE Datatable fields
##################################
@@ -233,4 +249,4 @@
);
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 39eb7ff..b8f55ee 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -19,4 +19,6 @@
$wb['use_domain_module_hint'] = 'If you use this module, your customers can only select one of the domains the admin creates for them. They can not free edit the domain-field.You have to re-login after changing this value, to make the changes visible.';
$wb['new_domain_txt'] = 'HTML to create a new domain';
$wb['webftp_url_txt'] = 'WebFTP URL';
+$wb['admin_mail_txt'] = 'E-mail Administrátora';
+$wb['admin_name_txt'] = 'Jméno Administrátora';
?>
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index 5d89164..d75d1a7 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -19,4 +19,6 @@
$wb["use_domain_module_hint"] = 'If you use this module, your customers can only select one of the domains the admin creates for them. They cannot free edit the domain-field.You have to re-login after changing this value, to make the changes visible.';
$wb["new_domain_txt"] = 'HTML to create a new domain';
$wb["webftp_url_txt"] = 'WebFTP URL';
+$wb['admin_mail_txt'] = 'Administrator's e-mail';
+$wb['admin_name_txt'] = 'Administrator's name';
?>
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index 776c513..41ba4cd 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -15,6 +15,14 @@
<label for="webmail_url">{tmpl_var name='webmail_url_txt'}</label>
<input name="webmail_url" id="webmail_url" value="{tmpl_var name='webmail_url'}" size="30" maxlength="255" type="text" class="textInput" />
</div>
+ <div class="ctrlHolder">
+ <label for="admin_mail">{tmpl_var name='admin_mail_txt'}</label>
+ <input name="admin_mail" id="admin_mail" value="{tmpl_var name='admin_mail'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="admin_name">{tmpl_var name='admin_name_txt'}</label>
+ <input name="admin_name" id="admin_name" value="{tmpl_var name='admin_name'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
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