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

Better handling of link titles as directories

Browse Source
This commit is contained in:
Nathan Gray 2012-06-26 16:47:04 +00:00
parent 8075cb9a9b
commit f6a76efba9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,21 +143,20 @@ class filemanager_merge extends bo_merge
if($dirlist[1] == 'apps' && count($dirlist) > 1) if($dirlist[1] == 'apps' && count($dirlist) > 1)
{ {
// Try this first - a normal path /apps/appname/id/file // Try this first - a normal path /apps/appname/id/file
list($app, $id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5)); list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
// Symlink? // Symlink?
if(!$app || !$id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) { if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
// Try resolving just app + ID - /apps/App Name/Record Title/file // Try resolving just app + ID - /apps/App Name/Record Title/file
$resolved = egw_vfs::resolve_url_symlinks(implode('/',array_slice($dirlist,0,4))); $resolved = egw_vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
list($app, $id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5)); list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
if(!$app || !$id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) { if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
// Get rid of any virtual folders (eg: All$) and symlinks // Get rid of any virtual folders (eg: All$) and symlinks
$resolved = egw_vfs::resolve_url_symlinks($file['path']); $resolved = egw_vfs::resolve_url_symlinks($file['path']);
list($app, $id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5)); list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
} }
} }
if($app && $id) if($app && $app_id)
{ {
if($app && $GLOBALS['egw_info']['user']['apps'][$app]) if($app && $GLOBALS['egw_info']['user']['apps'][$app])
{ {
@ -170,7 +169,7 @@ class filemanager_merge extends bo_merge
$app_merge = new $classname(); $app_merge = new $classname();
if($app_merge && method_exists($app_merge, 'get_replacements')) if($app_merge && method_exists($app_merge, 'get_replacements'))
{ {
$app_placeholders = $app_merge->get_replacements($id, $content); $app_placeholders = $app_merge->get_replacements($app_id, $content);
} }
} }
} }