From 74c7ca770b0cc8ab70fa383fc85e534603f8fd62 Mon Sep 17 00:00:00 2001
From: laking <laking@ispconfig3>
Date: Mon, 04 Apr 2011 17:04:46 -0400
Subject: [PATCH] Update on certificte CA-signing. Moved config to control panel.
---
interface/web/mail/mail_user_edit.php | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 50683ee..e9a3767 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -150,7 +150,7 @@
// Check the quota and adjust
if(isset($_POST["quota"]) && $client["limit_mailquota"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT sum(quota) as mailquota FROM mail_user WHERE mailuser_id != ".intval($this->id)." AND sys_groupid = $client_group_id");
+ $tmp = $app->db->queryOneRecord("SELECT sum(quota) as mailquota FROM mail_user WHERE mailuser_id != ".intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
$mailquota = $tmp["mailquota"] / 1024 / 1024;
$new_mailbox_quota = intval($this->dataRecord["quota"]);
if(($mailquota + $new_mailbox_quota > $client["limit_mailquota"]) || ($new_mailbox_quota == 0 && $client["limit_mailquota"] != -1)) {
@@ -214,6 +214,9 @@
// send a welcome email to create the mailbox
// mail($this->dataRecord["email"],$app->tform->wordbook["welcome_mail_subject"],$app->tform->wordbook["welcome_mail_message"]);
+ /*
+ // the conversion to iso-8859-1 causes compatibility problems, therefore the transition to utf-8
+
// tries to detect current charset, and encode subject-header and body from it to ISO-8859-1.
$fromCharset = mb_detect_encoding($app->tform->lng("welcome_mail_subject"));
$iconvPreferences = array("input-charset" => $fromCharset,
@@ -235,13 +238,35 @@
mail($mailTarget, $mailSubject, $mailBody, $mailHeaders);
+ */
+
+ $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";
+ $mailHeaders .= "From: $welcomeFromName <$welcomeFromEmail>" . "\n";
+ $mailHeaders .= "Reply-To: <$welcomeFromEmail>" . "\n";
+ $mailTarget = $this->dataRecord["email"];
+
+ $mailSubject = "=?utf-8?Q?" . imap_8bit($app->tform->lng("welcome_mail_subject")) . "?=";
+ $mailBody = $app->tform->lng("welcome_mail_message");
+
+ mail($mailTarget, $mailSubject, $mailBody, $mailHeaders);
+
// Spamfilter policy
$policy_id = intval($this->dataRecord["policy"]);
if($policy_id > 0) {
$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`)
@@ -303,6 +328,21 @@
$app->db->query($sql);
}
+ //** If the email address has been changed, change it in all aliases too
+ if(isset($this->dataRecord['email']) && $this->oldDataRecord['email'] != $this->dataRecord['email']) {
+ //if($this->oldDataRecord['email'] != $this->dataRecord['email']) {
+
+ //* Update the aliases
+ $forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE destination = '".$app->db->quote($this->oldDataRecord['email'])."'");
+ if(is_array($forwardings)) {
+ foreach($forwardings as $rec) {
+ $destination = $app->db->quote($this->dataRecord['email']);
+ $app->db->datalogUpdate('mail_forwarding', "destination = '$destination'", 'forwarding_id', $rec['forwarding_id']);
+ }
+ }
+
+ } // end if email addess changed
+
}
}
--
Gitblit v1.9.1