[Aimmath-commit] moodle/mod/math_assignment lib.php,1.5,1.6

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

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

Modified Files:
	lib.php 
Log Message:
Fixed file upload bug.

Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lib.php	14 Sep 2003 14:11:14 -0000	1.5
--- lib.php	16 Sep 2003 00:02:18 -0000	1.6
***************
*** 21,25 ****
              $math_assignment->problems = "";
          else
!             $math_assignment->problems = math_assignment_save_upload($_FILES['problemsfile']);
      }
      $math_assignment->problems = trim($math_assignment->problems);
--- 21,25 ----
              $math_assignment->problems = "";
          else
!             $math_assignment->problems = math_assignment_save_upload($math_assignment->course, $_FILES['problemsfile']);
      }
      $math_assignment->problems = trim($math_assignment->problems);
***************
*** 32,36 ****
              $math_assignment->solutions = "";
          else
!             $math_assignment->solutions = math_assignment_save_upload($_FILES['solutionsfile']);
      }
      $math_assignment->solutions = trim($math_assignment->solutions);
--- 32,36 ----
              $math_assignment->solutions = "";
          else
!             $math_assignment->solutions = math_assignment_save_upload($math_assignment->course, $_FILES['solutionsfile']);
      }
      $math_assignment->solutions = trim($math_assignment->solutions);
***************
*** 58,62 ****
              $math_assignment->problems = "";
          else
!             $math_assignment->problems = math_assignment_save_upload($_FILES['problemsfile']);
      }
      $math_assignment->problems = trim($math_assignment->problems);
--- 58,62 ----
              $math_assignment->problems = "";
          else
!             $math_assignment->problems = math_assignment_save_upload($math_assignment->course, $_FILES['problemsfile']);
      }
      $math_assignment->problems = trim($math_assignment->problems);
***************
*** 69,73 ****
              $math_assignment->solutions = "";
          else
!             $math_assignment->solutions = math_assignment_save_upload($_FILES['solutionsfile']);
      }
      $math_assignment->solutions = trim($math_assignment->solutions);
--- 69,73 ----
              $math_assignment->solutions = "";
          else
!             $math_assignment->solutions = math_assignment_save_upload($math_assignment->course, $_FILES['solutionsfile']);
      }
      $math_assignment->solutions = trim($math_assignment->solutions);
***************
*** 155,161 ****
  /// starts with math_assignment_
  
! function math_assignment_save_upload($file) {
  /// Function which saves an uploaded file (used when adding / updating an instance)
!     if (!$basedir = make_upload_directory("$course->id"))
          return "";
      if (!is_uploaded_file($file['tmp_name']) || $file['size'] == 0)
--- 155,161 ----
  /// starts with math_assignment_
  
! function math_assignment_save_upload($courseid, $file) {
  /// Function which saves an uploaded file (used when adding / updating an instance)
!     if (!$basedir = make_upload_directory("$courseid"))
          return "";
      if (!is_uploaded_file($file['tmp_name']) || $file['size'] == 0)
***************
*** 466,470 ****
      // get max grade for the aim quiz
      $max_grade = math_assignment_get_aim_max_grade($math_assignment, $subject, $server);
!     if ($max_grade <= 0)
          return false;
      $math_assignment->aimgrade = $max_grade;
--- 466,470 ----
      // get max grade for the aim quiz
      $max_grade = math_assignment_get_aim_max_grade($math_assignment, $subject, $server);
!     if (!$max_grade) // note that this includes the case where $max_grade is zero
          return false;
      $math_assignment->aimgrade = $max_grade;
***************
*** 484,488 ****
      $postdata = math_assignment_add_arg_to_url_data($postdata, "DueDateYear", $date['year']);
      // load the AiM page and grab the result
!     $data = math_assignment_get_aim_output($server->address, $postdata);
      // did it work?
      return preg_match("/<title>Quiz:[^<>]*?<\/title>/i", $data) ? true : false;
--- 484,489 ----
      $postdata = math_assignment_add_arg_to_url_data($postdata, "DueDateYear", $date['year']);
      // load the AiM page and grab the result
!     if (!$data = math_assignment_get_aim_output($server->address, $postdata))
!         return false;
      // did it work?
      return preg_match("/<title>Quiz:[^<>]*?<\/title>/i", $data) ? true : false;
***************
*** 514,517 ****
--- 515,520 ----
      if (!math_assignment_convert_aim_output($math_assignment, $subject, $data, "", "", false, $grade, $max_grade))
          return false;
+     if ($max_grade < 0)
+         return false; // no grades table on page (or something is VERY wrong with AiM!)
      return $max_grade;
  }