chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

should fix bug when 2 courses are showed at the same time in userportal

Browse Source
skala
Julio Montoya 13 years ago
parent 401af69153
commit 90652cc797
3 changed files with 30 additions and 16 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 27
      main/inc/lib/course.lib.php
  2. 18
      main/inc/lib/userportal.lib.php
  3. 1
      user_portal.php

27
main/inc/lib/course.lib.php
Unescape View File

@ -2970,15 +2970,15 @@ class CourseManager {
$current_url_id = api_get_current_access_url_id();
// Get course list auto-register
$special_course_list = self::get_special_course_list();
$special_course_list = self::get_special_course_list();
$without_special_courses = '';
if (!empty($special_course_list)) {
$without_special_courses = ' AND course.code NOT IN ("'.implode('","',$special_course_list).'")';
}
//AND course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
$sql_select_courses = "SELECT course.id, course.code, course.subscribe subscr, course.unsubscribe unsubscr, course_rel_user.status status,
$sql = "SELECT course.id, course.code, course.subscribe subscr, course.unsubscribe unsubscr, course_rel_user.status status,
course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
FROM $TABLECOURS course,
$TABLECOURSUSER course_rel_user, ".$TABLE_ACCESS_URL_REL_COURSE." url
@ -2988,14 +2988,16 @@ class CourseManager {
// If multiple URL access mode is enabled, only fetch courses
// corresponding to the current URL.
if (api_get_multiple_access_url() && $current_url_id != -1) {
$sql_select_courses .= " AND url.course_code=course.code AND access_url_id='".$current_url_id."'";
$sql .= " AND url.course_code=course.code AND access_url_id='".$current_url_id."'";
}
// Use user's classification for courses (if any).
$sql_select_courses .= " ORDER BY course_rel_user.user_course_cat, course_rel_user.sort ASC";
$result = Database::query($sql_select_courses);
$key = 0;
$sql .= " ORDER BY course_rel_user.user_course_cat, course_rel_user.sort ASC";
$result = Database::query($sql);
$status_icon = '';
$html = '';
$course_list = array();
// Browse through all courses.
while ($course = Database::fetch_array($result)) {
@ -3003,6 +3005,13 @@ class CourseManager {
//$course['id_session'] = null;
$course_info['id_session'] = null;
$course_info['status'] = $course['status'];
//In order to avoid doubles
if (in_array($course_info['real_id'], $course_list)) {
continue;
} else {
$course_list[] = $course_info['real_id'];
}
// For each course, get if there is any notification icon to show
// (something that would have changed since the user's last visit).
@ -3038,6 +3047,7 @@ class CourseManager {
}
}
}
$course_title = $course_info['title'];
$course_title_url = '';
@ -3069,8 +3079,7 @@ class CourseManager {
if (empty($user_category_id)) {
$is_subcontent = false;
}
$html .= self::course_item_html($params, $is_subcontent);
$key++;
$html .= self::course_item_html($params, $is_subcontent);
}
return $html;
}

18
main/inc/lib/userportal.lib.php
Unescape View File

@ -858,23 +858,26 @@ class IndexManager {
$load_history = (isset($_GET['history']) && intval($_GET['history']) == 1) ? true : false;
if ($load_history) {
//Load courses history
//Load sessions in category in *history*
$courses_tree = UserManager::get_sessions_by_category($user_id, true, true, true);
if (empty($courses_tree[0]) && count($courses_tree) == 1) {
$courses_tree = null;
}
} else {
//Load current courses
//Load sessions in category
$courses_tree = UserManager::get_sessions_by_category($user_id, true, false, true);
}
if (!empty($courses_tree)) {
foreach ($courses_tree as $cat => $sessions) {
foreach ($courses_tree as $cat => $sessions) {
//Get session category
$courses_tree[$cat]['details'] = SessionManager::get_session_category($cat);
//Get courses
if ($cat == 0) {
$courses_tree[$cat]['courses'] = CourseManager::get_courses_list_by_user_id($user_id, false);
$courses_tree[$cat]['courses'] = CourseManager::get_courses_list_by_user_id($user_id, false);
}
$courses_tree[$cat]['sessions'] = array_flip(array_flip($sessions));
//Get courses in sessions
if (count($courses_tree[$cat]['sessions']) > 0) {
@ -886,7 +889,9 @@ class IndexManager {
}
}
$html = '';
$html = '';
//Showing history title
if ($load_history) {
$html .= Display::page_subheader(get_lang('HistoryTrainingSession'));
@ -897,9 +902,8 @@ class IndexManager {
if (is_array($courses_tree)) {
foreach ($courses_tree as $key => $category) {
// Sessions and courses that are not in a session category
if ($key == 0) {
// Sessions and courses that are not in a session category.
// If we're not in the history view...
if (!isset($_GET['history'])) {
//Display special courses

1
user_portal.php
Unescape View File

@ -168,6 +168,7 @@ if (api_get_setting('allow_browser_sniffer') == 'true') {
$sniff_notification = '';
$some_activex=$_SESSION['sniff_check_some_activex'];
$some_plugins=$_SESSION['sniff_check_some_plugins'];
if(!empty($some_activex) || !empty($some_plugins)){
if (! preg_match("/flash_yes/", $some_activex) && ! preg_match("/flash_yes/", $some_plugins)) {
$sniff_notification = Display::return_message(get_lang('NoFlash'), 'warning', true);

Write Preview
Loading…
Cancel
Save