From dd43f12e9bec082fc41b979c221a50c115295efa Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Tue, 17 Mar 2015 22:37:34 +0000
Subject: [PATCH] delete list-admin.php and its template, use list.php instead

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1754 a1433add-5e2c-0410-b055-b7f2511e0802
---
 configs/menu.conf            |  2 +-
 list-admin.php               | 34 ----------------------------------
 model/AdminHandler.php       |  2 +-
 templates/adminlistadmin.tpl | 29 -----------------------------
 4 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 list-admin.php
 delete mode 100644 templates/adminlistadmin.tpl

diff --git a/configs/menu.conf b/configs/menu.conf
index 71d851ae..a670a1c5 100644
--- a/configs/menu.conf
+++ b/configs/menu.conf
@@ -1,7 +1,7 @@
 url_main = main.php
 url_editactive = editactive.php?table=
 # list_admin
-url_list_admin = list-admin.php
+url_list_admin = list.php?table=admin
 url_create_admin = edit.php?table=admin
 # list-domain
 url_list_domain = list.php?table=domain
diff --git a/list-admin.php b/list-admin.php
deleted file mode 100644
index 65836df5..00000000
--- a/list-admin.php
+++ /dev/null
@@ -1,34 +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://postfixadmin.sf.net 
- * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
- * File: list-admin.php
- * Lists all administrators
- * Template File: list-admin.tpl
- *
- * Template Variables: -none-
- *
- * Form POST \ GET Variables: -none-
- */
-
-require_once("common.php");
-
-authentication_require_role('global-admin');
-
-$admin_properties = list_admins();
-
-$smarty->assign ('admin_properties', $admin_properties);
-$smarty->assign ('smarty_template', 'adminlistadmin');
-$smarty->display ('index.tpl');
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>
diff --git a/model/AdminHandler.php b/model/AdminHandler.php
index 9ff98bfa..bfee687b 100644
--- a/model/AdminHandler.php
+++ b/model/AdminHandler.php
@@ -104,7 +104,7 @@ class AdminHandler extends PFAHandler {
 
             # various settings
             'required_role' => 'global-admin',
-            'listview' => 'list-admin.php',
+            'listview' => 'list.php?table=admin',
             'early_init' => 0,
         );
     }
diff --git a/templates/adminlistadmin.tpl b/templates/adminlistadmin.tpl
deleted file mode 100644
index cb67753c..00000000
--- a/templates/adminlistadmin.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-{if $admin_properties}
-	<table id="admin_table">
-		{#tr_header#}
-			<td>{$PALANG.admin}</td>
-			<td>{$PALANG.pAdminList_admin_count}</td>
-			<td>{$PALANG.last_modified}</td>
-			<td>{$PALANG.active}</td>
-			<td colspan="2">&nbsp;</td>
-		</tr>
-{foreach from=$admin_properties item=admin}
-		{#tr_hilightoff#}
-			<td><a href="list.php?table=domain&amp;username={$admin.username|escape:"url"}">{$admin.username}</a></td>
-			<td>
-				{if $admin.superadmin == 1}
-					{$PALANG.super_admin}
-				{else}
-					{$admin.domain_count}
-				{/if}
-			</td>
-			<td>{$admin.modified}</td>
-			<td><a href="{#url_editactive#}admin&amp;id={$admin.username|escape:"url"}&amp;active={if ($admin.active==0)}1{else}0{/if}&amp;token={$smarty.session.PFA_token|escape:"url"}">{$admin._active}</a></td>
-			<td><a href="{#url_edit_admin#}&amp;edit={$admin.username|escape:"url"}">{$PALANG.edit}</a></td>
-			<td><a href="{#url_delete#}?table=admin&amp;delete={$admin.username|escape:"url"}&amp;token={$smarty.session.PFA_token|escape:"url"}" 
-				onclick="return confirm ('{$PALANG.confirm}{$PALANG.admin}: {$admin.username}');">{$PALANG.del}</a></td>
-		</tr>
-{/foreach}
-	</table>
-	<br /><a href="{#url_create_admin#}" class="button">{$PALANG.pAdminMenu_create_admin}</a><br />
-{/if}