diff --git a/documentation/changelog.html b/documentation/changelog.html index 3d7345687b..258beaa638 100755 --- a/documentation/changelog.html +++ b/documentation/changelog.html @@ -58,6 +58,75 @@

Removals

+

Chamilo 1.9.10.2 - Sipán, 19th of March, 2015

+

Release notes - summary

+

Chamilo 1.9.10.2 is a patch (minor) version of the 1.9.x branch, with + bugfixes and a few new minor features, but more importantly fixes for + vulnerabilities discovered in 1.9.10 and previous versions (as such, you + can just overwrite previous files to upgrade from 1.9.8, 1.9.8.1 or + 1.9.8.2 to 1.9.10.2).

+

See our Security page for more information.

+

Release name

+

Sipán + is a small city on the Peruvian Coast where the remains of the Lord of Sipán + (a ruler of the 3rd century AC) were discovered in 1987. It held many well-conserved + offerings. We believe this version of Chamilo, containing additional fixes on + top of an excellent 1.9.10 version, has its fair share of common points with Sipán.

+

Security fixes

+ +

Improvements (minor features) and debug

+ + +

Chamilo 1.9.10 - Huánuco, 25th of January, 2015

Release notes - summary

Chamilo 1.9.10 is a new minor version of the 1.9.x branch, with many bugfixes and a few interesting new features (as such, you can just overwrite previous files to upgrade from 1.9.8, 1.9.8.1 or 1.9.8.2 to 1.9.10).

diff --git a/main/css/base.css b/main/css/base.css index 3e036ba4aa..11e3c70b71 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -2680,7 +2680,7 @@ div.admin_section h4 { } .ribbon .rib-total { - width: 275px; + width: 275px !important; } .ribbon .rib-error, .ribbon .ribbon-total-error { diff --git a/main/inc/introductionSection.inc.php b/main/inc/introductionSection.inc.php index a86601503e..cad1e78f2d 100755 --- a/main/inc/introductionSection.inc.php +++ b/main/inc/introductionSection.inc.php @@ -296,7 +296,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) { $thematic_description_html .= '
'.$subTitle2.'
-

'.$thematic_info['title'].'

+

'.$thematic_info2['title'].'

'.$thematic_advance_info2['start_date'].'

'.$thematic_advance_info2['content'].'

'.get_lang('DurationInHours').' : '.$thematic_advance_info2['duration'].' - '.get_lang('SeeDetail').'

diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index 0f6c183229..32b5773aea 100755 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -1136,7 +1136,7 @@ class IndexManager 'window_list.png', $session_box['title'], array('id' => 'session_img_' . $session_id), - ICON_SIZE_LARGE + ICON_SIZE_BIG ); $extra_info = !empty($session_box['coach']) ? $session_box['coach'] : null; $extra_info .= !empty($session_box['coach']) ? ' - '.$session_box['dates'] : $session_box['dates']; @@ -1270,7 +1270,7 @@ class IndexManager 'window_list.png', $session_box['title'], array('id' => 'session_img_' . $session_id), - ICON_SIZE_LARGE + ICON_SIZE_BIG ); if (api_is_drh()) { diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php index a85f16d920..2dfd5b802a 100755 --- a/main/tracking/courseLog.php +++ b/main/tracking/courseLog.php @@ -50,21 +50,28 @@ if (api_is_drh()) { if (api_drh_can_access_all_session_content()) { // If the drh has been configured to be allowed to see all session content, give him access to the session courses $coursesFromSession = SessionManager::getAllCoursesFollowedByUser(api_get_user_id(), null); + + $coursesFromSessionCodeList = array(); if (!empty($coursesFromSession)) { - $coursesFromSession = array_keys($coursesFromSession); + foreach ($coursesFromSession as $course) { + $coursesFromSessionCodeList[$course['code']] = $course['code']; + } } $coursesFollowedList = CourseManager::get_courses_followed_by_drh(api_get_user_id()); + if (!empty($coursesFollowedList)) { $coursesFollowedList = array_keys($coursesFollowedList); } + if (!in_array($courseCode, $coursesFollowedList)) { - if (!in_array($courseCode, $coursesFromSession)) { + if (!in_array($courseCode, $coursesFromSessionCodeList)) { api_not_allowed(); } } } else { - // If the drh has *not* been configured to be allowed to see all session content, then check if he has also been given access to the corresponding courses + // If the drh has *not* been configured to be allowed to see all session content, + // then check if he has also been given access to the corresponding courses $coursesFollowedList = CourseManager::get_courses_followed_by_drh(api_get_user_id()); $coursesFollowedList = array_keys($coursesFollowedList); if (!in_array(api_get_course_id(), $coursesFollowedList)) {