From bddb8fee29654c0bbec7c0c057a37dcf80ec96c9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 02 Mar 2006 17:59:11 -0500
Subject: [PATCH] Fixed some issues with new user creation
---
program/include/main.inc | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 244e902..3a15bfd 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -470,10 +470,10 @@
if ($user_id = $DB->insert_id(get_sequence_name('users')))
{
- if (is_string($CONFIG['mail_domain']))
- $mail_domain = $CONFIG['mail_domain'];
- else if (is_array($CONFIG['mail_domain']) && isset($CONFIG['mail_domain'][$host]))
+ if (is_array($CONFIG['mail_domain']) && isset($CONFIG['mail_domain'][$host]))
$mail_domain = $CONFIG['mail_domain'][$host];
+ else if (!empty($CONFIG['mail_domain']))
+ $mail_domain = $CONFIG['mail_domain'];
else
$mail_domain = $host;
@@ -501,14 +501,6 @@
// get existing mailboxes
$a_mailboxes = $IMAP->list_mailboxes();
-
- // check if the configured mailbox for sent messages exists
- if ($CONFIG['sent_mbox'] && !in_array_nocase($CONFIG['sent_mbox'], $a_mailboxes))
- $IMAP->create_mailbox($CONFIG['sent_mbox'], TRUE);
-
- // check if the configured mailbox for sent messages exists
- if ($CONFIG['trash_mbox'] && !in_array_nocase($CONFIG['trash_mbox'], $a_mailboxes))
- $IMAP->create_mailbox($CONFIG['trash_mbox'], TRUE);
}
else
{
--
Gitblit v1.9.1