Просмотр исходного кода

Fix multiple bugs (#4038)

* Add .webmanifest to proxy list #4024

* Fix #4019 Unable to edit ftp password

* Fix: #3999 Hide Purge nginx cache on Apache2 only servers

* Add correct tabbing
Jaap Marcus 2 лет назад
Родитель
Сommit
8b71ef14c4
3 измененных файлов с 26 добавлено и 1 удалено
  1. 3 0
      bin/v-add-web-domain
  2. 20 0
      web/edit/web/index.php
  3. 3 1
      web/templates/pages/list_web.php

+ 3 - 0
bin/v-add-web-domain

@@ -204,6 +204,9 @@ if [ -n "$PROXY_SYSTEM" ]; then
 		PROXY_EXT="$PROXY_EXT,7z,bz2,gz,rar,tar,tgz,zip"
 		PROXY_EXT="$PROXY_EXT,7z,bz2,gz,rar,tar,tgz,zip"
 		# Binaries
 		# Binaries
 		PROXY_EXT="$PROXY_EXT,apk,appx,bin,dmg,exe,img,iso,jar,msi"
 		PROXY_EXT="$PROXY_EXT,apk,appx,bin,dmg,exe,img,iso,jar,msi"
+		# Other
+		PROXY_EXT="$PROXY_EXT,webmanifest"
+
 	fi
 	fi
 	if [ -z "$PROXY_TEMPLATE" ]; then
 	if [ -z "$PROXY_TEMPLATE" ]; then
 		PROXY_TEMPLATE='default'
 		PROXY_TEMPLATE='default'

+ 20 - 0
web/edit/web/index.php

@@ -1364,6 +1364,26 @@ if (!empty($_POST["save"])) {
 					unset($output);
 					unset($output);
 				}
 				}
 				// Change FTP account password
 				// Change FTP account password
+				if (!empty($v_ftp_user_data["v_ftp_password"])) {
+					$v_ftp_password = tempnam("/tmp", "vst");
+					$fp = fopen($v_ftp_password, "w");
+					fwrite($fp, $v_ftp_user_data["v_ftp_password"] . "\n");
+					fclose($fp);
+					exec(
+						HESTIA_CMD .
+							"v-change-web-domain-ftp-password " .
+							$user .
+							" " .
+							quoteshellarg($v_domain) .
+							" " .
+							$v_ftp_username .
+							" " .
+							$v_ftp_password,
+						$output,
+						$return_var,
+					);
+					unlink($v_ftp_password);
+				}
 				if (!empty($v_ftp_user_data["v_ftp_email"]) && empty($_SESSION["error_msg"])) {
 				if (!empty($v_ftp_user_data["v_ftp_email"]) && empty($_SESSION["error_msg"])) {
 					$to = $v_ftp_user_data["v_ftp_email"];
 					$to = $v_ftp_user_data["v_ftp_email"];
 					$template = get_email_template("ftp_credentials", $_SESSION["language"]);
 					$template = get_email_template("ftp_credentials", $_SESSION["language"]);

+ 3 - 1
web/templates/pages/list_web.php

@@ -44,7 +44,9 @@
 							<?php } ?>
 							<?php } ?>
 							<option value="suspend"><?= _("Suspend") ?></option>
 							<option value="suspend"><?= _("Suspend") ?></option>
 							<option value="unsuspend"><?= _("Unsuspend") ?></option>
 							<option value="unsuspend"><?= _("Unsuspend") ?></option>
-							<option value="purge"><?= _('Purge Nginx Cache');?></option>
+							<?php if ($_SESSION['PROXY_SYSTEM'] == 'nginx') || $_SESSION['WEB_SYSTEM'] == 'nginx')){?>}
+								<option value="purge"><?= _('Purge Nginx Cache');?></option>
+							<? } ?>
 							<option value="delete"><?= _("Delete") ?></option>
 							<option value="delete"><?= _("Delete") ?></option>
 						</select>
 						</select>
 						<button type="submit" class="toolbar-input-submit" title="<?= _("Apply to selected") ?>">
 						<button type="submit" class="toolbar-input-submit" title="<?= _("Apply to selected") ?>">