From 9adcf583066a327f7386f80aa2e52638522c1c96 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Tue, 27 Oct 2009 17:17:11 +0000 Subject: [PATCH] Added: FS#687 - Add a replication and mirroring mode for server settings --- interface/web/admin/form/server.tform.php | 6 + interface/web/admin/lib/lang/en_server.lng | 22 +-- interface/web/admin/server_edit.php | 37 ++++- .../admin/templates/server_edit_services.htm | 134 +++++++++--------- interface/web/dns/form/dns_soa.tform.php | 2 +- .../web/mail/form/mail_blacklist.tform.php | 2 +- .../mail/form/mail_content_filter.tform.php | 2 +- interface/web/mail/form/mail_domain.tform.php | 2 +- interface/web/mail/form/mail_get.tform.php | 2 +- .../web/mail/form/mail_transport.tform.php | 2 +- .../mail/form/spamfilter_blacklist.tform.php | 2 +- .../web/mail/form/spamfilter_users.tform.php | 2 +- .../mail/form/spamfilter_whitelist.tform.php | 2 +- interface/web/sites/form/cron.tform.php | 2 +- interface/web/sites/form/database.tform.php | 2 +- interface/web/sites/form/ftp_user.tform.php | 2 +- interface/web/sites/form/shell_user.tform.php | 2 +- .../web/sites/form/web_aliasdomain.tform.php | 2 +- interface/web/sites/form/web_domain.tform.php | 2 +- .../web/sites/form/web_subdomain.tform.php | 2 +- server/lib/classes/modules.inc.php | 7 +- server/server.php | 12 +- 22 files changed, 155 insertions(+), 95 deletions(-) diff --git a/interface/web/admin/form/server.tform.php b/interface/web/admin/form/server.tform.php index 87b1c18cd..20947c8a0 100644 --- a/interface/web/admin/form/server.tform.php +++ b/interface/web/admin/form/server.tform.php @@ -102,6 +102,12 @@ $form["tabs"]['services'] = array ( 'default' => '0', 'value' => array(0 => 0,1 => 1) ), + 'mirror_server_id' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '' + ), /* 'update' => array ( 'datatype' => 'INTEGER', diff --git a/interface/web/admin/lib/lang/en_server.lng b/interface/web/admin/lib/lang/en_server.lng index dcd498b2c..dcd46c582 100644 --- a/interface/web/admin/lib/lang/en_server.lng +++ b/interface/web/admin/lib/lang/en_server.lng @@ -1,11 +1,13 @@ - \ No newline at end of file diff --git a/interface/web/admin/server_edit.php b/interface/web/admin/server_edit.php index ea8dd8917..a132af210 100644 --- a/interface/web/admin/server_edit.php +++ b/interface/web/admin/server_edit.php @@ -46,8 +46,41 @@ $app->auth->check_module_permissions('admin'); // Loading classes $app->uses('tpl,tform,tform_actions'); +$app->load('tform_actions'); -// let tform_actions handle the page -$app->tform_actions->onLoad(); +class page_action extends tform_actions { + + function onShowEnd() { + global $app, $conf; + + // Getting Servers + $sql = "SELECT server_id,server_name FROM server WHERE 1 ORDER BY server_name"; + $mirror_servers = $app->db->queryAllRecords($sql); + $mirror_server_select = ''; + if(is_array($mirror_servers)) { + foreach( $mirror_servers as $mirror_server) { + $selected = ($mirror_server["server_id"] == $this->dataRecord['mirror_server_id'])?'SELECTED':''; + $mirror_server_select .= "\r\n"; + } + } + $app->tpl->setVar("mirror_server_id",$mirror_server_select); + + parent::onShowEnd(); + } + + function onSubmit() { + global $app; + + //* We do not want to mirror the the server itself + if($this->id == $this->dataRecord['mirror_server_id']) $this->dataRecord['mirror_server_id'] = 0; + + parent::onSubmit(); + + } + +} + +$page = new page_action; +$page->onLoad(); ?> \ No newline at end of file diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm index c5a3be685..8eca2909c 100644 --- a/interface/web/admin/templates/server_edit_services.htm +++ b/interface/web/admin/templates/server_edit_services.htm @@ -1,64 +1,70 @@ -

