Skip to content

Commit d0f6d5d

Browse files
serghey-rodinserghey-rodin
committed
check_return_code function
1 parent 3cb02ae commit d0f6d5d

File tree

19 files changed

+118
-229
lines changed

19 files changed

+118
-229
lines changed

‎web/delete/backup/index.php‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,17 @@
55
session_start();
66
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
77

8-
// Delete as someone else?
9-
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
10-
$user=$_GET['user'];
11-
}
12-
13-
if (!empty($_GET['backup'])) {
14-
$v_username = escapeshellarg($user);
15-
$v_backup = escapeshellarg($_GET['backup']);
16-
exec (VESTA_CMD."v-delete-user-backup ".$v_username." ".$v_backup, $output, $return_var);
17-
}
18-
if ($return_var != 0) {
19-
$error = implode('<br>', $output);
20-
if (empty($error)) $error = __('Error: vesta did not return any output.');
21-
$_SESSION['error_msg'] = $error;
22-
}
23-
unset($output);
8+
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
9+
$user=$_GET['user'];
10+
}
2411

25-
//}
12+
if (!empty($_GET['backup'])) {
13+
$v_username = escapeshellarg($user);
14+
$v_backup = escapeshellarg($_GET['backup']);
15+
exec (VESTA_CMD."v-delete-user-backup ".$v_username." ".$v_backup, $output, $return_var);
16+
}
17+
check_return_code($return_var,$output);
18+
unset($output);
2619

2720
$back = $_SESSION['back'];
2821
if (!empty($back)) {

‎web/delete/cron/index.php‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,17 @@
55
session_start();
66
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
77

8-
// Delete as someone else?
9-
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
10-
$user=$_GET['user'];
11-
}
12-
13-
if (!empty($_GET['job'])) {
14-
$v_username = escapeshellarg($user);
15-
$v_job = escapeshellarg($_GET['job']);
16-
exec (VESTA_CMD."v-delete-cron-job ".$v_username." ".$v_job, $output, $return_var);
17-
}
18-
if ($return_var != 0) {
19-
$error = implode('<br>', $output);
20-
if (empty($error)) $error = __('Error: vesta did not return any output.');
21-
$_SESSION['error_msg'] = $error;
22-
}
23-
unset($output);
8+
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
9+
$user=$_GET['user'];
10+
}
2411

25-
//}
12+
if (!empty($_GET['job'])) {
13+
$v_username = escapeshellarg($user);
14+
$v_job = escapeshellarg($_GET['job']);
15+
exec (VESTA_CMD."v-delete-cron-job ".$v_username." ".$v_job, $output, $return_var);
16+
}
17+
check_return_code($return_var,$output);
18+
unset($output);
2619

2720
$back = $_SESSION['back'];
2821
if (!empty($back)) {

‎web/delete/db/index.php‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,17 @@
55
session_start();
66
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
77

8-
// Delete as someone else?
9-
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
10-
$user=$_GET['user'];
11-
}
12-
13-
if (!empty($_GET['database'])) {
14-
$v_username = escapeshellarg($user);
15-
$v_database = escapeshellarg($_GET['database']);
16-
exec (VESTA_CMD."v-delete-database ".$v_username." ".$v_database, $output, $return_var);
17-
}
18-
if ($return_var != 0) {
19-
$error = implode('<br>', $output);
20-
if (empty($error)) $error = __('Error: vesta did not return any output.');
21-
$_SESSION['error_msg'] = $error;
22-
}
23-
unset($output);
8+
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
9+
$user=$_GET['user'];
10+
}
2411

25-
//}
12+
if (!empty($_GET['database'])) {
13+
$v_username = escapeshellarg($user);
14+
$v_database = escapeshellarg($_GET['database']);
15+
exec (VESTA_CMD."v-delete-database ".$v_username." ".$v_database, $output, $return_var);
16+
}
17+
check_return_code($return_var,$output);
18+
unset($output);
2619

2720
$back = $_SESSION['back'];
2821
if (!empty($back)) {

‎web/delete/dns/index.php‎

Lines changed: 31 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,53 +5,44 @@
55
session_start();
66
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
77

8-
// Delete as someone else?
9-
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
10-
$user=$_GET['user'];
11-
}
8+
// Delete as someone else?
9+
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
10+
$user=$_GET['user'];
11+
}
1212

