merge

main/coursecopy/classes/CourseBuilder.class.php

@@ -328,7 +328,7 @@ class CourseBuilder
 				$doc = Database::fetch_object(Database::query("SELECT id FROM ".$table_doc." WHERE path = '/audio/".$obj->sound."'"));
 				$obj->sound = $doc->id;
 			}
-			$quiz = new Quiz($obj->id, $obj->title, $obj->description, $obj->random, $obj->type, $obj->active, $obj->sound, $obj->max_attempt, $obj->results_disabled, $obj->access_condition, $obj->start_time, $obj->end_time, $obj->feedback_type);
+			$quiz = new Quiz($obj->id, $obj->title, $obj->description, $obj->random, $obj->type, $obj->active, $obj->sound, $obj->max_attempt, $obj->results_disabled, $obj->access_condition, $obj->start_time, $obj->end_time, $obj->feedback_type, $obj->random_answers, $obj->expired_time);
 			$sql = 'SELECT * FROM '.$table_rel.' WHERE exercice_id = '.$obj->id;
 			$db_result2 = Database::query($sql, __FILE__, __LINE__);
 			while ($obj2 = Database::fetch_object($db_result2))

main/coursecopy/classes/CourseRestorer.class.php

@@ -233,8 +233,10 @@ class CourseRestorer
 					if (file_exists($path.$document->path)) {
 						switch ($this->file_option) {
 							case FILE_OVERWRITE :
-								$this->course->backup_path.'/'.$document->path;
-								copy($this->course->backup_path.'/'.$document->path, $path.$document->path);
+								$origin_path = $this->course->backup_path.'/'.$document->path;
+								if (file_exists($origin_path)) {
+									copy($origin_path, $path.$document->path);
+								}
 								$sql = "SELECT id FROM ".$table." WHERE path='/".substr($document->path, 9)."'";
 								$res = Database::query($sql, __FILE__, __LINE__);
 								$obj = Database::fetch_object($res);
@@ -823,6 +825,8 @@ class CourseRestorer
 						"', start_time = '".$quiz->start_time.
 						"', end_time = '".$quiz->end_time.
 						"', feedback_type = ".(int)$quiz->feedback_type.
+						", random_answers = ".(int)$quiz->random_answers.
+						", expired_time = ".(int)$quiz->expired_time.
 						$condition_session;
 					Database::query($sql, __FILE__, __LINE__);
 					$new_id = Database::insert_id();

main/coursecopy/classes/CourseSelectForm.class.php

@@ -292,7 +292,7 @@ class CourseSelectForm
 				switch ($type) {
 					case RESOURCE_SURVEYQUESTION:
 						foreach($resources as $id => $obj) {
-						    if(!in_array($obj->survey_id,array_keys($_POST['resource'][RESOURCE_SURVEY]))) {
+						    if(is_array($_POST['resource'][RESOURCE_SURVEY]) && !in_array($obj->survey_id,array_keys($_POST['resource'][RESOURCE_SURVEY]))) {
 								unset ($course->resources[$type][$id]);
 							}
 						}

main/coursecopy/classes/Quiz.class.php

@@ -86,6 +86,15 @@ class Quiz extends Resource
 	 * Feedback type
 	 */
 	var $feedback_type;
+	/**
+	 * Random answers
+	 */
+	var $random_answers;
+	/**
+	 * Expired time
+	 */
+	var $expired_time;
+	
 	/**
 	 * Create a new Quiz
 	 * @param string $title
@@ -94,7 +103,7 @@ class Quiz extends Resource
 	 * @param int $type
 	 * @param int $active
 	 */
-	function Quiz($id, $title, $description, $random, $type, $active, $media, $attempts = 0, $results_disabled = 0, $access_condition = null, $start_time = '0000-00-00 00:00:00', $end_time = '0000-00-00 00:00:00', $feedback_type = 0)
+	function Quiz($id, $title, $description, $random, $type, $active, $media, $attempts = 0, $results_disabled = 0, $access_condition = null, $start_time = '0000-00-00 00:00:00', $end_time = '0000-00-00 00:00:00', $feedback_type = 0, $random_answers = 0, $expired_time = 0)
 	{
 		parent::Resource($id, RESOURCE_QUIZ);
 		$this->title = $title;
@@ -110,6 +119,8 @@ class Quiz extends Resource
 		$this->start_time = $start_time;
 		$this->end_time = $end_time;
 		$this->feedback_type = $feedback_type;
+		$this->random_answers = $random_answers; 
+		$this->expired_time = $expired_time;
 	}
 	/**
 	 * Add a question to this Quiz

main/coursecopy/classes/wiki.class.php

@@ -15,10 +15,8 @@ class Wiki extends Resource
 	var $user_id;
 	var $group_id;
 	var $timestamp;	
-	var $template;
-	var $menu;
 
-	function Wiki($id, $reflink, $title, $content, $user_id, $group_id, $timestamp, $template, $menu)
+	function Wiki($id, $reflink, $title, $content, $user_id, $group_id, $timestamp)
 	{
 		parent::Resource($id,RESOURCE_WIKI);
 		$this->page_id					= $id;