hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #307 from openclassify/vedat

Browse Source 
fixed image upload and resize
This commit is contained in:
Fatih Alp 2020-02-11 17:32:05 +03:00 committed by GitHub
commit ad513def7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php
View File

@ -60,21 +60,20 @@ class UploadController extends AdminController
$watermarktype = $settings->value('visiosoft.module.advs::watermark_type');
$position = $settings->value('visiosoft.module.advs::watermark_position');
$img = WaterMark::make($this->request->file('upload')->getRealPath())
->resizeCanvas(800, 600, 'center', false, '464646');
if ($watermarktype == 'image') {
$img = WaterMark::make($this->request->file('upload')->getRealPath());
$watermarkimage_id = $settings->value('visiosoft.module.advs::watermark_image');
$watermarkimage = $files->find($watermarkimage_id);
$w = $img->width();
if ($watermarkimage != null) {
$watermark = WaterMark::make(public_path() . '/app/default/files-module/local/' . $watermarkimage->path())
->opacity($settings->value('visiosoft.module.advs::watermark_opacity'))
->resize($w);
$watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path())
->opacity($settings->value('visiosoft.module.advs::watermark_opacity'));
$img->insert($watermark, $position);
}
} else {
$img = WaterMark::make($this->request->file('upload')->getRealPath());
$watermarktext = $settings->value('visiosoft.module.advs::watermark_text');
$v = "top";
$h = "center";
@ -90,7 +89,7 @@ class UploadController extends AdminController
}
$img->save(public_path() . '/app/default/files-module/local/images/' . $file->getAttributes()['name']);
$img->save(app_storage_path() . '/files-module/local/images/' . $file->getAttributes()['name']);
return $this->response->json($file->getAttributes());
}