From 3a88303088e2a3ce8a5135c0f9b23acba161c58d Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 26 Feb 2009 22:57:11 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@571 a1433add-5e2c-0410-b055-b7f2511e0802 --- edit-domain.php | 3 --- list-virtual.php | 25 +++++++++++-------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/edit-domain.php b/edit-domain.php index 1186b00c..e1177fe8 100644 --- a/edit-domain.php +++ b/edit-domain.php @@ -80,9 +80,6 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") if ($fBackupmx == "on") { - $fAliases = -1; - $fMailboxes = -1; - $fMaxquota = -1; $fBackupmx = 1; $sqlBackupmx = db_get_boolean(True); } diff --git a/list-virtual.php b/list-virtual.php index 75565703..ee4124be 100644 --- a/list-virtual.php +++ b/list-virtual.php @@ -193,20 +193,17 @@ if (isset ($limit)) { $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; } }