aimmath-commit

[<ma...@us...>]

Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv2609/mod/math_assignment

Modified Files:
	aimpage.php lib.php 
Log Message:
Fixed multipart questions.

Index: aimpage.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/aimpage.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aimpage.php	11 Sep 2003 21:15:32 -0000	1.4
--- aimpage.php	16 Sep 2003 11:44:44 -0000	1.5
***************
*** 105,109 ****
          foreach ($_POST as $key => $arg) {
              if (strcasecmp($key, "target")) { // ignore target arguments
!                 $postdata = math_assignment_add_arg_to_url_data($postdata, $key, stripslashes($arg));
              }
          }
--- 105,109 ----
          foreach ($_POST as $key => $arg) {
              if (strcasecmp($key, "target")) { // ignore target arguments
!                 $postdata = math_assignment_add_arg_to_url_data($postdata, math_assignment_convert_arg_name($key), stripslashes($arg));
              }
          }

Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** lib.php	16 Sep 2003 10:06:23 -0000	1.8
--- lib.php	16 Sep 2003 11:44:44 -0000	1.9
***************
*** 15,23 ****
  
      // problems
!     if ($math_assignment->problemsurl <> "") {
          $math_assignment->problems = $math_assignment->problemsurl;
!     }
!     else if ($math_assignment->problemsfile <> "") {
!         $math_assignment->problems = math_assignment_save_upload($math_assignment->course, $_FILES['problemsfile']);
      }
      $math_assignment->problems = trim($math_assignment->problems);
--- 15,25 ----
  
      // problems
!     if ($math_assignment->problems == "|url|")
          $math_assignment->problems = $math_assignment->problemsurl;
!     else if ($math_assignment->problems == "|upload|") {
!         if (empty($_FILES['problemsfile']))
!             $math_assignment->problems = "";
!         else
!             $math_assignment->problems = math_assignment_save_upload($math_assignment->course, $_FILES['problemsfile']);
      }
      $math_assignment->problems = trim($math_assignment->problems);
***************
*** 345,352 ****
          $return .= "<br />\n";
          // Browse Source
!         //$strbrowsesource = get_string("browsesource", "math_assignment");
!         //$return .= "<a href=\"aimpage.php?id=$cm->id&amp;aimaction=source\">$strbrowsesource</a>";
!         //$return .= math_assignment_help_button("admin_sourcedir", $strbrowsesource, false);
!         //$return .= "<br />\n";
          // Edit Subject
          $streditsubject = get_string("editsubject", "math_assignment");
--- 347,354 ----
          $return .= "<br />\n";
          // Browse Source
!         $strbrowsesource = get_string("browsesource", "math_assignment");
!         $return .= "<a href=\"aimpage.php?id=$cm->id&amp;aimaction=source\">$strbrowsesource</a>";
!         $return .= math_assignment_help_button("admin_sourcedir", $strbrowsesource, false);
!         $return .= "<br />\n";
          // Edit Subject
          $streditsubject = get_string("editsubject", "math_assignment");
***************
*** 359,362 ****
--- 361,371 ----
          $return .= "</p>\n";
      return $return;
+ }
+ 
+ function math_assignment_convert_arg_name($name) {
+ /// Function to demangle names which php has mangled before passing them to AiM
+ 
+     $name = preg_replace("/RawAnswer([0-9]*)_([0-9]+)/i", "RawAnswer\\1.\\2", $name);
+     return $name;
  }