moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

quiz editing: MDL-17291 Question moving functionality to a user-selected page now manipulates an array instead of string

Browse source 
The old implementation was string-based and flawed, so switched to a more readable array-based one.

Also removed strpos2() since it was only used in edit.php locally and due to this change became unused.
This commit is contained in:
pilpi 2008-11-21 17:08:36 +00:00
parent 47a8933f62
commit 218dfb9127
1 changed files with 29 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

66
mod/quiz/edit.php
View file

@ -134,26 +134,6 @@ function array_add_at($array,$value,$at){
$result=array_merge($beginpart,$endpart); $result=array_merge($beginpart,$endpart);
return $result; return $result;
} }
/**
* Just like strpos, but it returns the position
* of the nth instance of the needle.
* Thanks to chasesan at gmail for strpos2
* http://www.php.net/manual/en/function.strpos.php
*/
function strpos2($haystack, $needle, $nth = 1)
{
//Fixes a null return if the position is at the beginning of input
//It also changes all input to that of a string ^.~
$haystack = ' '.$haystack;
if (!strpos($haystack, $needle)){
return false;
}
$offset=0;
for($i = 1; $i < $nth; $i++){
$offset = strpos($haystack, $needle, $offset) + 1;
}
return strpos($haystack, $needle, $offset) - 1;
}
/** /**
* Prints the form for setting a quiz' overall grade * Prints the form for setting a quiz' overall grade
*/ */
@ -585,34 +565,40 @@ if (optional_param('savechanges', false, PARAM_BOOL) and confirm_sesskey()) {
} }
//get a list of questions to move, later to be added in the appropriate //get a list of questions to move, later to be added in the appropriate
//place in the string //place in the string
$questionstomove = implode(",", $moveonpagequestions);
if($moveonpagequestions){ if($moveonpagequestions){
$pagecount=quiz_number_of_pages($quiz->questions); $questions = explode(",", $quiz->questions);
if($moveselectedonpage>quiz_number_of_pages($quiz->questions)){
$moveselectedonpage=$pagecount;
}
$selectedpageend=(strpos2($quiz->questions,",0",$moveselectedonpage));
if($selectedpageend!==FALSE){
foreach($moveonpagequestions as $page=>$question){ foreach($moveonpagequestions as $page=>$question){
$quiz->questions=str_replace("$question,","",$quiz->questions); //remove the questions from their original positions first
while(($delpos=array_search($question,$questions))!==FALSE){
//in case there are multiple instances because of an error, remove all
unset($questions[$delpos]);
} }
if($moveselectedonpage>1){ }
//reindex
foreach($questions as $question){
$newquestions[]=$question;
}
$questions=$newquestions;
//find all pagebreaks
$pagecount=quiz_number_of_pages($quiz->questions); $pagecount=quiz_number_of_pages($quiz->questions);
if($moveselectedonpage>quiz_number_of_pages($quiz->questions)){ if($moveselectedonpage>$pagecount){
// move to the last page is a page beyond last page was requested
$moveselectedonpage=$pagecount; $moveselectedonpage=$pagecount;
} }
$selectedpageend=(strpos2($quiz->questions,",0", if($moveselectedonpage<1){
$moveselectedonpage-1)); $moveselectedonpage=1;
$start=substr($quiz->questions,0,$selectedpageend+1);
$end=substr($quiz->questions,$selectedpageend);
$quiz->questions=$start.$questionstomove.$end;
}else if ($moveselectedonpage==1){
$quiz->questions=$questionstomove.",".$quiz->questions;
} }
}else{ $pagebreakpositions=array_keys($questions,0);
//TODO: add alert message //move to the end of the selected page
$moveselectedpos=$pagebreakpositions[$moveselectedonpage-1];
//array_reverse($moveonpagequestions);
foreach($moveonpagequestions as $question){
$questions=array_add_at($questions,$question,$moveselectedpos);
//place the next one after this one:
$moveselectedpos++;
} }
$quiz->questions=implode(",",$questions);
} }
if($moveonpagequestions or $questions){ if($moveonpagequestions or $questions){
if (!$DB->set_field('quiz', 'questions', $quiz->questions, if (!$DB->set_field('quiz', 'questions', $quiz->questions,