Skip to content

Commit 44d2a76

Browse files
tbrehmtbrehm
committed
Added missing error messages to the dns wizard.
Improved language file loading.
1 parent 93f3e1a commit 44d2a76

File tree

4 files changed

+123
-89
lines changed

4 files changed

+123
-89
lines changed

‎interface/lib/app.inc.php‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/*
4-
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
4+
Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without modification,
@@ -147,26 +147,44 @@ public function error($msg, $next_link = '', $stop = true, $priority = 1)
147147
}
148148
}
149149

150-
/** Loads language */
150+
/** Translates strings in current language */
151151
public function lng($text)
152152
{
153153
if($this->_language_inc != 1) {
154154
//* loading global and module Wordbook
155155
// TODO: this need to be made clearer somehow - pedro
156-
@include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');
156+
//@include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');
157+
$this->load_language_file('/lib/lang/'.$_SESSION['s']['language'].'.lng');
157158
if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['language'])) {
158-
$lng_file = ISPC_ROOT_PATH.'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng';
159-
if(!file_exists($lng_file)) $lng_file = ISPC_ROOT_PATH.'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/en.lng';
160-
@include_once($lng_file);
159+
$lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng';
160+
if(!file_exists($lng_file)) $lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/en.lng';
161+
//@include_once($lng_file);
162+
$this->load_language_file($lng_file);
161163
}
162-
if(isset($wb)) $this->_wb = $wb;
164+
//if(isset($wb)) $this->_wb = $wb;
163165
$this->_language_inc = 1;
164166
}
165167
if(!empty($this->_wb[$text])) {
166168
$text = $this->_wb[$text];
167169
}
168170
return $text;
169171
}
172+
173+
//** Helper function to load the language files.
174+
public function load_language_file($filename) {
175+
$filename = ISPC_ROOT_PATH.'/'.$filename;
176+
if(substr($filename,-4) != '.lng') $this->error('Language file has wrong extension.');
177+
if(file_exists($filename)) {
178+
@include_once($filename);
179+
if(is_array($wb)) {
180+
if(is_array($this->_wb)) {
181+
$this->_wb = array_merge($wb,$this->_wb);
182+
} else {
183+
$this->_wb = $wb;
184+
}
185+
}
186+
}
187+
}
170188

171189
public function tpl_defaults()
172190
{

‎interface/web/dns/dns_wizard.php‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
$app->uses('tpl,validate_dns');
4040
$app->tpl->newTemplate("form.tpl.htm");
4141
$app->tpl->setInclude('content_tpl','templates/dns_wizard.htm');
42+
$app->load_language_file('/web/dns/lib/lang/'.$_SESSION['s']['language'].'_dns_wizard.lng');
4243

4344
// import variables
4445
$template_id = (isset($_POST['template_id']))?intval($_POST['template_id']):0;
@@ -109,11 +110,11 @@
109110

110111
$error = '';
111112

112-
if(isset($_POST['domain']) && $_POST['domain'] == '') $error .= $app->lng('error_domain_empty');
113-
if(isset($_POST['ip']) && $_POST['ip'] == '') $error .= $app->lng('error_ip_empty');
114-
if(isset($_POST['ns1']) && $_POST['ns1'] == '') $error .= $app->lng('error_ns1_empty');
115-
if(isset($_POST['ns2']) && $_POST['ns2'] == '') $error .= $app->lng('error_ns2_empty');
116-
if(isset($_POST['email']) && $_POST['email'] == '') $error .= $app->lng('error_email_empty');
113+
if(isset($_POST['domain']) && $_POST['domain'] == '') $error .= $app->lng('error_domain_empty').'<br />';
114+
if(isset($_POST['ip']) && $_POST['ip'] == '') $error .= $app->lng('error_ip_empty').'<br />';
115+
if(isset($_POST['ns1']) && $_POST['ns1'] == '') $error .= $app->lng('error_ns1_empty').'<br />';
116+
if(isset($_POST['ns2']) && $_POST['ns2'] == '') $error .= $app->lng('error_ns2_empty').'<br />';
117+
if(isset($_POST['email']) && $_POST['email'] == '') $error .= $app->lng('error_email_empty').'<br />';
117118

118119

119120
// replace template placeholders
@@ -164,14 +165,14 @@
164165

165166
} // end foreach
166167

