From 1eb829a13c89ee5f5cc89d834760b2228d467a86 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 31 May 2010 17:33:16 +0200
Subject: [PATCH 1/3] Fixing question pool pagination + changing with nice
 icons

---
 main/exercice/question_pool.php | 67 ++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/main/exercice/question_pool.php b/main/exercice/question_pool.php
index e494a702e1..215a0b862c 100755
--- a/main/exercice/question_pool.php
+++ b/main/exercice/question_pool.php
@@ -40,11 +40,12 @@ if(isset($_GET['exerciseId'])){
 	$exerciseId = intval($_GET['exerciseId']);
 }
 if(isset($_GET['exerciseLevel'])){
-	$exerciseLevel = intval($_GET['exerciseLevel']);
+	$exerciseLevel = intval($_REQUEST['exerciseLevel']);
 }
 if(isset($_GET['answerType'])){
-	$answerType = intval($_GET['answerType']);
+	$answerType = intval($_REQUEST['answerType']);
 }
+$page = 0;
 if(!empty($_GET['page'])){
 	$page = intval($_GET['page']);
 }
@@ -136,8 +137,7 @@ if($is_allowedToEdit) {
 		// destruction of the Question object
 		unset($objQuestionTmp);
 
-        if(!$objExcercise instanceOf Exercise)
-        {
+        if(!$objExcercise instanceOf Exercise) {
         	$objExercise = new Exercise();
             $objExercise->read($fromExercise);
         }
@@ -176,7 +176,7 @@ if (isset($_SESSION['gradebook'])){
 
 if (!empty($gradebook) && $gradebook=='view') {
 	$interbreadcrumb[]= array (
-			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),
 			'name' => get_lang('ToolGradebook')
 		);
 }
@@ -186,35 +186,25 @@ $nameTools=get_lang('QuestionPool');
 $interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
 
 // if admin of course
-if($is_allowedToEdit)
-{
-	Display::display_header($nameTools,"Exercise");
-?>
-
-<h3><?php echo $nameTools; ?></h3>
-
-<div class="actions">
-	
-	<?php
-	
+if($is_allowedToEdit) {
+	Display::display_header($nameTools,'Exercise');
+	echo '<h3>'.$nameTools.'</h3>';
+	echo '<div class="actions">';
 	if (isset($type)) {
 		$url = api_get_self().'?type=1';
 	} else {
 		$url = api_get_self();
 	}
-	?>
-
-	<form method="get" action="<?php echo $url; ?>" style="display:inline;">
-	<?php
+	echo '<form method="GET" action="'.$url.'" style="display:inline;">';
+	 
 	if (isset($type)) {
 		echo '<input type="hidden" name="type" value="1">';
 	}
+	echo '<input type="hidden" name="fromExercise" value="'.$fromExercise.'">';
+	echo get_lang('Exercice').' :';	
+	echo '<select name="exerciseId">';	
+	echo '<option value="0">'.get_lang('AllExercises').'</option>';
 	?>
-	<input type="hidden" name="fromExercise" value="<?php echo $fromExercise; ?>">
-
-	<?php echo get_lang('Exercice'); ?> :
-	<select name="exerciseId">
-	<option value="0"><?php echo get_lang('AllExercises'); ?></option>
 	<option value="-1" <?php if($exerciseId == -1) echo 'selected="selected"'; ?>><?php echo get_lang('OrphanQuestions'); ?></option>
 	<?php
 	$sql="SELECT id,title FROM $TBL_EXERCICES WHERE id<>'".Database::escape_string($fromExercise)."' AND active<>'-1' ORDER BY id";
@@ -260,7 +250,7 @@ if($is_allowedToEdit)
 				$selected ='';
 				if ($answer_type!=0) {
 					if ($answerType == $answer_type)
-					$selected = ' selected="selected" ';
+						$selected = ' selected="selected" ';
 					if ($answer_type==-1) {echo '<option value="-1" '.$selected.'>'.get_lang('Any').'</option>'; } // check 0 or -1
 					elseif ($answer_type==1) {echo '<option value="'.$answer_type.'" '.$selected.'>'.get_lang('UniqueAnswer').'</option>'; }
 					elseif ($answer_type==2) {echo '<option value="'.$answer_type.'" '.$selected.'>'.get_lang('MultipleAnswer').'</option>'; }
@@ -379,8 +369,9 @@ if($is_allowedToEdit)
 		if (isset($answerType) && $answerType != -1) {
 			$filter .= ' AND qu.type='.$answerType.' ';
 		}
-
-		$sql="SELECT qu.id, question, qu.type, level, q.session_id FROM $TBL_QUESTIONS as qu, $TBL_EXERCICE_QUESTION as qt, $TBL_EXERCICES as q WHERE q.id=qt.exercice_id AND qu.id=qt.question_id AND qt.exercice_id<>".$fromExercise." $filter ORDER BY session_id ASC";
+		$new_limit_page = $limitQuestPage + 1;
+		$sql="SELECT qu.id, question, qu.type, level, q.session_id FROM $TBL_QUESTIONS as qu, $TBL_EXERCICE_QUESTION as qt, $TBL_EXERCICES as q
+			  WHERE q.id=qt.exercice_id AND qu.id=qt.question_id AND qt.exercice_id<>".$fromExercise." $filter ORDER BY session_id ASC LIMIT $from, $new_limit_page";
 		// forces the value to 0
 		//echo $sql;
 		$exerciseId=0;
@@ -398,15 +389,23 @@ if($is_allowedToEdit)
 	 '<td align="right">';
 
 	if(!empty($page)) {
-		echo '<a href="',api_get_self(),'?',api_get_cidreq(),'&exerciseId=',$exerciseId,'&fromExercise=',$fromExercise,'&page=',($page-1),'">&lt;&lt; ',get_lang('PreviousPage'),'</a> | ';
+		echo '<a href="',api_get_self(),'?',api_get_cidreq(),'&exerciseId=',$exerciseId,'&fromExercise=',$fromExercise,'&page=',($page-1),'&answerType=',$answerType,'&exerciseLevel='.$exerciseLevel.'">';
+		echo Display::return_icon('action_prev.png');
+		echo '&nbsp;'.get_lang('PreviousPage'),'</a> | ';
+		
 	} elseif($nbrQuestions > $limitQuestPage) {
-		echo '&lt;&lt; ',get_lang('PreviousPage'),' | ';
+		echo Display::return_icon('action_prev_na.png');
+		echo '&nbsp;'.get_lang('PreviousPage'),' | ';
 	}
 
 	if($nbrQuestions > $limitQuestPage) {
-    	echo '<a href="',api_get_self(),'?',api_get_cidreq(),'&exerciseId=',$exerciseId,'&fromExercise=',$fromExercise,'&page=',($page+1),'">',get_lang('NextPage'),' &gt;&gt;</a>';
+    	echo '<a href="',api_get_self(),'?',api_get_cidreq(),'&exerciseId=',$exerciseId,'&fromExercise=',$fromExercise,'&page=',($page+1),'&answerType=',$answerType,'&exerciseLevel='.$exerciseLevel.'">',get_lang('NextPage').'&nbsp;';
+    	echo Display::return_icon('action_next.png');
+    	echo '</a>';
+    	
 	} elseif($page) {
-	   echo '  ',get_lang('NextPage'),' &gt;&gt;';
+	   echo get_lang('NextPage');
+	   echo '&nbsp;'.Display::return_icon('action_next_na.png');
 	}
     echo '</td>
 	</tr>
@@ -476,7 +475,6 @@ if($is_allowedToEdit)
 			if($i == $limitQuestPage) {
 				break;
 			}
-
 			$i++;
 		}
 	}
@@ -498,5 +496,4 @@ if($is_allowedToEdit)
 	// if not admin of course
 	api_not_allowed(true);
 }
-
-?>
+?>
\ No newline at end of file

From 832ca5610d2634aa1c7ae7f3101efeb0d7b752d5 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 31 May 2010 17:54:49 +0200
Subject: [PATCH 2/3] Fixing javascript errors

---
 main/exercice/exercice.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index f27583a9b6..22afa7778b 100755
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -957,16 +957,15 @@ if ($show == 'test') {
 ?>
 		    <td>
 		    <a href="admin.php?<?php echo api_get_cidreq()?>&amp;exerciseId=<?php echo $row['id']; ?>"><img src="../img/wizard_small.gif" border="0" title="<?php echo api_htmlentities(get_lang('Edit'),ENT_QUOTES,$charset); ?>" alt="<?php echo api_htmlentities(get_lang('Edit'),ENT_QUOTES,$charset); ?>" /></a>		    
-		    <a href="exercice.php?<?php echo api_get_cidreq()?>&amp;choice=copy_exercise&amp;sec_token=<?php echo $token; ?>&amp;exerciseId=<?php echo $row['id']; ?>"  onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('AreYouSureToCopy'),ENT_QUOTES,$charset)); echo " ".$row['title']; echo "?"; ?>')) return false;"><img width="16" src="../img/cd.gif" border="0" title="<?php echo api_htmlentities(get_lang('CopyExercise'),ENT_QUOTES,$charset); ?>" alt="<?php echo api_htmlentities(get_lang('CopyExercise'),ENT_QUOTES,$charset); ?>" /></a>		    
-		    <a href="exercice.php?<?php echo api_get_cidreq()?>&amp;choice=clean_results&amp;sec_token=<?php echo $token; ?>&amp;exerciseId=<?php echo $row['id']; ?>"  onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('AreYouSureToDeleteResults'),ENT_QUOTES,$charset)); echo " ".$row['title']; echo "?"; ?>')) return false;" ><img width="16" src="../img/clean_group.gif" border="0" title="<?php echo api_htmlentities(get_lang('CleanStudentResults'),ENT_QUOTES,$charset); ?>" alt="<?php echo api_htmlentities(get_lang('CleanStudentResults'),ENT_QUOTES,$charset); ?>" /></a>
+		    <a href="exercice.php?<?php echo api_get_cidreq()?>&amp;choice=copy_exercise&amp;sec_token=<?php echo $token; ?>&amp;exerciseId=<?php echo $row['id']; ?>"  onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('AreYouSureToCopy'),ENT_QUOTES,$charset)); echo " ".addslashes($row['title']); echo "?"; ?>')) return false;"><img width="16" src="../img/cd.gif" border="0" title="<?php echo api_htmlentities(get_lang('CopyExercise'),ENT_QUOTES,$charset); ?>" alt="<?php echo api_htmlentities(get_lang('CopyExercise'),ENT_QUOTES,$charset); ?>" /></a>		    
+		    <a href="exercice.php?<?php echo api_get_cidreq()?>&amp;choice=clean_results&amp;sec_token=<?php echo $token; ?>&amp;exerciseId=<?php echo $row['id']; ?>"  onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('AreYouSureToDeleteResults'),ENT_QUOTES,$charset)); echo " ".addslashes($row['title']); echo "?"; ?>')) return false;" ><img width="16" src="../img/clean_group.gif" border="0" title="<?php echo api_htmlentities(get_lang('CleanStudentResults'),ENT_QUOTES,$charset); ?>" alt="<?php echo api_htmlentities(get_lang('CleanStudentResults'),ENT_QUOTES,$charset); ?>" /></a>
 		    
 			<?php
