X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fimagefile.php;h=cf1668f20373a092c791e71a706608493d0848a8;hb=69ac99ff949ab0118ff25a62471980ad0ec7a52b;hp=ea24029a30b2ed8904f99756c006971e538b3086;hpb=805560677bc66a58c270551fa54b613642b3af97;p=quix0rs-gnu-social.git

diff --git a/lib/imagefile.php b/lib/imagefile.php
index ea24029a30..cf1668f203 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Abstraction for an image file
  *
@@ -20,15 +20,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Image
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -38,11 +38,11 @@ if (!defined('LACONICA')) {
  * Makes it slightly easier to accept an image file from upload.
  *
  * @category Image
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ImageFile
@@ -68,17 +68,23 @@ 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:
-            throw new Exception(sprintf(_('That file is too big. The maximum file size is %d.'), $this->maxFileSize()));
+         case UPLOAD_ERR_INI_SIZE:
+         case UPLOAD_ERR_FORM_SIZE:
+            throw new Exception(sprintf(_('That file is too big. The maximum file size is %s.'),
+                ImageFile::maxFileSize()));
             return;
-        case UPLOAD_ERR_PARTIAL:
+         case UPLOAD_ERR_PARTIAL:
             @unlink($_FILES[$param]['tmp_name']);
             throw new Exception(_('Partial upload.'));
             return;
-        default:
+         case UPLOAD_ERR_NO_FILE:
+            // No file; probably just a non-AJAX submission.
+            return;
+         default:
+            common_log(LOG_ERR, __METHOD__ . ": Unknown upload error " .
+                $_FILES[$param]['error']);
             throw new Exception(_('System error uploading file.'));
             return;
         }
@@ -112,19 +118,19 @@ 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 = 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);
             @copy($this->filepath, $outpath);
             return $outname;
@@ -171,9 +177,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 +197,7 @@ class ImageFile
             throw new Exception(_('Unknown file type'));
             return;
         }
-        
+
         imagedestroy($image_src);
         imagedestroy($image_dest);
 
@@ -229,12 +235,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;