hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-09 23:06:08 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/openclassify/openclassify into muammertop

Browse Source 
 Conflicts:
	addons/default/visiosoft/advs-module/resources/config/settings/settings.php
	addons/default/visiosoft/advs-module/resources/lang/en/setting.php
This commit is contained in:
Muammer Top 2021-03-12 12:40:13 +03:00
commit 60d1ba95c1
4 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/default/visiosoft/advs-module/resources/config/settings/sections.php
View File

@ -63,6 +63,7 @@ return [
'ads_image' => [ 'ads_image' => [
'title' => 'visiosoft.module.advs::section.ads_image', 'title' => 'visiosoft.module.advs::section.ads_image',
'fields' => [ 'fields' => [
'watermark',
'image_resize_backend', 'image_resize_backend',
'full_image_width', 'full_image_width',
'full_image_height', 'full_image_height',

6
addons/default/visiosoft/advs-module/resources/config/settings/settings.php
View File

@ -295,6 +295,12 @@ return [
'default_value' => 600, 'default_value' => 600,
], ],
], ],
'watermark' => [
'type' => 'anomaly.field_type.boolean',
'config' => [
'default_value' => false,
]
],
'watermark_type' => [ 'watermark_type' => [
'type' => 'anomaly.field_type.select', 'type' => 'anomaly.field_type.select',
'bind' => 'adv.watermark_type', 'bind' => 'adv.watermark_type',

6
addons/default/visiosoft/advs-module/resources/lang/en/setting.php
View File

@ -249,5 +249,9 @@ return [
], ],
'disable_sentry' => [ 'disable_sentry' => [
'name' => 'Disable Sentry' 'name' => 'Disable Sentry'
] ],
'watermark' => [
'name' => 'Watermark',
'instructions' => 'Is watermark active?'
],
]; ];

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

@ -118,6 +118,7 @@ class UploadController extends AdminController
foreach ($image_types as $key => $image) { foreach ($image_types as $key => $image) {
if (setting_value('visiosoft.module.advs::watermark', false)) {
if ($settings_value['watermark_type'] == 'image') { if ($settings_value['watermark_type'] == 'image') {
if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) { if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) {
@ -139,6 +140,7 @@ class UploadController extends AdminController
}); });
} }
}
if ($key === "full") { if ($key === "full") {
$fileName = $file->getAttributes()['name']; $fileName = $file->getAttributes()['name'];