WP User Avatar - Version 1.6.6

Version Description

Release Info

Developer	bangbay
Plugin	WP User Avatar
Version	1.6.6
Comparing to
See all releases

Code changes from version 1.5.4 to 1.6.6

Files changed (18) hide show

css/wp-user-avatar.css +1 -1
includes/tinymce.php +1 -1
includes/tinymce/editor_plugin.js +1 -1
includes/tinymce/window.php +3 -3
js/wp-user-avatar-admin.js +8 -3
js/wp-user-avatar-user.js +14 -0
js/wp-user-avatar.js +1 -1
lang/wp-user-avatar-de_DE.mo +0 -0
lang/wp-user-avatar-de_DE.po +37 -12
lang/wp-user-avatar-es_ES.mo +0 -0
lang/wp-user-avatar-es_ES.po +37 -12
lang/wp-user-avatar-fr_FR.mo +0 -0
lang/wp-user-avatar-fr_FR.po +37 -12
lang/wp-user-avatar-sv_SE.mo +0 -0
lang/wp-user-avatar-sv_SE.po +37 -12
readme.txt +157 -22
uninstall.php +9 -1
wp-user-avatar.php +284 -170

css/wp-user-avatar.css CHANGED Viewed

	@@ -1,7 +1,6 @@
1	#wpua-errors, #wpua-message, #wpua-readable-size-error, .wpua-error { color: #c00 !important; font-weight: 700 !important; }
2	#wpua-message, #wpua-readable-size-error { display: none; }
3	#wpua-preview, #wpua-thumbnail { display: inline-block; text-align: center; vertical-align: top; }
4	- #wpua-preview { margin-right: 10px !important; }
5	#wpua-preview img, #wpua-thumbnail img { max-height: 96px; border: 1px solid #dfdfdf; display: block; }
6	.defaultavatarpicker #wpua-preview { width: 32px; height: 32px; margin-right: 0; display: inline-block; overflow: hidden; vertical-align: middle; }
7	.defaultavatarpicker #wpua-preview img { width: 32px; height: auto; border: 0; }
	@@ -9,3 +8,4 @@
9	#wpua-edit #wpua-remove { margin-left: 10px !important; }
10	#wpua-slider { width: 22.75em; }
11	.wpua-hide { display: none !important; }


1	#wpua-errors, #wpua-message, #wpua-readable-size-error, .wpua-error { color: #c00 !important; font-weight: 700 !important; }
2	#wpua-message, #wpua-readable-size-error { display: none; }
3	#wpua-preview, #wpua-thumbnail { display: inline-block; text-align: center; vertical-align: top; }

4	#wpua-preview img, #wpua-thumbnail img { max-height: 96px; border: 1px solid #dfdfdf; display: block; }
5	.defaultavatarpicker #wpua-preview { width: 32px; height: 32px; margin-right: 0; display: inline-block; overflow: hidden; vertical-align: middle; }
6	.defaultavatarpicker #wpua-preview img { width: 32px; height: auto; border: 0; }

8	#wpua-edit #wpua-remove { margin-left: 10px !important; }
9	#wpua-slider { width: 22.75em; }
10	.wpua-hide { display: none !important; }
11	+ #wpua-upload-messages span { display: block; }

includes/tinymce.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	/**
3	* @package WP User Avatar
4	- * @version 1.5.4
5	*/
6
7	if(!defined('ABSPATH')){


1	<?php
2	/**
3	* @package WP User Avatar
4	+ * @version 1.6.6
5	*/
6
7	if(!defined('ABSPATH')){

includes/tinymce/editor_plugin.js CHANGED Viewed

@@ -1 +1 @@

- (function(){tinymce.PluginManager.requireLangPack('wpUserAvatar');tinymce.create('tinymce.plugins.wpUserAvatar',{init:function(ed,url){ed.addCommand('mceWpUserAvatar',function(){ed.windowManager.open({file:ajaxurl+'?action=wp_user_avatar_tinymce',width:500,height:265,inline:1},{plugin_url:url})});ed.addButton('wpUserAvatar',{title:'Insert WP User Avatar',cmd:'mceWpUserAvatar',image:url+'/../../images/wp-user-avatar-32x32.png'});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('wpUserAvatar',n.nodeName=='IMG')})},createControl:function(n,cm){return null},getInfo:function(){return{longname:'WP User Avatar',author:'Bangbay Siboliban',authorurl:'http://siboliban.org/',infourl:'http://wordpress.org/extend/plugins/wp-user-avatar/',version:"1.5.4"}}});tinymce.PluginManager.add('wpUserAvatar',tinymce.plugins.wpUserAvatar)})();

+ (function(){tinymce.PluginManager.requireLangPack('wpUserAvatar');tinymce.create('tinymce.plugins.wpUserAvatar',{init:function(ed,url){ed.addCommand('mceWpUserAvatar',function(){ed.windowManager.open({file:ajaxurl+'?action=wp_user_avatar_tinymce',width:500,height:265,inline:1},{plugin_url:url})});ed.addButton('wpUserAvatar',{title:'Insert WP User Avatar',cmd:'mceWpUserAvatar',image:url+'/../../images/wp-user-avatar-32x32.png'});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('wpUserAvatar',n.nodeName=='IMG')})},createControl:function(n,cm){return null},getInfo:function(){return{longname:'WP User Avatar',author:'Bangbay Siboliban',authorurl:'http://siboliban.org/',infourl:'http://wordpress.org/extend/plugins/wp-user-avatar/',version:"1.6.6"}}});tinymce.PluginManager.add('wpUserAvatar',tinymce.plugins.wpUserAvatar)})();

