stack-cvs

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

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

Modified Files:
	stackAuthor.php 
Log Message:


Index: stackAuthor.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackAuthor.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** stackAuthor.php	30 Aug 2005 16:34:58 -0000	1.36
--- stackAuthor.php	30 Aug 2005 18:30:19 -0000	1.37
***************
*** 15,18 ****
--- 15,32 ----
  
  /**
+ *
+ * @param string $fieldname The field name
+ * @return string The link to the popup window
+ */
+ function stack_question_edit_formname($fieldname,$prefix) {
+ 
+   if ('' == $prefix) {
+       return $fieldname;
+   }
+   $fieldname = $prefix.'['.$fieldname.']';
+   return $fieldname;
+ }
+ 
+ /**
  * Display the name of a option field, in a link generating a popup window.
  * Added $remoteCaller, which if not specified defaults to false. This prevents the display of the help
***************
*** 24,39 ****
      global $stackOptions;
  
!     $fd='stackOptions_'.$field;
!     $fd=get_string($fd,'stack','');
!     
!     if (!$remoteCaller)
!     {
! 	    $strout = "<a href=\"javascript:HelpPopup('$field','stackOptions');\">$fd</a>";
! 	    $strout = "<a border=\"none\" href=\"javascript:HelpPopup('$field','stackOptions');\"><img align=\"middle\" border=\"0\" alt=\"$fd\" src=\"pics/help.gif\" /></a> $fd";
! 	    return($strout);
!     }
      
!     else if ($remoteCaller) {
! 	    return($fd);
      }
  }
--- 38,50 ----
      global $stackOptions;
  
!     $fd = 'stackOptions_'.$field;
!     $fd = get_string($fd,'stack','');
      
!     if ($remoteCaller) {
!         return($fd);
!     } else {
!         $strout = "<a href=\"javascript:HelpPopup('$field','stackOptions');\">$fd</a>";
!         $strout = "<a border=\"none\" href=\"javascript:HelpPopup('$field','stackOptions');\"><img align=\"middle\" border=\"0\" alt=\"$fd\" src=\"pics/help.gif\" /></a> $fd";
!         return($strout);
      }
  }
***************
*** 80,84 ****
  * @return void
  */
