github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 21:34:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #877 from pcfreak30/feature/800

Browse source 
Letsencrypt Improvements
This commit is contained in:
Serghey Rodin 2016-10-20 16:04:29 +03:00 • committed by GitHub
commit db04a00bca
5 changed files with 49 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

26
web/edit/web/index.php
View file

@ -267,26 +267,26 @@ if (!empty($_POST['save'])) {
// Disable Lets Encrypt support
if (( $v_letsencrypt == 'yes' ) && (empty($_POST['v_letsencrypt'])) && (!empty($_POST['v_letsencrypt'])) && (empty($_SESSION['error_msg']))) {
exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '' 'no'", $output, $return_var);
exec (VESTA_CMD."v-delete-letsencrypt-domain ".$user." ".$v_domain." '' 'no'", $output, $return_var);
check_return_code($return_var,$output);
unset($output);
$v_letsencrypt = 'no';
$restart_web = 'yes';
$restart_proxy = 'yes';
}
else {
// Delete SSL certificate
if (( $v_ssl == 'yes' ) && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var);
$data = json_decode(implode('', $output), true);
exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '".$data['ALIAS']."' 'no'", $output, $return_var);
check_return_code($return_var,$output);
unset($output);
$v_ssl = 'no';
$restart_web = 'yes';
$restart_proxy = 'yes';
}
else{
// Delete SSL certificate
if (( $v_ssl == 'yes' ) && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var);
check_return_code($return_var,$output);
unset($output);
$v_ssl = 'no';
$restart_web = 'yes';
$restart_proxy = 'yes';
}
}
// Enable Lets Encrypt support
if (( $v_letsencrypt == 'no' || empty( $v_letsencrypt)) && (!empty($_POST['v_letsencrypt'])) && empty($_SESSION['error_msg'])) {
exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var);
$data = json_decode(implode('', $output), true);

13
web/js/pages/edit_web.js
View file

@ -135,14 +135,14 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
App.Actions.WEB.toggle_letsencrypt = function(elm) {
if ($(elm).attr('checked')) {
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
//$('input[name=v_ssl]').prop('checked', true);
//$('#ssltable').show();
$('input[name=v_ssl]').prop('checked', true);
$('#ssltable').show();
$('#generate-csr').hide();
}
else {
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled');
//$('input[name=v_ssl]').prop('checked', false);
//$('#ssltable').hide();
$('input[name=v_ssl]').prop('checked', false);
$('#ssltable').hide();
$('#generate-csr').show();
}
}
@ -180,8 +180,9 @@ $(function() {
var elm = $(evt.target);
App.Actions.WEB.passwordChanged(elm);
});
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'));
if ($('input[name=v_letsencrypt]').attr('checked')) {
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'))
}
$('select[name="v_stats"]').change(function(evt){
var select = $(evt.target);

15
web/templates/admin/list_web.html
View file

@ -266,6 +266,21 @@ sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
<? } ?>
</td>
</tr>
<tr>
<td></td>
<td>
<? if(empty($data[$key]['LETSENCRYPT']) || $data[$key]['LETSENCRYPT'] == 'no') { ?>
<div class="l-unit__stat-cols clearfix disabled"><?=__('Lets Encrypt Support')?></div>
<? } else {?>
<div class="l-unit__stat-cols clearfix">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Lets Encrypt Support')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<b><?=__($data[$key]['LETSENCRYPT'])?></b>
</div>
</div>
<? } ?>
</td>
</tr>
<tr>
<td>
<div class="l-unit__stat-cols clearfix graph">