Merge pull request #2078 from mix5003/fix-v-ssl

Fix Edit Web page error

bin/v-change-web-domain-proxy-tpl

@@ -42,7 +42,7 @@ is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
 is_object_unsuspended 'web' 'DOMAIN' "$domain"
-is_object_value_exist 'web' 'DOMAIN' "$domain" '$PROXY'
+is_object_value_exist 'web' 'DOMAIN' "$domain" 'PROXY'
 is_proxy_template_valid $template
 
 

src/react/src/components/WebDomain/Edit/EditWeb.jsx

@@ -158,7 +158,7 @@ const EditWeb = props => {
               id="proxy-aliases"
               name="v_aliases"
               title={i18n['Aliases']}
-              value={state.data.aliases} />
+              defaultValue={state.data.aliases} />
 
             <SelectInput
               options={state.data.templates}
@@ -202,7 +202,7 @@ const EditWeb = props => {
 
             <Checkbox
               onChange={onChangeSslSupport}
-              name="v_shared"
+              name="v_ssl"
               id="ssl-support"
               title={i18n['SSL Support'] ?? 'SSL Support'}
               defaultChecked={state.sslSupport} />
@@ -219,8 +219,8 @@ const EditWeb = props => {
                   sslPubKey={state.data.ssl_pub_key}
                   sslIssuer={state.data.ssl_issuer}
                   sslCertificate={state.data.ssl_crt}
-                  sslKey={state.data.key}
-                  sslCertificateAuthority={state.data.ca}
+                  sslKey={state.data.ssl_key}
+                  sslCertificateAuthority={state.data.ssl_ca}
                   domain={state.domain}
                   sslHome={state.data.ssl_home}
                   letsEncrypt={state.letsEncrypt}

src/react/src/components/WebDomain/Edit/SslSupport/SslSupport.jsx

@@ -56,8 +56,8 @@ const SslSupport = props => {
         title={i18n['SSL Key']} />
 
       <TextArea
-        id="ssl-key"
-        name="v_ssl_key"
+        id="ssl-ca"
+        name="v_ssl_ca"
         disabled={letsEncrypt}
         defaultValue={props.sslCertificateAuthority}
         title={i18n['SSL Certificate Authority / Intermediate']}

web/api/v1/edit/web/index.php

@@ -260,7 +260,7 @@ if (!empty($_POST['save'])) {
     }
 
     // Add proxy support
-    if ((!empty($_SESSION['PROXY_SYSTEM'])) && (empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
+    if ((!empty($_SESSION['PROXY_SYSTEM'])) && (empty($v_proxy)) && (!empty($_POST['v_proxy_template'])) && (empty($_SESSION['error_msg']))) {
         $v_proxy_template = $_POST['v_proxy_template'];
         if (!empty($_POST['v_proxy_ext'])) {
             $ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']);