includes/tinymce/window.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	/**
3	* @package WP User Avatar
4	- * @version 1.5.4
5	*/
6
7	if(!defined('ABSPATH')){
	@@ -18,7 +18,7 @@ if(!defined('ABSPATH')){
18	<script type="text/javascript" src="<?php echo site_url(); ?>/wp-includes/js/tinymce/tiny_mce_popup.js"></script>
19	<script type="text/javascript" src="<?php echo site_url(); ?>/wp-includes/js/tinymce/utils/form_utils.js"></script>
20	<script type="text/javascript">
21	- function ~~insert_wp_user_avatar~~(){
22	// Custom shortcode values
23	var shortcode;
24	var user = document.getElementById('wp_user_avatar_user').value;
	@@ -122,7 +122,7 @@ if(!defined('ABSPATH')){
122	</p>
123
124	<div class="mceActionPanel">
125	- <input type="submit" id="insert" class="button-primary" name="insert" value="<?php _e('Insert into Post'); ?>" onclick="~~insert_wp_user_avatar~~();" />
126	</div>
127	</form>
128	</body>


1	<?php
2	/**
3	* @package WP User Avatar
4	+ * @version 1.6.6
5	*/
6
7	if(!defined('ABSPATH')){

18	<script type="text/javascript" src="<?php echo site_url(); ?>/wp-includes/js/tinymce/tiny_mce_popup.js"></script>
19	<script type="text/javascript" src="<?php echo site_url(); ?>/wp-includes/js/tinymce/utils/form_utils.js"></script>
20	<script type="text/javascript">
21	+ function wpuaInsertAvatar(){
22	// Custom shortcode values
23	var shortcode;
24	var user = document.getElementById('wp_user_avatar_user').value;

122	</p>
123
124	<div class="mceActionPanel">
125	+ <input type="submit" id="insert" class="button-primary" name="insert" value="<?php _e('Insert into Post'); ?>" onclick="wpuaInsertAvatar();" />
126	</div>
127	</form>
128	</body>

js/wp-user-avatar-admin.js CHANGED Viewed

	@@ -1,15 +1,20 @@
1	jQuery(function(){
2	// Show size info only if allow uploads is checked
3	jQuery('#wp_user_avatar_allow_upload').change(function(){
4	- jQuery('#wpua-~~size~~-~~limit~~').~~removeClass~~(~~'wpua-hide').toggle(~~jQuery('#wp_user_avatar_allow_upload').is(':checked'));




5	});
6	// Hide Gravatars if disable Gravatars is checked
7	jQuery('#wp_user_avatar_disable_gravatar').change(function(){
8	if(jQuery('#wp-avatars').length){
9	- jQuery('#wp-avatars').~~toggle~~(!jQuery('#wp_user_avatar_disable_gravatar').is(':checked'));
10	jQuery('#wp_user_avatar_radio').trigger('click');


11	}
12	- jQuery('#wpua-message').show();
13	});
14	// Add size slider
15	jQuery('#wpua-slider').slider({


1	jQuery(function(){
2	// Show size info only if allow uploads is checked
3	jQuery('#wp_user_avatar_allow_upload').change(function(){
4	+ jQuery('#wpua-contributors-subscribers').slideToggle(jQuery('#wp_user_avatar_allow_upload').is(':checked'));
5	+ });
6	+ // Show resize info only if resize uploads is checked
7	+ jQuery('#wp_user_avatar_resize_upload').change(function(){
8	+ jQuery('#wpua-resize-sizes').slideToggle(jQuery('#wp_user_avatar_resize_upload').is(':checked'));
9	});
10	// Hide Gravatars if disable Gravatars is checked
11	jQuery('#wp_user_avatar_disable_gravatar').change(function(){
12	if(jQuery('#wp-avatars').length){
13	+ jQuery('#wp-avatars').slideToggle(!jQuery('#wp_user_avatar_disable_gravatar').is(':checked'));
14	jQuery('#wp_user_avatar_radio').trigger('click');
15	+ } else {
16	+ jQuery('#wpua-message').show();
17	}

18	});
19	// Add size slider
20	jQuery('#wpua-slider').slider({

js/wp-user-avatar-user.js ADDED Viewed

	@@ -0,0 +1,14 @@


1	+ jQuery(function(){
2	+ // Add enctype to form with JavaScript as backup
3	+ jQuery('#your-profile').attr('enctype', 'multipart/form-data');
4	+ // Remove WP User Avatar
5	+ jQuery('body').on('click', '#wpua-remove', function(e){
6	+ e.preventDefault();
7	+ jQuery(this).hide();
8	+ jQuery('#wpua-edit, #wpua-thumbnail').hide();
9	+ jQuery('#wpua-preview').find('img').attr('src', wpua_custom.avatar_thumb).removeAttr('width', "").removeAttr('height', "");
10	+ jQuery('#wp-user-avatar').val("");
11	+ jQuery('#wpua-message').show();
12	+ jQuery('#wp_user_avatar_radio').trigger('click');
13	+ });
14	+ });

js/wp-user-avatar.js CHANGED Viewed

@@ -1 +1 @@

- function wpuaMediaUploader(c,d,f){wp.media.wpUserAvatar={get:function(){return wp.media.view.settings.post.wpUserAvatarId},set:function(a){var b=wp.media.view.settings;b.post.wpUserAvatarId=a;b.post.wpUserAvatarSrc=jQuery('div.attachment-info').find('img').attr('src');if(b.post.wpUserAvatarId){~~wpuaSetAvatar~~(b.post.wpUserAvatarId,b.post.wpUserAvatarSrc);jQuery('#wp_user_avatar_radio').trigger('click')}},frame:function(){if(this._frame){return this._frame}this._frame=wp.media({state:'library',states:[new wp.media.controller.Library({title:d+": "+c})]});this._frame.on('open',function(){var a=this.state().get('selection');id=jQuery('#wp-user-avatar').val();attachment=wp.media.attachment(id);attachment.fetch();a.add(attachment?[attachment]:[])},this._frame);this._frame.on('toolbar:create:select',function(a){this.createSelectToolbar(a,{text:f})},this._frame);this._frame.state('library').on('select',this.select);return this._frame},select:function(a){var b=wp.media.view.settings,selection=this.get('selection').single();wp.media.wpUserAvatar.set(selection?selection.id:-1)},init:function(){jQuery('body').on('click','#wpua-add',function(e){e.preventDefault();e.stopPropagation();wp.media.wpUserAvatar.frame().open()})}};jQuery(wp.media.wpUserAvatar.init)}function ~~wpuaSetAvatar~~(~~a,b~~){jQuery('#wp-~~user-avatar~~'~~,window.parent.document~~).~~val(a);jQuery('#wpua-preview',window.parent.document).find('img').~~attr('~~src~~',~~b).removeAttr(~~'~~width~~'~~,""~~)~~.removeAttr('height',"")~~;~~jQuery~~(~~'#wpua-message',window.parent.document).show~~()~~;jQuery(~~'~~#wpua-remove~~'~~,window.parent.document~~)~~.removeClass~~(~~'wpua-hide')~~.~~show();jQuery('#wpua-thumbnail'~~,~~window~~.~~parent.document).hide();jQuery('#wp_user_avatar_radio'~~,~~window~~.~~parent.document~~)~~.trigger('click');wp.media.wpUserAvatar.frame().close()~~}~~function wpuaRemoveAvatar(a){~~jQuery('body').on('click','#wpua-remove',function(e){e.preventDefault();jQuery(this).hide();jQuery('#wpua-edit, #wpua-thumbnail').hide();jQuery('#wpua-preview').find('img').attr('src',a).removeAttr('width',"").removeAttr('height',"");jQuery('#wp-user-avatar').val("");jQuery('#wpua-message').show();jQuery('#wp_user_avatar_radio').trigger('click')})}~~jQuery(function(~~)~~{jQuery('#your-profile').attr('enctype','multipart/form-data')~~;~~if(typeof(wp)!='undefined'){wpuaMediaUploader(wpua_custom.section,wpua_custom.edit_image,wpua_custom.select_image)}wpuaRemoveAvatar(wpua_custom.avatar_thumb)});~~

+ function wpuaMediaUploader(c,d,f){wp.media.wpUserAvatar={get:function(){return wp.media.view.settings.post.wpUserAvatarId},set:function(a){var b=wp.media.view.settings;b.post.wpUserAvatarId=a;b.post.wpUserAvatarSrc=jQuery('div.attachment-info').find('img').attr('src');if(b.post.wpUserAvatarId){jQuery('#wp-user-avatar',window.parent.document).val(b.post.wpUserAvatarId);jQuery('#wpua-preview',window.parent.document).find('img').attr('src',b.post.wpUserAvatarSrc).removeAttr('width',"").removeAttr('height',"");jQuery('#wpua-message',window.parent.document).show();jQuery('#wpua-remove',window.parent.document).removeClass('wpua-hide').show();jQuery('#wpua-thumbnail',window.parent.document).hide();jQuery('#wp_user_avatar_radio',window.parent.document).trigger('click');wp.media.wpUserAvatar.frame().close();jQuery('#wp_user_avatar_radio').trigger('click')}},frame:function(){if(this._frame){return this._frame}this._frame=wp.media({state:'library',states:[new wp.media.controller.Library({title:d+": "+c})]});this._frame.on('open',function(){var a=this.state().get('selection');id=jQuery('#wp-user-avatar').val();attachment=wp.media.attachment(id);attachment.fetch();a.add(attachment?[attachment]:[])},this._frame);this._frame.on('toolbar:create:select',function(a){this.createSelectToolbar(a,{text:f})},this._frame);this._frame.state('library').on('select',this.select);return this._frame},select:function(a){var b=wp.media.view.settings,selection=this.get('selection').single();wp.media.wpUserAvatar.set(selection?selection.id:-1)},init:function(){jQuery('body').on('click','#wpua-add',function(e){e.preventDefault();e.stopPropagation();wp.media.wpUserAvatar.frame().open()})}};jQuery(wp.media.wpUserAvatar.init)}jQuery(function(){jQuery('#your-profile').attr('enctype','multipart/form-data');if(typeof(wp)!='undefined'){wpuaMediaUploader(wpua_custom.section,wpua_custom.edit_image,wpua_custom.select_image)}jQuery('body').on('click','#wpua-remove',function(e){e.preventDefault();jQuery(this).hide();jQuery('#wpua-edit, #wpua-thumbnail').hide();jQuery('#wpua-preview').find('img').attr('src',wpua_custom.avatar_thumb).removeAttr('width',"").removeAttr('height',"");jQuery('#wp-user-avatar').val("");jQuery('#wpua-message').show();jQuery('#wp_user_avatar_radio').trigger('click')})});

lang/wp-user-avatar-de_DE.mo CHANGED Viewed

Binary file

lang/wp-user-avatar-de_DE.po CHANGED Viewed

	@@ -4,9 +4,9 @@
4	#
5	msgid ""
6	msgstr ""
7	- "Project-Id-Version: WP User Avatar 1.5.4\n"
8	"Report-Msgid-Bugs-To: http://wordpress.org/plugins/wp-user-avatar/\n"
9	- "PO-Revision-Date: 2013-07-31 00:00-0000\n"
10	"Language: de_DE\n"
11	"Last-Translator: WP User Avatar\n"
12	"Language-Team: WP User Avatar\n"
	@@ -14,32 +14,57 @@ msgstr ""
14	"Content-Type: text/plain; charset=UTF-8\n"
15	"Content-Transfer-Encoding: 8bit\n"
16
17	- #: wp-user-avatar.php:~~341~~
18	- #: ~~wp-user-avatar.php:798~~








19	msgid "Click %s to save your changes"
20	msgstr "Klicken Sie %s, um Ihre Änderungen zu speichern"
21
22	- #: wp-user-avatar.php:~~870~~




23	msgid "Add avatar button to Visual Editor"
24	msgstr "Einen Avatar-Knopf zum WYSIWYG-Editor hinzufügen"
25
26	- #: wp-user-avatar.php:~~875~~
27	msgid "Allow Contributors & Subscribers to upload avatars"
28	msgstr "Mitarbeiter und Abonnenten erlauben, Avatare hochzuladen"
29
30	- #: wp-user-avatar.php:~~880~~
31	msgid "Disable Gravatar and use only local avatars"
32	msgstr "Gravatar deaktivieren und nur lokale Avatare verwenden"
33
34	- #: wp-user-avatar.php:~~888~~
35	- #: wp-user-avatar.php:~~893~~
36	- msgid "Upload Size Limit ~~(only for Contributors & Subscribers)~~"
37	- msgstr "Dateigrößenbeschränkung ~~(nur für Mitarbeiter und Abonnenten)~~"
38
39	- #: wp-user-avatar.php:~~902~~





40	msgid "Allow users to edit avatars"
41	msgstr "Benutzer erlauben, Avatare bearbeiten"
42








43	#. Plugin Name of the plugin/theme
44	msgid "WP User Avatar"
45	msgstr "WP-Benutzer-Avatar"


4	#
5	msgid ""
6	msgstr ""
7	+ "Project-Id-Version: WP User Avatar 1.6.6\n"
8	"Report-Msgid-Bugs-To: http://wordpress.org/plugins/wp-user-avatar/\n"
9	+ "PO-Revision-Date: 2013-12-01 00:00-0000\n"
10	"Language: de_DE\n"
11	"Last-Translator: WP User Avatar\n"
12	"Language-Team: WP User Avatar\n"

14	"Content-Type: text/plain; charset=UTF-8\n"
15	"Content-Transfer-Encoding: 8bit\n"
16
17	+ #: wp-user-avatar.php:313
18	+ msgid "Do you like WP User Avatar?"
19	+ msgstr "Bist Du mit WP-Benutzer-Avatar zufrieden?"
20	+
21	+ #: wp-user-avatar.php:313
22	+ msgid "Make a donation"
23	+ msgstr "Spenden"
24	+
25	+ #: wp-user-avatar.php:407
26	+ #: wp-user-avatar.php:881
27	msgid "Click %s to save your changes"
28	msgstr "Klicken Sie %s, um Ihre Änderungen zu speichern"
29
30	+ #: wp-user-avatar.php:522
31	+ msgid "Donate"
32	+ msgstr "Spenden"
33	+
34	+ #: wp-user-avatar.php:955
35	msgid "Add avatar button to Visual Editor"
36	msgstr "Einen Avatar-Knopf zum WYSIWYG-Editor hinzufügen"
37
38	+ #: wp-user-avatar.php:961
39	msgid "Allow Contributors & Subscribers to upload avatars"
40	msgstr "Mitarbeiter und Abonnenten erlauben, Avatare hochzuladen"
41
42	+ #: wp-user-avatar.php:967
43	msgid "Disable Gravatar and use only local avatars"
44	msgstr "Gravatar deaktivieren und nur lokale Avatare verwenden"
45
46	+ #: wp-user-avatar.php:978
47	+ #: wp-user-avatar.php:983
48	+ msgid "Upload Size Limit"
49	+ msgstr "Dateigrößenbeschränkung"
50
51	+ #: wp-user-avatar.php:978
52	+ #: wp-user-avatar.php:983
53	+ msgid "(only for Contributors & Subscribers)"
54	+ msgstr "(nur für Mitarbeiter und Abonnenten)"
55	+
56	+ #: wp-user-avatar.php:993
57	msgid "Allow users to edit avatars"
58	msgstr "Benutzer erlauben, Avatare bearbeiten"
59
60	+ #: wp-user-avatar.php:999
61	+ msgid "Resize avatars on upload"
62	+ msgstr "Resize Avatare beim Upload"
63	+
64	+ #: wp-user-avatar.php:1011
65	+ msgid "Crop avatars to exact dimensions"
66	+ msgstr "Avatare auf exakte Größe beschneiden"
67	+
68	#. Plugin Name of the plugin/theme
69	msgid "WP User Avatar"
70	msgstr "WP-Benutzer-Avatar"

lang/wp-user-avatar-es_ES.mo CHANGED Viewed

Binary file

lang/wp-user-avatar-es_ES.po CHANGED Viewed

	@@ -4,9 +4,9 @@
4	#
5	msgid ""
6	msgstr ""
7	- "Project-Id-Version: WP User Avatar 1.5.4\n"
8	"Report-Msgid-Bugs-To: http://wordpress.org/plugins/wp-user-avatar/\n"
9	- "PO-Revision-Date: 2013-07-31 00:00-0000\n"
10	"Language: es_ES\n"
11	"Last-Translator: WP User Avatar\n"
12	"Language-Team: WP User Avatar\n"
	@@ -14,32 +14,57 @@ msgstr ""
14	"Content-Type: text/plain; charset=UTF-8\n"
15	"Content-Transfer-Encoding: 8bit\n"
16
17	- #: wp-user-avatar.php:~~341~~
18	- #: ~~wp-user-avatar.php:798~~








19	msgid "Click %s to save your changes"
20	msgstr "Haz clic %s para guardar los cambios"
21
22	- #: wp-user-avatar.php:~~870~~




23	msgid "Add avatar button to Visual Editor"
24	msgstr "Añadir botón avatar al editor visual"
25
26	- #: wp-user-avatar.php:~~875~~
27	msgid "Allow Contributors & Subscribers to upload avatars"
28	msgstr "Permitir los colaboradores y los suscriptores subir avatares"
29
30	- #: wp-user-avatar.php:~~880~~
31	msgid "Disable Gravatar and use only local avatars"
32	msgstr "Desactivar Gravatar y utilizar sólo los avatares locales"
33
34	- #: wp-user-avatar.php:~~888~~
35	- #: wp-user-avatar.php:~~893~~
36	- msgid "Upload Size Limit ~~(only for Contributors & Subscribers)~~"
37	- msgstr "Sube límite de tamaño ~~(para colaboradores y suscriptores)~~"
38
39	- #: wp-user-avatar.php:~~902~~





40	msgid "Allow users to edit avatars"
41	msgstr "Permitir a los usuarios editar avatar"
42








43	#. Plugin Name of the plugin/theme
44	msgid "WP User Avatar"
45	msgstr "WP-Usuario-Avatar"


4	#
5	msgid ""
6	msgstr ""
7	+ "Project-Id-Version: WP User Avatar 1.6.6\n"
8	"Report-Msgid-Bugs-To: http://wordpress.org/plugins/wp-user-avatar/\n"
9	+ "PO-Revision-Date: 2013-12-01 00:00-0000\n"
10	"Language: es_ES\n"
11	"Last-Translator: WP User Avatar\n"
12	"Language-Team: WP User Avatar\n"

14	"Content-Type: text/plain; charset=UTF-8\n"
15	"Content-Transfer-Encoding: 8bit\n"
16
17	+ #: wp-user-avatar.php:313
18	+ msgid "Do you like WP User Avatar?"
19	+ msgstr "¿Está satisfecho con WP-Usuario-Avatar?"
20	+
21	+ #: wp-user-avatar.php:313
22	+ msgid "Make a donation"
23	+ msgstr "Donar"
24	+
25	+ #: wp-user-avatar.php:407
26	+ #: wp-user-avatar.php:881
27	msgid "Click %s to save your changes"
28	msgstr "Haz clic %s para guardar los cambios"
29
30	+ #: wp-user-avatar.php:522
31	+ msgid "Donate"
32	+ msgstr "Donar"
33	+
34	+ #: wp-user-avatar.php:955
35	msgid "Add avatar button to Visual Editor"
36	msgstr "Añadir botón avatar al editor visual"
37
38	+ #: wp-user-avatar.php:961
39	msgid "Allow Contributors & Subscribers to upload avatars"
40	msgstr "Permitir los colaboradores y los suscriptores subir avatares"
41
42	+ #: wp-user-avatar.php:967
43	msgid "Disable Gravatar and use only local avatars"
44	msgstr "Desactivar Gravatar y utilizar sólo los avatares locales"
45
46	+ #: wp-user-avatar.php:978
47	+ #: wp-user-avatar.php:983
48	+ msgid "Upload Size Limit"
49	+ msgstr "Sube límite de tamaño"
50
51	+ #: wp-user-avatar.php:978
52	+ #: wp-user-avatar.php:983
53	+ msgid "(only for Contributors & Subscribers)"
54	+ msgstr "(para colaboradores y suscriptores)"
55	+
56	+ #: wp-user-avatar.php:993
57	msgid "Allow users to edit avatars"
58	msgstr "Permitir a los usuarios editar avatar"
59
60	+ #: wp-user-avatar.php:999
61	+ msgid "Resize avatars on upload"
62	+ msgstr "Cambiar el tamaño de avatares en carga"
63	+
64	+ #: wp-user-avatar.php:1011
65	+ msgid "Crop avatars to exact dimensions"
66	+ msgstr "Recortar los avatares a sus dimensiones exactas"
67	+
68	#. Plugin Name of the plugin/theme
69	msgid "WP User Avatar"
70	msgstr "WP-Usuario-Avatar"

lang/wp-user-avatar-fr_FR.mo CHANGED Viewed

Binary file

lang/wp-user-avatar-fr_FR.po CHANGED Viewed

	@@ -4,9 +4,9 @@
4	#
5	msgid ""
6	msgstr ""
7	- "Project-Id-Version: WP User Avatar 1.5.4\n"
8	"Report-Msgid-Bugs-To: http://wordpress.org/plugins/wp-user-avatar/\n"
9	- "PO-Revision-Date: 2013-07-31 00:00-0000\n"
10	"Language: fr_FR\n"
11	"Last-Translator: WP User Avatar\n"
12	"Language-Team: WP User Avatar\n"
	@@ -14,32 +14,57 @@ msgstr ""
14	"Content-Type: text/plain; charset=UTF-8\n"
15	"Content-Transfer-Encoding: 8bit\n"
16
17	- #: wp-user-avatar.php:~~341~~
18	- #: ~~wp-user-avatar.php:798~~








19	msgid "Click %s to save your changes"
20	msgstr "Cliquez sur %s pour enregistrer vos modifications"
21
22	- #: wp-user-avatar.php:~~870~~




23	msgid "Add avatar button to Visual Editor"
24	msgstr "Ajouter le bouton avatar sur l'éditeur visuel"
25
26	- #: wp-user-avatar.php:~~875~~
27	msgid "Allow Contributors & Subscribers to upload avatars"
28	msgstr "Permettre aux contributeurs et aux abonnés d'envoyer des avatars"
29
30	- #: wp-user-avatar.php:~~880~~
31	msgid "Disable Gravatar and use only local avatars"
32	msgstr "Désactiver Gravatar et utiliser les avatars fournis"
33
34	- #: wp-user-avatar.php:~~888~~
35	- #: wp-user-avatar.php:~~893~~
36	- msgid "Upload Size Limit ~~(only for Contributors & Subscribers)~~"
37	- msgstr "Taille limite d'envoi de fichiers ~~(pour contributeurs et abonnés)~~"
38
39	- #: wp-user-avatar.php:~~902~~





40	msgid "Allow users to edit avatars"
41	msgstr "Permettre aux utilisateurs de modifier avatar"
42








43	#. Plugin Name of the plugin/theme
44	msgid "WP User Avatar"
45	msgstr "WP-Utilisateur-Avatar"


4	#
5	msgid ""
6	msgstr ""
7	+ "Project-Id-Version: WP User Avatar 1.6.6\n"
8	"Report-Msgid-Bugs-To: http://wordpress.org/plugins/wp-user-avatar/\n"
9	+ "PO-Revision-Date: 2013-12-01 00:00-0000\n"
10	"Language: fr_FR\n"
11	"Last-Translator: WP User Avatar\n"
12	"Language-Team: WP User Avatar\n"

14	"Content-Type: text/plain; charset=UTF-8\n"
15	"Content-Transfer-Encoding: 8bit\n"
16
17	+ #: wp-user-avatar.php:313
18	+ msgid "Do you like WP User Avatar?"
19	+ msgstr "Etes-vous satisfait avec WP-Utilisateur-Avatar?"
20	+
21	+ #: wp-user-avatar.php:313
22	+ msgid "Make a donation"
23	+ msgstr "Faites un don"
24	+
25	+ #: wp-user-avatar.php:407
26	+ #: wp-user-avatar.php:881
27	msgid "Click %s to save your changes"
28	msgstr "Cliquez sur %s pour enregistrer vos modifications"
29
30	+ #: wp-user-avatar.php:522
31	+ msgid "Donate"
32	+ msgstr "Faites un don"
33	+
34	+ #: wp-user-avatar.php:955
35	msgid "Add avatar button to Visual Editor"
36	msgstr "Ajouter le bouton avatar sur l'éditeur visuel"
37
38	+ #: wp-user-avatar.php:961
39	msgid "Allow Contributors & Subscribers to upload avatars"
40	msgstr "Permettre aux contributeurs et aux abonnés d'envoyer des avatars"
41
42	+ #: wp-user-avatar.php:967
43	msgid "Disable Gravatar and use only local avatars"
44	msgstr "Désactiver Gravatar et utiliser les avatars fournis"
45
46	+ #: wp-user-avatar.php:978
47	+ #: wp-user-avatar.php:983
48	+ msgid "Upload Size Limit"
49	+ msgstr "Taille limite d'envoi de fichiers"
50
51	+ #: wp-user-avatar.php:978
52	+ #: wp-user-avatar.php:983
53	+ msgid "(only for Contributors & Subscribers)"
54	+ msgstr "(pour contributeurs et abonnés)"
55	+
56	+ #: wp-user-avatar.php:993
57	msgid "Allow users to edit avatars"
58	msgstr "Permettre aux utilisateurs de modifier avatar"
59
60	+ #: wp-user-avatar.php:999
61	+ msgid "Resize avatars on upload"
62	+ msgstr "Redimensionner avatars lors du téléchargement"
63	+
64	+ #: wp-user-avatar.php:1011
65	+ msgid "Crop avatars to exact dimensions"
66	+ msgstr "Recadrer les avatars pour parvenir aux dimensions exactes"
67	+
68	#. Plugin Name of the plugin/theme
69	msgid "WP User Avatar"
70	msgstr "WP-Utilisateur-Avatar"

lang/wp-user-avatar-sv_SE.mo CHANGED Viewed

Binary file

lang/wp-user-avatar-sv_SE.po CHANGED Viewed

	@@ -4,9 +4,9 @@
4	#
5	msgid ""
6	msgstr ""
7	- "Project-Id-Version: WP User Avatar 1.5.4\n"
8	"Report-Msgid-Bugs-To: http://wordpress.org/plugins/wp-user-avatar/\n"
9	- "PO-Revision-Date: 2013-07-31 00:00-0000\n"
10	"Language: sv_SE\n"
11	"Last-Translator: Mattias Tengblad <mst@eyesx.com>\n"
12	"Language-Team: WordPress Sverige <info@wpsv.se>\n"
	@@ -14,32 +14,57 @@ msgstr ""
14	"Content-Type: text/plain; charset=UTF-8\n"
15	"Content-Transfer-Encoding: 8bit\n"
16
17	- #: wp-user-avatar.php:~~341~~
18	- #: ~~wp-user-avatar.php:798~~








19	msgid "Click %s to save your changes"
20	msgstr "Klicka på %s för att spara dina ändringar"
21
22	- #: wp-user-avatar.php:~~870~~




23	msgid "Add avatar button to Visual Editor"
24	msgstr "Lägg till knapp för avatarer i den visuella redigeraren"
25
26	- #: wp-user-avatar.php:~~875~~
27	msgid "Allow Contributors & Subscribers to upload avatars"
28	msgstr "Tillåt medarbetare & prenumeranter att ladda upp avatarer"
29
30	- #: wp-user-avatar.php:~~880~~
31	msgid "Disable Gravatar and use only local avatars"
32	msgstr "Inaktivera Gravatar och använd endast lokala avatarer"
33
34	- #: wp-user-avatar.php:~~888~~
35	- #: wp-user-avatar.php:~~893~~
36	- msgid "Upload Size Limit ~~(only for Contributors & Subscribers)~~"
37	- msgstr "Storleksgräns för uppladdningar ~~(endast för medarbetare & prenumeranter)~~"
38
39	- #: wp-user-avatar.php:~~902~~





40	msgid "Allow users to edit avatars"
41	msgstr "Tillåt användare att redigera avatarer"
42








43	#. Plugin Name of the plugin/theme
44	msgid "WP User Avatar"
45	msgstr "Visningsbild (avatar)"


4	#
5	msgid ""
6	msgstr ""
7	+ "Project-Id-Version: WP User Avatar 1.6.6\n"
8	"Report-Msgid-Bugs-To: http://wordpress.org/plugins/wp-user-avatar/\n"
9	+ "PO-Revision-Date: 2013-12-01 00:00-0000\n"
10	"Language: sv_SE\n"
11	"Last-Translator: Mattias Tengblad <mst@eyesx.com>\n"
12	"Language-Team: WordPress Sverige <info@wpsv.se>\n"

14	"Content-Type: text/plain; charset=UTF-8\n"
15	"Content-Transfer-Encoding: 8bit\n"
16
17	+ #: wp-user-avatar.php:313
18	+ msgid "Do you like WP User Avatar?"
19	+ msgstr "Är du nöjd med Visningsbild (avatar)?"
20	+
21	+ #: wp-user-avatar.php:313
22	+ msgid "Make a donation"
23	+ msgstr "Donera"
24	+
25	+ #: wp-user-avatar.php:407
26	+ #: wp-user-avatar.php:881
27	msgid "Click %s to save your changes"
28	msgstr "Klicka på %s för att spara dina ändringar"
29
30	+ #: wp-user-avatar.php:522
31	+ msgid "Donate"
32	+ msgstr "Donera"
33	+
34	+ #: wp-user-avatar.php:955
35	msgid "Add avatar button to Visual Editor"
36	msgstr "Lägg till knapp för avatarer i den visuella redigeraren"
37
38	+ #: wp-user-avatar.php:961
39	msgid "Allow Contributors & Subscribers to upload avatars"
40	msgstr "Tillåt medarbetare & prenumeranter att ladda upp avatarer"
41
42	+ #: wp-user-avatar.php:967
43	msgid "Disable Gravatar and use only local avatars"
44	msgstr "Inaktivera Gravatar och använd endast lokala avatarer"
45
46	+ #: wp-user-avatar.php:978
47	+ #: wp-user-avatar.php:983
48	+ msgid "Upload Size Limit"
49	+ msgstr "Storleksgräns för uppladdningar"
50
51	+ #: wp-user-avatar.php:978
52	+ #: wp-user-avatar.php:983
53	+ msgid "(only for Contributors & Subscribers)"
54	+ msgstr "(endast för medarbetare & prenumeranter)"
55	+
56	+ #: wp-user-avatar.php:993
57	msgid "Allow users to edit avatars"
58	msgstr "Tillåt användare att redigera avatarer"
59
60	+ #: wp-user-avatar.php:999
61	+ msgid "Resize avatars on upload"
62	+ msgstr "Ändra storlek på avatarer på uppladdning"
63	+
64	+ #: wp-user-avatar.php:1011
65	+ msgid "Crop avatars to exact dimensions"
66	+ msgstr "Beskär avatarer till exakta dimensioner"
67	+
68	#. Plugin Name of the plugin/theme
69	msgid "WP User Avatar"
70	msgstr "Visningsbild (avatar)"

readme.txt CHANGED Viewed

@@ -4,8 +4,8 @@ Contributors: bangbay
             Donate link: http://siboliban.org/donate
             Tags: author image, author photo, author avatar, avatar, bbPress, profile avatar, profile image, user avatar, user image, user photo
             Requires at least: 3.5
-            -
            Tested up to: 3.7-alpha-24927
-            -
            Stable tag: 1.5.4
             License: GPLv2 or later
             License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -22,7 +22,7 @@ WP User Avatar also lets you:
             * Disable [Gravatar](http://gravatar.com/) avatars and use only local avatars.
             * Use the <code>[avatar]</code> shortcode in your posts. The shortcode will work with any theme, whether it has avatar support or not.
             * Allow Contributors and Subscribers to upload their own avatars.
-            -
            * Limit upload file size for Contributors and Subscribers.
             == Installation ==
@@ -126,9 +126,10 @@ First, choose a theme that has avatar support. In your theme, you have a choice
 . Allows you to use the values "original", "large", "medium", or "thumbnail" for your avatar size.
 . Doesn't add a fixed width and height to the image if you use the aforementioned values. This will give you more flexibility to resize the image with CSS.
-            -
            3. Optionally adds CSS classes "alignleft", "alignright", or "aligncenter" to position your avatar.
-            -
            4. Shows nothing if the user has no WP User Avatar image.
-            -
            5. Shows the user's [Gravatar](http://gravatar.com/) avatar or Default Avatar only if "Show Avatars" is enabled in your WP User Avatar settings.
             = get_avatar =
@@ -143,17 +144,9 @@ First, choose a theme that has avatar support. In your theme, you have a choice
             = Can I create a custom Default Avatar? =
             In your WP User Avatar settings, you can upload your own Default Avatar.
-            -
            = Can I insert WP User Avatar directly into a post? =
-            -
-            -
            You can use the <code>[avatar]</code> shortcode in your posts. It will detect the author of the post or you can specify an author by username. You can specify a size, alignment, and link, but they are optional. For links, you can link to the original image file, attachment page, or a custom URL.
-            -
-            -
            `[avatar user="admin" size="96" align="left" link="file"]`
-            -
-            -
            Outputs:
-            -
            `<a href="{fileURL}" class="wp-user-avatar-link wp-user-avatar-file">
-            -
              <img src="{imageURL}" width="96" height="96" class="wp-user-avatar wp-user-avatar-96 alignleft" />
-            -
            </a>`
             = Can Contributors or Subscribers choose their own WP User Avatar image? =
             Yes, if you enable "Allow Contributors & Subscribers to upload avatars" in the WP User Avatar settings. These users will see a slightly different interface because they are allowed only one image upload.
@@ -162,14 +155,14 @@ Yes, if you enable "Allow Contributors & Subscribers to upload avatars" in the W
             Yes, for registered users. Non-registered comment authors will show their [Gravatar](http://gravatar.com/) avatars or Default Avatar.
-            -
            = Can I disable all Gravatar avatars? =
-            -
-            -
            In your WP User Avatar settings, you can select "Disable Gravatar — Use only local avatars" to disable all [Gravatar](http://gravatar.com/) avatars on your site and replace them with your Default Avatar. This will affect your registered users and non-registered comment authors.
-            -
             = Will WP User Avatar work with bbPress? =
             Yes!
             = Will WP User Avatar work with WordPress Multisite? =
             Yes, however, each site has its own avatar settings. If you set a WP User Avatar image on one site, you have to set it again for different sites in your network.
@@ -178,6 +171,18 @@ Yes, however, each site has its own avatar settings. If you set a WP User Avatar
             For Administrators, WP User Avatar adds a column with avatar thumbnails to your Users list table. If "Show Avatars" is enabled in your WP User Avatar settings, you will see avatars to the left of each username instead of in a new column.
             = What CSS can I use with WP User Avatar? =
             WP User Avatar will add the CSS classes "wp-user-avatar" and "wp-user-avatar-{size}" to your image. If you add an alignment, the corresponding alignment class will be added:
@@ -219,6 +224,90 @@ Outputs:
             * <code>has_wp_user_avatar</code>: checks if the user has a WP User Avatar image
             * [See example usage here](http://wordpress.org/extend/plugins/wp-user-avatar/installation/)
             == Screenshots ==
 . WP User Avatar admin settings.
@@ -230,8 +319,54 @@ Outputs:
             == Changelog ==
             = 1.5.4 =
-            -
            * Add: Option to enable avatar editing privilege for Subscribers
             * Add: Swedish translation
             * Update: Move inline JavaScript to wp-user-avatar.js and wp-user-avatar-admin.js
             * Update: Load JavaScript in footer
@@ -263,7 +398,7 @@ Outputs:
             * Bug Fix: Use wp_die for errors
             = 1.4 =
-            -
            * Add: Uploader for Subscribers and Contributors
             * Add: Media states for avatar images
             * Add: Plugin admin settings
             * Update: Change support only to WP 3.4+


4	Donate link: http://siboliban.org/donate
5	Tags: author image, author photo, author avatar, avatar, bbPress, profile avatar, profile image, user avatar, user image, user photo
6	Requires at least: 3.5
7	+ Tested up to: 3.8
8	+ Stable tag: 1.6.6
9	License: GPLv2 or later
10	License URI: http://www.gnu.org/licenses/gpl-2.0.html
11

22	* Disable [Gravatar](http://gravatar.com/) avatars and use only local avatars.
23	* Use the <code>[avatar]</code> shortcode in your posts. The shortcode will work with any theme, whether it has avatar support or not.
24	* Allow Contributors and Subscribers to upload their own avatars.
25	+ * Limit upload file size and image dimensions for Contributors and Subscribers.
26
27	== Installation ==
28

126
127	1. Allows you to use the values "original", "large", "medium", or "thumbnail" for your avatar size.
128	2. Doesn't add a fixed width and height to the image if you use the aforementioned values. This will give you more flexibility to resize the image with CSS.
129	+ 3. Allows you to use custom image sizes registered with [<code>add_image_size</code>](http://codex.wordpress.org/Function_Reference/add_image_size) (fixed width and height are added to the image).
130	+ 4. Optionally adds CSS classes "alignleft", "alignright", or "aligncenter" to position your avatar.
131	+ 5. Shows nothing if the user has no WP User Avatar image.
132	+ 6. Shows the user's [Gravatar](http://gravatar.com/) avatar or Default Avatar only if "Show Avatars" is enabled in your WP User Avatar settings.
133
134	= get_avatar =
135

144	= Can I create a custom Default Avatar? =
145	In your WP User Avatar settings, you can upload your own Default Avatar.
146
147	+ = Can I disable all Gravatar avatars? =






148
149	+ In your WP User Avatar settings, you can select "Disable Gravatar — Use only local avatars" to disable all [Gravatar](http://gravatar.com/) avatars on your site and replace them with your Default Avatar. This will affect your registered users and non-registered comment authors.


150
151	= Can Contributors or Subscribers choose their own WP User Avatar image? =
152	Yes, if you enable "Allow Contributors & Subscribers to upload avatars" in the WP User Avatar settings. These users will see a slightly different interface because they are allowed only one image upload.

155
156	Yes, for registered users. Non-registered comment authors will show their [Gravatar](http://gravatar.com/) avatars or Default Avatar.
157




158	= Will WP User Avatar work with bbPress? =
159
160	Yes!
161
162	+ = Will WP User Avatar work with BuddyPress? =
163	+
164	+ No, BuddyPress has its own custom avatar functions and WP User Avatar will override only some of them. It's best to use BuddyPress without WP User Avatar.
165	+
166	= Will WP User Avatar work with WordPress Multisite? =
167
168	Yes, however, each site has its own avatar settings. If you set a WP User Avatar image on one site, you have to set it again for different sites in your network.

171
172	For Administrators, WP User Avatar adds a column with avatar thumbnails to your Users list table. If "Show Avatars" is enabled in your WP User Avatar settings, you will see avatars to the left of each username instead of in a new column.
173
174	+ = Can I insert WP User Avatar directly into a post? =
175	+
176	+ You can use the <code>[avatar]</code> shortcode in your posts. It will detect the author of the post or you can specify an author by username. You can specify a size, alignment, and link, but they are optional. For links, you can link to the original image file, attachment page, or a custom URL.
177	+
178	+ `[avatar user="admin" size="96" align="left" link="file"]`
179	+
180	+ Outputs:
181	+
182	+ `<a href="{fileURL}" class="wp-user-avatar-link wp-user-avatar-file">
183	+ <img src="{imageURL}" width="96" height="96" class="wp-user-avatar wp-user-avatar-96 alignleft" />
184	+ </a>`
185	+
186	= What CSS can I use with WP User Avatar? =
187
188	WP User Avatar will add the CSS classes "wp-user-avatar" and "wp-user-avatar-{size}" to your image. If you add an alignment, the corresponding alignment class will be added:

224	* <code>has_wp_user_avatar</code>: checks if the user has a WP User Avatar image
225	* [See example usage here](http://wordpress.org/extend/plugins/wp-user-avatar/installation/)
226
227	+ = There's a call for donations in the WP User Avatar settings. How can I remove it? =
228	+ I've spent countless hours developing this plugin for free. If you're able to give a donation I'd appreciate it, but it's by no means a requirement. You can remove the message by adding this to the <code>functions.php</code> file of your theme:
229	+
230	+ `remove_action('wpua_donation_message', 'wpua_do_donation_message');`
231	+
232	+ == Advanced Settings ==
233	+
234	+ You can change the HTML structure of the WP User Avatar section on your profile edit page by using the functions <code>wpua_before_avatar</code> and <code>wpua_after_avatar</code>. By default, the avatar code is structured like this:
235	+
236	+ `
237	+ <h3>Avatar</h3>
238	+ <table class="form-table">
239	+ <tr>
240	+ <th><label for="wp_user_avatar">Image</label></th>
241	+ <td>
242	+ <input type="hidden" name="wp-user-avatar" id="wp-user-avatar" value="{attachmentID}" />
243	+ <p id="wpua-add-button">
244	+ <button type="button" class="button" id="wpua-add" name="wpua-add">Edit Image</button>
245	+ </p>
246	+ <p id="wpua-preview">
247	+ <img src="{imageURL}" alt="" />
248	+ Original Size
249	+ </p>
250	+ <p id="wpua-thumbnail">
251	+ <img src="{imageURL}" alt="" />
252	+ Thumbnail
253	+ </p>
254	+ <p id="wpua-remove-button">
255	+ <button type="button" class="button" id="wpua-remove" name="wpua-remove">Remove</button>
256	+ </p>
257	+ <p id="wpua-message">
258	+ Click “Update Profile” to save your changes
259	+ </p>
260	+ </td>
261	+ </tr>
262	+ </table>
263	+ `
264	+
265	+ To strip out the table, you would add the following filters to the <code>functions.php</code> file in your theme:
266	+
267	+ `
268	+ remove_action('wpua_before_avatar', 'wpua_do_before_avatar');
269	+ remove_action('wpua_after_avatar', 'wpua_do_after_avatar');
270	+ `
271	+
272	+ To add your own wrapper, you could create something like this:
273	+
274	+ `
275	+ function my_before_avatar(){
276	+ echo '<div id="my-avatar">';
277	+ }
278	+ add_action('wpua_before_avatar', 'my_before_avatar');
279	+
280	+ function my_after_avatar(){
281	+ echo '</div>';
282	+ }
283	+ add_action('wpua_after_avatar', 'my_after_avatar');
284	+ `
285	+
286	+ This would output:
287	+
288	+ `
289	+ <div id="my-avatar">
290	+ <input type="hidden" name="wp-user-avatar" id="wp-user-avatar" value="{attachmentID}" />
291	+ <p id="wpua-add-button">
292	+ <button type="button" class="button" id="wpua-add" name="wpua-add">Edit Image</button>
293	+ </p>
294	+ <p id="wpua-preview">
295	+ <img src="{imageURL}" alt="" />
296	+ Original Size
297	+ </p>
298	+ <p id="wpua-thumbnail">
299	+ <img src="{imageURL}" alt="" />
300	+ Thumbnail
301	+ </p>
302	+ <p id="wpua-remove-button">
303	+ <button type="button" class="button" id="wpua-remove" name="wpua-remove">Remove</button>
304	+ </p>
305	+ <p id="wpua-message">
306	+ Click “Update Profile” to save your changes
307	+ </p>
308	+ </div>
309	+ `
310	+
311	== Screenshots ==
312
313	1. WP User Avatar admin settings.

319
320	== Changelog ==
321
322	+ = 1.6.6. =
323	+ * Add: Donation message
324	+ * Bug Fix: Die page when image is too large
325	+ * Bug Fix: Resize images uploaded through plugin only
326	+ * Remove: Unused function
327	+ * Update: Refactor JavaScript
328	+
329	+ = 1.6.5 =
330	+ * Bug Fix: Use entire comment object instead of just e-mail address
331	+
332	+ = 1.6.4 =
333	+ * Bug Fix: Correct avatar not showing in widget
334	+ * Update: Check compatibility to 3.7.1
335	+
336	+ = 1.6.3 =
337	+ * Bug Fix: Checkbox value for "Crop avatars to exact dimensions"
338	+
339	+ = 1.6.2 =
340	+ * Bug Fix: Show Default Avatar if attachment doesn't exist
341	+ * Bug Fix: manage_users_custom_column not returning values
342	+
343	+ = 1.6.1 =
344	+ * Bug Fix: Profile not saving without an avatar for Contributors & Subscribers
345	+
346	+ = 1.6.0 =
347	+ * Add: Filters to change profile HTML structure
348	+ * Add: Recognition of sizes registered with add_image_size
349	+ * Add: Resize image options for Contributors & Subscribers
350	+ * Bug Fix: Rerrange CSS class names
351	+
352	+ = 1.5.8 =
353	+ * Bug Fix: Add function exists checks to prevent redeclare errors
354	+ * Bug Fix: Page die if file upload is too big
355	+ * Bug Fix: Upload file with submit
356	+
357	+ = 1.5.7 =
358	+ * Bug Fix: Separate out JavaScript for Contributors & Subscribers
359	+ * Bug Fix: Subscriber uploader not finding error type
360	+
361	+ = 1.5.6 =
362	+ * Update: Use cache for wpua_has_gravatar
363	+
364	+ = 1.5.5 =
365	+ * Bug Fix: Hide "Edit Image" button if Contributors & Subscribers can't edit avatar
366	+ * Bug Fix: Remove edit_posts capability if Subscribers can't edit avatar
367	+
368	= 1.5.4 =
369	+ * Add: Option to enable avatar editing privilege for Contributors & Subscribers
370	* Add: Swedish translation
371	* Update: Move inline JavaScript to wp-user-avatar.js and wp-user-avatar-admin.js
372	* Update: Load JavaScript in footer

398	* Bug Fix: Use wp_die for errors
399
400	= 1.4 =
401	+ * Add: Uploader for Contributors & Subscribers
402	* Add: Media states for avatar images
403	* Add: Plugin admin settings
404	* Update: Change support only to WP 3.4+

uninstall.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	/**
3	* @package WP User Avatar
4	- * @version 1.5.4
5	*/
6
7	// Remove user metadata and options on plugin delete
	@@ -26,6 +26,10 @@ if(is_multisite()){
26	delete_option('wp_user_avatar_disable_gravatar');
27	delete_option('wp_user_avatar_edit_avatar');
28	delete_option('wp_user_avatar_load_scripts');




29	delete_option('wp_user_avatar_tinymce');
30	delete_option('wp_user_avatar_upload_size_limit');
31	delete_option('wp_user_avatar_default_avatar_updated');
	@@ -41,6 +45,10 @@ if(is_multisite()){
41	delete_option('wp_user_avatar_disable_gravatar');
42	delete_option('wp_user_avatar_edit_avatar');
43	delete_option('wp_user_avatar_load_scripts');




44	delete_option('wp_user_avatar_tinymce');
45	delete_option('wp_user_avatar_upload_size_limit');
46	delete_option('wp_user_avatar_default_avatar_updated');


1	<?php
2	/**
3	* @package WP User Avatar
4	+ * @version 1.6.6
5	*/
6
7	// Remove user metadata and options on plugin delete

26	delete_option('wp_user_avatar_disable_gravatar');
27	delete_option('wp_user_avatar_edit_avatar');
28	delete_option('wp_user_avatar_load_scripts');
29	+ delete_option('wp_user_avatar_resize_crop');
30	+ delete_option('wp_user_avatar_resize_h');
31	+ delete_option('wp_user_avatar_resize_upload');
32	+ delete_option('wp_user_avatar_resize_w');
33	delete_option('wp_user_avatar_tinymce');
34	delete_option('wp_user_avatar_upload_size_limit');
35	delete_option('wp_user_avatar_default_avatar_updated');

45	delete_option('wp_user_avatar_disable_gravatar');
46	delete_option('wp_user_avatar_edit_avatar');
47	delete_option('wp_user_avatar_load_scripts');
48	+ delete_option('wp_user_avatar_resize_crop');
49	+ delete_option('wp_user_avatar_resize_h');
50	+ delete_option('wp_user_avatar_resize_upload');
51	+ delete_option('wp_user_avatar_resize_w');
52	delete_option('wp_user_avatar_tinymce');
53	delete_option('wp_user_avatar_upload_size_limit');
54	delete_option('wp_user_avatar_default_avatar_updated');

wp-user-avatar.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	/**
3	* @package WP User Avatar
4	- * @version 1.5.4
5	*/
6	/*
7	Plugin Name: WP User Avatar
	@@ -9,7 +9,7 @@ Plugin URI: http://wordpress.org/plugins/wp-user-avatar/
9	Description: Use any image from your WordPress Media Library as a custom user avatar. Add your own Default Avatar.
10	Author: Bangbay Siboliban
11	Author URI: http://siboliban.org/
12	- Version: 1.5.4
13	Text Domain: wp-user-avatar
14	Domain Path: /lang/
15	*/
	@@ -20,7 +20,7 @@ if(!defined('ABSPATH')){
20	}
21
22	// Define paths and variables
23	- define('WPUA_VERSION', ' 1.5.4');
24	define('WPUA_FOLDER', basename(dirname(__FILE__)));
25	define('WPUA_ABSPATH', trailingslashit(str_replace('\\', '/', WP_PLUGIN_DIR.'/'.WPUA_FOLDER)));
26	define('WPUA_URLPATH', trailingslashit(plugins_url(WPUA_FOLDER)));
	@@ -32,13 +32,16 @@ $wpua_allow_upload = get_option('wp_user_avatar_allow_upload');
32	$wpua_avatar_default = get_option('avatar_default_wp_user_avatar');
33	$wpua_disable_gravatar = get_option('wp_user_avatar_disable_gravatar');
34	$wpua_edit_avatar = get_option('wp_user_avatar_edit_avatar');




35	$wpua_tinymce = get_option('wp_user_avatar_tinymce');
36	$mustache_original = WPUA_URLPATH.'images/wp-user-avatar.png';
37	$mustache_medium = WPUA_URLPATH.'images/wp-user-avatar-300x300.png';
38	$mustache_thumbnail = WPUA_URLPATH.'images/wp-user-avatar-150x150.png';
39	$mustache_avatar = WPUA_URLPATH.'images/wp-user-avatar-96x96.png';
40	$mustache_admin = WPUA_URLPATH.'images/wp-user-avatar-32x32.png';
41	- $ssl = is_ssl() ? 's' : "";
42
43	// Check for updates
44	$wpua_default_avatar_updated = get_option('wp_user_avatar_default_avatar_updated');
	@@ -91,6 +94,10 @@ function wpua_options(){
91	add_option('wp_user_avatar_allow_upload', '0');
92	add_option('wp_user_avatar_disable_gravatar', '0');
93	add_option('wp_user_avatar_edit_avatar', '1');




94	add_option('wp_user_avatar_tinymce', '1');
95	add_option('wp_user_avatar_upload_size_limit', '0');
96	}
	@@ -162,7 +169,7 @@ if((bool) $wpua_allow_upload == 1){
162	add_action('user_edit_form_tag', 'wpua_add_edit_form_multipart_encoding');
163
164	// Check user role
165	- function ~~check_user_role~~($role, $user_id=null){
166	global $current_user;
167	$user = is_numeric($user_id) ? get_userdata($user_id) : $current_user->ID;
168	if(empty($user)){
	@@ -174,7 +181,7 @@ if((bool) $wpua_allow_upload == 1){
174	// Remove menu items
175	function wpua_subscriber_remove_menu_pages(){
176	global $current_user;
177	- if(~~check_user_role~~('subscriber', $current_user->ID)){
178	remove_menu_page('edit.php');
179	remove_menu_page('edit-comments.php');
180	remove_menu_page('tools.php');
	@@ -185,7 +192,7 @@ if((bool) $wpua_allow_upload == 1){
185	// Remove menu bar items
186	function wpua_subscriber_remove_menu_bar_items(){
187	global $current_user, $wp_admin_bar;
188	- if(~~check_user_role~~('subscriber', $current_user->ID)){
189	$wp_admin_bar->remove_menu('comments');
190	$wp_admin_bar->remove_menu('new-content');
191	}
	@@ -195,7 +202,7 @@ if((bool) $wpua_allow_upload == 1){
195	// Remove dashboard items
196	function wpua_subscriber_remove_dashboard_widgets(){
197	global $current_user;
198	- if(~~check_user_role~~('subscriber', $current_user->ID)){
199	remove_meta_box('dashboard_quick_press', 'dashboard', 'side');
200	remove_meta_box('dashboard_recent_drafts', 'dashboard', 'side');
201	remove_meta_box('dashboard_right_now', 'dashboard', 'normal');
	@@ -211,7 +218,7 @@ if((bool) $wpua_allow_upload == 1){
211	} else {
212	$offlimits = array('edit.php', 'edit-comments.php', 'post.php', 'post-new.php', 'tools.php');
213	}
214	- if(~~check_user_role~~('subscriber', $current_user->ID)){
215	if(in_array($pagenow, $offlimits)){
216	do_action('admin_page_access_denied');
217	wp_die(__('You do not have sufficient permissions to access this page.'));
	@@ -250,11 +257,74 @@ function wpua_deactivate(){
250	update_option('avatar_default', 'mystery');
251	}
252































































253	// WP User Avatar
254	if(!class_exists('wp_user_avatar')){
255	class wp_user_avatar{
256	function wp_user_avatar(){
257	- global $current_screen, $current_user, $pagenow, $show_avatars, $wpua_allow_upload, $wpua_upload_size_limit;
258	// Add WPUA to profile
259	if(current_user_can('upload_files') \|\| ((bool) $wpua_allow_upload == 1 && is_user_logged_in())){
260	// For themes that use this function
	@@ -274,19 +344,24 @@ if(!class_exists('wp_user_avatar')){
274	}
275	// Prefilter upload size
276	if(!current_user_can('upload_files')){
277	- add_filter('wp_handle_upload_prefilter', array($this, 'wpua_handle_upload_prefilter')~~, 10, 1~~);
278	}
279	// Admin menu settings
280	add_action('admin_menu', 'wpua_admin');
281	- add_filter('plugin_action_links', array($this, '~~wpua_plugin_settings_links~~'), 10, 2);

282	// Hide column in Users table if default avatars are enabled
283	if((bool) $show_avatars == 0 && is_admin()){
284	add_filter('manage_users_columns', array($this, 'wpua_add_column'), 10, 1);
285	add_filter('manage_users_custom_column', array($this, 'wpua_show_column'), 10, 3);
286	}





287	}
288	}
289	-
290	// Add to edit user profile
291	function wpua_action_show_user_profile($user){
292	global $blog_id, $current_user, $post, $show_avatars, $wpdb, $wpua_allow_upload, $wpua_edit_avatar, $wpua_upload_size_limit_with_units;
	@@ -303,31 +378,22 @@ if(!class_exists('wp_user_avatar')){
303	// Change text on message based on current user
304	$profile = ($current_user->ID == $user->ID) ? '“'.__('Update Profile').'”' : '“'.__('Update User').'”';
305	?>
306	- <?php if(~~class_exists(~~'~~bbPress~~') ~~&& bbp_is_edit()) : // Add to bbPress profile with same style~~ ?>
307	- <h2 class="entry-title"><?php _e('Avatar'); ?></h2>
308	- <fieldset class="bbp-form">
309	- <legend><?php _e('Image'); ?></legend>
310	- <?php else : // Add to profile with admin style ?>
311	- <h3><?php _e('Avatar') ?></h3>
312	- <table class="form-table">
313	- <tr>
314	- <th><label for="wp_user_avatar"><?php _e('Image'); ?></label></th>
315	- <td>
316	- <?php endif; ?>
317	<input type="hidden" name="wp-user-avatar" id="wp-user-avatar" value="<?php echo $wpua; ?>" />
318	<?php if(current_user_can('upload_files')) : // Button to launch Media uploader ?>
319	- <p><button type="button" class="button" id="wpua-add" name="wpua-add"><?php _e('Edit Image'); ?></button></p>
320	<?php elseif(!current_user_can('upload_files') && !has_wp_user_avatar($current_user->ID)) : // Upload button ?>
321	- <~~input~~ ~~name="wp-user-avatar-file"~~ id="wpua-~~file~~" ~~type="file" />~~
322	- <~~button~~ ~~type~~="~~submit~~" ~~class="button"~~ id="~~upload~~-~~wp-user-avatar~~" ~~name~~="~~upload-wp-user-avatar~~" ~~value="<?php _e('Upload'); ?>"><?php _e('Upload'); ?></button>~~
323	- <p>
324	- ~~<?php printf(__('Maximum upload file size: %d%s.'), esc_html($wpua_upload_size_limit_with_units), esc_html('KB')); ?>~~
325	- <br />
326	- <?php _e('~~Allowed~~ ~~Files');~~ ~~?>:~~ ~~<?php~~ ~~_e(~~'~~<code>jpg~~ ~~jpeg~~ ~~png gif</code>~~'); ?>

327	</p>
328	<?php elseif((bool) $wpua_edit_avatar == 1 && !current_user_can('upload_files') && has_wp_user_avatar($current_user->ID) && wpua_author($wpua, $current_user->ID)) : // Edit button ?>
329	<?php $edit_attachment_link = add_query_arg(array('post' => $wpua, 'action' => 'edit'), admin_url('post.php')); ?>
330	- <p><button type="button" class="button" id="wpua-edit" name="wpua-edit" onclick="window.open('<?php echo $edit_attachment_link; ?>', '_self');"><?php _e('Edit Image'); ?></button></p>
331	<?php endif; ?>
332	<p id="wpua-preview">
333	<img src="<?php echo $avatar_medium; ?>" alt="" />
	@@ -337,15 +403,9 @@ if(!class_exists('wp_user_avatar')){
337	<img src="<?php echo $avatar_thumbnail; ?>" alt="" />
338	<?php _e('Thumbnail'); ?>
339	</p>
340	- <p><button type="button" class="button<?php echo $hide_remove; ?>" id="wpua-remove" name="wpua-remove"><?php _e('Remove'); ?></button></p>
341	<p id="wpua-message"><?php printf(__('Click %s to save your changes', 'wp-user-avatar'), $profile); ?></p>
342	- <?php if(~~class_exists(~~'~~bbPress~~') ~~&& bbp_is_edit()) : // Add to bbPress profile with same style~~ ?>
343	- </fieldset>
344	- <?php else : // Add to profile with admin style ?>
345	- </td>
346	- </tr>
347	- </table>
348	- <?php endif; ?>
349	<?php
350	}
351
	@@ -353,15 +413,15 @@ if(!class_exists('wp_user_avatar')){
353	function wpua_handle_upload_prefilter($file){
354	global $wpua_upload_size_limit;
355	$size = $file['size'];
356	- if($size > $wpua_upload_size_limit){
357	- ~~$file['error'] =~~ __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.');
358	}
359	return $file;
360	}
361
362	// Update user meta
363	function wpua_action_process_option_update($user_id){
364	- global $blog_id, $wpdb;
365	// Check if user has upload_files capability
366	if(current_user_can('upload_files')){
367	$wpua_id = isset($_POST['wp-user-avatar']) ? intval($_POST['wp-user-avatar']) : "";
	@@ -369,83 +429,85 @@ if(!class_exists('wp_user_avatar')){
369	add_post_meta($wpua_id, '_wp_attachment_wp_user_avatar', $user_id);
370	update_user_meta($user_id, $wpdb->get_blog_prefix($blog_id).'user_avatar', $wpua_id);
371	} else {

372	if(isset($_POST['wp-user-avatar']) && empty($_POST['wp-user-avatar'])){
373	// Uploads by user
374	- $attachments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE post_author = %d AND post_type = %s", $user_id, 'attachment'));
375	foreach($attachments as $attachment){
376	// Delete attachment if not used by another user
377	if(!wpua_image($attachment->ID, $user_id)){
378	- ~~wp_delete_post~~($attachment->ID);
379	}
380	}
381	update_user_meta($user_id, $wpdb->get_blog_prefix($blog_id).'user_avatar', "");
382	}
383	// Create attachment from upload
384	- if(isset($_POST['~~upload-wp-user-avatar~~']) && $_POST['~~upload~~-~~wp-user-avatar~~']){
385	if(!function_exists('wp_handle_upload')){
386	- require_once(ABSPATH.'wp-admin/includes/admin.php');
387	require_once(ABSPATH.'wp-admin/includes/file.php');
388	}
389	- ~~$name = $_FILES[~~'~~wp-user-avatar-file~~'~~]['name'];~~
390	- ~~$file = wp_handle_upload~~(~~$_FILES[~~'wp-~~user-avatar-file~~'~~], array('test_form' => false~~));
391	- $type = $file['type'];
392	- // Allow only JPG, GIF, PNG
393	- if($file['error'] \|\| !preg_match('/(jpe?g\|gif\|png)$/i', $type)){
394	- if($file['error']){
395	- wp_die($file['error']);
396	- } else {
397	- wp_die(__('Sorry, this file type is not permitted for security reasons.'));
398	- }
399	}
400	- // ~~Break~~ ~~out~~ file ~~info~~
401	- $~~name_parts~~ = ~~pathinfo~~($~~name~~);
402	- ~~$name = trim~~(~~substr~~($~~name, 0,~~ -~~(1 + strlen($name_parts~~['~~extension~~']))~~));~~
403	- $~~url~~ = $file['~~url~~'];
404	- ~~$file~~ = ~~$file['file'];~~
405	- ~~$title~~ = $~~name;~~
406	- // ~~Use~~ ~~image~~ ~~exif/iptc~~ ~~data~~ for ~~title~~ ~~if possible~~
407	- ~~if($image_meta~~ = ~~@wp_read_image_metadata($file))~~{
408	- ~~if(trim($image_meta['title'])~~ && ~~!is_numeric(sanitize_title($image_meta['title']))){~~
409	- $~~title~~ = ~~$image_meta['title'];~~









































410	}
411	}
412	- // Construct the attachment array
413	- $attachment = array(
414	- 'guid' => $url,
415	- 'post_mime_type' => $type,
416	- 'post_title' => $title
417	- );
418	- // This should never be set as it would then overwrite an existing attachment
419	- if(isset($attachment['ID'])){
420	- unset($attachment['ID']);
421	- }
422	- // Save the attachment metadata
423	- $attachment_id = wp_insert_attachment($attachment, $file);
424	- if(!is_wp_error($attachment_id)){
425	- require_once(ABSPATH.'wp-admin/includes/image.php');
426	- wp_update_attachment_metadata($attachment_id, wp_generate_attachment_metadata($attachment_id, $file));
427	- $wpdb->query($wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %d", '_wp_attachment_wp_user_avatar', $user_id));
428	- add_post_meta($attachment_id, '_wp_attachment_wp_user_avatar', $user_id);
429	- update_user_meta($user_id, $wpdb->get_blog_prefix($blog_id).'user_avatar', $attachment_id);
430	- }
431	}
432	}
433	}
434
435	- // Add ~~button~~ to ~~attach~~ ~~image~~ ~~for WP 3.4 and older~~
436	- function ~~wpua_add_attachment_field_to_edit~~($~~fields~~, $~~post~~){
437	- $image = wp_get_attachment_image_src($post->ID, "medium");
438	- $button = '<button type="button" class="button" id="set-wp-user-avatar-image" name="set-wp-user-avatar-image" onclick="wpuaSetAvatar(\''.$post->ID.'\', \''.$image[0].'\')">'.__('Select Image').'</button>';
439	- $fields['wp-user-avatar'] = array(
440	- 'label' => __('WP User Avatar', 'wp-user-avatar'),
441	- 'input' => 'html',
442	- 'html' => $button
443	- );
444	- return $fields;
445	- }
446	-
447	- // Add settings link on plugin page
448	- function wpua_plugin_settings_links($links, $file){
449	if(basename($file) == basename(plugin_basename(__FILE__))){
450	$settings_link = '<a href="'.add_query_arg(array('page' => 'wp-user-avatar'), admin_url('options-general.php')).'">'.__('Settings').'</a>';
451	$links = array_merge($links, array($settings_link));
	@@ -453,6 +515,16 @@ if(!class_exists('wp_user_avatar')){
453	return $links;
454	}
455










456	// Add column to Users table
457	function wpua_add_column($columns){
458	return $columns + array('wp-user-avatar' => __('WP User Avatar', 'wp-user-avatar'));
	@@ -463,9 +535,8 @@ if(!class_exists('wp_user_avatar')){
463	global $blog_id, $wpdb;
464	$wpua = get_user_meta($user_id, $wpdb->get_blog_prefix($blog_id).'user_avatar', true);
465	$wpua_image = wp_get_attachment_image($wpua, array(32,32));
466	- if($column_name == 'wp-user-avatar'){
467	- return $~~wpua_image~~;
468	- }
469	}
470
471	// Media uploader
	@@ -475,8 +546,10 @@ if(!class_exists('wp_user_avatar')){
475	if(current_user_can('upload_files')){
476	wp_enqueue_script('admin-bar');
477	wp_enqueue_media();



478	}
479	- wp_enqueue_script('wp-user-avatar', WPUA_URLPATH.'js/wp-user-avatar.js', array('jquery'), WPUA_VERSION, true);
480	wp_enqueue_style('wp-user-avatar', WPUA_URLPATH.'css/wp-user-avatar.css', "", WPUA_VERSION);
481	// Admin scripts
482	if($pagenow == 'options-discussion.php' \|\| ($pagenow == 'options-general.php' && isset($_GET['page']) && $_GET['page'] == 'wp-user-avatar')){
	@@ -501,7 +574,6 @@ if(!class_exists('wp_user_avatar')){
501
502	// Returns true if user has Gravatar-hosted image
503	function wpua_has_gravatar($id_or_email, $has_gravatar=false, $user="", $email=""){
504	- global $ssl;
505	if(!is_object($id_or_email) && !empty($id_or_email)){
506	// Find user by ID or e-mail address
507	$user = is_numeric($id_or_email) ? get_user_by('id', $id_or_email) : get_user_by('email', $id_or_email);
	@@ -509,12 +581,15 @@ if(!class_exists('wp_user_avatar')){
509	$email = !empty($user) ? $user->user_email : "";
510	}
511	// Check if Gravatar image returns 200 (OK) or 404 (Not Found)
512	- if(~~!empty~~($email)){
513	- $~~hash~~ = ~~md5(strtolower(trim($email)))~~;
514	- $~~gravatar~~ = ~~'http'.$ssl.'://www.gravatar.com/avatar/'.$~~hash~~.'?d=404'~~;
515	- ~~$headers~~ = ~~@get_headers(~~$~~gravatar~~);
516	- $~~has_gravatar~~ = ~~!preg_match~~(~~"\|200\|",~~ $~~headers[0]~~) ~~? false : true~~;


517	}

518	return $has_gravatar;
519	}
520
	@@ -528,17 +603,17 @@ if(!class_exists('wp_user_avatar')){
528	$user_id = !empty($user) ? $user->ID : "";
529	}
530	$wpua = get_user_meta($user_id, $wpdb->get_blog_prefix($blog_id).'user_avatar', true);
531	- $has_wpua = !empty($wpua) ? true : false;
532	return $has_wpua;
533	}
534
535	// Replace get_avatar only in get_wp_user_avatar
536	function wpua_get_avatar_filter($avatar, $id_or_email="", $size="", $default="", $alt=""){
537	- global $avatar_default, $~~comment, $~~mustache_admin, $mustache_avatar, $mustache_medium, $mustache_original, $mustache_thumbnail, $post, $wpua_avatar_default, $wpua_disable_gravatar;
538	// User has WPUA
539	if(is_object($id_or_email)){
540	- if(!empty($~~comment~~->comment_author_email)){
541	- $avatar = get_wp_user_avatar($~~comment~~, $size, $default, $alt);
542	} else {
543	$avatar = get_wp_user_avatar('unknown@gravatar.com', $size, $default, $alt);
544	}
	@@ -551,14 +626,13 @@ if(!class_exists('wp_user_avatar')){
551	// User doesn't have WPUA or Gravatar and Default Avatar is wp_user_avatar, show custom Default Avatar
552	} elseif($avatar_default == 'wp_user_avatar'){
553	// Show custom Default Avatar
554	- if(!empty($wpua_avatar_default)){
555	// Get image
556	$wpua_avatar_default_image = wp_get_attachment_image_src($wpua_avatar_default, array($size,$size));
557	// Image src
558	$default = $wpua_avatar_default_image[0];
559	// Add dimensions if numeric size
560	$dimensions = ' width="'.$wpua_avatar_default_image[1].'" height="'.$wpua_avatar_default_image[2].'"';
561	- $defaultcss = "";
562	} else {
563	// Get mustache image based on numeric size comparison
564	if($size > get_option('medium_size_w')){
	@@ -574,10 +648,9 @@ if(!class_exists('wp_user_avatar')){
574	}
575	// Add dimensions if numeric size
576	$dimensions = ' width="'.$size.'" height="'.$size.'"';
577	- $defaultcss = ' avatar-default';
578	}
579	// Construct the img tag
580	- $avatar = "<img src='".$default."'".$dimensions." alt='".$alt."' class='wp-user-avatar wp-user-avatar-".$size." ~~avatar~~ avatar-"~~.$size."~~ ~~photo~~'~~".$defaultcss." />"~~;
581	}
582	}
583	return $avatar;
	@@ -595,7 +668,7 @@ if(!class_exists('wp_user_avatar')){
595	// User doesn't have Gravatar and Default Avatar is wp_user_avatar, show custom Default Avatar
596	if(!wpua_has_gravatar($id_or_email) && $avatar_default == 'wp_user_avatar'){
597	// Show custom Default Avatar
598	- if(!empty($wpua_avatar_default)){
599	$wpua_avatar_default_image = wp_get_attachment_image_src($wpua_avatar_default, array($size,$size));
600	$default = $wpua_avatar_default_image[0];
601	} else {
	@@ -606,10 +679,10 @@ if(!class_exists('wp_user_avatar')){
606	$wpua_image = get_avatar($id_or_email, $size);
607	// Takes the img tag, extracts the src
608	$output = preg_match_all('/<img.+src=[\'"]([^\'"]+)[\'"].*>/i', $wpua_image, $matches, PREG_SET_ORDER);
609	- $default = $matches [0] [1];
610	}
611	} else {
612	- if(!empty($wpua_avatar_default)){
613	$wpua_avatar_default_image = wp_get_attachment_image_src($wpua_avatar_default, array($size,$size));
614	$default = $wpua_avatar_default_image[0];
615	} else {
	@@ -620,21 +693,21 @@ if(!class_exists('wp_user_avatar')){
620	}
621
622	// Find WPUA, show get_avatar if empty
623	- function get_wp_user_avatar($id_or_email="", $size='96', $align="", $alt=""){
624	- global $avatar_default, $blog_id, $~~comment~~, $~~post~~, $~~wpdb~~;
625	// Checks if comment
626	if(is_object($id_or_email)){
627	// Checks if comment author is registered user by user ID
628	- if($~~comment~~->user_id != 0){
629	- $~~id_or_email~~ = $~~comment~~->user_id;
630	// Checks that comment author isn't anonymous
631	- } elseif(!empty($~~comment~~->comment_author_email)){
632	// Checks if comment author is registered user by e-mail address
633	- $user = get_user_by('email', $~~comment~~->comment_author_email);
634	// Get registered user info from profile, otherwise e-mail address should be value
635	- $~~id_or_email~~ = !empty($user) ? $user->ID : $~~comment~~->comment_author_email;
636	}
637	- $alt = $~~comment~~->comment_author;
638	} else {
639	if(!empty($id_or_email)){
640	// Find user by ID or e-mail address
	@@ -653,14 +726,14 @@ if(!class_exists('wp_user_avatar')){
653	}
654	// Set user's ID and name
655	if(!empty($user)){
656	- $~~id_or_email~~ = $user->ID;
657	$alt = $user->display_name;
658	}
659	}
660	// Checks if user has WPUA
661	- $wpua_meta = ~~!empty($id_or_email) ?~~ get_the_author_meta($wpdb->get_blog_prefix($blog_id).'user_avatar', $~~id_or_email~~) ~~: ""~~;
662	// Add alignment class
663	- $alignclass = !empty($align) ? ' align'.$align : "";
664	// User has WPUA, bypass get_avatar
665	if(!empty($wpua_meta)){
666	// Numeric size use size array
	@@ -670,24 +743,34 @@ if(!class_exists('wp_user_avatar')){
670	// Add dimensions to img only if numeric size was specified
671	$dimensions = is_numeric($size) ? ' width="'.$wpua_image[1].'" height="'.$wpua_image[2].'"' : "";
672	// Construct the img tag
673	- $avatar = '<img src="'.$wpua_image[0].'"'.$dimensions.' alt="'.$alt.'" class="wp-user-avatar wp-user-avatar-'.$size.$alignclass.' ~~avatar avatar avatar-'.$size.'~~ photo" />';
674	} else {
675	// Get numeric sizes for non-numeric sizes based on media options
676	- if(~~$size ==~~ '~~original~~' ~~\|\| $size == 'large' \|\| $size == 'medium' \|\| $size == 'thumbnail'~~){
677	- ~~$get_size =~~ (~~$size ==~~ '~~original') ? get_option('large_size_w') : get_option($size~~.'~~_size_w'~~);









678	} else {
679	// Numeric sizes leave as-is
680	$get_size = $size;
681	}
682	// User with no WPUA uses get_avatar
683	- $avatar = get_avatar($~~id_or_email~~, $get_size, $default="", $alt="");
684	// Remove width and height for non-numeric sizes
685	- if(~~!is_numeric~~($size)){
686	- $avatar = preg_replace("/(width\|height)=\'\d*\'\s/", "", $avatar);
687	$avatar = preg_replace('/(width\|height)=\"\d*\"\s/', "", $avatar);
688	- $avatar = ~~str_replace~~('~~wp-user-avatar wp-user-avatar-~~'~~.$get_size.' '~~, "", $avatar);
689	- $avatar = str_replace("class='", "class='wp-user-avatar wp-user-avatar-".$size.$alignclass." ", $avatar);
690	}



691	}
692	return $avatar;
693	}
	@@ -700,7 +783,7 @@ if(!class_exists('wp_user_avatar')){
700	// Takes the img tag, extracts the src
701	if(!empty($wpua_image)){
702	$output = preg_match_all('/<img.+src=[\'"]([^\'"]+)[\'"].*>/i', $wpua_image, $matches, PREG_SET_ORDER);
703	- $wpua_image_src = $matches [0] [1];
704	}
705	return $wpua_image_src;
706	}
	@@ -717,7 +800,7 @@ if(!class_exists('wp_user_avatar')){
717	$user = empty($user) ? get_user_by('email', $user) : $user;
718	}
719	// Get user ID
720	- $id_or_email = !empty($user) ? $user->ID : "";
721	// Check if link is set
722	if(!empty($link)){
723	// CSS class is same as link type, except for URL
	@@ -776,13 +859,13 @@ if(!class_exists('wp_user_avatar')){
776	$avatar_list .= '<br />';
777	}
778	// Show remove link if custom Default Avatar is set
779	- if(!empty($wpua_avatar_default)){
780	$avatar_thumb_src = wp_get_attachment_image_src($wpua_avatar_default, array(32,32));
781	$avatar_thumb = $avatar_thumb_src[0];
782	$hide_remove = "";
783	} else {
784	$avatar_thumb = $mustache_admin;
785	- $hide_remove = ' ~~class~~="~~wpua-hide~~"';
786	}
787	// Default Avatar is wp_user_avatar, check the radio button next to it
788	$selected_avatar = ((bool) $wpua_disable_gravatar == 1 \|\| $avatar_default == 'wp_user_avatar') ? ' checked="checked" ' : "";
	@@ -846,12 +929,13 @@ if(!class_exists('wp_user_avatar')){
846
847	// Admin page
848	function wpua_options_page(){
849	- global $show_avatars, $upload_size_limit_with_units, $wpua_allow_upload, $wpua_disable_gravatar, $wpua_edit_avatar, $wpua_tinymce, $wpua_upload_size_limit, $wpua_upload_size_limit_with_units;
850	// Give subscribers edit_posts capability
851	if(isset($_GET['settings-updated']) && $_GET['settings-updated'] == 'true' && (empty($wpua_allow_upload) \|\| empty($wpua_edit_avatar))){
852	wpua_subscriber_remove_cap();
853	}
854	- $hide_size = (bool) $wpua_allow_upload != 1 ? ' ~~class~~="~~wpua-hide~~"' : "";

855	?>
856	<div class="wrap">
857	<?php screen_icon(); ?>
	@@ -859,6 +943,7 @@ if(!class_exists('wp_user_avatar')){
859	<form method="post" action="options.php">
860	<?php settings_fields('wpua-settings-group'); ?>
861	<?php do_settings_fields('wpua-settings-group', ""); ?>

862	<table class="form-table">
863	<tr valign="top">
864	<th scope="row"><?php _e('Settings'); ?></th>
	@@ -869,12 +954,14 @@ if(!class_exists('wp_user_avatar')){
869	<input name="wp_user_avatar_tinymce" type="checkbox" id="wp_user_avatar_tinymce" value="1" <?php checked($wpua_tinymce, 1); ?> />
870	<?php _e('Add avatar button to Visual Editor', 'wp-user-avatar'); ?>
871	</label>
872	- ~~<br />~~

873	<label for="wp_user_avatar_allow_upload">
874	<input name="wp_user_avatar_allow_upload" type="checkbox" id="wp_user_avatar_allow_upload" value="1" <?php checked($wpua_allow_upload, 1); ?> />
875	<?php _e('Allow Contributors & Subscribers to upload avatars', 'wp-user-avatar'); ?>
876	</label>
877	- ~~<br />~~

878	<label for="wp_user_avatar_disable_gravatar">
879	<input name="wp_user_avatar_disable_gravatar" type="checkbox" id="wp_user_avatar_disable_gravatar" value="1" <?php checked($wpua_disable_gravatar, 1); ?> />
880	<?php _e('Disable Gravatar and use only local avatars', 'wp-user-avatar'); ?>
	@@ -882,29 +969,51 @@ if(!class_exists('wp_user_avatar')){
882	</fieldset>
883	</td>
884	</tr>
885	- <tr id="wpua-size-limit" valign="top"<?php echo $hide_size; ?>>
886	- <th scope="row">
887	- <label for="wp_user_avatar_upload_size_limit">
888	- <?php _e('Upload Size Limit (only for Contributors & Subscribers)', 'wp-user-avatar'); ?>
889	- </label>
890	- </th>
891	- <td>
892	- <fieldset>
893	- <legend class="screen-reader-text"><span><?php _e('Upload Size Limit (only for Contributors & Subscribers)', 'wp-user-avatar'); ?></span></legend>
894	- <input name="wp_user_avatar_upload_size_limit" type="text" id="wp_user_avatar_upload_size_limit" value="<?php echo $wpua_upload_size_limit; ?>" class="regular-text" />
895	- <span id="wpua-readable-size"><?php echo $wpua_upload_size_limit_with_units; ?></span>
896	- <span id="wpua-readable-size-error"><?php printf(__('%s exceeds the maximum upload size for this site.'), ""); ?></span>
897	- <div id="wpua-slider"></div>
898	- <span class="description"><?php printf(__('Maximum upload file size: %d%s.'), esc_html(wp_max_upload_size()), esc_html(' bytes ('.$upload_size_limit_with_units.')')); ?></span>
899	- <br />
900	- <label for="wp_user_avatar_edit_avatar">
901	- <input name="wp_user_avatar_edit_avatar" type="checkbox" id="wp_user_avatar_edit_avatar" value="1" <?php checked($wpua_edit_avatar, 1); ?> />
902	- <?php _e('Allow users to edit avatars', 'wp-user-avatar'); ?>
903	- </label>
904	- </fieldset>
905	- </td>
906	- </tr>
907	</table>












































908	<h3 class="title"><?php _e('Avatars'); ?></h3>
909	<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
910	<table class="form-table">
	@@ -967,6 +1076,10 @@ if(!class_exists('wp_user_avatar')){
967	register_setting('wpua-settings-group', 'wp_user_avatar_allow_upload', 'intval');
968	register_setting('wpua-settings-group', 'wp_user_avatar_disable_gravatar', 'intval');
969	register_setting('wpua-settings-group', 'wp_user_avatar_edit_avatar', 'intval');




970	register_setting('wpua-settings-group', 'wp_user_avatar_upload_size_limit', 'intval');
971	}
972
	@@ -983,4 +1096,5 @@ if(!class_exists('wp_user_avatar')){
983	}
984	add_action('plugins_loaded', 'wpua_load');
985	}

986	?>


1	<?php
2	/**
3	* @package WP User Avatar
4	+ * @version 1.6.6
5	*/
6	/*
7	Plugin Name: WP User Avatar

9	Description: Use any image from your WordPress Media Library as a custom user avatar. Add your own Default Avatar.
10	Author: Bangbay Siboliban
11	Author URI: http://siboliban.org/
12	+ Version: 1.6.6
13	Text Domain: wp-user-avatar
14	Domain Path: /lang/
15	*/

20	}
21
22	// Define paths and variables
23	+ define('WPUA_VERSION', ' 1.6.6');
24	define('WPUA_FOLDER', basename(dirname(__FILE__)));
25	define('WPUA_ABSPATH', trailingslashit(str_replace('\\', '/', WP_PLUGIN_DIR.'/'.WPUA_FOLDER)));
26	define('WPUA_URLPATH', trailingslashit(plugins_url(WPUA_FOLDER)));

32	$wpua_avatar_default = get_option('avatar_default_wp_user_avatar');
33	$wpua_disable_gravatar = get_option('wp_user_avatar_disable_gravatar');
34	$wpua_edit_avatar = get_option('wp_user_avatar_edit_avatar');
35	+ $wpua_resize_crop = get_option('wp_user_avatar_resize_crop');
36	+ $wpua_resize_h = get_option('wp_user_avatar_resize_h');
37	+ $wpua_resize_upload = get_option('wp_user_avatar_resize_upload');
38	+ $wpua_resize_w = get_option('wp_user_avatar_resize_w');
39	$wpua_tinymce = get_option('wp_user_avatar_tinymce');
40	$mustache_original = WPUA_URLPATH.'images/wp-user-avatar.png';
41	$mustache_medium = WPUA_URLPATH.'images/wp-user-avatar-300x300.png';
42	$mustache_thumbnail = WPUA_URLPATH.'images/wp-user-avatar-150x150.png';
43	$mustache_avatar = WPUA_URLPATH.'images/wp-user-avatar-96x96.png';
44	$mustache_admin = WPUA_URLPATH.'images/wp-user-avatar-32x32.png';

45
46	// Check for updates
47	$wpua_default_avatar_updated = get_option('wp_user_avatar_default_avatar_updated');

94	add_option('wp_user_avatar_allow_upload', '0');
95	add_option('wp_user_avatar_disable_gravatar', '0');
96	add_option('wp_user_avatar_edit_avatar', '1');
97	+ add_option('wp_user_avatar_resize_crop', '0');
98	+ add_option('wp_user_avatar_resize_h', '96');
99	+ add_option('wp_user_avatar_resize_upload', '0');
100	+ add_option('wp_user_avatar_resize_w', '96');
101	add_option('wp_user_avatar_tinymce', '1');
102	add_option('wp_user_avatar_upload_size_limit', '0');
103	}

169	add_action('user_edit_form_tag', 'wpua_add_edit_form_multipart_encoding');
170
171	// Check user role
172	+ function wpua_check_user_role($role, $user_id=null){
173	global $current_user;
174	$user = is_numeric($user_id) ? get_userdata($user_id) : $current_user->ID;
175	if(empty($user)){

181	// Remove menu items
182	function wpua_subscriber_remove_menu_pages(){
183	global $current_user;
184	+ if(wpua_check_user_role('subscriber', $current_user->ID)){
185	remove_menu_page('edit.php');
186	remove_menu_page('edit-comments.php');
187	remove_menu_page('tools.php');

192	// Remove menu bar items
193	function wpua_subscriber_remove_menu_bar_items(){
194	global $current_user, $wp_admin_bar;
195	+ if(wpua_check_user_role('subscriber', $current_user->ID)){
196	$wp_admin_bar->remove_menu('comments');
197	$wp_admin_bar->remove_menu('new-content');
198	}

202	// Remove dashboard items
203	function wpua_subscriber_remove_dashboard_widgets(){
204	global $current_user;
205	+ if(wpua_check_user_role('subscriber', $current_user->ID)){
206	remove_meta_box('dashboard_quick_press', 'dashboard', 'side');
207	remove_meta_box('dashboard_recent_drafts', 'dashboard', 'side');
208	remove_meta_box('dashboard_right_now', 'dashboard', 'normal');

218	} else {
219	$offlimits = array('edit.php', 'edit-comments.php', 'post.php', 'post-new.php', 'tools.php');
220	}
221	+ if(wpua_check_user_role('subscriber', $current_user->ID)){
222	if(in_array($pagenow, $offlimits)){
223	do_action('admin_page_access_denied');
224	wp_die(__('You do not have sufficient permissions to access this page.'));

257	update_option('avatar_default', 'mystery');
258	}
259
260	+ // Before wrapper for profile
261	+ function wpua_before_avatar(){
262	+ do_action('wpua_before_avatar');
263	+ }
264	+
265	+ // After wrapper for profile
266	+ function wpua_after_avatar(){
267	+ do_action('wpua_after_avatar');
268	+ }
269	+
270	+ // Before avatar container
271	+ function wpua_do_before_avatar(){ ?>
272	+ <?php if(class_exists('bbPress') && bbp_is_edit()) : // Add to bbPress profile with same style ?>
273	+ <h2 class="entry-title"><?php _e('Avatar'); ?></h2>
274	+ <fieldset class="bbp-form">
275	+ <legend><?php _e('Image'); ?></legend>
276	+ <?php elseif(class_exists('WPUF_Main') && is_page()) : // Add to WP User Frontend profile with same style ?>
277	+ <fieldset>
278	+ <legend><?php _e('Avatar') ?></legend>
279	+ <table class="wpuf-table">
280	+ <tr>
281	+ <th><label for="wp_user_avatar"><?php _e('Image'); ?></label></th>
282	+ <td>
283	+ <?php else : // Add to profile with admin style ?>
284	+ <h3><?php _e('Avatar') ?></h3>
285	+ <table class="form-table">
286	+ <tr>
287	+ <th><label for="wp_user_avatar"><?php _e('Image'); ?></label></th>
288	+ <td>
289	+ <?php endif; ?>
290	+ <?php
291	+ }
292	+
293	+ // After avatar container
294	+ function wpua_do_after_avatar(){ ?>
295	+ <?php if(class_exists('bbPress') && bbp_is_edit()) : // Add to bbPress profile with same style ?>
296	+ </fieldset>
297	+ <?php elseif(class_exists('WPUF_Main') && is_page()) : // Add to WP User Frontend profile with same style ?>
298	+ </td>
299	+ </tr>
300	+ </table>
301	+ </fieldset>
302	+ <?php else : // Add to profile with admin style ?>
303	+ </td>
304	+ </tr>
305	+ </table>
306	+ <?php endif; ?>
307	+ <?php
308	+ }
309	+
310	+ // Donate message
311	+ function wpua_do_donation_message(){ ?>
312	+ <div class="updated">
313	+ <p><?php _e('Do you like WP User Avatar?', 'wp-user-avatar'); ?> <a href="http://siboliban.org/donate" target="_blank"><?php _e('Make a donation.', 'wp-user-avatar'); ?></a></p>
314	+ </div>
315	+ <?php
316	+ }
317	+
318	+ // Filter for the inevitable complaints about the donation message
319	+ function wpua_donation_message(){
320	+ do_action('wpua_donation_message');
321	+ }
322	+
323	// WP User Avatar
324	if(!class_exists('wp_user_avatar')){
325	class wp_user_avatar{
326	function wp_user_avatar(){
327	+ global $current_screen, $current_user, $pagenow, $show_avatars, $wpua_allow_upload, $wpua_resize_upload, $wpua_upload_size_limit;
328	// Add WPUA to profile
329	if(current_user_can('upload_files') \|\| ((bool) $wpua_allow_upload == 1 && is_user_logged_in())){
330	// For themes that use this function

344	}
345	// Prefilter upload size
346	if(!current_user_can('upload_files')){
347	+ add_filter('wp_handle_upload_prefilter', array($this, 'wpua_handle_upload_prefilter'));
348	}
349	// Admin menu settings
350	add_action('admin_menu', 'wpua_admin');
351	+ add_filter('plugin_action_links', array($this, 'wpua_action_links'), 10, 2);
352	+ add_filter('plugin_row_meta', array($this, 'wpua_row_meta'), 10, 2);
353	// Hide column in Users table if default avatars are enabled
354	if((bool) $show_avatars == 0 && is_admin()){
355	add_filter('manage_users_columns', array($this, 'wpua_add_column'), 10, 1);
356	add_filter('manage_users_custom_column', array($this, 'wpua_show_column'), 10, 3);
357	}
358	+ // Profile wrappers
359	+ add_action('wpua_before_avatar', 'wpua_do_before_avatar');
360	+ add_action('wpua_after_avatar', 'wpua_do_after_avatar');
361	+ // Donate message
362	+ add_action('wpua_donation_message', 'wpua_do_donation_message');
363	}
364	}

365	// Add to edit user profile
366	function wpua_action_show_user_profile($user){
367	global $blog_id, $current_user, $post, $show_avatars, $wpdb, $wpua_allow_upload, $wpua_edit_avatar, $wpua_upload_size_limit_with_units;

378	// Change text on message based on current user
379	$profile = ($current_user->ID == $user->ID) ? '“'.__('Update Profile').'”' : '“'.__('Update User').'”';
380	?>
381	+ <?php do_action('wpua_before_avatar'); ?>










382	<input type="hidden" name="wp-user-avatar" id="wp-user-avatar" value="<?php echo $wpua; ?>" />
383	<?php if(current_user_can('upload_files')) : // Button to launch Media uploader ?>
384	+ <p id="wpua-add-button"><button type="button" class="button" id="wpua-add" name="wpua-add"><?php _e('Edit Image'); ?></button></p>
385	<?php elseif(!current_user_can('upload_files') && !has_wp_user_avatar($current_user->ID)) : // Upload button ?>
386	+ <p id="wpua-upload-button">
387	+ <input name="wpua-file" id="wpua-file" type="file" />
388	+ <button type="submit" class="button" id="wpua-upload" name="submit" value="<?php _e('Upload'); ?>"><?php _e('Upload'); ?></button>
389	+ </p>
390	+ <p id="wpua-upload-messages">
391	+ <span id="wpua-max-upload"><?php printf(__('Maximum upload file size: %d%s.'), esc_html($wpua_upload_size_limit_with_units), esc_html('KB')); ?></span>
392	+ <span id="wpua-allowed-files"><?php _e('Allowed Files'); ?>: <?php _e('<code>jpg jpeg png gif</code>'); ?></span>
393	</p>
394	<?php elseif((bool) $wpua_edit_avatar == 1 && !current_user_can('upload_files') && has_wp_user_avatar($current_user->ID) && wpua_author($wpua, $current_user->ID)) : // Edit button ?>
395	<?php $edit_attachment_link = add_query_arg(array('post' => $wpua, 'action' => 'edit'), admin_url('post.php')); ?>
396	+ <p id="wpua-edit-button"><button type="button" class="button" id="wpua-edit" name="wpua-edit" onclick="window.open('<?php echo $edit_attachment_link; ?>', '_self');"><?php _e('Edit Image'); ?></button></p>
397	<?php endif; ?>
398	<p id="wpua-preview">
399	<img src="<?php echo $avatar_medium; ?>" alt="" />

403	<img src="<?php echo $avatar_thumbnail; ?>" alt="" />
404	<?php _e('Thumbnail'); ?>
405	</p>
406	+ <p id="wpua-remove-button"><button type="button" class="button<?php echo $hide_remove; ?>" id="wpua-remove" name="wpua-remove"><?php _e('Remove'); ?></button></p>
407	<p id="wpua-message"><?php printf(__('Click %s to save your changes', 'wp-user-avatar'), $profile); ?></p>
408	+ <?php do_action('wpua_after_avatar'); ?>






409	<?php
410	}
411

413	function wpua_handle_upload_prefilter($file){
414	global $wpua_upload_size_limit;
415	$size = $file['size'];
416	+ if(!empty($size) && $size > $wpua_upload_size_limit){
417	+ wp_die(__('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'));
418	}
419	return $file;
420	}
421
422	// Update user meta
423	function wpua_action_process_option_update($user_id){
424	+ global $blog_id, $wpdb, $wpua_resize_crop, $wpua_resize_h, $wpua_resize_upload, $wpua_resize_w;
425	// Check if user has upload_files capability
426	if(current_user_can('upload_files')){
427	$wpua_id = isset($_POST['wp-user-avatar']) ? intval($_POST['wp-user-avatar']) : "";

429	add_post_meta($wpua_id, '_wp_attachment_wp_user_avatar', $user_id);
430	update_user_meta($user_id, $wpdb->get_blog_prefix($blog_id).'user_avatar', $wpua_id);
431	} else {
432	+ // Remove attachment info if avatar is blank
433	if(isset($_POST['wp-user-avatar']) && empty($_POST['wp-user-avatar'])){
434	// Uploads by user
435	+ $attachments = $wpdb->get_results($wpdb->prepare("SELECT $wpdb->posts.ID FROM $wpdb->posts, $wpdb->postmeta WHERE $wpdb->posts.ID = $wpdb->postmeta.post_id AND $wpdb->posts.post_author = %d AND $wpdb->posts.post_type = %s AND $wpdb->postmeta.meta_key = %s AND $wpdb->postmeta.meta_value = $wpdb->posts.post_author", $user_id, 'attachment', '_wp_attachment_wp_user_avatar'));
436	foreach($attachments as $attachment){
437	// Delete attachment if not used by another user
438	if(!wpua_image($attachment->ID, $user_id)){
439	+ wp_delete_attachment($attachment->ID);
440	}
441	}
442	update_user_meta($user_id, $wpdb->get_blog_prefix($blog_id).'user_avatar', "");
443	}
444	// Create attachment from upload
445	+ if(isset($_POST['submit']) && $_POST['submit'] && !empty($_FILES['wpua-file'])){
446	if(!function_exists('wp_handle_upload')){

447	require_once(ABSPATH.'wp-admin/includes/file.php');
448	}
449	+ if(!function_exists('wp_generate_attachment_metadata')){
450	+ require_once(ABSPATH.'wp-admin/includes/image.php');








451	}
452	+ $name = $_FILES['wpua-file']['name'];
453	+ $file = wp_handle_upload($_FILES['wpua-file'], array('test_form' => false));
454	+ if(!empty($_FILES['wpua-file']['type'])){
455	+ $type = $_FILES['wpua-file']['type'];
456	+ // Allow only JPG, GIF, PNG
457	+ if(!preg_match('/(jpe?g\|gif\|png)$/i', $type)){
458	+ wp_die(__('Sorry, this file type is not permitted for security reasons.'));
459	+ } else {
460	+ // Resize uploaded image
461	+ if((bool) $wpua_resize_upload == 1){
462	+ // Original image
463	+ $uploaded_image = wp_get_image_editor($file['file']);
464	+ // Check for errors
465	+ if(!is_wp_error($uploaded_image)){
466	+ // Resize image
467	+ $uploaded_image->resize($wpua_resize_w, $wpua_resize_h, $wpua_resize_crop);
468	+ // Save image
469	+ $resized_image = $uploaded_image->save($file['file']);
470	+ }
471	+ }
472	+ // Break out file info
473	+ $name_parts = pathinfo($name);
474	+ $name = trim(substr($name, 0, -(1 + strlen($name_parts['extension']))));
475	+ $url = $file['url'];
476	+ $file = $file['file'];
477	+ $title = $name;
478	+ // Use image exif/iptc data for title if possible
479	+ if($image_meta = @wp_read_image_metadata($file)){
480	+ if(trim($image_meta['title']) && !is_numeric(sanitize_title($image_meta['title']))){
481	+ $title = $image_meta['title'];
482	+ }
483	+ }
484	+ // Construct the attachment array
485	+ $attachment = array(
486	+ 'guid' => $url,
487	+ 'post_mime_type' => $type,
488	+ 'post_title' => $title,
489	+ 'post_content' => ""
490	+ );
491	+ // This should never be set as it would then overwrite an existing attachment
492	+ if(isset($attachment['ID'])){
493	+ unset($attachment['ID']);
494	+ }
495	+ // Save the attachment metadata
496	+ $attachment_id = wp_insert_attachment($attachment, $file);
497	+ if(!is_wp_error($attachment_id)){
498	+ wp_update_attachment_metadata($attachment_id, wp_generate_attachment_metadata($attachment_id, $file));
499	+ $wpdb->query($wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %d", '_wp_attachment_wp_user_avatar', $user_id));
500	+ add_post_meta($attachment_id, '_wp_attachment_wp_user_avatar', $user_id);
501	+ update_user_meta($user_id, $wpdb->get_blog_prefix($blog_id).'user_avatar', $attachment_id);
502	+ }
503	}
504	}



















505	}
506	}
507	}
508
509	+ // Add actions links on plugin page
510	+ function wpua_action_links($links, $file){












511	if(basename($file) == basename(plugin_basename(__FILE__))){
512	$settings_link = '<a href="'.add_query_arg(array('page' => 'wp-user-avatar'), admin_url('options-general.php')).'">'.__('Settings').'</a>';
513	$links = array_merge($links, array($settings_link));

515	return $links;
516	}
517
518	+ // Add row meta on plugin page
519	+ function wpua_row_meta($links, $file){
520	+ if(basename($file) == basename(plugin_basename(__FILE__))){
521	+ $support_link = '<a href="http://wordpress.org/support/plugin/wp-user-avatar" target="_blank">'.__('Support Forums').'</a>';
522	+ $donate_link = '<a href="http://siboliban.org/donate" target="_blank">'.__('Donate', 'wp-user-avatar').'</a>';
523	+ $links = array_merge($links, array($support_link, $donate_link));
524	+ }
525	+ return $links;
526	+ }
527	+
528	// Add column to Users table
529	function wpua_add_column($columns){
530	return $columns + array('wp-user-avatar' => __('WP User Avatar', 'wp-user-avatar'));

535	global $blog_id, $wpdb;
536	$wpua = get_user_meta($user_id, $wpdb->get_blog_prefix($blog_id).'user_avatar', true);
537	$wpua_image = wp_get_attachment_image($wpua, array(32,32));
538	+ if($column_name == 'wp-user-avatar'){ $value = $wpua_image; }
539	+ return $value;

540	}
541
542	// Media uploader

546	if(current_user_can('upload_files')){
547	wp_enqueue_script('admin-bar');
548	wp_enqueue_media();
549	+ wp_enqueue_script('wp-user-avatar', WPUA_URLPATH.'js/wp-user-avatar.js', array('jquery'), WPUA_VERSION, true);
550	+ } else {
551	+ wp_enqueue_script('wp-user-avatar', WPUA_URLPATH.'js/wp-user-avatar-user.js', array('jquery'), WPUA_VERSION, true);
552	}

553	wp_enqueue_style('wp-user-avatar', WPUA_URLPATH.'css/wp-user-avatar.css', "", WPUA_VERSION);
554	// Admin scripts
555	if($pagenow == 'options-discussion.php' \|\| ($pagenow == 'options-general.php' && isset($_GET['page']) && $_GET['page'] == 'wp-user-avatar')){

574
575	// Returns true if user has Gravatar-hosted image
576	function wpua_has_gravatar($id_or_email, $has_gravatar=false, $user="", $email=""){

577	if(!is_object($id_or_email) && !empty($id_or_email)){
578	// Find user by ID or e-mail address
579	$user = is_numeric($id_or_email) ? get_user_by('id', $id_or_email) : get_user_by('email', $id_or_email);

581	$email = !empty($user) ? $user->user_email : "";
582	}
583	// Check if Gravatar image returns 200 (OK) or 404 (Not Found)
584	+ $hash = md5(strtolower(trim($email)));
585	+ $gravatar = 'http://www.gravatar.com/avatar/'.$hash.'?d=404';
586	+ $data = wp_cache_get($hash);
587	+ if(false === $data){
588	+ $response = wp_remote_head($gravatar);
589	+ $data = is_wp_error($response) ? 'not200' : $response['response']['code'];
590	+ wp_cache_set($hash, $data, $group="", $expire=60*5);
591	}
592	+ $has_gravatar = ($data == '200') ? true : false;
593	return $has_gravatar;
594	}
595

603	$user_id = !empty($user) ? $user->ID : "";
604	}
605	$wpua = get_user_meta($user_id, $wpdb->get_blog_prefix($blog_id).'user_avatar', true);
606	+ $has_wpua = !empty($wpua) && wp_attachment_is_image($wpua) ? true : false;
607	return $has_wpua;
608	}
609
610	// Replace get_avatar only in get_wp_user_avatar
611	function wpua_get_avatar_filter($avatar, $id_or_email="", $size="", $default="", $alt=""){
612	+ global $avatar_default, $mustache_admin, $mustache_avatar, $mustache_medium, $mustache_original, $mustache_thumbnail, $post, $wpua_avatar_default, $wpua_disable_gravatar;
613	// User has WPUA
614	if(is_object($id_or_email)){
615	+ if(!empty($id_or_email->comment_author_email)){
616	+ $avatar = get_wp_user_avatar($id_or_email, $size, $default, $alt);
617	} else {
618	$avatar = get_wp_user_avatar('unknown@gravatar.com', $size, $default, $alt);
619	}

626	// User doesn't have WPUA or Gravatar and Default Avatar is wp_user_avatar, show custom Default Avatar
627	} elseif($avatar_default == 'wp_user_avatar'){
628	// Show custom Default Avatar
629	+ if(!empty($wpua_avatar_default) && wp_attachment_is_image($wpua_avatar_default)){
630	// Get image
631	$wpua_avatar_default_image = wp_get_attachment_image_src($wpua_avatar_default, array($size,$size));
632	// Image src
633	$default = $wpua_avatar_default_image[0];
634	// Add dimensions if numeric size
635	$dimensions = ' width="'.$wpua_avatar_default_image[1].'" height="'.$wpua_avatar_default_image[2].'"';

636	} else {
637	// Get mustache image based on numeric size comparison
638	if($size > get_option('medium_size_w')){

648	}
649	// Add dimensions if numeric size
650	$dimensions = ' width="'.$size.'" height="'.$size.'"';

651	}
652	// Construct the img tag
653	+ $avatar = '<img src="'.$default.'"'.$dimensions.' alt="'.$alt.'" class="avatar avatar-'.$size.' wp-user-avatar wp-user-avatar-'.$size.' photo avatar-default" />';
654	}
655	}
656	return $avatar;

668	// User doesn't have Gravatar and Default Avatar is wp_user_avatar, show custom Default Avatar
669	if(!wpua_has_gravatar($id_or_email) && $avatar_default == 'wp_user_avatar'){
670	// Show custom Default Avatar
671	+ if(!empty($wpua_avatar_default) && wp_attachment_is_image($wpua_avatar_default)){
672	$wpua_avatar_default_image = wp_get_attachment_image_src($wpua_avatar_default, array($size,$size));
673	$default = $wpua_avatar_default_image[0];
674	} else {

679	$wpua_image = get_avatar($id_or_email, $size);
680	// Takes the img tag, extracts the src
681	$output = preg_match_all('/<img.+src=[\'"]([^\'"]+)[\'"].*>/i', $wpua_image, $matches, PREG_SET_ORDER);
682	+ $default = !empty($matches) ? $matches [0] [1] : "";
683	}
684	} else {
685	+ if(!empty($wpua_avatar_default) && wp_attachment_is_image($wpua_avatar_default)){
686	$wpua_avatar_default_image = wp_get_attachment_image_src($wpua_avatar_default, array($size,$size));
687	$default = $wpua_avatar_default_image[0];
688	} else {

693	}
694
695	// Find WPUA, show get_avatar if empty
696	+ function get_wp_user_avatar($id_or_email="", $size='96', $align="", $alt="", $email='unknown@gravatar.com'){
697	+ global $avatar_default, $blog_id, $post, $wpdb, $_wp_additional_image_sizes;
698	// Checks if comment
699	if(is_object($id_or_email)){
700	// Checks if comment author is registered user by user ID
701	+ if($id_or_email->user_id != 0){
702	+ $email = $id_or_email->user_id;
703	// Checks that comment author isn't anonymous
704	+ } elseif(!empty($id_or_email->comment_author_email)){
705	// Checks if comment author is registered user by e-mail address
706	+ $user = get_user_by('email', $id_or_email->comment_author_email);
707	// Get registered user info from profile, otherwise e-mail address should be value
708	+ $email = !empty($user) ? $user->ID : $id_or_email->comment_author_email;
709	}
710	+ $alt = $id_or_email->comment_author;
711	} else {
712	if(!empty($id_or_email)){
713	// Find user by ID or e-mail address

726	}
727	// Set user's ID and name
728	if(!empty($user)){
729	+ $email = $user->ID;
730	$alt = $user->display_name;
731	}
732	}
733	// Checks if user has WPUA
734	+ $wpua_meta = get_the_author_meta($wpdb->get_blog_prefix($blog_id).'user_avatar', $email);
735	// Add alignment class
736	+ $alignclass = !empty($align) && ($align == 'left' \|\| $align == 'right' \|\| $align == 'center') ? ' align'.$align : ' alignnone';
737	// User has WPUA, bypass get_avatar
738	if(!empty($wpua_meta)){
739	// Numeric size use size array

743	// Add dimensions to img only if numeric size was specified
744	$dimensions = is_numeric($size) ? ' width="'.$wpua_image[1].'" height="'.$wpua_image[2].'"' : "";
745	// Construct the img tag
746	+ $avatar = '<img src="'.$wpua_image[0].'"'.$dimensions.' alt="'.$alt.'" class="avatar avatar-'.$size.' wp-user-avatar wp-user-avatar-'.$size.$alignclass.' photo" />';
747	} else {
748	// Get numeric sizes for non-numeric sizes based on media options
749	+ if(!function_exists('get_intermediate_image_sizes')){
750	+ require_once(ABSPATH.'wp-admin/includes/media.php');
751	+ }
752	+ // Check for custom image sizes
753	+ $all_sizes = array_merge(get_intermediate_image_sizes(), array('original'));
754	+ if(in_array($size, $all_sizes)){
755	+ if(in_array($size, array('original', 'large', 'medium', 'thumbnail'))){
756	+ $get_size = ($size == 'original') ? get_option('large_size_w') : get_option($size.'_size_w');
757	+ } else {
758	+ $get_size = $_wp_additional_image_sizes[$size]['width'];
759	+ }
760	} else {
761	// Numeric sizes leave as-is
762	$get_size = $size;
763	}
764	// User with no WPUA uses get_avatar
765	+ $avatar = get_avatar($email, $get_size, $default="", $alt="");
766	// Remove width and height for non-numeric sizes
767	+ if(in_array($size, array('original', 'large', 'medium', 'thumbnail'))){

768	$avatar = preg_replace('/(width\|height)=\"\d*\"\s/', "", $avatar);
769	+ $avatar = preg_replace("/(width\|height)=\'\d*\'\s/", "", $avatar);

770	}
771	+ $str_replacemes = array('wp-user-avatar ', 'wp-user-avatar-'.$get_size.' ', 'wp-user-avatar-'.$size.' ', 'avatar-'.$get_size, 'photo');
772	+ $str_replacements = array("", "", "", 'avatar-'.$size, 'wp-user-avatar wp-user-avatar-'.$size.$alignclass.' photo');
773	+ $avatar = str_replace($str_replacemes, $str_replacements, $avatar);
774	}
775	return $avatar;
776	}

783	// Takes the img tag, extracts the src
784	if(!empty($wpua_image)){
785	$output = preg_match_all('/<img.+src=[\'"]([^\'"]+)[\'"].*>/i', $wpua_image, $matches, PREG_SET_ORDER);
786	+ $wpua_image_src = !empty($matches) ? $matches [0] [1] : "";
787	}
788	return $wpua_image_src;
789	}

800	$user = empty($user) ? get_user_by('email', $user) : $user;
801	}
802	// Get user ID
803	+ $id_or_email = !empty($user) ? $user->ID : 'unknown@gravatar.com';
804	// Check if link is set
805	if(!empty($link)){
806	// CSS class is same as link type, except for URL

859	$avatar_list .= '<br />';
860	}
861	// Show remove link if custom Default Avatar is set
862	+ if(!empty($wpua_avatar_default) && wp_attachment_is_image($wpua_avatar_default)){
863	$avatar_thumb_src = wp_get_attachment_image_src($wpua_avatar_default, array(32,32));
864	$avatar_thumb = $avatar_thumb_src[0];
865	$hide_remove = "";
866	} else {
867	$avatar_thumb = $mustache_admin;
868	+ $hide_remove = ' style="display:none;"';
869	}
870	// Default Avatar is wp_user_avatar, check the radio button next to it
871	$selected_avatar = ((bool) $wpua_disable_gravatar == 1 \|\| $avatar_default == 'wp_user_avatar') ? ' checked="checked" ' : "";

929
930	// Admin page
931	function wpua_options_page(){
932	+ global $show_avatars, $upload_size_limit_with_units, $wpua_allow_upload, $wpua_disable_gravatar, $wpua_edit_avatar, $wpua_resize_crop, $wpua_resize_h, $wpua_resize_upload, $wpua_resize_w, $wpua_tinymce, $wpua_upload_size_limit, $wpua_upload_size_limit_with_units;
933	// Give subscribers edit_posts capability
934	if(isset($_GET['settings-updated']) && $_GET['settings-updated'] == 'true' && (empty($wpua_allow_upload) \|\| empty($wpua_edit_avatar))){
935	wpua_subscriber_remove_cap();
936	}
937	+ $hide_size = (bool) $wpua_allow_upload != 1 ? ' style="display:none;"' : "";
938	+ $hide_resize = (bool) $wpua_resize_upload != 1 ? ' style="display:none;"' : "";
939	?>
940	<div class="wrap">
941	<?php screen_icon(); ?>

943	<form method="post" action="options.php">
944	<?php settings_fields('wpua-settings-group'); ?>
945	<?php do_settings_fields('wpua-settings-group', ""); ?>
946	+ <?php do_action('wpua_donation_message'); ?>
947	<table class="form-table">
948	<tr valign="top">
949	<th scope="row"><?php _e('Settings'); ?></th>

954	<input name="wp_user_avatar_tinymce" type="checkbox" id="wp_user_avatar_tinymce" value="1" <?php checked($wpua_tinymce, 1); ?> />
955	<?php _e('Add avatar button to Visual Editor', 'wp-user-avatar'); ?>
956	</label>
957	+ </fieldset>
958	+ <fieldset>
959	<label for="wp_user_avatar_allow_upload">
960	<input name="wp_user_avatar_allow_upload" type="checkbox" id="wp_user_avatar_allow_upload" value="1" <?php checked($wpua_allow_upload, 1); ?> />
961	<?php _e('Allow Contributors & Subscribers to upload avatars', 'wp-user-avatar'); ?>
962	</label>
963	+ </fieldset>
964	+ <fieldset>
965	<label for="wp_user_avatar_disable_gravatar">
966	<input name="wp_user_avatar_disable_gravatar" type="checkbox" id="wp_user_avatar_disable_gravatar" value="1" <?php checked($wpua_disable_gravatar, 1); ?> />
967	<?php _e('Disable Gravatar and use only local avatars', 'wp-user-avatar'); ?>

969	</fieldset>
970	</td>
971	</tr>






















972	</table>
973	+ <div id="wpua-contributors-subscribers"<?php echo $hide_size; ?>>
974	+ <table class="form-table">
975	+ <tr valign="top">
976	+ <th scope="row">
977	+ <label for="wp_user_avatar_upload_size_limit">
978	+ <?php _e('Upload Size Limit', 'wp-user-avatar'); ?> <?php _e('(only for Contributors & Subscribers)', 'wp-user-avatar'); ?>
979	+ </label>
980	+ </th>
981	+ <td>
982	+ <fieldset>
983	+ <legend class="screen-reader-text"><span><?php _e('Upload Size Limit', 'wp-user-avatar'); ?> <?php _e('(only for Contributors & Subscribers)', 'wp-user-avatar'); ?></span></legend>
984	+ <input name="wp_user_avatar_upload_size_limit" type="text" id="wp_user_avatar_upload_size_limit" value="<?php echo $wpua_upload_size_limit; ?>" class="regular-text" />
985	+ <span id="wpua-readable-size"><?php echo $wpua_upload_size_limit_with_units; ?></span>
986	+ <span id="wpua-readable-size-error"><?php printf(__('%s exceeds the maximum upload size for this site.'), ""); ?></span>
987	+ <div id="wpua-slider"></div>
988	+ <span class="description"><?php printf(__('Maximum upload file size: %d%s.'), esc_html(wp_max_upload_size()), esc_html(' bytes ('.$upload_size_limit_with_units.')')); ?></span>
989	+ </fieldset>
990	+ <fieldset>
991	+ <label for="wp_user_avatar_edit_avatar">
992	+ <input name="wp_user_avatar_edit_avatar" type="checkbox" id="wp_user_avatar_edit_avatar" value="1" <?php checked($wpua_edit_avatar, 1); ?> />
993	+ <?php _e('Allow users to edit avatars', 'wp-user-avatar'); ?>
994	+ </label>
995	+ </fieldset>
996	+ <fieldset>
997	+ <label for="wp_user_avatar_resize_upload">
998	+ <input name="wp_user_avatar_resize_upload" type="checkbox" id="wp_user_avatar_resize_upload" value="1" <?php checked($wpua_resize_upload, 1); ?> />
999	+ <?php _e('Resize avatars on upload', 'wp-user-avatar'); ?>
1000	+ </label>
1001	+ </fieldset>
1002	+ <fieldset id="wpua-resize-sizes"<?php echo $hide_resize; ?>
1003	+ <br />
1004	+ <br />
1005	+ <label for="wp_user_avatar_resize_w"><?php _e('Width'); ?></label>
1006	+ <input name="wp_user_avatar_resize_w" type="number" step="1" min="0" id="wp_user_avatar_resize_w" value="<?php form_option('wp_user_avatar_resize_w'); ?>" class="small-text" />
1007	+ <label for="wp_user_avatar_resize_h"><?php _e('Height'); ?></label>
1008	+ <input name="wp_user_avatar_resize_h" type="number" step="1" min="0" id="wp_user_avatar_resize_h" value="<?php form_option('wp_user_avatar_resize_h'); ?>" class="small-text" />
1009	+ <br />
1010	+ <input name="wp_user_avatar_resize_crop" type="checkbox" id="wp_user_avatar_resize_crop" value="1" <?php checked('1', $wpua_resize_crop); ?> />
1011	+ <label for="wp_user_avatar_resize_crop"><?php _e('Crop avatars to exact dimensions', 'wp-user-avatar'); ?></label>
1012	+ </fieldset>
1013	+ </td>
1014	+ </tr>
1015	+ </table>
1016	+ </div>
1017	<h3 class="title"><?php _e('Avatars'); ?></h3>
1018	<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
1019	<table class="form-table">

1076	register_setting('wpua-settings-group', 'wp_user_avatar_allow_upload', 'intval');
1077	register_setting('wpua-settings-group', 'wp_user_avatar_disable_gravatar', 'intval');
1078	register_setting('wpua-settings-group', 'wp_user_avatar_edit_avatar', 'intval');
1079	+ register_setting('wpua-settings-group', 'wp_user_avatar_resize_crop', 'intval');
1080	+ register_setting('wpua-settings-group', 'wp_user_avatar_resize_h', 'intval');
1081	+ register_setting('wpua-settings-group', 'wp_user_avatar_resize_upload', 'intval');
1082	+ register_setting('wpua-settings-group', 'wp_user_avatar_resize_w', 'intval');
1083	register_setting('wpua-settings-group', 'wp_user_avatar_upload_size_limit', 'intval');
1084	}
1085

1096	}
1097	add_action('plugins_loaded', 'wpua_load');
1098	}
1099	+
1100	?>