SF.net SVN: postfixadmin: [383] branches/postfixadmin-2.2.1

[<Gin...@us...>]

Revision: 383
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=383&view=rev
Author:   GingerDog
Date:     2008-06-17 13:56:56 -0700 (Tue, 17 Jun 2008)

Log Message:
-----------
changesets 367, 369, 370 merged from trunk

Modified Paths:
--------------
    branches/postfixadmin-2.2.1/create-mailbox.php
    branches/postfixadmin-2.2.1/functions.inc.php
    branches/postfixadmin-2.2.1/setup.php

Modified: branches/postfixadmin-2.2.1/create-mailbox.php
===================================================================
--- branches/postfixadmin-2.2.1/create-mailbox.php	2008-06-17 20:44:30 UTC (rev 382)
+++ branches/postfixadmin-2.2.1/create-mailbox.php	2008-06-17 20:56:56 UTC (rev 383)
@@ -278,13 +278,6 @@
  */
       $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,7 +319,15 @@
             $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";
       }
+
+      }
    }
 }
 

Modified: branches/postfixadmin-2.2.1/functions.inc.php
===================================================================
--- branches/postfixadmin-2.2.1/functions.inc.php	2008-06-17 20:44:30 UTC (rev 382)
+++ branches/postfixadmin-2.2.1/functions.inc.php	2008-06-17 20:56:56 UTC (rev 383)
@@ -1886,6 +1886,8 @@
 
    $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)
    {

Modified: branches/postfixadmin-2.2.1/setup.php
===================================================================
--- branches/postfixadmin-2.2.1/setup.php	2008-06-17 20:44:30 UTC (rev 382)
+++ branches/postfixadmin-2.2.1/setup.php	2008-06-17 20:56:56 UTC (rev 383)
@@ -80,7 +80,9 @@
 }
 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>";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.