Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
e2e9036c
Commit
e2e9036c
authored
Feb 03, 2017
by
Marius Burkard
Browse files
- fixed letsencrypt inactivated by client accidently if checkbox is hidden
parent
525108a6
Changes
2
Hide whitespace changes
Inline
Side-by-side
interface/lib/classes/tform_actions.inc.php
View file @
e2e9036c
...
...
@@ -110,6 +110,7 @@ class tform_actions {
$app
->
plugin
->
raiseEvent
(
$_SESSION
[
's'
][
'module'
][
'name'
]
.
':'
.
$app
->
tform
->
formDef
[
'name'
]
.
':'
.
'on_before_update'
,
$this
);
$ext_where
=
''
;
// pre-fill dataRecord array with elements from database to avoid overwriting fields set by admin but hidden for client
$tmp_old_record
=
$app
->
tform
->
getDataRecord
(
$this
->
id
);
if
(
$tmp_old_record
&&
is_array
(
$tmp_old_record
))
$this
->
dataRecord
=
array_merge
(
$tmp_old_record
,
$this
->
dataRecord
);
$sql
=
$app
->
tform
->
getSQL
(
$this
->
dataRecord
,
$app
->
tform
->
getCurrentTab
(),
'UPDATE'
,
$this
->
id
,
$ext_where
);
...
...
interface/web/sites/web_vhost_domain_edit.php
View file @
e2e9036c
...
...
@@ -1127,7 +1127,7 @@ class page_action extends tform_actions {
// When the record is updated
if
(
$this
->
id
>
0
)
{
// restore the server ID if the user is not admin and record is edited
$tmp
=
$app
->
db
->
queryOneRecord
(
"SELECT server_id, `system_user`, `system_group`, `web_folder`, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl` FROM web_domain WHERE domain_id = ?"
,
$this
->
id
);
$tmp
=
$app
->
db
->
queryOneRecord
(
"SELECT server_id, `system_user`, `system_group`, `web_folder`, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl`
, `ssl_letsencrypt`, `directive_snippets_id`
FROM web_domain WHERE domain_id = ?"
,
$this
->
id
);
$this
->
dataRecord
[
"server_id"
]
=
$tmp
[
"server_id"
];
if
(
$this
->
_vhostdomain_type
!=
'domain'
)
$this
->
dataRecord
[
'web_folder'
]
=
$tmp
[
'web_folder'
];
// cannot be changed!
$this
->
dataRecord
[
'system_user'
]
=
$tmp
[
'system_user'
];
...
...
@@ -1143,7 +1143,9 @@ class page_action extends tform_actions {
if
(
$this
->
dataRecord
[
'errordocs'
]
==
'n'
)
$this
->
dataRecord
[
'errordocs'
]
=
$tmp
[
'errordocs'
];
if
(
$this
->
dataRecord
[
'subdomain'
]
==
'n'
)
$this
->
dataRecord
[
'subdomain'
]
=
$tmp
[
'subdomain'
];
if
(
$this
->
dataRecord
[
'ssl'
]
==
'n'
)
$this
->
dataRecord
[
'ssl'
]
=
$tmp
[
'ssl'
];
if
(
$this
->
dataRecord
[
'ssl_letsencrypt'
]
==
'n'
)
$this
->
dataRecord
[
'ssl_letsencrypt'
]
=
$tmp
[
'ssl_letsencrypt'
];
if
(
$this
->
dataRecord
[
'directive_snippets_id'
]
==
0
)
$this
->
dataRecord
[
'directive_snippets_id'
]
=
$tmp
[
'directive_snippets_id'
];
unset
(
$tmp
);
// When the record is inserted
}
else
{
...
...
Till Brehm
@tbrehm
Mentioned in issue
#4513 (closed)
·
Feb 10, 2017
Mentioned in issue
#4513 (closed)
Mentioned in issue #4513
Toggle commit list
Marius Burkard
@pixcept
Mentioned in commit
0f9fa27a
·
Feb 10, 2017
Mentioned in commit
0f9fa27a
Mentioned in commit 0f9fa27a6c7026f77c7d857c971b1db1b709f583
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment