Skip to content

Commit 705e325

Browse files
jaapmarcusjaapmarcus
committed
hestiacp#850 Add port field to Configure Server
+ Add ann aditional port field when (s)ftp is runninng on non default port + Fix bug when submitting form with a error it currently it won't show the selected tag when sftp selected
1 parent fe5bf53 commit 705e325

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

‎web/edit/server/index.php‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -388,18 +388,20 @@
388388
if (empty($_SESSION['error_msg'])) {
389389
if ((!empty($_POST['v_backup_host'])) && (empty($v_backup_host))) {
390390
$v_backup_host = escapeshellarg($_POST['v_backup_host']);
391+
$v_backup_port = escapeshellarg($_POST['v_backup_port']);
391392
$v_backup_type = escapeshellarg($_POST['v_backup_type']);
392393
$v_backup_username = escapeshellarg($_POST['v_backup_username']);
393394
$v_backup_password = escapeshellcmd($_POST['v_backup_password']);
394395
$v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']);
395-
exec (HESTIA_CMD."v-add-backup-host ". $v_backup_type ." ". $v_backup_host ." ". $v_backup_username ." '". $v_backup_password ."' ". $v_backup_bpath, $output, $return_var);
396+
exec (HESTIA_CMD."v-add-backup-host ". $v_backup_type ." ". $v_backup_host ." ". $v_backup_username ." '". $v_backup_password ."' ". $v_backup_bpath." ".$v_backup_port, $output, $return_var);
396397
check_return_code($return_var,$output);
397398
unset($output);
398399
if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host'];
399400
if (empty($_SESSION['error_msg'])) $v_backup_type = $_POST['v_backup_type'];
400401
if (empty($_SESSION['error_msg'])) $v_backup_username = $_POST['v_backup_username'];
401402
if (empty($_SESSION['error_msg'])) $v_backup_password = $_POST['v_backup_password'];
402403
if (empty($_SESSION['error_msg'])) $v_backup_bpath = $_POST['v_backup_bpath'];
404+
if (empty($_SESSION['error_msg'])) $v_backup_port = $_POST['v_backup_port'];
403405
$v_backup_new = 'yes';
404406
$v_backup_adv = 'yes';
405407
$v_backup_remote_adv = 'yes';
@@ -411,20 +413,21 @@
411413
if ((!empty($_POST['v_backup_host'])) && ($_POST['v_backup_type'] != $v_backup_type)) {
412414
exec (HESTIA_CMD."v-delete-backup-host '". $v_backup_type ."'", $output, $return_var);
413415
unset($output);
414-
415416
$v_backup_host = escapeshellarg($_POST['v_backup_host']);
417+
$v_backup_port = escapeshellarg($_POST['v_backup_port']);
416418
$v_backup_type = escapeshellarg($_POST['v_backup_type']);
417419
$v_backup_username = escapeshellarg($_POST['v_backup_username']);
418420
$v_backup_password = escapeshellcmd($_POST['v_backup_password']);
419421
$v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']);
420-
exec (HESTIA_CMD."v-add-backup-host ". $v_backup_type ." ". $v_backup_host ." ". $v_backup_username ." '". $v_backup_password ."' ". $v_backup_bpath, $output, $return_var);
422+
exec (HESTIA_CMD."v-add-backup-host ". $v_backup_type ." ". $v_backup_host ." ". $v_backup_username ." '". $v_backup_password ."' ". $v_backup_bpath." ".$v_backup_port, $output, $return_var);
421423
check_return_code($return_var,$output);
422424
unset($output);
423425
if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host'];
424426
if (empty($_SESSION['error_msg'])) $v_backup_type = $_POST['v_backup_type'];
425427
if (empty($_SESSION['error_msg'])) $v_backup_username = $_POST['v_backup_username'];
426428
if (empty($_SESSION['error_msg'])) $v_backup_password = $_POST['v_backup_password'];
427429
if (empty($_SESSION['error_msg'])) $v_backup_bpath = $_POST['v_backup_bpath'];
430+
if (empty($_SESSION['error_msg'])) $v_backup_port = $_POST['v_backup_port'];
428431
$v_backup_adv = 'yes';
429432
$v_backup_remote_adv = 'yes';
430433
}
@@ -433,20 +436,22 @@
433436
// Change remote backup host
434437
if (empty($_SESSION['error_msg'])) {
435438
if ((!empty($_POST['v_backup_host'])) && ($_POST['v_backup_type'] == $v_backup_type) && (!isset($v_backup_new))) {
436-
if (($_POST['v_backup_host'] != $v_backup_host) || ($_POST['v_backup_username'] != $v_backup_username) || ($_POST['v_backup_password'] != $v_backup_password) || ($_POST['v_backup_bpath'] != $v_backup_bpath)){
439+
if (($_POST['v_backup_host'] != $v_backup_host) || ($_POST['v_backup_username'] != $v_backup_username) || ($_POST['v_backup_password'] != $v_backup_password) || ($_POST['v_backup_bpath'] != $v_backup_bpath || $_POST['v_backup_port'] == $v_backup_port)){
437440
$v_backup_host = escapeshellarg($_POST['v_backup_host']);
441+
$v_backup_port = escapeshellarg($_POST['v_backup_port']);
438442
$v_backup_type = escapeshellarg($_POST['v_backup_type']);
439443
$v_backup_username = escapeshellarg($_POST['v_backup_username']);
440444
$v_backup_password = escapeshellcmd($_POST['v_backup_password']);
441445
$v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']);
442-
exec (HESTIA_CMD."v-add-backup-host ". $v_backup_type ." ". $v_backup_host ." ". $v_backup_username ." '". $v_backup_password ."' ". $v_backup_bpath, $output, $return_var);
446+
exec (HESTIA_CMD."v-add-backup-host ". $v_backup_type ." ". $v_backup_host ." ". $v_backup_username ." '". $v_backup_password ."' ". $v_backup_bpath." ".$v_backup_port, $output, $return_var);
443447
check_return_code($return_var,$output);
444448
unset($output);
445449
if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host'];
446450
if (empty($_SESSION['error_msg'])) $v_backup_type = $_POST['v_backup_type'];
447451
if (empty($_SESSION['error_msg'])) $v_backup_username = $_POST['v_backup_username'];
448452
if (empty($_SESSION['error_msg'])) $v_backup_password = $_POST['v_backup_password'];
449453
if (empty($_SESSION['error_msg'])) $v_backup_bpath = $_POST['v_backup_bpath'];
454+
if (empty($_SESSION['error_msg'])) $v_backup_port = $_POST['v_backup_port'];
450455
$v_backup_adv = 'yes';
451456
$v_backup_remote_adv = 'yes';
452457
}

‎web/templates/admin/edit_server.html‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@
643643
<td>
644644
<select class="vst-list" name="v_backup_type">
645645
<option value='ftp'><?php print __('ftp'); ?></option>
646-
<option value='sftp' <?php if((!empty($v_backup_type)) && ($v_backup_type == 'sftp')) echo 'selected' ?> ><?php print __('sftp'); ?></option>
646+
<option value='sftp' <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'") == 'sftp' )) echo 'selected="selected"'; ?>><?php print __('sftp'); ?></option>
647647
</select>
648648
<br><br>
649649
</td>
@@ -659,6 +659,17 @@
659659
<br><br>
660660
</td>
661661
</tr>
662+
<tr>
663+
<td class="vst-text">
664+
<?php print __('Port') ?>
665+
</td>
666+
</tr>
667+
<tr>
668+
<td>
669+
<input type="text" size="20" class="vst-input" name="v_backup_port" value="<?=trim($v_backup_port, "'")?>">
670+
<br><br>
671+
</td>
672+
</tr>
662673
<tr>
663674
<td class="vst-text">
664675
<?php print __('Username') ?>

0 commit comments

Comments
 (0)