From 47646e70f0dbd421d9e35e75ae13b9640d0b7b71 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 1 Apr 2025 16:22:32 +0200 Subject: [PATCH] #7414 @0.25 --- app/Http/Controllers/Admin/TeamPayController.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/TeamPayController.php b/app/Http/Controllers/Admin/TeamPayController.php index 5363f3db9..63b8b1ee4 100644 --- a/app/Http/Controllers/Admin/TeamPayController.php +++ b/app/Http/Controllers/Admin/TeamPayController.php @@ -55,10 +55,18 @@ class TeamPayController extends Controller foreach ($iterator as $item) { /** @var $item \SplFileInfo */ $n = $item->getFilename(); - if (mb_strtolower($item->getExtension()) === 'pdf' && ($id === 'all' || str_starts_with($n, $id))) { - $year = substr($n, 4, 4); - $month = substr($n, 8, 2); - $oxygene = substr($n, 0, 3); + + if (preg_match('/([A-Z]{3})\s([0-9]{4})([0-9IR]{2}).pdf/i', $n, $m)) { + $oxygene = $m[1]; + $year = $m[2]; + $month = $m[3]; + } else if (preg_match('/([0-9]{4})([0-9IR]{2})\s([A-Z]{3}).pdf/i', $n, $m)) { + $oxygene = $m[3]; + $year = $m[1]; + $month = $m[2]; + } + + if (mb_strtolower($item->getExtension()) === 'pdf' && ($id === 'all' || $oxygene == $id)) { $res[$year . $month . $oxygene] = ['name' => $names[$oxygene] ?? $oxygene, 'oxygene' => $oxygene, 'path' => $item->getPathname(), 'updated' => $item->getMTime(), 'year' => $year, 'month' => $month]; } } -- 2.39.5