Changeset 394 for trunk/bp-core/bp-core-avatars.php

Timestamp:

10/23/2008 12:56:37 PM (18 years ago)

Author:

apeatling

Message:

Removed home base requirement

File:

• trunk/bp-core/bp-core-avatars.php (modified) (10 diffs)

trunk/bp-core/bp-core-avatars.php

@@ -19 +19 @@
 
 function bp_core_get_avatar( $user, $version = 1, $no_tag = false, $width = null, $height = null ) {
+        global $bp, $current_blog;
+        
         if ( !is_int($version) )
                 $version = (int) $version;
@@ -25 +27 @@
                 $version = 1;
         
-        if ( $home_base_id = get_usermeta( $user, 'home_base' ) )
-                $url = get_blog_option($home_base_id, 'siteurl');
-                
         if ( !$width )
                 $width = constant('CORE_AVATAR_V' . $version . '_W');
@@ -34 +33 @@
                 $height = constant('CORE_AVATAR_V' . $version . '_H');          
         
-        $str = get_usermeta( $user, "bp_core_avatar_v$version" );
-        
-        if ( strlen($str) ) {
+
+        $avatar_file = get_usermeta( $user, "bp_core_avatar_v$version" );
+        $url = $bp['root_domain'] . '/' . $avatar_file;
+        
+        if ( strlen($avatar_file) ) {
                 if ( $no_tag )
-                        return $str;
+                        return $url;
                 else
-                        return '<img src="' . $url . '/' . $str . '" alt="" class="avatar" width="' . $width . '" height="' . $height . '" />';
+                        return '<img src="' . $url . '" alt="" class="avatar" width="' . $width . '" height="' . $height . '" />';
         } else {
+                $identicon = 'http://www.gravatar.com/avatar/' . md5( $user . '@buddypress.org') . '?d=wavatar&amp;s=';
                 if ( $no_tag )
-                        return CORE_DEFAULT_AVATAR_THUMB;
+                        return $identicon . constant('CORE_AVATAR_V' . $version . '_W');
                 else
-                        return '<img src="' . CORE_DEFAULT_AVATAR . '" alt="" class="avatar" width="' . $width . '" height="' . $height . '" />';
+                        return '<img src="' . $identicon . constant('CORE_AVATAR_V' . $version . '_W') . '" alt="" class="avatar" width="' . $width . '" height="' . $height . '" />';
         }
 }
@@ -72 +74 @@
 
 // Main UI Rendering
-function bp_core_avatar_admin( $message = null, $action = null, $delete_action = null ) {
+function bp_core_avatar_admin( $message = null ) {
         global $wp_upload_error;
         ?>      
@@ -90 +92 @@
                 
                 <?php
-                if ( !$action )
-                        $action = site_url() . '/wp-admin/admin.php?page=bp-xprofile.php';
-                
-                if ( !$delete_action )
-                        $delete_action = site_url() . '/wp-admin/admin.php?page=bp-xprofile.php&slick_avatars_action=delete';
-                
+
                 bp_core_render_avatar_upload_form($action);
 
@@ -132 +129 @@
                 
                 if ( !bp_core_check_avatar_size($_FILES) )
-                        bp_core_ap_die( 'The file you uploaded is too big. Please upload a file under ' . size_format(1024 * CORE_MAX_FILE_SIZE) );
+                        bp_core_ap_die( 'The file you uploaded is too big. Please upload a file under ' . size_format(CORE_MAX_FILE_SIZE) );
 
                 if ( !bp_core_check_avatar_type($_FILES) )
@@ -148 +145 @@
                         $canvas = $original;
                 
-                // Render the cropper UI
-                if ( !$action )
-                        $action = get_option('home') .'/wp-admin/admin.php?page=bp-xprofile.php';
-                
+                // Render the cropper UI                
                 bp_core_render_avatar_cropper($original, $canvas, $action);
                 
@@ -258 +252 @@
                 $user_id = $bp['loggedin_userid'];
 
-        if ( !$url ) {
-                $home_base_id = get_usermeta( $user_id, 'home_base' );
-                $url = get_blog_option($home_base_id, 'siteurl');
-        }
-
-        $src = str_replace( array(ABSPATH), array($url . '/'), $new );
+        $src = str_replace( array(ABSPATH), array(site_url() . '/'), $new );
 
         // Load cropper details
@@ -401 +390 @@
 }
 
-function bp_core_avatar_save( $vars, $user_id = false, $upload_dir = false, $url = false ) {
+function bp_core_avatar_save( $vars, $user_id = false ) {
         if ( !$user_id )
                 $user_id = get_current_user_id();
-                
-        if ( !$url ) {
-                $home_base_id = get_usermeta( $user_id, 'home_base' );
-                $url = get_blog_option($home_base_id, 'siteurl');
-        }
         
         $old = get_usermeta( $user_id, 'bp_core_avatar_v1_path' );
@@ -458 +442 @@
 function bp_core_ap_die( $msg ) {
         echo '<p><strong>' . $msg . '</strong></p>';
-        echo '<p><a href="' . get_option('home') .'/wp-admin/admin.php?page=bp-xprofile.php">' . __('Try Again', 'buddypress') . '</a></p>';
+        echo '<p><a href="' . $bp['loggedin_domain'] . '/' . $bp['profile']['slug'] . '/change-avatar">' . __('Try Again', 'buddypress') . '</a></p>';
         echo '</div>';
         exit;