X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fimagefile.php;h=0c93b257ed394d5433e6a2c8f147e18aad480587;hb=8295402fb30a3854bae3b9d6c457c7c0e432c51a;hp=a8e963370852145f0c8fcd5110ff7a261efb069c;hpb=a3d5e00f64b3c166e34a8d36fcb4f5b757394e9b;p=quix0rs-gnu-social.git

diff --git a/lib/imagefile.php b/lib/imagefile.php
index a8e9633708..0c93b257ed 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -68,17 +68,17 @@ class ImageFile
     static function fromUpload($param='upload')
     {
         switch ($_FILES[$param]['error']) {
-        case UPLOAD_ERR_OK: // success, jump out
+         case UPLOAD_ERR_OK: // success, jump out
             break;
-        case UPLOAD_ERR_INI_SIZE:
-        case UPLOAD_ERR_FORM_SIZE:
+         case UPLOAD_ERR_INI_SIZE:
+         case UPLOAD_ERR_FORM_SIZE:
             throw new Exception(sprintf(_('That file is too big. The maximum file size is %d.'), $this->maxFileSize()));
             return;
-        case UPLOAD_ERR_PARTIAL:
+         case UPLOAD_ERR_PARTIAL:
             @unlink($_FILES[$param]['tmp_name']);
             throw new Exception(_('Partial upload.'));
             return;
-        default:
+         default:
             throw new Exception(_('System error uploading file.'));
             return;
         }
@@ -112,20 +112,20 @@ class ImageFile
             throw new Exception(_('Lost our file.'));
             return;
         }
-        
+
         // Don't crop/scale if it isn't necessary
-        if ($size === $this->width 
-            && $size === $this->height 
-            && $x === 0 
-            && $y === 0 
+        if ($size === $this->width
+            && $size === $this->height
+            && $x === 0
+            && $y === 0
             && $w === $this->width
             && $h === $this->height) {
-            
-            $outname = common_avatar_filename($this->id,
-                                                image_type_to_extension($this->type),
-                                                $size,
-                                                common_timestamp());
-            $outpath = common_avatar_path($outname);
+
+            $outname = Avatar::filename($this->id,
+                                        image_type_to_extension($this->type),
+                                        $size,
+                                        common_timestamp());
+            $outpath = Avatar::path($outname);
             @copy($this->filepath, $outpath);
             return $outname;
         }
@@ -171,9 +171,9 @@ class ImageFile
         imagecopyresampled($image_dest, $image_src, 0, 0, $x, $y, $size, $size, $w, $h);
 
         $outname = Avatar::filename($this->id,
-                                          image_type_to_extension($this->type),
-                                          $size,
-                                          common_timestamp());
+                                    image_type_to_extension($this->type),
+                                    $size,
+                                    common_timestamp());
 
         $outpath = Avatar::path($outname);
 
@@ -191,7 +191,7 @@ class ImageFile
             throw new Exception(_('Unknown file type'));
             return;
         }
-        
+
         imagedestroy($image_src);
         imagedestroy($image_dest);
 
@@ -229,12 +229,12 @@ class ImageFile
         $num = substr($str, 0, -1);
 
         switch(strtoupper($unit)){
-            case 'G':
-                $num *= 1024;
-            case 'M':
-                $num *= 1024;
-            case 'K':
-                $num *= 1024;
+         case 'G':
+            $num *= 1024;
+         case 'M':
+            $num *= 1024;
+         case 'K':
+            $num *= 1024;
         }
 
         return $num;