diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_delete_file.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_delete_file.php index 7f12b3df3e..baf660ef89 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_delete_file.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_delete_file.php @@ -34,65 +34,78 @@ && isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, getBaseName($_GET['delete'])) && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, getBaseName($_GET['delete']))) { - /////////////bridge to Dokeos by Juan Carlos Raņa Trabado - //find path - $mainPath='../../../../../../../courses/'.$_course['path'].'/document/';//get Dokeos - $fullPath = $_GET['delete']; //get Ajaxfilemanager - $dokeosPath = substr($fullPath, strlen($mainPath)-strlen($fullPath)-1,-1); - //find base_work_dir - $course_dir = $_course['path']."/document";//get Dokeos - $sys_course_path = api_get_path(SYS_COURSE_PATH);//get Dokeos - $base_work_dir = $sys_course_path.$course_dir; // sample c:/xampp/htdocs/dokeos2009beta/courses/JUAN2009/document - //delete directory - - //check protect directories - if ($dokeosPath!='/audio' && $dokeosPath!='/flash' && $dokeosPath!='/images' && $dokeosPath!='/shared_folder' && $dokeosPath!='/video') - { - if(! $is_allowed_to_edit && DocumentManager::check_readonly($_course,api_get_user_id(),$dokeosPath)) - { - $error=get_lang('CantDeleteReadonlyFiles'); //From Dokeos to Ajaxfilemanager - } - else - { - $deleted= DocumentManager::delete_document($_course,$dokeosPath,$base_work_dir); //deleted by Dokeos - //$file->delete(addTrailingSlash(backslashToSlash($doc))); // disabled deleted by ajaxfilemanager - } - } - else - { - $error=get_lang('ProtectFolder'); //From Dokeos to Ajaxfilemanager - } - //////end bridge to Dokeos - + /////////////bridge to Dokeos by Juan Carlos Raņa Trabado + if(!empty($_course['path'])) + { + //find path + $mainPath='../../../../../../../courses/'.$_course['path'].'/document/';//get Dokeos + $fullPath = $_GET['delete']; //get Ajaxfilemanager + $dokeosPath = substr($fullPath, strlen($mainPath)-strlen($fullPath)-1,-1); + //find base_work_dir + $course_dir = $_course['path']."/document";//get Dokeos + $sys_course_path = api_get_path(SYS_COURSE_PATH);//get Dokeos + $base_work_dir = $sys_course_path.$course_dir; // sample c:/xampp/htdocs/dokeos2009beta/courses/JUAN2009/document + //delete directory + + //check protect directories + if ($dokeosPath!='/audio' && $dokeosPath!='/flash' && $dokeosPath!='/images' && $dokeosPath!='/shared_folder' && $dokeosPath!='/video') + { + if(! $is_allowed_to_edit && DocumentManager::check_readonly($_course,api_get_user_id(),$dokeosPath)) + { + $error=get_lang('CantDeleteReadonlyFiles'); //From Dokeos to Ajaxfilemanager + } + else + { + $deleted= DocumentManager::delete_document($_course,$dokeosPath,$base_work_dir); //deleted by Dokeos + //$file->delete(addTrailingSlash(backslashToSlash($doc))); // disabled deleted by ajaxfilemanager + } + } + else + { + $error=get_lang('ProtectFolder'); //From Dokeos to Ajaxfilemanager + } + } + else + { + $file->delete(addTrailingSlash(backslashToSlash($doc)));//deleted by ajaxfilemanager + } + //////end bridge to Dokeos }elseif(is_file($_GET['delete']) && isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, getBaseName($_GET['delete'])) && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, getBaseName($_GET['delete'])) ) - { - /////////////bridge to Dokeos by Juan Carlos Raņa Trabado - //find path - $mainPath='../../../../../../../courses/'.$_course['path'].'/document/';//get Dokeos - $fullPath = $_GET['delete']; //get Ajaxfilemanager - $dokeosPath = substr($fullPath, strlen($mainPath)-strlen($fullPath)-1); - //find base_work_dir - $course_dir = $_course['path']."/document";//get Dokeos - $sys_course_path = api_get_path(SYS_COURSE_PATH);//get Dokeos - $base_work_dir = $sys_course_path.$course_dir; // sample c:/xampp/htdocs/dokeos2009beta/courses/JUAN2009/document - //delete file - - if(! $is_allowed_to_edit && DocumentManager::check_readonly($_course,api_get_user_id(),$dokeosPath)) - { - $error=get_lang('CantDeleteReadonlyFiles'); //From Dokeos to Ajaxfilemanager - } - else - { - - $deleted= DocumentManager::delete_document($_course,$dokeosPath,$base_work_dir); //deleted by Dokeos - //$file->delete(($_GET['delete'])); // disabled deleted by ajaxfilemanager - - } - //////end bridge to Dokeos + { + /////////////bridge to Dokeos by Juan Carlos Raņa Trabado + if(!empty($_course['path'])) + { + //find path + $mainPath='../../../../../../../courses/'.$_course['path'].'/document/';//get Dokeos + $fullPath = $_GET['delete']; //get Ajaxfilemanager + $dokeosPath = substr($fullPath, strlen($mainPath)-strlen($fullPath)-1); + //find base_work_dir + $course_dir = $_course['path']."/document";//get Dokeos + $sys_course_path = api_get_path(SYS_COURSE_PATH);//get Dokeos + $base_work_dir = $sys_course_path.$course_dir; // sample c:/xampp/htdocs/dokeos2009beta/courses/JUAN2009/document + //delete file + + if(! $is_allowed_to_edit && DocumentManager::check_readonly($_course,api_get_user_id(),$dokeosPath)) + { + $error=get_lang('CantDeleteReadonlyFiles'); //From Dokeos to Ajaxfilemanager + } + else + { + + $deleted= DocumentManager::delete_document($_course,$dokeosPath,$base_work_dir); //deleted by Dokeos + //$file->delete(($_GET['delete'])); // disabled deleted by ajaxfilemanager + + } + } + else + { + $file->delete(($_GET['delete']));//deleted by ajaxfilemanager + } + //////end bridge to Dokeos } } }else @@ -115,64 +128,78 @@ && isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, $doc) && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, $doc)) { - /////////////bridge to Dokeos by Juan Carlos Raņa Trabado - //find path - $mainPath='../../../../../../../courses/'.$_course['path'].'/document/';//get Dokeos - $fullPath = $doc; //get Ajaxfilemanager - $dokeosPath = substr($fullPath, strlen($mainPath)-strlen($fullPath)-1,-1); - //find base_work_dir - $course_dir = $_course['path']."/document";//get Dokeos - $sys_course_path = api_get_path(SYS_COURSE_PATH);//get Dokeos - $base_work_dir = $sys_course_path.$course_dir; // sample c:/xampp/htdocs/dokeos2009beta/courses/JUAN2009/document - //delete directory - - //check protect directories - if ($dokeosPath!='/audio' && $dokeosPath!='/flash' && $dokeosPath!='/images' && $dokeosPath!='/shared_folder' && $dokeosPath!='/video') - { - if(! $is_allowed_to_edit && DocumentManager::check_readonly($_course,api_get_user_id(),$dokeosPath)) - { - $error=get_lang('CantDeleteReadonlyFiles'); //From Dokeos to Ajaxfilemanager - } - else - { - $deleted= DocumentManager::delete_document($_course,$dokeosPath,$base_work_dir); //deleted by Dokeos - //$file->delete(addTrailingSlash(backslashToSlash($doc))); // disabled deleted by ajaxfilemanager - } - } - else - { - $error=get_lang('ProtectFolder'); //From Dokeos to Ajaxfilemanager - } - //////end bridge to Dokeos + /////////////bridge to Dokeos by Juan Carlos Raņa Trabado + if(!empty($_course['path'])) + { + //find path + $mainPath='../../../../../../../courses/'.$_course['path'].'/document/';//get Dokeos + $fullPath = $doc; //get Ajaxfilemanager + $dokeosPath = substr($fullPath, strlen($mainPath)-strlen($fullPath)-1,-1); + //find base_work_dir + $course_dir = $_course['path']."/document";//get Dokeos + $sys_course_path = api_get_path(SYS_COURSE_PATH);//get Dokeos + $base_work_dir = $sys_course_path.$course_dir; // sample c:/xampp/htdocs/dokeos2009beta/courses/JUAN2009/document + //delete directory + + //check protect directories + if ($dokeosPath!='/audio' && $dokeosPath!='/flash' && $dokeosPath!='/images' && $dokeosPath!='/shared_folder' && $dokeosPath!='/video') + { + if(! $is_allowed_to_edit && DocumentManager::check_readonly($_course,api_get_user_id(),$dokeosPath)) + { + $error=get_lang('CantDeleteReadonlyFiles'); //From Dokeos to Ajaxfilemanager + } + else + { + $deleted= DocumentManager::delete_document($_course,$dokeosPath,$base_work_dir); //deleted by Dokeos + //$file->delete(addTrailingSlash(backslashToSlash($doc))); // disabled deleted by ajaxfilemanager + } + } + else + { + $error=get_lang('ProtectFolder'); //From Dokeos to Ajaxfilemanager + } + } + else + { + $file->delete(addTrailingSlash(backslashToSlash($doc)));//deleted by ajaxfilemanager + } + //////end bridge to Dokeos }elseif(is_file($doc) && isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, $doc) && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, $doc) ) { - /////////////bridge to Dokeos by Juan Carlos Raņa Trabado - //find path - $mainPath='../../../../../../../courses/'.$_course['path'].'/document/';//get Dokeos - $fullPath = $doc; //get Ajaxfilemanager - $dokeosPath = substr($fullPath, strlen($mainPath)-strlen($fullPath)-1); - //find base_work_dir - $course_dir = $_course['path']."/document";//get Dokeos - $sys_course_path = api_get_path(SYS_COURSE_PATH);//get Dokeos - $base_work_dir = $sys_course_path.$course_dir; // sample c:/xampp/htdocs/dokeos2009beta/courses/JUAN2009/document - //delete file - - if(! $is_allowed_to_edit && DocumentManager::check_readonly($_course,api_get_user_id(),$dokeosPath)) - { - $error=get_lang('CantDeleteReadonlyFiles'); //From Dokeos to Ajaxfilemanager - } - else - { - - $deleted= DocumentManager::delete_document($_course,$dokeosPath,$base_work_dir); //deleted by Dokeos - //$file->delete($doc); // disabled deleted by ajaxfilemanager - - } - //////end bridge to Dokeos + /////////////bridge to Dokeos by Juan Carlos Raņa Trabado + if(!empty($_course['path'])) + { + //find path + $mainPath='../../../../../../../courses/'.$_course['path'].'/document/';//get Dokeos + $fullPath = $doc; //get Ajaxfilemanager + $dokeosPath = substr($fullPath, strlen($mainPath)-strlen($fullPath)-1); + //find base_work_dir + $course_dir = $_course['path']."/document";//get Dokeos + $sys_course_path = api_get_path(SYS_COURSE_PATH);//get Dokeos + $base_work_dir = $sys_course_path.$course_dir; // sample c:/xampp/htdocs/dokeos2009beta/courses/JUAN2009/document + //delete file + + if(! $is_allowed_to_edit && DocumentManager::check_readonly($_course,api_get_user_id(),$dokeosPath)) + { + $error=get_lang('CantDeleteReadonlyFiles'); //From Dokeos to Ajaxfilemanager + } + else + { + + $deleted= DocumentManager::delete_document($_course,$dokeosPath,$base_work_dir); //deleted by Dokeos + //$file->delete($doc); // disabled deleted by ajaxfilemanager + + } + } + else + { + $file->delete($doc); //deleted by ajaxfilemanager + } + //////end bridge to Dokeos } }