From 7990f8881b085279269d35cf9dd2787b88ae1c08 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 27 Nov 2012 14:47:43 -0500
Subject: [PATCH] Bugfix: _ispconfig_pw_crypted was ignored (stripped off in encoding method)

---
 interface/web/sites/database_edit.php |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index 959b018..393ec38 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -166,7 +166,22 @@
 				}
 
 			}
-		}
+		} else {
+            // check if client of database parent domain is client of db user!
+            $web_group = $app->db->queryOneRecord("SELECT sys_groupid FROM web_domain WHERE domain_id = '".$app->functions->intval($this->dataRecord['parent_domain_id'])."'");
+            if($this->dataRecord['database_user_id']) {
+                $group = $app->db->queryOneRecord("SELECT sys_groupid FROM web_database_user WHERE database_user_id = '".$app->functions->intval($this->dataRecord['database_user_id'])."'");
+                if($group['sys_groupid'] != $web_group['sys_groupid']) {
+                    $app->error($app->tform->wordbook['database_client_differs_txt']);
+                }
+            }
+            if($this->dataRecord['database_ro_user_id']) {
+                $group = $app->db->queryOneRecord("SELECT sys_groupid FROM web_database_user WHERE database_user_id = '".$app->functions->intval($this->dataRecord['database_ro_user_id'])."'");
+                if($group['sys_groupid'] != $web_group['sys_groupid']) {
+                    $app->error($app->tform->wordbook['database_client_differs_txt']);
+                }
+            }
+        }
 
 
 		parent::onSubmit();

--
Gitblit v1.9.1