From 62eee67aee133b925fbdc49aad780da170e6c919 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Wed, 2 Mar 2011 21:36:41 +0000 Subject: [PATCH] delete.php: - fix various db_delete calls - use default table name, not table_by_key() result git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@977 a1433add-5e2c-0410-b055-b7f2511e0802 --- delete.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/delete.php b/delete.php index 7d5bceb3..d87f189a 100644 --- a/delete.php +++ b/delete.php @@ -47,8 +47,8 @@ if ($fTable == "admin") { authentication_require_role('global-admin'); $fWhere = 'username'; - $result_admin = db_delete ($table_admin,$fWhere,$fDelete); - $result_domain_admins = db_delete ($table_domain_admins,$fWhere,$fDelete); + $result_admin = db_delete ('admin',$fWhere,$fDelete); + $result_domain_admins = db_delete ('domain_admins',$fWhere,$fDelete); if (!($result_admin == 1) and ($result_domain_admins >= 0)) { @@ -65,16 +65,16 @@ elseif ($fTable == "domain") { authentication_require_role('global-admin'); $fWhere = 'domain'; - $result_domain_admins = db_delete ($table_domain_admins,$fWhere,$fDelete); - $result_alias = db_delete ($table_alias,$fWhere,$fDelete); - $result_mailbox = db_delete ($table_mailbox,$fWhere,$fDelete); - $result_alias_domain = db_delete($table_alias_domain,'alias_domain',$fDelete); - $result_log = db_delete ($table_log,$fWhere,$fDelete); + $result_domain_admins = db_delete ('domain_admins',$fWhere,$fDelete); + $result_alias = db_delete ('alias',$fWhere,$fDelete); + $result_mailbox = db_delete ('mailbox',$fWhere,$fDelete); + $result_alias_domain = db_delete('alias_domain','alias_domain',$fDelete); + $result_log = db_delete ('log',$fWhere,$fDelete); if ($CONF['vacation'] == "YES") { - $result_vacation = db_delete ($table_vacation,$fWhere,$fDelete); + $result_vacation = db_delete ('vacation',$fWhere,$fDelete); } - $result_domain = db_delete ($table_domain,$fWhere,$fDelete); + $result_domain = db_delete ('domain',$fWhere,$fDelete); if (!$result_domain || !domain_postdeletion($fDelete)) { @@ -93,7 +93,7 @@ elseif ($fTable == "alias_domain") $table_domain_alias = table_by_key('alias_domain'); $fWhere = 'alias_domain'; $fDelete = $fDomain; - if(db_delete($table_domain_alias,$fWhere,$fDelete)) { + if(db_delete('alias_domain',$fWhere,$fDelete)) { $url = "list-domain.php"; header ("Location: $url"); }