167-
if($vars['origin'] == '') $error .= $app->lng('error_origin_empty');
168-
if($vars['ns'] == '') $error .= $app->lng('error_ns_empty');
169-
if($vars['mbox'] == '') $error .= $app->lng('error_mbox_empty');
170-
if($vars['refresh'] == '') $error .= $app->lng('error_refresh_empty');
171-
if($vars['retry'] == '') $error .= $app->lng('error_retry_empty');
172-
if($vars['expire'] == '') $error .= $app->lng('error_expire_empty');
173-
if($vars['minimum'] == '') $error .= $app->lng('error_minimum_empty');
174-
if($vars['ttl'] == '') $error .= $app->lng('error_ttl_empty');
168+
if($vars['origin'] == '') $error .= $app->lng('error_origin_empty').'<br />';
169+
if($vars['ns'] == '') $error .= $app->lng('error_ns_empty').'<br />';
170+
if($vars['mbox'] == '') $error .= $app->lng('error_mbox_empty').'<br />';
171+
if($vars['refresh'] == '') $error .= $app->lng('error_refresh_empty').'<br />';
172+
if($vars['retry'] == '') $error .= $app->lng('error_retry_empty').'<br />';
173+
if($vars['expire'] == '') $error .= $app->lng('error_expire_empty').'<br />';
174+
if($vars['minimum'] == '') $error .= $app->lng('error_minimum_empty').'<br />';
175+
if($vars['ttl'] == '') $error .= $app->lng('error_ttl_empty').'<br />';
175176

