SF.net SVN: postfixadmin:[891] trunk/scripts/models-ext
Brought to you by:
christian_boltz,
gingerdog
From: <chr...@us...> - 2010-12-09 00:33:52
|
Revision: 891 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=891&view=rev Author: christian_boltz Date: 2010-12-09 00:33:46 +0000 (Thu, 09 Dec 2010) Log Message: ----------- UserHandler.php, DomainHandler.php - db_insert and db_delete need the default table name as parameter ('alias', not $table_alias aka table_by_key('alias') ) DomainHandler.php - removed now unused $table_domain and $table_alias Modified Paths: -------------- trunk/scripts/models-ext/DomainHandler.php trunk/scripts/models-ext/UserHandler.php Modified: trunk/scripts/models-ext/DomainHandler.php =================================================================== --- trunk/scripts/models-ext/DomainHandler.php 2010-12-02 21:38:51 UTC (rev 890) +++ trunk/scripts/models-ext/DomainHandler.php 2010-12-09 00:33:46 UTC (rev 891) @@ -27,10 +27,6 @@ public function add($domain, $desc, $a, $m, $t, $q, $default, $backup){ - $table_domain = table_by_key('domain'); - $table_alias = table_by_key('alias'); - - ($backup == true) ? $backup = db_get_boolean(true) : $backup = db_get_boolean(false); $arr = array( @@ -43,7 +39,7 @@ 'backupmx' => $backup, ); - $result = db_insert($table_domain, $arr, array('created', 'modified') ); + $result = db_insert('domain', $arr, array('created', 'modified') ); if ($result != 1) { $this->errormsg[] = Lang::read('pAdminCreate_domain_result_error') . "\n($domain)\n"; @@ -61,7 +57,7 @@ 'goto' => $goto, 'domain' => $domain, ); - $result = db_insert ($table_alias, $arr, array('created', 'modified') ); + $result = db_insert ('alias', $arr, array('created', 'modified') ); } } $tMessage = Lang::read('pAdminCreate_domain_result_success') . "<br />($domain)</br />"; Modified: trunk/scripts/models-ext/UserHandler.php =================================================================== --- trunk/scripts/models-ext/UserHandler.php 2010-12-02 21:38:51 UTC (rev 890) +++ trunk/scripts/models-ext/UserHandler.php 2010-12-09 00:33:46 UTC (rev 891) @@ -164,7 +164,7 @@ 'active' => $active, ); - $result = db_insert($table_alias, $arr, array('created', 'modified') ); + $result = db_insert('alias', $arr, array('created', 'modified') ); if ($result != 1) { $this->errormsg[] = Lang::read('pAlias_result_error') . "\n($address -> $address)\n"; @@ -190,7 +190,7 @@ 'domain' => $domain, 'active' => $active, ); - $result = db_insert($table_mailbox, $arr2, array('created', 'modified') ); + $result = db_insert('mailbox', $arr2, array('created', 'modified') ); if ($result != 1 || !mailbox_postcreation($address,$domain,$maildir, $quota)) { $this->errormsg[] = Lang::read('pCreate_mailbox_result_error') . "\n($address)\n"; @@ -269,7 +269,7 @@ $result = db_query("SELECT * FROM $table_alias WHERE address = '$username' AND domain = '$domain'"); if($result['rows'] == 1) { //$result = db_query ("DELETE FROM $table_alias WHERE address='$username' AND domain='$domain'"); - $result = db_delete($table_alias, 'address', $username); + $result = db_delete('alias', 'address', $username); db_log ('CONSOLE', $domain, 'delete_alias', $username); } @@ -278,7 +278,7 @@ if ($result['rows'] == 1) { //$result = db_query ("DELETE FROM $table_mailbox WHERE username='$username' AND domain='$domain'"); - $result = db_delete($table_mailbox, 'username', $username); + $result = db_delete('mailbox', 'username', $username); $postdel_res=mailbox_postdeletion($username,$domain); if ($result != 1 || !$postdel_res) { @@ -301,9 +301,9 @@ $result = db_query("SELECT * FROM $table_vacation WHERE email = '$username' AND domain = '$domain'"); if($result['rows'] == 1) { //db_query ("DELETE FROM $table_vacation WHERE email='$username' AND domain='$domain'"); - db_delete($table_vacation, 'email', $username); + db_delete('vacation', 'email', $username); //db_query ("DELETE FROM $table_vacation_notification WHERE on_vacation ='$username' "); /* should be caught by cascade, if PgSQL */ - db_delete($table_vacation_notification, 'on_vacation', $username); + db_delete('vacation_notification', 'on_vacation', $username); } return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |