Use cid/sid in params

pull/3064/head
Julio 6 years ago
parent 81d71517d5
commit acb00941c4
  1. 14
      public/main/lp/learnpath.class.php
  2. 8
      public/main/lp/learnpathList.class.php
  3. 4
      public/main/lp/lp_controller.php
  4. 2
      public/main/lp/lp_stats.php
  5. 4
      public/main/lp/scorm_api.php

@ -831,7 +831,7 @@ class learnpath
Database::query($sql);
// Insert into item_property.
api_item_property_update(
/*api_item_property_update(
$courseInfo,
TOOL_LEARNPATH,
$id,
@ -845,7 +845,7 @@ class learnpath
$courseInfo,
$session_id,
$userId
);
);*/
return $id;
}
@ -4280,6 +4280,7 @@ class learnpath
$sql = "SELECT * FROM $tbl_lp
WHERE iid = $lp_id";
$result = Database::query($sql);
if (Database::num_rows($result)) {
$row = Database::fetch_array($result);
$name = Database::escape_string($row['name']);
@ -4562,10 +4563,9 @@ class learnpath
*
* @return bool
*/
public static function categoryIsPublished(
CLpCategory $category,
$courseId
) {
public static function categoryIsPublished(CLpCategory $category, $courseId)
{
return false;
$link = self::getCategoryLinkForTool($category->getId());
$em = Database::getManager();
@ -11988,7 +11988,7 @@ EOD;
// Delete link tool
$tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
$link = 'lp/lp_controller.php?cidReq='.$courseInfo['code'].'&id_session='.$sessionId.'&gidReq=0&gradebook=0&origin=&action=view_category&id='.$id;
$link = 'lp/lp_controller.php?cid='.$courseInfo['real_id'].'&sid='.$sessionId.'&gidReq=0&gradebook=0&origin=&action=view_category&id='.$id;
// Delete tools
$sql = "DELETE FROM $tbl_tool
WHERE c_id = ".$courseId." AND (link LIKE '$link%' AND image='lp_category.gif')";

@ -110,7 +110,7 @@ class LearnpathList
$link = 'lp/lp_controller.php?action=view&lp_id='.$row->getId().'&id_session='.$session_id;
$oldLink = 'newscorm/lp_controller.php?action=view&lp_id='.$row->getId().'&id_session='.$session_id;
$sql2 = "SELECT visibility FROM $tbl_tool
/*$sql2 = "SELECT visibility FROM $tbl_tool
WHERE
c_id = $course_id AND
name = '$name' AND
@ -120,12 +120,12 @@ class LearnpathList
link LIKE '$oldLink%'
)
";
$res2 = Database::query($sql2);
$res2 = Database::query($sql2);*/
$pub = 'i';
if (Database::num_rows($res2) > 0) {
/*if (Database::num_rows($res2) > 0) {
$row2 = Database::fetch_array($res2);
$pub = $row2['visibility'];
}
}*/
// Check if visible.
$visibility = api_get_item_visibility(

@ -516,7 +516,7 @@ switch ($action) {
if (!empty($sessionId)) {
$sessionInfo = api_get_session_info($sessionId);
$courseName = $sessionInfo['name'];
$courseUrl .= '?id_session='.$sessionId;
$courseUrl .= '?sid='.$sessionId;
}
$url = Display::url($courseName, $courseUrl, ['title' => get_lang('Go to the course')]);
@ -1447,7 +1447,7 @@ switch ($action) {
error_log('save_current()');
error_log('save_last()');
}
$url = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php?id_session='.api_get_session_id();
$url = $_course['course_public_url'].'?sid='.api_get_session_id();
$redirectTo = isset($_GET['redirectTo']) ? $_GET['redirectTo'] : '';
switch ($redirectTo) {
case 'lp_list':

@ -16,7 +16,7 @@ if (!isset($origin)) {
$origin = 'learnpath';
}
$sessionId = isset($_GET['id_session']) ? (int) $_GET['id_session'] : api_get_session_id();
$sessionId = isset($_GET['sid']) ? (int) $_GET['sid'] : api_get_session_id();
$courseCode = isset($_GET['course']) ? $_GET['course'] : api_get_course_id();
$userId = isset($_GET['student_id']) ? (int) $_GET['student_id'] : api_get_user_id();
$lpId = isset($_GET['lp_id']) ? $_GET['lp_id'] : null;

@ -214,7 +214,7 @@ olms.userfname = '<?php echo addslashes(trim($user['firstname'])); ?>';
olms.userlname = '<?php echo addslashes(trim($user['lastname'])); ?>';
olms.execute_stats = false;
var courseUrl = '?cidReq='+olms.lms_course_code+'&id_session='+olms.lms_session_id;
var courseUrl = '?cid='+olms.lms_course_id+'&sid='+olms.lms_session_id;
/**
* Add the "addListeners" function to the "onload" event of the window and
@ -1662,7 +1662,7 @@ function switch_item(current_item, next_item)
}
var mysrc = '<?php echo api_get_path(WEB_CODE_PATH); ?>lp/lp_controller.php?action=content&lp_id=' + olms.lms_lp_id +
'&item_id=' + next_item + '&cidReq=' + olms.lms_course_code + '&id_session=' + olms.lms_session_id;
'&item_id=' + next_item + '&cid=' + olms.lms_course_id + '&sid=' + olms.lms_session_id;
var cont_f = $("#content_id");
<?php if ($oLP->mode == 'fullscreen') {

Loading…
Cancel
Save