Skip to content

Commit 41d7d17

Browse files
scambrascambra
committed
default servers on system config for admin use
1 parent a1db685 commit 41d7d17

15 files changed

+124
-3
lines changed

‎interface/web/admin/form/system_config.tform.php‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,28 @@
172172
'default' => 'n',
173173
'value' => array(0 => 'n', 1 => 'y')
174174
),
175+
'default_webserver' => array (
176+
'datatype' => 'INTEGER',
177+
'formtype' => 'SELECT',
178+
'default' => '1',
179+
'datasource' => array ( 'type' => 'CUSTOM',
180+
'class'=> 'custom_datasource',
181+
'function'=> 'client_servers'
182+
),
183+
'value' => '',
184+
'name' => 'default_webserver'
185+
),
186+
'default_dbserver' => array (
187+
'datatype' => 'INTEGER',
188+
'formtype' => 'SELECT',
189+
'default' => '1',
190+
'datasource' => array ( 'type' => 'CUSTOM',
191+
'class'=> 'custom_datasource',
192+
'function'=> 'client_servers'
193+
),
194+
'value' => '',
195+
'name' => 'default_dbserver'
196+
),
175197
//#################################
176198
// ENDE Datatable fields
177199
//#################################
@@ -321,6 +343,53 @@
321343
'default' => '',
322344
'value' => array('' => 'No', 'ssl' => 'SSL', 'tls' => 'STARTTLS')
323345
),
346+
'default_mailserver' => array (
347+
'datatype' => 'INTEGER',
348+
'formtype' => 'SELECT',
349+
'default' => '1',
350+
'datasource' => array ( 'type' => 'CUSTOM',
351+
'class'=> 'custom_datasource',
352+
'function'=> 'client_servers'
353+
),
354+
'value' => '',
355+
'name' => 'default_mailserver'
356+
),
357+
//#################################
358+
// ENDE Datatable fields
359+
//#################################
360+
)
361+
);
362+
363+
$form["tabs"]['dns'] = array (
364+
'title' => "DNS",
365+
'width' => 70,
366+
'template' => "templates/system_config_dns_edit.htm",
367+
'fields' => array (
368+
//#################################
369+
// Begin Datatable fields
370+
//#################################
371+
'default_dnsserver' => array (
372+
'datatype' => 'INTEGER',
373+
'formtype' => 'SELECT',
374+
'default' => '1',
375+
'datasource' => array ( 'type' => 'CUSTOM',
376+
'class'=> 'custom_datasource',
377+
'function'=> 'client_servers'
378+
),
379+
'value' => '',
380+
'name' => 'default_dnsserver'
381+
),
382+
'default_slave_dnsserver' => array (
383+
'datatype' => 'INTEGER',
384+
'formtype' => 'SELECT',
385+
'default' => '1',
386+
'datasource' => array ( 'type' => 'CUSTOM',
387+
'class'=> 'custom_datasource',
388+
'function'=> 'client_servers'
389+
),
390+
'value' => '',
391+
'name' => 'default_slave_dnsserver'
392+
),
324393
//#################################
325394
// ENDE Datatable fields
326395
//#################################

‎interface/web/admin/lib/lang/en.lng‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ $wb['Firewall'] = 'Firewall';
4141

4242
$wb['Interface'] = 'Interface';
4343
$wb['Interface Config'] = 'Main Config';
44+
$wb['Sites'] = 'Sites';
45+
$wb['DNS'] = 'DNS';
4446
$wb['Domains'] = 'Domains';
4547
$wb['Misc'] = 'Misc';
4648

@@ -59,4 +61,4 @@ $wb['Import'] = 'Import';
5961
$wb['Remote Actions'] = 'Remote Actions';
6062
$wb['Do OS-Update'] = 'Do OS-Update';
6163
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
62-
?>
64+
?>

‎interface/web/admin/lib/lang/en_system_config.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,9 @@ $wb['session_allow_endless_txt'] = 'Enable "stay logged in"';
7373
$wb['No'] = 'No';
7474
$wb['min_password_length_txt'] = 'Minimum password length';
7575
$wb['min_password_strength_txt'] = 'Minimum password strength';
76+
$wb["default_mailserver_txt"] = 'Default Mailserver';
77+
$wb["default_webserver_txt"] = 'Default Webserver';
78+
$wb["default_dnsserver_txt"] = 'Default DNS Server';
79+
$wb["default_slave_dnsserver_txt"] = 'Default Secondary DNS Server';
80+
$wb["default_dbserver_txt"] = 'Default Database Server';
7681
?>

‎interface/web/admin/lib/lang/es.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@ $wb['Directive Snippets'] = 'Fragmentos de Directivas';
4747
$wb['Interface'] = 'Interfaz';
4848
$wb['Domains'] = 'Dominios';
4949
$wb['Misc'] = 'Misc';
50+
$wb['Sites'] = 'Sitios';
51+
$wb['DNS'] = 'DNS';
5052
?>

‎interface/web/admin/lib/lang/es_system_config.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,9 @@ $wb['min_password_length_txt'] = 'Longitud de contraseña mínima';
7070
$wb['min_password_strength_txt'] = 'Fortaleza de contraseña mínima';
7171
$wb['Sites'] = 'Sitios';
7272
$wb['System Config'] = 'Configuración de sistema';
73+
$wb['default_mailserver_txt'] = 'Servidor de correo por defecto';
74+
$wb['default_webserver_txt'] = 'Servidor web por defecto';
75+
$wb['default_dnsserver_txt'] = 'Servidor DNS por defecto';
76+
$wb['default_slave_dnsserver_txt'] = 'Servidor DNS secundario por defecto';
77+
$wb['default_dbserver_txt'] = 'Servidor de bases de datos por defecto';
7378
?>

‎interface/web/admin/system_config_edit.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ function onShowEdit() {
6464
$server_id = $this->id;
6565

6666
$this->dataRecord = $app->getconf->get_global_config($section);
67+
if (is_null($this->dataRecord)) {
68+
$this->dataRecord = array();
69+
}
6770
if ($section == 'domains'){
6871
if (isset($this->dataRecord['use_domain_module'])){
6972
$_SESSION['use_domain_module_old_value'] = $this->dataRecord['use_domain_module'];

‎interface/web/admin/templates/system_config_mail_edit.htm‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@ <h2><tmpl_var name="list_head_txt"></h2>
8585
{tmpl_var name='smtp_crypt'}
8686
</select>
8787
</div>
88+
<div class="ctrlHolder">
89+
<label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
90+
<select name="default_mailserver" id="default_mailserver" class="selectInput">
91+
{tmpl_var name='default_mailserver'}
92+
</select>
93+
</div>
8894
</fieldset>
8995

9096
<input type="hidden" name="id" value="{tmpl_var name='id'}">

‎interface/web/admin/templates/system_config_sites_edit.htm‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@ <h2><tmpl_var name="list_head_txt"></h2>
6363
{tmpl_var name='reseller_can_use_options'}
6464
</div>
6565
</div>
66+
<div class="ctrlHolder">
67+
<label for="default_webserver">{tmpl_var name='default_webserver_txt'}</label>
68+
<select name="default_webserver" id="default_webserver" class="selectInput">
69+
{tmpl_var name='default_webserver'}
70+
</select>
71+
</div>
72+
<div class="ctrlHolder">
73+
<label for="default_dbserver">{tmpl_var name='default_dbserver_txt'}</label>
74+
<select name="default_dbserver" id="default_dbserver" class="selectInput">
75+
{tmpl_var name='default_dbserver'}
76+
</select>
77+
</div>
6678
</fieldset>
6779

6880
<input type="hidden" name="id" value="{tmpl_var name='id'}">

‎interface/web/dns/dns_import.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
$server_id = $app->functions->intval($_POST['server_id_value']);
5757
$post_server_id = true;
5858
} else {
59-
$server_id = 1;
59+
$settings = $app->getconf->get_global_config('dns');
60+
$server_id = $app->functions->intval($settings['default_dnsserver']);
6061
$post_server_id = false;
6162
}
6263

‎interface/web/dns/dns_slave_edit.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ function onShowNew() {
6161
if(!$app->tform->checkResellerLimit('limit_dns_slave_zone')) {
6262
$app->error('Reseller: '.$app->tform->wordbook["limit_dns_slave_zone_txt"]);
6363
}
64+
} else {
65+
$settings = $app->getconf->get_global_config('dns');
66+
$app->tform->formDef['tabs']['dns_slave']['fields']['server_id']['default'] = intval($settings['default_slave_dnsserver']);
6467
}
6568

6669
parent::onShowNew();

0 commit comments

Comments
 (0)