[Stack-cvs] stack-1-0/scripts stackDatabase.php,1.57,1.58 stackQuestion.php,1.54,1.55 stackWin.php,1.15,1.16

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

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

Modified Files:
	stackDatabase.php stackQuestion.php stackWin.php 
Log Message:


Index: stackDatabase.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackDatabase.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** stackDatabase.php	24 Nov 2005 19:09:14 -0000	1.57
--- stackDatabase.php	27 Nov 2005 11:30:52 -0000	1.58
***************
*** 893,897 ****
  
      // Only store answers to questions that have an ID, which is not zero, ie are in the DB.
!     if ('' !=  $questionID and 0 != $questionID) {
  
          $query='INSERT INTO questionAttempts '; 
--- 893,897 ----
  
      // Only store answers to questions that have an ID, which is not zero, ie are in the DB.
!     if ( '' != $questionID and 0 != $questionID and -1 != $userID) {
  
          $query='INSERT INTO questionAttempts '; 

Index: stackWin.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackWin.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** stackWin.php	19 Nov 2005 15:33:54 -0000	1.15
--- stackWin.php	27 Nov 2005 11:30:52 -0000	1.16
***************
*** 89,93 ****
     global $stack_root,$stack_logfiles,$stack_cas;
  
!    $debug = FALSE;
     if (array_key_exists('debug',$_GET)) {
        $debug = TRUE;
--- 89,93 ----
     global $stack_root,$stack_logfiles,$stack_cas;
  
!    $debug = false;
     if (array_key_exists('debug',$_GET)) {
        $debug = TRUE;

Index: stackQuestion.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuestion.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** stackQuestion.php	19 Nov 2005 16:37:08 -0000	1.54
--- stackQuestion.php	27 Nov 2005 11:30:52 -0000	1.55
***************
*** 133,136 ****
--- 133,141 ----
  $stackOptions['TeacherEmail']['default']  = '';
  
+ // Set a default value.
+ if ('' != $stack_mail['admin_email'] and 'so...@so...' != $stack_mail['admin_email']) {
+     $stackOptions['TeacherEmail']['default'] = $stack_mail['admin_email'];
+ }
+ 
  // 'Feedback: correct';
  $stackOptions['FeedBackGenericCorrect']['type']      = 'html';