Image Watermark - Version 1.0.2

Version Description

New: Add watermark to custom images sizes registered in theme
Tweak: Admin notices on settings page if no watermark image selected
Tweak: JavaScript enquequing on front-end
Tweak: General code cleanup
Tweak: Changed label for enabling image protection for logged-in users

Release Info

Developer	dfactory
Plugin	Image Watermark
Version	1.0.2
Comparing to
See all releases

Code changes from version 1.0.1 to 1.0.2

Files changed (7) hide show

image-watermark.php +190 -85
js/no-right-click.js +5 -1
js/upload-manager.js +10 -11
languages/image-watermark-pl_PL.mo +0 -0
languages/image-watermark-pl_PL.po +84 -73
languages/image-watermark.pot +81 -69
readme.txt +10 -2

image-watermark.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/*
3	Plugin Name: Image Watermark
4	Description: Image Watermark allows you to automatically watermark images uploaded to the WordPress Media Library.
5	- Version: 1.0.1
6	Author: dFactory
7	Author URI: http://www.dfactory.eu/
8	Plugin URI: http://www.dfactory.eu/plugins/image-watermark/
	@@ -30,7 +30,7 @@ if(version_compare(PHP_VERSION, '5.0', '<') \|\| version_compare($wp_version, '3.5
30	class ImageWatermark
31	{
32	private $_messages = array();
33	- private $_image_sizes = array(~~'thumbnail', 'medium', 'large', 'fullsize'~~);
34	private $_watermark_positions = array (
35	'x' => array('left', 'center', 'right'),
36	'y' => array('top', 'middle', 'bottom'),
	@@ -61,23 +61,48 @@ class ImageWatermark
61
62	public function __construct()
63	{
64	- // register installer function
65	register_activation_hook(__FILE__, array(&$this, 'activate_watermark'));
66
67	//actions
68	add_action('plugins_loaded', array(&$this, 'load_textdomain'));
69	- add_action('~~admin_enqueue_scripts~~', array(&$this, '~~watermark_scripts_styles~~'));


70	add_action('admin_menu', array(&$this, 'watermark_admin_menu'));
71	- ~~add_action('wp_footer', array(&$this, 'watermark_no_right_click'));~~



72
73	- // check if post_id is "-1", meaning we're uploading watermark image
74	if(!(array_key_exists('post_id', $_REQUEST) && $_REQUEST['post_id'] == -1))
75	{
76	- ~~add_filter('wp_handle_upload_prefilter',~~ ~~array~~(~~&$this,~~ '~~delay_upload_filter~~')~~, 10, 1)~~;





77	}
78	}
79
80















81	public function delay_upload_filter($value)
82	{
83	if(isset($_REQUEST['post_id']))
	@@ -94,14 +119,63 @@ class ImageWatermark
94	}
95
96



97	public function load_textdomain()
98	{
99	load_plugin_textdomain('image-watermark', FALSE, basename(dirname(__FILE__)).'/languages');
100	}
101
102
103	- ~~// Enqueue scripts and styles~~
104	- ~~public~~ ~~function~~ ~~watermark_scripts_styles($page)~~














































105	{
106	if($page !== 'settings_page_watermark-options')
107	return;
	@@ -131,6 +205,7 @@ class ImageWatermark
131	array(
132	'title' => __('Select watermark', 'image-watermark'),
133	'originalSize' => __('Original size', 'image-watermark'),

134	'frame' => 'select',
135	'button' => array('text' => __('Add watermark', 'image-watermark')),
136	'multiple' => FALSE,
	@@ -143,7 +218,33 @@ class ImageWatermark
143	}
144
145
146	- ~~// Create options page in menu & print styles & scripts~~


























147	public function watermark_admin_menu()
148	{
149	$watermark_settings_page = add_options_page(
	@@ -156,29 +257,9 @@ class ImageWatermark
156	}
157
158
159	- ~~// Block right click on images~~
160	- ~~public~~ ~~function~~ ~~watermark_no_right_click()~~
161	- {
162	- $options = $this->get_option('df_image_protection');
163	-
164	- if(($options['forlogged'] == 0 && is_user_logged_in()) \|\| ($options['draganddrop'] == 0 && $options['rightclick'] == 0))
165	- {
166	- return;
167	- }
168	-
169	- // Oj nieladnie :)
170	- // to wszystko powinno siedziec np. w tym no-right-click.js lub oddzielnym pliku js, enqueue_script? (jesli to cos robi na froncie)
171	-
172	- echo '
173	- <script language="javascript" type="text/javascript">
174	- var df_nrc_extra="'.($options['rightclick'] == 1 ? 'Y' : 'N').'";
175	- var df_nrc_drag="'.($options['draganddrop'] == 1 ? 'Y' : 'N').'";
176	- </script>
177	- <script language="javascript" type="text/javascript" src="'.addslashes(WP_PLUGIN_URL.'/image-watermark'.'/js/no-right-click.js').'">
178	- </script>';
179	- }
180	-
181	-
182	private function getCustomPostTypes()
183	{
184	return array_merge(array('post', 'page'), get_post_types(array('_builtin' => FALSE), 'names'));
	@@ -190,7 +271,17 @@ class ImageWatermark
190	*/
191	public function watermark_options_page()
192	{
193	- // if ~~user clicked "Save Changes" save them~~










194	if(isset($_POST['submit']))
195	{
196	foreach($this->_options as $option => $value)
	@@ -308,26 +399,16 @@ class ImageWatermark
308	}
309	}
310
311	- if(~~!extension_loaded(~~'gd'))
312	- {
313	- $this->_messages['error'][] = __('Image Watermark will not work properly without GD PHP extension.', 'image-watermark');
314	- }
315
316	- ~~foreach~~($~~this->_messages~~ as $~~namespace~~ => ~~$messages~~)
317	{
318	- ~~foreach($messages~~ ~~as $message)~~
319	- {
320	- ~~echo~~ '
321	- <div ~~class="~~'~~.$namespace.'">~~
322	- <p>
323	- <strong>'.$message.'</strong>
324	- </p>
325	- </div>';
326	- }
327	}
328	-
329	- $watermark_image = $this->get_option('df_watermark_image');
330	- $image_protection = $this->get_option('df_image_protection');
331	?>
332	<div class="wrap">
333	<div id="icon-options-general" class="icon32"><br /></div>
	@@ -424,6 +505,16 @@ class ImageWatermark
424	</tr>
425	</table>
426	<hr />










427	<h3><?php echo __('Watermark image','image-watermark'); ?></h3>
428	<p class="howto"><?php echo __('Configure your watermark image. Allowed file formats are: jpg, png, gif.','image-watermark'); ?></p>
429	<table id="watermark-image-table" class="form-table">
	@@ -432,7 +523,7 @@ class ImageWatermark
432	<td>
433	<input id="upload_image" type="hidden" name="df_watermark_image[url]" value="<?php echo (int)$watermark_image['url']; ?>" />
434	<input id="upload_image_button" type="button" class="button button-secondary" value="<?php echo __('Select image','image-watermark'); ?>" />
435	- <input id="turn_off_image_button" type="button" class="button button-secondary" value="<?php echo __('Turn off image','image-watermark'); ?>" />
436	<p class="howto"><?php _e('You have to save changes after the selection or removal of the image.', 'image-watermark'); ?></p>
437	</td>
438	</tr>
	@@ -442,20 +533,28 @@ class ImageWatermark
442	<fieldset class="wr_width">
443	<legend class="screen-reader-text"><span><?php echo __('Watermark Preview', 'image-watermark'); ?></span></legend>
444	<div id="previewImg_imageDiv">
445	- <?php if($~~watermark_image['url']~~ ~~!==~~ ~~NULL && $watermark_image['url'] != 0~~) {
446	$image = wp_get_attachment_image_src($watermark_image['url'], array(300, 300), FALSE);
447	?>
448	<img id="previewImg_image" src="<? echo $image[0]; ?>" alt="" width="300" />
449	- <? } else { ?>
450	- <~~span~~ id="previewImg_image">
451	- <?php ~~_e('Watermak~~ ~~has not been selected yet.', 'image-watermark');?>~~
452	- </span>
453	- <?php } ?>
454	- <span id="previewImg_image_hidden" style="display: none;">
455	- <?php _e('Watermak has not been selected yet.', 'image-watermark');?>
456	- </span>
457	</div>
458	- <p id="~~previewImg_imageDivSize~~" class="howto"~~></p~~>













459	</fieldset>
460	</td>
461	</tr>
	@@ -521,7 +620,7 @@ class ImageWatermark
521	<td><input type="checkbox" <?php checked($image_protection['draganddrop'], 1, TRUE); ?> value="1" name="df_image_protection[draganddrop]"></td>
522	</tr>
523	<tr>
524	- <th><?php echo __('~~Disable~~ image protection for logged-in users','image-watermark'); ?></th>
525	<td><input type="checkbox" <?php checked($image_protection['forlogged'], 1, TRUE); ?> value="1" name="df_image_protection[forlogged]"></td>
526	</tr>
527	</table>
	@@ -584,7 +683,7 @@ class ImageWatermark
