Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x

1 files changed, 29 insertions, 1 deletions

diff --git a/lib/imagefile.php b/lib/imagefile.php
index 5e9913235..74c3d14f0 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -72,7 +72,7 @@ class ImageFile
             break;
         case UPLOAD_ERR_INI_SIZE:
         case UPLOAD_ERR_FORM_SIZE:
-            throw new Exception(_('That file is too big.'));
+            throw new Exception(_('That file is too big. The maximum file size is '.$this->maxFileSize().'.'));
             return;
         case UPLOAD_ERR_PARTIAL:
             @unlink($_FILES[$param]['tmp_name']);
@@ -182,4 +182,32 @@ class ImageFile
     {
         @unlink($this->filename);
     }
+    
+    static function maxFileSize($return_bytes = false)
+    {
+        $limit = min(ImageFile::strToInt(ini_get('post_max_size')), ImageFile::strToInt(ini_get('upload_max_filesize')), ImageFile::strToInt(ini_get('memory_limit')));
+        
+        if ($return_bytes) {
+            return $limit;
+        }
+        
+        return ($limit/(1024*1024)).'MB';
+    }
+    
+    static function strToInt($str)
+    {
+        $unit = substr($str, -1);
+        $num = substr($str, 0, -1);
+        
+        switch(strtoupper($unit)){
+            case 'G':
+                $num *= 1024;
+            case 'M':
+                $num *= 1024;
+            case 'K':
+                $num *= 1024;
+        }
+        
+        return $num;
+    }
 }
\ No newline at end of file