Ticket #7860: 7860.2.diff

core/credits/wp-credits.php

@@ -209 +209 @@
         private function _grab_validators( $gp_locale, $path ) {
                 global $wpdb;
                 $users = $this->grab_validators( $gp_locale, $path );
 
                 if ( ! $users )
                         return array();
 
                 $validator_data = $wpdb->get_results( "SELECT user_nicename, display_name, user_email FROM $wpdb->users WHERE ID IN (" . implode( ',', $users ) . ")" );
 
                 $validators = array();
 
                 foreach ( $validator_data as $user ) {
                         if ( $user->user_nicename == 'nacin' ) // I stopped taking Spanish in 11th grade, don't show me as a validator when I'm testing things.
                                 continue;
                         if ( $user->display_name && $user->display_name != $user->user_nicename && false === strpos( $user->display_name , '?') )
-                                $validators[ $user->user_nicename ] = array( $this->_encode( $user->display_name ), md5( $user->user_email ), $user->user_nicename );
+                                $validators[ $user->user_nicename ] = array( $this->_encode( $user->display_name ), $this->hash( $user->user_email ), $user->user_nicename );
                         else
-                                $validators[ $user->user_nicename ] = array( $user->user_nicename, md5( $user->user_email ), $user->user_nicename );
+                                $validators[ $user->user_nicename ] = array( $user->user_nicename, $this->hash( $user->user_email ), $user->user_nicename );
                 }
 
                 return $validators;
         }
 
         protected function grab_validators( $gp_locale, $path ) {
                 global $wpdb;
 
                 $path = 'wp/' . $path;
                 $path = like_escape( $path ) . '%';
 
                 $project_ids = $wpdb->get_col( "SELECT `id` FROM `translate_projects` WHERE ( `path` LIKE '$path' OR `path` = 'wp' ) AND `active` = 1" ); // Project validators
                 if ( ! $project_ids ) {
                         $project_ids = array();
                 }
@@ -287 +287 @@
                 if ( isset( $this->groups ) )
                         return $this->groups;
 
                 $groups = $this->groups();
                 $fetch_emails_from_user_cache = $fetch_emails_from_db = array();
 
                 foreach ( $groups as $group_slug => $group_data ) {
                         if ( 'list' == $group_data['type'] )
                                 continue;
                         foreach ( $group_data['data'] as $k => $person ) {
                                 $person = (array) $person;
                                 $new_data = array( 'name' => $person[0], 'hash' => '', 'username' => $k, 'title' => '' );
                                 $this->names_in_groups[] = strtolower( $k );
 
                                 if ( ! empty( $person[2] ) ) {
-                                        // array( 'Andrew Nacin', 'Lead Developer', 'md5 hash' )
+                                        // array( 'Andrew Nacin', 'Lead Developer', 'gravatar hash' )
                                         $new_data['title'] = $person[1];
                                         $new_data['hash'] = $person[2];
                                 } elseif ( empty( $person[1] ) ) {
                                         // array( 'Andrew Nacin' )
                                         $fetch_emails_from_user_cache[ $k ] = $group_slug;
-                                } elseif ( strlen( $person[1] ) === 32 && preg_match('/^[a-f0-9]{32}$/', $person[1] ) ) {
-                                        // array( 'Andrew Nacin', 'md5 hash' )
+                                } elseif ( $this->is_hashed( $person[1] ) ) {
+                                        // array( 'Andrew Nacin', 'gravatar hash' )
                                         $new_data['hash'] = $person[1];
                                 } else {
                                         // array( 'Andrew Nacin', 'Lead Developer' )
                                         $new_data['title'] = $person[1];
                                         $fetch_emails_from_user_cache[ $k ] = $group_slug;
                                 }
 
                                 // Temporary:
-                                if ( strlen( $new_data['hash'] ) != 32 || strpos( $new_data['hash'], '@' ) ) {
-                                        $new_data['hash'] = md5( $new_data['hash'] );
+                                if ( ! $this->is_hashed( $new_data['hash'] ) ) {
+                                        $new_data['hash'] = $this->hash( $new_data['hash'] );
                                 }
 
                                 $group_data['data'][ $k ] = array_values( $new_data );
                         }
 
                         $groups[ $group_slug ]['data'] = $group_data['data'];
                 }
 
                 if ( $fetch_emails_from_user_cache ) {
                         foreach ( $fetch_emails_from_user_cache as $username => $group ) {
                                 $user_id = wp_cache_get( $username, 'userlogins' );
                                 if ( $user_id ) {
                                         if ( $user_object = wp_cache_get( $user_id, 'users' ) ) {
-                                                $groups[ $group ]['data'][ $username ][1] = md5( strtolower( $user_object->user_email ) );
+                                                $groups[ $group ]['data'][ $username ][1] = $this->hash( $user_object->user_email );
                                         } else {
                                                 $fetch_emails_from_db[ $username ] = $group;
                                         }
                                 } else {
                                         $fetch_emails_from_db[ $username ] = $group;
                                 }
                         }
                         if ( $fetch_emails_from_db ) {
                                 $fetched = $wpdb->get_results( "SELECT user_login, ID, user_email FROM $wpdb->users WHERE user_login IN ('" . implode( "', '", array_keys( $fetch_emails_from_db ) ) . "')", OBJECT_K );
                                 foreach ( $fetched as $username => $row ) {
-                                        $groups[ $fetch_emails_from_db[ $username ] ]['data'][ $username ][1] = md5( strtolower( $row->user_email ) );
+                                        $groups[ $fetch_emails_from_db[ $username ] ]['data'][ $username ][1] = $this->hash( $row->user_email );
                                         wp_cache_add( $username, $row->ID, 'userlogins' );
                                 }
                         }
                 }
 
                 $this->groups = $groups;
                 return $groups;
         }
 
         private function _props() {
                 global $wpdb;
                 $props = $this->cache_get( 'props-' . $this->version );
                 if ( $props !== false )
                         return $props;
 
@@ -433 +433 @@
                 return compact( 'groups', 'data' );
         }
 
         final public function execute() {
                 $results = $this->get_results();
 
                 if ( 'cli' === php_sapi_name() ) {
                         print_r( $results );
                 } elseif ( defined( 'JSON_RESPONSE' ) && JSON_RESPONSE ) {
                         echo json_encode( $results );
                 } else {
                         echo serialize( $results );
                 }
         }
 
+        private function is_hashed( $maybe_hash ) {
+                if (
+                        ! is_string( $maybe_hash ) ||
+                        strpos( $maybe_hash, '@' ) !== false
+                ) {
+                        return false;
+                }
+
+                switch ( strlen( $maybe_hash ) ) {
+                        case 32:
+                                return preg_match( '/^[a-f0-9]{32}$/', $maybe_hash );
+                        case 64:
+                                return preg_match( '/^[a-f0-9]{64}$/', $maybe_hash );
+                }
+
+                return false;
+        }
+
+        private function hash( $email ) {
+                return hash( 'sha256', strtolower( $email ) );
+        }
+
 }