Merge branch 'main' into beta/1.6.0

Author: jaapmarcus

func/main.sh

@@ -1376,7 +1376,7 @@ format_aliases() {
 }
 
 is_restart_format_valid() {
-  if [ "$1" != 'yes' ] && [ "$1" != 'no' ] && [ "$1" != 'ssl' ] && [ "$1" != 'reload' ];  then
+  if [ "$1" != 'yes' ] && [ "$1" != 'no' ] && [ "$1" != 'ssl' ] && [ "$1" != 'reload' ]  && [ "$1" != 'updatessl' ];  then
   check_result "$E_INVALID" "invalid $2 format :: $1"
   fi
 }

web/add/dns/index.php

@@ -169,7 +169,7 @@
     $v_ttl = escapeshellarg($_POST['v_ttl']);
     // Add dns record
     if (empty($_SESSION['error_msg'])) {
-        exec(HESTIA_CMD."v-add-dns-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority." '' false ".$v_ttl, $output, $return_var);
+        exec(HESTIA_CMD."v-add-dns-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority." '' no ".$v_ttl, $output, $return_var);
         check_return_code($return_var, $output);
         unset($output);
     }

web/edit/dns/index.php

@@ -162,7 +162,7 @@
         $v_val = escapeshellarg($_POST['v_val']);
         $v_priority = escapeshellarg($_POST['v_priority']);
         $v_ttl = escapeshellarg($_POST['v_ttl']);
-        exec(HESTIA_CMD."v-change-dns-record ".$user." ".$v_domain." ".$v_record_id." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority." false ".$v_ttl, $output, $return_var);
+        exec(HESTIA_CMD."v-change-dns-record ".$user." ".$v_domain." ".$v_record_id." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority." no ".$v_ttl, $output, $return_var);
         check_return_code($return_var, $output);
         $v_rec = $_POST['v_rec'];
         $v_type = $_POST['v_type'];