[Aimmath-commit] moodle/mod/math_assignment lib.php,1.25,1.26

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

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

Modified Files:
	lib.php 
Log Message:
Error reporting for mod.html implemented (requires the mod I posted to moodle).

Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** lib.php	27 Sep 2003 09:15:05 -0000	1.25
--- lib.php	27 Sep 2003 13:36:33 -0000	1.26
***************
*** 26,36 ****
              $math_assignment->problemsisurl = 1;
          }
!         else if (!empty($_FILES['problemsfile']))
!             $math_assignment->problems = math_assignment_save_upload($math_assignment->course, $_FILES['problemsfile']);
      }
      $math_assignment->problems = trim($math_assignment->problems);
      if ($math_assignment->problems) {
          if (math_assignment_is_tex_file($math_assignment->problems) xor $math_assignment->aimquiz)
!             return false; // sheet is not of the correct type
      }
  
--- 26,38 ----
              $math_assignment->problemsisurl = 1;
          }
!         else if ($_FILES['problemsfile']['name']) {
!             if (!$math_assignment->problems = math_assignment_save_upload($math_assignment->course, $_FILES['problemsfile']))
!                 return get_string("failedupload", "math_assignment", get_string("problems", "math_assignment"));
!         }
      }
      $math_assignment->problems = trim($math_assignment->problems);
      if ($math_assignment->problems) {
          if (math_assignment_is_tex_file($math_assignment->problems) xor $math_assignment->aimquiz)
!             return get_string($math_assignment->aimquiz ? "invalidmustbetex"  : "invalidmustnotbetex", "math_assignment", get_string("problems", "math_assignment"));
      }
  
***************
*** 42,63 ****
              $math_assignment->solutionsisurl = 1;
          }
!         else if (!empty($_FILES['solutionsfile']))
!             $math_assignment->solutions = math_assignment_save_upload($math_assignment->course, $_FILES['solutionsfile']);
      }
      $math_assignment->solutions = trim($math_assignment->solutions);
      if ($math_assignment->solutions) {
          if (math_assignment_is_tex_file($math_assignment->solutions) xor $math_assignment->aimquiz)
!             return false; // sheet is not of the correct type
      }
  
      // check that the paper grade is valid
      if ($math_assignment->papergrade < 0)
!         return false;
      // check we have some questions
      if (!$math_assignment->papergrade && !$math_assignment->aimquiz)
!         return false;
  
      if (!math_assignment_setup_aim_quiz($math_assignment))
!         return false;
  
      $math_assignment->timemodified = time();
--- 44,67 ----
              $math_assignment->solutionsisurl = 1;
          }
!         else if ($_FILES['solutionsfile']['name']) {
!             if (!$math_assignment->solutions = math_assignment_save_upload($math_assignment->course, $_FILES['solutionsfile']))
!                 return get_string("failedupload", "math_assignment", get_string("solutions", "math_assignment"));
!         }
      }
      $math_assignment->solutions = trim($math_assignment->solutions);
      if ($math_assignment->solutions) {
          if (math_assignment_is_tex_file($math_assignment->solutions) xor $math_assignment->aimquiz)
!             return get_string($math_assignment->aimquiz ? "invalidmustbetex"  : "invalidmustnotbetex", "math_assignment", get_string("solutions", "math_assignment"));
      }
  
      // check that the paper grade is valid
      if ($math_assignment->papergrade < 0)
!         return get_string("invalidpapergrade", "math_assignment");
      // check we have some questions
      if (!$math_assignment->papergrade && !$math_assignment->aimquiz)
!         return get_string("invalidnoquestions", "math_assignment");
  
      if (!math_assignment_setup_aim_quiz($math_assignment))
!         return get_string("failedaimsetup", "math_assignment");
  
      $math_assignment->timemodified = time();
***************
*** 83,93 ****
              $math_assignment->problemsisurl = 1;
          }
!         else if (!empty($_FILES['problemsfile']))
!             $math_assignment->problems = math_assignment_save_upload($math_assignment->course, $_FILES['problemsfile']);
      }
      $math_assignment->problems = trim($math_assignment->problems);
      if ($math_assignment->problems) {
          if (math_assignment_is_tex_file($math_assignment->problems) xor $math_assignment->aimquiz)
!             return false; // sheet is not of the correct type
      }
  
--- 87,99 ----
              $math_assignment->problemsisurl = 1;
          }
!         else if ($_FILES['problemsfile']['name']) {
!             if (!$math_assignment->problems = math_assignment_save_upload($math_assignment->course, $_FILES['problemsfile']))
!                 return get_string("failedupload", "math_assignment", get_string("problems", "math_assignment"));
!         }
      }
      $math_assignment->problems = trim($math_assignment->problems);
      if ($math_assignment->problems) {
          if (math_assignment_is_tex_file($math_assignment->problems) xor $math_assignment->aimquiz)
!             return get_string($math_assignment->aimquiz ? "invalidmustbetex"  : "invalidmustnotbetex", "math_assignment", get_string("problems", "math_assignment"));
      }
  
***************
*** 99,120 ****
              $math_assignment->solutionsisurl = 1;
          }
!         else if (!empty($_FILES['solutionsfile']))
!             $math_assignment->solutions = math_assignment_save_upload($math_assignment->course, $_FILES['solutionsfile']);
      }
      $math_assignment->solutions = trim($math_assignment->solutions);
      if ($math_assignment->solutions) {
          if (math_assignment_is_tex_file($math_assignment->solutions) xor $math_assignment->aimquiz)
!             return false; // sheet is not of the correct type
      }
  
      // check that the paper grade is valid
      if ($math_assignment->papergrade < 0)
!         return false;
      // check we have some questions
      if (!$math_assignment->papergrade && !$math_assignment->aimquiz)
!         return false;
  
      if (!math_assignment_setup_aim_quiz($math_assignment))
!         return false;
  
      $math_assignment->timemodified = time();
--- 105,128 ----
              $math_assignment->solutionsisurl = 1;
          }
!         else if ($_FILES['solutionsfile']['name']) {
!             if (!$math_assignment->solutions = math_assignment_save_upload($math_assignment->course, $_FILES['solutionsfile']))
!                 return get_string("failedupload", "math_assignment", get_string("solutions", "math_assignment"));
!         }
      }
      $math_assignment->solutions = trim($math_assignment->solutions);
      if ($math_assignment->solutions) {
          if (math_assignment_is_tex_file($math_assignment->solutions) xor $math_assignment->aimquiz)
!             return get_string($math_assignment->aimquiz ? "invalidmustbetex"  : "invalidmustnotbetex", "math_assignment", get_string("solutions", "math_assignment"));
      }
  
      // check that the paper grade is valid
      if ($math_assignment->papergrade < 0)
!         return get_string("invalidpapergrade", "math_assignment");
      // check we have some questions
      if (!$math_assignment->papergrade && !$math_assignment->aimquiz)
!         return get_string("invalidnoquestions", "math_assignment");
  
      if (!math_assignment_setup_aim_quiz($math_assignment))
!         return get_string("failedaimsetup", "math_assignment");
  
      $math_assignment->timemodified = time();