From 956475f2e3fc052fdff11258201cafd56c2bb6ae Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 7 Jan 2015 12:32:35 +0100 Subject: [PATCH] Minor - format code. --- .../classes/CourseArchiver.class.php | 19 +++++--- .../classes/CourseCopyLearnpath.class.php | 44 ++++++++++++++++--- .../classes/CourseCopyTestCategory.php | 3 +- .../classes/CourseDescription.class.php | 11 +++-- 4 files changed, 60 insertions(+), 17 deletions(-) diff --git a/main/coursecopy/classes/CourseArchiver.class.php b/main/coursecopy/classes/CourseArchiver.class.php index 80d128de43..0b958857c2 100755 --- a/main/coursecopy/classes/CourseArchiver.class.php +++ b/main/coursecopy/classes/CourseArchiver.class.php @@ -1,5 +1,4 @@ $file, 'date' => $date, 'course_code' => $course_code); + $backup_files[] = array( + 'file' => $file, + 'date' => $date, + 'course_code' => $course_code + ); } } } closedir($dir); } + return $backup_files; } @@ -174,8 +181,10 @@ class CourseArchiver $new_dir = api_get_path(SYS_ARCHIVE_PATH); if (is_dir($new_dir) && is_writable($new_dir)) { move_uploaded_file($file, api_get_path(SYS_ARCHIVE_PATH).$new_filename); + return $new_filename; } + return false; } @@ -218,7 +227,7 @@ class CourseArchiver return new Course(); } $course->backup_path = $unzip_dir; + return $course; } - } diff --git a/main/coursecopy/classes/CourseCopyLearnpath.class.php b/main/coursecopy/classes/CourseCopyLearnpath.class.php index b87da7798d..813574f0b1 100755 --- a/main/coursecopy/classes/CourseCopyLearnpath.class.php +++ b/main/coursecopy/classes/CourseCopyLearnpath.class.php @@ -1,11 +1,13 @@ * @package chamilo.backup */ -class CourseCopyLearnpath extends Resource { +class CourseCopyLearnpath extends Resource +{ /** * Type of learnpath (can be dokeos (1), scorm (2), aicc (3)) */ @@ -106,9 +108,35 @@ class CourseCopyLearnpath extends Resource { * @param string $visibility * @param array $items */ - function CourseCopyLearnpath($id,$type,$name, $path,$ref,$description,$content_local,$default_encoding,$default_view_mode,$prevent_reinit,$force_commit, - $content_maker, $display_order,$js_lib,$content_license,$debug, $visibility, $author, $preview_image, - $use_max_score, $autolunch, $created_on, $modified_on, $publicated_on, $expired_on, $session_id, $items) { + public function CourseCopyLearnpath( + $id, + $type, + $name, + $path, + $ref, + $description, + $content_local, + $default_encoding, + $default_view_mode, + $prevent_reinit, + $force_commit, + $content_maker, + $display_order, + $js_lib, + $content_license, + $debug, + $visibility, + $author, + $preview_image, + $use_max_score, + $autolunch, + $created_on, + $modified_on, + $publicated_on, + $expired_on, + $session_id, + $items + ) { parent::Resource($id,RESOURCE_LEARNPATH); $this->lp_type = $type; $this->name = $name; @@ -147,6 +175,7 @@ class CourseCopyLearnpath extends Resource { { return $this->items; } + /** * Check if a given resource is used as an item in this chapter */ @@ -154,13 +183,14 @@ class CourseCopyLearnpath extends Resource { { foreach ($this->items as $item) { if ($item['id'] == $resource->get_id() && - isset($item['type']) && $item['type'] == $resource->get_type() - ) { + isset($item['type']) && $item['type'] == $resource->get_type() + ) { return true; } } return false; } + /** * Show this learnpath */ diff --git a/main/coursecopy/classes/CourseCopyTestCategory.php b/main/coursecopy/classes/CourseCopyTestCategory.php index 72f38e5c76..5b3efa70f3 100755 --- a/main/coursecopy/classes/CourseCopyTestCategory.php +++ b/main/coursecopy/classes/CourseCopyTestCategory.php @@ -34,7 +34,8 @@ class CourseCopyTestcategory extends Resource /** * Show the test_category title, used in the partial recycle_course.php form */ - function show() { + function show() + { parent::show(); echo $this->title; } diff --git a/main/coursecopy/classes/CourseDescription.class.php b/main/coursecopy/classes/CourseDescription.class.php index 8401cc23cf..42946b7aa2 100755 --- a/main/coursecopy/classes/CourseDescription.class.php +++ b/main/coursecopy/classes/CourseDescription.class.php @@ -21,24 +21,27 @@ class CourseDescription extends Resource /** * The description type */ - var $description_type; + var $description_type; /** * Create a new course description * @param int $id * @param string $title * @param string $content */ - function __construct($id,$title,$content,$description_type) { + function __construct($id,$title,$content,$description_type) + { parent::Resource($id,RESOURCE_COURSEDESCRIPTION); $this->title = $title; $this->content = $content; $this->description_type = $description_type; } + /** * Show this Event */ - function show() { + function show() + { parent::show(); echo $this->title; } -} \ No newline at end of file +}