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

* Api: Make sure share cleanup job doesn't remove shares just because of access rights

Browse Source
This commit is contained in:
nathangray 2020-03-30 09:35:59 -06:00
parent ac83e0f3bd
commit b0f321f35f
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Link/Sharing.php
View File

@ -126,6 +126,10 @@ class Sharing extends \EGroupware\Api\Sharing
protected static function check_path($share) protected static function check_path($share)
{ {
list($app, $id) = explode('::', $share['share_path']); list($app, $id) = explode('::', $share['share_path']);
if(!\EGroupware\Api\Link::$app_register[$app])
{
\EGroupware\Api\Link::init_static();
}
return (boolean) \EGroupware\Api\Link::title($app, $id); return (boolean) \EGroupware\Api\Link::title($app, $id);
} }

2
api/src/Sharing.php
View File

@ -833,7 +833,7 @@ class Sharing
if (!isset(self::$db)) self::$db = $GLOBALS['egw']->db; if (!isset(self::$db)) self::$db = $GLOBALS['egw']->db;
foreach(self::$db->select(self::TABLE, array( foreach(self::$db->select(self::TABLE, array(
'share_id','share_path' 'share_id','share_path', 'share_writable'
), array(), __LINE__, __FILE__, false) as $share) ), array(), __LINE__, __FILE__, false) as $share)
{ {
$class = self::get_share_class($share); $class = self::get_share_class($share);

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

@ -390,7 +390,10 @@ class Sharing extends \EGroupware\Api\Sharing
*/ */
protected static function check_path($share) protected static function check_path($share)
{ {
return Vfs::file_exists($share['share_path']); Vfs::$is_root = true;
$exists = Vfs::file_exists($share['share_path']);
Vfs::$is_root = false;
return $exists;
} }
/** /**