From: Vincent Vanwaelscappel Date: Mon, 16 Mar 2026 11:38:24 +0000 (+0100) Subject: wait #8061 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=821af3373cd8f9e03ceb8162affcd1f8deb9d600;p=fluidbook-toolbox.git wait #8061 @1.5 --- diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php index 0f54f45b3..8563d1e72 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php @@ -294,15 +294,16 @@ trait LinksOperation $vPadding = 2; $hPadding = 2; $tooltip = ''; - $ignoreSeparators = ''; + switch ($rules) { case 'cart': $type = \Fluidbook\Tools\Links\Link::CART; $target = ''; + break; case 'steelite': $toSuffix = '?embed'; $target = '_popupiframe'; - $ignoreSeparators = '-'; + break; case 'web': default: break; @@ -312,6 +313,18 @@ trait LinksOperation $excel = ExcelToArray::excelToArrayKeyVal($uploadedFile->getPathname()); /** @var FluidbookPublication $fluidbook */ $fluidbook = FluidbookPublication::withoutGlobalScopes()->find($fluidbook_id); + + + uksort($excel, function ($a, $b) { + return mb_strlen($b) - mb_strlen($a); + }); + $ignoreSeparators = []; + foreach ($excel as $search => $url) { + if (preg_match_all('/[^0-9A-Za-z]/', $search, $matches)) { + $ignoreSeparators += $matches[0]; + } + } + $ignoreSeparators = implode('', array_unique($ignoreSeparators)); $highlights = $fluidbook->getHightlightData($ignoreSeparators); foreach ($excel as $search => $url) {