From 109d59b1864cfaf37d8f96df605deb6b424ed947 Mon Sep 17 00:00:00 2001
From: Can OMUR <can@positive-labs.com>
Date: Sun, 2 Jun 2019 21:53:15 +0200
Subject: [PATCH 1/3] fixes #48 and started to work on #56

---
 Form/Type/CroppableImageType.php                 |  3 ++-
 Handler/UploadHandler.php                        |  3 ++-
 README.md                                        | 13 +++++++++++++
 Resources/public/js/comur.imagelibrary.js        | 16 +++++++++++++---
 .../views/Form/croppable_image_modal.html.twig   |  2 +-
 composer.json                                    |  2 +-
 6 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/Form/Type/CroppableImageType.php b/Form/Type/CroppableImageType.php
index 02edefc7..5f06e8a1 100644
--- a/Form/Type/CroppableImageType.php
+++ b/Form/Type/CroppableImageType.php
@@ -41,7 +41,8 @@ class CroppableImageType extends AbstractType
         'aspectRatio' => true,
         'cropRoute' => 'comur_api_crop',
         'forceResize' => false,
-        'thumbs' => null
+        'thumbs' => null,
+        'disable' => false
     );
 
     // public function getParent()
diff --git a/Handler/UploadHandler.php b/Handler/UploadHandler.php
index 4b6349ef..8019bb16 100755
--- a/Handler/UploadHandler.php
+++ b/Handler/UploadHandler.php
@@ -937,7 +937,8 @@ protected function imagemagick_create_scaled_image($file_name, $version, $option
     }
 
     protected function get_image_size($file_path) {
-        if ($this->options['image_library']) {
+        // Disabled cause not works with animated gifs ans getimagesize works well with everything
+        if (false && $this->options['image_library']) {
             if (extension_loaded('imagick')) {
                 $image = new \Imagick();
                 try {
diff --git a/README.md b/README.md
index 82fb1232..516b78e3 100644
--- a/README.md
+++ b/README.md
@@ -279,6 +279,7 @@ Use widget in your forms (works with SonataAdmin too) to create a simple image f
               'generateFilename' => true      //optional
           ),
           'cropConfig' => array(
+              'disable' => false,      //optional
               'minWidth' => 588,
               'minHeight' => 300,
               'aspectRatio' => true,         //optional
@@ -412,6 +413,10 @@ Route called to send uploaded file. It's recommended to not change this paramete
 
 ### uploadDir (required) ###
 
+**Since 2.0.3**
+
+**Replaces uploadUrl removed because a security issue (see #80)**
+
 Public dir relative path to directory where put uploaded image. I recommend you to create a function in your entity and call it like it's shown in the example:
 
 ```PHP
@@ -483,6 +488,14 @@ This parameter is used to generate an uniq file name. Setted to false, it will k
 
 ## cropConfig ##
 
+### disable (optional) ###
+
+**Since 2.0.4**
+
+Disables cropping feature and saves directly original image
+
+**Default value:** false
+
 ### minWidth (optional) ###
 
 Minimum with of desired image.
diff --git a/Resources/public/js/comur.imagelibrary.js b/Resources/public/js/comur.imagelibrary.js
index 56a96d94..920ca85b 100644
--- a/Resources/public/js/comur.imagelibrary.js
+++ b/Resources/public/js/comur.imagelibrary.js
@@ -88,16 +88,26 @@ function initializeImageManager(id, options, cb){
             // console.log('uploaded');
             if(data.result['image_upload_file'][0].error){
                 $('#image_upload_widget_error').text(data.result['image_upload_file'][0].error);
-                $('#image_upload_widget_error').parent().removeClass('hidden');
+                $('#image_upload_widget_error').parent().show();
             }
             else{
                 $('#image_upload_widget_error').text('');
-                $('#image_upload_widget_error').parent().addClass('hidden');
+                $('#image_upload_widget_error').parent().hide();
                 // console.log(data.result, data.result['image_upload_file']);
                 // $('#image_preview img').remove();
                 // $('#image_preview').html('<img src="/'+data.result['image_upload_file'][0].url+'" id="image_preview_image"/>');
                 $('#selected_image').val(data.result['image_upload_file'][0].name); 
-                initJCrop(id, options);
+                if (options.cropConfig.disable) {
+                    $('#'+id).val(data.result['image_upload_file'][0].name);
+                    $('#image_preview_image_'+id).html('<img src="'+options.uploadConfig.webDir + '/' + data.result['image_upload_file'][0].name +'?'+ new Date().getTime()+'" id="'+id+'_preview"/>');
+                    reinitModal();
+                    cb({
+                        previewSrc: '/' + options.uploadConfig.webDir + '/' + data.result['image_upload_file'][0].name +'?'+ new Date().getTime(),
+                        filename: data.result['image_upload_file'][0].name
+                    });
+                } else {
+                    initJCrop(id, options);
+                }
             }
             
         },
diff --git a/Resources/views/Form/croppable_image_modal.html.twig b/Resources/views/Form/croppable_image_modal.html.twig
index a79fa3e7..f2cb5cf0 100644
--- a/Resources/views/Form/croppable_image_modal.html.twig
+++ b/Resources/views/Form/croppable_image_modal.html.twig
@@ -74,7 +74,7 @@
                 <div class="tab-content">
                     <!-- UPLOAD IMAGE -->
                     <div class="tab-pane active" id="upload-image">
-                        <div class="field-error clearfix hidden">
+                        <div class="field-error clearfix" style="display: none">
                             <div id="image_upload_widget_error" class="alert alert-danger span6">
                             </div>
                         </div>
diff --git a/composer.json b/composer.json
index 65c69629..67a33dad 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "comur/image-bundle",
     "type": "symfony-bundle",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "description": "A bundle providing fields for image upload with jquery upload and image cropping with jcrop for symfony2",
     "keywords": ["Form Type", "image", "upload", "crop", "jcrop", "jquery upload"],
     "homepage": "https://github.com/comur/ComurImageBundle",

From d430e81ac67d06d778fc1005cca656a85e980a40 Mon Sep 17 00:00:00 2001
From: Can OMUR <can@positive-labs.com>
Date: Sun, 2 Jun 2019 22:18:47 +0200
Subject: [PATCH 2/3] fixes #56 but need Imagick

---
 Controller/UploadController.php | 43 ++++++++++++++++++++++++++++++---
 README.md                       |  2 ++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/Controller/UploadController.php b/Controller/UploadController.php
index 2f2008f0..0c5f880a 100644
--- a/Controller/UploadController.php
+++ b/Controller/UploadController.php
@@ -330,6 +330,27 @@ public function getLibraryImagesAction(Request $request){
         return new Response(json_encode($result));
     }
 
+    private function isGifAnimated($filename) {
+        if(!($fh = @fopen($filename, 'rb')))
+            return false;
+        $count = 0;
+        //an animated gif contains multiple "frames", with each frame having a
+        //header made up of:
+        // * a static 4-byte sequence (\x00\x21\xF9\x04)
+        // * 4 variable bytes
+        // * a static 2-byte sequence (\x00\x2C) (some variants may use \x00\x21 ?)
+
+        // We read through the file til we reach the end of the file, or we've found
+        // at least 2 frame headers
+        while(!feof($fh) && $count < 2) {
+            $chunk = fread($fh, 1024 * 100); //read 100kb at a time
+            $count += preg_match_all('#\x00\x21\xF9\x04.{4}\x00(\x2C|\x21)#s', $chunk, $matches);
+        }
+
+        fclose($fh);
+        return $count > 1;
+    }
+
     /**
      * Crops or resizes image and writes it on disk
      */
@@ -345,9 +366,25 @@ private function resizeCropImage($destSrc, $imgSrc, $destX, $destY, $srcX, $srcY
                 $imageQuality = 100;
                 break;
             case 'gif':
-                $srcFunc = 'imagecreatefromgif';
-                $writeFunc = 'imagegif';
-                $imageQuality = null;
+                if ($this->isGifAnimated($imgSrc) && extension_loaded('imagick')) {
+                    $image = new \Imagick($imgSrc);
+
+                    $image = $image->coalesceImages();
+
+                    foreach ($image as $frame) {
+                        $frame->cropImage($srcW, $srcH, $srcX, $srcY);
+                        $frame->thumbnailImage($destW, $destH);
+                        $frame->setImagePage($destW, $destH, $destX, $destY);
+                    }
+
+                    $image = $image->deconstructImages();
+                    $image->writeImages($destSrc, true);
+                    return false;
+                } else {
+                    $srcFunc = 'imagecreatefromgif';
+                    $writeFunc = 'imagegif';
+                    $imageQuality = null;
+                }
                 break;
             case 'png':
                 $srcFunc = 'imagecreatefrompng';
diff --git a/README.md b/README.md
index 516b78e3..20216c6d 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,8 @@ If this bundle helps you reduce time to develop, you can pay me a cup of coffee
 
 :warning: **I won't maintain Symfony 2 anymore, I will only merge PR on 1.2 branch for compatibility with SF2. If you need something you can always create a PR and I will merge it.**
 
+:warning: **Animated gif cropping is only available with imagick**
+
 Screen shots
 ------------
 

From a674a659933dd69c18adc3d0dc922423f461a972 Mon Sep 17 00:00:00 2001
From: Can OMUR <can@positive-labs.com>
Date: Sun, 2 Jun 2019 22:23:31 +0200
Subject: [PATCH 3/3] updated changelog for new release

---
 CHANGELOG.md | 8 ++++++++
 README.md    | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d26d2217..624fb50f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## [2.0.4](https://github.com/comur/ComurImageBundle/tree/2.0.4) (2019-05-31)
+[Full Changelog](https://github.com/comur/ComurImageBundle/compare/2.0.3...2.0.4)
+
+**Implemented enhancements:**
+
+- Animated GIF support [\#56](https://github.com/comur/ComurImageBundle/issues/56)
+- add disable crop option [\#48](https://github.com/comur/ComurImageBundle/issues/48)
+
 ## [2.0.3](https://github.com/comur/ComurImageBundle/tree/2.0.3) (2019-05-31)
 [Full Changelog](https://github.com/comur/ComurImageBundle/compare/2.0.2...2.0.3)
 
diff --git a/README.md b/README.md
index 20216c6d..16bc5b60 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,11 @@ If this bundle helps you reduce time to develop, you can pay me a cup of coffee
 
 :warning: **Animated gif cropping is only available with imagick**
 
+Changelog
+---------
+
+Please see on [CHANGELOG.md](CHANGELOG.md)
+
 Screen shots
 ------------