|
@@ -36,7 +36,7 @@ $v_cgi = $data[$v_domain]['CGI'];
|
|
|
$v_elog = $data[$v_domain]['ELOG'];
|
|
$v_elog = $data[$v_domain]['ELOG'];
|
|
|
$v_ssl = $data[$v_domain]['SSL'];
|
|
$v_ssl = $data[$v_domain]['SSL'];
|
|
|
if (!empty($v_ssl)) {
|
|
if (!empty($v_ssl)) {
|
|
|
- exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
|
|
|
|
|
|
|
+ exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".escapeshellarg($v_domain)."' json", $output, $return_var);
|
|
|
$ssl_str = json_decode(implode('', $output), true);
|
|
$ssl_str = json_decode(implode('', $output), true);
|
|
|
unset($output);
|
|
unset($output);
|
|
|
$v_ssl_crt = $ssl_str[$v_domain]['CRT'];
|
|
$v_ssl_crt = $ssl_str[$v_domain]['CRT'];
|
|
@@ -129,6 +129,7 @@ if (!empty($_POST['save'])) {
|
|
|
exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $return_var);
|
|
exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $return_var);
|
|
|
unset($output);
|
|
unset($output);
|
|
|
if ($return_var == 0 ) {
|
|
if ($return_var == 0 ) {
|
|
|
|
|
+ $v_ip = escapeshellarg($_POST['v_ip']);
|
|
|
exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
|
|
exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
|
|
|
check_return_code($return_var,$output);
|
|
check_return_code($return_var,$output);
|
|
|
unset($output);
|
|
unset($output);
|
|
@@ -142,6 +143,7 @@ if (!empty($_POST['save'])) {
|
|
|
exec (VESTA_CMD."v-list-dns-domain ".$v_username." '".$v_alias."' json", $output, $return_var);
|
|
exec (VESTA_CMD."v-list-dns-domain ".$v_username." '".$v_alias."' json", $output, $return_var);
|
|
|
unset($output);
|
|
unset($output);
|
|
|
if ($return_var == 0 ) {
|
|
if ($return_var == 0 ) {
|
|
|
|
|
+ $v_ip = escapeshellarg($_POST['v_ip']);
|
|
|
exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var);
|
|
exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var);
|
|
|
check_return_code($return_var,$output);
|
|
check_return_code($return_var,$output);
|
|
|
unset($output);
|
|
unset($output);
|
|
@@ -367,7 +369,7 @@ if (!empty($_POST['save'])) {
|
|
|
// Add Lets Encrypt support
|
|
// Add Lets Encrypt support
|
|
|
if ((!empty($_POST['v_ssl'])) && ( $v_letsencrypt == 'no' ) && (!empty($_POST['v_letsencrypt'])) && empty($_SESSION['error_msg'])) {
|
|
if ((!empty($_POST['v_ssl'])) && ( $v_letsencrypt == 'no' ) && (!empty($_POST['v_letsencrypt'])) && empty($_SESSION['error_msg'])) {
|
|
|
$l_aliases = str_replace("\n", ',', $v_aliases);
|
|
$l_aliases = str_replace("\n", ',', $v_aliases);
|
|
|
- exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '".$l_aliases."' 'no'", $output, $return_var);
|
|
|
|
|
|
|
+ exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '".escapeshellarg($l_aliases)."' 'no'", $output, $return_var);
|
|
|
check_return_code($return_var,$output);
|
|
check_return_code($return_var,$output);
|
|
|
unset($output);
|
|
unset($output);
|
|
|
$v_letsencrypt = 'yes';
|
|
$v_letsencrypt = 'yes';
|