extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make app / ID detection handle symlinks

Browse Source
This commit is contained in:
Nathan Gray 2012-06-25 17:54:43 +00:00
parent 4d101be606
commit 1da77fe615
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
filemanager/inc/class.filemanager_merge.inc.php
View File

@ -142,11 +142,23 @@ class filemanager_merge extends bo_merge
// If in apps folder, try for app-specific placeholders // If in apps folder, try for app-specific placeholders
if($dirlist[1] == 'apps' && count($dirlist) > 1) if($dirlist[1] == 'apps' && count($dirlist) > 1)
{ {
// Get rid of any virtual folders (eg: All$) // Try this first - a normal path /apps/appname/id/file
$resolved = egw_vfs::resolve_url_symlinks($file['path']); list($app, $id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
if($resolved)
{ // Symlink?
if(!$app || !$id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
// Try resolving just app + ID - /apps/App Name/Record Title/file
$resolved = egw_vfs::resolve_url_symlinks(implode('/',array_slice($dirlist,0,4)));
list($app, $id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5)); list($app, $id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
if(!$app || !$id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
// Get rid of any virtual folders (eg: All$) and symlinks
$resolved = egw_vfs::resolve_url_symlinks($file['path']);
list($app, $id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
}
}
if($app && $id)
{
if($app && $GLOBALS['egw_info']['user']['apps'][$app]) if($app && $GLOBALS['egw_info']['user']['apps'][$app])
{ {
$app_merge = null; $app_merge = null;