13-
// DNS domain
14-
if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
15-
$v_username = escapeshellarg($user);
16-
$v_domain = escapeshellarg($_GET['domain']);
17-
exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
18-
if ($return_var != 0) {
19-
$error = implode('<br>', $output);
20-
if (empty($error)) $error = __('Error: vesta did not return any output.');
21-
$_SESSION['error_msg'] = $error;
22-
}
23-
unset($output);
13+
// DNS domain
14+
if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
15+
$v_username = escapeshellarg($user);
16+
$v_domain = escapeshellarg($_GET['domain']);
17+
exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
18+
check_return_code($return_var,$output);
19+
unset($output);
2420

25-
$back = $_SESSION['back'];
26-
if (!empty($back)) {
27-
header("Location: ".$back);
28-
exit;
29-
}
30-
header("Location: /list/dns/");
21+
$back = $_SESSION['back'];
22+
if (!empty($back)) {
23+
header("Location: ".$back);
3124
exit;
3225
}
26+
header("Location: /list/dns/");
27+
exit;
28+
}
3329

34-
// DNS record
35-
if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) {
36-
$v_username = escapeshellarg($user);
37-
$v_domain = escapeshellarg($_GET['domain']);
38-
$v_record_id = escapeshellarg($_GET['record_id']);
39-
exec (VESTA_CMD."v-delete-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
40-
if ($return_var != 0) {
41-
$error = implode('<br>', $output);
42-
if (empty($error)) $error = __('Error: vesta did not return any output.');
43-
$_SESSION['error_msg'] = $error;
44-
}
45-
unset($output);
46-
$back = $_SESSION['back'];
47-
if (!empty($back)) {
48-
header("Location: ".$back);
49-
exit;
50-
}
51-
header("Location: /list/dns/?domain=".$_GET['domain']);
30+
// DNS record
31+
if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) {
32+
$v_username = escapeshellarg($user);
33+
$v_domain = escapeshellarg($_GET['domain']);
34+
$v_record_id = escapeshellarg($_GET['record_id']);
35+
exec (VESTA_CMD."v-delete-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
36+
check_return_code($return_var,$output);
37+
unset($output);
38+
$back = $_SESSION['back'];
39+
if (!empty($back)) {
40+
header("Location: ".$back);
5241
exit;
5342
}
54-
//}
43+
header("Location: /list/dns/?domain=".$_GET['domain']);
44+
exit;
45+
}
5546

5647
$back = $_SESSION['back'];
5748
if (!empty($back)) {

‎web/delete/ip/index.php‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@
1010
$v_ip = escapeshellarg($_GET['ip']);
1111
exec (VESTA_CMD."v-delete-sys-ip ".$v_ip, $output, $return_var);
1212
}
13-
if ($return_var != 0) {
14-
$error = implode('<br>', $output);
15-
if (empty($error)) $error = __('Error: vesta did not return any output.');
16-
if ($return_var == 4) $error = __('IP address is in use');
17-
$_SESSION['error_msg'] = $error;
18-
}
13+
check_return_code($return_var,$output);
1914
unset($output);
2015

2116
}

‎web/delete/mail/index.php‎

Lines changed: 31 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,43 @@
55
session_start();
66
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
77

8-
// Delete as someone else?
9-
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
10-
$user=$_GET['user'];
11-
}
8+
// Delete as someone else?
9+
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
10+
$user=$_GET['user'];
11+
}
1212

13-
// Mail domain
14-
if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
15-
$v_username = escapeshellarg($user);
16-
$v_domain = escapeshellarg($_GET['domain']);
17-
exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
18-
if ($return_var != 0) {
19-
$error = implode('<br>', $output);
20-
if (empty($error)) $error = __('Error: vesta did not return any output.');
21-
$_SESSION['error_msg'] = $error;
22-
}
23-
unset($output);
24-
$back = $_SESSION['back'];
25-
if (!empty($back)) {
26-
header("Location: ".$back);
27-
exit;
28-
}
29-
header("Location: /list/mail/");
13+
// Mail domain
14+
if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
15+
$v_username = escapeshellarg($user);
16+
$v_domain = escapeshellarg($_GET['domain']);
17+
exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
18+
check_return_code($return_var,$output);
19+
unset($output);
20+
$back = $_SESSION['back'];
21+
if (!empty($back)) {
22+
header("Location: ".$back);
3023
exit;
3124
}
25+
header("Location: /list/mail/");
26+
exit;
27+
}
3228

