diff --git a/config/config.php b/config/config.php index 2d532692..39a383a9 100644 --- a/config/config.php +++ b/config/config.php @@ -190,6 +190,8 @@ $config['module']['image']['default']['watermark_font_alfa'] = '0'; $config['module']['image']['default']['watermark_back_color'] = '0,0,0'; $config['module']['image']['default']['watermark_back_alfa'] = '40'; $config['module']['image']['default']['watermark_image'] = false; +$config['module']['image']['default']['watermark_min_width'] = 200; +$config['module']['image']['default']['watermark_min_height'] = 130; $config['module']['image']['default']['round_corner'] = false; $config['module']['image']['default']['round_corner_radius'] = '18'; $config['module']['image']['default']['round_corner_rate'] = '40'; diff --git a/engine/modules/image/Image.class.php b/engine/modules/image/Image.class.php index d0d4ef41..38485829 100644 --- a/engine/modules/image/Image.class.php +++ b/engine/modules/image/Image.class.php @@ -160,29 +160,31 @@ class ModuleImage extends Module { * Добавляем watermark согласно в конфигурации заданым параметрам */ if($aParams['watermark_use']) { - switch($aParams['watermark_type']) { - default: - case 'text': - $oImage->set_font( - $aParams['watermark_font_size'], 0, - $aParams['path']['fonts'].$aParams['watermark_font'].'.ttf' - ); - - $oImage->watermark( - $aParams['watermark_text'], - explode(',',$aParams['watermark_position'],2), - explode(',',$aParams['watermark_font_color']), - explode(',',$aParams['watermark_back_color']), - $aParams['watermark_font_alfa'], - $aParams['watermark_back_alfa'] - ); - break; - case 'image': - $oImage->paste_image( - $aParams['path']['watermarks'].$aParams['watermark_image'], - true, explode(',',$aParams['watermark_position'],2) - ); - break; + if ($oImage->get_image_params('width')>$aParams['watermark_min_width'] and $oImage->get_image_params('height')>$aParams['watermark_min_height']) { + switch($aParams['watermark_type']) { + default: + case 'text': + $oImage->set_font( + $aParams['watermark_font_size'], 0, + $aParams['path']['fonts'].$aParams['watermark_font'].'.ttf' + ); + + $oImage->watermark( + $aParams['watermark_text'], + explode(',',$aParams['watermark_position'],2), + explode(',',$aParams['watermark_font_color']), + explode(',',$aParams['watermark_back_color']), + $aParams['watermark_font_alfa'], + $aParams['watermark_back_alfa'] + ); + break; + case 'image': + $oImage->paste_image( + $aParams['path']['watermarks'].$aParams['watermark_image'], + true, explode(',',$aParams['watermark_position'],2) + ); + break; + } } } /** diff --git a/include/cron/template.php b/include/cron/template.php index a5a6c094..82a28495 100644 --- a/include/cron/template.php +++ b/include/cron/template.php @@ -47,6 +47,6 @@ class TemplateCacheCleanCron extends Cron { /** * Создаем объект крон-процесса */ -$app=new TemplateCacheClean(); +$app=new TemplateCacheCleanCron(); print $app->Exec(); ?> \ No newline at end of file