From 0f58f4dca84870fc631dc718551bc94bccec4db3 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Sun, 24 Apr 2011 11:35:55 +0200
Subject: [PATCH] Improving messages when copying course items see #2247

---
 .../classes/CourseSelectForm.class.php        | 24 ++++++++++++-------
 main/coursecopy/copy_course.php               |  5 ----
 main/coursecopy/create_backup.php             |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/main/coursecopy/classes/CourseSelectForm.class.php b/main/coursecopy/classes/CourseSelectForm.class.php
index 42caa0e7ef..f26d927d77 100755
--- a/main/coursecopy/classes/CourseSelectForm.class.php
+++ b/main/coursecopy/classes/CourseSelectForm.class.php
@@ -98,9 +98,8 @@ class CourseSelectForm
 			echo '<input type="hidden" name="destination_session" 	value="'.$hidden_fields['destination_session'].'"/>';
 			echo '<input type="hidden" name="origin_session" 		value="'.$hidden_fields['origin_session'].'"/>';
 		}
-
 		foreach ($course->resources as $type => $resources) {
-			if (count($resources) > 0) {
+			if (count($resources) > 0) {			    
 				switch ($type) {
 					case RESOURCE_LINKCATEGORY :
 					case RESOURCE_FORUMCATEGORY :
@@ -109,16 +108,25 @@ class CourseSelectForm
 					case RESOURCE_QUIZQUESTION:
 					case RESOURCE_SURVEYQUESTION:
 					case RESOURCE_SURVEYINVITATION:
-					case RESOURCE_SCORM:
-						break;
-					default :
-						echo '<img id="img_'.$type.'" src="../img/1.gif" onclick="javascript: exp('."'$type'".');" />';
-						echo '<b  onclick="javascript:exp('."'$type'".');" >'.$resource_titles[$type].'</b><br />';
+					case RESOURCE_SCORM:					    
+						break;		    
+                    default :
+						echo '<img id="img_'.$type.'" src="../img/1.gif" onclick="javascript:exp('."'$type'".');" />&nbsp;';
+						echo '<b onclick="javascript:exp('."'$type'".');" >'.$resource_titles[$type].'</b><br />';
 						echo '<div id="div_'.$type.'">';
+						if ($type == RESOURCE_LEARNPATH) {
+    						Display::display_warning_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
+    						Display::display_warning_message(get_lang('IfYourLPsHaveAudioFilesIncludedYouShouldSelectThemFromTheDocuments'));
+						}
+						if ($type == RESOURCE_DOCUMENT) {                        
+                            if (api_get_setting('show_glossary_in_documents') != 'none') {
+                                Display::display_warning_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'));
+                            }
+						}
+                        
 						echo '<blockquote>';
 						echo "[<a href=\"javascript: void(0);\" onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a> | <a href=\"javascript: void(0);\" onclick=\"javascript:setCheckbox('$type',false);\" >".get_lang('None')."</a>]";
 						echo '<br />';
-
 						foreach ($resources as $id => $resource) {
 							echo '<input type="checkbox" name="resource['.$type.']['.$id.']"  id="resource['.$type.']['.$id.']" />';
 							echo ' <label for="resource['.$type.']['.$id.']">';
diff --git a/main/coursecopy/copy_course.php b/main/coursecopy/copy_course.php
index 6d38556762..0cb4fd7e4f 100755
--- a/main/coursecopy/copy_course.php
+++ b/main/coursecopy/copy_course.php
@@ -49,11 +49,6 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
 	$cr->restore($_POST['destination_course']);
 	Display::display_normal_message(get_lang('CopyFinished'));
 } elseif (isset ($_POST['copy_option']) && $_POST['copy_option'] == 'select_items') {
-	// Else, if a CourseSelectForm is requested, show it
-	Display::display_normal_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
-	if (api_get_setting('show_glossary_in_documents') != 'none') {
-		Display::display_normal_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'));
-	}
 	$cb = new CourseBuilder();
 	$course = $cb->build();
 	//echo get_lang('SelectItemsToCopy');
diff --git a/main/coursecopy/create_backup.php b/main/coursecopy/create_backup.php
index 1b6e76892c..82301d91cd 100755
--- a/main/coursecopy/create_backup.php
+++ b/main/coursecopy/create_backup.php
@@ -70,7 +70,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
 } elseif (isset($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') {
 	$cb = new CourseBuilder('partial');
 	$course = $cb->build();
-	Display::display_normal_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
+	
 	CourseSelectForm :: display_form($course);
 } else {
 	$cb = new CourseBuilder();