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

Fix Piwigo ajax thumbnail loading for watermark endpoint

Browse Source
This commit is contained in:
Terranom674
2026-08-15 20:40:59 +02:00
parent e6abf57090
commit 284d4626f3
1 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
watermark.php
View File

@@ -81,6 +81,36 @@ function bratonien_tools_output_image($path)
exit;
}
function bratonien_tools_output_ajax_url($url)
{
while (ob_get_level() > 0)
{
@ob_end_clean();
}
http_response_code(200);
header('Content-Type: application/json; charset=utf-8');
header('Cache-Control: no-store, max-age=0');
header('X-Bratonien-Watermark: ajaxload');
echo json_encode(array('url'=>$url), JSON_UNESCAPED_SLASHES);
exit;
}
function bratonien_tools_serve_cache($path, $url)
{
if (isset($_GET['ajaxload']) && $_GET['ajaxload'] === 'true')
{
clearstatcache(true, $path);
if (!is_file($path) || !is_readable($path))
{
bratonien_tools_watermark_fail(500, 'AJAX image output unavailable');
}
bratonien_tools_output_ajax_url($url);
}
bratonien_tools_output_image($path);
}
function bratonien_tools_url_to_size($value)
{
$parts = explode('x', (string)$value, 2);
@@ -335,7 +365,7 @@ if (!$descriptor)
if (is_file($descriptor['path']) && is_readable($descriptor['path']))
{
bratonien_tools_output_image($descriptor['path']);
bratonien_tools_serve_cache($descriptor['path'], $descriptor['url']);
}
if (!is_dir($descriptor['dir']) && !mkdir($descriptor['dir'], 0755, true) && !is_dir($descriptor['dir']))
@@ -358,7 +388,7 @@ if (is_file($descriptor['path']) && is_readable($descriptor['path']))
{
flock($lock, LOCK_UN);
fclose($lock);
bratonien_tools_output_image($descriptor['path']);
bratonien_tools_serve_cache($descriptor['path'], $descriptor['url']);
}
$piwigo_derivative = bratonien_tools_ensure_piwigo_derivative($derivative);
@@ -442,4 +472,4 @@ if (!is_file($descriptor['path']) || !is_readable($descriptor['path']))
bratonien_tools_watermark_fail(500, 'Generated watermark cache unavailable');
}
bratonien_tools_output_image($descriptor['path']);
bratonien_tools_serve_cache($descriptor['path'], $descriptor['url']);