[phpwiki-checkins] SF.net SVN: phpwiki:[7218] trunk/g

[<var...@us...>]

Revision: 7218
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7218&view=rev
Author:   vargenau
Date:     2009-10-19 07:46:27 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Get the maximum upload filesize from PHP config

Modified Paths:
--------------
    trunk/g

Modified: trunk/g
===================================================================
--- trunk/g	2009-10-17 15:45:24 UTC (rev 7217)
+++ trunk/g	2009-10-19 07:46:27 UTC (rev 7218)
@@ -89,6 +89,9 @@
     // Use black list of extensions instead of white list
     define('DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', true);
 
+    // Get the maximum upload filesize from PHP config
+    define('MAX_UPLOAD_SIZE', octets(ini_get('upload_max_filesize')));
+
     // GForge is UTF-8, so use the same.
     define('CHARSET', 'UTF-8');
 
@@ -203,12 +206,11 @@
 
     define('STRICT_MAILABLE_PAGEDUMPS', false);
 
-    define('DEFAULT_DUMP_DIR', "/tmp/wikidump");
-    define('HTML_DUMP_DIR', "/tmp/wikidumphtml");
+    // Perhaps propose Web DAV location ?
+    define('DEFAULT_DUMP_DIR', "");
+    define('HTML_DUMP_DIR', "");
     define('HTML_DUMP_SUFFIX', ".html");
 
-    define('MAX_UPLOAD_SIZE', 16777216);
-
     define('MINOR_EDIT_TIMEOUT', 604800);
 
     define('COMPRESS_OUTPUT', false);
@@ -263,4 +265,22 @@
     // Start the wiki
     include "lib/main.php";
 }
+
+/**
+ * Return a number of octets from a string like "300M"
+ */
+function octets($val) {
+    $val = trim($val);
+    $last = strtolower($val[strlen($val)-1]);
+    switch($last) {
+        // The 'G' modifier is available since PHP 5.1.0
+        case 'g':
+            $val *= 1024;
+        case 'm':
+            $val *= 1024;
+        case 'k':
+            $val *= 1024;
+    }
+    return $val;
+}
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.