Fix #13992: Use Gravatar generated patterns based on email hash for users wh

vboctor · vboctor · commit 5f1dba99ae9b · 2012-03-25T23:25:20.000-07:00
- Change gravatar integration to generate patterns based on email hash when
- Moved the checking for show_avatar inside the print_avatar() API.
- Remove default_avatar config option and delete the image.
diff --git a/bugnote_view_inc.php b/bugnote_view_inc.php
@@ -157,7 +157,7 @@
 ?>
 <tr class="bugnote <?php echo $t_bugnote_css ?>" id="c<?php echo $t_bugnote->id ?>">
         <td class="bugnote-meta">
-		<?php if ( ON  == config_get("show_avatar") ) print_avatar( $t_bugnote->reporter_id ); ?>
+		<?php print_avatar( $t_bugnote->reporter_id ); ?>
 		<span class="small bugnote-permalink"><a rel="bookmark" href="<?php echo string_get_bugnote_view_url($t_bugnote->bug_id, $t_bugnote->id) ?>" title="<?php echo lang_get( 'bugnote_link_title' ) ?>"><?php echo htmlentities( config_get_global( 'bugnote_link_tag' ) ) . $t_bugnote_id_formatted ?></a></span><br />
 
 		<span class="bugnote-reporter">
diff --git a/config_defaults_inc.php b/config_defaults_inc.php
@@ -1012,12 +1012,6 @@
  */
 $g_show_avatar_threshold = DEVELOPER;
 
-/**
- * Default avatar for users without a gravatar account
- * @global string $g_default_avatar
- */
-$g_default_avatar = "%path%images/no_avatar.png";
-
 /**
  * Show release dates on changelog
  * @global int $g_show_changelog_dates
diff --git a/core/config_api.php b/core/config_api.php
@@ -639,7 +639,6 @@ function config_is_private( $p_config_var ) {
 		case 'global_settings':
 		case 'system_font_folder':
 		case 'phpMailer_method':
-		case 'default_avatar':
 		case 'file_upload_ftp_server':
 		case 'file_upload_ftp_user':
 		case 'file_upload_ftp_pass':
diff --git a/core/obsolete.php b/core/obsolete.php
@@ -141,6 +141,7 @@
 
 # changes in 1.2.8
 config_obsolete( 'show_attachment_indicator' );
+config_obsolete( 'default_avatar', '' );
 
 # changes in 1.3.0dev
 config_obsolete( 'bugnote_allow_user_edit_delete', '' );
diff --git a/core/print_api.php b/core/print_api.php
@@ -169,6 +169,10 @@ function print_successful_redirect( $p_redirect_to ) {
 
 # Print avatar image for the given user ID
 function print_avatar( $p_user_id, $p_size = 80 ) {
+	if ( OFF == config_get( 'show_avatar' ) ) {
+		return;
+	}
+
 	if( !user_exists( $p_user_id ) ) {
 		return;
 	}
diff --git a/core/user_api.php b/core/user_api.php
@@ -808,11 +808,10 @@ function user_get_name( $p_user_id ) {
 * @return array|bool an array( URL, width, height ) or false when the given user has no avatar
 */
 function user_get_avatar( $p_user_id, $p_size = 80 ) {
-	$t_email = utf8_strtolower( user_get_email( $p_user_id ) );
+	$t_email = utf8_strtolower( trim( user_get_email( $p_user_id ) ) );
 	if( is_blank( $t_email ) ) {
 		$t_result = false;
 	} else {
-		$t_default_image = config_get( 'default_avatar' );
 		$t_size = $p_size;
 
 		$t_use_ssl = false;
@@ -826,7 +825,8 @@ function user_get_avatar( $p_user_id, $p_size = 80 ) {
 			$t_gravatar_domain = 'https://secure.gravatar.com/';
 		}
 
-		$t_avatar_url = $t_gravatar_domain . 'avatar/' . md5( $t_email ) . '?default=' . urlencode( $t_default_image ) . '&size=' . $t_size . '&rating=G';
+		$t_avatar_url = $t_gravatar_domain . 'avatar/' . md5( $t_email ) . '?d=identicon&r=G&s=' . $t_size;
+
 		$t_result = array(
 			$t_avatar_url,
 			$t_size,
diff --git a/docbook/Admin_Guide/en-US/Configuration.xml b/docbook/Admin_Guide/en-US/Configuration.xml
@@ -891,12 +891,6 @@
                     <para>The threshold of users for which MantisBT should attempt to show the avatar (default DEVELOPER).  Note that the threshold is related to the user for whom the avatar is being shown, rather than the user who is currently logged in.</para>
                 </listitem>
             </varlistentry>
-            <varlistentry>
-                <term>$g_default_avatar</term>
-                <listitem>
-                    <para>The full URL to the image to be used when a user doesn't have an avatar account.</para>
-                </listitem>
-            </varlistentry>
         </variablelist>
     </section>
 
diff --git a/images/no_avatar.png b/images/no_avatar.png
