Skip to content

Commit 28d66aa

Browse files
serghey-rodinserghey-rodin
committed
refactoring dns section: new html formating
1 parent 64e7488 commit 28d66aa

26 files changed

+1333
-918
lines changed

‎bin/v_delete_dns_domain‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ rm -f $HOMEDIR/$user/conf/dns/$domain.db
5050
#----------------------------------------------------------#
5151

5252
# Deleting domain
53-
sed -i "/$user\/conf\/dns\/$domain.db\"/d" /etc/named.conf
53+
sed -i "/DOMAIN='$domain'/ d" $USER_DATA/dns.conf
5454
rm -f $USER_DATA/dns/$domain.conf
5555

5656
# Decreasing domain value

‎web/add/dns/index.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,17 @@
150150
$v_ns4 = $nameservers[3];
151151
unset($output);
152152
}
153-
154153
if (empty($v_ttl)) $v_ttl = 14400;
155154
if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year'));
156-
157155
if ($_SESSION['user'] == 'admin') {
158-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_dns.html');
159156
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
160157
} else {
161-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_dns.html');
162158
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_dns.html');
163159
}
164160
unset($_SESSION['error_msg']);
165161
unset($_SESSION['ok_msg']);
166162
} else {
167163
$v_domain = $_GET['domain'];
168-
169-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_dns_rec.html');
170164
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns_rec.html');
171165
unset($_SESSION['error_msg']);
172166
unset($_SESSION['ok_msg']);

‎web/edit/dns/index.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,8 @@
140140

141141
}
142142
if ($_SESSION['user'] == 'admin') {
143-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_dns.html');
144143
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns.html');
145144
} else {
146-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_dns.html');
147145
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_dns.html');
148146
}
149147
unset($_SESSION['error_msg']);
@@ -200,7 +198,6 @@
200198
}
201199

202200
}
203-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_dns_rec.html');
204201
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns_rec.html');
205202
unset($_SESSION['error_msg']);
206203
unset($_SESSION['ok_msg']);

