From 872d91975b540b7143ff5874ee5eee8cd7b91337 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 30 Jan 2012 11:23:51 +0100
Subject: [PATCH] Fixing queries adding c_id see #3910

---
 .../classes/CourseRestorer.class.php          | 24 +++++--------------
 main/coursecopy/copy_course_session.php       |  2 +-
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/main/coursecopy/classes/CourseRestorer.class.php b/main/coursecopy/classes/CourseRestorer.class.php
index 77bff34c11..b94e308c0b 100644
--- a/main/coursecopy/classes/CourseRestorer.class.php
+++ b/main/coursecopy/classes/CourseRestorer.class.php
@@ -1342,16 +1342,11 @@ class CourseRestorer
 					Database::query($sql);
 					$new_id = Database::insert_id();
 					$this->course->resources[RESOURCE_SURVEY][$id]->destination_id = $new_id;
-					foreach ($survey->question_ids as $index => $question_id)
-					{
+					foreach ($survey->question_ids as $index => $question_id) {
 						$qid = $this->restore_survey_question($question_id, $new_id);
-						$sql = "UPDATE ".$table_que." " .
-								"SET survey_id = ".$new_id." WHERE " .
-								"question_id = ".$qid."";
+						$sql = "UPDATE $table_que SET survey_id = $new_id WHERE c_id = ".$this->destination_course_id." AND question_id = $qid";
 						Database::query($sql);
-						$sql = "UPDATE ".$table_ans." ".
-								"SET survey_id = ".$new_id." WHERE " .
-								"question_id = ".$qid."";
+						$sql = "UPDATE $table_ans SET survey_id = $new_id WHERE c_id = ".$this->destination_course_id." AND question_id = $qid";
 						Database::query($sql);
 					}
 				}
@@ -1363,8 +1358,7 @@ class CourseRestorer
 	/**
 	 * Check availability of a survey code
 	 */
-	function is_survey_code_available($survey_code)
-	{
+	function is_survey_code_available($survey_code)	{
 		$table_sur = Database :: get_course_table(TABLE_SURVEY);
 		$sql = "SELECT * FROM $table_sur WHERE c_id = ".$this->destination_course_id." AND code='".self::DBUTF8escapestring($survey_code)."'";
 		$result = Database::query($sql);
@@ -1375,8 +1369,7 @@ class CourseRestorer
 	/**
 	 * Restore survey-questions
 	 */
-	function restore_survey_question($id, $survey_id)
-	{
+	function restore_survey_question($id, $survey_id) {
 		$resources = $this->course->resources;
 		$question = $resources[RESOURCE_SURVEYQUESTION][$id];
 
@@ -1738,11 +1731,6 @@ class CourseRestorer
 		$destination='../../courses/'.$this->course->destination_path.'/work/';		
 		$origin='../../courses/'.$this->course->info['path'].'/work/';
 		self::allow_create_all_directory($origin,$destination,false);
-
-	
-	
-	
-
 	}
 
 /**
@@ -1888,7 +1876,7 @@ class CourseRestorer
 				$last_id = Database::insert($table_thematic, $thematic->params, false);
 				
 				if (is_numeric($last_id)) {
-					api_item_property_update($this->destination_course_info, 'thematic', $last_id,"ThematicAdded", api_get_user_id());
+					api_item_property_update($this->destination_course_info, 'thematic', $last_id, "ThematicAdded", api_get_user_id());
 					
 					foreach($thematic->thematic_advance_list as $thematic_advance) {						
 						unset($thematic_advance['id']);						
diff --git a/main/coursecopy/copy_course_session.php b/main/coursecopy/copy_course_session.php
index 428818dcde..6007ab3070 100644
--- a/main/coursecopy/copy_course_session.php
+++ b/main/coursecopy/copy_course_session.php
@@ -119,7 +119,7 @@ function display_form() {
     $html .= '<input type="radio" id="copy_option_2" name="copy_option" value="select_items" disabled="disabled"/>';
     $html .= '<label for="copy_option_2"><span id="title_option2" style="color:#aaa"> '.get_lang('LetMeSelectItems').'</span></label><br/>';
     
-    $html .= '<input type="checkbox" id="copy_base_content_id" name="copy_only_session_items" checked="checked" /><label for="copy_base_content_id">'.get_lang('CopyOnlySessionItems').'</label><br /><br/>';
+    $html .= '<input type="checkbox" id="copy_base_content_id" name="copy_only_session_items" /><label for="copy_base_content_id">'.get_lang('CopyOnlySessionItems').'</label><br /><br/>';
 	
 	$html .= '<button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;">'.get_lang('CopyCourse').'</button>';
     $html .= '</form>';