584	{
585	$options = array();
586
587	- // loop through default options and get user defined options
588	foreach($this->_options as $option => $value)
589	{
590	$options[$option] = $this->get_option($option);
	@@ -599,11 +698,11 @@ class ImageWatermark
599	*/
600	public function activate_watermark()
601	{
602	- // record install time
603	add_option('df_watermark_installed', time(), NULL, 'no');
604	add_option('df_watermark_cpt_on', array('everywhere'), NULL, 'no');
605
606	- // loop through default options and add them into DB
607	foreach($this->_options as $option => $value)
608	{
609	add_option($option, $value, NULL, 'no');
	@@ -619,18 +718,18 @@ class ImageWatermark
619	*/
620	public function apply_watermark($data)
621	{
622	- // get settings for watermarking
623	$upload_dir = wp_upload_dir();
624	$watermark_on = $this->get_option('df_watermark_on');
625
626	- // loop through image sizes~~...~~
627	foreach($watermark_on as $image_size => $on)
628	{
629	if($on === 1)
630	{
631	switch($image_size)
632	{
633	- case '~~fullsize~~':
634	$filepath = $upload_dir['basedir'].DIRECTORY_SEPARATOR.$data['file'];
635	break;
636
	@@ -641,17 +740,17 @@ class ImageWatermark
641	}
642	else
643	{
644	- // early getaway
645	continue 2;
646	}
647	}
648
649	- // ~~...and~~ apply watermark
650	$this->do_watermark($filepath);
651	}
652	}
653
654	- // pass forward attachment metadata
655	return $data;
656	}
657
	@@ -664,10 +763,10 @@ class ImageWatermark
664	*/
665	public function do_watermark($filepath)
666	{
667	- // get image mime type
668	$mime_type = wp_check_filetype($filepath);
669	$mime_type = $mime_type['type'];
670	- // get watermark settings
671	$options = $this->get_options();
672
673	if($options['df_watermark_image']['plugin_off'] === 1)
	@@ -675,16 +774,16 @@ class ImageWatermark
675	return TRUE;
676	}
677
678	- // get image resource
679	$image = $this->get_image_resource($filepath, $mime_type);
680
681	if($options['df_watermark_type'] === 'image')
682	{
683	- // add watermark image to image
684	$this->add_watermark_image($image, $options);
685	}
686
687	- // save watermarked image
688	return $this->save_image_file($image, $mime_type, $filepath);
689	}
690
	@@ -698,7 +797,7 @@ class ImageWatermark
698	*/
699	private function add_watermark_image($image, array $opt)
700	{
701	- // get size and url of watermark
702	$size_type = $opt['df_watermark_image']['watermark_size_type'];
703	$url = wp_get_attachment_url($opt['df_watermark_image']['url']);
704	$file = pathinfo($url);
	@@ -724,12 +823,12 @@ class ImageWatermark
724	$img_width = imagesx($image);
725	$img_height = imagesy($image);
726
727	- if($size_type == 1) // custom
728	{
729	$w = $opt['df_watermark_image']['absolute_width'];
730	$h = $opt['df_watermark_image']['absolute_height'];
731	}
732	- elseif($size_type == 2) // scale
733	{
734	$size = $opt['df_watermark_image']['width'] / 100;
735	$ratio = (($img_width * $size) / $watermark_width);
	@@ -801,25 +900,31 @@ class ImageWatermark
801	}
802
803



804	private function imagecopymerge_alpha($dst_im, $src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct)
805	{
806	- // creating a cut resource
807	$cut = imagecreateTRUEcolor($src_w, $src_h);
808	- // copying relevant section from background to the cut resource
809	imagecopy($cut, $dst_im, 0, 0, $dst_x, $dst_y, $src_w, $src_h);
810	- // copying relevant section from watermark to the cut resource
811	imagecopy($cut, $src_im, 0, 0, $src_x, $src_y, $src_w, $src_h);
812	- // insert cut resource to destination image
813	imagecopymerge($dst_im, $cut, $dst_x, $dst_y, 0, 0, $src_w, $src_h, $pct);
814	}
815
816



817	private function resize($im, $path, $nWidth, $nHeight)
818	{
819	$imgInfo = getimagesize($path);
820	$newImg = imagecreateTRUEcolor($nWidth, $nHeight);
821
822	- // ~~Check~~ if this image is PNG or GIF, then set if ~~Transparent~~
823	if($imgInfo[2] == 1 \|\| $imgInfo[2] == 3)
824	{
825	imagealphablending($newImg, FALSE);


2	/*
3	Plugin Name: Image Watermark
4	Description: Image Watermark allows you to automatically watermark images uploaded to the WordPress Media Library.
5	+ Version: 1.0.2
6	Author: dFactory
7	Author URI: http://www.dfactory.eu/
8	Plugin URI: http://www.dfactory.eu/plugins/image-watermark/

30	class ImageWatermark
31	{
32	private $_messages = array();
33	+ private $_image_sizes = array();
34	private $_watermark_positions = array (
35	'x' => array('left', 'center', 'right'),
36	'y' => array('top', 'middle', 'bottom'),

61
62	public function __construct()
63	{
64	+ //register installer function
65	register_activation_hook(__FILE__, array(&$this, 'activate_watermark'));
66
67	//actions
68	add_action('plugins_loaded', array(&$this, 'load_textdomain'));
69	+ add_action('wp_loaded', array(&$this, 'load_image_sizes'));
70	+ add_action('admin_enqueue_scripts', array(&$this, 'admin_watermark_scripts_styles'));
71	+ add_action('wp_enqueue_scripts', array(&$this, 'front_watermark_scripts_styles'));
72	add_action('admin_menu', array(&$this, 'watermark_admin_menu'));
73	+
74	+ //filters
75	+ add_filter('plugin_row_meta', array(&$this, 'plugin_extend_links'), 10, 2);
76	+ add_filter('plugin_action_links', array(&$this, 'plugin_settings_link'), 10, 2);
77
78	+ //check if post_id is "-1", meaning we're uploading watermark image
79	if(!(array_key_exists('post_id', $_REQUEST) && $_REQUEST['post_id'] == -1))
80	{
81	+ $watermark_image = $this->get_option('df_watermark_image');
82	+
83	+ if(!($watermark_image['plugin_off'] === 0 && $watermark_image['url'] === 0))
84	+ {
85	+ add_filter('wp_handle_upload_prefilter', array(&$this, 'delay_upload_filter'), 10, 1);
86	+ }
87	}
88	}
89
90
91	+ /**
92	+ * Loads available image sizes
93	+ */
94	+ public function load_image_sizes()
95	+ {
96	+ $this->_image_sizes = get_intermediate_image_sizes();
97	+ $this->_image_sizes[] = 'full';
98	+
99	+ sort($this->_image_sizes, SORT_STRING);
100	+ }
101	+
102	+
103	+ /**
104	+ * Applies watermark everywhere or for specific post type
105	+ */
106	public function delay_upload_filter($value)
107	{
108	if(isset($_REQUEST['post_id']))

119	}
120
121
122	+ /**
123	+ * Loads textdomain
124	+ */
125	public function load_textdomain()
126	{
127	load_plugin_textdomain('image-watermark', FALSE, basename(dirname(__FILE__)).'/languages');
128	}
129
130
131	+ /**
132	+ * Add links to Support Forum
133	+ */
134	+ public function plugin_extend_links($links, $file)
135	+ {
136	+ if (!current_user_can('install_plugins'))
137	+ return $links;
138	+
139	+ $plugin = plugin_basename(__FILE__);
140	+
141	+ if ($file == $plugin)
142	+ {
143	+ return array_merge(
144	+ $links,
145	+ array(sprintf('<a href="http://www.dfactory.eu/support/forum/image-watermark/" target="_blank">%s</a>', __('Support', 'image-watermark')))
146	+ );
147	+ }
148	+
149	+ return $links;
150	+ }
151	+
152	+
153	+ /**
154	+ * Add links to Settings page
155	+ */
156	+ function plugin_settings_link($links, $file)
157	+ {
158	+ if (!is_admin() \|\| !current_user_can('manage_options'))
159	+ return $links;
160	+
161	+ static $plugin;
162	+
163	+ $plugin = plugin_basename(__FILE__);
164	+
165	+ if ($file == $plugin)
166	+ {
167	+ $settings_link = sprintf('<a href="%s">%s</a>', admin_url('options-general.php').'?page=watermark-options', __('Settings', 'image-watermark'));
168	+ array_unshift($links, $settings_link);
169	+ }
170	+
171	+ return $links;
172	+ }
173	+
174	+
175	+ /**
176	+ * Enqueues admin-side scripts and styles
177	+ */
178	+ public function admin_watermark_scripts_styles($page)
179	{
180	if($page !== 'settings_page_watermark-options')
181	return;

205	array(
206	'title' => __('Select watermark', 'image-watermark'),
207	'originalSize' => __('Original size', 'image-watermark'),
208	+ 'noSelectedImg' => __('Watermak has not been selected yet.', 'image-watermark'),
209	'frame' => 'select',
210	'button' => array('text' => __('Add watermark', 'image-watermark')),
211	'multiple' => FALSE,

218	}
219
220
221	+ /**
222	+ * Enqueues front-side script with 'no right click' and 'drag and drop' functions
223	+ */
224	+ public function front_watermark_scripts_styles()
225	+ {
226	+ $options = $this->get_option('df_image_protection');
227	+
228	+ if(($options['forlogged'] == 0 && is_user_logged_in()) \|\| ($options['draganddrop'] == 0 && $options['rightclick'] == 0))
229	+ {
230	+ return;
231	+ }
232	+
233	+ wp_enqueue_script('no-right-click', plugins_url('js/no-right-click.js', __FILE__));
234	+ wp_localize_script(
235	+ 'no-right-click',
236	+ 'norightclick_args',
237	+ array(
238	+ 'rightclick' => ($options['rightclick'] == 1 ? 'Y' : 'N'),
239	+ 'draganddrop' => ($options['draganddrop'] == 1 ? 'Y' : 'N')
240	+ )
241	+ );
242	+ }
243	+
244	+
245	+ /**
246	+ * Creates options page in menu
247	+ */
248	public function watermark_admin_menu()
249	{
250	$watermark_settings_page = add_options_page(

257	}
258
259
260	+ /**
261	+ * Gets custom post types with additional post and page types
262	+ */




















263	private function getCustomPostTypes()
264	{
265	return array_merge(array('post', 'page'), get_post_types(array('_builtin' => FALSE), 'names'));

271	*/
272	public function watermark_options_page()
273	{
274	+ if(!extension_loaded('gd'))
275	+ {
276	+ echo '
277	+ <div class="error">
278	+ <p>'.__('Image Watermark will not work properly without GD PHP extension.', 'image-watermark').'</p>
279	+ </div>';
280	+
281	+ return;
282	+ }
283	+
284	+ //saves changes
285	if(isset($_POST['submit']))
286	{
287	foreach($this->_options as $option => $value)

399	}
400	}
401
402	+ $watermark_image = $this->get_option('df_watermark_image');
403	+ $image_protection = $this->get_option('df_image_protection');


404
405	+ if($watermark_image['plugin_off'] === 0 && $watermark_image['url'] === 0)
406	{
407	+ echo '
408	+ <div class="error">
409	+ <p>'.__('Watermarks will not be applied when <b>watermark image is not set</b>.', 'image-watermark').'</p>
410	+ </div>';





411	}



412	?>
413	<div class="wrap">
414	<div id="icon-options-general" class="icon32"><br /></div>

505	</tr>
506	</table>
507	<hr />
508	+
509	+ <?php
510	+ if($watermark_image['url'] !== NULL && $watermark_image['url'] != 0)
511	+ {
512	+ $image = wp_get_attachment_image_src($watermark_image['url'], array(300, 300), FALSE);
513	+ $imageSelected = TRUE;
514	+ }
515	+ else $imageSelected = FALSE;
516	+ ?>
517	+
518	<h3><?php echo __('Watermark image','image-watermark'); ?></h3>
519	<p class="howto"><?php echo __('Configure your watermark image. Allowed file formats are: jpg, png, gif.','image-watermark'); ?></p>
520	<table id="watermark-image-table" class="form-table">

523	<td>
524	<input id="upload_image" type="hidden" name="df_watermark_image[url]" value="<?php echo (int)$watermark_image['url']; ?>" />
525	<input id="upload_image_button" type="button" class="button button-secondary" value="<?php echo __('Select image','image-watermark'); ?>" />
526	+ <input id="turn_off_image_button" type="button" class="button button-secondary" value="<?php echo __('Turn off image','image-watermark'); ?>" <?php if($imageSelected === FALSE) echo 'disabled="disabled"'; ?>/>
527	<p class="howto"><?php _e('You have to save changes after the selection or removal of the image.', 'image-watermark'); ?></p>
528	</td>
529	</tr>

533	<fieldset class="wr_width">
534	<legend class="screen-reader-text"><span><?php echo __('Watermark Preview', 'image-watermark'); ?></span></legend>
535	<div id="previewImg_imageDiv">
536	+ <?php if($imageSelected === TRUE) {
537	$image = wp_get_attachment_image_src($watermark_image['url'], array(300, 300), FALSE);
538	?>
539	<img id="previewImg_image" src="<? echo $image[0]; ?>" alt="" width="300" />
540	+ <?php } else { ?>
541	+ <img id="previewImg_image" src="" alt="" width="300" style="display: none;" />
542	+ <?php } ?>





543	</div>
544	+ <p id="previewImageInfo" class="howto">
545	+ <?php
546	+ if($imageSelected === FALSE)
547	+ {
548	+ _e('Watermak has not been selected yet.', 'image-watermark');
549	+ }
550	+ else
551	+ {
552	+ $imageFullSize = wp_get_attachment_image_src($watermark_image['url'], 'full', FALSE);
553	+ $imgSelectedInfo = getimagesize($imageFullSize[0]);
554	+ echo __('Original size', 'image-watermark').': <strong>'.$imgSelectedInfo[0].'</strong>px / <strong>'.$imgSelectedInfo[1].'</strong>px';
555	+ }
556	+ ?>
557	+ </p>
558	</fieldset>
559	</td>
560	</tr>

620	<td><input type="checkbox" <?php checked($image_protection['draganddrop'], 1, TRUE); ?> value="1" name="df_image_protection[draganddrop]"></td>
621	</tr>
622	<tr>
623	+ <th><?php echo __('Enable image protection for logged-in users also','image-watermark'); ?></th>
624	<td><input type="checkbox" <?php checked($image_protection['forlogged'], 1, TRUE); ?> value="1" name="df_image_protection[forlogged]"></td>
625	</tr>
626	</table>

683	{
684	$options = array();
685
686	+ //loop through default options and get user defined options
687	foreach($this->_options as $option => $value)
688	{
689	$options[$option] = $this->get_option($option);

698	*/
699	public function activate_watermark()
700	{
701	+ //record install time
702	add_option('df_watermark_installed', time(), NULL, 'no');
703	add_option('df_watermark_cpt_on', array('everywhere'), NULL, 'no');
704
705	+ //loop through default options and add them into DB
706	foreach($this->_options as $option => $value)
707	{
708	add_option($option, $value, NULL, 'no');

718	*/
719	public function apply_watermark($data)
720	{
721	+ //get settings for watermarking
722	$upload_dir = wp_upload_dir();
723	$watermark_on = $this->get_option('df_watermark_on');
724
725	+ //loop through image sizes
726	foreach($watermark_on as $image_size => $on)
727	{
728	if($on === 1)
729	{
730	switch($image_size)
731	{
732	+ case 'full':
733	$filepath = $upload_dir['basedir'].DIRECTORY_SEPARATOR.$data['file'];
734	break;
735

740	}
741	else
742	{
743	+ //early getaway
744	continue 2;
745	}
746	}
747
748	+ //apply watermark
749	$this->do_watermark($filepath);
750	}
751	}
752
753	+ //pass forward attachment metadata
754	return $data;
755	}
756

763	*/
764	public function do_watermark($filepath)
765	{
766	+ //get image mime type
767	$mime_type = wp_check_filetype($filepath);
768	$mime_type = $mime_type['type'];
769	+ //get watermark settings
770	$options = $this->get_options();
771
772	if($options['df_watermark_image']['plugin_off'] === 1)

774	return TRUE;
775	}
776
777	+ //get image resource
778	$image = $this->get_image_resource($filepath, $mime_type);
779
780	if($options['df_watermark_type'] === 'image')
781	{
782	+ //add watermark image to image
783	$this->add_watermark_image($image, $options);
784	}
785
786	+ //save watermarked image
787	return $this->save_image_file($image, $mime_type, $filepath);
788	}
789

797	*/
798	private function add_watermark_image($image, array $opt)
799	{
800	+ //get size and url of watermark
801	$size_type = $opt['df_watermark_image']['watermark_size_type'];
802	$url = wp_get_attachment_url($opt['df_watermark_image']['url']);
803	$file = pathinfo($url);

823	$img_width = imagesx($image);
824	$img_height = imagesy($image);
825
826	+ if($size_type == 1) //custom
827	{
828	$w = $opt['df_watermark_image']['absolute_width'];
829	$h = $opt['df_watermark_image']['absolute_height'];
830	}
831	+ elseif($size_type == 2) //scale
832	{
833	$size = $opt['df_watermark_image']['width'] / 100;
834	$ratio = (($img_width * $size) / $watermark_width);

900	}
901
902
903	+ /**
904	+ * ???
905	+ */
906	private function imagecopymerge_alpha($dst_im, $src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct)
907	{
908	+ //creating a cut resource
909	$cut = imagecreateTRUEcolor($src_w, $src_h);
910	+ //copying relevant section from background to the cut resource
911	imagecopy($cut, $dst_im, 0, 0, $dst_x, $dst_y, $src_w, $src_h);
912	+ //copying relevant section from watermark to the cut resource
913	imagecopy($cut, $src_im, 0, 0, $src_x, $src_y, $src_w, $src_h);
914	+ //insert cut resource to destination image
915	imagecopymerge($dst_im, $cut, $dst_x, $dst_y, 0, 0, $src_w, $src_h, $pct);
916	}
917
918
919	+ /**
920	+ * Resizes image
921	+ */
922	private function resize($im, $path, $nWidth, $nHeight)
923	{
924	$imgInfo = getimagesize($path);
925	$newImg = imagecreateTRUEcolor($nWidth, $nHeight);
926
927	+ //check if this image is PNG or GIF, then set if transparent
928	if($imgInfo[2] == 1 \|\| $imgInfo[2] == 3)
929	{
930	imagealphablending($newImg, FALSE);

js/no-right-click.js CHANGED Viewed

	@@ -211,4 +211,8 @@ if (document.addEventListener) {
211	}
212	df_nrc_action('load');
213	};
214	- }


211	}
212	df_nrc_action('load');
213	};
214	+ }
215	+
216	+
217	+ var df_nrc_extra = norightclick_args.rightclick;
218	+ var df_nrc_drag = norightclick_args.draganddrop;

js/upload-manager.js CHANGED Viewed

	@@ -21,25 +21,24 @@ jQuery(document).ready(function($) {
21	var attachment = this.frame.state().get('selection').first();
22	$('#upload_image').val(attachment.attributes.id);
23
24	- if($('~~span~~#previewImg_image').~~length~~ > 0)
25	{
26	- $('~~span~~#previewImg_image').replaceWith('<img id="previewImg_image" src="'+attachment.attributes.url+'" alt="" width="300" />');
27	}
28	else
29	{
30	- $('img#previewImg_image').attr('src', attachment.attributes.url);
31	}
32



33	var img = new Image();
34	img.src = attachment.attributes.url;
35
36	- $('div#previewImg_imageDiv img#previewImg_image').show();
37	- $('div#previewImg_imageDiv span#previewImg_image_hidden').hide();
38	- $('p#previewImg_imageDivSize').show();
39	-
40	img.onload = function()
41	{
42	- $('#~~previewImg_imageDivSize~~').html(upload_manager_args.originalSize+': <strong>'+this.width+'</strong>px / <strong>'+this.height+'</strong>px');
43	}
44	},
45	init: function() {
	@@ -53,9 +52,9 @@ jQuery(document).ready(function($) {
53	watermarkFileUpload.init();
54
55	$(document).on('click', '#turn_off_image_button', function(event) {

56	$('#upload_image').val(0);
57	- $('div#previewImg_imageDiv img#previewImg_image').hide();
58	- $('~~div~~#~~previewImg_imageDiv span#previewImg_image_hidden~~').~~show~~();
59	- $('p#previewImg_imageDivSize').hide();
60	});
61	});


21	var attachment = this.frame.state().get('selection').first();
22	$('#upload_image').val(attachment.attributes.id);
23
24	+ if($('div#previewImg_imageDiv img#previewImg_image').attr('src') !== '')
25	{
26	+ $('div#previewImg_imageDiv img#previewImg_image').replaceWith('<img id="previewImg_image" src="'+attachment.attributes.url+'" alt="" width="300" />');
27	}
28	else
29	{
30	+ $('div#previewImg_imageDiv img#previewImg_image').attr('src', attachment.attributes.url);
31	}
32
33	+ $('#turn_off_image_button').removeAttr('disabled');
34	+ $('div#previewImg_imageDiv img#previewImg_image').show();
35	+
36	var img = new Image();
37	img.src = attachment.attributes.url;
38




39	img.onload = function()
40	{
41	+ $('p#previewImageInfo').html(upload_manager_args.originalSize+': <strong>'+this.width+'</strong>px / <strong>'+this.height+'</strong>px');
42	}
43	},
44	init: function() {

52	watermarkFileUpload.init();
53
54	$(document).on('click', '#turn_off_image_button', function(event) {
55	+ $(this).attr('disabled', 'true');
56	$('#upload_image').val(0);
57	+ $('div#previewImg_imageDiv img#previewImg_image').attr('src', '').hide();
58	+ $('p#previewImageInfo').html(upload_manager_args.noSelectedImg);

59	});
60	});

languages/image-watermark-pl_PL.mo CHANGED Viewed

Binary file

languages/image-watermark-pl_PL.po CHANGED Viewed

	@@ -2,8 +2,8 @@ msgid ""
2	msgstr ""
3	"Project-Id-Version: WordPress Watermark\n"
4	"Report-Msgid-Bugs-To: \n"
5	- "POT-Creation-Date: 2013-04-06 14:34+0100\n"
6	- "PO-Revision-Date: 2013-04-06 14:34+0100\n"
7	"Last-Translator: Bartosz Arendt <info@digitalfactory.pl>\n"
8	"Language-Team: Digital Factory <info@digitalfactory.pl>\n"
9	"Language: pl_PL\n"
	@@ -23,78 +23,96 @@ msgstr ""
23	"Przykro nam, ale ta wtyczka wymaga PHP w wersji co najmniej 5.0 WordPressa w "
24	"wersji 3.5 lub wyższej.."
25
26	- #: ../image-watermark.php:~~132~~








27	msgid "Select watermark"
28	msgstr "Wybierz znak wodny"
29
30	- #: ../image-watermark.php:~~133~~
31	msgid "Original size"
32	msgstr "Rozmiar oryginalny"
33
34	- #: ../image-watermark.php:~~135~~




35	msgid "Add watermark"
36	msgstr "Dodaj znak wodny"
37
38	- #: ../image-watermark.php:~~150~~
39	msgid "Image Watermark Options"
40	msgstr "Ustawienia znaku wodnego"
41
42	- #: ../image-watermark.php:~~151~~
43	msgid "Watermark"
44	msgstr "Znak wodny"
45
46	- #: ../image-watermark.php:~~313~~
47	msgid "Image Watermark will not work properly without GD PHP extension."
48	msgstr ""
49	"Znak wodny nie może funkcjonować bez zainstalowanego rozszerzenia GD PHP."
50
51	- #: ../image-watermark.php:~~334~~






52	msgid "Image Watermark Settings"
53	msgstr "Ustawienia znaku wodnego"
54
55	- #: ../image-watermark.php:~~338~~
56	msgid "General settings"
57	msgstr "Ustawienia ogólne"
58
59	- #: ../image-watermark.php:~~341~~
60	msgid "Enable watermark"
61	msgstr "Włącz znak wodny"
62
63	- #: ../image-watermark.php:~~344~~ ../image-watermark.php:~~466~~
64	- #: ../image-watermark.php:~~483~~ ../image-watermark.php:~~495~~
65	msgid "Width"
66	msgstr "Szerokość"
67
68	- #: ../image-watermark.php:~~346~~
69	msgid "on"
70	msgstr "włączony"
71
72	- #: ../image-watermark.php:~~348~~
73	msgid "off"
74	msgstr "wyłączony"
75
76	- #: ../image-watermark.php:~~351~~
77	msgid "Enable or disable watermark for uploaded images."
78	msgstr "Włącz lub wyłącz dodawanie znaku wodnego do wgrywanych obrazków."
79
80	- #: ../image-watermark.php:~~358~~ ../image-watermark.php:~~361~~
81	- #: ../image-watermark.php:~~370~~
82	msgid "Enable watermark for"
83	msgstr "Dodawaj znak wodny do"
84
85	- #: ../image-watermark.php:~~369~~
86	msgid "Check image sizes on which watermark should appear."
87	msgstr "Zaznacz wielkości obrazków dla których ma być dodawany znak wodny."
88
89	- #: ../image-watermark.php:~~376~~
90	msgid "everywhere"
91	msgstr "wszędzie"
92
93	- #: ../image-watermark.php:~~377~~
94	msgid "on selected post types only"
95	msgstr "na wybranych typach wpisów"
96
97	- #: ../image-watermark.php:~~385~~
98	msgid ""
99	"Check custom post types on which watermark should be applied to uploaded "
100	"images."
	@@ -102,105 +120,101 @@ msgstr ""
102	"Zaznacz własne typy wpisów w których znak wodny będzie dodawany do "
103	"wgrywanych obrazków."
104
105	- #: ../image-watermark.php:~~391~~
106	msgid "Watermark position"
107	msgstr "Pozycja znaku wodnego"
108
109	- #: ../image-watermark.php:~~394~~ ../image-watermark.php:~~397~~
110	msgid "Watermark alignment"
111	msgstr "Wyrównanie znaku wodnego"
112
113	- #: ../image-watermark.php:~~410~~
114	msgid "Choose the position of watermark image."
115	msgstr "Wybierz pozycję znaku wodnego na obrazkach"
116
117	- #: ../image-watermark.php:~~415~~ ../image-watermark.php:~~418~~
118	msgid "Watermark offset"
119	msgstr "Korekcja pozycji"
120
121	- #: ../image-watermark.php:~~419~~ ../image-watermark.php:~~484~~
122	msgid "x:"
123	msgstr "x:"
124
125	- #: ../image-watermark.php:~~419~~ ../image-watermark.php:~~421~~
126	- #: ../image-watermark.php:~~484~~ ../image-watermark.php:~~486~~
127	msgid "px"
128	msgstr "pikseli"
129
130	- #: ../image-watermark.php:~~421~~ ../image-watermark.php:~~486~~
131	msgid "y:"
132	msgstr "y:"
133
134	- #: ../image-watermark.php:~~427~~ ../image-watermark.php:~~431~~
135	msgid "Watermark image"
136	msgstr "Obrazek znaku wodnego"
137
138	- #: ../image-watermark.php:~~428~~
139	msgid ""
140	"Configure your watermark image. Allowed file formats are: jpg, png, gif."
141	msgstr ""
142	"Skonfiguruj obrazek znaku wodnego. Dozwolone formaty plików to: jpg, png i "
143	"gif."
144
145	- #: ../image-watermark.php:~~434~~
146	msgid "Select image"
147	msgstr "Wybierz obrazek"
148
149	- #: ../image-watermark.php:~~435~~
150	msgid "Turn off image"
151	msgstr "Wyłącz obrazek"
152
153	- #: ../image-watermark.php:~~436~~
154	msgid "You have to save changes after the selection or removal of the image."
155	msgstr "Po zapisaniu zmian lub wybraniu obrazka powienieneś zapisać zmiany."
156
157	- #: ../image-watermark.php:~~440~~
158	msgid "Watermark preview"
159	msgstr "Podgląd obrazka"
160
161	- #: ../image-watermark.php:~~443~~
162	msgid "Watermark Preview"
163	msgstr "Podgląd obrazka"
164
165	- #: ../image-watermark.php:~~451 ../image-watermark.php:455~~
166	- msgid "Watermak has not been selected yet."
167	- msgstr "Znak wodny nie został jeszcze wybrany."
168	-
169	- #: ../image-watermark.php:463
170	msgid "Watermark size"
171	msgstr "Wielkość znaku wodnego"
172
173	- #: ../image-watermark.php:~~468~~
174	msgid "original"
175	msgstr "oryginalna"
176
177	- #: ../image-watermark.php:~~470~~
178	msgid "custom"
179	msgstr "własna"
180
181	- #: ../image-watermark.php:~~472~~
182	msgid "scaled"
183	msgstr "skalowana"
184
185	- #: ../image-watermark.php:~~475~~
186	msgid "Select method of aplying watermark size."
187	msgstr "Wybierz sposób określania wielkości znaku wodnego."
188
189	- #: ../image-watermark.php:~~480~~
190	msgid "Watermark custom size"
191	msgstr "Własna wielkość"
192
193	- #: ../image-watermark.php:~~488~~
194	msgid "Those dimensions will be used if \"custom\" method is selected above."
195	msgstr ""
196	"Te wymiary zostaną zastosowane, jeśli wybrałeś \"własną\" wielkość znaku "
197	"wodnego. "
198
199	- #: ../image-watermark.php:~~492~~
200	msgid "Scale of watermark in relation to image width"
201	msgstr "Wielkość znaku wodnego w stosunku do szerokości obrazków"
202
203	- #: ../image-watermark.php:~~498~~
204	msgid ""
205	"This value will be used if \"scaled\" method if selected above. <br />Enter "
206	"a number ranging from 0 to 100. 100 makes width of watermark image equal to "
	@@ -211,11 +225,11 @@ msgstr ""
211	"że wielkość znaku wodnego będzie równa wielkości obrazka, do którego jest "
212	"dodawany."
213
214	- #: ../image-watermark.php:~~502~~
215	msgid "Watermark transparency / opacity"
216	msgstr "Przezroczystość znaku wodnego"
217
218	- #: ../image-watermark.php:~~507~~
219	msgid ""
220	"Enter a number ranging from 0 to 100. 0 makes watermark image completely "
221	"transparent, 100 shows it as is."
	@@ -223,68 +237,68 @@ msgstr ""
223	"Wpisz liczbę z zakresu od 0 do 100. Wpisanie 0 spowoduje, że znak wodny "
224	"będzie całkowicie przezroczysty, 100 że widoczny taki jak jest."
225
226	- #: ../image-watermark.php:~~513~~
227	msgid "Image protection"
228	msgstr "Ochrona obrazków"
229
230	- #: ../image-watermark.php:~~516~~
231	msgid "Disable right mouse click on images"
232	msgstr "Wyłącz możliwość kliknięcia prawym przyciskiem myszy na obrazku"
233
234	- #: ../image-watermark.php:~~520~~
235	msgid "Prevent drag and drop"
236	msgstr "Wyłącz możliwość przeciągania i upuszczania obrazków"
237
238	- #: ../image-watermark.php:~~524~~
239	- msgid "~~Disable~~ image protection for logged-in users"
240	- msgstr "~~Wyłącz~~ ochronę zdjęć dla zalogowanych użytkowników"
241
242	- #: ../image-watermark.php:~~529~~
243	msgid "Save Changes"
244	msgstr "Zapisz zmiany"
245
246	- #: ../image-watermark.php:~~535~~
247	msgid "Image Watermark"
248	msgstr "Znak wodny"
249
250	- #: ../image-watermark.php:~~537~~
251	msgid "Need support?"
252	msgstr "Potrzebujesz pomocy?"
253
254	- #: ../image-watermark.php:~~538~~
255	msgid ""
256	"If you are having problems with this plugin, please talk about them in the"
257	msgstr "Jeśli masz jakiekolwiek problemy z tą wtyczką, powiedz o tym na"
258
259	- #: ../image-watermark.php:~~538~~
260	msgid "Support forum"
261	msgstr "Forum pomocy"
262
263	- #: ../image-watermark.php:~~540~~
264	msgid "Do you like this plugin?"
265	msgstr "Lubisz tę wtyczkę?"
266
267	- #: ../image-watermark.php:~~541~~
268	msgid "Rate it 5 on WordPress.org"
269	msgstr "Oceń ją na 5 na WordPress.org"
270
271	- #: ../image-watermark.php:~~542~~
272	msgid "Blog about it & link to the"
273	msgstr "Napisz o niej i dodaj link do"
274
275	- #: ../image-watermark.php:~~542~~
276	msgid "plugin page"
277	msgstr "strony wtyczki"
278
279	- #: ../image-watermark.php:~~543~~
280	msgid "Check out our other"
281	msgstr "Sprawdź inne"
282
283	- #: ../image-watermark.php:~~543~~
284	msgid "WordPress plugins"
285	msgstr "wtyczki do WordPressa"
286
287	- #: ../image-watermark.php:~~547~~
288	msgid "Created by"
289	msgstr "Stworzone przez"
290
	@@ -308,6 +322,3 @@ msgstr "Stworzone przez"
308	#~ "Podaj adres URL, wgraj obrazek lub wybierz obrazek z biblioteki mediów."
309	#~ "<br /><b>Ważne:</b> Dodając obrazek musisz zaznaczyć <b>Adres URL pliku</"
310	#~ "b>."
311	-
312	- #~ msgid "Settings"
313	- #~ msgstr "Ustawienia"


2	msgstr ""
3	"Project-Id-Version: WordPress Watermark\n"
4	"Report-Msgid-Bugs-To: \n"
5	+ "POT-Creation-Date: 2013-04-16 18:16+0100\n"
6	+ "PO-Revision-Date: 2013-04-16 18:16+0100\n"
7	"Last-Translator: Bartosz Arendt <info@digitalfactory.pl>\n"
8	"Language-Team: Digital Factory <info@digitalfactory.pl>\n"
9	"Language: pl_PL\n"

23	"Przykro nam, ale ta wtyczka wymaga PHP w wersji co najmniej 5.0 WordPressa w "
24	"wersji 3.5 lub wyższej.."
25
26	+ #: ../image-watermark.php:145
27	+ msgid "Support"
28	+ msgstr "Forum pomocy"
29	+
30	+ #: ../image-watermark.php:167
31	+ msgid "Settings"
32	+ msgstr "Ustawienia"
33	+
34	+ #: ../image-watermark.php:206
35	msgid "Select watermark"
36	msgstr "Wybierz znak wodny"
37
38	+ #: ../image-watermark.php:207 ../image-watermark.php:554
39	msgid "Original size"
40	msgstr "Rozmiar oryginalny"
41
42	+ #: ../image-watermark.php:208 ../image-watermark.php:548
43	+ msgid "Watermak has not been selected yet."
44	+ msgstr "Znak wodny nie został jeszcze wybrany."
45	+
46	+ #: ../image-watermark.php:210
47	msgid "Add watermark"
48	msgstr "Dodaj znak wodny"
49
50	+ #: ../image-watermark.php:251
51	msgid "Image Watermark Options"
52	msgstr "Ustawienia znaku wodnego"
53
54	+ #: ../image-watermark.php:252
55	msgid "Watermark"
56	msgstr "Znak wodny"
57
58	+ #: ../image-watermark.php:278
59	msgid "Image Watermark will not work properly without GD PHP extension."
60	msgstr ""
61	"Znak wodny nie może funkcjonować bez zainstalowanego rozszerzenia GD PHP."
62
63	+ #: ../image-watermark.php:409
64	+ msgid "Watermarks will not be applied when <b>watermark image is not set</b>."
65	+ msgstr ""
66	+ "Znak wodny nie zostanie dodany ponieważ <b>nie wybrano obrazka dla znaku "
67	+ "wodnego</b>."
68	+
69	+ #: ../image-watermark.php:415
70	msgid "Image Watermark Settings"
71	msgstr "Ustawienia znaku wodnego"
72
73	+ #: ../image-watermark.php:419
74	msgid "General settings"
75	msgstr "Ustawienia ogólne"
76
77	+ #: ../image-watermark.php:422
78	msgid "Enable watermark"
79	msgstr "Włącz znak wodny"
80
81	+ #: ../image-watermark.php:425 ../image-watermark.php:565
82	+ #: ../image-watermark.php:582 ../image-watermark.php:594
83	msgid "Width"
84	msgstr "Szerokość"
85
86	+ #: ../image-watermark.php:427
87	msgid "on"
88	msgstr "włączony"
89
90	+ #: ../image-watermark.php:429
91	msgid "off"
92	msgstr "wyłączony"
93
94	+ #: ../image-watermark.php:432
95	msgid "Enable or disable watermark for uploaded images."
96	msgstr "Włącz lub wyłącz dodawanie znaku wodnego do wgrywanych obrazków."
97
98	+ #: ../image-watermark.php:439 ../image-watermark.php:442
99	+ #: ../image-watermark.php:451
100	msgid "Enable watermark for"
101	msgstr "Dodawaj znak wodny do"
102
103	+ #: ../image-watermark.php:450
104	msgid "Check image sizes on which watermark should appear."
105	msgstr "Zaznacz wielkości obrazków dla których ma być dodawany znak wodny."
106
107	+ #: ../image-watermark.php:457
108	msgid "everywhere"
109	msgstr "wszędzie"
110
111	+ #: ../image-watermark.php:458
112	msgid "on selected post types only"
113	msgstr "na wybranych typach wpisów"
114
115	+ #: ../image-watermark.php:466
116	msgid ""
117	"Check custom post types on which watermark should be applied to uploaded "
118	"images."

120	"Zaznacz własne typy wpisów w których znak wodny będzie dodawany do "
121	"wgrywanych obrazków."
122
123	+ #: ../image-watermark.php:472
124	msgid "Watermark position"
125	msgstr "Pozycja znaku wodnego"
126
127	+ #: ../image-watermark.php:475 ../image-watermark.php:478
128	msgid "Watermark alignment"
129	msgstr "Wyrównanie znaku wodnego"
130
131	+ #: ../image-watermark.php:491
132	msgid "Choose the position of watermark image."
133	msgstr "Wybierz pozycję znaku wodnego na obrazkach"
134
135	+ #: ../image-watermark.php:496 ../image-watermark.php:499
136	msgid "Watermark offset"
137	msgstr "Korekcja pozycji"
138
139	+ #: ../image-watermark.php:500 ../image-watermark.php:583
140	msgid "x:"
141	msgstr "x:"
142
143	+ #: ../image-watermark.php:500 ../image-watermark.php:502
144	+ #: ../image-watermark.php:583 ../image-watermark.php:585
145	msgid "px"
146	msgstr "pikseli"
147
148	+ #: ../image-watermark.php:502 ../image-watermark.php:585
149	msgid "y:"
150	msgstr "y:"
151
152	+ #: ../image-watermark.php:518 ../image-watermark.php:522
153	msgid "Watermark image"
154	msgstr "Obrazek znaku wodnego"
155
156	+ #: ../image-watermark.php:519
157	msgid ""
158	"Configure your watermark image. Allowed file formats are: jpg, png, gif."
159	msgstr ""
160	"Skonfiguruj obrazek znaku wodnego. Dozwolone formaty plików to: jpg, png i "
161	"gif."
162
163	+ #: ../image-watermark.php:525
164	msgid "Select image"
165	msgstr "Wybierz obrazek"
166
167	+ #: ../image-watermark.php:526
168	msgid "Turn off image"
169	msgstr "Wyłącz obrazek"
170
171	+ #: ../image-watermark.php:527
172	msgid "You have to save changes after the selection or removal of the image."
173	msgstr "Po zapisaniu zmian lub wybraniu obrazka powienieneś zapisać zmiany."
174
175	+ #: ../image-watermark.php:531
176	msgid "Watermark preview"
177	msgstr "Podgląd obrazka"
178
179	+ #: ../image-watermark.php:534
180	msgid "Watermark Preview"
181	msgstr "Podgląd obrazka"
182
183	+ #: ../image-watermark.php:562




184	msgid "Watermark size"
185	msgstr "Wielkość znaku wodnego"
186
187	+ #: ../image-watermark.php:567
188	msgid "original"
189	msgstr "oryginalna"
190
191	+ #: ../image-watermark.php:569
192	msgid "custom"
193	msgstr "własna"
194
195	+ #: ../image-watermark.php:571
196	msgid "scaled"
197	msgstr "skalowana"
198
199	+ #: ../image-watermark.php:574
200	msgid "Select method of aplying watermark size."
201	msgstr "Wybierz sposób określania wielkości znaku wodnego."
202
203	+ #: ../image-watermark.php:579
204	msgid "Watermark custom size"
205	msgstr "Własna wielkość"
206
207	+ #: ../image-watermark.php:587
208	msgid "Those dimensions will be used if \"custom\" method is selected above."
209	msgstr ""
210	"Te wymiary zostaną zastosowane, jeśli wybrałeś \"własną\" wielkość znaku "
211	"wodnego. "
212
213	+ #: ../image-watermark.php:591
214	msgid "Scale of watermark in relation to image width"
215	msgstr "Wielkość znaku wodnego w stosunku do szerokości obrazków"
216
217	+ #: ../image-watermark.php:597
218	msgid ""
219	"This value will be used if \"scaled\" method if selected above. <br />Enter "
220	"a number ranging from 0 to 100. 100 makes width of watermark image equal to "

225	"że wielkość znaku wodnego będzie równa wielkości obrazka, do którego jest "
226	"dodawany."
227
228	+ #: ../image-watermark.php:601
229	msgid "Watermark transparency / opacity"
230	msgstr "Przezroczystość znaku wodnego"
231
232	+ #: ../image-watermark.php:606
233	msgid ""
234	"Enter a number ranging from 0 to 100. 0 makes watermark image completely "
235	"transparent, 100 shows it as is."

237	"Wpisz liczbę z zakresu od 0 do 100. Wpisanie 0 spowoduje, że znak wodny "
238	"będzie całkowicie przezroczysty, 100 że widoczny taki jak jest."
239
240	+ #: ../image-watermark.php:612
241	msgid "Image protection"
242	msgstr "Ochrona obrazków"
243
244	+ #: ../image-watermark.php:615
245	msgid "Disable right mouse click on images"
246	msgstr "Wyłącz możliwość kliknięcia prawym przyciskiem myszy na obrazku"
247
248	+ #: ../image-watermark.php:619
249	msgid "Prevent drag and drop"
250	msgstr "Wyłącz możliwość przeciągania i upuszczania obrazków"
251
252	+ #: ../image-watermark.php:623
253	+ msgid "Enable image protection for logged-in users also"
254	+ msgstr "Włącz ochronę zdjęć także dla zalogowanych użytkowników"
255
256	+ #: ../image-watermark.php:628
257	msgid "Save Changes"
258	msgstr "Zapisz zmiany"
259
260	+ #: ../image-watermark.php:634
261	msgid "Image Watermark"
262	msgstr "Znak wodny"
263
264	+ #: ../image-watermark.php:636
265	msgid "Need support?"
266	msgstr "Potrzebujesz pomocy?"
267
268	+ #: ../image-watermark.php:637
269	msgid ""
270	"If you are having problems with this plugin, please talk about them in the"
271	msgstr "Jeśli masz jakiekolwiek problemy z tą wtyczką, powiedz o tym na"
272
273	+ #: ../image-watermark.php:637
274	msgid "Support forum"
275	msgstr "Forum pomocy"
276
277	+ #: ../image-watermark.php:639
278	msgid "Do you like this plugin?"
279	msgstr "Lubisz tę wtyczkę?"
280
281	+ #: ../image-watermark.php:640
282	msgid "Rate it 5 on WordPress.org"
283	msgstr "Oceń ją na 5 na WordPress.org"
284
285	+ #: ../image-watermark.php:641
286	msgid "Blog about it & link to the"
287	msgstr "Napisz o niej i dodaj link do"
288
289	+ #: ../image-watermark.php:641
290	msgid "plugin page"
291	msgstr "strony wtyczki"
292
293	+ #: ../image-watermark.php:642
294	msgid "Check out our other"
295	msgstr "Sprawdź inne"
296
297	+ #: ../image-watermark.php:642
298	msgid "WordPress plugins"
299	msgstr "wtyczki do WordPressa"
300
301	+ #: ../image-watermark.php:646
302	msgid "Created by"
303	msgstr "Stworzone przez"
304

322	#~ "Podaj adres URL, wgraj obrazek lub wybierz obrazek z biblioteki mediów."
323	#~ "<br /><b>Ważne:</b> Dodając obrazek musisz zaznaczyć <b>Adres URL pliku</"
324	#~ "b>."

languages/image-watermark.pot CHANGED Viewed

	@@ -1,8 +1,8 @@
1	msgid ""
2	msgstr ""
3	"Project-Id-Version: WordPress Watermark\n"
4	- "POT-Creation-Date: 2013-04-06 14:33+0100\n"
5	- "PO-Revision-Date: 2013-04-06 14:33+0100\n"
6	"Last-Translator: Bartosz Arendt <info@digitalfactory.pl>\n"
7	"Language-Team: dFactory <info@dfactory.pl>\n"
8	"Language: English\n"
	@@ -20,254 +20,266 @@ msgid ""
20	"Sorry, Image Watermark plugin requires at least PHP 5.0 and WP 3.5 or higher."
21	msgstr ""
22
23	- #: ../image-watermark.php:~~132~~








24	msgid "Select watermark"
25	msgstr ""
26
27	- #: ../image-watermark.php:~~133~~
28	msgid "Original size"
29	msgstr ""
30
31	- #: ../image-watermark.php:~~135~~




32	msgid "Add watermark"
33	msgstr ""
34
35	- #: ../image-watermark.php:~~150~~
36	msgid "Image Watermark Options"
37	msgstr ""
38
39	- #: ../image-watermark.php:~~151~~
40	msgid "Watermark"
41	msgstr ""
42
43	- #: ../image-watermark.php:~~313~~
44	msgid "Image Watermark will not work properly without GD PHP extension."
45	msgstr ""
46
47	- #: ../image-watermark.php:~~334~~




48	msgid "Image Watermark Settings"
49	msgstr ""
50
51	- #: ../image-watermark.php:~~338~~
52	msgid "General settings"
53	msgstr ""
54
55	- #: ../image-watermark.php:~~341~~
56	msgid "Enable watermark"
57	msgstr ""
58
59	- #: ../image-watermark.php:~~344~~ ../image-watermark.php:~~466~~
60	- #: ../image-watermark.php:~~483~~ ../image-watermark.php:~~495~~
61	msgid "Width"
62	msgstr ""
63
64	- #: ../image-watermark.php:~~346~~
65	msgid "on"
66	msgstr ""
67
68	- #: ../image-watermark.php:~~348~~
69	msgid "off"
70	msgstr ""
71
72	- #: ../image-watermark.php:~~351~~
73	msgid "Enable or disable watermark for uploaded images."
74	msgstr ""
75
76	- #: ../image-watermark.php:~~358~~ ../image-watermark.php:~~361~~
77	- #: ../image-watermark.php:~~370~~
78	msgid "Enable watermark for"
79	msgstr ""
80
81	- #: ../image-watermark.php:~~369~~
82	msgid "Check image sizes on which watermark should appear."
83	msgstr ""
84
85	- #: ../image-watermark.php:~~376~~
86	msgid "everywhere"
87	msgstr ""
88
89	- #: ../image-watermark.php:~~377~~
90	msgid "on selected post types only"
91	msgstr ""
92
93	- #: ../image-watermark.php:~~385~~
94	msgid ""
95	"Check custom post types on which watermark should be applied to uploaded "
96	"images."
97	msgstr ""
98
99	- #: ../image-watermark.php:~~391~~
100	msgid "Watermark position"
101	msgstr ""
102
103	- #: ../image-watermark.php:~~394~~ ../image-watermark.php:~~397~~
104	msgid "Watermark alignment"
105	msgstr ""
106
107	- #: ../image-watermark.php:~~410~~
108	msgid "Choose the position of watermark image."
109	msgstr ""
110
111	- #: ../image-watermark.php:~~415~~ ../image-watermark.php:~~418~~
112	msgid "Watermark offset"
113	msgstr ""
114
115	- #: ../image-watermark.php:~~419~~ ../image-watermark.php:~~484~~
116	msgid "x:"
117	msgstr ""
118
119	- #: ../image-watermark.php:~~419~~ ../image-watermark.php:~~421~~
120	- #: ../image-watermark.php:~~484~~ ../image-watermark.php:~~486~~
121	msgid "px"
122	msgstr ""
123
124	- #: ../image-watermark.php:~~421~~ ../image-watermark.php:~~486~~
125	msgid "y:"
126	msgstr ""
127
128	- #: ../image-watermark.php:~~427~~ ../image-watermark.php:~~431~~
129	msgid "Watermark image"
130	msgstr ""
131
132	- #: ../image-watermark.php:~~428~~
133	msgid ""
134	"Configure your watermark image. Allowed file formats are: jpg, png, gif."
135	msgstr ""
136
137	- #: ../image-watermark.php:~~434~~
138	msgid "Select image"
139	msgstr ""
140
141	- #: ../image-watermark.php:~~435~~
142	msgid "Turn off image"
143	msgstr ""
144
145	- #: ../image-watermark.php:~~436~~
146	msgid "You have to save changes after the selection or removal of the image."
147	msgstr ""
148
149	- #: ../image-watermark.php:~~440~~
150	msgid "Watermark preview"
151	msgstr ""
152
153	- #: ../image-watermark.php:~~443~~
154	msgid "Watermark Preview"
155	msgstr ""
156
157	- #: ../image-watermark.php:~~451 ../image-watermark.php:455~~
158	- msgid "Watermak has not been selected yet."
159	- msgstr ""
160	-
161	- #: ../image-watermark.php:463
162	msgid "Watermark size"
163	msgstr ""
164
165	- #: ../image-watermark.php:~~468~~
166	msgid "original"
167	msgstr ""
168
169	- #: ../image-watermark.php:~~470~~
170	msgid "custom"
171	msgstr ""
172
173	- #: ../image-watermark.php:~~472~~
174	msgid "scaled"
175	msgstr ""
176
177	- #: ../image-watermark.php:~~475~~
178	msgid "Select method of aplying watermark size."
179	msgstr ""
180
181	- #: ../image-watermark.php:~~480~~
182	msgid "Watermark custom size"
183	msgstr ""
184
185	- #: ../image-watermark.php:~~488~~
186	msgid "Those dimensions will be used if \"custom\" method is selected above."
187	msgstr ""
188
189	- #: ../image-watermark.php:~~492~~
190	msgid "Scale of watermark in relation to image width"
191	msgstr ""
192
193	- #: ../image-watermark.php:~~498~~
194	msgid ""
195	"This value will be used if \"scaled\" method if selected above. <br />Enter "
196	"a number ranging from 0 to 100. 100 makes width of watermark image equal to "
197	"width of the image it is applied to."
198	msgstr ""
199
200	- #: ../image-watermark.php:~~502~~
201	msgid "Watermark transparency / opacity"
202	msgstr ""
203
204	- #: ../image-watermark.php:~~507~~
205	msgid ""
206	"Enter a number ranging from 0 to 100. 0 makes watermark image completely "
207	"transparent, 100 shows it as is."
208	msgstr ""
209
210	- #: ../image-watermark.php:~~513~~
211	msgid "Image protection"
212	msgstr ""
213
214	- #: ../image-watermark.php:~~516~~
215	msgid "Disable right mouse click on images"
216	msgstr ""
217
218	- #: ../image-watermark.php:~~520~~
219	msgid "Prevent drag and drop"
220	msgstr ""
221
222	- #: ../image-watermark.php:~~524~~
223	- msgid "~~Disable~~ image protection for logged-in users"
224	msgstr ""
225
226	- #: ../image-watermark.php:~~529~~
227	msgid "Save Changes"
228	msgstr ""
229
230	- #: ../image-watermark.php:~~535~~
231	msgid "Image Watermark"
232	msgstr ""
233
234	- #: ../image-watermark.php:~~537~~
235	msgid "Need support?"
236	msgstr ""
237
238	- #: ../image-watermark.php:~~538~~
239	msgid ""
240	"If you are having problems with this plugin, please talk about them in the"
241	msgstr ""
242
243	- #: ../image-watermark.php:~~538~~
244	msgid "Support forum"
245	msgstr ""
246
247	- #: ../image-watermark.php:~~540~~
248	msgid "Do you like this plugin?"
249	msgstr ""
250
251	- #: ../image-watermark.php:~~541~~
252	msgid "Rate it 5 on WordPress.org"
253	msgstr ""
254
255	- #: ../image-watermark.php:~~542~~
256	msgid "Blog about it & link to the"
257	msgstr ""
258
259	- #: ../image-watermark.php:~~542~~
260	msgid "plugin page"
261	msgstr ""
262
263	- #: ../image-watermark.php:~~543~~
264	msgid "Check out our other"
265	msgstr ""
266
267	- #: ../image-watermark.php:~~543~~
268	msgid "WordPress plugins"
269	msgstr ""
270
271	- #: ../image-watermark.php:~~547~~
272	msgid "Created by"
273	msgstr ""


1	msgid ""
2	msgstr ""
3	"Project-Id-Version: WordPress Watermark\n"
4	+ "POT-Creation-Date: 2013-04-16 18:16+0100\n"
5	+ "PO-Revision-Date: 2013-04-16 18:16+0100\n"
6	"Last-Translator: Bartosz Arendt <info@digitalfactory.pl>\n"
7	"Language-Team: dFactory <info@dfactory.pl>\n"
8	"Language: English\n"

20	"Sorry, Image Watermark plugin requires at least PHP 5.0 and WP 3.5 or higher."
21	msgstr ""
22
23	+ #: ../image-watermark.php:145
24	+ msgid "Support"
25	+ msgstr ""
26	+
27	+ #: ../image-watermark.php:167
28	+ msgid "Settings"
29	+ msgstr ""
30	+
31	+ #: ../image-watermark.php:206
32	msgid "Select watermark"
33	msgstr ""
34
35	+ #: ../image-watermark.php:207 ../image-watermark.php:554
36	msgid "Original size"
37	msgstr ""
38
39	+ #: ../image-watermark.php:208 ../image-watermark.php:548
40	+ msgid "Watermak has not been selected yet."
41	+ msgstr ""
42	+
43	+ #: ../image-watermark.php:210
44	msgid "Add watermark"
45	msgstr ""
46
47	+ #: ../image-watermark.php:251
48	msgid "Image Watermark Options"
49	msgstr ""
50
51	+ #: ../image-watermark.php:252
52	msgid "Watermark"
53	msgstr ""
54
55	+ #: ../image-watermark.php:278
56	msgid "Image Watermark will not work properly without GD PHP extension."
57	msgstr ""
58
59	+ #: ../image-watermark.php:409
60	+ msgid "Watermarks will not be applied when <b>watermark image is not set</b>."
61	+ msgstr ""
62	+
63	+ #: ../image-watermark.php:415
64	msgid "Image Watermark Settings"
65	msgstr ""
66
67	+ #: ../image-watermark.php:419
68	msgid "General settings"
69	msgstr ""
70
71	+ #: ../image-watermark.php:422
72	msgid "Enable watermark"
73	msgstr ""
74
75	+ #: ../image-watermark.php:425 ../image-watermark.php:565
76	+ #: ../image-watermark.php:582 ../image-watermark.php:594
77	msgid "Width"
78	msgstr ""
79
80	+ #: ../image-watermark.php:427
81	msgid "on"
82	msgstr ""
83
84	+ #: ../image-watermark.php:429
85	msgid "off"
86	msgstr ""
87
88	+ #: ../image-watermark.php:432
89	msgid "Enable or disable watermark for uploaded images."
90	msgstr ""
91
92	+ #: ../image-watermark.php:439 ../image-watermark.php:442
93	+ #: ../image-watermark.php:451
94	msgid "Enable watermark for"
95	msgstr ""
96
97	+ #: ../image-watermark.php:450
98	msgid "Check image sizes on which watermark should appear."
99	msgstr ""
100
101	+ #: ../image-watermark.php:457
102	msgid "everywhere"
103	msgstr ""
104
105	+ #: ../image-watermark.php:458
106	msgid "on selected post types only"
107	msgstr ""
108
109	+ #: ../image-watermark.php:466
110	msgid ""
111	"Check custom post types on which watermark should be applied to uploaded "
112	"images."
113	msgstr ""
114
115	+ #: ../image-watermark.php:472
116	msgid "Watermark position"
117	msgstr ""
118
119	+ #: ../image-watermark.php:475 ../image-watermark.php:478
120	msgid "Watermark alignment"
121	msgstr ""
122
123	+ #: ../image-watermark.php:491
124	msgid "Choose the position of watermark image."
125	msgstr ""
126
127	+ #: ../image-watermark.php:496 ../image-watermark.php:499
128	msgid "Watermark offset"
129	msgstr ""
130
131	+ #: ../image-watermark.php:500 ../image-watermark.php:583
132	msgid "x:"
133	msgstr ""
134
135	+ #: ../image-watermark.php:500 ../image-watermark.php:502
136	+ #: ../image-watermark.php:583 ../image-watermark.php:585
137	msgid "px"
138	msgstr ""
139
140	+ #: ../image-watermark.php:502 ../image-watermark.php:585
141	msgid "y:"
142	msgstr ""
143
144	+ #: ../image-watermark.php:518 ../image-watermark.php:522
145	msgid "Watermark image"
146	msgstr ""
147
148	+ #: ../image-watermark.php:519
149	msgid ""
150	"Configure your watermark image. Allowed file formats are: jpg, png, gif."
151	msgstr ""
152
153	+ #: ../image-watermark.php:525
154	msgid "Select image"
155	msgstr ""
156
157	+ #: ../image-watermark.php:526
158	msgid "Turn off image"
159	msgstr ""
160
161	+ #: ../image-watermark.php:527
162	msgid "You have to save changes after the selection or removal of the image."
163	msgstr ""
164
165	+ #: ../image-watermark.php:531
166	msgid "Watermark preview"
167	msgstr ""
168
169	+ #: ../image-watermark.php:534
170	msgid "Watermark Preview"
171	msgstr ""
172
173	+ #: ../image-watermark.php:562




174	msgid "Watermark size"
175	msgstr ""
176
177	+ #: ../image-watermark.php:567
178	msgid "original"
179	msgstr ""
180
181	+ #: ../image-watermark.php:569
182	msgid "custom"
183	msgstr ""
184
185	+ #: ../image-watermark.php:571
186	msgid "scaled"
187	msgstr ""
188
189	+ #: ../image-watermark.php:574
190	msgid "Select method of aplying watermark size."
191	msgstr ""
192
193	+ #: ../image-watermark.php:579
194	msgid "Watermark custom size"
195	msgstr ""
196
197	+ #: ../image-watermark.php:587
198	msgid "Those dimensions will be used if \"custom\" method is selected above."
199	msgstr ""
200
201	+ #: ../image-watermark.php:591
202	msgid "Scale of watermark in relation to image width"
203	msgstr ""
204
205	+ #: ../image-watermark.php:597
206	msgid ""
207	"This value will be used if \"scaled\" method if selected above. <br />Enter "
208	"a number ranging from 0 to 100. 100 makes width of watermark image equal to "
209	"width of the image it is applied to."
210	msgstr ""
211
212	+ #: ../image-watermark.php:601
213	msgid "Watermark transparency / opacity"
214	msgstr ""
215
216	+ #: ../image-watermark.php:606
217	msgid ""
218	"Enter a number ranging from 0 to 100. 0 makes watermark image completely "
219	"transparent, 100 shows it as is."
220	msgstr ""
221
222	+ #: ../image-watermark.php:612
223	msgid "Image protection"
224	msgstr ""
225
226	+ #: ../image-watermark.php:615
227	msgid "Disable right mouse click on images"
228	msgstr ""
229
230	+ #: ../image-watermark.php:619
231	msgid "Prevent drag and drop"
232	msgstr ""
233
234	+ #: ../image-watermark.php:623
235	+ msgid "Enable image protection for logged-in users also"
236	msgstr ""
237
238	+ #: ../image-watermark.php:628
239	msgid "Save Changes"
240	msgstr ""
241
242	+ #: ../image-watermark.php:634
243	msgid "Image Watermark"
244	msgstr ""
245
246	+ #: ../image-watermark.php:636
247	msgid "Need support?"
248	msgstr ""
249
250	+ #: ../image-watermark.php:637
251	msgid ""
252	"If you are having problems with this plugin, please talk about them in the"
253	msgstr ""
254
255	+ #: ../image-watermark.php:637
256	msgid "Support forum"
257	msgstr ""
258
259	+ #: ../image-watermark.php:639
260	msgid "Do you like this plugin?"
261	msgstr ""
262
263	+ #: ../image-watermark.php:640
264	msgid "Rate it 5 on WordPress.org"
265	msgstr ""
266
267	+ #: ../image-watermark.php:641
268	msgid "Blog about it & link to the"
269	msgstr ""
270
271	+ #: ../image-watermark.php:641
272	msgid "plugin page"
273	msgstr ""
274
275	+ #: ../image-watermark.php:642
276	msgid "Check out our other"
277	msgstr ""
278
279	+ #: ../image-watermark.php:642
280	msgid "WordPress plugins"
281	msgstr ""
282
283	+ #: ../image-watermark.php:646
284	msgid "Created by"
285	msgstr ""

readme.txt CHANGED Viewed

	@@ -1,9 +1,10 @@
1	=== Image Watermark ===
2	Contributors: dfactory

3	Tags: image, images, picture, watermark, watermarking, protection, image protection, image security
4	Requires at least: 3.5
5	Tested up to: 3.5.1
6	- Stable tag: 1.0.1
7	License: MIT License
8	License URI: http://opensource.org/licenses/MIT
9
	@@ -22,7 +23,7 @@ For more information, check out plugin page at [dFactory](http://www.dfactory.eu
22	* Watermark image preview
23	* Set watermark offset
24	* Select post types where watermark will be aplied to images or select adding watermark during any image upload
25	- * Select from 3 methods of aplying watermark size � original, custom or scaled
26	* Set watermark transparency / opacity
27	* Protect your images from copying via drag&drop
28	* Disable right mouse click on images
	@@ -47,6 +48,13 @@ No questions yet.
47
48	== Changelog ==
49







50	= 1.0.1 =
51	* Fix: Using image ID instead of image URL during image upload
52


1	=== Image Watermark ===
2	Contributors: dfactory
3	+ Donate link: http://www.dfactory.eu/
4	Tags: image, images, picture, watermark, watermarking, protection, image protection, image security
5	Requires at least: 3.5
6	Tested up to: 3.5.1
7	+ Stable tag: 1.0.2
8	License: MIT License
9	License URI: http://opensource.org/licenses/MIT
10

23	* Watermark image preview
24	* Set watermark offset
25	* Select post types where watermark will be aplied to images or select adding watermark during any image upload
26	+ * Select from 3 methods of aplying watermark size: original, custom or scaled
27	* Set watermark transparency / opacity
28	* Protect your images from copying via drag&drop
29	* Disable right mouse click on images

48
49	== Changelog ==
50
51	+ = 1.0.2 =
52	+ * New: Add watermark to custom images sizes registered in theme
53	+ * Tweak: Admin notices on settings page if no watermark image selected
54	+ * Tweak: JavaScript enquequing on front-end
55	+ * Tweak: General code cleanup
56	+ * Tweak: Changed label for enabling image protection for logged-in users
57	+
58	= 1.0.1 =
59	* Fix: Using image ID instead of image URL during image upload
60