SF.net SVN: postfixadmin:[977] trunk/delete.php

[<chr...@us...>]

Revision: 977
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=977&view=rev
Author:   christian_boltz
Date:     2011-03-02 21:36:41 +0000 (Wed, 02 Mar 2011)

Log Message:
-----------
delete.php:
- fix various db_delete calls - use default table name, not table_by_key() result

Modified Paths:
--------------
    trunk/delete.php

Modified: trunk/delete.php
===================================================================
--- trunk/delete.php	2011-02-27 23:40:49 UTC (rev 976)
+++ trunk/delete.php	2011-03-02 21:36:41 UTC (rev 977)
@@ -47,8 +47,8 @@
 {
     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 @@
 {
     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 @@
     $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");
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.