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

Merge branch '3302' into 1.11.x

Browse Source
pull/3375/head
Yannick Warnier 5 years ago
parent 44836e74d8 f21a414b9d
commit 28c04ff122
2 changed files with 108 additions and 19 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. 64
      main/course_info/delete_course.php
  2. 63
      main/coursecopy/recycle_course.php

64
main/course_info/delete_course.php
Unescape View File

@ -25,29 +25,59 @@ if (!api_is_allowed_to_edit()) {
}
$tool_name = get_lang('DelCourse');
if (isset($_GET['delete']) && $_GET['delete'] === 'yes') {
CourseManager::delete_course($_course['sysCode']);
// DELETE CONFIRMATION MESSAGE
Session::erase('_cid');
Session::erase('_real_cid');
$message = '<h2>'.get_lang('Course').' : '.$current_course_name.' ('.$current_course_code.') </h2>';
$message .= get_lang('HasDel');
$message .= '<br /><br /><a href="../../index.php">'.get_lang('BackHome').'</a>';
$type_info_message = 'warning';
if (isset($_GET['delete']) && $_GET['delete'] === 'yes' && $_GET['course_code'] && !empty($_GET['course_code'])) {
if ($current_course_code == $_GET['course_code']) {
CourseManager::delete_course($_course['sysCode']);
// DELETE CONFIRMATION MESSAGE
Session::erase('_cid');
Session::erase('_real_cid');
$message = '<h2>' . get_lang('Course') . ' : ' . $current_course_name . ' (' . $current_course_code . ') </h2>';
$message .= get_lang('HasDel');
$message .= '<br /><br /><a href="../../index.php">' . get_lang('BackHome') . '</a>';
} else {
/* 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 .= '<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><a class="btn btn-primary"
href="'.api_get_path(WEB_CODE_PATH).'course_info/maintenance.php?'.api_get_cidreq().'">'.
get_lang('No').'</a>&nbsp;<a class="btn btn-danger" href="'.api_get_self().'?delete=yes&'.api_get_cidreq().'">'.
get_lang('Yes').'</a></p>';
$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>';
$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 .= '</p>';
$interbreadcrumb[] = [
'url' => 'maintenance.php',
'name' => get_lang('Maintenance'),
];
}
$htmlHeadXtra[] ='<script>
$(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();
})
})
</script>';
$tpl = new Template($tool_name);
$tpl->assign('content', Display::return_message($message, 'warning', false));
$tpl->assign('content', Display::return_message($message, $type_info_message, false));
$tpl->display_one_col_template();

63
main/coursecopy/recycle_course.php
Unescape View File

@ -16,6 +16,10 @@ require_once __DIR__.'/../inc/global.inc.php';
$current_course_tool = TOOL_COURSE_MAINTENANCE;
api_protect_course_script(true);
$_course = api_get_course_info();
$current_course_code = $_course['official_code'];
// Check access rights (only teachers are allowed here)
if (!api_is_allowed_to_edit()) {
api_not_allowed(true);
@ -55,14 +59,36 @@ if (Security::check_token('post') && (
$course = $cb->build();
}
$recycle_type = '';
$fullDelete = 0;
$courseCodeConfirmation ='';
if (isset($_POST['course_code_confirmation'])) {
$courseCodeConfirmation = $_POST['course_code_confirmation'];
}
if (isset($_POST['recycle_option']) && $_POST['recycle_option'] === 'full_backup') {
$recycle_type = 'full_backup';
$fullDelete = 1;
} elseif (isset($_POST['action']) && $_POST['action'] === 'course_select_form') {
$recycle_type = 'select_items';
}
$cr = new CourseRecycler($course);
$cr->recycle($recycle_type);
echo Display::return_message(get_lang('RecycleFinished'), 'confirm');
if ($recycle_type == 'full_backup') {
/* to delete, course code confirmation must be equal that current course code */
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>';
echo Display::return_message($messageFailCourseCode, 'error', false);
}
} elseif ($recycle_type == 'select_items') {
$cr->recycle($recycle_type);
echo Display::return_message(get_lang('RecycleFinished'), 'confirm');
}
} elseif (Security::check_token('post') && (
isset($_POST['recycle_option']) &&
$_POST['recycle_option'] === 'select_items'
@ -87,6 +113,23 @@ if (Security::check_token('post') && (
$form->addElement('header', get_lang('SelectOptionForBackup'));
$form->addElement('radio', 'recycle_option', null, get_lang('FullRecycle'), 'full_backup');
$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->addButtonSave(get_lang('RecycleCourse'));
$form->setDefaults(['recycle_option' => 'select_items']);
// Add Security token
@ -94,6 +137,22 @@ if (Security::check_token('post') && (
$form->addElement('hidden', 'sec_token');
$form->setConstants(['sec_token' => $token]);
$form->display();
/* make recycle_course_course_code_confirmation required to put code course */
echo '
<script>
$(function(){
$ (`[type="radio"]`).on (`change`, function (e) {
if ($ (this).val () === `full_backup`) {
$ (`#recycle_course_course_code_confirmation`).prop (`required`, `required`);
$ (`.course-full-delete`).removeClass(`hidden`);
} else {
$ (`#recycle_course_course_code_confirmation`).prop (`required`, ``);
$ (`.course-full-delete`).addClass(`hidden`);
}
});
})
</script>';
}
}

Write Preview
Loading…
Cancel
Save