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 #279 from openclassify/vedat

Browse Source 
version
This commit is contained in:
Ozcan Durak 2020-02-03 16:06:16 +03:00 committed by GitHub
commit a2ff467c01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,8 +65,11 @@ class UploadController extends AdminController
$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(50);
$watermark = WaterMark::make(public_path() . '/app/default/files-module/local/' . $watermarkimage->path())
->opacity($settings->value('visiosoft.module.advs::watermark_opacity'))
->resize($w);
$img->insert($watermark, $position);
}
@ -77,7 +80,7 @@ class UploadController extends AdminController
$h = "center";
$w = $img->width() / 2;
$h1 = $img->height() / 2;
$font_size = $w/20;
$font_size = $w / 20;
$img->text($watermarktext, $w, $h1, function ($font) use ($v, $h, $font_size) {
$font->file(public_path('Antonio-Bold.ttf'));
$font->size($font_size);

2
composer.json
View File

@ -46,7 +46,7 @@
"anomaly/tags-field_type": "~2.3.0",
"anomaly/slug-field_type": "~2.1.0",
"anomaly/text-field_type": "~2.2.0",
"anomaly/file-field_type": "~2.2.32",
"anomaly/file-field_type": "2.2.32",
"anomaly/url-field_type": "~2.2.0",
"anomaly/configuration-module": "~2.1.0",
"anomaly/preferences-module": "~2.1.0",