holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow for user specific mounts

Browse Source
This commit is contained in:
Ralf Becker 2020-10-20 20:13:15 +02:00
parent c2ca23a071
commit 9eae0333ad
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
api/src/Vfs/Base.php
View File

@ -14,6 +14,7 @@ namespace EGroupware\Api\Vfs;
use EGroupware\Api\Config;
use EGroupware\Api\Vfs;
use EGroupware\Api;
/**
* Shared base of Vfs class and Vfs-stream-wrapper
@ -75,11 +76,12 @@ class Base
* @param string $path =null path to mount the filesystem in the vfs, eg. /
* @param boolean $check_url =null check if url is an existing directory, before mounting it
* default null only checks if url does not contain a $ as used in $user or $pass
* @param boolean $persitent_mount =true create a persitent mount, or only a temprary for current request
* @param boolean|int $persistent_mount =true create a persitent mount, or only a temprary for current request,
* or integer account_id to mount persistent for a given user or group
* @param boolean $clear_fstab =false true clear current fstab, false (default) only add given mount
* @return array|boolean array with fstab, if called without parameter or true on successful mount
*/
static function mount($url=null,$path=null,$check_url=null,$persitent_mount=true,$clear_fstab=false)
static function mount($url=null, $path=null, $check_url=null, $persistent_mount=true, $clear_fstab=false)
{
if (is_null($check_url)) $check_url = strpos($url,'$') === false;
@ -132,14 +134,27 @@ class Base
return strlen($a) - strlen($b);
});
if ($persitent_mount)
if ($persistent_mount)
{
Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
// invalidate session cache
if (method_exists($GLOBALS['egw'],'invalidate_session_cache')) // egw object in setup is limited
if ($persistent_mount === true)
{
$GLOBALS['egw']->invalidate_session_cache();
Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
// invalidate session cache
if (method_exists($GLOBALS['egw'],'invalidate_session_cache')) // egw object in setup is limited
{
$GLOBALS['egw']->invalidate_session_cache();
}
}
else
{
$prefs = new Api\Preferences($persistent_mount);
$prefs->read_repository();
$prefs->user['common']['vfs_fstab'][$path] = $url;
$prefs->save_repository();
// also save for current session
$GLOBALS['egw_info']['user']['preferences']['common']['vfs_fstab'][$path] =
$_SESSION[Api\Session::EGW_INFO_CACHE]['user']['preferences']['common']['vfs_fstab'][$path] = $url;
}
}
if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns true (successful new mount).');

5
api/src/Vfs/StreamWrapper.php
View File

@ -983,6 +983,11 @@ class StreamWrapper extends Base implements StreamWrapperIface
{
self::$fstab = $fstab;
}
if (!empty($GLOBALS['egw_info']['user']['preferences']['common']['vfs_fstab']) &&
is_array($GLOBALS['egw_info']['user']['preferences']['common']['vfs_fstab']))
{
self::$fstab += $GLOBALS['egw_info']['user']['preferences']['common']['vfs_fstab'];
}
// set default context for our schema ('vfs') with current user
if (!($context = stream_context_get_options(stream_context_get_default())) || empty($context[self::SCHEME]['user']))