From 57ed9c5c1e5da4165ce39fde36f417ce10e274aa Mon Sep 17 00:00:00 2001 From: Alex Cabal Date: Wed, 10 Jan 2024 14:02:15 -0600 Subject: [PATCH] Parse URL when checking for approved museums --- lib/Artwork.php | 4 ++-- lib/Museum.php | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/Artwork.php b/lib/Artwork.php index dd95c7cc..49fc915c 100644 --- a/lib/Artwork.php +++ b/lib/Artwork.php @@ -462,11 +462,11 @@ class Artwork extends PropertiesBase{ $parsedUrl = parse_url($url); } catch(Exception){ - throw new InvalidUrlException($url); + throw new Exceptions\InvalidUrlException($url); } if(!is_array($parsedUrl)){ - throw new InvalidUrlException($url); + throw new Exceptions\InvalidUrlException($url); } if(stripos($parsedUrl['host'], 'hathitrust.org') !== false){ diff --git a/lib/Museum.php b/lib/Museum.php index ded204a6..6c56f46a 100644 --- a/lib/Museum.php +++ b/lib/Museum.php @@ -9,12 +9,19 @@ class Museum extends PropertiesBase{ throw new Exceptions\MuseumNotFoundException(); } + try{ + $parsedUrl = parse_url($url); + } + catch(Exception){ + throw new Exceptions\InvalidUrlException($url); + } + $result = Db::Query(' SELECT * from Museums where ? like concat("%", Domain, "%") limit 1; - ', [$url], 'Museum'); + ', [$parsedUrl['host']], 'Museum'); if(sizeof($result) == 0){ throw new Exceptions\MuseumNotFoundException();