From b4aaf3eedda4001ad5e01ac2c19494020148a77c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 08 Sep 2011 10:57:26 -0400
Subject: [PATCH] Fixed: FS#1579 - Add Exim config files for centos to config file folder.
---
interface/web/mail/mail_user_edit.php | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 50683ee..655ef70 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -75,7 +75,7 @@
$app->tpl->setVar("email_local_part",$email_parts[0]);
// Getting Domains of the user
- $sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
+ $sql = "SELECT domain, server_id FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
$domains = $app->db->queryAllRecords($sql);
$domain_select = '';
if(is_array($domains)) {
@@ -114,6 +114,14 @@
$app->tpl->setVar("ar_active", '');
}
+ $app->uses('getconf');
+ $mail_config = $app->getconf->get_global_config('mail');
+ if($mail_config["enable_custom_login"] == "y") {
+ $app->tpl->setVar("enable_custom_login", 1);
+ } else {
+ $app->tpl->setVar("enable_custom_login", 0);
+ }
+
parent::onShowEnd();
}
@@ -150,7 +158,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)) {
@@ -165,6 +173,9 @@
} // end if user is not admin
+ $app->uses('getconf');
+ $mail_config = $app->getconf->get_server_config($domain["server_id"],'mail');
+
//* compose the email field
if(isset($_POST["email_local_part"]) && isset($_POST["email_domain"])) {
$this->dataRecord["email"] = strtolower($_POST["email_local_part"]."@".$_POST["email_domain"]);
@@ -179,8 +190,6 @@
if($this->dataRecord["quota"] != -1) $this->dataRecord["quota"] = $this->dataRecord["quota"] * 1024 * 1024;
// setting Maildir, Homedir, UID and GID
- $app->uses('getconf');
- $mail_config = $app->getconf->get_server_config($domain["server_id"],'mail');
$maildir = str_replace("[domain]",$domain["domain"],$mail_config["maildir_path"]);
$maildir = str_replace("[localpart]",strtolower($_POST["email_local_part"]),$maildir);
$this->dataRecord["maildir"] = $maildir;
@@ -195,6 +204,13 @@
}
+ $sys_config = $app->getconf->get_global_config('mail');
+ if($sys_config["enable_custom_login"] == "y") {
+ if(!isset($_POST["login"])) $this->dataRecord["login"] = $this->dataRecord["email"];
+ elseif(strpos($_POST["login"], '@') !== false && $_POST["login"] != $this->dataRecord["email"]) $app->tform->errorMessage .= $app->tform->lng("error_login_email_txt")."<br>";
+ } else {
+ $this->dataRecord["login"] = $this->dataRecord["email"];
+ }
//* if autoresponder checkbox not selected, do not save dates
if (!isset($_POST['autoresponder']) && array_key_exists('autoresponder_start_date', $_POST)) {
$this->dataRecord['autoresponder_start_date'] = array_map(create_function('$item','return 0;'), $this->dataRecord['autoresponder_start_date']);
@@ -211,37 +227,13 @@
$domain = $app->db->queryOneRecord("SELECT sys_groupid, server_id FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r'));
$app->db->query("UPDATE mail_user SET sys_groupid = ".$domain["sys_groupid"]." WHERE mailuser_id = ".$this->id);
- // send a welcome email to create the mailbox
-// mail($this->dataRecord["email"],$app->tform->wordbook["welcome_mail_subject"],$app->tform->wordbook["welcome_mail_message"]);
-
- // 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,
- "output-charset" => "ISO-8859-1",
- "line-length" => 76,
- "line-break-chars" => "\n",
- "scheme" => "Q");
-
- $welcomeFromName = $app->tform->lng("welcome_mail_fromname_txt");
- $welcomeFromEmail = $app->tform->lng("welcome_mail_fromemail_txt");
- $mailHeaders = "MIME-Version: 1.0" . "\n";
- $mailHeaders .= "Content-type: text/plain; charset=iso-8859-1" . "\n";
- $mailHeaders .= "From: $welcomeFromName <$welcomeFromEmail>" . "\n";
- $mailHeaders .= "Reply-To: <$welcomeFromEmail>" . "\n";
- $mailTarget = $this->dataRecord["email"];
- $mailSubject = iconv_mime_encode("trimoff", $app->tform->lng("welcome_mail_subject"), $iconvPreferences);
- $mailSubject = str_replace("trimoff: ", "", $mailSubject);
- $mailBody = iconv ($fromCharset, "ISO-8859-1", $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 +295,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