From 69254c67f188ad1cd88ddc18a30596735d7bc2d0 Mon Sep 17 00:00:00 2001 From: Greg Date: Thu, 21 Jun 2007 23:18:47 +0000 Subject: [PATCH] 'alias' instead of '$table_alias' being used by some .php files git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@9 a1433add-5e2c-0410-b055-b7f2511e0802 --- CHANGELOG.TXT | 1 + admin/search.php | 8 ++++---- overview.php | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 943a29c7..327cecb8 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -6,6 +6,7 @@ # Version 2.1.1 -- TBD -------------------- + - Fixed: 'alias' instead of '$table_alias' being used by some .php files (GregC) - Fixed: Overview no longer lists alias entries for mailboxes (GregC) - Changed: Added exit buttons to several edit options. (GregC) - Fixed: user options are a little more idiot-proof, templates are consistent (GregC) diff --git a/admin/search.php b/admin/search.php index 28755b22..ed5ca527 100644 --- a/admin/search.php +++ b/admin/search.php @@ -39,10 +39,10 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") if ($CONF['alias_control'] == "YES") { - $query = "SELECT address,goto,modified,domain FROM alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address"; + $query = "SELECT address,goto,modified,domain FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address"; if ('pgsql'==$CONF['database_type']) { - $query = "SELECT address,goto,extract (epoch from modified) as modified,domain FROM alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address"; + $query = "SELECT address,goto,extract (epoch from modified) as modified,domain FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address"; } } else @@ -109,10 +109,10 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") if ($CONF['alias_control'] == "YES") { - $query = "SELECT address,goto,modified,domain FROM alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address"; + $query = "SELECT address,goto,modified,domain FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address"; if ('pgsql'==$CONF['database_type']) { - $query = "SELECT address,goto,extract (epoch from modified) as modified,domain FROM alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address"; + $query = "SELECT address,goto,extract (epoch from modified) as modified,domain FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address"; } } else diff --git a/overview.php b/overview.php index 80cde4a4..698212db 100644 --- a/overview.php +++ b/overview.php @@ -157,10 +157,10 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") if ($CONF['alias_control_admin'] == "YES") { - $query = "SELECT address,goto,modified,active FROM alias WHERE domain='$fDomain' ORDER BY address LIMIT $limitSql"; + $query = "SELECT address,goto,modified,active FROM $table_alias WHERE domain='$fDomain' ORDER BY address LIMIT $limitSql"; if ('pgsql'==$CONF['database_type']) { - $query = "SELECT address,goto,extract(epoch from modified) as modified,active FROM alias WHERE domain='$fDomain' ORDER BY address LIMIT $limitSql"; + $query = "SELECT address,goto,extract(epoch from modified) as modified,active FROM $table_alias WHERE domain='$fDomain' ORDER BY address LIMIT $limitSql"; } } else