SF.net SVN: postfixadmin:[820] trunk/create-mailbox.php

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

Revision: 820
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=820&view=rev
Author:   GingerDog
Date:     2010-04-19 22:27:35 +0000 (Mon, 19 Apr 2010)

Log Message:
-----------
reindent

Modified Paths:
--------------
    trunk/create-mailbox.php

Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php	2010-04-19 22:26:18 UTC (rev 819)
+++ trunk/create-mailbox.php	2010-04-19 22:27:35 UTC (rev 820)
@@ -158,10 +158,10 @@
    {
       $password = pacrypt ($fPassword);
 
-	  if($CONF['maildir_name_hook'] != 'NO' && function_exists($CONF['maildir_name_hook'])) {
-		$hook_func = $CONF['maildir_name_hook'];
-		$maildir = $hook_func ($fDomain, $fUsername);
-	  }
+      if($CONF['maildir_name_hook'] != 'NO' && function_exists($CONF['maildir_name_hook'])) {
+         $hook_func = $CONF['maildir_name_hook'];
+         $maildir = $hook_func ($fDomain, $fUsername);
+      }
       else if ($CONF['domain_path'] == "YES")
       {
          if ($CONF['domain_in_mailbox'] == "YES")
@@ -211,7 +211,7 @@
       $fUsername = strtolower($fUsername);
       $local_part = '';
       if(preg_match('/^(.*)@/', $fUsername, $matches)) {
-          $local_part = $matches[1];
+         $local_part = $matches[1];
       }
 
       $result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,local_part,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir','$local_part','$quota','$fDomain',NOW(),NOW(),'$sqlActive')");
@@ -225,45 +225,45 @@
       {
          db_query('COMMIT');
          db_log ($SESSID_USERNAME, $fDomain, 'create_mailbox', "$fUsername");
-      $tDomain = $fDomain;
+         $tDomain = $fDomain;
 
-      $tQuota = $CONF['maxquota'];
+         $tQuota = $CONF['maxquota'];
 
-      if ($fMail == "on")
-      {
-         $fTo = $fUsername;
-         $fFrom = $SESSID_USERNAME;
-         $fHeaders = "To: " . $fTo . "\n";
-         $fHeaders .= "From: " . $fFrom . "\n";
+         if ($fMail == "on")
+         {
+            $fTo = $fUsername;
+            $fFrom = $SESSID_USERNAME;
+            $fHeaders = "To: " . $fTo . "\n";
+            $fHeaders .= "From: " . $fFrom . "\n";
 
-         $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text']) . "\n";
-         $fHeaders .= "MIME-Version: 1.0\n";
-         $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
-         $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
-         
-         $fHeaders .= $CONF['welcome_text'];
+            $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text']) . "\n";
+            $fHeaders .= "MIME-Version: 1.0\n";
+            $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
+            $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
 
-         if (!smtp_mail ($fTo, $fFrom, $fHeaders))
-         {
-            $tMessage .= "<br />" . $PALANG['pSendmail_result_error'] . "<br />";
+            $fHeaders .= $CONF['welcome_text'];
+
+            if (!smtp_mail ($fTo, $fFrom, $fHeaders))
+            {
+               $tMessage .= "<br />" . $PALANG['pSendmail_result_error'] . "<br />";
+            }
+            else
+            {
+               $tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
+            }
          }
-         else
+
+         $tShowpass = "";
+         if ( $tPassGenerated == 1 || $CONF['show_password'] == "YES") $tShowpass = " / $fPassword";
+
+         if (create_mailbox_subfolders($fUsername,$fPassword))
          {
-            $tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
+            $tMessage .= $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername$tShowpass)";
+         } else {
+            $tMessage .= $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername$tShowpass)";
          }
-      }
 
-      $tShowpass = "";
-      if ( $tPassGenerated == 1 || $CONF['show_password'] == "YES") $tShowpass = " / $fPassword";
-
-      if (create_mailbox_subfolders($fUsername,$fPassword))
-      {
-         $tMessage .= $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername$tShowpass)";
-      } else {
-         $tMessage .= $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername$tShowpass)";
       }
-
-      }
    }
 }
 


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