From 91f613db5f9af77029da01abfd7788ab8349c73e Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Mon, 26 Dec 2011 16:02:14 +0000
Subject: [PATCH] adminlistdomain.tpl: - use edit.php to switch active status
 for domains - display backupmx and active status as yes/no instead of 1/0

edit-active-domain.php
- deleted, obsoleted by using edit.php

configs/menu.conf
- remove now superfluous url_edit_active_domain



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1306 a1433add-5e2c-0410-b055-b7f2511e0802
---
 configs/menu.conf             |  3 --
 edit-active-domain.php        | 58 -----------------------------------
 templates/adminlistdomain.tpl |  4 +--
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 edit-active-domain.php

diff --git a/configs/menu.conf b/configs/menu.conf
index 16368460..a167e475 100644
--- a/configs/menu.conf
+++ b/configs/menu.conf
@@ -45,6 +45,3 @@ form_search = <form name="search" method="post" action="list-virtual.php"><input
 [adminlistadmin]
 url_edit_active_admin = edit-active-admin.php
 url_edit_admin = edit.php?table=admin
-
-[adminlistdomain]
-url_edit_active_domain = edit-active-domain.php
diff --git a/edit-active-domain.php b/edit-active-domain.php
deleted file mode 100644
index 1873ad38..00000000
--- a/edit-active-domain.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/** 
- * Postfix Admin 
- * 
- * LICENSE 
- * This source file is subject to the GPL license that is bundled with  
- * this package in the file LICENSE.TXT. 
- * 
- * Further details on the project are available at : 
- *     http://www.postfixadmin.com or http://postfixadmin.sf.net 
- * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
- * File: edit-active-domain.php 
- * Responsible for toggling the status of a domain
- * Template File: message.tpl
- *
- * Template Variables:
- *
- * none
- *
- * Form POST \ GET Variables:
- *
- * fDomain
- */
-
-require_once('common.php');
-
-authentication_require_role('global-admin');
-
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
-   if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
-
-   $sqlSet='active=1-active';
-   if ('pgsql'==$CONF['database_type']) $sqlSet='active=NOT active';
-   
-   $result = db_query ("UPDATE $table_domain SET $sqlSet,modified=NOW() WHERE domain='$fDomain'");
-   if ($result['rows'] != 1)
-   {
-      $error = 1;
-      flash_error($PALANG['pAdminEdit_domain_result_error']);
-   }
-   
-   if ($error != 1)
-   {
-      header ("Location: list-domain.php");
-      exit;
-   }
-}
-
-$smarty->assign ('smarty_template', 'message');
-$smarty->display ('index.tpl');
-
-
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
-?>
diff --git a/templates/adminlistdomain.tpl b/templates/adminlistdomain.tpl
index ee390f47..15ea02d2 100644
--- a/templates/adminlistdomain.tpl
+++ b/templates/adminlistdomain.tpl
@@ -31,9 +31,9 @@
 			{if $CONF.quota==YES}<td>{$domain.maxquota}</td>{/if}
 			{if $CONF.domain_quota===YES}<td>{$domain.total_quota} / {$domain.quota}</td>{/if}
 			{if $CONF.transport==YES}<td>{$domain.transport}</td>{/if}
-			<td>{$domain.backupmx}</td>
+			<td>{$domain._backupmx}</td>
 			<td>{$domain.modified}</td>
-			<td><a href="{#url_edit_active_domain#}?domain={$domain.domain|escape:"url"}">{$domain.active}</a></td>
+			<td><a href="{#url_edit_domain#}&amp;edit={$domain.domain|escape:"url"}&amp;active={if ($domain.active==0)}1{else}0{/if}">{$domain._active}</a></td>
 			<td><a href="{#url_edit_domain#}&amp;edit={$domain.domain|escape:"url"}">{$PALANG.edit}</a></td>
 			<td><a href="{#url_delete#}?table=domain&amp;delete={$domain.domain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm_domain}{$PALANG.pAdminList_admin_domain}: {$domain.domain}')">{$PALANG.del}</a></td>
 		</tr>