hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Download elements without watermark when pushed

Browse Source
This commit is contained in:
Romain Neutron
2012-02-22 12:22:50 +01:00
parent dc1ec6df7d
commit 2cb18c5d78
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/classes/set/export.class.php
View File

@@ -535,10 +535,8 @@ class set_export extends set_abstract
'path' => $sd[$name]->get_path() 'path' => $sd[$name]->get_path()
, 'file' => $sd[$name]->get_file() , 'file' => $sd[$name]->get_file()
); );
if (!$user->ACL()->has_right_on_base( if (!$user->ACL()->has_right_on_base($download_element->get_base_id(), "nowatermark")
$download_element->get_base_id() && !$user->ACL()->has_preview_grant($download_element)
, "nowatermark"
)
&& $sd[$name]->get_type() == media_subdef::TYPE_IMAGE) && $sd[$name]->get_type() == media_subdef::TYPE_IMAGE)
{ {
$path = recordutils_image::watermark( $path = recordutils_image::watermark(
@@ -951,11 +949,12 @@ class set_export extends set_abstract
if (is_file($file)) if (is_file($file))
{ {
$testPath = function($file, $registry){ $testPath = function($file, $registry)
return strpos($file, $registry->get('GV_RootPath').'tmp/download/') !== false {
|| strpos($file, $registry->get('GV_RootPath').'tmp/lazaret/') !== false return strpos($file, $registry->get('GV_RootPath') . 'tmp/download/') !== false
|| strpos($file, $registry->get('GV_RootPath') . 'tmp/lazaret/') !== false
|| strpos($file, $registry->get('GV_X_Accel_Redirect')) !== false; || strpos($file, $registry->get('GV_X_Accel_Redirect')) !== false;
}; };
if ($registry->get('GV_modxsendfile') && $testPath($file, $registry)) if ($registry->get('GV_modxsendfile') && $testPath($file, $registry))
{ {