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

Add AuthenticationServiceProvider

Browse Source
This commit is contained in:
Romain Neutron
2013-02-15 11:12:22 +01:00
parent d2bc4f4a23
commit 6537b96f4c
30 changed files with 158 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/record/adapter.php
View File

@@ -400,7 +400,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
if (isset($dstatus[$sbas_id])) {
foreach ($dstatus[$sbas_id] as $n => $statbit) {
if ($statbit['printable'] == '0' &&
!$this->app['phraseanet.user']->ACL()->has_right_on_base($this->base_id, 'chgstatus')) {
!$this->app['authentication']->getUser()->ACL()->has_right_on_base($this->base_id, 'chgstatus')) {
continue;
}
@@ -1930,7 +1930,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
throw new Exception('This record is not a grouping');
}
if ($this->app['phraseanet.user']) {
if ($this->app['authentication']->getUser()) {
$sql = 'SELECT record_id
FROM regroup g
INNER JOIN (record r
@@ -1946,7 +1946,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$params = array(
':GV_site' => $this->app['phraseanet.registry']->get('GV_sit'),
':usr_id' => $this->app['phraseanet.user']->get_id(),
':usr_id' => $this->app['authentication']->getUser()->get_id(),
':record_id' => $this->get_record_id(),
);
} else {
@@ -1997,7 +1997,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$params = array(
':GV_site' => $this->app['phraseanet.registry']->get('GV_sit')
, ':usr_id' => $this->app['phraseanet.user']->get_id()
, ':usr_id' => $this->app['authentication']->getUser()->get_id()
, ':record_id' => $this->get_record_id()
);