Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
lolo888
ISPConfig 3
Commits
9adcf583
Commit
9adcf583
authored
Oct 27, 2009
by
tbrehm
Browse files
Added: FS#687 - Add a replication and mirroring mode for server settings
parent
f2ea1ac2
Changes
22
Hide whitespace changes
Inline
Side-by-side
interface/web/admin/form/server.tform.php
View file @
9adcf583
...
...
@@ -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',
...
...
interface/web/admin/lib/lang/en_server.lng
View file @
9adcf583
<?php
$wb
[
"config_txt"
]
=
'config'
;
$wb
[
"server_name_txt"
]
=
'Servername'
;
$wb
[
"mail_server_txt"
]
=
'Mailserver'
;
$wb
[
"web_server_txt"
]
=
'Webserver'
;
$wb
[
"dns_server_txt"
]
=
'DNS-Server'
;
$wb
[
"file_server_txt"
]
=
'Fileserver'
;
$wb
[
"db_server_txt"
]
=
'DB-Server'
;
$wb
[
"vserver_server_txt"
]
=
'VServer-Server'
;
$wb
[
"active_txt"
]
=
'Active'
;
<?php
$wb
[
"config_txt"
]
=
'config'
;
$wb
[
"server_name_txt"
]
=
'Servername'
;
$wb
[
"mail_server_txt"
]
=
'Mailserver'
;
$wb
[
"web_server_txt"
]
=
'Webserver'
;
$wb
[
"dns_server_txt"
]
=
'DNS-Server'
;
$wb
[
"file_server_txt"
]
=
'Fileserver'
;
$wb
[
"db_server_txt"
]
=
'DB-Server'
;
$wb
[
"vserver_server_txt"
]
=
'VServer-Server'
;
$wb
[
"active_txt"
]
=
'Active'
;
$wb
[
"mirror_server_id_txt"
]
=
'Is mirror of Server'
;
$wb
[
"- None -"
]
=
'- None -'
;
?>
\ No newline at end of file
interface/web/admin/server_edit.php
View file @
9adcf583
...
...
@@ -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
=
'<option value="0">'
.
$app
->
tform
->
lng
(
'- None -'
)
.
'</option>'
;
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
.
=
"<option value='
$mirror_server[server_id]
'
$selected
>
$mirror_server[server_name]
</option>
\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
interface/web/admin/templates/server_edit_services.htm
View file @
9adcf583
<h2><tmpl_var
name=
"list_head_txt"
></h2>
<p><tmpl_var
name=
"list_desc_txt"
></p>
<div
class=
"panel panel_server"
>
<div
class=
"pnl_formsarea"
>
<fieldset
class=
"inlineLabels"
>
<div
class=
"ctrlHolder"
>
<label
for=
"server_name"
>
{tmpl_var name='server_name_txt'}
</label>
<input
name=
"server_name"
id=
"server_name"
value=
"{tmpl_var name='server_name'}"
size=
"30"
maxlength=
"255"
type=
"text"
class=
"textInput"
/>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='mail_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='mail_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='web_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='web_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='dns_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='dns_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='file_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='file_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='db_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='db_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='vserver_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='vserver_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<label
for=
"active"
>
{tmpl_var name='active_txt'}
</label>
<select
name=
"active"
id=
"active"
class=
"selectInput formLengthBool"
>
{tmpl_var name='active'}
</select>
</div>
</fieldset>
<input
type=
"hidden"
name=
"id"
value=
"{tmpl_var name='id'}"
>
<div
class=
"buttonHolder buttons"
>
<button
class=
"positive iconstxt icoPositive"
type=
"button"
value=
"{tmpl_var name='btn_save_txt'}"
onClick=
"submitForm('pageForm','admin/server_edit.php');"
><span>
{tmpl_var name='btn_save_txt'}
</span></button>
<button
class=
"negative iconstxt icoNegative"
type=
"button"
value=
"{tmpl_var name='btn_cancel_txt'}"
onClick=
"loadContent('admin/server_list.php');"
><span>
{tmpl_var name='btn_cancel_txt'}
</span></button>
</div>
</div>
</div>
<h2><tmpl_var
name=
"list_head_txt"
></h2>
<p><tmpl_var
name=
"list_desc_txt"
></p>
<div
class=
"panel panel_server"
>
<div
class=
"pnl_formsarea"
>
<fieldset
class=
"inlineLabels"
>
<div
class=
"ctrlHolder"
>
<label
for=
"server_name"
>
{tmpl_var name='server_name_txt'}
</label>
<input
name=
"server_name"
id=
"server_name"
value=
"{tmpl_var name='server_name'}"
size=
"30"
maxlength=
"255"
type=
"text"
class=
"textInput"
/>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='mail_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='mail_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='web_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='web_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='dns_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='dns_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='file_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='file_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='db_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='db_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='vserver_server_txt'}
</p>
<div
class=
"multiField"
>
{tmpl_var name='vserver_server'}
</div>
</div>
<div
class=
"ctrlHolder"
>
<label
for=
"mirror_server_id"
>
{tmpl_var name='mirror_server_id_txt'}
</label>
<select
name=
"mirror_server_id"
id=
"server_id"
class=
"selectInput"
>
{tmpl_var name='mirror_server_id'}
</select>
</div>
<div
class=
"ctrlHolder"
>
<label
for=
"active"
>
{tmpl_var name='active_txt'}
</label>
<select
name=
"active"
id=
"active"
class=
"selectInput formLengthBool"
>
{tmpl_var name='active'}
</select>
</div>
</fieldset>
<input
type=
"hidden"
name=
"id"
value=
"{tmpl_var name='id'}"
>
<div
class=
"buttonHolder buttons"
>
<button
class=
"positive iconstxt icoPositive"
type=
"button"
value=
"{tmpl_var name='btn_save_txt'}"
onClick=
"submitForm('pageForm','admin/server_edit.php');"
><span>
{tmpl_var name='btn_save_txt'}
</span></button>
<button
class=
"negative iconstxt icoNegative"
type=
"button"
value=
"{tmpl_var name='btn_cancel_txt'}"
onClick=
"loadContent('admin/server_list.php');"
><span>
{tmpl_var name='btn_cancel_txt'}
</span></button>
</div>
</div>
</div>
interface/web/dns/form/dns_soa.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/mail/form/mail_blacklist.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/mail/form/mail_content_filter.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/mail/form/mail_domain.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/mail/form/mail_get.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/mail/form/mail_transport.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/mail/form/spamfilter_blacklist.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/mail/form/spamfilter_users.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/mail/form/spamfilter_whitelist.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/sites/form/cron.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/sites/form/database.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/sites/form/ftp_user.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/sites/form/shell_user.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/sites/form/web_aliasdomain.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/sites/form/web_domain.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
interface/web/sites/form/web_subdomain.tform.php
View file @
9adcf583
...
...
@@ -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'
),
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment