[Stack-cvs] stack-1-0 editquiz.php,1.17,1.18 import.php,1.5,1.6 question_bank.php,1.12,1.13 stackConfig.php.dist,1.3,1.4

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

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

Modified Files:
	editquiz.php import.php question_bank.php stackConfig.php.dist 
Log Message:


Index: import.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/import.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** import.php	29 Aug 2005 18:41:03 -0000	1.5
--- import.php	29 Aug 2005 19:08:04 -0000	1.6
***************
*** 35,43 ****
  require_once('stackLib.php');
  
  require_once("{$stack_root}/html/trypopupform.html");
- require_once("{$stack_root}/frontend_general/editquiz_display.php");
  require_once("{$stack_root}/html/helpform.php");
  require_once("{$stack_root}/html/quizjava.html");
- require_once("{$stack_root}/scripts/stackAuthor.php");
  
  $default_action = 'import';
--- 35,43 ----
  require_once('stackLib.php');
  
+ require_once("{$stack_root}/scripts/stackAuthor.php");
+ 
  require_once("{$stack_root}/html/trypopupform.html");
  require_once("{$stack_root}/html/helpform.php");
  require_once("{$stack_root}/html/quizjava.html");
  
  $default_action = 'import';

Index: question_bank.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/question_bank.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** question_bank.php	29 Aug 2005 18:41:03 -0000	1.12
--- question_bank.php	29 Aug 2005 19:08:04 -0000	1.13
***************
*** 139,143 ****
        include_once("{$stack_root}/scripts/stackXML.php");
        stack_question_validate($question,$errors);
!       $name = stack_xml_write_question_file($question, "{$stack_root}/tmp/");
        $questions_to_export = TRUE;
    }
--- 139,143 ----
        include_once("{$stack_root}/scripts/stackXML.php");
        stack_question_validate($question,$errors);
!       $name = stack_xml_write_question_file($question, "{$stack_root}/{$stack_tmpdir}/");
        $questions_to_export = TRUE;
    }
***************
*** 148,152 ****
        $name = '';
        if (NULL !== $questions_to_export) {
!           $name = stack_xml_write_question_list($questions_to_export, "{$stack_root}/tmp/");
        } 
        $action = 'export_xml';
--- 148,152 ----
        $name = '';
        if (NULL !== $questions_to_export) {
!           $name = stack_xml_write_question_list($questions_to_export, "{$stack_root}/{$stack_tmpdir}/");
        } 
        $action = 'export_xml';

Index: stackConfig.php.dist
===================================================================
RCS file: /cvsroot/stack/stack-1-0/stackConfig.php.dist,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** stackConfig.php.dist	29 Aug 2005 18:41:03 -0000	1.3
--- stackConfig.php.dist	29 Aug 2005 19:08:04 -0000	1.4
***************
*** 41,44 ****
--- 41,48 ----
  $stack_web_url  = 'http://'.$stack_host.'/'.$stack_basepath.'/';
  
+ /* Temporary files, such as pictures and XML              */
+ /* This should be in $stack_root                          */
+ $stack_tmpdir   = 'tmp';
+ 
  /***************************************************/
  /* Integration with VLE or stand alone?           */
***************
*** 102,107 ****
  // Use UNIX slashes in filenames: these get sorted in initmaxima.php, for Windows
  $maximalocal['TMP_IMAGE_DIR'] = $stack_logfiles;
! $maximalocal['IMAGE_DIR']     = $stack_root.'/tmp/';
! $maximalocal['URL_BASE']      = $stack_web_url.'tmp/';
  // These are used by the GNUplot "set terminal" command.
  $maximalocal['PLOT_TERMINAL'] = 'png'; // Either 'png' or 'gif'
--- 106,111 ----
  // Use UNIX slashes in filenames: these get sorted in initmaxima.php, for Windows
  $maximalocal['TMP_IMAGE_DIR'] = $stack_logfiles;
! $maximalocal['IMAGE_DIR']     = $stack_root.'/'.$stack_tmpdir.'/';
! $maximalocal['URL_BASE']      = $stack_web_url.$stack_tmpdir.'/';
  // These are used by the GNUplot "set terminal" command.
  $maximalocal['PLOT_TERMINAL'] = 'png'; // Either 'png' or 'gif'

Index: editquiz.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/editquiz.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** editquiz.php	29 Aug 2005 18:41:03 -0000	1.17
--- editquiz.php	29 Aug 2005 19:08:04 -0000	1.18
***************
*** 43,49 ****
  require_once("{$stack_root}/html/quizjava.html");
  
- //require_once("{$stack_root}/frontend_general/editquiz_display.php");
- //include_once('frontend_general/edit_quiz_util.php');
- 
  ///////////////////////////////////////////////////////////////
  // (1) Process Input - this sets $action, $user and $username
--- 43,46 ----
***************
*** 178,182 ****
      $quiz = stack_db_quiz_get($quizid);  
      stack_xml_remove_quiz_meta_defaults($quiz);         //Pass quiz by reference and remove all default metadata
!     $name = stack_xml_write_quiz_new($quiz,"{$stack_root}/tmp/"); 
   }  
  
--- 175,179 ----
      $quiz = stack_db_quiz_get($quizid);  
      stack_xml_remove_quiz_meta_defaults($quiz);         //Pass quiz by reference and remove all default metadata
!     $name = stack_xml_write_quiz_new($quiz,"{$stack_root}/{$stack_tmpdir}/"); 
   }