Skip to content

Commit 497ae08

Browse files
author
Kristan Kenney
committed
Hide additional FTP users when FTP_SYSTEM not installed
1 parent 5255b46 commit 497ae08

File tree

1 file changed

+82
-80
lines changed

1 file changed

+82
-80
lines changed

‎web/templates/pages/edit_web.html‎

Lines changed: 82 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -527,88 +527,90 @@
527527
</table>
528528
</td>
529529
</tr>
530-
<tr>
531-
<td class="vst-text input-label">
532-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_additional_ftp_accounts(this)"><?=_('Additional FTP Account');?></label>
533-
</td>
534-
</tr>
535-
<tr>
536-
<td>
537-
<?php foreach ($v_ftp_users as $i => $ftp_user): ?>
538-
<?php
539-
$v_ftp_user = $ftp_user['v_ftp_user'];
540-
$v_ftp_password = $ftp_user['v_ftp_password'];
541-
$v_ftp_path = $ftp_user['v_ftp_path'];
542-
$v_ftp_email = $ftp_user['v_ftp_email'];
543-
$v_ftp_pre_path = $ftp_user['v_ftp_pre_path'];
544-
?>
545-
<table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" class="ftptable ftptable-nrm" name="v_add_domain_ftp">
546-
<tr>
547-
<td class="vst-text input-label">
548-
<?=_('FTP');?> #<span class="ftp-user-number"><?=$i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)"><?=_('delete');?></a>
549-
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[<?=$i ?>][delete]" value="0" />
550-
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[<?=$i ?>][is_new]" value="<?=htmlentities($ftp_user['is_new']) ?>" />
551-
</td>
552-
</tr>
553-
<tr>
554-
<td class="vst-text step-left input-label">
555-
<?=_('Username');?><br>
556-
<span style="font-size: 10pt; color:#777;"><?=sprintf(_('Prefix %s will be added to username automatically'),$user."_");?></span>
557-
</td>
558-
</tr>
559-
<tr>
560-
<td class="step-left">
561-
<input type="text" size="20" class="vst-input v-ftp-user" <?=$ftp_user['is_new'] != 1 ? 'disabled="disabled"' : '' ?>
562-
name="v_ftp_user[<?=$i ?>][v_ftp_user]" value="<?=htmlentities(trim($v_ftp_user, "'"))?>">
563-
<small class="hint"></small>
564-
</td>
565-
</tr>
566-
<tr>
567-
<td class="vst-text step-left input-label">
568-
<?=_('Password');?> / <a href="javascript:void(0);" onClick="FTPrandom(this)" ; class="generate"><?=_('generate');?></a>
569-
</td>
570-
</tr>
571-
<tr>
572-
<td class="step-left">
573-
<input type="text" class="vst-input v-ftp-user-psw password" name="v_ftp_user[<?=$i ?>][v_ftp_password]" value="<?=htmlentities(trim($v_ftp_password, "'"))?>">
574-
</td>
575-
</tr>
530+
<?php if (in_array($_SESSION['FTP_SYSTEM'], array('vsftpd', 'proftpd'))) { ?>
531+
<tr>
532+
<td class="vst-text input-label">
533+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_additional_ftp_accounts(this)"><?=_('Additional FTP Account');?></label>
534+
</td>
535+
</tr>
536+
<tr>
537+
<td>
538+
<?php foreach ($v_ftp_users as $i => $ftp_user): ?>
539+
<?php
540+
$v_ftp_user = $ftp_user['v_ftp_user'];
541+
$v_ftp_password = $ftp_user['v_ftp_password'];
542+
$v_ftp_path = $ftp_user['v_ftp_path'];
543+
$v_ftp_email = $ftp_user['v_ftp_email'];
544+
$v_ftp_pre_path = $ftp_user['v_ftp_pre_path'];
545+
?>
546+
<table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" class="ftptable ftptable-nrm" name="v_add_domain_ftp">
547+
<tr>
548+
<td class="vst-text input-label">
549+
<?=_('FTP');?> #<span class="ftp-user-number"><?=$i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)"><?=_('delete');?></a>
550+
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[<?=$i ?>][delete]" value="0" />
551+
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[<?=$i ?>][is_new]" value="<?=htmlentities($ftp_user['is_new']) ?>" />
552+
</td>
553+
</tr>
554+
<tr>
555+
<td class="vst-text step-left input-label">
556+
<?=_('Username');?><br>
557+
<span style="font-size: 10pt; color:#777;"><?=sprintf(_('Prefix %s will be added to username automatically'),$user."_");?></span>
558+
</td>
559+
</tr>
560+
<tr>
561+
<td class="step-left">
562+
<input type="text" size="20" class="vst-input v-ftp-user" <?=$ftp_user['is_new'] != 1 ? 'disabled="disabled"' : '' ?>
563+
name="v_ftp_user[<?=$i ?>][v_ftp_user]" value="<?=htmlentities(trim($v_ftp_user, "'"))?>">
564+
<small class="hint"></small>
565+
</td>
566+
</tr>
567+
<tr>
568+
<td class="vst-text step-left input-label">
569+
<?=_('Password');?> / <a href="javascript:void(0);" onClick="FTPrandom(this)" ; class="generate"><?=_('generate');?></a>
570+
</td>
571+
</tr>
572+
<tr>
573+
<td class="step-left">
574+
<input type="text" class="vst-input v-ftp-user-psw password" name="v_ftp_user[<?=$i ?>][v_ftp_password]" value="<?=htmlentities(trim($v_ftp_password, "'"))?>">
575+
</td>
576+
</tr>
576577

577-
<tr>
578-
<td class="vst-text step-left input-label">
579-
<?=_('Path');?>
580-
</td>
581-
</tr>
582-
<tr>
583-
<td class="step-left">
584-
<input type="hidden" class="vst-input v-ftp-pre-path" name="v_ftp_pre_path" value="<?=!empty($v_ftp_pre_path) ? htmlentities(trim($v_ftp_pre_path, "'")) : '/'; ?>">
585-
<input type="hidden" class="vst-input v-ftp-path" name="v_ftp_user[<?=$i ?>][v_ftp_path_prev]" value="<?php if (!empty($v_ftp_path)) echo ($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'")) ?>">
586-
<input type="text" class="vst-input v-ftp-path" name="v_ftp_user[<?=$i ?>][v_ftp_path]" value="<?php if (!empty($v_ftp_path)) echo ($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'")); ?>">
587-
<br /><span class="ftp-path-prefix"><?=htmlentities(trim($v_ftp_pre_path, "'"))?></span><span class="ftp-path-value v-ftp-path-hint"></span>
588-
</td>
589-
</tr>
590-
<?php if ($ftp_user['is_new'] == 1): ?>
591-
<tr>
592-
<td class="vst-text step-left input-label">
593-
<?=_('Send FTP credentials to email');?>
594-
</td>
595-
</tr>
596-
<tr>
597-
<td class="step-left">
598-
<input type="text" class="vst-input vst-email-alert-on-psw" name="v_ftp_user[<?=$i ?>][v_ftp_email]" value="<?=htmlentities(trim($v_ftp_email, "'"))?>">
599-
</td>
600-
</tr>
601-
<?php endif; ?>
602-
</table>
603-
<?php endforeach; ?>
604-
</td>
605-
</tr>
578+
<tr>
579+
<td class="vst-text step-left input-label">
580+
<?=_('Path');?>
581+
</td>
582+
</tr>
583+
<tr>
584+
<td class="step-left">
585+
<input type="hidden" class="vst-input v-ftp-pre-path" name="v_ftp_pre_path" value="<?=!empty($v_ftp_pre_path) ? htmlentities(trim($v_ftp_pre_path, "'")) : '/'; ?>">
586+
<input type="hidden" class="vst-input v-ftp-path" name="v_ftp_user[<?=$i ?>][v_ftp_path_prev]" value="<?php if (!empty($v_ftp_path)) echo ($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'")) ?>">
587+
<input type="text" class="vst-input v-ftp-path" name="v_ftp_user[<?=$i ?>][v_ftp_path]" value="<?php if (!empty($v_ftp_path)) echo ($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'")); ?>">
588+
<br /><span class="ftp-path-prefix"><?=htmlentities(trim($v_ftp_pre_path, "'"))?></span><span class="ftp-path-value v-ftp-path-hint"></span>
589+
</td>
590+
</tr>
591+
<?php if ($ftp_user['is_new'] == 1): ?>
592+
<tr>
593+
<td class="vst-text step-left input-label">
594+
<?=_('Send FTP credentials to email');?>
595+
</td>
596+
</tr>
597+
<tr>
598+
<td class="step-left">
599+
<input type="text" class="vst-input vst-email-alert-on-psw" name="v_ftp_user[<?=$i ?>][v_ftp_email]" value="<?=htmlentities(trim($v_ftp_email, "'"))?>">
600+
</td>
601+
</tr>
602+
<?php endif; ?>
603+
</table>
604+
<?php endforeach; ?>
605+
</td>
606+
</tr>
606607

607-
<tr class="add-new-ftp-user-button" style="<?=!empty($v_ftp_user) ? '' : 'display:none;' ?>">
608-
<td class="vst-text step-top v-add-new-user step-bottom">
609-
<a class="additional-control vst-advanced" onClick="App.Actions.WEB.add_ftp_user_form()"><?=_('Add one more FTP Account');?></a>
610-
</td>
611-
</tr>
608+
<tr class="add-new-ftp-user-button" style="<?=!empty($v_ftp_user) ? '' : 'display:none;' ?>">
609+
<td class="vst-text step-top v-add-new-user step-bottom">
610+
<a class="additional-control vst-advanced" onClick="App.Actions.WEB.add_ftp_user_form()"><?=_('Add one more FTP Account');?></a>
611+
</td>
612+
</tr>
613+
<?php } ?>
612614
</table>
613615
</td>
614616
</tr>

0 commit comments

Comments
 (0)