! function stack_options_edit_form($options_headings,$options_list,$options,$fieldname,$remoteCaller=FALSE) {
  global $stackOptions;
  
--- 91,95 ----
  * @return void
  */
! function stack_options_edit_form($options_headings,$options_list,$options,$fieldname,$prefix='',$remoteCaller=FALSE) {
  global $stackOptions;
  
***************
*** 90,94 ****
      foreach( $options_list as $k => $opt) {
          $descript = stack_question_edit_dispoptionfield($opt,$remoteCaller);
!         $name     = $fieldname.'['.$opt.']';
          $category = $options_headings[$k];
          echo "\n<tr>\n"; 
--- 101,105 ----
      foreach( $options_list as $k => $opt) {
          $descript = stack_question_edit_dispoptionfield($opt,$remoteCaller);
!         $name     = stack_question_edit_formname($fieldname,$prefix).'['.$opt.']';
          $category = $options_headings[$k];
          echo "\n<tr>\n"; 
***************
*** 194,223 ****
      
      // hidden metadata
!     echo "\n<hr />\n
!         <input type='hidden' name='questionID' value='".sf($question,'questionID')."' />\n
!         <input type='hidden' name='questionGUID' value='".sf($question,'questionGUID')."' />\n
!         <input type='hidden' name='questionDateLastEdited' value='$t' />\n
!         <input type='hidden' name='questionUserLastEdited' value='".sf($question,'questionUserLastEdited')."' />\n
!         <input type='hidden' name='questionPublisher' value='".sf($question,'questionPublisher')."' />\n
!         <input type='hidden' name='type' value='".sf($question,'type')."' />\n
!         <input type='hidden' name='questionFormat' value='".sf($question,'questionFormat')."' />\n
!     
!         <table cellboarder='0' cellpadding='2'>
!         <tr> <td>".get_string('stackQuestion_questionName','stack','').":</td>
!         <td><input type='input' name='questionName' value='".sf($question,'questionName')."' size='25' /> (ID: ".sf($question,'questionID').") </td> </tr>
!         <tr> <td>".get_string('stackQuestion_questionDescription','stack','').":</td>
!         <td><input type='input' name='questionDescription' value='".sf($question,'questionDescription')."' size='60' /></tr>
!         <tr> <td>".get_string('stackQuestion_questionKeywords','stack','').":</td>
!         <td><input type='input' name='questionKeywords' value='".sf($question,'questionKeywords')."' size='60' /></tr>
!     
!         </table> ";
      
!     //  HACK: the field type in the database does not
!     //  allow these to be edited yet.
!     //   <tr> <td> Last edited by: </td>
!     //   <td> <input type='input' name='questionUserLastEdited' value='".stack_s($question['questionUserLastEdited'])."' size='40' /> on $dts.</td>
!     //   </tr>
  
!     echo "\n<hr />\n";
  
      // Buttons to go somewhere next
--- 205,233 ----
      
      // hidden metadata
!     $hidden_metadata = array('questionID','questionGUID','questionDateLastEdited','questionUserLastEdited','questionPublisher','type','questionFormat');
!     foreach ($hidden_metadata as $val) {
!         $name = stack_question_edit_formname($val,$prefix);
!         echo "<input type='hidden' name='$name' value='".sf($question,$val)."' />\n";
!     }
! 
!     echo "\n<hr />\n\n<table cellboarder='0' cellpadding='2'>\n";
! 
!     $val  = 'questionName';
!     $sz   = 25;
!     $name = stack_question_edit_formname($val,$prefix);
!     echo "<tr>\n  <td>".get_string("stackQuestion_$val",'stack','').":</td>\n  <td><input type='input' name='$name' value='".sf($question,$val)."' size='$sz' />";
!     echo " (ID: ".sf($question,'questionID').") </td>\n</tr>\n";
      
!     $val  = 'questionDescription';
!     $sz   = 60;
!     $name = stack_question_edit_formname($val,$prefix);
!     echo "<tr>\n  <td>".get_string("stackQuestion_$val",'stack','').":</td>\n  <td><input type='input' name='$name' value='".sf($question,$val)."' size='$sz' /> </td>\n</tr>\n";
  
!     $val  = 'questionKeywords';
!     $sz   = 60;
!     $name = stack_question_edit_formname($val,$prefix);
!     echo "<tr>\n  <td>".get_string("stackQuestion_$val",'stack','').":</td>\n  <td><input type='input' name='$name' value='".sf($question,$val)."' size='$sz' /> </td>\n</tr>\n";
!  
!     echo "</table>\n\n<hr />\n";
  
      // Buttons to go somewhere next
***************
*** 243,252 ****
          $strout = str_replace(";","\n",$question[$qfield]);
      } else { $strout = ''; }
!     stack_question_edit_form_field($qfield,$strout,$errors);
      echo "\n\n<br />\n";
  
      $qfield='questionStem';
      echo "<b>".stack_question_edit_dispquestionfield($qfield,$remoteCaller)."</b><br />";
!     @stack_question_edit_form_field($qfield,$question[$qfield],$errors);
  
      echo "<p><table align=top><tr align=top>\n";
--- 253,262 ----
          $strout = str_replace(";","\n",$question[$qfield]);
      } else { $strout = ''; }
!     stack_question_edit_form_field($qfield,$strout,$prefix,$errors);
      echo "\n\n<br />\n";
  
      $qfield='questionStem';
      echo "<b>".stack_question_edit_dispquestionfield($qfield,$remoteCaller)."</b><br />";
!     @stack_question_edit_form_field($qfield,$question[$qfield],$prefix,$errors);
  
      echo "<p><table align=top><tr align=top>\n";
***************
*** 255,259 ****
          echo "<td> </td></tr>\n\n<tr align=top>\n <td align=top>";
          $qfield='questionAns';
!         @stack_question_edit_form_field($qfield,$question[$qfield],$errors);
          echo "</td>\n <td> </td></tr>";
      } else {
--- 265,269 ----
          echo "<td> </td></tr>\n\n<tr align=top>\n <td align=top>";
          $qfield='questionAns';
!         @stack_question_edit_form_field($qfield,$question[$qfield],$prefix,$errors);
          echo "</td>\n <td> </td></tr>";
      } else {
***************
*** 266,280 ****
  
          $qfield='questionAns';
!         @stack_question_edit_form_field($qfield,$question[$qfield],$errors);
          echo "</td>\n <td align=top>\n";
  
          $opt = 'AnsTest';
!         $opt_name = "questionOptions[{$opt}]";
!         @stack_question_edit_option_form($opt_name,$opt,$optval[$opt]);
          echo "</td>\n <td align=top>\n";
  
          $opt = 'AnsTestOpt';
!         $opt_name = "questionOptions[{$opt}]";
!         @stack_question_edit_option_form($opt_name,$opt,$optval[$opt],20);
          echo "</td>\n</tr>";
  
--- 276,290 ----
  
          $qfield='questionAns';
!         @stack_question_edit_form_field($qfield,$question[$qfield],$prefix,$errors);
          echo "</td>\n <td align=top>\n";
  
          $opt = 'AnsTest';
!         $opt_name = stack_question_edit_formname('questionOptions',$prefix).'['.$opt.']'; 
!         @stack_question_edit_option_form($opt_name,$opt,$optval[$opt],$prefix);
          echo "</td>\n <td align=top>\n";
  
          $opt = 'AnsTestOpt';
!         $opt_name = stack_question_edit_formname('questionOptions',$prefix).'['.$opt.']'; 
!         @stack_question_edit_option_form($opt_name,$opt,$optval[$opt],$prefix,20);
          echo "</td>\n</tr>";
  
***************
*** 290,299 ****
  
      $opt = 'QuVal';
!     $opt_name = "questionOptions[{$opt}]";
      @stack_question_edit_option_form($opt_name,$opt,$optval[$opt]);
      echo " ({$stackOptions[$opt]['default']})</td>\n <td>\n";
  
      $opt = 'Penalty';
!     $opt_name = "questionOptions[{$opt}]";
      @stack_question_edit_option_form($opt_name,$opt,$optval[$opt]);
      echo " ({$stackOptions[$opt]['default']})</td>\n <td>\n";
--- 300,309 ----
  
      $opt = 'QuVal';
!     $opt_name = stack_question_edit_formname('questionOptions',$prefix).'['.$opt.']';
      @stack_question_edit_option_form($opt_name,$opt,$optval[$opt]);
      echo " ({$stackOptions[$opt]['default']})</td>\n <td>\n";
  
      $opt = 'Penalty';
!     $opt_name = stack_question_edit_formname('questionOptions',$prefix).'['.$opt.']';
      @stack_question_edit_option_form($opt_name,$opt,$optval[$opt]);
      echo " ({$stackOptions[$opt]['default']})</td>\n <td>\n";
***************
*** 303,312 ****
      // Potential responses
      if ($remoteCaller) {
! 	echo "Add \n";
      } else {
          echo "<br /><a href=\"javascript:EditQ('edit')\">Edit</a> and add \n";
      }
!     echo '<input type="input" name="questionPotResp[add]" value="0" size="3" />';
!     echo " potential responses<a href=\"javascript:HelpPopup('all','author_potresp');\"><img align=\"middle\" border=\"0\" height=\"17\" width=\"17\" src=\"pics/help.gif\" /></a> (distractors etc).<br />";
  
      if (array_key_exists('questionPotResp',$question)) {
--- 313,327 ----
      // Potential responses
      if ($remoteCaller) {
!     echo "Add \n";
      } else {
          echo "<br /><a href=\"javascript:EditQ('edit')\">Edit</a> and add \n";
      }
!     $name = stack_question_edit_formname('questionPotResp',$prefix).'[add]';    
!     echo "<input type='input' name='$name' value='0' size='3' />";
!     echo " potential responses (distractors etc).  ";
!     if (!$remoteCaller) {
!         echo "<a href=\"javascript:HelpPopup('all','author_potresp');\"><img align=\"middle\" border=\"0\" height=\"17\" width=\"17\" src=\"pics/help.gif\" /></a>";
!     }
!     echo "<br />";
  
      if (array_key_exists('questionPotResp',$question)) {
***************
*** 315,319 ****
              $qfield='questionAnsKey';
              echo '<p><b>'.stack_question_edit_dispquestionfield($qfield,$remoteCaller).'</b><br />';
!             @stack_question_edit_form_field($qfield,$question[$qfield],$errors);
              echo '</p>';
  
--- 330,334 ----
              $qfield='questionAnsKey';
              echo '<p><b>'.stack_question_edit_dispquestionfield($qfield,$remoteCaller).'</b><br />';
!             @stack_question_edit_form_field($qfield,$question[$qfield],$prefix,$errors);
              echo '</p>';
  
***************
*** 325,329 ****
                  $strout = str_replace(";","\n",$question[$qfield]);
              }
!             @stack_question_edit_form_field($qfield,$strout,$errors);
              echo "\n\n<br />\n";
  
--- 340,344 ----
                  $strout = str_replace(";","\n",$question[$qfield]);
              }
!             @stack_question_edit_form_field($qfield,$strout,$prefix,$errors);
              echo "\n\n<br />\n";
  
***************
*** 332,336 ****
              foreach ($question['questionPotResp'] as $key => $potresp) {
                  $potresp['order']=$key;
!                 @stack_question_edit_potresp($key,$potresp,$npr,$errors);
              }
              echo '</p>';
--- 347,351 ----
              foreach ($question['questionPotResp'] as $key => $potresp) {
                  $potresp['order']=$key;
!                 @stack_question_edit_potresp($key,$potresp,$npr,$errors,$prefix,$remoteCaller);
              }
              echo '</p>';
***************
*** 338,352 ****
          } // end questionPotResp
      } else {  // This needs its default, non-empty value.
!         echo "<input type='hidden' name='questionAnsKey' value='".stack_s($question['questionAnsKey'])."' />\n";
      }
  
      $qfield='questionSol';
      echo '<b>'.stack_question_edit_dispquestionfield($qfield,$remoteCaller).'</b><br />';
