From cefbfb3cd3532ace19e5cbf8c93ccc4d03e6d658 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 28 Jun 2013 08:17:57 -0400
Subject: [PATCH] Set cron type to full when website is owned by admin (and not a client)
---
interface/web/sites/database_edit.php | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index ccd6725..833b18d 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -197,7 +197,7 @@
//* 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 === '' ? '#' : $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 />';
@@ -206,6 +206,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 />';
@@ -244,11 +248,24 @@
// 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'];
+ }
+ }
+ }
}
}
@@ -269,7 +286,7 @@
$app->uses('getconf,tools_sites');
$global_config = $app->getconf->get_global_config('sites');
$dbname_prefix = $app->tools_sites->replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
- $this->dataRecord['database_name_prefix'] = ($dbname_prefix === '' ? '#' : $dbname_prefix);
+ $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 />';
@@ -295,11 +312,24 @@
// 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'];
+ }
+ }
+ }
}
}
@@ -311,7 +341,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);
@@ -325,7 +355,7 @@
if(!empty($sql) && !$app->tform->isReadonlyTab($app->tform->getCurrentTab(),$this->id)) {
$app->uses('sites_database_plugin');
- $app->sites_database_plugin->processDatabaseUpdate($this);
+ //$app->sites_database_plugin->processDatabaseUpdate($this);
$app->db->query($sql);
if($app->db->errorMessage != '') die($app->db->errorMessage);
--
Gitblit v1.9.1