Default avatar selector. Props Viper007Bond. see #6802
git-svn-id: http://svn.automattic.com/wordpress/trunk@7879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
parent
63d12e0b39
commit
fbcbedc4f0
|
|
@ -253,6 +253,9 @@ function populate_options() {
|
|||
add_option('medium_size_w', 300);
|
||||
add_option('medium_size_h', 300);
|
||||
|
||||
// 2.6
|
||||
add_option('avatar_default', 'default');
|
||||
|
||||
// Delete unused options
|
||||
$unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval');
|
||||
foreach ($unusedoptions as $option) :
|
||||
|
|
|
|||
|
|
@ -84,13 +84,13 @@ include('admin-header.php');
|
|||
|
||||
<table class="form-table">
|
||||
<tr valign="top">
|
||||
<th scope="row"><?php _e('Avatar display') ?></th>
|
||||
<th scope="row"><?php _e('Avatar Display') ?></th>
|
||||
<td>
|
||||
<?php
|
||||
$yesorno = array(0 => __("Don’t show Avatars"), 1 => __('Show Avatars'));
|
||||
foreach ( $yesorno as $key => $value) {
|
||||
$selected = (get_option('show_avatars') == $key) ? 'checked="checked"' : '';
|
||||
echo "\n\t<label><input type='radio' name='show_avatars' value='$key' $selected> $value</label><br />";
|
||||
echo "\n\t<label><input type='radio' name='show_avatars' value='$key' $selected/> $value</label><br />";
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
|
|
@ -103,10 +103,45 @@ include('admin-header.php');
|
|||
$ratings = array( 'G' => __('G — Suitable for all audiences'), 'PG' => __('PG — Possibly offensive, usually for audiences 13 and above'), 'R' => __('R — Intended for adult audiences above 17'), 'X' => __('X — Even more mature than above'));
|
||||
foreach ($ratings as $key => $rating) :
|
||||
$selected = (get_option('avatar_rating') == $key) ? 'checked="checked"' : '';
|
||||
echo "\n\t<label><input type='radio' name='avatar_rating' value='$key' $selected> $rating</label><br />";
|
||||
echo "\n\t<label><input type='radio' name='avatar_rating' value='$key' $selected/> $rating</label><br />";
|
||||
endforeach;
|
||||
?>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr valign="top">
|
||||
<th scope="row"><?php _e('Default Avatar') ?></th>
|
||||
<td class="defaultavatarpicker">
|
||||
|
||||
<?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address.'); ?><br />
|
||||
|
||||
<?php
|
||||
$avatar_defaults = array(
|
||||
'default' => __('Default'),
|
||||
'gravatar_default' => __('Gravatar Logo'),
|
||||
'identicon' => __('Identicon (Generated)'),
|
||||
'wavatar' => __('Wavatar (Generated)'),
|
||||
'monsterid' => __('MonsterID (Generated)')
|
||||
);
|
||||
$avatar_defaults = apply_filters('avatar_defaults', $avatar_defaults);
|
||||
$default = get_option('avatar_default');
|
||||
if ( empty($default) )
|
||||
$default = 'default';
|
||||
$size = 32;
|
||||
$avatar_list = '';
|
||||
foreach ( $avatar_defaults as $default_key => $default_name ) {
|
||||
$selected = ($default == $default_key) ? 'checked="checked" ' : '';
|
||||
$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='{$default_key}' {$selected}/> ";
|
||||
|
||||
$avatar = get_avatar( $user_email, $size, $default_key );
|
||||
$avatar_list .= preg_replace("/src='(.+?)'/", "src='\$1&forcedefault=1'", $avatar);
|
||||
|
||||
$avatar_list .= ' ' . $default_name . '</label>';
|
||||
$avatar_list .= '<br />';
|
||||
}
|
||||
echo apply_filters('default_avatar_select', $avatar_list);
|
||||
?>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
|
@ -115,7 +150,7 @@ endforeach;
|
|||
|
||||
<p class="submit">
|
||||
<input type="hidden" name="action" value="update" />
|
||||
<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys,show_avatars,avatar_rating" />
|
||||
<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys,show_avatars,avatar_rating,avatar_default" />
|
||||
<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
|
||||
</p>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -1356,6 +1356,11 @@ p#post-search {
|
|||
vertical-align:text-top;
|
||||
}
|
||||
|
||||
.defaultavatarpicker .avatar {
|
||||
margin: 2px 0;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
body.minwidth {
|
||||
min-width: 808px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1243,8 +1243,24 @@ function get_avatar( $id_or_email, $size = '96', $default = '' ) {
|
|||
$email = $id_or_email;
|
||||
}
|
||||
|
||||
if ( empty($default) )
|
||||
$default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s=$size"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
|
||||
if ( empty($default) ) {
|
||||
$avatar_default = get_option('avatar_default');
|
||||
if ( empty($avatar_default) )
|
||||
$default = 'default';
|
||||
else
|
||||
$default = $avatar_default;
|
||||
}
|
||||
|
||||
if ( 'custom' == $default )
|
||||
$default = add_query_arg( 's', $size, $defaults[$avatar_default][1] );
|
||||
elseif ( 'default' == $default )
|
||||
$default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
|
||||
elseif ( !empty($email) && 'gravatar_default' == $default )
|
||||
$default = '';
|
||||
elseif ( 'gravatar_default' == $default )
|
||||
$default = "http://www.gravatar.com/avatar/s={$size}";
|
||||
elseif ( empty($email) )
|
||||
$default = "http://www.gravatar.com/avatar/?d=$default&s={$size}";
|
||||
|
||||
if ( !empty($email) ) {
|
||||
$out = 'http://www.gravatar.com/avatar/';
|
||||
|
|
|
|||
Loading…
Reference in New Issue