!     @stack_question_edit_form_field($qfield,$question[$qfield],$errors);
      echo "\n\n<br />\n";
  
      $qfield='questionNote';
      echo '<b>'.stack_question_edit_dispquestionfield($qfield,$remoteCaller).'</b><br />';
!     @stack_question_edit_form_field($qfield,$question[$qfield],$errors);
      echo "\n\n<br />\n";
  
--- 353,368 ----
          } // end questionPotResp
      } else {  // This needs its default, non-empty value.
!         $name = stack_question_edit_formname('questionAnsKey',$prefix);
!         echo "<input type='hidden' name='$name' value='".stack_s($question['questionAnsKey'])."' />\n";
      }
  
      $qfield='questionSol';
      echo '<b>'.stack_question_edit_dispquestionfield($qfield,$remoteCaller).'</b><br />';
!     @stack_question_edit_form_field($qfield,$question[$qfield],$prefix,$errors);
      echo "\n\n<br />\n";
  
      $qfield='questionNote';
      echo '<b>'.stack_question_edit_dispquestionfield($qfield,$remoteCaller).'</b><br />';
!     @stack_question_edit_form_field($qfield,$question[$qfield],$prefix,$errors);
      echo "\n\n<br />\n";
  
***************
*** 368,372 ****
      $options_list     = array('InsertStars','InformalSyntax','AllowInputTool','SyntaxHint','Forbid','Allow','MarkModMethod','FeedBackGenericCorrect','FeedBackGenericPCorrect','FeedBackGenericIncorrect','Display');
  
!     stack_options_edit_form($options_headings,$options_list,$optval,'questionOptions',$remoteCaller);
      
      echo "\n<hr />\n";
--- 384,388 ----
      $options_list     = array('InsertStars','InformalSyntax','AllowInputTool','SyntaxHint','Forbid','Allow','MarkModMethod','FeedBackGenericCorrect','FeedBackGenericPCorrect','FeedBackGenericIncorrect','Display');
  
!     stack_options_edit_form($options_headings,$options_list,$optval,'questionOptions',$prefix,$remoteCaller);
      
      echo "\n<hr />\n";
***************
*** 375,379 ****
      $metadata_list = array('questionLanguage','questionLearningContext','questionDifficulty','questionCompetency',
      'questionCompetencyLevel','questionTimeAllocated','questionExcerciseType','questionRights');
!     stack_question_metadata_edit_form($question,$metadata_list,$remoteCaller);        //Create all metadata fields on question form
      
      echo "\n<hr />\n";
--- 391,395 ----
      $metadata_list = array('questionLanguage','questionLearningContext','questionDifficulty','questionCompetency',
      'questionCompetencyLevel','questionTimeAllocated','questionExcerciseType','questionRights');
!     stack_question_metadata_edit_form($question,$metadata_list,$prefix,$remoteCaller);        //Create all metadata fields on question form
      
      echo "\n<hr />\n";
