diff --git a/main/document/save_pixlr.php b/main/document/save_pixlr.php index f836a2850c..9fe49df5a8 100755 --- a/main/document/save_pixlr.php +++ b/main/document/save_pixlr.php @@ -12,7 +12,6 @@ * Code */ require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; api_protect_course_script(); api_block_anonymous_users(); diff --git a/main/document/showinframesmin.php b/main/document/showinframesmin.php index a52723afc6..70fdac007e 100755 --- a/main/document/showinframesmin.php +++ b/main/document/showinframesmin.php @@ -12,9 +12,6 @@ $language_file[] = 'document'; require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'document.lib.php'; -require_once api_get_path(LIBRARY_PATH).'glossary.lib.php'; -require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php'; // Protection api_protect_course_script(); diff --git a/main/dropbox/dropbox_submit.php b/main/dropbox/dropbox_submit.php index c53823cf92..534e157420 100755 --- a/main/dropbox/dropbox_submit.php +++ b/main/dropbox/dropbox_submit.php @@ -16,7 +16,6 @@ * - UPLOAD NEW FILE */ if (isset($_POST['submitWork'])) { - require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'; $error = false; $errormsg = ''; /** diff --git a/main/exercice/Hpdownload.php b/main/exercice/Hpdownload.php index c645981b62..ace2022863 100755 --- a/main/exercice/Hpdownload.php +++ b/main/exercice/Hpdownload.php @@ -68,7 +68,6 @@ header('Last-Modified: '.gmdate('D, d M Y H:i:s',time()+10).' GMT'); */ if ($content_type == 'text/html') { - require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; $directory_name = dirname($full_file_name); $dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name); diff --git a/main/exercice/admin.php b/main/exercice/admin.php index 602aab1b26..c3099d3bf0 100755 --- a/main/exercice/admin.php +++ b/main/exercice/admin.php @@ -64,8 +64,6 @@ if (!$is_allowedToEdit) { api_not_allowed(true); } -require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; -require_once api_get_path(LIBRARY_PATH).'document.lib.php'; /* stripslashes POST data */ if($_SERVER['REQUEST_METHOD'] == 'POST') { foreach($_POST as $key=>$val) { diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php index 05590b70d8..dd1d41c898 100755 --- a/main/forum/forumfunction.inc.php +++ b/main/forum/forumfunction.inc.php @@ -3936,7 +3936,6 @@ function search_link() */ function add_forum_attachment_file($file_comment, $last_id) { - require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'; $_course = api_get_course_info(); $agenda_forum_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT); diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php index 3b6e5da3c6..0541f8aa42 100755 --- a/main/inc/lib/document.lib.php +++ b/main/inc/lib/document.lib.php @@ -2396,8 +2396,6 @@ class DocumentManager $origin_course_path_from_zip = null, $origin_course_info_path = null ) { - require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'; - if (empty($content_html)) { return false; } @@ -2716,8 +2714,6 @@ class DocumentManager $index_document = false, $show_output = false ) { - require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'; - $course_info = api_get_course_info(); $sessionId = api_get_session_id(); $course_dir = $course_info['path'] . '/document'; diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php index 311140143f..802da8d58c 100755 --- a/main/inc/lib/extra_field.lib.php +++ b/main/inc/lib/extra_field.lib.php @@ -1225,7 +1225,6 @@ EOF; } break; case ExtraField::FIELD_TYPE_FILE: - require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'; $fieldVariable = "extra_{$field_details['field_variable']}"; diff --git a/main/inc/lib/jpegcam/webcam_receiver.php b/main/inc/lib/jpegcam/webcam_receiver.php index 1c259abc8e..d08962ab22 100755 --- a/main/inc/lib/jpegcam/webcam_receiver.php +++ b/main/inc/lib/jpegcam/webcam_receiver.php @@ -4,8 +4,6 @@ /* Receives JPEG webcam submission and saves to local file. */ /* Make sure your directory has permission to write files as your web server user! */ require_once '../../../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; -require_once api_get_path(LIBRARY_PATH).'document.lib.php'; ////Add security from Chamilo api_protect_course_script(); api_block_anonymous_users(); diff --git a/main/inc/lib/nanogong.lib.php b/main/inc/lib/nanogong.lib.php index 0029893dd5..d0a111ec34 100755 --- a/main/inc/lib/nanogong.lib.php +++ b/main/inc/lib/nanogong.lib.php @@ -286,7 +286,6 @@ class Nanogong */ public function upload_file($is_nano = false) { - require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; if (!empty($_FILES)) { $upload_ok = process_uploaded_file($_FILES['file'], false); diff --git a/main/inc/lib/nanogong/receiver.php b/main/inc/lib/nanogong/receiver.php index 388d1280a1..43814f0a70 100755 --- a/main/inc/lib/nanogong/receiver.php +++ b/main/inc/lib/nanogong/receiver.php @@ -13,7 +13,6 @@ * Code */ require_once '../../../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; api_protect_course_script(); api_block_anonymous_users(); diff --git a/main/inc/lib/nanogong/upload_nanogong_file.php b/main/inc/lib/nanogong/upload_nanogong_file.php index e7c75788f2..3b8e3025d6 100755 --- a/main/inc/lib/nanogong/upload_nanogong_file.php +++ b/main/inc/lib/nanogong/upload_nanogong_file.php @@ -13,7 +13,6 @@ * Code */ require_once '../../../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; api_protect_course_script(); api_block_anonymous_users(); diff --git a/main/inc/lib/svg-edit/extensions/savefile_config.php b/main/inc/lib/svg-edit/extensions/savefile_config.php index 49313b1ffa..36d377b4d4 100755 --- a/main/inc/lib/svg-edit/extensions/savefile_config.php +++ b/main/inc/lib/svg-edit/extensions/savefile_config.php @@ -16,8 +16,6 @@ $language_file = array('document');//Chamilo load lang var //Chamilo load libraries require_once '../../../../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; -require_once api_get_path(LIBRARY_PATH).'document.lib.php'; //Add security from Chamilo api_protect_course_script(); diff --git a/main/inc/lib/wami-recorder/record_document.php b/main/inc/lib/wami-recorder/record_document.php index 34375a7518..f4a77c56b9 100755 --- a/main/inc/lib/wami-recorder/record_document.php +++ b/main/inc/lib/wami-recorder/record_document.php @@ -3,8 +3,6 @@ $language_file = array('document'); require_once '../../../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; -require_once api_get_path(LIBRARY_PATH).'document.lib.php'; // Add security from Chamilo api_protect_course_script(); diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index e012a79e4b..b271ae0b07 100755 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -253,8 +253,6 @@ class learnpath } break; case 2: - require_once 'scorm.class.php'; - require_once 'scormItem.class.php'; $oItem = new scormItem('db', $row['id'], $course_id); if (is_object($oItem)) { $my_item_id = $oItem->get_id(); @@ -639,9 +637,6 @@ class learnpath api_get_session_id() ); } - - // Upload the file in the documents tool. - include_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; $file_path = handle_uploaded_document( $_course, $_FILES['mp3'], @@ -8315,7 +8310,6 @@ class learnpath if ($arrLP[$i]['item_type'] == TOOL_QUIZ) { // lets update max_score Quiz information depending of the Quiz Advanced properties - require_once api_get_path(LIBRARY_PATH)."lp_item.lib.php"; $tmp_obj_lp_item = new LpItem($course_id, $arrLP[$i]['id']); $tmp_obj_exercice = new Exercise(); $tmp_obj_exercice->read($tmp_obj_lp_item->path); @@ -9483,9 +9477,6 @@ EOD; $res = unlink($file); if ($res === false) { error_log('Could not delete temp file '.$file.' '.__FILE__.' '.__LINE__, 0); } } - // Send file to client. - require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; - $name = replace_dangerous_char($this->get_name()).'.zip'; DocumentManager::file_send_for_download($temp_zip_file, true, $name); } diff --git a/main/newscorm/lp_admin_view.php b/main/newscorm/lp_admin_view.php index 47cd83bc07..127efca70d 100755 --- a/main/newscorm/lp_admin_view.php +++ b/main/newscorm/lp_admin_view.php @@ -142,7 +142,6 @@ if (isset($_POST['save_audio'])) { } // Upload the file in the documents tool. - include_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; $file_path = handle_uploaded_document($_course, $_FILES[$key], api_get_path(SYS_COURSE_PATH).$_course['path'].'/document','/audio', api_get_user_id(), '', '', '', '', false); // Getting the filename only. diff --git a/main/newscorm/lp_impress.php b/main/newscorm/lp_impress.php index 2688951fa2..93af893daa 100755 --- a/main/newscorm/lp_impress.php +++ b/main/newscorm/lp_impress.php @@ -5,12 +5,8 @@ * * @package chamilo.learnpath */ -/** - * Code - */ require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH) . 'banner.lib.php'; $_SESSION['whereami'] = 'lp/impress'; $this_section = SECTION_COURSES; diff --git a/main/resourcelinker/resourcelinker.php b/main/resourcelinker/resourcelinker.php index f1c2fe84c8..47bc9b9d48 100755 --- a/main/resourcelinker/resourcelinker.php +++ b/main/resourcelinker/resourcelinker.php @@ -28,7 +28,7 @@ api_protect_course_script(); Libraries ----------------------------------------------------------- */ -include_once (api_get_path(LIBRARY_PATH)."fileUpload.lib.php"); + include ('resourcelinker.inc.php'); /* diff --git a/main/upload/index.php b/main/upload/index.php index 90a9d7993b..30def04084 100755 --- a/main/upload/index.php +++ b/main/upload/index.php @@ -54,9 +54,6 @@ if(!$is_allowed_to_edit){ api_not_allowed(true); } -require_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'); -require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php'); - $courseDir = $_course['path'] . "/document"; $sys_course_path = api_get_path(SYS_COURSE_PATH); $base_work_dir = $sys_course_path . $courseDir; diff --git a/main/upload/upload_ppt.php b/main/upload/upload_ppt.php index bc8c962f55..9237c078aa 100755 --- a/main/upload/upload_ppt.php +++ b/main/upload/upload_ppt.php @@ -15,11 +15,7 @@ $language_file[] = "document"; $language_file[] = "learnpath"; $language_file[] = "scormdocument"; -// global settings initialisation -// also provides access to main api (inc/lib/main_api.lib.php) require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'; -require_once api_get_path(LIBRARY_PATH) . 'document.lib.php'; $htmlHeadXtra[] = ''; $htmlHeadXtra[] = '