Merge branch 'master' of github.com:serghey-rodin/vesta

This commit is contained in:
Dmitry Naumov-Socolov 2016-10-17 12:01:11 -04:00
commit 1c82483734
2 changed files with 2 additions and 2 deletions

View file

@ -89,7 +89,7 @@ if (!empty($_POST['ok'])) {
if (!empty($v_domain)) $v_ftp_user_prepath .= $v_domain;
// Set advanced option checkmark
if (empty($_POST['v_proxy'])) $v_adv = 'yes';
if (!empty($_POST['v_proxy'])) $v_adv = 'yes';
if (!empty($_POST['v_ftp'])) $v_adv = 'yes';
if ($_POST['v_proxy_ext'] != $v_proxy_ext) $v_adv = 'yes';
if ((!empty($_POST['v_aliases'])) && ($_POST['v_aliases'] != 'www.'.$_POST['v_domain'])) $v_adv = 'yes';

View file

@ -386,6 +386,6 @@
</div>
<script>
GLOBAL.FTP_USER_PREFIX = <?=json_encode($user)?>;
GLOBAL.FTP_USER_PREFIX = <?=json_encode($user.'_')?>;
GLOBAL.FTP_USER_PREPATH = <?=json_encode($v_ftp_user_prepath)?>;
</script>