Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

5 files changed, 53 insertions, 16 deletions

diff --git a/lib/common.php b/lib/common.php
index 825ba0ff7..482800876 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -24,7 +24,6 @@ define('LACONICA_VERSION', '0.7.0');
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
 define('AVATAR_MINI_SIZE', 24);
-define('MAX_AVATAR_SIZE', 256 * 1024);
 
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
diff --git a/lib/imagefile.php b/lib/imagefile.php
index 5e9913235..fa0581dd0 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -58,7 +58,7 @@ class ImageFile
     {
         $this->id = $id;
         $this->filepath = $filepath;
-        
+
         $info = @getimagesize($this->filepath);
         $this->type = ($info) ? $info[2]:$type;
         $this->width = ($info) ? $info[0]:$width;
@@ -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(sprintf(_('That file is too big. The maximum file size is %d.'), $this->maxFileSize()));
             return;
         case UPLOAD_ERR_PARTIAL:
             @unlink($_FILES[$param]['tmp_name']);
@@ -82,19 +82,19 @@ class ImageFile
             throw new Exception(_('System error uploading file.'));
             return;
         }
-        
+
         $info = @getimagesize($_FILES[$param]['tmp_name']);
-        
+
         if (!$info) {
             @unlink($_FILES[$param]['tmp_name']);
             throw new Exception(_('Not an image or corrupt file.'));
             return;
         }
-        
+
         if ($info[2] !== IMAGETYPE_GIF &&
             $info[2] !== IMAGETYPE_JPEG &&
             $info[2] !== IMAGETYPE_PNG) {
-        
+
             @unlink($_FILES[$param]['tmp_name']);
             throw new Exception(_('Unsupported image file format.'));
             return;
@@ -102,7 +102,7 @@ class ImageFile
 
         return new ImageFile(null, $_FILES[$param]['tmp_name']);
     }
-    
+
     function resize($size, $x = 0, $y = 0, $w = null, $h = null)
     {
         $w = ($w === null) ? $this->width:$w;
@@ -129,25 +129,25 @@ class ImageFile
         }
 
         $image_dest = imagecreatetruecolor($size, $size);
-        
+
         if ($this->type == IMAGETYPE_GIF || $this->type == IMAGETYPE_PNG) {
 
             $transparent_idx = imagecolortransparent($image_src);
-            
+
             if ($transparent_idx >= 0) {
-                
+
                 $transparent_color = imagecolorsforindex($image_src, $transparent_idx);
                 $transparent_idx = imagecolorallocate($image_dest, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']);
                 imagefill($image_dest, 0, 0, $transparent_idx);
                 imagecolortransparent($image_dest, $transparent_idx);
-                
+
             } elseif ($this->type == IMAGETYPE_PNG) {
-                
+
                 imagealphablending($image_dest, false);
                 $transparent = imagecolorallocatealpha($image_dest, 0, 0, 0, 127);
                 imagefill($image_dest, 0, 0, $transparent);
                 imagesavealpha($image_dest, true);
-                
+
             }
         }
 
@@ -182,4 +182,41 @@ class ImageFile
     {
         @unlink($this->filename);
     }
+
+    static function maxFileSize()
+    {
+        $value = ImageFile::maxFileSizeInt();
+
+        if ($value > 1024 * 1024) {
+            return ($value/(1024*1024)).'Mb';
+        } else if ($value > 1024) {
+            return ($value/(1024)).'kB';
+        } else {
+            return $value;
+        }
+    }
+
+    static function maxFileSizeInt()
+    {
+        return min(ImageFile::strToInt(ini_get('post_max_size')),
+                   ImageFile::strToInt(ini_get('upload_max_filesize')),
+                   ImageFile::strToInt(ini_get('memory_limit')));
+    }
+
+    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
diff --git a/lib/mailbox.php b/lib/mailbox.php
index 8d5d44e49..e8323dc28 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -63,6 +63,8 @@ class MailboxAction extends PersonalAction
             $this->page = 1;
         }
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
diff --git a/lib/personal.php b/lib/personal.php
index 900df0257..e46350c63 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -55,7 +55,6 @@ class PersonalAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        common_set_returnto($this->selfUrl());
     }
 
 }
diff --git a/lib/util.php b/lib/util.php
index cbff35a9d..5275ad6b6 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -447,7 +447,7 @@ function common_replace_urls_callback($text, $callback) {
         
         // Replace it!
         $start = mb_strpos($text, $url, $offset);
-        $text = substr_replace($text, $modified_url, $start, mb_strlen($url));
+        $text = mb_substr($text, 0, $start).$modified_url.mb_substr($text, $start + mb_strlen($url), mb_strlen($text));
         $offset = $start + mb_strlen($modified_url);
     }