‎web/list/dns/index.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,29 @@
2020
$data = json_decode(implode('', $output), true);
2121
$data = array_reverse($data);
2222
unset($output);
23-
24-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_dns.html');
2523
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns.html');
2624
} else {
2725
exec (VESTA_CMD."v_list_dns_domain_records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
2826
check_error($return_var);
2927
$data = json_decode(implode('', $output), true);
3028
$data = array_reverse($data);
3129
unset($output);
32-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_dns_rec.html');
3330
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns_rec.html');
3431
}
3532
} else {
36-
3733
if (empty($_GET['domain'])){
3834
exec (VESTA_CMD."v_list_dns_domains $user json", $output, $return_var);
3935
check_error($return_var);
4036
$data = json_decode(implode('', $output), true);
4137
$data = array_reverse($data);
4238
unset($output);
43-
44-
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/menu_dns.html');
4539
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_dns.html');
4640
} else {
4741
exec (VESTA_CMD."v_list_dns_domain_records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
4842
check_error($return_var);
4943
$data = json_decode(implode('', $output), true);
5044
$data = array_reverse($data);
5145
unset($output);
52-
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/menu_dns_rec.html');
5346
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_dns_rec.html');
5447
}
5548

‎web/templates/admin/add_dns.html‎

Lines changed: 153 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,157 @@
1-
<script language="javascript">
2-
function elementHideShow(elementToHideOrShow)
3-
{
4-
var el = document.getElementById(elementToHideOrShow);
5-
if (el.style.display == "block") {
6-
el.style.display = "none";
7-
} else {
8-
el.style.display = "block";
9-
}
10-
}
11-
</script>
121

2+
<table class="sub-menu" style="background: white;">
3+
<tr>
4+
<td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding DNS Domain</b></a>
5+
<?php
6+
if (!empty($_SESSION['error_msg'])) {
7+
echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
8+
} else {
9+
if (!empty($_SESSION['ok_msg'])) {
10+
echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
11+
}
12+
}
13+
?>
14+
</td>
15+
</tr>
16+
</table>
17+
</td>
18+
</tr>
19+
</table>
1320

14-
<table class='data'>
15-
<tr class="data-add">
16-
<td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
17-
<table class="data-col1">
18-
<tr><td style="padding: 18 0 4 18;"></td></tr>
19-
</table>
20-
</td>
21-
<td class="data-dotted" width="830px" style="vertical-align:top;">
22-
<table width="830px"><tr>
23-
<td></td>
24-
</tr></table>
25-
<table class="data-col2" width="600px">
26-
<form method="post" name="v_add_user">
27-
<tr><td class="add-text" style="padding: 10 0 0 2px;">Domain</td></tr>
28-
<tr><td><input type="text" size="20" class="add-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain; ?> ></td></tr>
29-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">IP address</td></tr>
30-
<tr><td><input type="text" size="20" class="add-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>></tr>
31-
32-
<tr><td class="add-text" style="padding: 10px 0 0 2px;"><a href="javascript:elementHideShow('advtable');" class="add-advanced">Advanced Options ⇢</a></td></tr>
33-
<tr><td class="add-text" style="padding: 10px 0 0 0px;">
34-
<table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
35-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Template</td></tr>
36-
<tr><td><select class="add-list" name="v_template">
37-
<?php
38-
foreach ($templates as $key => $value) {
39-
echo "\t\t\t\t<option value=\"".$value."\"";
40-
if ((!empty($v_template)) && ( $value == $_POST['v_template'])){
41-
echo ' selected' ;
42-
}
43-
if ((empty($v_template)) && ( $value == $template)){
44-
echo ' selected' ;
21+
<form id="vstobjects" name="v_add_dns" method="post">
22+
<script language="javascript">
23+
function elementHideShow(elementToHideOrShow){
24+
var el = document.getElementById(elementToHideOrShow);
25+
if (el.style.display == "block") {
26+
el.style.display = "none";
27+
} else {
28+
el.style.display = "block";
29+
}
4530
}
31+
</script>
4632

47-
echo ">".$value."</option>\n";
48-
}
49-
?>
50-
</select></td></tr>
51-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Domain Expiriation</td></tr>
52-
<tr><td><input type="text" size="20" class="add-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>></tr>
53-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">TTL</td></tr>
54-
<tr><td><input type="text" size="20" class="add-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>></tr>
55-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Name Servers</td></tr>
56-
<tr><td><input type="text" size="20" class="add-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>></tr>
57-
<tr><td><input type="text" size="20" class="add-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>></tr>
58-
<tr><td><input type="text" size="20" class="add-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>></tr>
59-
<tr><td><input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>></tr>
60-
61-
62-
</table>
63-
</td></tr>
64-
<tr><td style="padding: 24px 0 0 0;">
65-
<input type="submit" name="ok" value="OK" class="add-button"></form>
66-
<input type="button" class="add-button" value="Cancel" onClick="location.href='/list/dns/'">
67-
</td></tr>
68-
</table>
69-
</td>
70-
</tr>
71-
</table>
72-
<table class="data-spacer" style="height:68px"><tr><td></td></tr></table>
33+
<table class="data">
34+
<tr class="data-add">
35+
<td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
36+
<table class="data-col1">
37+
<tr><td style="padding: 18 0 4 18;"></td></tr>
38+
</table>
39+
</td>
40+
<td class="data-dotted" width="830px" style="vertical-align:top;">
41+
<table width="830px">
42+
<tr>
43+
<td></td>
44+
</tr>
45+
</table>
46+
<table class="data-col2" width="600px">
47+
<tr>
48+
<td class="add-text" style="padding: 10 0 0 2px;">
49+
Domain
50+
</td>
51+
</tr>
52+
<tr>
53+
<td>
54+
<input type="text" size="20" class="add-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain; ?>>
55+
</td>
56+
</tr>
57+
<tr>
58+
<td class="add-text" style="padding: 10px 0 0 2px;">
59+
IP address
60+
</td>
61+
</tr>
62+
<tr>
63+
<td>
64+
<input type="text" size="20" class="add-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
65+
</td>
66+
</tr>
67+
<tr>
68+
<td class="add-text" style="padding: 10px 0 0 2px;">
69+
<a href="javascript:elementHideShow('advtable');" class="add-advanced">Advanced Options</a>
70+
</td>
71+
</tr>
72+
<tr>
73+
<td class="add-text" style="padding: 10px 0 0 0px;">
74+
<table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
75+
<tr>
76+
<td class="add-text" style="padding: 10px 0 0 2px;">
77+
Template
78+
</td>
79+
</tr>
80+
<tr>
81+
<td>
82+
<select class="add-list" name="v_template">
83+
<?php
84+
foreach ($templates as $key => $value) {
85+
echo "\n\t\t\t\t\t\\t\t\t\t<option value=\"".$value."\"";
86+
if ((!empty($v_template)) && ( $value == $_POST['v_template'])){
87+
echo ' selected' ;
88+
}
89+
if ((empty($v_template)) && ( $value == $template)){
90+
echo ' selected' ;
91+
}
92+
echo ">".$value."</option>\n";
93+
}
94+
?>
95+
</select>
96+
</td>
97+
</tr>
98+
<tr>
99+
<td class="add-text" style="padding: 10px 0 0 2px;">
100+
Domain Expiriation
101+
</td>
102+
</tr>
103+
<tr>
104+
<td>
105+
<input type="text" size="20" class="add-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>>
106+
</td>
107+
</tr>
108+
<tr>
109+
<td class="add-text" style="padding: 10px 0 0 2px;">
110+
TTL
111+
</td>
112+
</tr>
113+
<tr>
114+
<td>
115+
<input type="text" size="20" class="add-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
116+
</td>
117+
</tr>
118+
<tr>
119+
<td class="add-text" style="padding: 10px 0 0 2px;">
120+
Name Servers
121+
</td>
122+
</tr>
123+
<tr>
124+
<td>
125+
<input type="text" size="20" class="add-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
126+
</td>
127+
</tr>
128+
<tr>
129+
<td>
130+
<input type="text" size="20" class="add-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
131+
</td>
132+
</tr>
133+
<tr>
134+
<td>
135+
<input type="text" size="20" class="add-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
136+
</td>
137+
</tr>
138+
<tr>
139+
<td>
140+
<input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
141+
</td>
142+
</tr>
143+
</table>
144+
</td>
145+
</tr>
146+
<tr>
147+
<td style="padding: 24px 0 0 0;">
148+
<input type="submit" name="ok" value="OK" class="button">
149+
<input type="button" class="button" value="Cancel" onclick="location.href='/list/dns/'">
150+
</td>
151+
</tr>
152+
</table>
153+
</td>
154+
</tr>
155+
</table>
156+
<table class="data-spacer" style="height:68px"><tr><td></td></tr></table>
157+
</form>

0 commit comments

Comments
 (0)