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

Stream generated watermark in same request

Browse Source
This commit is contained in:
Terranom674
2026-08-15 20:29:54 +02:00
parent 4e27a41223
commit 3c7f36dc0b
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
watermark.php
View File

@@ -30,8 +30,13 @@ function bratonien_tools_runtime_b64url_decode($value)
function bratonien_tools_watermark_fail($code, $message) function bratonien_tools_watermark_fail($code, $message)
{ {
while (ob_get_level() > 0)
{
@ob_end_clean();
}
http_response_code($code); http_response_code($code);
header('Content-Type: text/plain; charset=utf-8'); header('Content-Type: text/plain; charset=utf-8');
header('Cache-Control: no-store, max-age=0');
echo $message; echo $message;
exit; exit;
} }
@@ -39,6 +44,16 @@ function bratonien_tools_watermark_fail($code, $message)
function bratonien_tools_output_image($path) function bratonien_tools_output_image($path)
{ {
clearstatcache(true, $path); clearstatcache(true, $path);
if (!is_file($path) || !is_readable($path))
{
bratonien_tools_watermark_fail(500, 'Image output unavailable');
}
while (ob_get_level() > 0)
{
@ob_end_clean();
}
$ext = strtolower(pathinfo($path, PATHINFO_EXTENSION)); $ext = strtolower(pathinfo($path, PATHINFO_EXTENSION));
$types = array('jpg'=>'image/jpeg','jpeg'=>'image/jpeg','png'=>'image/png','gif'=>'image/gif','webp'=>'image/webp'); $types = array('jpg'=>'image/jpeg','jpeg'=>'image/jpeg','png'=>'image/png','gif'=>'image/gif','webp'=>'image/webp');
$mtime = @filemtime($path) ?: time(); $mtime = @filemtime($path) ?: time();
@@ -52,6 +67,7 @@ function bratonien_tools_output_image($path)
exit; exit;
} }
http_response_code(200);
header('Content-Type: '.($types[$ext] ?? 'application/octet-stream')); header('Content-Type: '.($types[$ext] ?? 'application/octet-stream'));
if ($size > 0) if ($size > 0)
{ {
@@ -60,17 +76,11 @@ function bratonien_tools_output_image($path)
header('Last-Modified: '.gmdate('D, d M Y H:i:s', $mtime).' GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s', $mtime).' GMT');
header('ETag: '.$etag); header('ETag: '.$etag);
header('Cache-Control: public, max-age=31536000, immutable'); header('Cache-Control: public, max-age=31536000, immutable');
header('X-Bratonien-Watermark: direct');
readfile($path); readfile($path);
exit; exit;
} }
function bratonien_tools_redirect_to_cache($url)
{
header('Cache-Control: no-store, max-age=0');
header('Location: '.$url, true, 302);
exit;
}
function bratonien_tools_url_to_size($value) function bratonien_tools_url_to_size($value)
{ {
$parts = explode('x', (string)$value, 2); $parts = explode('x', (string)$value, 2);
@@ -325,7 +335,7 @@ if (!$descriptor)
if (is_file($descriptor['path']) && is_readable($descriptor['path'])) if (is_file($descriptor['path']) && is_readable($descriptor['path']))
{ {
bratonien_tools_redirect_to_cache($descriptor['url']); bratonien_tools_output_image($descriptor['path']);
} }
if (!is_dir($descriptor['dir']) && !mkdir($descriptor['dir'], 0755, true) && !is_dir($descriptor['dir'])) if (!is_dir($descriptor['dir']) && !mkdir($descriptor['dir'], 0755, true) && !is_dir($descriptor['dir']))
@@ -348,7 +358,7 @@ if (is_file($descriptor['path']) && is_readable($descriptor['path']))
{ {
flock($lock, LOCK_UN); flock($lock, LOCK_UN);
fclose($lock); fclose($lock);
bratonien_tools_redirect_to_cache($descriptor['url']); bratonien_tools_output_image($descriptor['path']);
} }
$piwigo_derivative = bratonien_tools_ensure_piwigo_derivative($derivative); $piwigo_derivative = bratonien_tools_ensure_piwigo_derivative($derivative);
@@ -432,4 +442,4 @@ if (!is_file($descriptor['path']) || !is_readable($descriptor['path']))
bratonien_tools_watermark_fail(500, 'Generated watermark cache unavailable'); bratonien_tools_watermark_fail(500, 'Generated watermark cache unavailable');
} }
bratonien_tools_redirect_to_cache($descriptor['url']); bratonien_tools_output_image($descriptor['path']);