diff --git a/public/main/cron/check_lp_total_time.php b/public/main/cron/check_lp_total_time.php index 1aa8f18b86..ab1870e227 100644 --- a/public/main/cron/check_lp_total_time.php +++ b/public/main/cron/check_lp_total_time.php @@ -115,13 +115,13 @@ function compareLpTimeAndCourseTime($user, $courseInfo, $sessionId = 0) $content .= PHP_EOL; // Check possible records with high values - $sql = "SELECT iv.iid, lp_id, total_time - FROM c_lp_view v + $sql = "SELECT iv.iid, lp_id, total_time + FROM c_lp_view v INNER JOIN c_lp_item_view iv ON (iv.c_id = v.c_id AND v.id = iv.lp_view_id) - WHERE - user_id = $userId AND - v.c_id = $courseId AND + WHERE + user_id = $userId AND + v.c_id = $courseId AND session_id = $sessionId ORDER BY total_time desc LIMIT 1 diff --git a/public/main/lp/lp_report.php b/public/main/lp/lp_report.php index a4908a6445..050247399a 100644 --- a/public/main/lp/lp_report.php +++ b/public/main/lp/lp_report.php @@ -15,8 +15,8 @@ if (!$isAllowedToEdit) { $lpTable = Database::get_course_table(TABLE_LP_MAIN); -$lpId = isset($_GET['lp_id']) ? intval($_GET['lp_id']) : false; -$export = isset($_GET['export']) ? true : false; +$lpId = isset($_GET['lp_id']) ? (int) $_GET['lp_id'] : false; +$export = isset($_GET['export']); if (empty($lpId)) { api_not_allowed(true); @@ -161,6 +161,7 @@ if ($export) { //'course_code' => $course_code ]; $pdf = new PDF('A4', 'P', $pdfParams); + $pdf->html_to_pdf_with_template( $result, false, diff --git a/public/main/mySpace/myStudents.php b/public/main/mySpace/myStudents.php index 43237f1245..d9325c3b27 100644 --- a/public/main/mySpace/myStudents.php +++ b/public/main/mySpace/myStudents.php @@ -1378,6 +1378,7 @@ if (empty($details)) { } $userEntity = api_get_user_entity(api_get_user_id()); + $codePath = api_get_path(WEB_CODE_PATH); /** @var CLpCategory $item */ foreach ($categories as $item) { @@ -1566,8 +1567,8 @@ if (empty($details)) { } $link = Display::url( Display::return_icon('2rightarrow.png', get_lang('Details')), - 'lp_tracking.php?cidReq='.$course_code.'&course='.$course_code.$from.'&origin='.$origin - .'&lp_id='.$lp_id.'&student_id='.$user_info['user_id'].'&id_session='.$sessionId + $codePath.'mySpace/lp_tracking.php?cid='.$courseInfo['real_id'].'&course='.$course_code.$from.'&origin='.$origin + .'&lp_id='.$lp_id.'&student_id='.$user_info['user_id'].'&sid='.$sessionId ); echo Display::tag('td', $link); } @@ -1575,9 +1576,9 @@ if (empty($details)) { if (api_is_allowed_to_edit()) { echo '