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

Use absolute URLs for watermark cache delivery

Browse Source
This commit is contained in:
Terranom674
2026-08-15 19:28:28 +02:00
parent 8a2d541139
commit 37de48885c
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/watermark_runtime.inc.php
View File

@@ -153,6 +153,17 @@ function bratonien_tools_runtime_canonical_derivative_url($rel_url)
return $rel_url; return $rel_url;
} }
function bratonien_tools_runtime_absolute_url($relative_path)
{
$relative_path = ltrim((string)$relative_path, '/');
if (function_exists('get_absolute_root_url'))
{
return rtrim(get_absolute_root_url(true), '/').'/'.$relative_path;
}
return '/'.$relative_path;
}
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)
@@ -197,7 +208,7 @@ function bratonien_tools_runtime_cache_descriptor($rel_url, array $profile, $par
'dir' => PHPWG_ROOT_PATH.$relative_dir, 'dir' => PHPWG_ROOT_PATH.$relative_dir,
'path' => PHPWG_ROOT_PATH.$relative_path, 'path' => PHPWG_ROOT_PATH.$relative_path,
'relative_path' => $relative_path, 'relative_path' => $relative_path,
'url' => get_root_url().$relative_path, 'url' => bratonien_tools_runtime_absolute_url($relative_path),
'profile_version' => $profile_version, 'profile_version' => $profile_version,
'canonical_rel_url' => $canonical_rel_url, 'canonical_rel_url' => $canonical_rel_url,
); );
@@ -243,7 +254,8 @@ function bratonien_tools_filter_derivative_url($url, $params, $src_image, $rel_u
$profile_id = (int)$profile['id']; $profile_id = (int)$profile['id'];
$profile_version = bratonien_tools_runtime_profile_version($profile); $profile_version = bratonien_tools_runtime_profile_version($profile);
$signature = bratonien_tools_runtime_sign($rel_url, $profile_id, $profile_version); $signature = bratonien_tools_runtime_sign($rel_url, $profile_id, $profile_version);
$endpoint = 'plugins/'.BRATONIEN_TOOLS_ID.'/watermark.php?p='.$profile_id.'&v='.
return get_root_url().'plugins/'.BRATONIEN_TOOLS_ID.'/watermark.php?p='.$profile_id.'&v='.
rawurlencode($profile_version).'&u='.rawurlencode(bratonien_tools_runtime_b64url_encode($rel_url)).'&s='.$signature; rawurlencode($profile_version).'&u='.rawurlencode(bratonien_tools_runtime_b64url_encode($rel_url)).'&s='.$signature;
return bratonien_tools_runtime_absolute_url($endpoint);
} }