Fixing fatal errors.

main/calendar/agenda.php

@@ -9,12 +9,9 @@
  */
 use \ChamiloSession as Session;
 
-// name of the language file that needs to be included
-$language_file = array('agenda', 'group');
-
 // use anonymous mode when accessing this course tool
 $use_anonymous = true;
-require_once '../inc/global.inc.php';
+
 $current_course_tool = TOOL_CALENDAR_EVENT;
 $course_info = api_get_course_info();
 

main/calendar/myagenda.inc.php

@@ -586,7 +586,7 @@ function get_courses_of_user() {
 	$TABLECOURS = Database :: get_main_table(TABLE_MAIN_COURSE);
 	$TABLECOURSUSER = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
 	$sql_select_courses = "SELECT course.code k, course.visual_code  vc,
-                            course.title i, course.tutor_name t, course.db_name db, course.directory dir, course_rel_user.status status
+                            course.title i, course.tutor_name t, course.directory dir, course_rel_user.status status
                             FROM    $TABLECOURS       course,
                                     $TABLECOURSUSER   course_rel_user
                             WHERE course.id = course_rel_user.c_id

main/document/create_document.php

@@ -13,7 +13,7 @@
 // Name of the language file that needs to be included
 $language_file = array('document', 'gradebook');
 
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 
 api_protect_course_script();
 
@@ -199,7 +199,7 @@ if (!($is_allowed_to_edit || GroupManager::groupMemberWithUploadRights() || is_m
     api_not_allowed(true);
 }
 
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
 
 $display_dir = $dir;
 if (isset ($group_properties)) {

main/document/document.php

@@ -586,7 +586,7 @@ $(document).ready( function() {
 Display::display_header('', 'Doc');
 
 // Lib for event log, stats & tracking & record of the access
-event_access_tool(TOOL_DOCUMENT);
+Event::event_access_tool(TOOL_DOCUMENT);
 
 /* 	DISPLAY */
 if ($to_group_id != 0) { // Add group name after for group documents

main/exercice/exercice.php

@@ -16,10 +16,10 @@
 
 use \ChamiloSession as Session;
 
-$language_file = array('exercice', 'tracking');
+//$language_file = array('exercice', 'tracking');
 
 // including the global library
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 $current_course_tool = TOOL_QUIZ;
 
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be.inc.php';
@@ -185,7 +185,7 @@ if ($origin != 'learnpath') {
     Display :: display_reduced_header();
 }
 
-event_access_tool(TOOL_QUIZ);
+Event::event_access_tool(TOOL_QUIZ);
 
 // Tool introduction
 Display :: display_introduction_section(TOOL_QUIZ);

main/exercice/exercise_admin.php

@@ -17,7 +17,7 @@ use \ChamiloSession as Session;
 require_once 'exercise.class.php';
 require_once 'question.class.php';
 require_once 'answer.class.php';
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
 
 if (!api_is_allowed_to_edit(null,true)) {

main/inc/lib/course.lib.php

@@ -809,7 +809,6 @@ class CourseManager
 
         $sql_nb_cours = "SELECT course_rel_user.c_id,
                                 course.title, course.id,
-                                course.db_name,
                                 course.id as real_id
                         FROM $tbl_course_user as course_rel_user
                         INNER JOIN $tbl_course as course
@@ -821,7 +820,7 @@ class CourseManager
             $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
-                $sql_nb_cours = "    SELECT course_rel_user.c_id, course.title, course.id, course.db_name, course.id as real_id
+                $sql_nb_cours = "    SELECT course_rel_user.c_id, course.title, course.id, course.id as real_id
                     FROM $tbl_course_user as course_rel_user
                     INNER JOIN $tbl_course as course
                         ON course.id = course_rel_user.c_id

main/inc/lib/events.lib.inc.php

@@ -119,7 +119,7 @@ class Event
      *
      * 	Functionality for "what's new" notification is added by Toon Van Hoecke
      */
-    function event_access_tool($tool, $id_session = 0)
+    public static function event_access_tool($tool, $id_session = 0)
     {
         global $_configuration;
         $TABLETRACK_ACCESS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);

main/inc/lib/usermanager.lib.php

@@ -3678,7 +3678,7 @@ class UserManager
         $course_list_sql = '';
         $course_list = array();
         if(!empty($code_special_courses)) {
-            $course_list_sql = "SELECT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, course.tutor_name t, course.course_language l, course_rel_user.status s, course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
+            $course_list_sql = "SELECT course.code k, course.directory d, course.visual_code c, course.title i, course.tutor_name t, course.course_language l, course_rel_user.status s, course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
                                 FROM    ".$tbl_course_user." course_rel_user
                                 LEFT JOIN ".$tbl_course." course
                                 ON course.id = course_rel_user.c_id

src/ChamiloLMS/CoreBundle/Controller/LegacyController.php

@@ -64,9 +64,10 @@ class LegacyController extends BaseController
             $toolNameFromFile = basename(dirname($fileToLoad));
             $charset = 'UTF-8';
             // Default values
-            /*$_course = api_get_course_info();
+            $_course = api_get_course_info();
             $_user = api_get_user_info();
 
+            /*
             $text_dir = api_get_text_direction();
             $is_platformAdmin = api_is_platform_admin();
             $_cid = api_get_course_id();*/