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

fix lp list see #8251

Browse Source
1.10.x
Julio 10 years ago
parent 397c9dcfd1
commit 5e30d37410
2 changed files with 32 additions and 27 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. 57
      main/inc/ajax/course_home.ajax.php
  2. 2
      main/inc/lib/array.lib.php

57
main/inc/ajax/course_home.ajax.php
Unescape View File

@ -77,8 +77,6 @@ switch ($action) {
echo get_lang('PrivateAccess'); echo get_lang('PrivateAccess');
break; break;
} }
//echo Display::tag('h2', $course_info['name']);
//echo '<br />';
$sql = "SELECT * FROM $tbl_course_description $sql = "SELECT * FROM $tbl_course_description
WHERE c_id = ".$course_info['real_id']." AND session_id = 0 WHERE c_id = ".$course_info['real_id']." AND session_id = 0
@ -117,7 +115,6 @@ switch ($action) {
$session_id = intval($_REQUEST['session_id']); $session_id = intval($_REQUEST['session_id']);
$course_id = intval($_REQUEST['course_id']); $course_id = intval($_REQUEST['course_id']);
//Filter users that does not belong to the session //Filter users that does not belong to the session
if (!api_is_platform_admin()) { if (!api_is_platform_admin()) {
$new_session_list = UserManager::get_personal_session_course_list(api_get_user_id()); $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
@ -137,10 +134,10 @@ switch ($action) {
$temp = array(); $temp = array();
foreach ($course_list as $item) { foreach ($course_list as $item) {
$list = new LearnpathList(api_get_user_id(), $item['code'], $session_id); $list = new LearnpathList(api_get_user_id(), $item['code'], $session_id);
$flat_list = $list->get_flat_list(); $flat_list = $list->get_flat_list();
$lps[$item['code']] = $flat_list; $lps[$item['code']] = $flat_list;
$course_url = api_get_path(WEB_COURSE_PATH).$item['directory'].'/?id_session='.$session_id; $course_url = api_get_path(WEB_COURSE_PATH).$item['directory'].'/?id_session='.$session_id;
$item['title'] = Display::url($item['title'], $course_url, array('target' => SESSION_LINK_TARGET)); $item['title'] = Display::url($item['title'], $course_url, array('target' => SESSION_LINK_TARGET));
foreach ($flat_list as $lp_id => $lp_item) { foreach ($flat_list as $lp_id => $lp_item) {
$temp[$count]['id']= $lp_id; $temp[$count]['id']= $lp_id;
@ -162,11 +159,11 @@ switch ($action) {
if ($lp_item['modified_on'] == '0000-00-00 00:00:00' || empty($lp_item['modified_on'])) { if ($lp_item['modified_on'] == '0000-00-00 00:00:00' || empty($lp_item['modified_on'])) {
$lp_date = api_get_local_time($lp_item['created_on']); $lp_date = api_get_local_time($lp_item['created_on']);
$image = 'new.gif'; $image = 'new.gif';
$label = get_lang('LearnpathAdded'); $label = get_lang('LearnpathAdded');
} else { } else {
$lp_date = api_get_local_time($lp_item['modified_on']); $lp_date = api_get_local_time($lp_item['modified_on']);
$image = 'moderator_star.png'; $image = 'moderator_star.png';
$label = get_lang('LearnpathUpdated'); $label = get_lang('LearnpathUpdated');
} }
$icons = ''; $icons = '';
@ -199,12 +196,11 @@ switch ($action) {
Display::url($icons.' '.$lp_item['lp_name'], $lp_url, array('target'=>SESSION_LINK_TARGET)) Display::url($icons.' '.$lp_item['lp_name'], $lp_url, array('target'=>SESSION_LINK_TARGET))
); );
$temp[$count]['course'] = strip_tags($item['title']); $temp[$count]['course'] = strip_tags($item['title']);
$temp[$count]['lp'] = $lp_item['lp_name']; $temp[$count]['lp'] = $lp_item['lp_name'];
$temp[$count]['date'] = $lp_item['publicated_on']; $temp[$count]['date'] = $lp_item['publicated_on'];
$count++; $count++;
} }
} }
$temp = msort($temp, $sidx, $sord); $temp = msort($temp, $sidx, $sord);
$i =0; $i =0;
@ -279,7 +275,11 @@ switch ($action) {
$list = new LearnpathList(api_get_user_id(),$item['code'], $session_id, 'publicated_on DESC'); $list = new LearnpathList(api_get_user_id(),$item['code'], $session_id, 'publicated_on DESC');
$flat_list = $list->get_flat_list(); $flat_list = $list->get_flat_list();
$lps[$item['code']] = $flat_list; $lps[$item['code']] = $flat_list;
$item['title'] = Display::url($item['title'],api_get_path(WEB_COURSE_PATH).$item['directory'].'/?id_session='.$session_id,array('target'=>SESSION_LINK_TARGET)); $item['title'] = Display::url(
$item['title'],
api_get_path(WEB_COURSE_PATH).$item['directory'].'/?id_session='.$session_id,
array('target' => SESSION_LINK_TARGET)
);
foreach ($flat_list as $lp_id => $lp_item) { foreach ($flat_list as $lp_id => $lp_item) {
$temp[$count]['id']= $lp_id; $temp[$count]['id']= $lp_id;
@ -312,8 +312,7 @@ switch ($action) {
$date = '-'; $date = '-';
} }
//Checking LP publicated and expired_on dates // Checking LP publicated and expired_on dates
if (!empty($lp_item['publicated_on']) && $lp_item['publicated_on'] != '0000-00-00 00:00:00') { if (!empty($lp_item['publicated_on']) && $lp_item['publicated_on'] != '0000-00-00 00:00:00') {
$week_data = date('Y', api_strtotime($lp_item['publicated_on'], 'UTC')).' - '.get_week_from_day($lp_item['publicated_on']); $week_data = date('Y', api_strtotime($lp_item['publicated_on'], 'UTC')).' - '.get_week_from_day($lp_item['publicated_on']);
if ($now < api_strtotime($lp_item['publicated_on'], 'UTC')) { if ($now < api_strtotime($lp_item['publicated_on'], 'UTC')) {
@ -329,12 +328,18 @@ switch ($action) {
} }
} }
$temp[$count]['cell'] = array($week_data, $date, $item['title'], Display::url($icons.' '.$lp_item['lp_name'], $lp_url, array('target'=>SESSION_LINK_TARGET))); $temp[$count]['cell'] = array(
$week_data,
$date,
$item['title'],
Display::url($icons.' '.$lp_item['lp_name'], $lp_url, array('target' => SESSION_LINK_TARGET)),
);
$temp[$count]['course'] = strip_tags($item['title']); $temp[$count]['course'] = strip_tags($item['title']);
$temp[$count]['lp'] = $lp_item['lp_name']; $temp[$count]['lp'] = $lp_item['lp_name'];
$count++; $count++;
} }
} }
if (!empty($sidx)) { if (!empty($sidx)) {
$temp = msort($temp, $sidx, $sord); $temp = msort($temp, $sidx, $sord);
} }
@ -374,8 +379,8 @@ switch ($action) {
$sidx = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'id'; $sidx = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'id';
$sidx = str_replace(array('course asc,', ' '), '', $sidx); $sidx = str_replace(array('course asc,', ' '), '', $sidx);
$sord = $_REQUEST['sord']; //asc or desc $sord = $_REQUEST['sord']; //asc or desc
if (!in_array($sord, array('asc','desc'))) { if (!in_array($sord, array('asc', 'desc'))) {
$sord = 'desc'; $sord = 'desc';
} }
$session_id = intval($_REQUEST['session_id']); $session_id = intval($_REQUEST['session_id']);
@ -424,11 +429,11 @@ switch ($action) {
if ($lp_item['modified_on'] == '0000-00-00 00:00:00' || empty($lp_item['modified_on'])) { if ($lp_item['modified_on'] == '0000-00-00 00:00:00' || empty($lp_item['modified_on'])) {
$lp_date = api_get_local_time($lp_item['created_on']); $lp_date = api_get_local_time($lp_item['created_on']);
$image = 'new.gif'; $image = 'new.gif';
$label = get_lang('LearnpathAdded'); $label = get_lang('LearnpathAdded');
} else { } else {
$lp_date = api_get_local_time($lp_item['modified_on']); $lp_date = api_get_local_time($lp_item['modified_on']);
$image = 'moderator_star.png'; $image = 'moderator_star.png';
$label = get_lang('LearnpathUpdated'); $label = get_lang('LearnpathUpdated');
} }
$icons = ''; $icons = '';
if (strtotime($last_date) < strtotime($lp_date)) { if (strtotime($last_date) < strtotime($lp_date)) {
@ -457,8 +462,8 @@ switch ($action) {
Display::url($icons.' '.$lp_item['lp_name'], $lp_url, array('target'=>SESSION_LINK_TARGET)) Display::url($icons.' '.$lp_item['lp_name'], $lp_url, array('target'=>SESSION_LINK_TARGET))
); );
$temp[$count]['course'] = strip_tags($item['title']); $temp[$count]['course'] = strip_tags($item['title']);
$temp[$count]['lp'] = $lp_item['lp_name']; $temp[$count]['lp'] = $lp_item['lp_name'];
$temp[$count]['date'] = $lp_item['publicated_on']; $temp[$count]['date'] = $lp_item['publicated_on'];
$count++; $count++;
} }

2
main/inc/lib/array.lib.php
Unescape View File

@ -57,7 +57,7 @@ function msort($array, $id = 'id', $order = 'desc')
$lowest_id = $index; $lowest_id = $index;
} }
} else { } else {
if ($item[$id] > $array[$lowest_id][$id]) { if (isset($item[$id]) && $item[$id] > $array[$lowest_id][$id]) {
$lowest_id = $index; $lowest_id = $index;
} }
} }

Write Preview
Loading…
Cancel
Save