Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19

1.9.x
Julio Montoya 11 years ago
commit 8b1b49da65
  1. 10
      main/coursecopy/copy_course.php
  2. 16
      main/coursecopy/copy_course_session.php
  3. 4
      main/coursecopy/create_backup.php
  4. 5
      main/coursecopy/import_backup.php
  5. 4
      main/coursecopy/recycle_course.php

@ -76,10 +76,12 @@ if (Security::check_token('post') && (
$cb = new CourseBuilder(); $cb = new CourseBuilder();
$course = $cb->build(); $course = $cb->build();
$hidden_fields = array(); $hiddenFields = array();
$hidden_fields['same_file_name_option'] = $_POST['same_file_name_option']; $hiddenFields['same_file_name_option'] = $_POST['same_file_name_option'];
$hidden_fields['destination_course'] = $_POST['destination_course']; $hiddenFields['destination_course'] = $_POST['destination_course'];
CourseSelectForm::display_form($course, $hidden_fields, true); // Add token to Course select form
$hiddenFields['sec_token'] = Security::get_token();
CourseSelectForm::display_form($course, $hiddenFields, true);
} else { } else {
$table_c = Database :: get_main_table(TABLE_MAIN_COURSE); $table_c = Database :: get_main_table(TABLE_MAIN_COURSE);
$table_cu = Database :: get_main_table(TABLE_MAIN_COURSE_USER); $table_cu = Database :: get_main_table(TABLE_MAIN_COURSE_USER);

@ -386,13 +386,15 @@ if (Security::check_token('post') && (
$course_origin = api_get_course_info($arr_course_origin[0]); $course_origin = api_get_course_info($arr_course_origin[0]);
$cb = new CourseBuilder('', $course_origin); $cb = new CourseBuilder('', $course_origin);
$course = $cb->build($origin_session, $arr_course_origin[0], $with_base_content); $course = $cb->build($origin_session, $arr_course_origin[0], $with_base_content);
//$hidden_fields['same_file_name_option'] = $_POST['same_file_name_option']; //$hiddenFields['same_file_name_option'] = $_POST['same_file_name_option'];
$hidden_fields['destination_course'] = $arr_course_destination[0]; $hiddenFields['destination_course'] = $arr_course_destination[0];
$hidden_fields['origin_course'] = $arr_course_origin[0]; $hiddenFields['origin_course'] = $arr_course_origin[0];
$hidden_fields['destination_session'] = $destination_session; $hiddenFields['destination_session'] = $destination_session;
$hidden_fields['origin_session'] = $origin_session; $hiddenFields['origin_session'] = $origin_session;
// Add token to Course select form
CourseSelectForm :: display_form($course, $hidden_fields, true); $hiddenFields['sec_token'] = Security::get_token();
CourseSelectForm :: display_form($course, $hiddenFields, true);
echo '<div style="float:right"><a href="javascript:window.back();">'. echo '<div style="float:right"><a href="javascript:window.back();">'.
Display::return_icon( Display::return_icon(
'back.png', 'back.png',

@ -91,7 +91,9 @@ if (Security::check_token('post') && (
$cb = new CourseBuilder('partial'); $cb = new CourseBuilder('partial');
$course = $cb->build(); $course = $cb->build();
CourseSelectForm::display_form($course); // Add token to Course select form
$hiddenFields['sec_token'] = Security::get_token();
CourseSelectForm::display_form($course, $hiddenFields);
} else { } else {
$cb = new CourseBuilder(); $cb = new CourseBuilder();

@ -135,7 +135,10 @@ if (Security::check_token('post') && (
$course = CourseArchiver::read_course($filename, $delete_file); $course = CourseArchiver::read_course($filename, $delete_file);
if ($course->has_resources() && ($filename !== false)) { if ($course->has_resources() && ($filename !== false)) {
CourseSelectForm::display_form($course, array('same_file_name_option' => $_POST['same_file_name_option'])); $hiddenFields['same_file_name_option'] = $_POST['same_file_name_option'];
// Add token to Course select form
$hiddenFields['sec_token'] = Security::get_token();
CourseSelectForm::display_form($course, $hiddenFields);
} elseif ($filename === false) { } elseif ($filename === false) {
Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin')); Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'));
echo '<a class="btn" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>'; echo '<a class="btn" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';

@ -85,7 +85,9 @@ if (Security::check_token('post') && (
$cb = new CourseBuilder(); $cb = new CourseBuilder();
$course = $cb->build(); $course = $cb->build();
CourseSelectForm::display_form($course); // Add token to Course select form
$hiddenFields['sec_token'] = Security::get_token();
CourseSelectForm::display_form($course, $hiddenFields);
} else { } else {
$cb = new CourseBuilder(); $cb = new CourseBuilder();
$course = $cb->build(); $course = $cb->build();

Loading…
Cancel
Save