Copy and crop (#335)

* added a helper method that overrides ini settings configured in lfm config. This method is applied before file upload but can be used in every LfmController if nessecary in the future

* moved ini override to the LfmController's constructor so it's always executed

* Update lfm.php

removed upload_max_filesize option as it doesn't work in this context because the request was already sent

* resolving merge conflicts after updating with unisharp upstream

* added 'Copy & Crop' option in crop pop-up

* removed some additions that are no longer used

* removed some additions that are no longer used

Author: Willem Leuverink

src/controllers/CropController.php

@@ -29,24 +29,36 @@ public function getCrop()
     /**
      * Crop the image (called via ajax)
      */
-    public function getCropimage()
+    public function getCropimage($overWrite = true)
     {
         $dataX      = request('dataX');
         $dataY      = request('dataY');
         $dataHeight = request('dataHeight');
         $dataWidth  = request('dataWidth');
         $image_path = parent::getCurrentPath(request('img'));
+        $crop_path  = $image_path;
+
+        if(!$overWrite) {
+            $fileParts = explode('.', request('img'));
+            $fileParts[count($fileParts) - 2] = $fileParts[count($fileParts) - 2] . '_cropped_' . time();
+            $crop_path = parent::getCurrentPath(implode('.', $fileParts));
+        }
 
         event(new ImageIsCropping($image_path));
         // crop image
         Image::make($image_path)
             ->crop($dataWidth, $dataHeight, $dataX, $dataY)
-            ->save($image_path);
+            ->save($crop_path);
 
         // make new thumbnail
-        Image::make($image_path)
+        Image::make($crop_path)
             ->fit(config('lfm.thumb_img_width', 200), config('lfm.thumb_img_height', 200))
-            ->save(parent::getThumbPath(parent::getName($image_path)));
+            ->save(parent::getThumbPath(parent::getName($crop_path)));
         event(new ImageWasCropped($image_path));
     }
+
+    public function getNewCropimage (){
+
+        $this->getCropimage(false);
+    }
 }

src/lang/en/lfm.php

@@ -59,6 +59,7 @@
     'btn-uploading'     => 'Uploading...',
     'btn-close'         => 'Close',
     'btn-crop'          => 'Crop',
+    'btn-copy-crop'     => 'Copy & Crop',
     'btn-cancel'        => 'Cancel',
     'btn-resize'        => 'Resize',
 

src/lang/nl/lfm.php

@@ -57,6 +57,7 @@
     'btn-uploading'       => 'Uploaden...',
     'btn-close'           => 'Sluiten',
     'btn-crop'            => 'Bijsnijden',
+    'btn-copy-crop'       => 'Kopiëren & Bijsnijden',
     'btn-cancel'          => 'Annuleren',
     'btn-resize'          => 'Formaat aanpassen',
 

src/routes.php

@@ -57,6 +57,10 @@
         'uses' => 'CropController@getCropimage',
         'as' => 'getCropimage'
     ]);
+    Route::get('/cropnewimage', [
+        'uses' => 'CropController@getNewCropimage',
+        'as' => 'getCropimage'
+    ]);
 
     // rename
     Route::get('/rename', [

src/views/crop.blade.php

@@ -31,6 +31,7 @@
       <br>
 
       <button class="btn btn-primary" onclick="performCrop()">{{ trans('laravel-filemanager::lfm.btn-crop') }}</button>
+      <button class="btn btn-primary" onclick="performCropNew()">{{ trans('laravel-filemanager::lfm.btn-copy-crop') }}</button>
       <button class="btn btn-info" onclick="loadItems()">{{ trans('laravel-filemanager::lfm.btn-cancel') }}</button>
       <form id='cropForm'>
         <input type="hidden" id="img" name="img" value="{{ $img->name }}">
@@ -90,4 +91,16 @@ function performCrop() {
         type: $('#type').val()
       }).done(loadItems);
     }
+
+    function performCropNew() {
+      performLfmRequest('cropnewimage', {
+        img: $("#img").val(),
+        working_dir: $("#working_dir").val(),
+        dataX: $("#dataX").val(),
+        dataY: $("#dataY").val(),
+        dataHeight: $("#dataHeight").val(),
+        dataWidth: $("#dataWidth").val(),
+        type: $('#type').val()
+      }).done(loadItems);
+    }
 </script>