From 4ef1a553e57e5447db4431f5ea8cc4e35cae148f Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Mon, 28 Mar 2011 15:56:33 -0400
Subject: [PATCH] added default-values for first use to the rescue-module
---
interface/web/mail/mail_user_edit.php | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 3bda442..e9a3767 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";
@@ -260,7 +266,7 @@
$tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '".mysql_real_escape_string($this->dataRecord["email"])."'");
if($tmp_user["id"] > 0) {
// There is already a record that we will update
- $app->db->datalogUpdate('spamfilter_users', "policy_id = $ploicy_id", 'id', $tmp_user["id"]);
+ $app->db->datalogUpdate('spamfilter_users', "policy_id = $policy_id", 'id', $tmp_user["id"]);
} else {
// We create a new record
$insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `priority`, `policy_id`, `email`, `fullname`, `local`)
--
Gitblit v1.9.1