-
-				if ($row['results_disabled']) {
-					//echo '<a href="exercice.php?choice=enable_results&page='.$page.'&exerciseId='.$row['id'].'" title="'.get_lang('EnableResults').'" alt="'.get_lang('EnableResults').'"><img src="../img/lp_quiz_na.gif" border="0" alt="'.api_htmlentities(get_lang('EnableResults'),ENT_QUOTES,$charset).'" /></a>';
-				} else {
-					//echo '<a href="exercice.php?choice=disable_results&page='.$page.'&exerciseId='.$row['id'].'" title="'.get_lang('DisableResults').'" alt="'.get_lang('DisableResults').'"><img src="../img/lp_quiz.gif" border="0" alt="'.api_htmlentities(get_lang('DisableResults'),ENT_QUOTES,$charset).'" /></a>';
-				}
+			if ($row['results_disabled']) {
+				//echo '<a href="exercice.php?choice=enable_results&page='.$page.'&exerciseId='.$row['id'].'" title="'.get_lang('EnableResults').'" alt="'.get_lang('EnableResults').'"><img src="../img/lp_quiz_na.gif" border="0" alt="'.api_htmlentities(get_lang('EnableResults'),ENT_QUOTES,$charset).'" /></a>';
+			} else {
+				//echo '<a href="exercice.php?choice=disable_results&page='.$page.'&exerciseId='.$row['id'].'" title="'.get_lang('DisableResults').'" alt="'.get_lang('DisableResults').'"><img src="../img/lp_quiz.gif" border="0" alt="'.api_htmlentities(get_lang('DisableResults'),ENT_QUOTES,$charset).'" /></a>';
+			}
 ?>
 			<!--<a href="exercise_admin.php?modifyExercise=yes&exerciseId=--><?php
 
