Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 19:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normalize watermark cache identity across Piwigo URL styles

Browse Source
This commit is contained in:
Terranom674
2026-08-15 16:53:05 +02:00
parent d1cba89db0
commit 23ff01ec83
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/watermark_runtime.inc.php
View File

@@ -137,6 +137,22 @@ function bratonien_tools_runtime_profile_version(array $profile)
return substr(sha1(implode('|', $parts)), 0, 16); return substr(sha1(implode('|', $parts)), 0, 16);
} }
function bratonien_tools_runtime_canonical_derivative_url($rel_url)
{
$rel_url = (string)$rel_url;
if (strpos($rel_url, PWG_DERIVATIVE_DIR) === 0)
{
return $rel_url;
}
if (preg_match('#^i(?:\.php)?\?/(.+)$#', $rel_url, $match) || preg_match('#^i(?:\.php)?/(.+)$#', $rel_url, $match))
{
return PWG_DERIVATIVE_DIR.ltrim(rawurldecode($match[1]), '/');
}
return $rel_url;
}
function bratonien_tools_runtime_cache_descriptor($rel_url, array $profile, $params, $source_path, $extension='') function bratonien_tools_runtime_cache_descriptor($rel_url, array $profile, $params, $source_path, $extension='')
{ {
if (!$params || !$source_path) if (!$params || !$source_path)
@@ -150,8 +166,9 @@ function bratonien_tools_runtime_cache_descriptor($rel_url, array $profile, $par
return null; return null;
} }
$canonical_rel_url = bratonien_tools_runtime_canonical_derivative_url($rel_url);
$extension = strtolower((string)$extension); $extension = strtolower((string)$extension);
if ($extension === '' && preg_match('/\.(jpe?g|png|gif|webp)(?:$|\?)/i', (string)$rel_url, $match)) if ($extension === '' && preg_match('/\.(jpe?g|png|gif|webp)(?:$|\?)/i', $canonical_rel_url, $match))
{ {
$extension = strtolower($match[1]); $extension = strtolower($match[1]);
} }
@@ -170,7 +187,7 @@ function bratonien_tools_runtime_cache_descriptor($rel_url, array $profile, $par
$profile_version = bratonien_tools_runtime_profile_version($profile); $profile_version = bratonien_tools_runtime_profile_version($profile);
$min_size = is_array($params->sizing->min_size) ? implode('x', $params->sizing->min_size) : ''; $min_size = is_array($params->sizing->min_size) ? implode('x', $params->sizing->min_size) : '';
$cache_fingerprint = array( $cache_fingerprint = array(
$rel_url, $canonical_rel_url,
$profile_version, $profile_version,
@filemtime($source_path) ?: 0, @filemtime($source_path) ?: 0,
$params->last_mod_time, $params->last_mod_time,
@@ -194,6 +211,7 @@ function bratonien_tools_runtime_cache_descriptor($rel_url, array $profile, $par
'relative_path' => $relative_path, 'relative_path' => $relative_path,
'url' => get_root_url().$relative_path, 'url' => get_root_url().$relative_path,
'profile_version' => $profile_version, 'profile_version' => $profile_version,
'canonical_rel_url' => $canonical_rel_url,
); );
} }