From 80412e4d607b87eceefe38a9d69d3db4375965cb Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Wed, 5 Jan 2011 20:57:53 +0000
Subject: [PATCH] list-virtual_alias.tpl: fix editing of aliases with
 $CONF[special_alias_control] == NO

- with special_alias_control = NO, no alias was editable.
  Fixed - only default_aliases should be locked (looks like == instead
  of === needs to be used in smarty for bool comparison)
- merged conditions, simplified code


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@936 a1433add-5e2c-0410-b055-b7f2511e0802
---
 templates/list-virtual_alias.tpl | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/templates/list-virtual_alias.tpl b/templates/list-virtual_alias.tpl
index 9195135b..0575f670 100644
--- a/templates/list-virtual_alias.tpl
+++ b/templates/list-virtual_alias.tpl
@@ -38,20 +38,14 @@
 			<td><a href="edit-alias.php?address={$item.address|escape:"url"}&amp;domain={$fDomain|escape:"url"}">{$PALANG.edit}</a></td>
 			<td><a href="delete.php?table=alias&amp;delete={$item.address|escape:"url"}&amp;domain={$fDomain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_aliases}: {$item.address}');">{$PALANG.del}</a></td>
 		{else}
-			{if $CONF.special_alias_control===YES}
+			{if $CONF.special_alias_control===YES || $check_alias_owner[$i]==true}
 				<td><a href="edit-active.php?alias={$item.address|escape:"url"}&amp;domain={$fDomain|escape:"url"}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
 				<td><a href="edit-alias.php?address={$item.address|escape:"url"}&amp;domain={$fDomain|escape:"url"}">{$PALANG.edit}</a></td>
 				<td><a href="delete.php?table=alias&amp;delete={$item.address|escape:"url"}&amp;domain={$fDomain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_aliases}: {$item.address}');">{$PALANG.del}</a></td>
 			{else}
-				{if $check_alias_owner[$i]===true}
-					<td><a href="edit-active.php?alias={$item.address|escape:"url"}&amp;domain={$fDomain|escape:"url"}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
-					<td><a href="edit-alias.php?address={$item.address|escape:"url"}&amp;domain={$fDomain|escape:"url"}">{$PALANG.edit}</a></td>
-					<td><a href="delete.php?table=alias&amp;delete={$item.address|escape:"url"}&amp;domain={$fDomain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_aliases}: {$item.address}');">{$PALANG.del}</a></td>
-				{else}
-					<td>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-				{/if}
+				<td>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
 			{/if}
 		{/if}
 		</tr>