From 8c6f6fc8eee84ae7bde4f47c80839ab2791c7b13 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Fri, 7 Dec 2007 09:39:11 +0000
Subject: [PATCH] templates/search.php: - removed superfluous and buggy
 superadmin check. Fixes  
 https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1844063&group_id=191583

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@266 a1433add-5e2c-0410-b055-b7f2511e0802
---
 templates/search.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/templates/search.php b/templates/search.php
index 4c4a8a07..10c01ebc 100644
--- a/templates/search.php
+++ b/templates/search.php
@@ -83,10 +83,7 @@ if (sizeof ($tAlias) > 0)
             $active = ($tAlias[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
             print "      <td><a href=\"edit-active.php?alias=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "&return=search.php?search=" . urlencode ($fSearch) . "\">" . $active . "</a></td>\n";
             print "      <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
-            print "      <td><a href=\"delete.php?";
-         if (authentication_has_role('global-admin')) {
-            print "table=alias&"; 
-         }
+            print "      <td><a href=\"delete.php?table=alias&"; 
          print "delete=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
          }
          else
@@ -176,10 +173,7 @@ $has_alias_control = 0; # temporary variable to simplify admin vs. superadmin co
          }
 
          print "      <td><a href=\"edit-mailbox.php?username=" . urlencode ($tMailbox[$i]['username']) . "&domain=" . $tMailbox[$i]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
-         print "      <td><a href=\"delete.php?";
-         if (authentication_has_role('global-admin')) {
-            print "table=mailbox&"; 
-         }
+         print "      <td><a href=\"delete.php?table=mailbox&"; 
          print "delete=" . urlencode ($tMailbox[$i]['username']) . "&domain=" . $tMailbox[$i]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_mailboxes'] . ": ". $tMailbox[$i]['username'] . "')\">" . $PALANG['del'] . "</a></td>\n";
          print "   </tr>\n";
       }