From 1fb645d09dbd1afaad71e873ebdb6d10a5f66db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Thu, 30 Dec 2010 19:46:57 +0100 Subject: [PATCH] Feature #2484 function is_my_shared folder detect also the user's subfolders --- main/document/document.inc.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/main/document/document.inc.php b/main/document/document.inc.php index 1788eaf773..7c721c4f09 100755 --- a/main/document/document.inc.php +++ b/main/document/document.inc.php @@ -386,6 +386,7 @@ function build_move_to_selector($folders, $curdirpath, $move_file, $group_dir = if ($curdirpath != '/') { $form .= ''; } + if (is_array($folders)) { foreach ($folders as & $folder) { // You cannot move a file to: @@ -550,15 +551,18 @@ function is_any_user_shared_folder($path, $current_session_id) { } /** - * Checks whether the user is into his shared folder - * @return return bool Return true when user is in his user shared folder + * Checks whether the user is into his shared folder or into a subfolder + * @return return bool Return true when user is in his user shared folder or into a subforder */ function is_my_shared_folder($user_id, $path, $current_session_id) { - $clean_path = Security::remove_XSS($path); - if($clean_path == '/shared_folder/sf_user_'.$user_id){ + $clean_path = Security::remove_XSS($path).'/'; + $main_user_shared_folder = '/shared_folder\/sf_user_'.$user_id.'\//'; + $main_user_shared_folder_session='/shared_folder_session_'.$current_session_id.'\/sf_user_'.$user_id.'\//'; + + if(preg_match($main_user_shared_folder, $clean_path)){ return true; } - elseif($clean_path == '/shared_folder_session_'.$current_session_id.'/sf_user_'.$user_id){ + elseif(preg_match($main_user_shared_folder_session, $clean_path)){ return true; } else{