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

Minor - fix php parameters, use int id instead of course code

Browse Source
pull/3984/head
Julio 4 years ago
parent 1a61a91b36
commit 99ec75abbb
13 changed files with 22 additions and 42 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. 2
      public/main/admin/course_list.php
  2. 18
      public/main/admin/user_information.php
  3. 2
      public/main/auth/set_temp_password.php
  4. 2
      public/main/course_info/legal.php
  5. 6
      public/main/exercise/question_stats.php
  6. 2
      public/main/inc/lib/AnnouncementManager.php
  7. 18
      public/main/inc/lib/groupmanager.lib.php
  8. 2
      public/main/inc/lib/template.lib.php
  9. 4
      public/main/session/index.php
  10. 2
      public/main/template/default/my_space/user_details.html.twig
  11. 2
      public/main/work/work.lib.php
  12. 2
      public/plugin/buycourses/src/buy_course_plugin.class.php
  13. 2
      public/plugin/courselegal/CourseLegalPlugin.php

2
public/main/admin/course_list.php
Unescape View File

@ -572,7 +572,7 @@ if (isset($_GET['search']) && 'advanced' === $_GET['search']) {
$table->set_header(3, get_lang('Language'), false, 'width="70px"');
$table->set_header(4, get_lang('Categories'));
$table->set_header(5, get_lang('Registr. allowed'), true, 'width="60px"');
$table->set_header(6, get_lang('UnsubscribeAllowed'), false, 'width="50px"');
$table->set_header(6, get_lang('Unreg. allowed'), false, 'width="50px"');
$table->set_header(
7,
get_lang('Action'),

18
public/main/admin/user_information.php
Unescape View File

@ -296,7 +296,7 @@ if (count($sessions) > 0) {
$courseId = $sessionRelCourse->getCourse()->getId();
$courseCode = $sessionRelCourse->getCourse()->getCode();
$courseUrl = api_get_course_url($courseCode);
$courseUrl = api_get_course_url($courseId, $sessionId);
$sessionStatus = SessionManager::get_user_status_in_course_session(
$userId,
@ -320,7 +320,7 @@ if (count($sessions) > 0) {
);
$tools .= '&nbsp;<a href="course_information.php?code='.$courseCode.'&id_session='.$sessionId.'">'.
Display::return_icon('info2.png', get_lang('Overview')).'</a>'.
'<a href="'.$courseUrl.'?id_session='.$sessionId.'">'.
'<a href="'.$courseUrl.'">'.
Display::return_icon('course_home.png', get_lang('Course home')).'</a>';
/*if (!empty($my_course['status']) && STUDENT == $my_course['status']) {
@ -346,7 +346,7 @@ if (count($sessions) > 0) {
$row = [
Display::url(
$courseCode,
$courseUrl.'?id_session='.$sessionId
$courseUrl
),
$course->getTitle(),
$status,
@ -357,16 +357,6 @@ if (count($sessions) > 0) {
$csvContent[] = array_map('strip_tags', $row);
$data[] = $row;
/*$result = Tracking::getToolInformation(
$userId,
$courseInfo,
$sessionId
);
if (!empty($result['html'])) {
$courseToolInformationTotal .= $result['html'];
$csvContent = array_merge($csvContent, $result['array']);
}*/
}
$dates = SessionManager::parseSessionDates($session);
@ -432,7 +422,7 @@ if (count($courseRelUserList) > 0) {
$courseCode = $course->getCode();
$courseToolInformation = null;
$courseUrl = api_get_course_url($courseCode);
$courseUrl = api_get_course_url($courseId);
$tools = Display::url(
Display::return_icon('statistics.png', get_lang('Statistics')),
api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?details=true&student='.$userId.'&id_session=0&course='.$courseCode

2
public/main/auth/set_temp_password.php
Unescape View File

@ -40,7 +40,7 @@ if ($form->validate()) {
$formValues = $form->exportValues();
if (sha1($formValues['course_password']) === $courseInfo['registration_code']) {
Session::write('course_password_'.$courseInfo['real_id'], true);
header('Location: '.api_get_course_url($courseInfo['code'], $sessionId).
header('Location: '.api_get_course_url($courseInfo['real_id'], $sessionId).
'&action=subscribe&sec_token='.Security::get_existing_token());
exit;
} else {

2
public/main/course_info/legal.php
Unescape View File

@ -75,7 +75,7 @@ $form->addButtonSave(get_lang('Accept'));
$variable = 'accept_legal_'.$user_id.'_'.$course_info['real_id'].'_'.$session_id;
$url = api_get_course_url($course_code, $session_id);
$url = api_get_course_url($course_info['real_id'], $session_id);
if ($form->validate()) {
$accept_legal = $form->exportValue('accept_legal');

6
public/main/exercise/question_stats.php
Unescape View File

@ -24,6 +24,7 @@ if (empty($exerciseId)) {
$sessionId = api_get_session_id();
$exercise = new Exercise();
$result = $exercise->read($exerciseId);
$course = api_get_course_entity();
if (empty($result)) {
api_not_allowed(true);
@ -44,13 +45,12 @@ $interbreadcrumb[] = [
'name' => get_lang('StudentScore'),
];
$courseId = api_get_course_int_id();
$courseInfo = api_get_course_info();
$form = new FormValidator('search_form', 'GET', api_get_self().'?id='.$exerciseId.'&'.api_get_cidreq());
$form->addCourseHiddenParams();
$form->addHidden('id', $exerciseId);
$courseGroups = GroupManager::get_group_list(null, $courseInfo);
$courseGroups = GroupManager::get_group_list(null, $course);
if (!empty($courseGroups)) {
$courseGroups = array_column($courseGroups, 'name', 'iid');
@ -64,7 +64,7 @@ if (!empty($courseGroups)) {
);
}
$courseUsers = CourseManager::get_user_list_from_course_code($courseInfo['code']);
$courseUsers = CourseManager::get_user_list_from_course_code($course->getCode());
if (!empty($courseUsers)) {
array_walk(
$courseUsers,

2
public/main/inc/lib/AnnouncementManager.php
Unescape View File

@ -108,7 +108,7 @@ class AnnouncementManager
}
$data['course_title'] = $courseInfo['name'];
$courseLink = api_get_course_url($courseCode, $sessionId);
$courseLink = api_get_course_url($courseInfo['real_id'], $sessionId);
$data['course_link'] = Display::url($courseLink, $courseLink);
$data['teachers'] = $teacherList;

18
public/main/inc/lib/groupmanager.lib.php
Unescape View File

@ -108,7 +108,7 @@ class GroupManager
*/
public static function get_group_list(
$categoryId = null,
$course = null,
Course $course = null,
$status = null,
$sessionId = 0,
$getCount = false,
@ -2801,14 +2801,9 @@ class GroupManager
return $content;
}
/**
* @param string $keyword
*
* @return string
*/
public static function getOverview(Course $course, $keyword = '')
public static function getOverview(Course $course, string $keyword = ''): string
{
$content = null;
$content = '';
$categories = self::get_categories();
$url = api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(true, false);
if (!empty($categories)) {
@ -2844,12 +2839,7 @@ class GroupManager
return $content;
}
/**
* Returns the search form.
*
* @return string
*/
public static function getSearchForm()
public static function getSearchForm(): string
{
$url = api_get_path(WEB_CODE_PATH).'group/group_overview.php?'.api_get_cidreq();
$form = new FormValidator(

2
public/main/inc/lib/template.lib.php
Unescape View File

@ -1230,7 +1230,7 @@ class Template
// @TODO: support right-to-left in title
$socialMeta .= '<meta property="og:title" content="'.$course->getTitle().' - '.$metaTitle.'" />'."\n";
$socialMeta .= '<meta property="twitter:title" content="'.$course->getTitle().' - '.$metaTitle.'" />'."\n";
$socialMeta .= '<meta property="og:url" content="'.api_get_course_url($course->getCode()).'" />'."\n";
$socialMeta .= '<meta property="og:url" content="'.api_get_course_url($course->getId()).'" />'."\n";
$metaDescription = api_get_setting('meta_description');
if (!empty($course->getDescription())) {

4
public/main/session/index.php
Unescape View File

@ -99,13 +99,13 @@ if (!empty($courseList)) {
if (api_is_platform_admin()) {
$course_data['title'] = Display::url(
$course_data['title'],
api_get_course_url($course_data['code'], $session_id)
api_get_course_url($course_data['real_id'], $session_id)
);
} else {
if (in_array($course_data['real_id'], $user_course_list) || api_is_anonymous()) {
$course_data['title'] = Display::url(
$course_data['title'],
api_get_course_url($course_data['code'], $session_id)
api_get_course_url($course_data['real_id'], $session_id)
);
} else {
continue;

2
public/main/template/default/my_space/user_details.html.twig
Unescape View File

@ -32,7 +32,7 @@
{{ display.card_widget('Latest login in platform'|trans, user_extra.last_connection, 'calendar') }}
{% if user_extra.legal %}
{{ display.card_widget('Legal accepted'|trans, user_extra.legal.datetime, 'gavel', user.legal.icon) }}
{{ display.card_widget('Legal accepted'|trans, user_extra.legal.datetime, 'gavel', user_extra.legal.icon) }}
{% endif %}
</div>
</div>

2
public/main/work/work.lib.php
Unescape View File

@ -3105,7 +3105,7 @@ function sendEmailToDrhOnHomeworkCreation($workId, $courseId, $sessionId = 0)
$bodyView->assign('hrm_name', $hrmName);
$bodyView->assign('student', $studentInfo);
$bodyView->assign('course', $courseInfo);
$bodyView->assign('course_link', api_get_course_url($courseInfo['code'], $sessionId));
$bodyView->assign('course_link', api_get_course_url($courseInfo['real_id'], $sessionId));
$bodyView->assign('work', $workInfo);
$bodyTemplate = $bodyView->get_template('mail/new_work_alert_hrm.tpl');

2
public/plugin/buycourses/src/buy_course_plugin.class.php
Unescape View File

@ -2801,7 +2801,7 @@ class BuyCoursesPlugin extends Plugin
switch ($saleInfo['product_type']) {
case self::PRODUCT_TYPE_COURSE:
$courseInfo = api_get_course_info_by_id($saleInfo['product_id']);
$url = api_get_course_url($courseInfo['code']);
$url = api_get_course_url($courseInfo['real_id']);
break;
case self::PRODUCT_TYPE_SESSION:
$sessionId = (int) $saleInfo['product_id'];

2
public/plugin/courselegal/CourseLegalPlugin.php
Unescape View File

@ -253,7 +253,7 @@ class CourseLegalPlugin extends Plugin
$students = CourseManager::get_student_list_from_course_code($courseCode, true, $sessionId);
}
$url = api_get_course_url($courseCode, $sessionId);
$url = api_get_course_url($courseId, $sessionId);
$url = Display::url($url, $url);
$subject = $this->get_lang('AgreementUpdated');

Write Preview
Loading…
Cancel
Save