-

- -
- -
-
-
- - -
-
-

{tmpl_var name='mail_server_txt'}

-
- {tmpl_var name='mail_server'} -
-
-
-

{tmpl_var name='web_server_txt'}

-
- {tmpl_var name='web_server'} -
-
-
-

{tmpl_var name='dns_server_txt'}

-
- {tmpl_var name='dns_server'} -
-
-
-

{tmpl_var name='file_server_txt'}

-
- {tmpl_var name='file_server'} -
-
-
-

{tmpl_var name='db_server_txt'}

-
- {tmpl_var name='db_server'} -
-
-
-

{tmpl_var name='vserver_server_txt'}

-
- {tmpl_var name='vserver_server'} -
-
-
- - -
-
- - - -
- - -
-
- -
+

+

+ +
+ +
+
+
+ + +
+
+

{tmpl_var name='mail_server_txt'}

+
+ {tmpl_var name='mail_server'} +
+
+
+

{tmpl_var name='web_server_txt'}

+
+ {tmpl_var name='web_server'} +
+
+
+

{tmpl_var name='dns_server_txt'}

+
+ {tmpl_var name='dns_server'} +
+
+
+

{tmpl_var name='file_server_txt'}

+
+ {tmpl_var name='file_server'} +
+
+
+

{tmpl_var name='db_server_txt'}

+
+ {tmpl_var name='db_server'} +
+
+
+

{tmpl_var name='vserver_server_txt'}

