API 1.0.0-6 release.

This commit is contained in:
Alexander 2021-12-30 21:58:29 +00:00
parent 22f3dd11e2
commit b7bdfd2d87
8 changed files with 58 additions and 24 deletions

View file

@ -172,6 +172,7 @@ if (!empty($_POST['ok_acc'])) {
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
}
// Email login credentials
if ((!empty($v_send_email)) && (empty($_SESSION['error_msg']))) {
$to = $v_send_email;

View file

@ -260,7 +260,9 @@ $result = array(
'web_system' => $_SESSION['WEB_SYSTEM'],
'web_backend' => $_SESSION['WEB_BACKEND'],
'proxy_system' => $_SESSION['PROXY_SYSTEM'],
'dns_system' => $_SESSION['DNS_SYSTEM']
'dns_system' => $_SESSION['DNS_SYSTEM'],
'error_msg' => $_SESSION['error_msg'],
'ok_msg' => $_SESSION['ok_msg']
);
echo json_encode($result);

View file

@ -0,0 +1,18 @@
<?php
error_reporting(NULL);
$TAB = 'SERVER';
header('Content-Type: application/json');
// Main include
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
// Change port
exec (VESTA_CMD."v-change-vesta-port ".escapeshellarg('8087'), $output, $return_var);
check_return_code($return_var,$output);
unset($output);
header('Location: '
. ($_SERVER['HTTPS'] ? 'https' : 'http')
. '://' . $_SERVER['HTTP_HOST'] . ':' . '8087');
exit;

View file

@ -60,15 +60,23 @@ foreach ($data as $key => $value) {
}
if (empty($_GET['domain'])){
$total_amount = $i === 1 ? __('1 domain') : __('%s domains', $i);
$total_amount = $i == 1 ? __('1 domain') : __('%s domains', $i);
} else {
$total_amount = $i === 1 ? __('1 mail account') : __('%s mail account', $i);
$total_amount = $i == 1 ? __('1 mail account') : __('%s mail account', $i);
}
$data[$key]['list_accounts_button'] = __('list accounts', $data[$key]['ACCOUNTS']);
$data[$key]['delete_conf'] = __('DELETE_DOMAIN_CONFIRMATION', $key);
}
if (count($data) == 0) {
if (empty($_GET['domain'])){
$total_amount = __('%s domains', 0);
} else {
$total_amount = __('%s mail account', 0);
}
}
// Back uri
$_SESSION['back'] = $_SERVER['REQUEST_URI'];

View file

