mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2026-11-20 23:43:26 +03:00
changesets 367, 369, 370 merged from trunk
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.2.1@383 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
1 parent
f465a2c542
commit
9b2f6f1bea
3 files changed
+13
-8
No files matched your search
+8
-7
@@ -278,13 +278,6 @@ TODO: this is the end of /create-mailbox.php code segment
|
||||
*/
|
||||
$tDomain = $fDomain;
|
||||
|
||||
if (create_mailbox_subfolders($fUsername,$fPassword))
|
||||
{
|
||||
$tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
|
||||
} else {
|
||||
$tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
|
||||
}
|
||||
|
||||
if ($CONF['generate_password'] == "YES")
|
||||
{
|
||||
$tMessage .= " / $fPassword)</br />";
|
||||
@@ -326,6 +319,14 @@ TODO: this is the end of /create-mailbox.php code segment
|
||||
$tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
|
||||
}
|
||||
}
|
||||
|
||||
if (create_mailbox_subfolders($fUsername,$fPassword))
|
||||
{
|
||||
$tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
|
||||
} else {
|
||||
$tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1886,6 +1886,8 @@ function create_mailbox_subfolders($login,$cleartext_password)
|
||||
|
||||
$s='{'.$s_host.$s_port.$s_options.'}';
|
||||
|
||||
sleep(1); # give the mail triggering the mailbox creation a chance to do its job
|
||||
|
||||
$i=@imap_open($s,$login,$cleartext_password);
|
||||
if (FALSE==$i)
|
||||
{
|
||||
|
||||
@@ -80,7 +80,9 @@ if ($f_apache_get_version == 1)
|
||||
}
|
||||
else
|
||||
{
|
||||
print "<li><b>Unable to check for Apache version. (missing function: apache_get_version())<br />(Ignore this warning if you use another webserver software.)</b></li>\n";
|
||||
# not running on Apache.
|
||||
# However postfixadmin _is_ running, so obviously we are on a supported webserver ;-))
|
||||
# No need to confuse the user with a warning.
|
||||
}
|
||||
|
||||
print "</ul>";
|
||||
|
||||
Reference in new issue
Block a user