From d18ac59c65621307eb559ae27d7aaa3305fda621 Mon Sep 17 00:00:00 2001 From: mcramer <m.cramer@pixcept.de> Date: Wed, 12 Jun 2013 04:27:43 -0400 Subject: [PATCH] Reworked database user management to fix FS#2918 - multiserver - remote access db passwd not changed , when changed access from IP to % and vice versa --- interface/lib/classes/sites_database_plugin.inc.php | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interface/lib/classes/sites_database_plugin.inc.php b/interface/lib/classes/sites_database_plugin.inc.php index 11fe91c..37cc546 100644 --- a/interface/lib/classes/sites_database_plugin.inc.php +++ b/interface/lib/classes/sites_database_plugin.inc.php @@ -33,7 +33,7 @@ public function processDatabaseInsert($form_page) { global $app; - if($form_page->dataRecord["parent_domain_id"] > 0) { + /*if($form_page->dataRecord["parent_domain_id"] > 0) { $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($form_page->dataRecord["parent_domain_id"])); //* The Database user shall be owned by the same group then the website @@ -42,7 +42,7 @@ $sys_groupid = $form_page->dataRecord['sys_groupid']; } - + if($form_page->dataRecord['database_user_id']) { // check if there has already been a database on this server with that user $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_database` WHERE `server_id` = '" . $app->functions->intval($form_page->dataRecord['server_id']) . "' AND (`database_user_id` = '" . $app->functions->intval($form_page->dataRecord['database_user_id']) . "' OR `database_ro_user_id` = '" . $app->functions->intval($form_page->dataRecord['database_user_id']) . "')"); @@ -69,13 +69,13 @@ $app->db->datalogSave('web_database_user', 'INSERT', 'database_user_id', $db_user['database_user_id'], array(), $db_user); } } - } + }*/ } public function processDatabaseUpdate($form_page) { global $app; - $old_record = $app->db->queryOneRecord('SELECT * FROM `web_database` WHERE `database_id` = ' . $app->functions->intval($form_page->id)); + /*$old_record = $app->db->queryOneRecord('SELECT * FROM `web_database` WHERE `database_id` = ' . $app->functions->intval($form_page->id)); if($form_page->dataRecord["parent_domain_id"] > 0) { $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($form_page->dataRecord["parent_domain_id"])); @@ -111,9 +111,9 @@ $app->db->datalogSave('web_database_user', 'DELETE', 'database_user_id', $db_user['database_user_id'], $db_user, array()); } } - } + }*/ - if($form_page->dataRecord['database_user_id']) { + /*if($form_page->dataRecord['database_user_id']) { // check if there has already been a database on this server with that user $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_database` WHERE `server_id` = '" . $app->functions->intval($form_page->dataRecord['server_id']) . "' AND (`database_user_id` = '" . $app->functions->intval($form_page->dataRecord['database_user_id']) . "' OR `database_ro_user_id` = '" . $app->functions->intval($form_page->dataRecord['database_user_id']) . "')"); @@ -139,14 +139,14 @@ $app->db->datalogSave('web_database_user', 'INSERT', 'database_user_id', $db_user['database_user_id'], array(), $db_user); } } - } + }*/ } public function processDatabaseDelete($primary_id) { global $app; - $old_record = $app->db->queryOneRecord('SELECT * FROM `web_database` WHERE `database_id` = ' . $app->functions->intval($primary_id)); + /*$old_record = $app->db->queryOneRecord('SELECT * FROM `web_database` WHERE `database_id` = ' . $app->functions->intval($primary_id)); if($old_record['database_user_id']) { // check if any database on the server still uses this one $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_database` WHERE `server_id` = '" . $app->functions->intval($old_record['server_id']) . "' AND (`database_user_id` = '" . $app->functions->intval($old_record['database_user_id']) . "' OR `database_ro_user_id` = '" . $app->functions->intval($old_record['database_user_id']) . "') AND `database_id` != '" . $app->functions->intval($primary_id) . "'"); @@ -170,7 +170,7 @@ $app->db->datalogSave('web_database_user', 'DELETE', 'database_user_id', $db_user['database_user_id'], $db_user, array()); } } - } + }*/ } } -- Gitblit v1.9.1