@ -17,57 +17,52 @@ if ($_SESSION['user'] != 'admin') {
if (isset($_GET['cpu'])) {
$TAB = 'CPU';
exec (VESTA_CMD.'v-list-sys-cpu-status', $output, $return_var);
$service_log = $output;
}
// Memory info
if (isset($_GET['mem'])) {
$TAB = 'MEMORY';
exec (VESTA_CMD.'v-list-sys-memory-status', $output, $return_var);
$service_log = $output;
}
// Disk info
if (isset($_GET['disk'])) {
$TAB = 'DISK';
exec (VESTA_CMD.'v-list-sys-disk-status', $output, $return_var);
$service_log = $output;
}
// Network info
if (isset($_GET['net'])) {
$TAB = 'NETWORK';
exec (VESTA_CMD.'v-list-sys-network-status', $output, $return_var);
$service_log = $output;
}
// Web info
if (isset($_GET['web'])) {
$TAB = 'WEB';
exec (VESTA_CMD.'v-list-sys-web-status', $output, $return_var);
$service_log = $output;
}
// DNS info
if (isset($_GET['dns'])) {
$TAB = 'DNS';
exec (VESTA_CMD.'v-list-sys-dns-status', $output, $return_var);
$service_log = $output;
}
// Mail info
if (isset($_GET['mail'])) {
$TAB = 'MAIL';
exec (VESTA_CMD.'v-list-sys-mail-status', $output, $return_var);
$service_log = $output;
}
// DB info
if (isset($_GET['db'])) {
$TAB = 'DB';
exec (VESTA_CMD.'v-list-sys-db-status', $output, $return_var);
$service_log = $output;
}
foreach($output as $file) {
$service_log .= $file . "\n";
}
// Data

View file

@ -31,23 +31,23 @@ foreach ($data as $key => $value) {
$data[$key]['U_BANDWIDTH_PERCENT'] = get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']);
$data[$key]['U_DISK_PERCENT'] = get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']);
$data[$key]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($data[$key]['U_BANDWIDTH']);
$data[$key]['U_BANDWIDTH'] = humanize_usage_size($data[$key]['U_BANDWIDTH']);
$data[$key]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($data[$key]['U_BANDWIDTH_MEASURE']);
$data[$key]['U_DISK_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK']);
$data[$key]['U_DISK'] = humanize_usage_size($data[$key]['U_DISK']);
$data[$key]['U_DISK_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_MEASURE']);
$data[$key]['U_DISK_WEB_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_WEB']);
$data[$key]['U_DISK_WEB'] = humanize_usage_size($data[$key]['U_DISK_WEB']);
$data[$key]['U_DISK_WEB_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_WEB_MEASURE']);
$data[$key]['U_DISK_DB_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_DB']);
$data[$key]['U_DISK_DB'] = humanize_usage_size($data[$key]['U_DISK_DB']);
$data[$key]['U_DISK_DB_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_DB_MEASURE']);
$data[$key]['U_DISK_MAIL_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_MAIL']);
$data[$key]['U_DISK_MAIL'] = humanize_usage_size($data[$key]['U_DISK_MAIL']);
$data[$key]['U_DISK_MAIL_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_MAIL_MEASURE']);
$data[$key]['U_DISK_DIRS_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_DIRS']);
$data[$key]['U_DISK_DIRS'] = humanize_usage_size($data[$key]['U_DISK_DIRS']);
$data[$key]['U_DISK_DIRS_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_DIRS_MEASURE']);
if ($data[$key]['SUSPENDED'] == 'yes') {
$spnd_action = 'unsuspend' ;

View file

@ -14,10 +14,18 @@ if ($_GET['type'] == 'access') $type = 'access';
if ($_GET['type'] == 'error') $type = 'error';
$data = exec (VESTA_CMD."v-list-web-domain-".$type."log $user ".$v_domain, $output, $return_var);
$content = '';
if ($return_var == 0 ) {
foreach($output as $file) {
$content .= htmlentities($file) . "\n";
}
}
echo json_encode(
array(
'data' => $data
'data' => $content,
'prefix' => __('Last 70 lines of %s.%s.log', htmlentities($_GET['domain']), htmlentities($_GET['type']))
)
);

View file

@ -148,20 +148,22 @@ if (empty($_SESSION['language'])) {
}
}
// Generate CSRF token
$token = bin2hex(file_get_contents('/dev/urandom', false, null, 0, 16));
$_SESSION['token'] = $token;
if (empty($_SESSION['token'])) {
// Generate CSRF token
$token = bin2hex(file_get_contents('/dev/urandom', false, null, 0, 16));
$_SESSION['token'] = $token;
}
require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php');
$v_user = empty($_SESSION['look']) ? $_SESSION['user'] : $_SESSION['look'];
top_panel($v_user, $TAB);
$panel[$v_user]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($panel[$v_user]['U_BANDWIDTH']);
$panel[$v_user]['U_BANDWIDTH'] = humanize_usage_size($panel[$v_user]['U_BANDWIDTH']);
$panel[$v_user]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($panel[$v_user]['U_BANDWIDTH_MEASURE']);
$panel[$v_user]['U_DISK_MEASURE'] = humanize_usage_measure($panel[$v_user]['U_DISK']);
$panel[$v_user]['U_DISK'] = humanize_usage_size($panel[$v_user]['U_DISK']);
$panel[$v_user]['U_DISK_MEASURE'] = humanize_usage_measure($panel[$v_user]['U_DISK_MEASURE']);
$result = array(
'token' => $_SESSION['token'],