diff --git a/index.php b/index.php index 0c4d94f..70b80cb 100644 --- a/index.php +++ b/index.php @@ -119,6 +119,9 @@ try { } else { $whitelist_selection = Bridge::listBridges(); } + + // Prepare for case-insensitive match + $whitelist_selection = array_map('strtolower', $whitelist_selection); } $action = filter_input(INPUT_GET, 'action'); @@ -140,7 +143,7 @@ try { } // whitelist control - if(!Bridge::isWhitelisted($whitelist_selection, $bridge)) { + if(!Bridge::isWhitelisted($whitelist_selection, strtolower($bridge))) { throw new \HttpException('This bridge is not whitelisted', 401); die; } @@ -246,7 +249,7 @@ EOD; $inactiveBridges = ''; $bridgeList = Bridge::listBridges(); foreach($bridgeList as $bridgeName) { - if(Bridge::isWhitelisted($whitelist_selection, $bridgeName)) { + if(Bridge::isWhitelisted($whitelist_selection, strtolower($bridgeName))) { echo displayBridgeCard($bridgeName, $formats); $activeFoundBridgeCount++; } elseif($showInactive) { diff --git a/lib/Bridge.php b/lib/Bridge.php index d0a127e..42a8b64 100644 --- a/lib/Bridge.php +++ b/lib/Bridge.php @@ -94,8 +94,8 @@ EOD; static public function isWhitelisted($whitelist, $name){ if(in_array($name, $whitelist) || in_array($name . '.php', $whitelist) - || in_array($name . 'Bridge', $whitelist) // DEPRECATED - || in_array($name . 'Bridge.php', $whitelist) // DEPRECATED + || in_array($name . 'bridge', $whitelist) // DEPRECATED + || in_array($name . 'bridge.php', $whitelist) // DEPRECATED || (count($whitelist) === 1 && trim($whitelist[0]) === '*')) { return true; } else {