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

Let default public profile inherit base watermark file

Browse Source
This commit is contained in:
Terranom674
2026-09-06 23:04:38 +02:00
parent 940a5e3124
commit a6a2f65f72
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/watermark_runtime.inc.php
View File

@@ -82,16 +82,37 @@ function bratonien_tools_runtime_b64url_encode($value)
return rtrim(strtr(base64_encode($value), '+/', '-_'), '='); return rtrim(strtr(base64_encode($value), '+/', '-_'), '=');
} }
function bratonien_tools_profile_watermark_relative(array $profile)
{
$relative = ltrim(trim((string)($profile['watermark_file'] ?? '')), '/');
if ($relative !== '')
{
return $relative;
}
// Ein Profil ohne eigene Datei bedeutet bewusst: Einstellungen dieses
// Profils verwenden, aber die zentrale Basis-Wasserzeichendatei erben.
// Dadurch kann das Standardprofil "Oeffentlich" ohne doppelte Dateipflege
// fuer jedes öffentliche Album als Schutzregel dienen.
if (function_exists('bratonien_tools_get_base_watermark_config'))
{
$base = bratonien_tools_get_base_watermark_config();
$relative = ltrim(trim((string)($base['file'] ?? '')), '/');
}
return $relative;
}
function bratonien_tools_profile_watermark_path(array $profile) function bratonien_tools_profile_watermark_path(array $profile)
{ {
static $paths = array(); static $paths = array();
if (empty($profile['watermark_file'])) $relative = bratonien_tools_profile_watermark_relative($profile);
if ($relative === '')
{ {
return null; return null;
} }
$relative = ltrim((string)$profile['watermark_file'], '/');
if (array_key_exists($relative, $paths)) if (array_key_exists($relative, $paths))
{ {
return $paths[$relative]; return $paths[$relative];
@@ -119,9 +140,10 @@ function bratonien_tools_profile_watermark_path(array $profile)
function bratonien_tools_runtime_profile_version(array $profile) function bratonien_tools_runtime_profile_version(array $profile)
{ {
$watermark_path = bratonien_tools_profile_watermark_path($profile); $watermark_path = bratonien_tools_profile_watermark_path($profile);
$effective_file = bratonien_tools_profile_watermark_relative($profile);
$parts = array( $parts = array(
$profile['id'] ?? 0, $profile['id'] ?? 0,
$profile['watermark_file'] ?? '', $effective_file,
$profile['scale_percent'] ?? 100, $profile['scale_percent'] ?? 100,
$profile['xpos'] ?? 90, $profile['xpos'] ?? 90,
$profile['ypos'] ?? 90, $profile['ypos'] ?? 90,