Updating libraries include references. course.lib.php and sessionmanager.lib.php added to global due the constant use in the platform (bis)

skala
Julio Montoya 14 years ago
parent 0213329a41
commit 492ce80da6
  1. 1
      main/admin/session_edit.php
  2. 1
      main/admin/session_list.php
  3. 4
      main/admin/user_move_stats.php
  4. 1
      main/calendar/allagendas.php
  5. 18
      main/inc/ajax/course_home.ajax.php
  6. 3
      main/inc/global.inc.php
  7. 87
      main/inc/lib/course.lib.php
  8. 3
      main/user/userInfo.php

@ -5,7 +5,6 @@
$language_file ='admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
// setting the section (for the tabs)
$this_section=SECTION_PLATFORM_ADMIN;

@ -8,7 +8,6 @@ $cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
$this_section = SECTION_PLATFORM_ADMIN;

@ -6,10 +6,6 @@ require_once '../inc/global.inc.php';
$this_section=SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'course.lib.php';
require_once api_get_path(LIBRARY_PATH).'tracking.lib.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
require_once '../newscorm/learnpathList.class.php';

@ -19,7 +19,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_MYAGENDA;
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
require_once 'agenda.inc.php';
require_once 'myagenda.inc.php';

@ -102,11 +102,7 @@ switch ($action) {
*/
case 'session_courses_lp_default':
require_once '../global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'sessionmanager.lib.php';
require_once $libpath.'tracking.lib.php';
require_once '../global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
@ -221,11 +217,7 @@ switch ($action) {
case 'session_courses_lp_by_week':
require_once '../global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'tracking.lib.php';
require_once $libpath.'sessionmanager.lib.php';
require_once '../global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
$page = intval($_REQUEST['page']); //page
@ -350,11 +342,7 @@ switch ($action) {
case 'session_courses_lp_by_course':
require_once '../global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'tracking.lib.php';
require_once $libpath.'sessionmanager.lib.php';
require_once '../global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
$page = intval($_REQUEST['page']); //page

@ -109,6 +109,9 @@ require_once $lib_path.'message.lib.php';
require_once $lib_path.'social.lib.php';
require_once $lib_path.'notification.lib.php';
require_once $lib_path.'course.lib.php';
require_once $lib_path.'sessionmanager.lib.php';
require_once $lib_path.'tracking.lib.php';
require_once $lib_path.'online.inc.php';

@ -605,7 +605,92 @@ class CourseManager {
}
return $result_array;
}
/**
* Get course list as coach
*
* @param int user id
* @return array course list
*
* */
public static function get_course_list_as_coach($user_id, $include_courses_in_sessions = false) {
//1. Getting courses as teacher (No session)
$courses_temp = CourseManager::get_course_list_of_user_as_course_admin($user_id);
$courses_as_admin = array();
if (!empty($courses_temp)) {
foreach($courses_temp as $course_item) {
$courses_as_admin[0][$course_item['course_code']] = $course_item['course_code'];
}
}
//2. Include courses in sessions
if ($include_courses_in_sessions) {
$sessions = Tracking::get_sessions_coached_by_user($user_id);
if (!empty($sessions)) {
foreach($sessions as $session_item) {
$courses = Tracking :: get_courses_followed_by_coach($user_id, $session_item['id']);
foreach($courses as $course_item) {
$courses_as_admin[$session_item['id']][$course_item] = $course_item;
}
}
}
}
return $courses_as_admin;
}
public static function get_user_list_from_courses_as_coach($user_id, $include_sessions = true) {
$courses_as_admin = $students_in_courses = array();
$sessions = CourseManager::get_course_list_as_coach($user_id, true);
if (!empty($sessions)) {
foreach($sessions as $session_id => $courses) {
if (!$include_sessions) {
if (!empty($session_id)) {
continue;
}
}
if (empty($session_id)) {
foreach($courses as $course_code) {
$students_in_course = CourseManager::get_user_list_from_course_code($course_code);
foreach($students_in_course as $user_item) {
//Only students
if ($user_item['status_rel'] == STUDENT)
$students_in_courses[$user_item['user_id']] = $user_item['user_id'];
}
}
} else {
$students_in_course = SessionManager::get_users_by_session($session_id, '0');
foreach($students_in_course as $user_item) {
$students_in_courses[$user_item['user_id']] = $user_item['user_id'];
}
}
}
}
$students = Tracking :: get_student_followed_by_coach($coach_id);
if (!empty($students_in_courses)) {
if (!empty($students)) {
$students = array_merge($students, $students_in_courses);
} else {
$students = $students_in_courses;
}
}
if (!empty($students)) {
$students = array_unique($students);
}
return $students;
}
/**
* @return an array with the course info of all the courses (real and virtual) of which
* the current user is course admin

@ -24,9 +24,6 @@ $language_file = array ('registration', 'userInfo');
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'tracking.lib.php';
$htmlHeadXtra[] = '<script type="text/javascript">

Loading…
Cancel
Save