Browse Source

'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
postfixadmin-2.3
Greg 19 years ago
parent
commit
69254c67f1
  1. 1
      CHANGELOG.TXT
  2. 8
      admin/search.php
  3. 4
      overview.php

1
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)

8
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

4
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

Loading…
Cancel
Save