Remove survey.lib.php already loaded by composer

main/coursecopy/classes/CourseRestorer.class.php

@@ -1823,7 +1823,6 @@ class CourseRestorer
 						case FILE_OVERWRITE:
 							// Delete the existing survey with the same code and language and import the one of the source course
 							// getting the information of the survey (used for when the survey is shared)
-							require_once(api_get_path(SYS_CODE_PATH).'survey/survey.lib.php');
 
 							$sql_select_existing_survey = "SELECT * FROM $table_sur WHERE c_id = ".$this->destination_course_id." AND survey_id='".self::DBUTF8escapestring(Database::result($result_check,0,0))."'";
 							$result = Database::query($sql_select_existing_survey);

main/mySpace/myStudents.php

@@ -20,8 +20,6 @@ $language_file = array(
 
 require_once '../inc/global.inc.php';
 
-require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';
-
 api_block_anonymous_users();
 
 if (!api_is_allowed_to_create_course() && !api_is_session_admin() && !api_is_drh() && !api_is_student_boss()) {

main/survey/fillsurvey.php

@@ -22,10 +22,6 @@ if (!isset($_GET['cidReq'])) {
 // Including the global initialization file
 require_once '../inc/global.inc.php';
 
-// Including additional libraries
-//require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
-require_once 'survey.lib.php';
-
 // Breadcrumbs
 if (!empty($_user)) {
     $interbreadcrumb[] = array(
@@ -1137,7 +1133,7 @@ if ($survey_data['survey_type'] === '0') {
         if (($show < $numberofpages) || !$_GET['show']) { //$show = $_GET['show'] + 1
             if ($show == 0) {
                 echo '<button type="submit" name="next_survey_page" class="survey-next">'.get_lang('StartSurvey').'</button>';
-            } else {                   
+            } else {
                 echo '<button type="submit" name="next_survey_page" class="survey-next">'.get_lang('Next').'</button>';
             }
         }
@@ -1150,8 +1146,8 @@ if ($survey_data['survey_type'] === '0') {
             $numberofpages = count($paged_questions);
             if (($show < $numberofpages) || !$_GET['show']) { //$show = $_GET['show'] + 1
                 if ($show == 0) {
-                    echo '<button type="submit" name="next_survey_page" class="next">'.get_lang('StartSurvey').'</button>';    
-                } else {                   
+                    echo '<button type="submit" name="next_survey_page" class="next">'.get_lang('StartSurvey').'</button>';
+                } else {
                     echo '<button type="submit" name="next_survey_page" class="next">'.get_lang('Next').'</button>';
                 }
             }

main/survey/reporting.php

@@ -15,7 +15,7 @@ $language_file = 'survey';
 
 // Including the global initialization file
 require_once '../inc/global.inc.php';
-require_once 'survey.lib.php';
+
 $this_section = SECTION_COURSES;
 $cidReq = api_get_cidreq();
 $survey_id = intval($_GET['survey_id']);

main/survey/survey.download.inc.php

@@ -11,10 +11,8 @@
  *	by document/download.php
  */
 
-function check_download_survey($course, $invitation, $doc_url) {
-
-	require_once 'survey.lib.php';
-
+function check_download_survey($course, $invitation, $doc_url)
+{
 	// Getting all the course information
 	$_course = CourseManager::get_course_information($course);
     $course_id = $_course['real_id'];

main/survey/survey.php

@@ -20,9 +20,6 @@ $current_course_tool  = TOOL_SURVEY;
 
 api_protect_course_script(true);
 
-// Including additional libraries
-require_once 'survey.lib.php';
-
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 // Coach can't view this page
 $extend_rights_for_coachs = api_get_setting('extend_rights_for_coach_on_survey');

main/survey/survey_invitation.php

@@ -15,9 +15,6 @@ $language_file = 'survey';
 // Including the global initialization file
 require '../inc/global.inc.php';
 
-// Including additional libraries
-require_once 'survey.lib.php';
-
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false, true)) {
 	Display :: display_header(get_lang('ToolSurvey'));

main/survey/survey_invite.php

@@ -19,9 +19,6 @@ $language_file = 'survey';
 // Including the global initialization file
 require_once '../inc/global.inc.php';
 
-// Including additional libraries
-require_once 'survey.lib.php';
-
 $this_section = SECTION_COURSES;
 
 if (!api_is_allowed_to_edit(false, true)) {

main/survey/survey_list.php

@@ -27,9 +27,6 @@ $current_course_tool = TOOL_SURVEY;
 api_protect_course_script(true);
 $action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : null;
 
-// Including additional libraries
-require_once 'survey.lib.php';
-
 // Tracking
 Event::event_access_tool(TOOL_SURVEY);
 

main/tracking/courseLog.php

@@ -76,7 +76,6 @@ if (api_is_drh()) {
 
 // Including additional libraries.
 require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
-require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';
 
 if ($export_csv) {
     if (!empty($session_id)) {

main/tracking/course_log_resources.php

@@ -36,7 +36,6 @@ if (!$is_allowedToTrack) {
 
 // Including additional libraries.
 require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
-require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';
 
 // Starting the output buffering when we are exporting the information.
 $export_csv = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false;

main/tracking/course_log_tools.php

@@ -38,7 +38,6 @@ if (!$is_allowedToTrack) {
 
 // Including additional libraries.
 require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
-require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';
 
 $TABLEQUIZ              = Database::get_course_table(TABLE_QUIZ_TEST);