github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-21 05:44:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix Edit Web page error
This commit is contained in:
Serghey Rodin 2021-10-30 22:49:13 +03:00 • committed by GitHub
commit ed94787cd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-change-web-domain-proxy-tpl
View file

@ -42,7 +42,7 @@ is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain" is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended '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 is_proxy_template_valid $template

8
src/react/src/components/WebDomain/Edit/EditWeb.jsx
View file

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

4
src/react/src/components/WebDomain/Edit/SslSupport/SslSupport.jsx
View file

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

2
web/api/v1/edit/web/index.php
View file

@ -260,7 +260,7 @@ if (!empty($_POST['save'])) {
} }
// Add proxy support // 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']; $v_proxy_template = $_POST['v_proxy_template'];
if (!empty($_POST['v_proxy_ext'])) { if (!empty($_POST['v_proxy_ext'])) {
$ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']); $ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']);