+
+ {tmpl_var name='vserver_server'} +
+
+
+ + +
+
+ + +
+
+ + + +
+ + +
+
+ +
diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php index 1a688ea24..adbd6283a 100644 --- a/interface/web/dns/form/dns_soa.tform.php +++ b/interface/web/dns/form/dns_soa.tform.php @@ -62,7 +62,7 @@ $form["tabs"]['dns_soa'] = array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND dns_server = 1 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/mail/form/mail_blacklist.tform.php b/interface/web/mail/form/mail_blacklist.tform.php index a349680bc..df63f7f75 100644 --- a/interface/web/mail/form/mail_blacklist.tform.php +++ b/interface/web/mail/form/mail_blacklist.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['blacklist'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/mail/form/mail_content_filter.tform.php b/interface/web/mail/form/mail_content_filter.tform.php index c41def6a2..a838e0abe 100644 --- a/interface/web/mail/form/mail_content_filter.tform.php +++ b/interface/web/mail/form/mail_content_filter.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['filter'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/mail/form/mail_domain.tform.php b/interface/web/mail/form/mail_domain.tform.php index 69cc478d2..4ccd1842d 100644 --- a/interface/web/mail/form/mail_domain.tform.php +++ b/interface/web/mail/form/mail_domain.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['domain'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/mail/form/mail_get.tform.php b/interface/web/mail/form/mail_get.tform.php index 3de9b1031..634094d3f 100644 --- a/interface/web/mail/form/mail_get.tform.php +++ b/interface/web/mail/form/mail_get.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['mailget'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/mail/form/mail_transport.tform.php b/interface/web/mail/form/mail_transport.tform.php index 12dbdacec..4930099ae 100644 --- a/interface/web/mail/form/mail_transport.tform.php +++ b/interface/web/mail/form/mail_transport.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['transport'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/mail/form/spamfilter_blacklist.tform.php b/interface/web/mail/form/spamfilter_blacklist.tform.php index af2208960..a51addb91 100644 --- a/interface/web/mail/form/spamfilter_blacklist.tform.php +++ b/interface/web/mail/form/spamfilter_blacklist.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['blacklist'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/mail/form/spamfilter_users.tform.php b/interface/web/mail/form/spamfilter_users.tform.php index fd9e456f0..c3fd0fde9 100644 --- a/interface/web/mail/form/spamfilter_users.tform.php +++ b/interface/web/mail/form/spamfilter_users.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['users'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/mail/form/spamfilter_whitelist.tform.php b/interface/web/mail/form/spamfilter_whitelist.tform.php index 0273419ed..4d476a75d 100644 --- a/interface/web/mail/form/spamfilter_whitelist.tform.php +++ b/interface/web/mail/form/spamfilter_whitelist.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['whitelist'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/sites/form/cron.tform.php b/interface/web/sites/form/cron.tform.php index 4f9f8dd5b..fc63548ff 100644 --- a/interface/web/sites/form/cron.tform.php +++ b/interface/web/sites/form/cron.tform.php @@ -62,7 +62,7 @@ $form["tabs"]['cron'] = array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE web_server = 1 AND {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND web_server = 1 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php index 3a7a947da..be6998aa2 100644 --- a/interface/web/sites/form/database.tform.php +++ b/interface/web/sites/form/database.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['database'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND db_server = 1 ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} AND db_server = 1 ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/sites/form/ftp_user.tform.php b/interface/web/sites/form/ftp_user.tform.php index add5c7227..6077dee02 100644 --- a/interface/web/sites/form/ftp_user.tform.php +++ b/interface/web/sites/form/ftp_user.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['ftp'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/sites/form/shell_user.tform.php b/interface/web/sites/form/shell_user.tform.php index 0f692e33b..0b009bb45 100644 --- a/interface/web/sites/form/shell_user.tform.php +++ b/interface/web/sites/form/shell_user.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['shell'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php index f69e16d69..815a373c3 100644 --- a/interface/web/sites/form/web_aliasdomain.tform.php +++ b/interface/web/sites/form/web_aliasdomain.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['domain'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index eadc2d7bb..b1da5931e 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -72,7 +72,7 @@ $form["tabs"]['domain'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE web_server = 1 AND {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND web_server = 1 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php index 271e9a173..cc209ff41 100644 --- a/interface/web/sites/form/web_subdomain.tform.php +++ b/interface/web/sites/form/web_subdomain.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['domain'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php index 8df5b64cb..56fd408d8 100644 --- a/server/lib/classes/modules.inc.php +++ b/server/lib/classes/modules.inc.php @@ -84,7 +84,12 @@ class modules { //* If its a multiserver setup if($app->db->dbHost != $app->dbmaster->dbHost) { - $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = 0) ORDER BY datalog_id"; + if($conf["mirror_server_id"] > 0) { + $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = ".$conf["mirror_server_id"]." OR server_id = 0) ORDER BY datalog_id"; + } else { + $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = 0) ORDER BY datalog_id"; + } + $records = $app->dbmaster->queryAllRecords($sql); foreach($records as $d) { diff --git a/server/server.php b/server/server.php index 97604e28b..61a809f8a 100644 --- a/server/server.php +++ b/server/server.php @@ -53,14 +53,17 @@ if($server_db_record == false) { //* Load the server configuration if($app->dbmaster->connect()) { // get the dalaog_id of the last performed record - $server_db_record = $app->dbmaster->queryOneRecord("SELECT updated, config FROM server WHERE server_id = ".$conf["server_id"]); + $server_db_record = $app->dbmaster->queryOneRecord("SELECT * FROM server WHERE server_id = ".$conf["server_id"]); $conf['last_datalog_id'] = (int)$server_db_record['updated']; + $conf["mirror_server_id"] = (int)$server_db_record['mirror_server_id']; // Load the ini_parser $app->uses('ini_parser'); // Get server configuration $conf["serverconfig"] = $app->ini_parser->parse_ini_string(stripslashes($server_db_record["config"])); // Set the loglevel $conf["log_priority"] = intval($conf["serverconfig"]["server"]["loglevel"]); + + unset($server_db_record); } @@ -89,7 +92,12 @@ $app->log("Set Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock", LOGL if($app->db->connect() && $app->dbmaster->connect()) { // Check if there is anything to update - $tmp_rec = $app->dbmaster->queryOneRecord("SELECT count(server_id) as number from sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = 0)"); + if($conf["mirror_server_id"] > 0) { + $tmp_rec = $app->dbmaster->queryOneRecord("SELECT count(server_id) as number from sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = ".$conf["mirror_server_id"]." OR server_id = 0)"); + } else { + $tmp_rec = $app->dbmaster->queryOneRecord("SELECT count(server_id) as number from sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = 0)"); + } + $tmp_num_records = $tmp_rec["number"]; unset($tmp_rec); -- GitLab