[Aimmath-commit] moodle/mod/math_assignment lib.php,1.9,1.10

[<gus...@us...>]

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

Modified Files:
	lib.php 
Log Message:
merged Alex's change with my earlier changes. Alex, please be careful to merge before committing.

Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** lib.php	16 Sep 2003 11:44:44 -0000	1.9
--- lib.php	16 Sep 2003 13:23:10 -0000	1.10
***************
*** 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);
--- 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);
***************
*** 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");
--- 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");