hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +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

17
lib/classes/record/preview.class.php
View File

@@ -316,9 +316,7 @@ class record_preview extends record_adapter
$tab = array();
$user = $this->app['phraseanet.user'];
$report = $user->ACL()->has_right_on_base($this->get_base_id(), 'canreport');
$report = $this->app['phraseanet.user']->ACL()->has_right_on_base($this->get_base_id(), 'canreport');
$connsbas = connection::getPDOConnection($this->app, $this->get_sbas_id());
@@ -330,7 +328,7 @@ class record_preview extends record_adapter
if ( ! $report) {
$sql .= ' AND ((l.usrid = :usr_id AND l.site= :site) OR action="add")';
$params[':usr_id'] = $user->get_id();
$params[':usr_id'] = $this->app['phraseanet.user']->get_id();
$params[':site'] = $this->app['phraseanet.registry']->get('GV_sit');
}
@@ -401,8 +399,7 @@ class record_preview extends record_adapter
return $this->view_popularity;
}
$user = $this->app['phraseanet.user'];
$report = $user->ACL()->has_right_on_base(
$report = $this->app['phraseanet.user']->ACL()->has_right_on_base(
$this->get_base_id(), 'canreport');
if ( ! $report && ! $this->app['phraseanet.registry']->get('GV_google_api')) {
@@ -491,8 +488,7 @@ class record_preview extends record_adapter
return $this->refferer_popularity;
}
$user = $this->app['phraseanet.user'];
$report = $user->ACL()->has_right_on_base(
$report = $this->app['phraseanet.user']->ACL()->has_right_on_base(
$this->get_base_id(), 'canreport');
if ( ! $report && ! $this->app['phraseanet.registry']->get('GV_google_api')) {
@@ -566,14 +562,11 @@ class record_preview extends record_adapter
*/
public function get_download_popularity()
{
if ( ! is_null($this->download_popularity)) {
return $this->download_popularity;
}
$user = $this->app['phraseanet.user'];
$report = $user->ACL()->has_right_on_base(
$this->get_base_id(), 'canreport');
$report = $this->app['phraseanet.user']->ACL()->has_right_on_base($this->get_base_id(), 'canreport');
$ret = false;
if ( ! $report && ! $this->app['phraseanet.registry']->get('GV_google_api')) {