From 660ab416613809aca5c8906969ec7907e0c92950 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 22 Apr 2009 10:02:18 +0000 Subject: [PATCH] "- egw_vfs::check_access() using resolved symlink to call check_extended_acl on backend - mime_magic" --- phpgwapi/inc/class.egw_vfs.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php index 6c1eb45dc3..81ee14a484 100644 --- a/phpgwapi/inc/class.egw_vfs.inc.php +++ b/phpgwapi/inc/class.egw_vfs.inc.php @@ -686,7 +686,7 @@ class egw_vfs extends vfs_stream_wrapper } } // check backend for extended acls (only if path given) - $ret = $path && self::_call_on_backend('check_extended_acl',array($path,$check),true); // true = fail silent if backend does not support + $ret = $path && self::_call_on_backend('check_extended_acl',array(isset($stat['url'])?$stat['url']:$path,$check),true); // true = fail silent if backend does not support //error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) ".($ret ? 'backend extended acl granted access.' : 'no access!!!')); return $ret; @@ -949,7 +949,7 @@ class egw_vfs extends vfs_stream_wrapper { return 'etemplate/'.$icon; } - return html::image('etemplate',$icon,lang($mime_type)); + return html::image('etemplate',$icon,mime_magic::mime2label($mime_type)); } /**