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

Fix SSL not found + php error on login page. (#3404)

* Add missing "SSL_HSTS" to syshealth

* Fix php warning user_plain not set
Jaap Marcus 3 лет назад
Родитель
Сommit
7e020c712b
2 измененных файлов с 4 добавлено и 1 удалено
  1. 1 1
      func/syshealth.sh
  2. 3 0
      web/inc/main.php

+ 1 - 1
func/syshealth.sh

@@ -52,7 +52,7 @@ function syshealth_update_web_config_format() {
 	# WEB DOMAINS
 	# Create array of known keys in configuration file
 	system="web"
-	known_keys="DOMAIN IP IP6 CUSTOM_DOCROOT CUSTOM_PHPROOT FASTCGI_CACHE FASTCGI_DURATION ALIAS TPL SSL SSL_FORCE SSL_HOME LETSENCRYPT FTP_USER FTP_MD5 FTP_PATH BACKEND PROXY PROXY_EXT STATS STATS_USER STATS_CRYPT REDIRECT REDIRECT_CODE AUTH_USER AUTH_HASH SUSPENDED TIME DATE"
+	known_keys="DOMAIN IP IP6 CUSTOM_DOCROOT CUSTOM_PHPROOT FASTCGI_CACHE FASTCGI_DURATION ALIAS TPL SSL SSL_FORCE SSL_HSTS SSL_HOME LETSENCRYPT FTP_USER FTP_MD5 FTP_PATH BACKEND PROXY PROXY_EXT STATS STATS_USER STATS_CRYPT REDIRECT REDIRECT_CODE AUTH_USER AUTH_HASH SUSPENDED TIME DATE"
 	write_kv_config_file
 	unset system
 	unset known_keys

+ 3 - 0
web/inc/main.php

@@ -145,6 +145,9 @@ if (isset($_SESSION["look"]) && $_SESSION["look"] != "" && $_SESSION["userContex
 	$user = quoteshellarg($_SESSION["look"]);
 	$user_plain = htmlentities($_SESSION["look"]);
 }
+if (empty($user_plain)) {
+	$user_plain = "";
+}
 
 require_once dirname(__FILE__) . "/i18n.php";