From bdbc1449b9729031bc3150150af310ffbd1c22ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Wed, 11 May 2011 18:17:33 +0200 Subject: [PATCH] Feature #2479 fix show size when a file is uploaded, pasted from advanced HTML editor --- .../editor/plugins/ajaxfilemanager/ajax_file_paste.php | 4 ++-- .../editor/plugins/ajaxfilemanager/ajax_file_upload.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_paste.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_paste.php index 6fa8a2b9ce..a2f6a9fb50 100755 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_paste.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_paste.php @@ -99,10 +99,10 @@ { $mainPath= getParentFolderPath($folderInfo['path']);// from ajaxfilemanager sample ../../../../../../../courses/TEST/document/ - $fullPath=$tem['final_path'];// from ajaxfilemanager sample ../../../../../../../courses/TEST/document/icons/book_highlight.jpg + $fullPath=$tem['final_path'];// from ajaxfilemanager sample ../../../../../../../courses/TEST/document/icons/book_highlight.jpg $chamiloFolder = substr($fullPath, strlen($mainPath)-strlen($fullPath)-1); // sample /icons/book_highlight.jpg or /icons $chamiloFile = $tem['name']; //get ajaxmanager - $chamiloFileSize = $tem['size'];//get ajaxmanager //TODO:change by filesize($tem)? + $chamiloFileSize = filesize($fullPath);//get ajaxmanager if(!empty($group_properties['directory'])){ $chamiloFolder=$group_properties['directory'].$chamiloFolder;//get Chamilo } diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_upload.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_upload.php index ad0f6d2c3e..57fc5b7aad 100755 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_upload.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_upload.php @@ -76,7 +76,7 @@ $mainPath= getParentFolderPath($folderInfo['path']);//get ajaxmanager. Sample ../../../../../../../courses/TEST/document/Grupo_1_groupdocs/ $chamiloFolder = substr($fullPath, strlen($mainPath)-strlen($fullPath)-1); $chamiloFile = $tem['name']; //get ajaxmanager - $chamiloFileSize = $tem['size'];//get ajaxmanager + $chamiloFileSize = filesize($fullPath); //get ajaxmanager if(!empty($group_properties['directory'])) //get Chamilo { $chamiloFolder=$group_properties['directory'].$chamiloFolder;//get Chamilo