From b14a7cc845c80aca290562af9a5723b487ebfde8 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 02 Nov 2012 04:05:08 -0400
Subject: [PATCH] Updated: - Database users have to match the client of the parent website - Update select boxes for database users on change of parent website
---
interface/web/sites/lib/lang/de_database.lng | 1 +
interface/web/sites/lib/lang/en_database.lng | 1 +
interface/web/sites/templates/database_edit.htm | 19 +++++++++++++++++++
interface/web/sites/ajax_get_json.php | 20 ++++++++++++++++++++
interface/web/sites/database_edit.php | 17 ++++++++++++++++-
5 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index 53702bd..20267eb 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -119,6 +119,26 @@
$json = $app->functions->json_encode($result);
}
+
+ if($type == 'getdatabaseusers') {
+ $json = '{';
+
+ $sql = "SELECT sys_groupid FROM web_domain WHERE domain_id = $web_id";
+ $group = $app->db->queryOneRecord($sql);
+ if($group) {
+ $sql = "SELECT database_user_id, database_user FROM web_database_user WHERE sys_groupid = '" . $group['sys_groupid'] . "'";
+ $records = $app->db->queryAllRecords($sql);
+
+ foreach($records as $record) {
+ $json .= '"'.$record['database_user_id'].'": "'.$record['database_user'].'",';
+ }
+ unset($records);
+ unset($group);
+ }
+
+ if(substr($json,-1) == ',') $json = substr($json,0,-1);
+ $json .= '}';
+ }
//}
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();
diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng
index 5bed48f..70b7721 100644
--- a/interface/web/sites/lib/lang/de_database.lng
+++ b/interface/web/sites/lib/lang/de_database.lng
@@ -14,6 +14,7 @@
$wb['database_remote_error_ips'] = 'Mindestens eine der eingegebenen IP Adressen ist ungültig.';
$wb['client_txt'] = 'Kunde';
$wb['active_txt'] = 'Aktiv';
+$wb['database_client_differs_txt'] = 'Der Kunde dieser Datenbank passt nicht zum Kunden des Datenbankusers.';
$wb['database_name_error_empty'] = 'Datenbankname ist leer.';
$wb['database_name_error_unique'] = 'Es existiert bereits eine Datenbank mit diesem Namen am Server. Um einen eindeutigen Namen zu erhalten können sie z.B. den Domainnamen vor dem Datenbanknamen verwenden.';
$wb['database_name_error_regex'] = 'Ungültiger Datenbankname. Der Datenbankname darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.';
diff --git a/interface/web/sites/lib/lang/en_database.lng b/interface/web/sites/lib/lang/en_database.lng
index a494efc..288f895 100644
--- a/interface/web/sites/lib/lang/en_database.lng
+++ b/interface/web/sites/lib/lang/en_database.lng
@@ -15,6 +15,7 @@
$wb["database_remote_error_ips"] = 'At least one of the entered ip addresses is invalid.';
$wb["client_txt"] = 'Client';
$wb["active_txt"] = 'Active';
+$wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.';
$wb["database_name_error_empty"] = 'Database name is empty.';
$wb["database_name_error_unique"] = 'There is already a database with this name on the server. To get a unique name, e.g. prepend your domain name to the database name.';
$wb["database_name_error_regex"] = 'Invalid database name. The database name may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index de2899c..0924626 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -97,6 +97,25 @@
</div>
<script language="JavaScript" type="text/javascript">
+ <tmpl_if name="is_admin">
+ function reloadDatabaseUsers() {
+ var parentDomainId = jQuery('#parent_domain_id').val()
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : parentDomainId, 'type': 'getdatabaseusers'}, function(data) {
+ var options = '<option value=""></option>';
+ $.each(data, function(key, val) {
+ options += '<option value="'+key+'"'+ ($('#database_user_id').val() == key ? ' selected="selected"' : '') +'>'+val+'</option>';
+ });
+ $('#database_user_id').html(options).change();
+
+ options = '<option value=""></option>';
+ $.each(data, function(key, val) {
+ options += '<option value="'+key+'"'+ ($('#database_ro_user_id').val() == key ? ' selected="selected"' : '') +'>'+val+'</option>';
+ });
+ $('#database_ro_user_id').html(options).change();
+ });
+ }
+ jQuery('#parent_domain_id').change(function() { reloadDatabaseUsers(); });
+ </tmpl_if>
jQuery('#remote_ips').ispconfigSearch({
dataSrc: '/sites/ajax_get_json.php?type=get_ipv4',
resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
--
Gitblit v1.9.1