SF.net SVN: postfixadmin:[571] trunk

[<chr...@us...>]

Revision: 571
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=571&view=rev
Author:   christian_boltz
Date:     2009-02-26 22:57:11 +0000 (Thu, 26 Feb 2009)

Log Message:
-----------
list-virtual.php
- do not hide "add alias" / "add mailbox" links if domain is a backup MX
  (includes some whitespace changes, the "real" change removes 3 lines of code
  checking for the backupmx setting)

edit-domain.php
- do not reset aliases, mailboxes and maxquota to disabled for backup MX domains

These changes should fix 
https://sourceforge.net/forum/forum.php?thread_id=2897067&forum_id=676076

Modified Paths:
--------------
    trunk/edit-domain.php
    trunk/list-virtual.php

Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php	2009-02-26 22:35:50 UTC (rev 570)
+++ trunk/edit-domain.php	2009-02-26 22:57:11 UTC (rev 571)
@@ -80,9 +80,6 @@
 
     if ($fBackupmx == "on")
     {
-        $fAliases = -1;
-        $fMailboxes = -1;
-        $fMaxquota = -1;
         $fBackupmx = 1;
         $sqlBackupmx = db_get_boolean(True);
     }

Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php	2009-02-26 22:35:50 UTC (rev 570)
+++ trunk/list-virtual.php	2009-02-26 22:57:11 UTC (rev 571)
@@ -193,21 +193,18 @@
       $tDisplay_next = $fDisplay + $page_size;
    }
 
-   $backup_mx = $limit['backupmx'];
-   if($backup_mx == 'f' || $backup_mx == 0) {
-      if($limit['aliases'] == 0) {
-         $tCanAddAlias = true;
-      }
-      elseif($limit['alias_count'] < $limit['aliases']) {
-         $tCanAddAlias = true;
-      }
-      if($limit['mailboxes'] == 0) {
-         $tCanAddMailbox = true;
-      }
-      elseif($limit['mailbox_count'] < $limit['mailboxes']) {
-         $tCanAddMailbox = true;
-      }
+   if($limit['aliases'] == 0) {
+      $tCanAddAlias = true;
    }
+   elseif($limit['alias_count'] < $limit['aliases']) {
+      $tCanAddAlias = true;
+   }
+   if($limit['mailboxes'] == 0) {
+      $tCanAddMailbox = true;
+   }
+   elseif($limit['mailbox_count'] < $limit['mailboxes']) {
+      $tCanAddMailbox = true;
+   }
 }
 
 // this is why we need a proper template layer.


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