176177
if($error == '') {
177178
// Insert the soa record

‎interface/web/dns/lib/lang/en_dns_wizard.lng‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,18 @@ $wb['email_txt'] = 'Email';
1010
$wb['ns1_txt'] = 'NS 1';
1111
$wb['ns2_txt'] = 'NS 2';
1212
$wb['ip_txt'] = 'IP Address';
13-
1413
$wb['error_origin_empty'] = 'Origin empty.';
14+
$wb['error_ns_empty'] = 'NS empty.';
15+
$wb['error_mbox_empty'] = 'Mbox empty.';
16+
$wb['error_refresh_empty'] = 'Refresh empty.';
17+
$wb['error_retry_empty'] = 'Retry empty.';
18+
$wb['error_expire_empty'] = 'Expire empty.';
19+
$wb['error_minimum_empty'] = 'Minimum empty.';
20+
$wb['error_ttl_empty'] = 'TTL empty.';
21+
$wb['error_domain_empty'] = 'Domain empty';
22+
$wb['error_ip_empty'] = 'IP empty.';
23+
$wb['error_ns1_empty'] = 'NS1 empty.';
24+
$wb['error_ns2_empty'] = 'NS2 empty.';
25+
$wb['error_email_empty'] = 'EMail empty.';
1526

1627
?>

‎interface/web/dns/templates/dns_wizard.htm‎

Lines changed: 72 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,72 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
<p><tmpl_var name="list_desc_txt"></p>
3-
4-
<div class="panel panel_dns_wizard">
5-
6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>DNS Zone</legend>
8-
<div class="ctrlHolder">
9-
<label for="template_id">{tmpl_var name='template_id_txt'}</label>
10-
<select name="template_id" id="template_id" class="selectInput" onChange="submitForm('pageForm','dns/dns_wizard.php')">
11-
{tmpl_var name='template_id_option'}
12-
</select>
13-
</div>
14-
<tmpl_if name="is_admin">
15-
<div class="ctrlHolder">
16-
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
17-
<select name="server_id" id="server_id" class="selectInput">
18-
{tmpl_var name='server_id'}
19-
</select>
20-
</div>
21-
<div class="ctrlHolder">
22-
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
23-
<select name="client_group_id" id="client_group_id" class="selectInput">
24-
{tmpl_var name='client_group_id'}
25-
</select>
26-
</div>
27-
</tmpl_if>
28-
<tmpl_if name="DOMAIN_VISIBLE">
29-
<div class="ctrlHolder">
30-
<label for="domain">{tmpl_var name='domain_txt'}</label>
31-
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
32-
</div>
33-
</tmpl_if>
34-
<tmpl_if name="IP_VISIBLE">
35-
<div class="ctrlHolder">
36-
<label for="ip">{tmpl_var name='ip_txt'}</label>
37-
<input name="ip" id="ip" value="{tmpl_var name='ip'}" size="30" maxlength="255" type="text" class="textInput" />
38-
</div>
39-
</tmpl_if>
40-
<tmpl_if name="NS1_VISIBLE">
41-
<div class="ctrlHolder">
42-
<label for="ns1">{tmpl_var name='ns1_txt'}</label>
43-
<input name="ns1" id="ns1" value="{tmpl_var name='ns1'}" size="30" maxlength="255" type="text" class="textInput" />
44-
</div>
45-
</tmpl_if>
46-
<tmpl_if name="NS2_VISIBLE">
47-
<div class="ctrlHolder">
48-
<label for="ns2">{tmpl_var name='ns2_txt'}</label>
49-
<input name="ns2" id="ns2" value="{tmpl_var name='ns2'}" size="30" maxlength="255" type="text" class="textInput" />
50-
</div>
51-
</tmpl_if>
52-
<tmpl_if name="EMAIL_VISIBLE">
53-
<div class="ctrlHolder">
54-
<label for="email">{tmpl_var name='email_txt'}</label>
55-
<input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
56-
</div>
57-
</tmpl_if>
58-
</fieldset>
59-
60-
<input type="hidden" name="create" value="0" />
61-
62-
<div class="buttonHolder buttons">
63-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onClick="document.pageForm.create.value=1; submitForm('pageForm','dns/dns_wizard.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
64-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
65-
</div>
66-
</div>
67-
68-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
<p><tmpl_var name="list_desc_txt"></p>
3+
4+
<tmpl_if name="error">
5+
<div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
6+
</tmpl_if>
7+
8+
<div class="panel panel_dns_wizard">
9+
10+
<div class="pnl_formsarea">
11+
<fieldset class="inlineLabels"><legend>DNS Zone</legend>
12+
<div class="ctrlHolder">
13+
<label for="template_id">{tmpl_var name='template_id_txt'}</label>
14+
<select name="template_id" id="template_id" class="selectInput" onChange="submitForm('pageForm','dns/dns_wizard.php')">
15+
{tmpl_var name='template_id_option'}
16+
</select>
17+
</div>
18+
<tmpl_if name="is_admin">
19+
<div class="ctrlHolder">
20+
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
21+
<select name="server_id" id="server_id" class="selectInput">
22+
{tmpl_var name='server_id'}
23+
</select>
24+
</div>
25+
<div class="ctrlHolder">
26+
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
27+
<select name="client_group_id" id="client_group_id" class="selectInput">
28+
{tmpl_var name='client_group_id'}
29+
</select>
30+
</div>
31+
</tmpl_if>
32+
<tmpl_if name="DOMAIN_VISIBLE">
33+
<div class="ctrlHolder">
34+
<label for="domain">{tmpl_var name='domain_txt'}</label>
35+
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
36+
</div>
37+
</tmpl_if>
38+
<tmpl_if name="IP_VISIBLE">
39+
<div class="ctrlHolder">
40+
<label for="ip">{tmpl_var name='ip_txt'}</label>
41+
<input name="ip" id="ip" value="{tmpl_var name='ip'}" size="30" maxlength="255" type="text" class="textInput" />
42+
</div>
43+
</tmpl_if>
44+
<tmpl_if name="NS1_VISIBLE">
45+
<div class="ctrlHolder">
46+
<label for="ns1">{tmpl_var name='ns1_txt'}</label>
47+
<input name="ns1" id="ns1" value="{tmpl_var name='ns1'}" size="30" maxlength="255" type="text" class="textInput" />
48+
</div>
49+
</tmpl_if>
50+
<tmpl_if name="NS2_VISIBLE">
51+
<div class="ctrlHolder">
52+
<label for="ns2">{tmpl_var name='ns2_txt'}</label>
53+
<input name="ns2" id="ns2" value="{tmpl_var name='ns2'}" size="30" maxlength="255" type="text" class="textInput" />
54+
</div>
55+
</tmpl_if>
56+
<tmpl_if name="EMAIL_VISIBLE">
57+
<div class="ctrlHolder">
58+
<label for="email">{tmpl_var name='email_txt'}</label>
59+
<input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
60+
</div>
61+
</tmpl_if>
62+
</fieldset>
63+
64+
<input type="hidden" name="create" value="0" />
65+
66+
<div class="buttonHolder buttons">
67+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onClick="document.pageForm.create.value=1; submitForm('pageForm','dns/dns_wizard.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
68+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
69+
</div>
70+
</div>
71+
72+
</div>

0 commit comments

Comments
 (0)