Limit the size of contact avatars

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 4c49bdf43af5f7f35ac94a4e67f5b6ec1760acf5..16903885959bb394e7871dc7dc1267724af0caa2 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -460,6 +460,29 @@ class Photo
                if ($Image->isValid()) {
                        $Image->scaleToSquare(300);
 
+                       $filesize = strlen($Image->asString());
+                       $maximagesize = DI::config()->get('system', 'maximagesize');
+                       if (!empty($maximagesize) && ($filesize > $maximagesize)) {
+                               Logger::info('Avatar exceeds image limit', ['uid' => $uid, 'cid' => $cid, 'maximagesize' => $maximagesize, 'size' => $filesize, 'type' => $Image->getType()]);
+                               if (($Image->getType() == 'image/gif')) {
+                                       $Image->toStatic();
+                                       $Image = new Image($Image->asString(), 'image/png');
+
+                                       $filesize = strlen($Image->asString());
+                                       Logger::info('Converted gif to a static png', ['uid' => $uid, 'cid' => $cid, 'size' => $filesize, 'type' => $Image->getType()]);
+                               }
+                               if ($filesize > $maximagesize) {
+                                       foreach ([160, 80] as $pixels) {
+                                               if ($filesize > $maximagesize) {
+                                                       Logger::info('Resize', ['uid' => $uid, 'cid' => $cid, 'size' => $filesize, 'max' => $maximagesize, 'pixels' => $pixels, 'type' => $Image->getType()]);
+                                                       $Image->scaleDown($pixels);
+                                                       $filesize = strlen($Image->asString());
+                                               }
+                                       }
+                               }
+                               Logger::info('Avatar is resized', ['uid' => $uid, 'cid' => $cid, 'size' => $filesize, 'type' => $Image->getType()]);
+                       }
+
                        $r = self::store($Image, $uid, $cid, $resource_id, $filename, self::CONTACT_PHOTOS, 4);
 
                        if ($r === false) {

diff --git a/src/Object/Image.php b/src/Object/Image.php
index c1da711f9ca14472326283feed129c0fa88d4d59..4645a8678a59fd1e330614315a364dfb01005a07 100644 (file)
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -575,6 +575,21 @@ class Image
                return true;
        }
 
+       /**
+        * Convert a GIF to a PNG to make it static
+        */
+       public function toStatic()
+       {
+               if ($this->type != 'image/gif') {
+                       return;
+               }
+
+               if ($this->isImagick()) {
+                       $this->type == 'image/png';
+                       $this->image->setFormat('png');
+               }
+       }
+
        /**
         * @param integer $max maximum
         * @param integer $x   x coordinate