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

Adding constant SESSION_LINK_TARGET see #3328

Browse Source
skala
Julio Montoya 14 years ago
parent bb66ae72f3
commit 149052c8f7
3 changed files with 15 additions and 14 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. 18
      main/inc/ajax/course_home.ajax.php
  2. 8
      main/inc/lib/tracking.lib.php
  3. 3
      main/session/index.php

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

@ -147,7 +147,7 @@ switch ($action) {
$flat_list = $list->get_flat_list();
$lps[$item['code']] = $flat_list;
$course_url = api_get_path(WEB_COURSE_PATH).$item['directory'].'/?id_session='.$session_id;
$item['title'] = Display::url($item['title'], $course_url, array('target'=>'_blank'));
$item['title'] = Display::url($item['title'], $course_url, array('target'=>SESSION_LINK_TARGET));
foreach($flat_list as $lp_id => $lp_item) {
$temp[$count]['id']= $lp_id;
$lp_url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
@ -184,7 +184,7 @@ switch ($action) {
}
}
$temp[$count]['cell']=array($date, $item['title'], Display::url($lp_item['lp_name'].$icons, $lp_url, array('target'=>'_blank')));
$temp[$count]['cell']=array($date, $item['title'], Display::url($lp_item['lp_name'].$icons, $lp_url, array('target'=>SESSION_LINK_TARGET)));
$count++;
}
}
@ -269,7 +269,7 @@ switch ($action) {
$list = new LearnpathList(api_get_user_id(),$item['code'], $session_id, 'publicated_on DESC');
$flat_list = $list->get_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'=>'_blank'));
$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) {
$temp[$count]['id']= $lp_id;
@ -311,7 +311,7 @@ switch ($action) {
}
}
$temp[$count]['cell'] = array($week_data, $date, $item['title'], Display::url($lp_item['lp_name'].$icons, $lp_url, array('target'=>'_blank')));
$temp[$count]['cell'] = array($week_data, $date, $item['title'], Display::url($lp_item['lp_name'].$icons, $lp_url, array('target'=>SESSION_LINK_TARGET)));
$count++;
}
}
@ -395,7 +395,7 @@ switch ($action) {
$list = new LearnpathList(api_get_user_id(),$item['code'],$session_id);
$flat_list = $list->get_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'=>'_blank'));
$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) {
$temp[$count]['id']= $lp_id;
$lp_url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
@ -423,15 +423,13 @@ switch ($action) {
if ($now < api_strtotime($lp_item['publicated_on'])) {
continue;
}
}
}
if (!empty($lp_item['expired_on']) && $lp_item['expired_on'] != '0000-00-00 00:00:00') {
if ($now > api_strtotime($lp_item['expired_on'])) {
continue;
}
}
$temp[$count]['cell']=array($date, $item['title'], Display::url($lp_item['lp_name'].$icons, $lp_url, array('target'=>'_blank')));
}
$temp[$count]['cell']=array($date, $item['title'], Display::url($lp_item['lp_name'].$icons, $lp_url, array('target'=>SESSION_LINK_TARGET)));
$count++;
}
}

8
main/inc/lib/tracking.lib.php
Unescape View File

@ -8,6 +8,8 @@
* @author Julio Montoya <gugli100@gmail.com> (Score average fixes)
*/
define('SESSION_LINK_TARGET','_self');
class Tracking {
/**
@ -1978,7 +1980,7 @@ class Tracking {
$html .= '<tr class="row_even">';
}
$url = api_get_course_url($enreg['code'], $session_id);
$course_url = Display::url($enreg['title'], $url);
$course_url = Display::url($enreg['title'], $url, array('target'=>SESSION_LINK_TARGET));
$html .= '<td>'.$course_url.'</td>';
$html .= '<td align="center">'.$time.'</td>';
@ -2151,7 +2153,7 @@ class Tracking {
}
$url = api_get_course_url($enreg['code'], $key);
$course_url = Display::url($enreg['title'], $url, array('target'=>'_blank'));
$course_url = Display::url($enreg['title'], $url, array('target'=>SESSION_LINK_TARGET));
$html .= Display::tag('td', $course_url);
$html .= Display::tag('td', $stats_array[$enreg['code']]['exercises']);
@ -2308,7 +2310,7 @@ class Tracking {
$html .= '<tr class="row_even">';
$url = api_get_path(WEB_CODE_PATH)."exercice/exercice_submit.php?cidReq={$course_info['code']}&id_session=$session_id&exerciseId={$exercices['id']}";
$exercices['title'] = Display::url($exercices['title'], $url, array('target'=>'_blank'));
$exercices['title'] = Display::url($exercices['title'], $url, array('target'=>SESSION_LINK_TARGET));
$html .= Display::tag('td', $exercices['title']);
//Exercise configuration show results show results or show only score

3
main/session/index.php
Unescape View File

@ -11,6 +11,7 @@ $language_file = array('courses', 'index','tracking','exercice', 'admin');
$cidReset = true;
require_once '../inc/global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'course.lib.php';
//require_once $libpath.'usermanager.lib.php';
require_once $libpath.'sessionmanager.lib.php';
@ -185,7 +186,7 @@ foreach($final_array as $session_data) {
continue;
}
}
$exercise_info->exercise = Display::url($exercise_info->exercise, api_get_path(WEB_CODE_PATH)."exercice/exercice_submit.php?cidReq=$my_course_code&exerciseId={$exercise_info->id}&id_session=$session_id", array('target'=>'_blank'));
$exercise_info->exercise = Display::url($exercise_info->exercise, api_get_path(WEB_CODE_PATH)."exercice/exercice_submit.php?cidReq=$my_course_code&exerciseId={$exercise_info->id}&id_session=$session_id", array('target'=>SESSION_LINK_TARGET));
$new_exercises[]= array( //'date' => api_get_local_time($exercise_result['exe_date']),
'status' => Display::return_icon('star.png', get_lang('New'), array('width'=>'22')),
'date' => $start_date,

Write Preview
Loading…
Cancel
Save