Menu
▾
▴
[Stack-cvs] stack-1-0/frontend_general editquiz_display.php,1.1.2.1,1.1.2.2 front_end_display.php,1.1.2.5,1.1.2.6 frontend_util.php,1.1.2.1,1.1.2.2 process_input.php,1.1.2.5,1.1.2.6
|
From: Juliette W. <jv...@us...> - 2005-06-17 10:55:01
|
Update of /cvsroot/stack/stack-1-0/frontend_general In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15612/frontend_general Modified Files: Tag: frontend_dev editquiz_display.php front_end_display.php frontend_util.php process_input.php Log Message: Fixed one of the problems. Changed quizID to quizid everywhere because I thought this might be the problem, need to decide on how to name things consistently. Index: frontend_util.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/frontend_general/Attic/frontend_util.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** frontend_util.php 16 Jun 2005 16:50:50 -0000 1.1.2.1 --- frontend_util.php 17 Jun 2005 10:54:51 -0000 1.1.2.2 *************** *** 1,4 **** --- 1,6 ---- <?php + include_once('scripts/stackUtility.php'); + function stack_get_username($user) { return nsf('username',$user); Index: editquiz_display.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/frontend_general/Attic/editquiz_display.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** editquiz_display.php 16 Jun 2005 16:50:50 -0000 1.1.2.1 --- editquiz_display.php 17 Jun 2005 10:54:51 -0000 1.1.2.2 *************** *** 1,13 **** <?php function stack_select_quiz_screen($quiz_store, $PostTo) { global $stackQuiz; if (is_array($quiz_store)) { echo "<p>\n<form name='quizform' action='$PostTo' method='POST'> ! <input type='hidden' name='quizID' value='-1' /> <input type='hidden' name='action' value='quiz_choose' />"; echo "\n<table cellpadding='2'>\n"; ! echo "\n<tr><th></th><th>{$stackQuiz['quizName']['descript']}</th><th>{$stackQuiz['quizDescription']['descript']}</th><th></th></tr>"; foreach ($quiz_store as $qs => $quiz) { --- 1,19 ---- <?php + + + // + // @param $quiz_store + // @param $PostTo function stack_select_quiz_screen($quiz_store, $PostTo) { global $stackQuiz; if (is_array($quiz_store)) { echo "<p>\n<form name='quizform' action='$PostTo' method='POST'> ! <input type='hidden' name='quizid' value='-1' /> <input type='hidden' name='action' value='quiz_choose' />"; echo "\n<table cellpadding='2'>\n"; ! echo "\n<tr><th></th><th>{$stackQuiz['quizName']['descript']}</th> ! <th>{$stackQuiz['quizDescription']['descript']}</th><th></th></tr>"; foreach ($quiz_store as $qs => $quiz) { *************** *** 16,41 **** $qname = '[empty]'; } ! $qID = $quiz['quizID']; echo "<tr><td>{$qID}</td><td><a href=\"javascript:takeaction('quiz_edit','$qID');\">{$qname}</a></td>\n"; echo "<td>".$quiz['quizDescription']."</td>\n"; ! echo "<td><a href=\"javascript:takeaction('quiz_delete','$qID');\"><font color='red'>Del</font></a></td></tr>\n"; } echo "\n</table>\n\n</p>"; } else { ! echo "<p>You have no quizzes available to try.</p>"; echo "<p>\n<form name='quizform' action='$PostTo' method='POST'> ! <input type='hidden' name='quizID' value='-1' /> <input type='hidden' name='action' value='quiz_choose' />"; - - } } ! function stack_add_questions_screen($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']}' />"; --- 22,50 ---- $qname = '[empty]'; } ! $qID = $quiz['quizid']; echo "<tr><td>{$qID}</td><td><a href=\"javascript:takeaction('quiz_edit','$qID');\">{$qname}</a></td>\n"; echo "<td>".$quiz['quizDescription']."</td>\n"; ! echo "<td><a href=\"javascript:takeaction('quiz_delete','$qID');\"><font color='red'>Delete Quiz</font></a></td></tr>\n"; } echo "\n</table>\n\n</p>"; } else { ! stack_no_quiz_screen($PostTo); ! } ! } ! ! function stack_no_quiz_screen($PostTo) { ! echo "<p>You have no quizzes available to try.</p>"; echo "<p>\n<form name='quizform' action='$PostTo' method='POST'> ! <input type='hidden' name='quizid' value='-1' /> <input type='hidden' name='action' value='quiz_choose' />"; } ! function stack_add_questions_screen($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']}' />"; *************** *** 53,57 **** echo "<p>\n<form name='quizform' action='$PostTo' method='POST'> ! <input type='hidden' name='quizID' value='-1'> <input type='hidden' name='action' value='quiz_choose'>"; } --- 62,66 ---- echo "<p>\n<form name='quizform' action='$PostTo' method='POST'> ! <input type='hidden' name='quizid' value='-1'> <input type='hidden' name='action' value='quiz_choose'>"; } Index: front_end_display.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/frontend_general/Attic/front_end_display.php,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** front_end_display.php 16 Jun 2005 16:50:50 -0000 1.1.2.5 --- front_end_display.php 17 Jun 2005 10:54:51 -0000 1.1.2.6 *************** *** 67,71 **** echo "<p>\n<form name='quizform' action='quiz.php' method='POST'> ! <input type='hidden' name='quizID' value='-1'> <input type='hidden' name='action' value='continue_quiz'>"; --- 67,71 ---- echo "<p>\n<form name='quizform' action='quiz.php' method='POST'> ! <input type='hidden' name='quizid' value='-1'> <input type='hidden' name='action' value='continue_quiz'>"; *************** *** 74,78 **** foreach ($quiz_store as $qs => $quiz) { $qname = $quiz['quizName']; ! $qID = $quiz['quizID']; $mark = '-'; if (is_array($user)) { --- 74,78 ---- foreach ($quiz_store as $qs => $quiz) { $qname = $quiz['quizName']; ! $qID = $quiz['quizid']; $mark = '-'; if (is_array($user)) { Index: process_input.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/frontend_general/Attic/process_input.php,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** process_input.php 16 Jun 2005 11:44:44 -0000 1.1.2.5 --- process_input.php 17 Jun 2005 10:54:51 -0000 1.1.2.6 *************** *** 19,23 **** * @package Stack */ ! $errors = ''; --- 19,23 ---- * @package Stack */ ! include_once('frontend_general/frontend_util.php'); $errors = ''; *************** *** 71,78 **** $username = $user['username']; } else { ! // Make sure the user is logged in as a Guest. include_once($stack_root."/scripts/stackUser.php"); $user = stack_user_blank(); } ?> --- 71,80 ---- $username = $user['username']; } else { ! // Make sure the user is logged in as a Guest. ! // Is a blank user a guest user??? include_once($stack_root."/scripts/stackUser.php"); $user = stack_user_blank(); } + $username = stack_get_username($user); ?> |
