Merge pull request #22 from morja/main

IchHabRecht · web-flow · commit c37c8cbf72e0 · 2025-03-10T22:15:39.000+01:00
Allow umap URLs for openstreetmap
diff --git a/Classes/Handler/OpenStreetMapHandler.php b/Classes/Handler/OpenStreetMapHandler.php
@@ -33,7 +33,7 @@ public function __construct(OpenStreetMapService $openStreetMapService = null)
     public function hasMatches(string $content): bool
     {
         preg_match_all(
-            '/<iframe(?:(?: src="(?:(?:https?:)?\/\/)?(?:www\.)?openstreetmap\.org\/export\/embed.html\?bbox=(?<bbox>[^&]+)[^"]*?"| height="(?<height>[^"]+)"| width="(?<width>[^"]+)"|(?!src)[^>])+)>.*?<\/iframe>/i',
+            '/<iframe(?:(?: src="(?:(?:https?:)?\/\/)?(?:(?:www|umap)\.)?openstreetmap\.(?:org|de|fr)\/(?:export\/embed.html\?bbox=(?<bbox>[^&]+)|[a-z]{2}\/map\/)[^"]*?"| height="(?<height>[^"]+)"| width="(?<width>[^"]+)"|(?!src)[^>])+)>.*?<\/iframe>/i',
             $content,
             $this->matches,
             PREG_SET_ORDER

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct(OpenStreetMapService $openStreetMapService = null)`
`33`	`33`	`public function hasMatches(string $content): bool`
`34`	`34`	`{`
`35`	`35`	`preg_match_all(`
`36`		`- '/<iframe(?:(?: src="(?:(?:https?:)?\/\/)?(?:www\.)?openstreetmap\.org\/export\/embed.html\?bbox=(?<bbox>[^&]+)[^"]?"\| height="(?<height>[^"]+)"\| width="(?<width>[^"]+)"\|(?!src)[^>])+)>.?<\/iframe>/i',`
	`36`	`+ '/<iframe(?:(?: src="(?:(?:https?:)?\/\/)?(?:(?:www\|umap)\.)?openstreetmap\.(?:org\|de\|fr)\/(?:export\/embed.html\?bbox=(?<bbox>[^&]+)\|[a-z]{2}\/map\/)[^"]?"\| height="(?<height>[^"]+)"\| width="(?<width>[^"]+)"\|(?!src)[^>])+)>.?<\/iframe>/i',`
`37`	`37`	`$content,`
`38`	`38`	`$this->matches,`
`39`	`39`	`PREG_SET_ORDER`