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 - Code styling

Browse Source
pull/3375/head
Yannick Warnier 5 years ago
parent 9c3c2829c5
commit f21a414b9d
2 changed files with 36 additions and 12 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. 20
      main/course_info/delete_course.php
  2. 28
      main/coursecopy/recycle_course.php

20
main/course_info/delete_course.php
Unescape View File

@ -39,20 +39,30 @@ if (isset($_GET['delete']) && $_GET['delete'] === 'yes' && $_GET['course_code']
/* message if code course is incorrect */
$message = '<h2>' . get_lang('Course') . ' : ' . $current_course_name . ' (' . $current_course_code . ') </h2>';
$message .= '<p>'.get_lang('CourseRegistrationCodeIncorrect').'</p>';
$message .= '<p><a class="btn btn-primary" href="' . api_get_path(WEB_CODE_PATH) . 'course_info/delete_course.php?' . api_get_cidreq() . '">' . get_lang('BackToPreviousPage') . '</a>';
$message .= '<p><a class="btn btn-primary" href="'
.api_get_path(WEB_CODE_PATH)
.'course_info/delete_course.php?'
.api_get_cidreq()
.'">'.get_lang('BackToPreviousPage').'</a>';
$message .= '<br /><br /><a href="../../index.php">' . get_lang('BackHome') . '</a>';
$type_info_message = 'error';
}
} else {
$message = '<h3>' . get_lang('Course') . ' : ' . $current_course_name . ' (' . $current_course_code . ') </h3>';
$message .= '<p>' . get_lang('ByDel') . '</p>';
$message .= '<p><span class="form_required">*</span>' . get_lang('CourseCodeConfirmation') . '&nbsp;<input type="text" name="course_code" id="course_code"></p>';
$message .= '<p><span class="form_required">*</span>'
.get_lang('CourseCodeConfirmation')
.'&nbsp;<input type="text" name="course_code" id="course_code"></p>';
$message .= '<p>';
$message .= '<button class="btn btn-danger delete-course">' . get_lang('ValidateChanges') . '</button>';
$message .= '&nbsp;';
$message .= '<a class="btn btn-primary"href="' . api_get_path(WEB_CODE_PATH) . 'course_info/maintenance.php?' . api_get_cidreq() . '">' .
get_lang('No') . '</a>';
$message .= '<a class="btn btn-primary"href="'
.api_get_path(WEB_CODE_PATH)
.'course_info/maintenance.php?'
.api_get_cidreq().'">'
.get_lang('No')
.'</a>';
$message .= '</p>';
$interbreadcrumb[] = [
'url' => 'maintenance.php',
@ -63,7 +73,7 @@ if (isset($_GET['delete']) && $_GET['delete'] === 'yes' && $_GET['course_code']
$(function(){
/* Asking by course code to confirm recycling*/
$(".delete-course").on("click",function(){
window.location ="' . api_get_self() . '?delete=yes&' . api_get_cidreq() . '&course_code=" + $("#course_code").val();
window.location ="'.api_get_self().'?delete=yes&'.api_get_cidreq().'&course_code=" + $("#course_code").val();
})
})

28
main/coursecopy/recycle_course.php
Unescape View File

@ -61,7 +61,7 @@ if (Security::check_token('post') && (
$recycle_type = '';
$fullDelete = 0;
$courseCodeConfirmation ='';
if(isset($_POST['course_code_confirmation'])) {
if (isset($_POST['course_code_confirmation'])) {
$courseCodeConfirmation = $_POST['course_code_confirmation'];
}
if (isset($_POST['recycle_option']) && $_POST['recycle_option'] === 'full_backup') {
@ -72,18 +72,20 @@ if (Security::check_token('post') && (
}
$cr = new CourseRecycler($course);
if($recycle_type == 'full_backup') {
if ($recycle_type == 'full_backup') {
/* to delete, course code confirmation must be equal that current course code */
if($current_course_code == $courseCodeConfirmation) {
if ($current_course_code == $courseCodeConfirmation) {
$cr->recycle($recycle_type);
echo Display::return_message(get_lang('RecycleFinished'), 'confirm');
} else {
$messageFailCourseCode = '<p>' . get_lang('CourseRegistrationCodeIncorrect') . '</p>';
$messageFailCourseCode .= '<p><a class="btn btn-primary" href="' . api_get_self() . '?' . api_get_cidreq() . '">' . get_lang('BackToPreviousPage') . '</a></p>';
$messageFailCourseCode .= '<p><a class="btn btn-primary" href="'.api_get_self().'?'.api_get_cidreq().'">'.
get_lang('BackToPreviousPage').
'</a></p>';
echo Display::return_message($messageFailCourseCode, 'error', false);
}
} elseif($recycle_type == 'select_items') {
} elseif ($recycle_type == 'select_items') {
$cr->recycle($recycle_type);
echo Display::return_message(get_lang('RecycleFinished'), 'confirm');
}
@ -113,8 +115,20 @@ if (Security::check_token('post') && (
$form->addElement('radio', 'recycle_option', null, get_lang('LetMeSelectItems'), 'select_items');
//Confirmation input code
$form->addElement('label', '', '<span class="hidden course-full-delete">'.get_lang('CourseCodeConfirmation').'</span>', null, null);
$form->addElement('input', 'course_code_confirmation', null, 'class="hidden course-full-delete"', 'course_code');
$form->addElement(
'label',
'',
'<span class="hidden course-full-delete">'.get_lang('CourseCodeConfirmation').'</span>',
null,
null
);
$form->addElement(
'input',
'course_code_confirmation',
null,
'class="hidden course-full-delete"',
'course_code'
);
$form->addButtonSave(get_lang('RecycleCourse'));
$form->setDefaults(['recycle_option' => 'select_items']);

Write Preview
Loading…
Cancel
Save