Better https detection (patched from develop)

slawkens · slawkens · commit d73aceb272d0 · 2024-07-23T16:39:24.000+02:00
diff --git a/common.php b/common.php
@@ -115,7 +115,7 @@
 		}
 	}
 
-	define('SERVER_URL', 'http' . (isset($_SERVER['HTTPS'][0]) && strtolower($_SERVER['HTTPS']) === 'on' ? 's' : '') . '://' . $baseHost);
+	define('SERVER_URL', 'http' . (isHttps() ? 's' : '') . '://' . $baseHost);
 	define('BASE_URL', SERVER_URL . BASE_DIR . '/');
 	define('ADMIN_URL', SERVER_URL . BASE_DIR . '/admin/');
 
@@ -125,3 +125,11 @@
 	}
 }
 require SYSTEM . 'autoload.php';
+
+function isHttps(): bool
+{
+	return
+		(!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https')
+		|| (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')
+		|| (isset($_SERVER['SERVER_PORT']) && (int) $_SERVER['SERVER_PORT'] === 443);
+}

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`- define('SERVER_URL', 'http' . (isset($_SERVER['HTTPS'][0]) && strtolower($_SERVER['HTTPS']) === 'on' ? 's' : '') . '://' . $baseHost);`
	`118`	`+ define('SERVER_URL', 'http' . (isHttps() ? 's' : '') . '://' . $baseHost);`
`119`	`119`	`define('BASE_URL', SERVER_URL . BASE_DIR . '/');`
`120`	`120`	`define('ADMIN_URL', SERVER_URL . BASE_DIR . '/admin/');`
`121`	`121`
`@@ -125,3 +125,11 @@`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`	`require SYSTEM . 'autoload.php';`
	`128`	`+`
	`129`	`+function isHttps(): bool`
	`130`	`+{`
	`131`	`+ return`
	`132`	`+ (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https')`
	`133`	`+ \|\| (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')`
	`134`	`+ \|\| (isset($_SERVER['SERVER_PORT']) && (int) $_SERVER['SERVER_PORT'] === 443);`
	`135`	`+}`