Skip to content

Commit fb8f65c

Browse files
serghey-rodinserghey-rodin
committed
edit mail domain page
1 parent 6d4b14e commit fb8f65c

File tree

13 files changed

+371
-20
lines changed

13 files changed

+371
-20
lines changed

bin/v_add_mail_domain_cactchall renamed to bin/v_add_mail_domain_catchall

File renamed without changes.

bin/v_change_mail_domain_cactchall renamed to bin/v_change_mail_domain_catchall

File renamed without changes.

bin/v_delete_mail_domain_cactchall renamed to bin/v_delete_mail_domain_catchall

File renamed without changes.

‎bin/v_list_mail_domain‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ json_list_domain() {
3131
echo -e "\t\"$value\": {"
3232
else
3333
if [ "$fileds_count" -eq "$i" ]; then
34-
echo -e "\t\t\"${field//$/}\": \"$value\","
35-
else
3634
echo -e "\t\t\"${field//$/}\": \"$value\""
35+
else
36+
echo -e "\t\t\"${field//$/}\": \"$value\","
3737
fi
3838
fi
3939
(( ++i))
@@ -72,7 +72,7 @@ is_object_valid 'mail' 'DOMAIN' "$domain"
7272
# Defining fileds to select
7373
conf=$USER_DATA/mail.conf
7474
fields='$DOMAIN $ANTIVIRUS $ANTISPAM $DKIM $ACCOUNTS $U_DISK $CATCHALL
75-
$SUSPENDED $DATE'
75+
$SUSPENDED $TIME $DATE'
7676

7777
# Listing domains
7878
case $format in

‎web/add/mail/index.php‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,11 @@
8686
$v_account = escapeshellarg($_POST['v_account']);
8787
$v_password = escapeshellarg($_POST['v_password']);
8888
$v_quota = escapeshellarg($_POST['v_quota']);
89+
$v_aliases = $_POST['v_aliases'];
90+
$v_fwd = $_POST['v_fwd'];
91+
8992
if (empty($_POST['v_quota'])) $v_quota = 0;
93+
if ((!empty($_POST['v_quota'])) || (!empty($_POST['v_aliases'])) || (!empty($_POST['v_fwd'])) ) $v_adv = 'yes';
9094

9195
// Check for errors
9296
if (!empty($errors[0])) {
@@ -106,11 +110,58 @@
106110
if (empty($error)) $error = 'Error: vesta did not return any output.';
107111
$_SESSION['error_msg'] = $error;
108112
}
113+
114+
// Add Aliases
115+
if ((!empty($_POST['v_aliases'])) && (empty($_SESSION['error_msg']))) {
116+
$valiases = preg_replace("/\n/", " ", $_POST['v_aliases']);
117+
$valiases = preg_replace("/,/", " ", $valiases);
118+
$valiases = preg_replace('/\s+/', ' ',$valiases);
119+
$valiases = trim($valiases);
120+
$aliases = explode(" ", $valiases);
121+
foreach ($aliases as $alias) {
122+
$alias = escapeshellarg($alias);
123+
if (empty($_SESSION['error_msg'])) {
124+
exec (VESTA_CMD."v_add_mail_account_alias ".$user." ".$v_domain." ".$v_account." ".$alias, $output, $return_var);
125+
if ($return_var != 0) {
126+
$error = implode('<br>', $output);
127+
if (empty($error)) $error = 'Error: vesta did not return any output.';
128+
$_SESSION['error_msg'] = $error;
129+
}
130+
}
131+
unset($output);
132+
}
133+
}
134+
135+
// Add Forwads
136+
if ((!empty($_POST['v_fwd'])) && (empty($_SESSION['error_msg']))) {
137+
$vfwd = preg_replace("/\n/", " ", $_POST['v_fwd']);
138+
$vfwd = preg_replace("/,/", " ", $vfwd);
139+
$vfwd = preg_replace('/\s+/', ' ',$vfwd);
140+
$vfwd = trim($vfwd);
141+
$fwd = explode(" ", $vfwd);
142+
foreach ($fwd as $forward) {
143+
$forward = escapeshellarg($forward);
144+
if (empty($_SESSION['error_msg'])) {
145+
exec (VESTA_CMD."v_add_mail_account_forward ".$user." ".$v_domain." ".$v_account." ".$forward, $output, $return_var);
146+
if ($return_var != 0) {
147+
$error = implode('<br>', $output);
148+
if (empty($error)) $error = 'Error: vesta did not return any output.';
149+
$_SESSION['error_msg'] = $error;
150+
}
151+
}
152+
unset($output);
153+
}
154+
}
155+
109156
unset($output);
110157
if (empty($_SESSION['error_msg'])) {
111158
$_SESSION['ok_msg'] = "OK: account <b>".$_POST['v_account']."</b> has been created successfully.";
112159
unset($v_account);
113160
unset($v_password);
161+
unset($v_password);
162+
unset($v_aliases);
163+
unset($v_fwd);
164+
unset($v_quota);
114165
}
115166
}
116167
}

