From 403dca154c6b539de221f9e16174a0fdd0a1e896 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 5 Feb 2021 23:41:32 +0300
Subject: initial WIP for php8; bump php version requirement to 7.0

---
 include/functions.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 41d6e5853..0ec0ba30b 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -138,7 +138,11 @@
 	function startup_gettext() {
 
 		# Get locale from Accept-Language header
-		$lang = al2gt(array_keys(get_translations()), "text/html");
+		if (version_compare(PHP_VERSION, '8.0.0', '<')) {
+			$lang = al2gt(array_keys(get_translations()), "text/html");
+		} else {
+			$lang = ""; // FIXME: do something with accept-to-gettext.php
+		}
 
 		if (defined('_TRANSLATION_OVERRIDE_DEFAULT')) {
 			$lang = _TRANSLATION_OVERRIDE_DEFAULT;
@@ -222,13 +226,13 @@
 	/* end compat shims */
 
 	function get_ssl_certificate_id() {
-		if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
+		if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] ?? false) {
 			return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
 				$_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
 				$_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
 				$_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
 		}
-		if ($_SERVER["SSL_CLIENT_M_SERIAL"]) {
+		if ($_SERVER["SSL_CLIENT_M_SERIAL"] ?? false) {
 			return sha1($_SERVER["SSL_CLIENT_M_SERIAL"] .
 				$_SERVER["SSL_CLIENT_V_START"] .
 				$_SERVER["SSL_CLIENT_V_END"] .
@@ -240,11 +244,11 @@
 	// this is used for user http parameters unless HTML code is actually needed
 	function clean($param) {
 		if (is_array($param)) {
-			return array_map("strip_tags", $param);
+			return trim(array_map("strip_tags", $param));
 		} else if (is_string($param)) {
-			return strip_tags($param);
+			return trim(strip_tags($param));
 		} else {
-			return $param;
+			return trim($param);
 		}
 	}
 
@@ -407,7 +411,8 @@
 	}
 
 	function is_server_https() {
-		return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
+		return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) ||
+			(!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
 	}
 
 	function is_prefix_https() {
@@ -577,7 +582,7 @@
 		if (is_array($ttrss_version) && isset($ttrss_version['version'])) {
 			$git_commit = $ttrss_version['commit'];
 			$git_timestamp = $ttrss_version['timestamp'];
-			$last_error = $ttrss_version['last_error'];
+			$last_error = $ttrss_version['last_error'] ?? "";
 
 			return $ttrss_version['version'];
 		} else {
-- 
cgit v1.2.3-54-g00ecf