33-
// Mail account
34-
if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) {
35-
$v_username = escapeshellarg($user);
36-
$v_domain = escapeshellarg($_GET['domain']);
37-
$v_account = escapeshellarg($_GET['account']);
38-
exec (VESTA_CMD."v-delete-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
39-
if ($return_var != 0) {
40-
$error = implode('<br>', $output);
41-
if (empty($error)) $error = __('Error: vesta did not return any output.');
42-
$_SESSION['error_msg'] = $error;
43-
}
44-
unset($output);
45-
$back = $_SESSION['back'];
46-
if (!empty($back)) {
47-
header("Location: ".$back);
48-
exit;
49-
}
50-
header("Location: /list/mail/?domain=".$_GET['domain']);
29+
// Mail account
30+
if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) {
31+
$v_username = escapeshellarg($user);
32+
$v_domain = escapeshellarg($_GET['domain']);
33+
$v_account = escapeshellarg($_GET['account']);
34+
exec (VESTA_CMD."v-delete-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
35+
check_return_code($return_var,$output);
36+
unset($output);
37+
$back = $_SESSION['back'];
38+
if (!empty($back)) {
39+
header("Location: ".$back);
5140
exit;
5241
}
53-
//}
42+
header("Location: /list/mail/?domain=".$_GET['domain']);
43+
exit;
44+
}
5445

5546
$back = $_SESSION['back'];
5647
if (!empty($back)) {

‎web/delete/package/index.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
$v_package = escapeshellarg($_GET['package']);
1111
exec (VESTA_CMD."v-delete-user-package ".$v_package, $output, $return_var);
1212
}
13-
if ($return_var != 0) {
14-
$error = implode('<br>', $output);
15-
if (empty($error)) $error = __('Error: vesta did not return any output.');
16-
$_SESSION['error_msg'] = $error;
17-
}
13+
check_return_code($return_var,$output);
1814
unset($output);
1915
}
2016

‎web/delete/user/index.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
$v_username = escapeshellarg($_GET['user']);
1111
exec (VESTA_CMD."v-delete-user ".$v_username, $output, $return_var);
1212
}
13-
if ($return_var != 0) {
14-
$error = implode('<br>', $output);
15-
if (empty($error)) $error = __('Error: vesta did not return any output.');
16-
$_SESSION['error_msg'] = $error;
17-
}
13+
check_return_code($return_var,$output);
1814
unset($_SESSION['look']);
1915
unset($output);
2016
}

‎web/delete/web/index.php‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,34 @@
55
session_start();
66
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
77

8-
// Delete as someone else?
9-
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
10-
$user=$_GET['user'];
11-
}
8+
// Delete as someone else?
9+
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
10+
$user=$_GET['user'];
11+
}
1212

1313
if (!empty($_GET['domain'])) {
1414
$v_username = escapeshellarg($user);
1515
$v_domain = escapeshellarg($_GET['domain']);
1616
exec (VESTA_CMD."v-delete-web-domain ".$v_username." ".$v_domain, $output, $return_var);
17-
if ($return_var != 0) {
18-
$error = implode('<br>', $output);
19-
if (empty($error)) $error = __('Error: vesta did not return any output.');
20-
$_SESSION['error_msg'] = $error;
21-
}
17+
check_return_code($return_var,$output);
2218
unset($output);
2319

2420
// DNS
25-
if ($return_var == 0) {
21+
if (empty($_SESSION['error_msg'])) {
2622
exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $lreturn_var);
2723
if ($lreturn_var == 0 ) {
2824
exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
29-
if ($return_var != 0) {
30-
$error = implode('<br>', $output);
31-
if (empty($error)) $error = __('Error: vesta did not return any output.');
32-
$_SESSION['error_msg'] = $error;
33-
}
25+
check_return_code($return_var,$output);
3426
unset($output);
3527
}
3628
}
3729

3830
// Mail
39-
if ($return_var == 0) {
31+
if (empty($_SESSION['error_msg'])) {
4032
exec (VESTA_CMD."v-list-mail-domain ".$v_username." ".$v_domain." json", $output, $lreturn_var);
4133
if ($lreturn_var == 0 ) {
4234
exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
43-
if ($return_var != 0) {
44-
$error = implode('<br>', $output);
45-
if (empty($error)) $error = __('Error: vesta did not return any output.');
46-
$_SESSION['error_msg'] = $error;
47-
}
35+
check_return_code($return_var,$output);
4836
unset($output);
4937
}
5038
}

‎web/suspend/cron/index.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
$v_job = escapeshellarg($_GET['job']);
1515
exec (VESTA_CMD."v-suspend-cron-job ".$v_username." ".$v_job, $output, $return_var);
1616
}
17-
if ($return_var != 0) {
18-
$error = implode('<br>', $output);
19-
if (empty($error)) $error = __('Error: vesta did not return any output.');
20-
$_SESSION['error_msg'] = $error;
21-
}
17+
check_return_code($return_var,$output);
2218
unset($output);
2319
}
2420

0 commit comments

Comments
 (0)