‎web/edit/mail/index.php‎

Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,232 @@
1+
<?php
2+
// Init
3+
//error_reporting(NULL);
4+
ob_start();
5+
session_start();
6+
7+
$TAB = 'MAIL';
8+
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
9+
10+
// Header
11+
include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
12+
13+
// Panel
14+
top_panel($user,$TAB);
15+
16+
// Are you admin?
17+
if ($_SESSION['user'] == 'admin') {
18+
19+
// Check user argument?
20+
if (empty($_GET['domain'])) {
21+
header("Location: /list/mail/");
22+
}
23+
24+
if (!empty($_POST['cancel'])) {
25+
header("Location: /list/mail/");
26+
}
27+
28+
// Check domain
29+
if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
30+
$v_domain = escapeshellarg($_GET['domain']);
31+
exec (VESTA_CMD."v_list_mail_domain ".$user." ".$v_domain." json", $output, $return_var);
32+
if ($return_var != 0) {
33+
$error = implode('<br>', $output);
34+
if (empty($error)) $error = 'Error: vesta did not return any output.';
35+
$_SESSION['error_msg'] = $error;
36+
} else {
37+
$data = json_decode(implode('', $output), true);
38+
unset($output);
39+
$v_username = $user;
40+
$v_domain = $_GET['domain'];
41+
$v_antispam = $data[$v_domain]['ANTISPAM'];
42+
$v_antivirus = $data[$v_domain]['ANTIVIRUS'];
43+
$v_dkim = $data[$v_domain]['DKIM'];
44+
$v_catchall = $data[$v_domain]['CATCHALL'];
45+
$v_date = $data[$v_domain]['DATE'];
46+
$v_time = $data[$v_domain]['TIME'];
47+
$v_suspended = $data[$v_domain]['SUSPENDED'];
48+
if ( $v_suspended == 'yes' ) {
49+
$v_status = 'suspended';
50+
} else {
51+
$v_status = 'active';
52+
}
53+
}
54+
55+
// Action
56+
if (!empty($_POST['save'])) {
57+
$v_domain = escapeshellarg($_POST['v_domain']);
58+
59+
// Antispam
60+
if (($v_antispam == 'yes') && (empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) {
61+
exec (VESTA_CMD."v_delete_mail_domain_antispam ".$v_username." ".$v_domain, $output, $return_var);
62+
if ($return_var != 0) {
63+
$error = implode('<br>', $output);
64+
if (empty($error)) $error = 'Error: vesta did not return any output.';
65+
$_SESSION['error_msg'] = $error;
66+
}
67+
$v_antispam = 'no';
68+
unset($output);
69+
}
70+
if (($v_antispam == 'no') && (!empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) {
71+
exec (VESTA_CMD."v_add_mail_domain_antispam ".$v_username." ".$v_domain, $output, $return_var);
72+
if ($return_var != 0) {
73+
$error = implode('<br>', $output);
74+
if (empty($error)) $error = 'Error: vesta did not return any output.';
75+
$_SESSION['error_msg'] = $error;
76+
}
77+
$v_antispam = 'yes';
78+
unset($output);
79+
}
80+
81+
// Antivirus
82+
if (($v_antivirus == 'yes') && (empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) {
83+
exec (VESTA_CMD."v_delete_mail_domain_antivirus ".$v_username." ".$v_domain, $output, $return_var);
84+
if ($return_var != 0) {
85+
$error = implode('<br>', $output);
86+
if (empty($error)) $error = 'Error: vesta did not return any output.';
87+
$_SESSION['error_msg'] = $error;
88+
}
89+
$v_antivirus = 'no';
90+
unset($output);
91+
}
92+
if (($v_antivirus == 'no') && (!empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) {
93+
exec (VESTA_CMD."v_add_mail_domain_antivirus ".$v_username." ".$v_domain, $output, $return_var);
94+
if ($return_var != 0) {
95+
$error = implode('<br>', $output);
96+
if (empty($error)) $error = 'Error: vesta did not return any output.';
97+
$_SESSION['error_msg'] = $error;
98+
}
99+
$v_antivirus = 'yes';
100+
unset($output);
101+
}
102+
103+
if (empty($_SESSION['error_msg'])) {
104+
$_SESSION['ok_msg'] = "OK: changes has been saved.";
105+
}
106+
107+
// DKIM
108+
if (($v_dkim == 'yes') && (empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) {
109+
exec (VESTA_CMD."v_delete_mail_domain_dkim ".$v_username." ".$v_domain, $output, $return_var);
110+
if ($return_var != 0) {
111+
$error = implode('<br>', $output);
112+
if (empty($error)) $error = 'Error: vesta did not return any output.';
113+
$_SESSION['error_msg'] = $error;
114+
}
115+
$v_dkim = 'no';
116+
unset($output);
117+
}
118+
if (($v_dkim == 'no') && (!empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) {
119+
exec (VESTA_CMD."v_add_mail_domain_dkim ".$v_username." ".$v_domain, $output, $return_var);
120+
if ($return_var != 0) {
121+
$error = implode('<br>', $output);
122+
if (empty($error)) $error = 'Error: vesta did not return any output.';
123+
$_SESSION['error_msg'] = $error;
124+
}
125+
$v_dkim = 'yes';
126+
unset($output);
127+
}
128+
129+
// Catchall
130+
if ((!empty($v_catchall)) && (empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
131+
exec (VESTA_CMD."v_delete_mail_domain_catchall ".$v_username." ".$v_domain, $output, $return_var);
132+
if ($return_var != 0) {
133+
$error = implode('<br>', $output);
134+
if (empty($error)) $error = 'Error: vesta did not return any output.';
135+
$_SESSION['error_msg'] = $error;
136+
}
137+
$v_catchall = '';
138+
unset($output);
139+
}
140+
141+
if ((!empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
142+
if ($v_catchall != $_POST['v_catchall']) {
143+
$v_catchall = escapeshellarg($_POST['v_catchall']);
144+
exec (VESTA_CMD."v_change_mail_domain_catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
145+
if ($return_var != 0) {
146+
$error = implode('<br>', $output);
147+
if (empty($error)) $error = 'Error: vesta did not return any output.';
148+
$_SESSION['error_msg'] = $error;
149+
}
150+
unset($output);
151+
}
152+
}
153+
154+
if ((empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
155+
$v_catchall = escapeshellarg($_POST['v_catchall']);
156+
exec (VESTA_CMD."v_add_mail_domain_catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
157+
if ($return_var != 0) {
158+
$error = implode('<br>', $output);
159+
if (empty($error)) $error = 'Error: vesta did not return any output.';
160+
$_SESSION['error_msg'] = $error;
161+
}
162+
unset($output);
163+
}
164+
165+
if (empty($_SESSION['error_msg'])) {
166+
$_SESSION['ok_msg'] = "OK: changes has been saved.";
167+
}
168+
}
169+
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_mail.html');
170+
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail.html');
171+
unset($_SESSION['error_msg']);
172+
unset($_SESSION['ok_msg']);
173+
} else {
174+
$v_domain = escapeshellarg($_GET['domain']);
175+
$v_record_id = escapeshellarg($_GET['record_id']);
176+
exec (VESTA_CMD."v_list_dns_domain_records ".$user." ".$v_domain." 'json'", $output, $return_var);
177+
if ($return_var != 0) {
178+
$error = implode('<br>', $output);
179+
if (empty($error)) $error = 'Error: vesta did not return any output.';
180+
$_SESSION['error_msg'] = $error;
181+
} else {
182+
$data = json_decode(implode('', $output), true);
183+
unset($output);
184+
$v_username = $user;
185+
$v_domain = $_GET['domain'];
186+
$v_d = $_GET['record_id'];
187+
$v_rec = $data[$v_record_id]['RECORD'];
188+
$v_type = $data[$v_record_id]['TYPE'];
189+
$v_val = $data[$v_record_id]['VALUE'];
190+
$v_priority = $data[$v_record_id]['PRIORITY'];
191+
$v_suspended = $data[$v_record_id]['SUSPENDED'];
192+
if ( $v_suspended == 'yes' ) {
193+
$v_status = 'suspended';
194+
} else {
195+
$v_status = 'active';
196+
}
197+
$v_date = $data[$v_record_id]['DATE'];
198+
$v_time = $data[$v_record_id]['TIME'];
199+
}
200+
201+
// Action
202+
if (!empty($_POST['save'])) {
203+
$v_domain = escapeshellarg($_POST['v_domain']);
204+
$v_record_id = escapeshellarg($_POST['v_record_id']);
205+
206+
if (($v_val != $_POST['v_val']) || ($v_priority != $_POST['v_priority']) && (empty($_SESSION['error_msg']))) {
207+
$v_val = escapeshellarg($_POST['v_val']);
208+
$v_priority = escapeshellarg($_POST['v_priority']);
209+
exec (VESTA_CMD."v_change_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id." ".$v_val." ".$v_priority, $output, $return_var);
210+
if ($return_var != 0) {
211+
$error = implode('<br>', $output);
212+
if (empty($error)) $error = 'Error: vesta did not return any output.';
213+
$_SESSION['error_msg'] = $error;
214+
}
215+
$restart_dns = 'yes';
216+
unset($output);
217+
}
218+
219+
if (empty($_SESSION['error_msg'])) {
220+
$_SESSION['ok_msg'] = "OK: changes has been saved.";
221+
}
222+
223+
}
224+
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_dns_rec.html');
225+
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns_rec.html');
226+
unset($_SESSION['error_msg']);
227+
unset($_SESSION['ok_msg']);
228+
}
229+
}
230+
231+
// Footer
232+
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

‎web/list/mail/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
exec (VESTA_CMD."v_list_mail_accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
2828
check_error($return_var);
2929
$data = json_decode(implode('', $output), true);
30-
//$data = array_reverse($data);
30+
$data = array_reverse($data);
3131
unset($output);
3232
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_mail_acc.html');
3333
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail_acc.html');

‎web/templates/admin/add_mail_acc.html‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
<script type="text/javascript">
2-
function randomString() {
3-
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
4-
var string_length = 10;
5-
var randomstring = '';
6-
for (var i=0; i<string_length; i++) {
7-
var rnum = Math.floor(Math.random() * chars.length);
8-
randomstring += chars.substring(rnum,rnum+1);
9-
}
10-
document.v_add_user.v_password.value = randomstring;
11-
}
2+
function elementHideShow(elementToHideOrShow) {
3+
var el = document.getElementById(elementToHideOrShow);
4+
if (el.style.display == "block") {
5+
el.style.display = "none";
6+
} else {
7+
el.style.display = "block";
8+
}
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.v_add_user.v_password.value = randomstring;
20+
}
1221
</script>
1322

1423

@@ -31,8 +40,17 @@
3140
<tr><td><input type="text" size="20" class="add-input" name="v_account" <?php if (!empty($v_account)) echo "value=".$v_account; ?>></tr>
3241
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Password <a href="javascript:randomString();" class="genpass">generate</a></td></tr>
3342
<tr><td><input type="text" size="20" class="add-input" name="v_password"</tr>
34-
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Quota <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span></td></tr>
35-
<tr><td><input type="text" size="20" class="add-input" name="v_quota" <?php if (!empty($v_quota)) echo "value=".$v_quota; ?>></tr>
43+
<tr><td class="add-text" style="padding: 10px 0 0 2px;"><a href="javascript:elementHideShow('advtable');" class="add-advanced">Advanced Options ⇢</a></td></tr>
44+
<tr><td class="add-text" style="padding: 9px 0 0 0px;">
45+
<table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
46+
<tr><td class="add-text" style="padding: 0 0 0 2px;">Quota <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(in megabytes)</span></td></tr>
47+
<tr><td><input type="text" size="20" class="add-input" name="v_quota" <?php if (!empty($v_quota)) echo "value=".$v_quota; ?>></tr>
48+
<tr><td class="add-text" style="padding: 10 0 0 2px;">Aliases <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(local part only)</span></td></tr>
49+
<tr><td><textarea size="20" class="add-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases; ?></textarea></td></tr>
50+
<tr><td class="add-text" style="padding: 10 0 0 2px;">Forward to <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(email address or addresses)</span></td></tr>
51+
<tr><td><textarea size="20" class="add-textinput" name="v_fwd"><?php if (!empty($v_fwd)) echo $v_fwd; ?></textarea></td></tr>
52+
</table>
53+
</td></tr>
3654
<tr><td style="padding: 24px 0 0 0;">
3755
<input type="submit" name="ok_acc" value="OK" class="add-button"></form>
3856
<input type="button" class="add-button" value="Cancel" onClick="location.href='/list/mail/<?php echo "?domain=".$v_domain; ?>'">

0 commit comments

Comments
 (0)