Skip to content

Commit 3e477ce

Browse files
serghey-rodinserghey-rodin
committed
refactoring ip section: new html formating
1 parent f1253a0 commit 3e477ce

File tree

10 files changed

+488
-304
lines changed

10 files changed

+488
-304
lines changed

‎bin/v_list_sys_users‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
#!/bin/bash
2+
# info: list system users
3+
# options: [format]
4+
#
5+
# The function for obtaining the list of system users without
6+
# detailed information.
7+
8+
9+
#----------------------------------------------------------#
10+
# Variable&Function #
11+
#----------------------------------------------------------#
12+
13+
# Argument defenition
14+
format=${1-shell}
15+
16+
# Includes
17+
source $VESTA/func/main.sh
18+
19+
# Json function
20+
json_list_users() {
21+
users=$(grep @ /etc/passwd|cut -f 1 -d :)
22+
int_counter=$(echo "$users" | wc -l)
23+
i=1
24+
echo '['
25+
for user in $users; do
26+
if [ "$i" -lt "$int_counter" ]; then
27+
echo -e "\t\"$user\","
28+
else
29+
echo -e "\t\"$user\""
30+
fi
31+
(( ++i))
32+
done
33+
echo "]"
34+
}
35+
36+
# Shell function
37+
shell_list_users() {
38+
if [ -z "$nohead" ]; then
39+
echo "USERS"
40+
echo "----------"
41+
fi
42+
for user in $(grep @ /etc/passwd|cut -f 1 -d :); do
43+
echo "$user"
44+
done
45+
}
46+
47+
48+
#----------------------------------------------------------#
49+
# Action #
50+
#----------------------------------------------------------#
51+
52+
# Listing domains
53+
case $format in
54+
json) json_list_users ;;
55+
plain) nohead=1; shell_list_users ;;
56+
shell) shell_list_users ;;
57+
*) check_args '1' '0' '[format]' ;;
58+
esac
59+
60+
61+
#----------------------------------------------------------#
62+
# Vesta #
63+
#----------------------------------------------------------#
64+
65+
exit

‎web/add/ip/index.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@
7474
$interfaces = json_decode(implode('', $output), true);
7575
unset($output);
7676

77-
exec (VESTA_CMD."v_list_users 'json'", $output, $return_var);
77+
exec (VESTA_CMD."v_list_sys_users 'json'", $output, $return_var);
7878
$users = json_decode(implode('', $output), true);
7979
unset($output);
8080

81-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_ip.html');
8281
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_ip.html');
8382
unset($_SESSION['error_msg']);
8483
unset($_SESSION['ok_msg']);

‎web/edit/ip/index.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
$v_status = 'active';
4949
}
5050

51-
exec (VESTA_CMD."v_list_users 'json'", $output, $return_var);
51+
exec (VESTA_CMD."v_list_sys_users 'json'", $output, $return_var);
5252
$users = json_decode(implode('', $output), true);
5353
unset($output);
5454

@@ -110,7 +110,6 @@
110110
}
111111
}
112112

113-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_ip.html');
114113
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_ip.html');
115114
unset($_SESSION['error_msg']);
116115
unset($_SESSION['ok_msg']);

‎web/list/ip/index.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515

1616
// Data
1717
if ($_SESSION['user'] == 'admin') {
18-
1918
exec (VESTA_CMD."v_list_sys_ips json", $output, $return_var);
2019
check_error($return_var);
2120
$data = json_decode(implode('', $output), true);
2221
$data = array_reverse($data);
2322
unset($output);
24-
25-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_ip.html');
2623
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_ip.html');
2724
}
2825

‎web/templates/admin/add_ip.html‎

Lines changed: 137 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,139 @@
1-
<script type="text/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-
function randomString() {
12-
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
13-
var string_length = 10;
14-
var randomstring = '';
15-
for (var i=0; i<string_length; i++) {
16-
var rnum = Math.floor(Math.random() * chars.length);
17-
randomstring += chars.substring(rnum,rnum+1);
18-
}
19-
document.getElementById('v_password').value = randomstring;
20-
}
21-
</script>
221

