From 391e05cbee6ff84bce60b665be60b4e5f049ee7f Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Tue, 22 Oct 2013 12:48:51 -0400
Subject: [PATCH] - Display hostname next to IP (where available) in the jQuery IP suggestion box.
---
interface/web/sites/database_edit.php | 98 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 77 insertions(+), 21 deletions(-)
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index 08afd85..99e0bbd 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -40,7 +40,6 @@
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-require_once('tools.inc.php');
//* Check permissions for module
$app->auth->check_module_permissions('sites');
@@ -111,20 +110,16 @@
*/
//* Get the database name and database user prefix
- $app->uses('getconf');
+ $app->uses('getconf,tools_sites');
$global_config = $app->getconf->get_global_config('sites');
- $dbname_prefix = replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
+ $dbname_prefix = $app->tools_sites->replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
if ($this->dataRecord['database_name'] != ""){
/* REMOVE the restriction */
- $app->tpl->setVar("database_name", str_replace($dbname_prefix , '', $this->dataRecord['database_name']));
+ $app->tpl->setVar("database_name", $app->tools_sites->removePrefix($this->dataRecord['database_name'], $this->dataRecord['database_name_prefix'], $dbname_prefix));
}
-
- if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- $app->tpl->setVar("database_name_prefix", $global_config['dbname_prefix']);
- } else {
- $app->tpl->setVar("database_name_prefix", $dbname_prefix);
- }
+
+ $app->tpl->setVar("database_name_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_name_prefix'], $dbname_prefix, $global_config['dbname_prefix']));
if($this->id > 0) {
//* we are editing a existing record
@@ -141,6 +136,9 @@
function onSubmit() {
global $app, $conf;
+ $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
+ if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
+
if($_SESSION["s"]["user"]["typ"] != 'admin') {
// Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"];
@@ -149,7 +147,7 @@
// When the record is updated
if($this->id > 0) {
// restore the server ID if the user is not admin and record is edited
- $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_database WHERE database_id = ".intval($this->id));
+ $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_database WHERE database_id = ".$app->functions->intval($this->id));
$this->dataRecord["server_id"] = $tmp["server_id"];
unset($tmp);
// When the record is inserted
@@ -167,7 +165,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();
@@ -176,16 +189,19 @@
function onBeforeUpdate() {
global $app, $conf, $interfaceConf;
- //* Site shell not be empty
+ //* Site shall not be empty
if($this->dataRecord['parent_domain_id'] == 0) $app->tform->errorMessage .= $app->tform->lng("database_site_error_empty").'<br />';
//* Get the database name and database user prefix
- $app->uses('getconf');
+ $app->uses('getconf,tools_sites');
$global_config = $app->getconf->get_global_config('sites');
- $dbname_prefix = replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
+ $dbname_prefix = $app->tools_sites->replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
//* Prevent that the database name and charset is changed
$old_record = $app->tform->getDataRecord($this->id);
+ $dbname_prefix = $app->tools_sites->getPrefix($old_record['database_name_prefix'], $dbname_prefix);
+ $this->dataRecord['database_name_prefix'] = $dbname_prefix;
+
if($old_record["database_name"] != $dbname_prefix . $this->dataRecord["database_name"]) {
$app->tform->errorMessage .= $app->tform->wordbook["database_name_change_txt"].'<br />';
}
@@ -193,6 +209,10 @@
$app->tform->errorMessage .= $app->tform->wordbook["database_charset_change_txt"].'<br />';
}
+ if(!$this->dataRecord['database_user_id']) {
+ $app->tform->errorMessage .= $app->tform->wordbook["database_user_missing_txt"].'<br />';
+ }
+
//* Database username and database name shall not be empty
if($this->dataRecord['database_name'] == '') $app->tform->errorMessage .= $app->tform->wordbook["database_name_error_empty"].'<br />';
@@ -231,11 +251,28 @@
// we need remote access rights for this server, so get it's ip address
$server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
if($server_config['ip_address']!='') {
+ /*
if($this->dataRecord['remote_access'] != 'y') $this->dataRecord['remote_ips'] = '';
$this->dataRecord['remote_access'] = 'y';
if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
$this->dataRecord['remote_ips'] .= ($this->dataRecord['remote_ips'] != '' ? ',' : '') . $server_config['ip_address'];
}
+ */
+
+ if($this->dataRecord['remote_access'] != 'y'){
+ $this->dataRecord['remote_ips'] = $server_config['ip_address'];
+ $this->dataRecord['remote_access'] = 'y';
+ } else {
+ if($this->dataRecord['remote_ips'] != ''){
+ if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
+ $this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address'];
+ }
+ $tmp = preg_split('/\s*,\s*/', $this->dataRecord['remote_ips']);
+ $tmp = array_unique($tmp);
+ $this->dataRecord['remote_ips'] = implode(',', $tmp);
+ unset($tmp);
+ }
+ }
}
}
@@ -253,9 +290,10 @@
if($this->dataRecord['database_name'] == '') $app->tform->errorMessage .= $app->tform->wordbook["database_name_error_empty"].'<br />';
//* Get the database name and database user prefix
- $app->uses('getconf');
+ $app->uses('getconf,tools_sites');
$global_config = $app->getconf->get_global_config('sites');
- $dbname_prefix = replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
+ $dbname_prefix = $app->tools_sites->replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
+ $this->dataRecord['database_name_prefix'] = $dbname_prefix;
if(strlen($dbname_prefix . $this->dataRecord['database_name']) > 64) $app->tform->errorMessage .= str_replace('{db}',$dbname_prefix . $this->dataRecord['database_name'],$app->tform->wordbook["database_name_error_len"]).'<br />';
@@ -281,11 +319,28 @@
// we need remote access rights for this server, so get it's ip address
$server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
if($server_config['ip_address']!='') {
+ /*
if($this->dataRecord['remote_access'] != 'y') $this->dataRecord['remote_ips'] = '';
$this->dataRecord['remote_access'] = 'y';
if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
$this->dataRecord['remote_ips'] .= ($this->dataRecord['remote_ips'] != '' ? ',' : '') . $server_config['ip_address'];
}
+ */
+
+ if($this->dataRecord['remote_access'] != 'y'){
+ $this->dataRecord['remote_ips'] = $server_config['ip_address'];
+ $this->dataRecord['remote_access'] = 'y';
+ } else {
+ if($this->dataRecord['remote_ips'] != ''){
+ if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
+ $this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address'];
+ }
+ $tmp = preg_split('/\s*,\s*/', $this->dataRecord['remote_ips']);
+ $tmp = array_unique($tmp);
+ $this->dataRecord['remote_ips'] = implode(',', $tmp);
+ unset($tmp);
+ }
+ }
}
}
@@ -297,7 +352,7 @@
$app->uses('sites_database_plugin');
- $app->sites_database_plugin->processDatabaseInsert($this);
+ //$app->sites_database_plugin->processDatabaseInsert($this);
$app->db->query($sql);
if($app->db->errorMessage != '') die($app->db->errorMessage);
@@ -310,7 +365,8 @@
global $app;
if(!empty($sql) && !$app->tform->isReadonlyTab($app->tform->getCurrentTab(),$this->id)) {
- $app->sites_database_plugin->processDatabaseUpdate($this);
+ $app->uses('sites_database_plugin');
+ //$app->sites_database_plugin->processDatabaseUpdate($this);
$app->db->query($sql);
if($app->db->errorMessage != '') die($app->db->errorMessage);
@@ -321,7 +377,7 @@
global $app, $conf;
if($this->dataRecord["parent_domain_id"] > 0) {
- $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($this->dataRecord["parent_domain_id"]));
+ $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 = $web['sys_groupid'];
@@ -337,7 +393,7 @@
global $app, $conf;
if($this->dataRecord["parent_domain_id"] > 0) {
- $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($this->dataRecord["parent_domain_id"]));
+ $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 = $web['sys_groupid'];
--
Gitblit v1.9.1