[Stack-cvs] stack-1-0/frontend_general editquiz_display.php,1.2,1.3 frontend_util.php,1.2,1.3

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

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

Modified Files:
	editquiz_display.php frontend_util.php 
Log Message:


Index: frontend_util.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/frontend_general/frontend_util.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** frontend_util.php	20 Jun 2005 15:42:58 -0000	1.2
--- frontend_util.php	21 Jun 2005 14:52:24 -0000	1.3
***************
*** 118,129 ****
  */
  function stack_get_questionbank_filter() {
!       $question_bank_filter = '';
    if (array_key_exists('bank_filter',$_SESSION)) {
        $question_bank_filter = $_SESSION['bank_filter'];
    }
    if (array_key_exists('bank_filter',$_POST)) {
        $question_bank_filter = $_POST['bank_filter'];
!       $_SESSION['bank_filter'] = $question_bank_filter;      
    }
    return $question_bank_filter;
  }
--- 118,140 ----
  */
  function stack_get_questionbank_filter() {
! 
!   // Ensure all fields exist and are set.
!   $question_bank_filter['name']       = '';
!   $question_bank_filter['kw']         = '';
!   $question_bank_filter['case_sense'] = FALSE;
! 
! 
    if (array_key_exists('bank_filter',$_SESSION)) {
        $question_bank_filter = $_SESSION['bank_filter'];
    }
+ 
    if (array_key_exists('bank_filter',$_POST)) {
        $question_bank_filter = $_POST['bank_filter'];
!       if (!array_key_exists('case_sense',$question_bank_filter)) {
!           $question_bank_filter['case_sense'] = FALSE;
!       }
    }
+   
+   $_SESSION['bank_filter'] = $question_bank_filter;      
    return $question_bank_filter;
  }

Index: editquiz_display.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/frontend_general/editquiz_display.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** editquiz_display.php	20 Jun 2005 15:42:58 -0000	1.2
--- editquiz_display.php	21 Jun 2005 14:52:24 -0000	1.3
***************
*** 77,102 ****
  
  /* 
- * Displays the page for adding questions to a quiz
- * @param string $PostTo The page that the info from the form should be posted to
- * @param int $quizid The id of the quiz to add the questions to
- * @param array $question_bank_filter The question bank filter to apply
- * @return void
- */
- function stack_display_editquiz_add_questions($PostTo, $quizid, $question_bank_filter) {
-     echo "<p>\n<form name='quizform' action='$PostTo' method='POST'>
-           <input type='hidden' name='quizid' value='$quizid'>";
- 
-   echo "<a href=\"javascript:takeaction('filter',{$quizid});\">Filter</a> "; 
-   echo "Name = <input type='text' name='bank_filter[name]' value='{$question_bank_filter['name']}' />";
-   echo " Keyword = <input type='text' name='bank_filter[kw]' value='{$question_bank_filter['kw']}' />";
- 
-   stack_db_listquestions_quiz($question_bank_filter);
- 
-   echo '<input type="hidden" name="action" value="quiz_edit" />';
-   echo "<input type=\"submit\" value=\"Add\" />\n</form>\n";
- 
- }
- 
- /* 
  * Displays the page for editting a quiz
  * @param array $quiz The quiz to edit
--- 77,80 ----