[svn r20810] Fixed - bug en ejercicios al editar dentro de vista previa - see FS#4186 (by rvelasquez)

main/exercice/admin.php

@@ -1,4 +1,4 @@
-<?php // $Id: admin.php 20776 2009-05-18 12:43:44Z pcool $
+<?php // $Id: admin.php 20810 2009-05-18 21:16:22Z cfasanando $
  
 /*
 ==============================================================================
@@ -67,7 +67,7 @@
 *
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: admin.php 20776 2009-05-18 12:43:44Z pcool $
+* 	@version $Id: admin.php 20810 2009-05-18 21:16:22Z cfasanando $
 */
 
 
@@ -75,7 +75,6 @@ include('exercise.class.php');
 include('question.class.php');
 include('answer.class.php');
 
-
 // name of the language file that needs to be included
 $language_file='exercice';
 
@@ -85,8 +84,7 @@ $this_section=SECTION_COURSES;
 
 $is_allowedToEdit=api_is_allowed_to_edit();
 
-if(!$is_allowedToEdit)
-{
+if (!$is_allowedToEdit) {
 	api_not_allowed(true);
 }
 
@@ -96,7 +94,6 @@ define(ALLOWED_TO_INCLUDE,1);
 include_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
 include_once(api_get_path(LIBRARY_PATH).'document.lib.php');
 
-
 // get vars from GET
 if ( empty ( $exerciseId ) )
 {
@@ -131,6 +128,11 @@ if ( empty ( $modifyExercise ) )
     $modifyExercise = $_GET['modifyExercise'];
 }
 
+// it clean the session
+if (!empty($_SESSION)) {
+	unset($_SESSION);
+}
+
 // get from session
 $objExercise = $_SESSION['objExercise'];
 $objQuestion = $_SESSION['objQuestion'];
@@ -434,12 +436,8 @@ echo Display::return_icon('edit.gif', get_lang('ModifyExercise')).'<a href="exer
 
 echo '</div>';
 
-if(isset($_GET['message']))
-{
-	if (in_array($_GET['message'], array('ExerciseStored')))
-	{
-		Display::display_confirmation_message(get_lang($_GET['message']));
-	}
+if (isset($_GET['message'])) {
+	Display::display_confirmation_message(get_lang($_GET['message']));
 }
 
 /*		
@@ -476,8 +474,7 @@ if(!$newQuestion && !$modifyQuestion && !$editQuestion && !isset($_GET['hotspota
 		if($form -> getSubmitValue('edit') == 'true')
 			Display::display_confirmation_message(get_lang('ExerciseEdited'));
 	}		
-	$form -> display (); 
-	echo '<br />';	
+	$form -> display ();
 	// question list management
 	include('question_list_admin.inc.php');
 }

main/exercice/exercise_admin.php

@@ -112,16 +112,15 @@ if(isset($_GET['exerciseId'])) {
 
 $objExercise -> createForm ($form);
 
-
 /*********************
  * VALIDATE FORM
  *********************/
-if($form -> validate()) {
-	$objExercise -> processCreation($form);	
+if ($form -> validate()) {
+	$objExercise -> processCreation($form);
 	if ($form -> getSubmitValue('edit') == 'true') {
 		header('Location:admin.php?message=ExerciseEdited&exerciseId='.$objExercise->id);
 	} else {
-		header('Location:admin.php?message=ExerciseStored&exerciseId='.$objExercise->id);
+		header('Location:admin.php?message=ExerciseAdded&exerciseId='.$objExercise->id);
 	}
 } else {
 	/*********************

main/exercice/question_list_admin.inc.php

@@ -1,4 +1,4 @@
-<?php // $Id: question_list_admin.inc.php 20716 2009-05-16 07:28:22Z ivantcholakov $
+<?php // $Id: question_list_admin.inc.php 20810 2009-05-18 21:16:22Z cfasanando $
  
 /*
 ==============================================================================
@@ -28,7 +28,7 @@
 *	Code library for HotPotatoes integration.
 *	@package dokeos.exercise
 * 	@author
-* 	@version $Id: question_list_admin.inc.php 20716 2009-05-16 07:28:22Z ivantcholakov $
+* 	@version $Id: question_list_admin.inc.php 20810 2009-05-18 21:16:22Z cfasanando $
 */
 
 
@@ -113,7 +113,7 @@ if($nbrQuestions) {
 			  	<td align="center"><?php echo $objQuestionTmp->selectLevel(); ?></td>
 			  	<!--<td align="center"><a href="<?php echo api_get_self(); ?>?action=exportqti2&questionId=<?php echo $id; ?>"><img src="../img/export.png" border="0" align="absmiddle" alt="IMS/QTI" /></a></td>-->
 			  	<td> <a href="<?php echo api_get_self(); ?>?myid=1&ed
-					itQuestion=<?php echo $id; ?>"><img src="../img/edit.gif" border="0" alt="<?php echo get_lang('Modify'); ?>" /></a> <a href="<?php echo api_get_self(); ?>?deleteQuestion=<?php echo $id; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="<?php echo get_lang('Delete'); ?>" /></a>
+					itQuestion=<?php echo $id; ?>"><img src="../img/edit.gif" border="0" alt="<?php echo get_lang('Modify'); ?>" /></a> <a href="<?php echo api_get_self(); ?>?deleteQuestion=<?php echo $id; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="<?php echo get_lang('Delete'); ?>" /></a>
 				<?php 
 				if($i != 1) { ?>		
 						<a href="<?php echo api_get_self(); ?>?moveUp=<?php echo $id; ?>"><img src="../img/up.gif" border="0" alt="<?php echo get_lang('MoveUp'); ?>"></a>