Skip to content

Commit 8b71ef1

Browse files
authored
Fix multiple bugs (hestiacp#4038)
* Add .webmanifest to proxy list hestiacp#4024 * Fix hestiacp#4019 Unable to edit ftp password * Fix: hestiacp#3999 Hide Purge nginx cache on Apache2 only servers * Add correct tabbing
1 parent c227925 commit 8b71ef1

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

bin/v-add-web-domain

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ if [ -n "$PROXY_SYSTEM" ]; then
204204
PROXY_EXT="$PROXY_EXT,7z,bz2,gz,rar,tar,tgz,zip"
205205
# Binaries
206206
PROXY_EXT="$PROXY_EXT,apk,appx,bin,dmg,exe,img,iso,jar,msi"
207+
# Other
208+
PROXY_EXT="$PROXY_EXT,webmanifest"
209+
207210
fi
208211
if [ -z "$PROXY_TEMPLATE" ]; then
209212
PROXY_TEMPLATE='default'

web/edit/web/index.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,6 +1364,26 @@
13641364
unset($output);
13651365
}
13661366
// Change FTP account password
1367+
if (!empty($v_ftp_user_data["v_ftp_password"])) {
1368+
$v_ftp_password = tempnam("/tmp", "vst");
1369+
$fp = fopen($v_ftp_password, "w");
1370+
fwrite($fp, $v_ftp_user_data["v_ftp_password"] . "\n");
1371+
fclose($fp);
1372+
exec(
1373+
HESTIA_CMD .
1374+
"v-change-web-domain-ftp-password " .
1375+
$user .
1376+
" " .
1377+
quoteshellarg($v_domain) .
1378+
" " .
1379+
$v_ftp_username .
1380+
" " .
1381+
$v_ftp_password,
1382+
$output,
1383+
$return_var,
1384+
);
1385+
unlink($v_ftp_password);
1386+
}
13671387
if (!empty($v_ftp_user_data["v_ftp_email"]) && empty($_SESSION["error_msg"])) {
13681388
$to = $v_ftp_user_data["v_ftp_email"];
13691389
$template = get_email_template("ftp_credentials", $_SESSION["language"]);

web/templates/pages/list_web.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
<?php } ?>
4545
<option value="suspend"><?= _("Suspend") ?></option>
4646
<option value="unsuspend"><?= _("Unsuspend") ?></option>
47-
<option value="purge"><?= _('Purge Nginx Cache');?></option>
47+
<?php if ($_SESSION['PROXY_SYSTEM'] == 'nginx') || $_SESSION['WEB_SYSTEM'] == 'nginx')){?>}
48+
<option value="purge"><?= _('Purge Nginx Cache');?></option>
49+
<? } ?>
4850
<option value="delete"><?= _("Delete") ?></option>
4951
</select>
5052
<button type="submit" class="toolbar-input-submit" title="<?= _("Apply to selected") ?>">

0 commit comments

Comments
 (0)