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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
web/add/web/index.php
View file

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

2
web/templates/admin/add_web.html
View file

@ -386,6 +386,6 @@
</div> </div>
<script> <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)?>; GLOBAL.FTP_USER_PREPATH = <?=json_encode($v_ftp_user_prepath)?>;
</script> </script>