23-
<table class='data'>
24-
<tr class="data-add">
25-
<td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
26-
<table class="data-col1">
27-
<tr><td style="padding: 18 0 4 18;"></td></tr>
28-
</table>
29-
</td>
30-
<td class="data-dotted" width="830px" style="vertical-align:top;">
31-
<table width="830px"><tr>
32-
<td></td>
33-
</tr></table>
34-
<table class="data-col2" width="600px">
35-
<form method="post" name="v_add_user">
36-
<tr><td class="add-text" style="padding: 10 0 0 2px;">IP</td></tr>
37-
<tr><td><input type="text" size="20" class="add-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>></td></tr>
38-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Netmask</td></tr>
39-
<tr><td></span><input type="text" size="20" class="add-input" name="v_netmask" <?php if (!empty($v_netmask)) echo "value=".$v_netmask; ?>></tr>
40-
<tr><td class="add-text" style="padding: 10 0 0 2px;">Interface</td></tr>
41-
<tr><td><select class="add-list" name="v_interface">
42-
<?php
43-
foreach ($interfaces as $key => $value) {
44-
echo "\t\t\t\t<option value=\"".$value."\"";
45-
if ((!empty($v_interface)) && ( $value == $v_interface )) echo ' selected';
46-
echo ">".$value."</option>\n";
47-
}
48-
?>
49-
</select></td></tr>
50-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Shared</td></tr>
51-
<tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?> onclick="javascript:elementHideShow('usrtable');"></tr>
52-
<tr><td><table style="display:<?php if (empty($v_dedicated)) { echo 'none';} else {echo 'block';}?> ;" id="usrtable"><tr>
53-
<tr><td class="add-text" style="padding: 0 0 0 2px;">Assigned User</td></tr>
54-
<tr><td><select class="add-list" name="v_owner">
55-
<?php
56-
foreach ($users as $key => $value) {
57-
echo "\t\t\t\t<option value=\"".$value."\"";
58-
if ((!empty($v_owner)) && ( $value == $v_owner )) echo ' selected';
59-
echo ">".$value."</option>\n";
60-
}
61-
?>
62-
</select></td></tr>
63-
</table></td></tr>
64-
<tr><td class="add-text" style="padding: 10 0 0 2px;">Associated Domain <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span></td></tr>
65-
<tr><td><input type="text" size="20" class="add-input" name="v_name" <?php if (!empty($v_name)) echo "value=".$v_name; ?>></td></tr>
2+
<table class="sub-menu" style="background: white;">
3+
<tr>
4+
<td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding IP Address</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>
6620

67-
<tr><td style="padding: 24px 0 0 0;">
68-
<input type="submit" name="ok" value="OK" class="add-button"></form>
69-
<input type="button" class="add-button" value="Cancel" onClick="location.href='/list/ip/'">
70-
</td></tr>
71-
</table>
72-
</td>
73-
</tr>
74-
</table>
21+
<form id="vstobjects" name="v_add_ip" method="post">
22+
<script type="text/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+
}
30+
}
31+
</script>
32+
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+
IP
50+
</td>
51+
</tr>
52+
<tr>
53+
<td>
54+
<input type="text" size="20" class="add-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
55+
</td>
56+
</tr>
57+
<tr>
58+
<td class="add-text" style="padding: 10px 0 0 2px;">
59+
Netmask
60+
</td>
61+
</tr>
62+
<tr>
63+
<td>
64+
<input type="text" size="20" class="add-input" name="v_netmask" <?php if (!empty($v_netmask)) echo "value=".$v_netmask; ?>>
65+
</td>
66+
</tr>
67+
<tr>
68+
<td class="add-text" style="padding: 10 0 0 2px;">
69+
Interface
70+
</td>
71+
</tr>
72+
<tr>
73+
<td>
74+
<select class="add-list" name="v_interface">
75+
<?php
76+
foreach ($interfaces as $key => $value) {
77+
echo "\t\t\t\t<option value=\"".$value."\"";
78+
if ((!empty($v_interface)) && ( $value == $v_interface )) echo ' selected';
79+
echo ">".$value."</option>\n";
80+
}
81+
?>
82+
</select>
83+
</td>
84+
</tr>
85+
<tr>
86+
<td class="add-text" style="padding: 10px 0 0 2px;">
87+
Shared
88+
</td>
89+
</tr>
90+
<tr>
91+
<td>
92+
<input type="checkbox" size="20" class="add-checkbox" name="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?> onclick="javascript:elementHideShow('usrtable');">
93+
</td>
94+
</tr>
95+
<tr>
96+
<td>
97+
<table style="display:<?php if (empty($v_dedicated)) { echo 'none';} else {echo 'block';}?> ;" id="usrtable">
98+
<tr>
99+
<td class="add-text" style="padding: 0 0 0 2px;">
100+
Assigned User
101+
</td>
102+
</tr>
103+
<tr>
104+
<td>
105+
<select class="add-list" name="v_owner">
106+
<?php
107+
foreach ($users as $key => $value) {
108+
echo "\t\t\t\t<option value=\"".$value."\"";
109+
if ((!empty($v_owner)) && ( $value == $v_owner )) echo ' selected';
110+
echo ">".$value."</option>\n";
111+
}
112+
?>
113+
</select>
114+
</td>
115+
</tr>
116+
</table>
117+
</td>
118+
</tr>
119+
<tr>
120+
<td class="add-text" style="padding: 10 0 0 2px;">
121+
Associated Domain <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span>
122+
</td>
123+
</tr>
124+
<tr>
125+
<td>
126+
<input type="text" size="20" class="add-input" name="v_name" <?php if (!empty($v_name)) echo "value=".$v_name; ?>>
127+
</td>
128+
</tr>
129+
<tr>
130+
<td style="padding: 24px 0 0 0;">
131+
<input type="submit" name="ok" value="OK" class="button">
132+
<input type="button" class="button" value="Cancel" onclick="location.href='/list/ip/'">
133+
</td>
134+
</tr>
135+
</table>
136+
</td>
137+
</tr>
138+
</table>
139+
</from>

0 commit comments

Comments
 (0)