From 2f7e607a9d5331c5d5f56dec8bc167907a08ddad Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Fri, 10 Oct 2014 07:24:53 -0400 Subject: [PATCH] - Fixes: FS#3693 - sites_database_add doesn't set the sys_groupid parameter --- interface/web/sites/database_edit.php | 30 ++++-------------------------- 1 files changed, 4 insertions(+), 26 deletions(-) diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index 0f2f5f2..48540e8 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -405,9 +405,6 @@ global $app; if(!empty($sql) && !$app->tform->isReadonlyTab($app->tform->getCurrentTab(), $this->id)) { - $app->uses('sites_database_plugin'); - //$app->sites_database_plugin->processDatabaseUpdate($this); - $app->db->query($sql); if($app->db->errorMessage != '') die($app->db->errorMessage); } @@ -416,34 +413,15 @@ function onAfterInsert() { global $app, $conf; - if($this->dataRecord["parent_domain_id"] > 0) { - $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"])); - - //* The Database user shall be owned by the same group then the website - $sys_groupid = $app->functions->intval($web['sys_groupid']); - $backup_interval = $app->db->quote($web['backup_interval']); - $backup_copies = $app->functions->intval($web['backup_copies']); - - $sql = "UPDATE web_database SET sys_groupid = '$sys_groupid', backup_interval = '$backup_interval', backup_copies = '$backup_copies' WHERE database_id = ".$this->id; - $app->db->query($sql); - } + $app->uses('sites_database_plugin'); + $app->sites_database_plugin->processDatabaseInsert($this); } function onAfterUpdate() { global $app, $conf; - if($this->dataRecord["parent_domain_id"] > 0) { - $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"])); - - //* The Database user shall be owned by the same group then the website - $sys_groupid = $app->functions->intval($web['sys_groupid']); - $backup_interval = $app->db->quote($web['backup_interval']); - $backup_copies = $app->functions->intval($web['backup_copies']); - - $sql = "UPDATE web_database SET sys_groupid = '$sys_groupid', backup_interval = '$backup_interval', backup_copies = '$backup_copies' WHERE database_id = ".$this->id; - $app->db->query($sql); - } - + $app->uses('sites_database_plugin'); + $app->sites_database_plugin->processDatabaseUpdate($this); } } -- Gitblit v1.9.1