@@ -981,7 +980,7 @@ if ($show == 'test') {
 ?>
 
 <!--" /></a>-->
-			<a href="exercice.php?<?php echo api_get_cidreq() ?>&choice=delete&sec_token=<?php echo$token; ?>&amp;exerciseId=<?php echo $row['id']; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('AreYouSureToDelete'),ENT_QUOTES,$charset)); echo " ".$row['title']; echo "?"; ?>')) return false;"> <img src="../img/delete.gif" border="0" title="<?php echo get_lang('Delete'); ?>" alt="<?php echo api_htmlentities(get_lang('Delete'),ENT_QUOTES,$charset); ?>" /></a>
+			<a href="exercice.php?<?php echo api_get_cidreq() ?>&choice=delete&sec_token=<?php echo$token; ?>&amp;exerciseId=<?php echo $row['id']; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('AreYouSureToDelete'),ENT_QUOTES,$charset)); echo " ".addslashes($row['title']); echo "?"; ?>')) return false;"> <img src="../img/delete.gif" border="0" title="<?php echo get_lang('Delete'); ?>" alt="<?php echo api_htmlentities(get_lang('Delete'),ENT_QUOTES,$charset); ?>" /></a>
 			<?php
 				//if active
 				if ($row['active']) {

From 997118e838a04b25667491e0e905d9a68bb24165 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 31 May 2010 17:55:50 +0200
Subject: [PATCH 3/3] Adding some sense (anchor tag) to the \"Add this question
 to the test\" feature in Quiz tool

---
 main/exercice/question_create.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/exercice/question_create.php b/main/exercice/question_create.php
index 7a10f757f5..5a2d29ba5f 100755
--- a/main/exercice/question_create.php
+++ b/main/exercice/question_create.php
@@ -98,7 +98,7 @@ if ($form->validate()) {
 }
 ?>
 <script>
-var ddlObj1=$("#questiontypes").finalselect({id:"test",viewWidth:'260px', viewHeight:'150px', selectText:'<?php echo Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle; cursor:hand'))."&nbsp;&nbsp;".get_lang('SelectQuestionType');?>',selectImage:'<?php echo api_get_path(WEB_IMG_PATH); ?>select.png', viewMouseoverColor: '#EFEFEF'});
+var ddlObj1=$("#questiontypes").finalselect({id:"test",viewWidth:'260px', viewHeight:'150px', selectText:'<?php echo Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle; cursor:hand'))."&nbsp;&nbsp;<a href=\"#\"> ".get_lang('SelectQuestionType'); echo "</a>"; ?>',selectImage:'<?php echo api_get_path(WEB_IMG_PATH); ?>select.png', viewMouseoverColor: '#EFEFEF'});
 $("#test-select").bind('click',function(){
 	$("#question_type_hidden").val(ddlObj1.getText());
 });
@@ -114,7 +114,7 @@ $pictures_question_types[9] = 'mcmac.gif';
 
 foreach (Question::$questionTypes as $key=>$value) {
 	?>
-	ddlObj1.addItem('<table width="100%"><tr><td style="width: 37px;" valign="top"><?php Display::display_icon($pictures_question_types[$key],addslashes(get_lang($value[1])),array('height'=>'40px;', 'style' => 'vertical-align:top; cursor:hand;')); ?></td><td><span class="thistext" style="cursor:hand"><?php echo addslashes(get_lang($value[1])); ?></span><br/><sub><?php /*echo addslashes(get_lang($value[1].'Comment'));*/ ?></sub></td></tr></table>','');
+	ddlObj1.addItem('<table width="100%"><tr><td style="width: 37px;" valign="top"><?php Display::display_icon($pictures_question_types[$key],addslashes(get_lang($value[1])),array('height'=>'40px;', 'style' => 'vertical-align:top; cursor:hand;')); ?></td><td><span class="thistext" style="cursor:hand"><?php echo '<a href="#">'.addslashes(get_lang($value[1])).'</a>'; ?></span><br/><sub><?php /*echo addslashes(get_lang($value[1].'Comment'));*/ ?></sub></td></tr></table>','');
 	<?php
 }
 ?>