diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_get_file_listing.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_get_file_listing.php index 0e2142d7d0..d083e3fe90 100755 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_get_file_listing.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_get_file_listing.php @@ -1,176 +1,169 @@ -addSearchKeyword('recursive', @$_GET['search_recursively']); - $search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']); - $search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']); - $search->addSearchKeyword('size_from', @$_GET['search_size_from']); - $search->addSearchKeyword('size_to', @$_GET['search_size_to']); - $search->addSearchKeyword('recursive', @$_GET['search_recursively']); - $search->addSearchKeyword('name', @$_GET['search_name']); - $search->doSearch(); - $fileList = $search->getFoundFiles(); - $folderInfo = $search->getRootFolderInfo(); - - }else - { - include_once(CLASS_MANAGER); - include_once(CLASS_SESSION_ACTION); - $sessionAction = new SessionAction(); - include_once(DIR_AJAX_INC . "class.manager.php"); - - $manager = new manager(); - $manager->setSessionAction($sessionAction); +if(!isset($manager)) { + /** + * this is part of script for processing file paste + */ + //$_GET = $_POST; + include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php"); + include_once(CLASS_PAGINATION); + $pagination = new pagination(false); + $search_folder = str_replace("'","",$_GET['search_folder']); //security fix for Chamilo by cfasanando + if(!empty($_GET['search'])) { + include_once(CLASS_SEARCH); + + $search = new Search($search_folder);//security fix for Chamilo by cfasanando + $search->addSearchKeyword('recursive', @$_GET['search_recursively']); + $search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']); + $search->addSearchKeyword('mtime_to', @$_GET['search_mtime_to']); + $search->addSearchKeyword('size_from', @$_GET['search_size_from']); + $search->addSearchKeyword('size_to', @$_GET['search_size_to']); + $search->addSearchKeyword('recursive', @$_GET['search_recursively']); + $search->addSearchKeyword('name', @$_GET['search_name']); + $search->doSearch(); + $fileList = $search->getFoundFiles(); + $folderInfo = $search->getRootFolderInfo(); - $fileList = $manager->getFileList(); - $folderInfo = $manager->getFolderInfo(); - - } - $pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER); - }else { - include_once(CLASS_PAGINATION); - $pagination = new pagination(false); + include_once(CLASS_MANAGER); + include_once(CLASS_SESSION_ACTION); + $sessionAction = new SessionAction(); + include_once(DIR_AJAX_INC . "class.manager.php"); + + $manager = new manager(); + $manager->setSessionAction($sessionAction); + + $fileList = $manager->getFileList(); + $folderInfo = $manager->getFolderInfo(); + } + $pagination->setUrl(CONFIG_URL_FILEnIMAGE_MANAGER); - - $pagination->setTotal(sizeof($fileList)); - $pagination->setFirstText(PAGINATION_FIRST); - $pagination->setPreviousText(PAGINATION_PREVIOUS); - $pagination->setNextText(PAGINATION_NEXT); - $pagination->setLastText(PAGINATION_LAST); - $pagination->setLimit(!empty($_GET['limit'])?intval($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT); - echo $pagination->getPaginationHTML(); - ///////Chamilo fix for count hidden folders - $count_hideItem =0; +}else +{ + include_once(CLASS_PAGINATION); + $pagination = new pagination(false); +} - $deleted_by_Chamilo_file=' DELETED '; // ' DELETED ' not '_DELETED_' because in $file['name'] _ is replaced with blank see class.manager.php - $deleted_by_Chamilo_folder='_DELETED_'; - $css_folder_Chamilo='css'; - $hotpotatoes_folder_Chamilo='HotPotatoes_files'; - $chat_files_Chamilo='chat_files'; - $certificates_Chamilo='certificates'; + + $pagination->setTotal(sizeof($fileList)); + $pagination->setFirstText(PAGINATION_FIRST); + $pagination->setPreviousText(PAGINATION_PREVIOUS); + $pagination->setNextText(PAGINATION_NEXT); + $pagination->setLastText(PAGINATION_LAST); + $pagination->setLimit(!empty($_GET['limit'])?intval($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT); + echo $pagination->getPaginationHTML(); + ///////Chamilo fix for count hidden folders + $count_hideItem =0; - //end previous fix for count hidden folders + $deleted_by_Chamilo_file=' DELETED '; // ' DELETED ' not '_DELETED_' because in $file['name'] _ is replaced with blank see class.manager.php + $deleted_by_Chamilo_folder='_DELETED_'; + $css_folder_Chamilo='css'; + $hotpotatoes_folder_Chamilo='HotPotatoes_files'; + $chat_files_Chamilo='chat_files'; + $certificates_Chamilo='certificates'; - echo "\n"; - if(!empty($_GET['view'])) - { - switch($_GET['view']) + echo (($count > 1)?",":'').$count++ . ":{"; + $j = 1; + foreach($file as $k=>$v) { - case 'detail': - case 'thumbnail': - case 'text': - $view = $_GET['view']; - break; - default: - $view = CONFIG_DEFAULT_VIEW; + + if($k == 'ctime' || $k == 'mtime') + { + $v = @date(DATE_TIME_FORMAT, $v); + } + if($k == 'size') + { + $v = transformFileSize($v); + } + echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'"; } - }else - { - $view = CONFIG_DEFAULT_VIEW; - } - switch($view) + echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'"; + echo "}\n"; + } + $fileList = array_slice($fileList, $pagination->getPageOffset(), $pagination->getLimit());//Chamilo fix for hidden files added +$count_hideItem + + echo "};\n"; +if(!empty($_GET['view'])) +{ + switch($_GET['view']) { - case 'text': - //list file name only - include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php'); - break; + case 'detail': case 'thumbnail': - //list file with thumbnail - include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php'); + case 'text': + $view = $_GET['view']; break; - case 'detail': default: - include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php'); + $view = CONFIG_DEFAULT_VIEW; } - - - -?> \ No newline at end of file +}else +{ + $view = CONFIG_DEFAULT_VIEW; +} +switch($view) +{ + case 'text': + //list file name only + include_once(DIR_AJAX_ROOT . '_ajax_get_text_listing.php'); + break; + case 'thumbnail': + //list file with thumbnail + include_once(DIR_AJAX_ROOT . '_ajax_get_thumbnail_listing.php'); + break; + case 'detail': + default: + include_once(DIR_AJAX_ROOT . '_ajax_get_details_listing.php'); +} \ No newline at end of file