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

Fixing the \"Complete course copy in session\" feature see CT#1253

Browse Source
skala
Julio Montoya 16 years ago
parent 732a8b75d7
commit fba4319b25
3 changed files with 53 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. 21
      main/coursecopy/classes/CourseBuilder.class.php
  2. 51
      main/coursecopy/classes/CourseRestorer.class.php
  3. 23
      main/coursecopy/copy_course_session.php

21
main/coursecopy/classes/CourseBuilder.class.php
Unescape View File

@ -27,8 +27,7 @@ require_once 'wiki.class.php';
* @author Bart Mollet <bart.mollet@hogent.be>
* @package dokeos.backup
*/
class CourseBuilder
{
class CourseBuilder {
/**
* The course
*/
@ -36,28 +35,32 @@ class CourseBuilder
/**
* Create a new CourseBuilder
*/
function CourseBuilder($type='')
{
function CourseBuilder($type='', $course = null) {
global $_course;
if(!empty($course['official_code'])){
$_course = $course;
}
$this->course = new Course();
$this->course->code = $_course['official_code'];
$this->course->type = $type;
$this->course->path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/';
$this->course->backup_path = api_get_path(SYS_COURSE_PATH).$_course['path'];
$this->course->encoding = api_get_system_encoding(); //current platform encoding
$this->course->db_name = $_course['dbName'];
}
/**
* Get the created course
* @return course The course
*/
function get_course()
{
function get_course() {
return $this->course;
}
/**
* Build the course-object
*/
function build($session_id = 0,$course_code = '') {
function build($session_id = 0, $course_code = '') {
if (!empty($session_id) && !empty($course_code)) {
$course_info = api_get_course_info($course_code);
@ -511,11 +514,11 @@ class CourseBuilder
*/
function build_events()
{
$table = Database :: get_course_table(TABLE_AGENDA);
$table = Database :: get_course_table(TABLE_AGENDA, $this->course->db_name);
$sql = 'SELECT * FROM '.$table.' WHERE session_id = 0';
$db_result = Database::query($sql);
while ($obj = Database::fetch_object($db_result)) {
$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT, $this->course->db_name);
$sql = 'SELECT path, comment, filename, size FROM '.$table_attachment.' WHERE agenda_id = '.$obj->id.'';
$result = Database::query($sql);
$attachment_obj = Database::fetch_object($result);

51
main/coursecopy/classes/CourseRestorer.class.php
Unescape View File

@ -57,6 +57,7 @@ class CourseRestorer
{
$this->file_option = $option;
}
/**
* Restore a course.
* @param string $destination_course_code The code of the Dokeos-course in
@ -95,7 +96,8 @@ class CourseRestorer
$this->course->to_system_encoding();
if (!empty($session_id)) {
$this->restore_documents($session_id,$destination_course_code);
$this->restore_documents($session_id, $destination_course_code);
$this->restore_quizzes($session_id);
$this->restore_glossary($session_id);
$this->restore_learnpaths($session_id);
@ -182,24 +184,25 @@ class CourseRestorer
/**
* Restore documents
*/
function restore_documents($session_id = 0,$destination_course_code = '')
{
function restore_documents($session_id = 0, $destination_course_code = '') {
$perm = api_get_permissions_for_new_directories();
if ($this->course->has_resources(RESOURCE_DOCUMENT)) {
$table = Database :: get_course_table(TABLE_DOCUMENT, $this->course->destination_db);
$resources = $this->course->resources;
$destination_course['dbName']= $this->course->destination_db;
/* echo '<pre>'; echo $this->course->backup_path; echo '<br>'; */
foreach ($resources[RESOURCE_DOCUMENT] as $id => $document) {
$path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/';
$dirs = explode('/', dirname($document->path));
$dirs = explode('/', dirname($document->path));
//if (count($dirs)==1) {
if ($document->file_type==FOLDER) {
$visibility = $document->item_properties[0]['visibility'];
$new = substr($document->path, 8);
if (!is_dir($path.'document/'.$new)) {
$created_dir = create_unexisting_directory($destination_course,api_get_user_id(),0, 0 ,$path.'document',$new,basename($new),$visibility);
}
@ -234,8 +237,10 @@ class CourseRestorer
echo 'filetype:'.$document->file_type ;
echo '<br>';
*/
if ($document->file_type == DOCUMENT) {
if ($document->file_type == DOCUMENT) {
if (file_exists($path.$document->path)) {
switch ($this->file_option) {
case FILE_OVERWRITE :
$origin_path = $this->course->backup_path.'/'.$document->path;
@ -256,6 +261,7 @@ class CourseRestorer
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = $obj->id;
break;
case FILE_RENAME :
$i = 1;
$ext = explode('.', basename($document->path));
if (count($ext) > 1) {
@ -281,7 +287,7 @@ class CourseRestorer
$course_path = $path; // "/var/www/wiener/courses/"
$orig_base_folder = $document_path[1];
$orig_base_path = $course_path.$document_path[0].'/'.$document_path[1];
if (is_dir($orig_base_path)) {
$new_base_foldername = $orig_base_folder; // e.g: "carpeta1"
@ -344,35 +350,28 @@ class CourseRestorer
break;
} // end switch
} else { // end if file exists
} else { // end if file exists
//make sure the source file actually exists
if(is_file($this->course->backup_path.'/'.$document->path) && is_readable($this->course->backup_path.'/'.$document->path) && is_dir(dirname($path.$document->path)) && is_writeable(dirname($path.$document->path)))
{
if(is_file($this->course->backup_path.'/'.$document->path) && is_readable($this->course->backup_path.'/'.$document->path) && is_dir(dirname($path.$document->path)) && is_writeable(dirname($path.$document->path))) {
copy($this->course->backup_path.'/'.$document->path, $path.$document->path);
$sql = "INSERT INTO ".$table." SET path = '/".substr($document->path, 9)."', comment = '".Database::escape_string($document->comment)."', title = '".Database::escape_string($document->title)."' ,filetype='".$document->file_type."', size= '".$document->size."'";
Database::query($sql);
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::insert_id();
}
else
{
if(is_file($this->course->backup_path.'/'.$document->path) && is_readable($this->course->backup_path.'/'.$document->path))
{
} else {
if(is_file($this->course->backup_path.'/'.$document->path) && is_readable($this->course->backup_path.'/'.$document->path)) {
error_log('Course copy generated an ignoreable error while trying to copy '.$this->course->backup_path.'/'.$document->path.': file not found');
}
if(!is_dir(dirname($path.$document->path)))
{
if(!is_dir(dirname($path.$document->path))) {
error_log('Course copy generated an ignoreable error while trying to copy to '.dirname($path.$document->path).': directory not found');
}
if(!is_writeable(dirname($path.$document->path)))
{
if(!is_writeable(dirname($path.$document->path))) {
error_log('Course copy generated an ignoreable error while trying to copy to '.dirname($path.$document->path).': directory not writeable');
}
}
} // end file doesn't exist
}
else
{
} else {
/*$sql = "SELECT id FROM ".$table." WHERE path = '/".Database::escape_string(substr($document->path, 9))."'";
$res = Database::query($sql);
if( Database::num_rows($res)> 0)

23
main/coursecopy/copy_course_session.php
Unescape View File

@ -309,6 +309,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
$origin_session = $_POST['origin_session'];
$course = CourseSelectForm :: get_posted_course('copy_course',$origin_session,$origin_course);
$cr = new CourseRestorer($course);
//$cr->set_file_option($_POST['same_file_name_option']);
$cr->restore($destination_course,$destination_session);
@ -335,15 +336,23 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
}
if ((is_array($arr_course_origin) && count($arr_course_origin) > 0) && !empty($destination_session)) {
//var_dump($arr_course_origin);exit;
foreach ($arr_course_origin as $course_origin) {
$cb = new CourseBuilder();
$course = $cb->build($origin_session,$course_origin);
//We need only one value
if (count($arr_course_origin) > 1 || count($arr_course_destination) > 1) {
Display::display_error_message(get_lang('YouMustSelectACourseFromOriginalSession'));
display_form();
} else {
//foreach ($arr_course_origin as $course_origin) {
//first element of the array
$course_code = $arr_course_origin[0];
$course_destinatination = $arr_course_destination[0];
$course_origin = api_get_course_info($course_code);
$cb = new CourseBuilder('', $course_origin);
$course = $cb->build($origin_session, $course_code);
$cr = new CourseRestorer($course);
//$cr->set_file_option($_POST['same_file_name_option']);
$cr->restore($course_origin,$destination_session);
$cr->restore($course_destinatination, $destination_session);
//}
}
Display::display_normal_message(get_lang('CopyFinished'));
display_form();

Write Preview
Loading…
Cancel
Save