From b9c05b3d672afe4e69fdf5afe357a0797b449537 Mon Sep 17 00:00:00 2001
From: Mark Metcalfe <mark@markmetcalfe.com>
Date: Mon, 25 Nov 2024 17:20:23 +1300
Subject: [PATCH] Fix config.php array error

---
 config.php | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/config.php b/config.php
index 853f1b3..8a662e3 100644
--- a/config.php
+++ b/config.php
@@ -135,30 +135,16 @@
  * You shouldn't need to change this section - but if you find this needs modification to get it working,
  * then please contribute what you did back to the docker-dev repository :)
  */
-// Ngrok uses a few different URLs, add if a new one is used
-$ngrok_urls = array('ngrok-free.app', 'ngrok.app');
-
-// Depending on the Ngrok version its hostname is stored in different server vars
-$ngrok_server_vars = array(
-    $_SERVER['HTTP_X_FORWARDED_HOST'] ?: '',
-    $_SERVER['HTTP_X_ORIGINAL_HOST'] ?: '',
-);
-
-$ngrok_hostname = '';
-foreach ($ngrok_server_vars as $server_var) {
-    if (!empty($server_var) && empty($ngrok_hostname)) {
-        foreach ($ngrok_urls as $ngrok_url) {
-            if (strpos($server_var, $ngrok_url) !== false) {
-                $ngrok_hostname = $server_var;
-                break;
-            }
-        }
-    }
-}
+// Matches URL with ngrok.app or ngrok-free.app
+$ngrok_hostname_regex = '/\b(?:ngrok-free\.app|ngrok\.app)\b/';
 
-// Turns out request came via Ngrok
-if (!empty($ngrok_hostname)) {
-    $_SERVER['HTTP_HOST'] = $ngrok_hostname;
+if (!empty($_SERVER['HTTP_X_FORWARDED_HOST']) && preg_match($ngrok_hostname_regex, $_SERVER['HTTP_X_FORWARDED_HOST'])) {
+    // Request came via ngrok
+    $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
+    $CFG->wwwroot = 'https://' . $_SERVER['HTTP_HOST'];
+} else if (!empty($_SERVER['HTTP_X_ORIGINAL_HOST']) && preg_match($ngrok_hostname_regex, $_SERVER['HTTP_X_ORIGINAL_HOST'])) {
+    // Request came via ngrok
+    $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_X_ORIGINAL_HOST'];
     $CFG->wwwroot = 'https://' . $_SERVER['HTTP_HOST'];
 } else if (!empty($_SERVER['HTTP_HOST']) && !empty($_SERVER['REQUEST_SCHEME'])) {
     // accessing it locally via the web