[Stack-cvs] stack-1-0 quiz.php,1.53,1.54 vista.php,1.5,1.6

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-1-0
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30916

Modified Files:
	quiz.php vista.php 
Log Message:


Index: vista.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/vista.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** vista.php	29 Sep 2006 16:14:51 -0000	1.5
--- vista.php	2 Oct 2006 07:18:38 -0000	1.6
***************
*** 90,91 ****
--- 90,93 ----
  stack_quiz_student_select($subjectID,$quiz_store, $user, FALSE, "choosequiz.php");
  echo $subject['subjectHTMLFoot'];
+ 
+ ?>
\ No newline at end of file

Index: quiz.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/quiz.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** quiz.php	24 Aug 2006 22:05:04 -0000	1.53
--- quiz.php	2 Oct 2006 07:18:38 -0000	1.54
***************
*** 40,45 ****
  
    // $focus means "one question at a time";
!   $focus    = FALSE;
!   $focus_on = NULL;
  
    if (array_key_exists('focus',$_SESSION)) {
--- 40,45 ----
  
    // $focus means "one question at a time";
!   $focus    = TRUE;
!   $focus_on = 0;
  
    if (array_key_exists('focus',$_SESSION)) {
***************
*** 110,114 ****
          $focus_on = $_POST['quizid'];
      } else {
!         $focus_on = 1;
      }
    }
--- 110,114 ----
          $focus_on = $_POST['quizid'];
      } else {
!         $focus_on = 0;
      }
    }
***************
*** 259,263 ****
    // (4.6) Start a new quiz
    if ('new_quiz_version' == $action) {
!      $focus    = FALSE;
       $new_seed = TRUE;
       $seed     = time()+rand(0,30000);
--- 259,264 ----
    // (4.6) Start a new quiz
    if ('new_quiz_version' == $action) {
!      $focus    = TRUE;
!      $focus_on = 0;
       $new_seed = TRUE;
       $seed     = time()+rand(0,30000);
***************
*** 612,616 ****
    echo '</td></tr>';
    echo '<tr><td><b>'.get_string('stackOptions_QuizMode','stack','').'</b></td><td>'.$quizmode.'</td></tr>';
!   $disp_default_q_mmm  = 'quiz_noattempts_'.$default_q_mmm;  
    $disp_penalty        = 100*$options['Penalty'];
    echo '<tr><td></td><td><font size="-2">'.get_string('quiz_noattempts','stack').get_string($disp_default_q_mmm,'stack',$disp_penalty).'</font></td></tr>';
--- 613,617 ----
    echo '</td></tr>';
    echo '<tr><td><b>'.get_string('stackOptions_QuizMode','stack','').'</b></td><td>'.$quizmode.'</td></tr>';
!   $disp_default_q_mmm  = 'quiz_noattempts_'.$default_q_mmm;
    $disp_penalty        = 100*$options['Penalty'];
    echo '<tr><td></td><td><font size="-2">'.get_string('quiz_noattempts','stack').get_string($disp_default_q_mmm,'stack',$disp_penalty).'</font></td></tr>';