[Stack-cvs] stack-1-0/scripts stackDatabase.php,1.47,1.48 stackQuiz.php,1.13,1.14

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

Update of /cvsroot/stack/stack-1-0/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19268/scripts

Modified Files:
	stackDatabase.php stackQuiz.php 
Log Message:


Index: stackQuiz.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuiz.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** stackQuiz.php	5 Sep 2005 13:40:56 -0000	1.13
--- stackQuiz.php	7 Sep 2005 14:19:35 -0000	1.14
***************
*** 184,188 ****
  * @return void
  */
! function stack_quiz_student_select($subjectID, $quiz_store, $user, $review=FALSE) {
      global $stack_root;
      require_once("{$stack_root}/html/quizjava.html");
--- 184,188 ----
  * @return void
  */
! function stack_quiz_student_select($subjectID, $quiz_store, $user, $review=FALSE, $returnurl='') {
      global $stack_root;
      require_once("{$stack_root}/html/quizjava.html");
***************
*** 201,208 ****
  </script>
         <p>\n<form name='quizform' action='quiz.php' method='POST'>
!                 <input type='hidden' name='userid' value='-1'>
!                 <input type='hidden' name='quizid' value='-1'>
!                 <input type='hidden' name='subjectID' value='-1'>
!                 <input type='hidden' name='action' value='review'>";
          echo "\n<table cellpadding='2'>\n";
          echo "\n<tr><th>{$stackQuiz['quizName']['descript']}</th><th>{$stackQuiz['quizDescription']['descript']}</th><th>Last mark (%)</th><th>{$stackQuiz['quizDueDate']['descript']}</th></tr>";
--- 201,209 ----
  </script>
         <p>\n<form name='quizform' action='quiz.php' method='POST'>
!                 <input type='hidden' name='returnurl' value ='$returnurl' />
!                 <input type='hidden' name='userid' value='-1' />
!                 <input type='hidden' name='quizid' value='-1' />
!                 <input type='hidden' name='subjectID' value='-1' />
!                 <input type='hidden' name='action' value='review' />";
          echo "\n<table cellpadding='2'>\n";
          echo "\n<tr><th>{$stackQuiz['quizName']['descript']}</th><th>{$stackQuiz['quizDescription']['descript']}</th><th>Last mark (%)</th><th>{$stackQuiz['quizDueDate']['descript']}</th></tr>";

Index: stackDatabase.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackDatabase.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** stackDatabase.php	5 Sep 2005 13:40:56 -0000	1.47
--- stackDatabase.php	7 Sep 2005 14:19:35 -0000	1.48
***************
*** 2084,2087 ****
--- 2084,2089 ----
  global $stackQuiz;
  
+    $quiz_list = '';
+ 
     $query  = "SELECT quizid FROM subject_quiz WHERE subjectID = {$subjectID} AND qord >= 0 ORDER BY qord";
  
***************
*** 2097,2101 ****
          }
     }
- 
     return $quiz_list;
  }
--- 2099,2102 ----