Fixes to increase the number of options available to limit assignment

upload size, and also to limit the list based on PHP limits

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index fdb6eb0a1ab9f557a795fc0e5ac89f2411f935da..b3878153427e449072bda9ceafafe93cd3bd2608 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1766,8 +1766,10 @@ function get_real_size($size=0) {
         return 0; 
     }
     $scan['MB'] = 1048576;
+    $scan['Mb'] = 1048576;
     $scan['M'] = 1048576;
     $scan['KB'] = 1024;
+    $scan['Kb'] = 1024;
     $scan['K'] = 1024;
 
     while (list($key) = each($scan)) {

diff --git a/mod/assignment/mod.html b/mod/assignment/mod.html
index ab6573b31bd9fc4f30f1fd6d0e42571a5d31cae3..d9f54df115e4013ea66ea6fb3a3e875d4cb78c9a 100644 (file)
--- a/mod/assignment/mod.html
+++ b/mod/assignment/mod.html
@@ -75,15 +75,19 @@
     <td align=right><P><B><? print_string("maximumsize", "assignment") ?>:</B></P></TD>
     <td>
         <?
-        $filesize[10000] = "10kb";
-        $filesize[50000] = "50kb";
-        $filesize[100000] = "100kb";
-        $filesize[500000] = "500kb";
-        $filesize[1000000] = "1000Kb (1Mb)";
-        $filesize[2000000] = "2000Kb (2Mb)";
+        $sizelist = array("10Kb", "50Kb", "100Kb", "500Kb", "1Mb", "2Mb", "5Mb", "10Mb", "20Mb", "50Mb");
+        $maxsize = get_max_upload_file_size();
+        foreach ($sizelist as $size) {
+            $sizebytes = get_real_size($size);
+            if ($sizebytes < $maxsize) {
+                $filesize[$sizebytes] = $size;
+            }
+        }
+        $filesize[$maxsize] = display_size($maxsize);
         if (!$form->maxbytes) {
-            $form->maxbytes = 500000;
+            $form->maxbytes = get_real_size("500K");
         }
+        ksort($filesize, SORT_NUMERIC);
         choose_from_menu($filesize, "maxbytes", "$form->maxbytes");
         ?>
     </td>