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

Remove user variable assignment

Browse Source
This commit is contained in:
Romain Neutron
2012-09-28 17:56:00 +02:00
parent 87c00ee4fb
commit 0565bce475
65 changed files with 274 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Out/Module/PDF.php
View File

@@ -124,8 +124,6 @@ class PDF
protected function print_thumbnailGrid($links = false)
{
$user = $this->app['phraseanet.user'];
$NDiapoW = 3;
$NDiapoH = 4;
@@ -168,7 +166,7 @@ class PDF
$fimg = $subdef->get_pathfile();
if (!$user->ACL()->has_right_on_base($rec->get_base_id(), "nowatermark")
if (!$this->app['phraseanet.user']->ACL()->has_right_on_base($rec->get_base_id(), "nowatermark")
&& $subdef->get_type() == \media_subdef::TYPE_IMAGE) {
$fimg = \recordutils_image::watermark($this->app, $subdef);
}
@@ -310,8 +308,6 @@ class PDF
protected function print_preview($withtdm, $write_caption)
{
$user = $this->app['phraseanet.user'];
if ($withtdm === true) {
$this->print_thumbnailGrid($this->pdf, $this->records, true);
}
@@ -433,7 +429,7 @@ class PDF
$f = $subdef->get_pathfile();
if (!$user->ACL()->has_right_on_base($rec->get_base_id(), "nowatermark")
if (!$this->app['phraseanet.user']->ACL()->has_right_on_base($rec->get_base_id(), "nowatermark")
&& $subdef->get_type() == \media_subdef::TYPE_IMAGE)
$f = \recordutils_image::watermark($this->app, $subdef);