***************
*** 382,391 ****
      
      if (!$remoteCaller)  {
! 	    ob_end_flush();
      }
      
      //Do not ask server to display options, waste of processor power
      else {
! 	    ob_end_clean();
      }
      
--- 398,407 ----
      
      if (!$remoteCaller)  {
!         ob_end_flush();
      }
      
      //Do not ask server to display options, waste of processor power
      else {
!         ob_end_clean();
      }
      
***************
*** 402,417 ****
  * @return void
  */
! function stack_question_edit_form_field($f,$qf,$errors) {
      // Output an element on the form.
      global  $stackQuestion;
      $val = $stackQuestion[$f];
      // htmlspecialchars
      $qf  = stack_s($qf);
  
  
      if ('castext' == $val['type']) {
          // Adjust the size of the box!
          $rows = substr_count($qf,"\n") + 2;
!         echo "<textarea name=\"$f\" cols=\"60\" rows=\"$rows\">$qf</textarea>\n";
          if ($errors) {
              if (array_key_exists($f,$errors)) {
--- 418,435 ----
  * @return void
  */
! function stack_question_edit_form_field($f,$qf,$prefix,$errors) {
      // Output an element on the form.
      global  $stackQuestion;
+     
      $val = $stackQuestion[$f];
      // htmlspecialchars
      $qf  = stack_s($qf);
  
+     $name = stack_question_edit_formname($f,$prefix);
  
      if ('castext' == $val['type']) {
          // Adjust the size of the box!
          $rows = substr_count($qf,"\n") + 2;
!         echo "<textarea name=\"$name\" cols=\"60\" rows=\"$rows\">$qf</textarea>\n";
          if ($errors) {
              if (array_key_exists($f,$errors)) {
***************
*** 423,427 ****
          // Adjust the size of the box!
          $rows = substr_count($qf,"\n") + 2;
!         echo "<textarea name='$f' cols='60' rows='$rows'>$qf</textarea>\n";
  
          if (is_array($errors)) {
--- 441,445 ----
          // Adjust the size of the box!
          $rows = substr_count($qf,"\n") + 2;
!         echo "<textarea name='$name' cols='60' rows='$rows'>$qf</textarea>\n";
  
          if (is_array($errors)) {
***************
*** 436,440 ****
      } else if ( 'casstring' ==  $val['type'] or 'string'== $val['type']) {
  
!         echo "<input type='text' name='$f' size='30' value ='$qf'/>\n";
  
          if ('' != $errors[$f]) {
--- 454,458 ----
      } else if ( 'casstring' ==  $val['type'] or 'string'== $val['type']) {
  
!         echo "<input type='text' name='$name' size='30' value ='$qf'/>\n";
  
          if ('' != $errors[$f]) {
***************
*** 460,470 ****
      if(!$remoteCaller)
      {
! 	    $strout = "<a border=\"none\" href=\"javascript:HelpPopup('$field','stackQuestion');\"><img align=\"middle\" border=\"0\" alt=\"$fd\" src=\"pics/help.gif\" /></a> $fd";
! 	    return($strout);
      }
      
      else
      {
! 	    return($fd);
      }
  }
--- 478,488 ----
      if(!$remoteCaller)
      {
!         $strout = "<a border=\"none\" href=\"javascript:HelpPopup('$field','stackQuestion');\"><img align=\"middle\" border=\"0\" alt=\"$fd\" src=\"pics/help.gif\" /></a> $fd";
!         return($strout);
      }
      
      else
      {
!         return($fd);
      }
  }
***************
*** 479,496 ****
  * @return void
  */
! function stack_question_edit_potresp($key,$potresp,$npr,&$errors) {
  
      echo "<table border='1'><tr align=top><td>\n";
      echo "\n\n<table border='0' cellpadding='2'>\n";
      echo "<tr>\n <td>No.</td>\n
                 <td></td>\n
!                <td><a href=\"javascript:HelpPopup('SAns','stackQuestionPotResp');\">".get_string('stackQuestion_PR_SAns2','stack')."</a></td>\n
!                <td><a href=\"javascript:HelpPopup('TAns','stackQuestionPotResp');\">".get_string('stackQuestion_PR_TAns2','stack')."</a></td>\n
!                <td><a href=\"javascript:HelpPopup('AnsTest','stackOptions');\">".get_string('stackQuestion_PR_AnsTest','stack')."</a></td>\n
!                <td><a href=\"javascript:HelpPopup('AnsTestOpt','stackOptions');\">".get_string('stackQuestion_PR_AnsTestOpts','stack')."</a></td>
                 <td>Del</td>\n
           </tr>\n";
  
!     $name = "questionPotResp[$key]";
  
      echo "\n<tr align=top>\n";
--- 497,528 ----
  * @return void
  */
! function stack_question_edit_potresp($key,$potresp,$npr,&$errors,$prefix,$remoteCaller) {
  
+     $helplogo = "<img align=\"middle\" border=\"0\" height=\"17\" width=\"17\" src=\"pics/help.gif\" />";
+     
      echo "<table border='1'><tr align=top><td>\n";
      echo "\n\n<table border='0' cellpadding='2'>\n";
+     if ($remoteCaller) {
      echo "<tr>\n <td>No.</td>\n
                 <td></td>\n
!                <td>".get_string('stackQuestion_PR_SAns2','stack')."</td>\n
!                <td>".get_string('stackQuestion_PR_TAns2','stack')."</td>\n
!                <td>".get_string('stackQuestion_PR_AnsTest','stack')."</td>\n
!                <td>".get_string('stackQuestion_PR_AnsTestOpts','stack')."</td>
                 <td>Del</td>\n
           </tr>\n";
+     
+     } else {
+     echo "<tr>\n <td>No.</td>\n
+                <td></td>\n
+                <td><a href=\"javascript:HelpPopup('SAns','stackQuestionPotResp');\">$helplogo</a> ".get_string('stackQuestion_PR_SAns2','stack')."</td>\n
+                <td><a href=\"javascript:HelpPopup('TAns','stackQuestionPotResp');\">$helplogo</a> ".get_string('stackQuestion_PR_TAns2','stack')."</td>\n
+                <td><a href=\"javascript:HelpPopup('AnsTest','stackOptions');\">$helplogo</a> ".get_string('stackQuestion_PR_AnsTest','stack')."</td>\n
+                <td><a href=\"javascript:HelpPopup('AnsTestOpt','stackOptions');\">$helplogo</a> ".get_string('stackQuestion_PR_AnsTestOpts','stack')."</td>
+                <td>Del</td>\n
+          </tr>\n";
+     }
  
!     $name = stack_question_edit_formname('questionPotResp',$prefix).'['.$key.']';
  
      echo "\n<tr align=top>\n";
***************
*** 501,505 ****
      stack_question_edit_input_stringfield($name,$potresp,'TAns',-4,10);
  
!     $field = $name.'[AnsTest]';
      $val = $potresp['AnsTest'];
      echo '    <td>';
--- 533,537 ----
      stack_question_edit_input_stringfield($name,$potresp,'TAns',-4,10);
  
!     $field =  $name.'[AnsTest]';
      $val = $potresp['AnsTest'];
      echo '    <td>';
***************
*** 528,538 ****
      }
  
!     echo "<tr align=top><td>If...</td>\n
!              <td><a href=\"javascript:HelpPopup('RawMarkMod','stackQuestionPotResp');\">".get_string('stackQuestion_PR_RawMarkMod2','stack')."</a></td>\n
!              <td><a href=\"javascript:HelpPopup('RawMark','stackQuestionPotResp');\">".get_string('Score','stack')."</a></td>\n
!              <td><a href=\"javascript:HelpPopup('Penalty','stackQuestionPotResp');\">".get_string('stackQuestion_PR_Penalty','stack')."</a></td>\n
!              <td colspan='2'><a href=\"javascript:HelpPopup('FeedBack','stackQuestionPotResp');\">".get_string('stackQuestion_PR_FeedBack','stack')."</a></td>\n
!              <td><a href=\"javascript:HelpPopup('ApLat','stackQuestionPotResp');\">".get_string('stackQuestion_PR_ApLat2','stack')."</a></td>\n";
!     echo "<td></td></tr>\n";
  
      echo '    <td>true</td>';
--- 560,580 ----
      }
  
!     if ($remoteCaller) {
!          echo "<tr align=top><td>If...</td>\n
!               <td>".get_string('stackQuestion_PR_RawMarkMod2','stack')."</td>\n
!               <td>".get_string('Score','stack')."</td>\n
!               <td>".get_string('stackQuestion_PR_Penalty','stack')."</td>\n
!               <td colspan='2'>".get_string('stackQuestion_PR_FeedBack','stack')."</td>\n
!               <td>>".get_string('stackQuestion_PR_ApLat2','stack')."</td>\n";
!          echo "<td></td></tr>\n";
!     } else {
!          echo "<tr align=top><td>If...</td>\n
!                   <td><a href=\"javascript:HelpPopup('RawMarkMod','stackQuestionPotResp');\">$helplogo</a> ".get_string('stackQuestion_PR_RawMarkMod2','stack')."</td>\n
!                   <td><a href=\"javascript:HelpPopup('RawMark','stackQuestionPotResp');\">$helplogo</a> ".get_string('Score','stack')."</td>\n
!                   <td><a href=\"javascript:HelpPopup('Penalty','stackQuestionPotResp');\">$helplogo</a> ".get_string('stackQuestion_PR_Penalty','stack')."</td>\n
!                   <td colspan='2'><a href=\"javascript:HelpPopup('FeedBack','stackQuestionPotResp');\">$helplogo</a> ".get_string('stackQuestion_PR_FeedBack','stack')."</td>\n
!                   <td><a href=\"javascript:HelpPopup('ApLat','stackQuestionPotResp');\">$helplogo</a> ".get_string('stackQuestion_PR_ApLat2','stack')."</td>\n";
!          echo "<td></td></tr>\n";
!     }
  
      echo '    <td>true</td>';
***************
*** 554,558 ****
      }
  
!     echo "<tr><td></td> <td></td><td align ='right' colspan='2'><a href=\"javascript:HelpPopup('AnswerNote','stackQuestionPotResp');\">AnswerNote</a></td>";
      $strin = $potresp['true']['AnswerNote'];
      stack_question_edit_input_textfield($bname,$strin,'AnswerNote',55,3);
--- 596,606 ----
      }
  
!     echo "<tr><td></td> <td></td><td align ='right' colspan='2'>";
!     if ($remoteCaller) {
!       echo get_string('stackQuestion_PR_AnswerNote','stack');
!     } else {
!       echo "<a href=\"javascript:HelpPopup('AnswerNote','stackQuestionPotResp');\">$helplogo</a> ".get_string('stackQuestion_PR_AnswerNote','stack');
!     }
!     echo "</td>";
      $strin = $potresp['true']['AnswerNote'];
      stack_question_edit_input_textfield($bname,$strin,'AnswerNote',55,3);
***************
*** 589,593 ****
      }
  
!     echo "<tr><td></td> <td></td><td align ='right' colspan='2'><a href=\"javascript:HelpPopup('AnswerNote','stackQuestionPotResp');\">AnswerNote</a></td>";
      $strin = $potresp['false']['AnswerNote'];
      stack_question_edit_input_textfield($bname,$strin,'AnswerNote',55,3);
--- 637,647 ----
      }
  
!     echo "<tr><td></td> <td></td><td align ='right' colspan='2'>";
!     if ($remoteCaller) {
!       echo get_string('stackQuestion_PR_AnswerNote','stack');
!     } else {
!       echo "<a href=\"javascript:HelpPopup('AnswerNote','stackQuestionPotResp');\">$helplogo</a> ".get_string('stackQuestion_PR_AnswerNote','stack');
!     }
!     echo "</td>";
      $strin = $potresp['false']['AnswerNote'];
      stack_question_edit_input_textfield($bname,$strin,'AnswerNote',55,3);
***************
*** 653,657 ****
  * @return void
  */
! function stack_question_edit_potresp_branch($name,$branchvals,$npr) {
  
      $field = $name.'[RawMarkMod]';
--- 707,711 ----
  * @return void
  */
! function stack_question_edit_potresp_branch($name,$branchvals,$npr,$prefix) {
  
      $field = $name.'[RawMarkMod]';
***************
*** 713,717 ****
  */
  function stack_quiz_edit_form($quiz,&$errors,$PostTo = '') {
! 	
      //show_array($quiz);
      global $_PHP_SELF,$stackQuiz,$stackOptions, $stack_stand_alone;
--- 767,771 ----
  */
  function stack_quiz_edit_form($quiz,&$errors,$PostTo = '') {
!     
      //show_array($quiz);
      global $_PHP_SELF,$stackQuiz,$stackOptions, $stack_stand_alone;
***************
*** 772,778 ****
       $options_headings = array('','');
       $options_list     = array('QuizMode','TeacherEmail');
!      $fieldname        = 'quiz[quizOptions]';
! 
!      stack_options_edit_form($options_headings,$options_list,$optval,$fieldname);
   
  
--- 826,833 ----
       $options_headings = array('','');
       $options_list     = array('QuizMode','TeacherEmail');
!  
!      // If there is a prefix sort it out *HERE!*
!      $fieldname        = 'quiz'.'[quizOptions]';
!      stack_options_edit_form($options_headings,$options_list,$optval,$fieldname,'');
   
  
***************
*** 814,820 ****
       $options_headings = array(get_string('stackOptions_edit_inmeth','stack'),'','','',get_string('stackOptions_edit_resppro','stack'),'','','','','','','','',get_string('stackOptions_edit_out','stack'),'');
       $options_list     = array('InsertStars','InformalSyntax','AllowInputTool','SyntaxHint','AnsTest','AnsTestOpt','QuVal','Penalty','Forbid','Allow','FeedBackGenericCorrect','FeedBackGenericPCorrect','FeedBackGenericIncorrect','Display','Language');
-      $fieldname        = 'quiz[quizOptions]';
  
!      stack_options_edit_form($options_headings,$options_list,$optval,$fieldname);
      
       // Check if quiz has metadata set
--- 869,875 ----
       $options_headings = array(get_string('stackOptions_edit_inmeth','stack'),'','','',get_string('stackOptions_edit_resppro','stack'),'','','','','','','','',get_string('stackOptions_edit_out','stack'),'');
       $options_list     = array('InsertStars','InformalSyntax','AllowInputTool','SyntaxHint','AnsTest','AnsTestOpt','QuVal','Penalty','Forbid','Allow','FeedBackGenericCorrect','FeedBackGenericPCorrect','FeedBackGenericIncorrect','Display','Language');
  
!      $fieldname        = 'quiz'.'[quizOptions]';
!      stack_options_edit_form($options_headings,$options_list,$optval,$fieldname,$prefix);
      
       // Check if quiz has metadata set
***************
*** 1004,1008 ****
  * @return void
  */
! function stack_question_metadata_edit_form($question,$metadata_list,$remoteCaller=FALSE)
  {   
  global $stackQuestion;
--- 1059,1063 ----
  * @return void
  */
! function stack_question_metadata_edit_form($question,$metadata_list,$prefix='',$remoteCaller=FALSE)
  {   
  global $stackQuestion;
***************
*** 1017,1021 ****
      foreach( $metadata_list as $k => $metadata) {
          $descript = stack_question_edit_dispquestionfield($metadata,$remoteCaller);   //Display tag with help
!         $fieldname= $metadata;
  
          echo " <td> $descript </td>\n <td>";
--- 1072,1076 ----
      foreach( $metadata_list as $k => $metadata) {
          $descript = stack_question_edit_dispquestionfield($metadata,$remoteCaller);   //Display tag with help
!         $fieldname = stack_question_edit_formname($metadata,$prefix);
  
          echo " <td> $descript </td>\n <td>";