Changeset 793

Timestamp:

01/11/07 12:37:55 (2 years ago)

Author:

sven

Message:

files: make maximum uploadable file size configurable instead of hard coded at 5 meg, defaulting to 20meg. apache/php limits still trump this.
fix php notice on folder handler for root folder.

Files:

• devel/_files/index.php (modified) (1 diff)
• devel/lib/elgglib.php (modified) (2 diffs)
• devel/lib/setup.php (modified) (1 diff)

devel/_files/index.php

@@ -23 +23 @@
-        $body = run("content:files:view");
-                
-
+!is_object($folder_object) || 
-            || !isset($folder_object->handler)
-            || !isset($CFG->folders->handler[$folder_object->handler]->function_name)

devel/lib/elgglib.php

@@ -725 +725 @@
-        return 0;
-    }
+    $scan['GB'] = 1073741824;
+    $scan['Gb'] = 1073741824;
+    $scan['G'] = 1073741824;
+    $scan['g'] = 1073741824;
-    $scan['MB'] = 1048576;
-    $scan['Mb'] = 1048576;
@@ -3785 +3789 @@
- */
-function get_max_upload_file_size($maxbytes=0) {
+    global $CFG;
-
-    if (! $filesize = ini_get('upload_max_filesize')) {
-
+
+
+
+
+
-    }
-    $minimumsize = get_real_size($filesize);

devel/lib/setup.php

@@ -82 +82 @@
-    }
-    unset($pathcomponents);
+}
+
+if (empty($CFG->absmaxuploadsize)) {
+    // absolute maximum allowed file upload size.
+    // in most cases, apache or php will have lower limits configured, that cannot be overridden in code.
+    $CFG->absmaxuploadsize = '20M';
-}
-