extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

need to use egw_vfs::is_readable() to correctly check for posix rights, as PHPs is_readable only checks other rights not owner or group

Browse Source
This commit is contained in:
Ralf Becker 2014-12-08 12:51:33 +00:00
parent 8203d5f695
commit 4467003d10
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
phpgwapi/inc/class.egw_sharing.inc.php
View File

@ -116,6 +116,27 @@ class egw_sharing
return $token; return $token;
} }
/**
* so_sql instance for egw_sharing table
*
* @var so_sql
*/
protected static $so;
/**
* Get a so_sql instance initialised for shares
*/
public static function so()
{
if (!isset(self::$so))
{
self::$so = new so_sql('phpgwapi', self::TABLE, null, '', true);
self::$so->set_times('string');
}
return self::$so;
}
/** /**
* Create sharing session * Create sharing session
* *
@ -276,20 +297,26 @@ class egw_sharing
if (substr($path, 0, strlen($temp_dir)) == $temp_dir) if (substr($path, 0, strlen($temp_dir)) == $temp_dir)
{ {
$mode = self::LINK; $mode = self::LINK;
$exists = file_exists($path) && is_readable($path);
} }
elseif(parse_url($path, PHP_URL_SCHEME) !== 'vfs') else
{ {
$path = 'vfs://default'.($path[0] == '/' ? '' : '/').$path; if(parse_url($path, PHP_URL_SCHEME) !== 'vfs')
{
$path = 'vfs://default'.($path[0] == '/' ? '' : '/').$path;
}
$vfs_path = egw_vfs::parse_url($path, PHP_URL_PATH);
$exists = egw_vfs::file_exists($vfs_path) && egw_vfs::is_readable($vfs_path);
} }
// check if file exists and is readable // check if file exists and is readable
if (!file_exists($path) || !is_readable($path)) if (!$exists)
{ {
throw new egw_exception_not_found("'$path' NOT found!"); throw new egw_exception_not_found("'$path' NOT found!");
} }
// check if file has been shared before // check if file has been shared before
if (($mode != self::LINK || isset($path2tmp[$path])) && if (($mode != self::LINK || isset($path2tmp[$path])) &&
($share = self::$db->select(self::TABLE, '*', array( ($share = self::$db->select(self::TABLE, '*', array(
'share_path' => $mode == 'link' ? $path2tmp[$path] : egw_vfs::parse_url($path, PHP_URL_PATH), 'share_path' => $mode == 'link' ? $path2tmp[$path] : $vfs_path,
'share_owner' => $GLOBALS['egw_info']['user']['account_id'], 'share_owner' => $GLOBALS['egw_info']['user']['account_id'],
)+$extra, __LINE__, __FILE__)->fetch())) )+$extra, __LINE__, __FILE__)->fetch()))
{ {