From b913eeaabd1f1bfdf784a49ddea7f2fa30413d25 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 3 Mar 2021 14:40:35 +0100 Subject: [PATCH] Remove work.lib.php calls already added in legacy.php --- public/main/admin/teachers_time_by_session_report.php | 1 - public/main/admin/user_add.php | 2 ++ public/main/admin/user_move_stats.php | 1 - .../main/coursecopy/move_users_from_course_to_session.php | 1 - public/main/inc/ajax/work.ajax.php | 1 - public/main/inc/lib/sessionmanager.lib.php | 4 ---- public/main/mySpace/myStudents.php | 1 - public/main/mySpace/work_stats.php | 1 - public/main/plagiarism/compilatio/upload.php | 7 +++---- src/CourseBundle/Component/CourseCopy/CourseRestorer.php | 1 - 10 files changed, 5 insertions(+), 15 deletions(-) diff --git a/public/main/admin/teachers_time_by_session_report.php b/public/main/admin/teachers_time_by_session_report.php index 4b738880b1..63e0304f41 100644 --- a/public/main/admin/teachers_time_by_session_report.php +++ b/public/main/admin/teachers_time_by_session_report.php @@ -11,7 +11,6 @@ use Doctrine\Common\Collections\Criteria; $cidReset = true; require_once __DIR__.'/../inc/global.inc.php'; -require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php'; if (!api_is_platform_admin(true) && !api_is_teacher()) { api_not_allowed(true); diff --git a/public/main/admin/user_add.php b/public/main/admin/user_add.php index 3b5dcd08ae..421f034ec0 100644 --- a/public/main/admin/user_add.php +++ b/public/main/admin/user_add.php @@ -15,6 +15,8 @@ $this_section = SECTION_PLATFORM_ADMIN; api_protect_admin_script(true); api_protect_limit_for_session_admin(); +var_dump(api_get_setting('site_name')); + $is_platform_admin = api_is_platform_admin() ? 1 : 0; $message = null; diff --git a/public/main/admin/user_move_stats.php b/public/main/admin/user_move_stats.php index 0945848b1f..23f6ba5dc7 100644 --- a/public/main/admin/user_move_stats.php +++ b/public/main/admin/user_move_stats.php @@ -402,7 +402,6 @@ if (isset($_REQUEST['load_ajax'])) { $sys_course_path = api_get_path(SYS_COURSE_PATH); $course_dir = $sys_course_path.$course_info['path']; $base_work_dir = $course_dir.'/work'; - require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php'; // Creating the parent folder in the session if does not exists already //@todo ugly fix diff --git a/public/main/coursecopy/move_users_from_course_to_session.php b/public/main/coursecopy/move_users_from_course_to_session.php index 9dc53a4c0e..c7fdd01319 100644 --- a/public/main/coursecopy/move_users_from_course_to_session.php +++ b/public/main/coursecopy/move_users_from_course_to_session.php @@ -4,7 +4,6 @@ $cidReset = true; require_once __DIR__.'/../inc/global.inc.php'; -require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php'; $current_course_tool = TOOL_COURSE_MAINTENANCE; api_protect_admin_script(); diff --git a/public/main/inc/ajax/work.ajax.php b/public/main/inc/ajax/work.ajax.php index c1bee9e6dd..82146d4bb3 100644 --- a/public/main/inc/ajax/work.ajax.php +++ b/public/main/inc/ajax/work.ajax.php @@ -9,7 +9,6 @@ use Chamilo\CoreBundle\Framework\Container; require_once __DIR__.'/../global.inc.php'; -require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php'; $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null; $isAllowedToEdit = api_is_allowed_to_edit(); diff --git a/public/main/inc/lib/sessionmanager.lib.php b/public/main/inc/lib/sessionmanager.lib.php index d3854939ff..fcc3183bcf 100644 --- a/public/main/inc/lib/sessionmanager.lib.php +++ b/public/main/inc/lib/sessionmanager.lib.php @@ -2584,10 +2584,6 @@ class SessionManager return false; } - if ($importAssignments) { - require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php'; - } - $session = api_get_session_entity($sessionId); if (!$session) { diff --git a/public/main/mySpace/myStudents.php b/public/main/mySpace/myStudents.php index d3a03c385a..d16e232ab5 100644 --- a/public/main/mySpace/myStudents.php +++ b/public/main/mySpace/myStudents.php @@ -12,7 +12,6 @@ if (!isset($_GET['course'])) { } require_once __DIR__.'/../inc/global.inc.php'; -require_once '../work/work.lib.php'; api_block_anonymous_users(); diff --git a/public/main/mySpace/work_stats.php b/public/main/mySpace/work_stats.php index f7081b0925..36fe32ec17 100644 --- a/public/main/mySpace/work_stats.php +++ b/public/main/mySpace/work_stats.php @@ -3,7 +3,6 @@ /* For licensing terms, see /license.txt */ require_once __DIR__.'/../inc/global.inc.php'; -require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php'; api_protect_course_script(); diff --git a/public/main/plagiarism/compilatio/upload.php b/public/main/plagiarism/compilatio/upload.php index 9924161de7..59f9f6ac8a 100644 --- a/public/main/plagiarism/compilatio/upload.php +++ b/public/main/plagiarism/compilatio/upload.php @@ -3,7 +3,6 @@ /* For licensing terms, see /license.txt */ require_once '../../inc/global.inc.php'; -require_once '../../work/work.lib.php'; ini_set('soap.wsdl_cache_enabled', 0); ini_set('default_socket_timeout', '1000'); @@ -92,7 +91,7 @@ function sendDocument($documentId, $courseInfo) compilatioUpdateWorkDocument($documentId, $courseId); $workTable = Database::get_course_table(TABLE_STUDENT_PUBLICATION); - $query = "SELECT * FROM $workTable + $query = "SELECT * FROM $workTable WHERE id = $documentId AND c_id= $courseId"; $sqlResult = Database::query($query); $doc = Database::fetch_object($sqlResult); @@ -162,7 +161,7 @@ function getWorkTitle($docId, $courseId) $courseId = (int) $courseId; $workTable = Database::get_course_table(TABLE_STUDENT_PUBLICATION); - $sql = "SELECT title FROM $workTable + $sql = "SELECT title FROM $workTable WHERE c_id= $courseId AND id = $docId"; $res = Database::query($sql); if (Database::num_rows($res) > 0) { @@ -228,7 +227,7 @@ function compilatioUpdateWorkDocument($docId, $courseId) $newestFilename = $shortFilename.'_'.$cleanWorkTitle; rename($coursePath.$urlFile, $coursePath.$work_folder.$newestFilename); /*rename the db's input with the extension*/ - $sql = "UPDATE $workTable SET url='".$work_folder.$newestFilename."' + $sql = "UPDATE $workTable SET url='".$work_folder.$newestFilename."' WHERE c_id=$courseId AND id=$docId"; Database::query($sql); } diff --git a/src/CourseBundle/Component/CourseCopy/CourseRestorer.php b/src/CourseBundle/Component/CourseCopy/CourseRestorer.php index 4a5683d1e1..385852a7d8 100644 --- a/src/CourseBundle/Component/CourseCopy/CourseRestorer.php +++ b/src/CourseBundle/Component/CourseCopy/CourseRestorer.php @@ -3378,7 +3378,6 @@ class CourseRestorer */ public function restore_works($sessionId = 0) { - require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php'; if ($this->course->has_resources(RESOURCE_WORK)) { $table = Database::get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);