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

Merge pull request #31 from Terranom674/fix/0979-picture-derivatives

Browse Source 
0.9.7.9: Picture-Viewer lädt WebDAV-Derivate lokal
This commit is contained in:
Terranom674
2026-08-19 22:17:54 +02:00
committed by GitHub
parent 9e282af1b4 ebf4fc7e74
commit ae96fc2e3e
2 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/webdav_gallery_runtime.inc.php
View File

@@ -14,13 +14,14 @@ function bratonien_tools_filter_webdav_gallery_derivative_url($url, $params, $sr
return $url; return $url;
} }
$derivative_path = '';
try try
{ {
$derivative = new DerivativeImage($params, $src_image); $derivative = new DerivativeImage($params, $src_image);
if (!$derivative->same_as_source()) if (!$derivative->same_as_source())
{ {
$path = $derivative->get_path(); $derivative_path = $derivative->get_path();
if ($path !== '' && is_file($path) && is_readable($path)) if ($derivative_path !== '' && is_file($derivative_path) && is_readable($derivative_path))
{ {
return $url; return $url;
} }
@@ -28,7 +29,37 @@ function bratonien_tools_filter_webdav_gallery_derivative_url($url, $params, $sr
} }
catch (Throwable $e) catch (Throwable $e)
{ {
error_log('Bratonien WebDAV gallery derivative lookup #'.(int)$src_image->id.': '.$e->getMessage()); error_log('Bratonien WebDAV derivative lookup #'.(int)$src_image->id.': '.$e->getMessage());
}
$script_name = basename((string)($_SERVER['SCRIPT_NAME'] ?? ''));
if ($script_name === 'picture.php' && function_exists('bratonien_tools_webdav_generate_derivative'))
{
$detail = '';
try
{
if (bratonien_tools_webdav_generate_derivative($params, $src_image, $detail))
{
if ($derivative_path === '')
{
$probe = new DerivativeImage($params, $src_image);
if (!$probe->same_as_source()) $derivative_path = $probe->get_path();
}
if ($derivative_path !== '' && is_file($derivative_path) && is_readable($derivative_path))
{
return $url;
}
}
}
catch (Throwable $e)
{
$detail = get_class($e).': '.$e->getMessage();
}
if ($detail !== '')
{
error_log('Bratonien WebDAV picture derivative #'.(int)$src_image->id.': '.$detail);
}
} }
$preview_url = bratonien_tools_webdav_image_url((int)$src_image->id, true); $preview_url = bratonien_tools_webdav_image_url((int)$src_image->id, true);

2
main.inc.php
View File

@@ -1,7 +1,7 @@
<?php <?php
/* /*
Plugin Name: Bratonien Tools Plugin Name: Bratonien Tools
Version: 0.9.7.8 Version: 0.9.7.9
Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation. Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
Author: Bratonien Author: Bratonien