From d18c66312348bf8e61a94687bb6f689923f28bfb Mon Sep 17 00:00:00 2001 From: dev-101 Date: Wed, 15 Jul 2015 00:15:27 +0200 Subject: [PATCH 1/7] Update ImageProcessing.php --- oc-includes/osclass/classes/ImageProcessing.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oc-includes/osclass/classes/ImageProcessing.php b/oc-includes/osclass/classes/ImageProcessing.php index 0afa156e2f..dc5f3bf251 100755 --- a/oc-includes/osclass/classes/ImageProcessing.php +++ b/oc-includes/osclass/classes/ImageProcessing.php @@ -248,14 +248,14 @@ public function show() { } } - public function doWatermarkText($text, $color = 'ff0000') { + public function doWatermarkText($text, $color = 'ff0000', $fontsize = '30') { $this->_watermarked = true; $this->_font = osc_apply_filter('watermark_font_path', LIB_PATH . "osclass/assets/fonts/Arial.ttf"); if(osc_use_imagick()) { $draw = new ImagickDraw(); $draw->setFillColor("#".$color); $draw->setFont($this->_font); - $draw->setFontSize( 30 ); + $draw->setFontSize( $fontsize ); $metrics = $this->im->queryFontMetrics($draw, $text); switch(osc_watermark_place()) { case 'tl': @@ -289,7 +289,7 @@ public function doWatermarkText($text, $color = 'ff0000') { } $color = $this->_imageColorAllocateHex($color); $offset = $this->_calculateOffset($text); - imagettftext($this->im, 20, 0, $offset['x'], $offset['y'], $color, $this->_font , html_entity_decode($text, null, "UTF-8")); + imagettftext($this->im, $fontsize, 0, $offset['x'], $offset['y'], $color, $this->_font , html_entity_decode($text, null, "UTF-8")); } return $this; } From 3a093280ad6501c18dafdbe875947330583d1f9f Mon Sep 17 00:00:00 2001 From: dev-101 Date: Wed, 15 Jul 2015 00:17:29 +0200 Subject: [PATCH 2/7] Update ItemActions.php --- oc-includes/osclass/ItemActions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oc-includes/osclass/ItemActions.php b/oc-includes/osclass/ItemActions.php index 33057ef55f..85815f8c69 100755 --- a/oc-includes/osclass/ItemActions.php +++ b/oc-includes/osclass/ItemActions.php @@ -1390,7 +1390,7 @@ public function uploadItemResources($aResources,$itemId) $size = explode('x', osc_normal_dimensions()); $img = ImageResizer::fromFile($tmpName)->autoRotate()->resizeTo($size[0], $size[1]); if( osc_is_watermark_text() ) { - $img->doWatermarkText(osc_watermark_text(), osc_watermark_text_color()); + $img->doWatermarkText(osc_watermark_text(), osc_watermark_text_color(), osc_watermark_text_size()); } else if ( osc_is_watermark_image() ){ $img->doWatermarkImage(); } From 5c8db4b0c693325ff1a2e52d870bad5ba7bba767 Mon Sep 17 00:00:00 2001 From: dev-101 Date: Wed, 15 Jul 2015 00:20:05 +0200 Subject: [PATCH 3/7] Update hPreference.php --- oc-includes/osclass/helpers/hPreference.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/oc-includes/osclass/helpers/hPreference.php b/oc-includes/osclass/helpers/hPreference.php index e419f34bf2..5fe7b86343 100755 --- a/oc-includes/osclass/helpers/hPreference.php +++ b/oc-includes/osclass/helpers/hPreference.php @@ -1017,21 +1017,30 @@ function osc_is_watermark_image() { } /** - * Return watermark text color + * Return watermark text * * @return string */ - function osc_watermark_text_color() { - return getPreference('watermark_text_color'); + function osc_watermark_text() { + return getPreference('watermark_text'); } /** - * Return watermark text + * Return watermark text size * * @return string */ - function osc_watermark_text() { - return getPreference('watermark_text'); + function osc_watermark_text_size() { + return getPreference('watermark_text_size'); + } + + /** + * Return watermark text color + * + * @return string + */ + function osc_watermark_text_color() { + return getPreference('watermark_text_color'); } /** From 01ca555806516c1ef9ff326795656103cbd1b031 Mon Sep 17 00:00:00 2001 From: dev-101 Date: Wed, 15 Jul 2015 00:21:14 +0200 Subject: [PATCH 4/7] Update basic_data.sql --- oc-includes/osclass/installer/basic_data.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/oc-includes/osclass/installer/basic_data.sql b/oc-includes/osclass/installer/basic_data.sql index 37454316c0..91b1d5950a 100755 --- a/oc-includes/osclass/installer/basic_data.sql +++ b/oc-includes/osclass/installer/basic_data.sql @@ -125,6 +125,7 @@ INSERT INTO /*TABLE_PREFIX*/t_preference VALUES ,('osclass', 'marketCategories', '', 'STRING') ,('osclass', 'marketDataUpdate', '0', 'INTEGER') ,('osclass', 'watermark_text', '', 'STRING') + ,('osclass', 'watermark_text_size', '30', 'STRING') ,('osclass', 'watermark_text_color', '', 'STRING') ,('osclass', 'watermark_place', 'centre', 'STRING') ,('osclass', 'watermark_image', '', 'STRING') From bb3b4239b710b25b554ac4488667f0d408224379 Mon Sep 17 00:00:00 2001 From: dev-101 Date: Wed, 15 Jul 2015 00:24:41 +0200 Subject: [PATCH 5/7] Update media.php --- oc-admin/themes/modern/settings/media.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/oc-admin/themes/modern/settings/media.php b/oc-admin/themes/modern/settings/media.php index 63297814af..868858e0f1 100644 --- a/oc-admin/themes/modern/settings/media.php +++ b/oc-admin/themes/modern/settings/media.php @@ -272,6 +272,12 @@ function customPageTitle($string) { +
+
+
+ +
+
From cb893a2e690a2ecc123d8b8e2d1f8176ea754bf0 Mon Sep 17 00:00:00 2001 From: dev-101 Date: Wed, 15 Jul 2015 00:26:25 +0200 Subject: [PATCH 6/7] Update media.php --- oc-admin/controller/settings/media.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/oc-admin/controller/settings/media.php b/oc-admin/controller/settings/media.php index c98612590d..555030bd31 100644 --- a/oc-admin/controller/settings/media.php +++ b/oc-admin/controller/settings/media.php @@ -53,18 +53,21 @@ function doModel() $forceJPEG = Params::getParam('force_jpeg'); $use_imagick = Params::getParam('use_imagick'); $type_watermark = Params::getParam('watermark_type'); - $watermark_color = Params::getParam('watermark_text_color'); - $watermark_text = Params::getParam('watermark_text'); + $watermark_text = Params::getParam('watermark_text'); + $watermark_text_size = Params::getParam('watermark_text_size'); + $watermark_text_color = Params::getParam('watermark_text_color'); switch ($type_watermark) { case 'none': - $iUpdated += osc_set_preference('watermark_text_color', ''); $iUpdated += osc_set_preference('watermark_text', ''); + $iUpdated += osc_set_preference('watermark_text_size', ''); + $iUpdated += osc_set_preference('watermark_text_color', ''); $iUpdated += osc_set_preference('watermark_image', ''); break; case 'text': - $iUpdated += osc_set_preference('watermark_text_color', $watermark_color); $iUpdated += osc_set_preference('watermark_text', $watermark_text); + $iUpdated += osc_set_preference('watermark_text_size', $watermark_text_size); + $iUpdated += osc_set_preference('watermark_text_color', $watermark_text_color); $iUpdated += osc_set_preference('watermark_image', ''); $iUpdated += osc_set_preference('watermark_place', Params::getParam('watermark_text_place')); break; @@ -91,8 +94,9 @@ function doModel() $error .= _m('There was a problem uploading the watermark image')."
"; } } - $iUpdated += osc_set_preference('watermark_text_color', ''); $iUpdated += osc_set_preference('watermark_text', ''); + $iUpdated += osc_set_preference('watermark_text_size', ''); + $iUpdated += osc_set_preference('watermark_text_color', ''); $iUpdated += osc_set_preference('watermark_place', Params::getParam('watermark_image_place')); break; default: From 47b6fc94e2ac184b554ee6bde7b31eed58633933 Mon Sep 17 00:00:00 2001 From: dev-101 Date: Wed, 15 Jul 2015 00:29:23 +0200 Subject: [PATCH 7/7] Update upgrade-funcs.php --- oc-includes/osclass/upgrade-funcs.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/oc-includes/osclass/upgrade-funcs.php b/oc-includes/osclass/upgrade-funcs.php index 5d076adda7..a2c23c8c00 100755 --- a/oc-includes/osclass/upgrade-funcs.php +++ b/oc-includes/osclass/upgrade-funcs.php @@ -513,6 +513,10 @@ osc_set_preference('marketURL', 'http://market.osclass.org/api/v2/'); } + if(osc_version() < 357) { + osc_set_preference('watermark_text_size', '30'); + } + osc_changeVersionTo(357); if(!defined('IS_AJAX') || !IS_AJAX) {