Ticket #5715: 5715.diff

src/bp-core/admin/bp-core-admin-settings.php

@@ -330 +330 @@
                         'bp-disable-profile-sync',
                         'bp_restrict_group_creation',
                         'hide-loggedout-adminbar',
+                        //Added for default profile text avatar
+                        'bp-disable-choice-avatar',
                 );
 
                 foreach( $legacy_options as $legacy_option ) {
                         // Note: Each of these options is represented by its opposite in the UI
                         // Ie, the Profile Syncing option reads "Enable Sync", so when it's checked,
                         // the corresponding option should be unset.
-                        $value = isset( $_POST[$legacy_option] ) ? '' : 1;
+                        $value = (isset( $_POST[$legacy_option] ) OR !empty( $_POST[$legacy_option] ))? '' : 1;
+
+                        //Validation POST data from the drop-down list avatar customization plug-in
+            if($legacy_option == 'bp-disable-choice-avatar'){
+
+              $value = ($_POST['bp-disable-choice-avatar'] == 1)? 1: 0;
+           }
+
                         bp_update_option( $legacy_option, $value );
                 }
 
@@ -346 +355 @@
 add_action( 'bp_admin_init', 'bp_core_admin_settings_save', 100 );
 
 /**
+ * To use Text Avatars
+ *
+ * @since BuddyPress (2.4)
+ *
+ * @uses selected() To display the selected attribute
+ */
+function bp_admin_setting_choice_avatar_plugin()
+{
+    $disable_choice_avatar = (int)bp_disable_choice_avatar(false);
+    ?>
+
+    <select id="bp-disable-choice-avatar" name="bp-disable-choice-avatar">
+        <option value="0" <?php selected($disable_choice_avatar, 0); ?>><?php _e('Mystery Man', 'buddypress'); ?></option>
+        <option value="1" <?php selected($disable_choice_avatar, 1); ?>><?php _e('Textavatar', 'buddypress'); ?></option>
+    </select>
+    <p class="description"><?php _e('If a users profile photo is not available what should be shown as the users profile photo?', 'buddypress'); ?></p>
+<?php
+}
+
+/**
  * Output settings API option.
  *
  * @since 1.6.0

src/bp-core/bp-core-avatars.php

@@ -564 +564 @@
                 }
         }
 
+
+           /** Filters should skip the First letter Avatar.
+     *
+     * @since BuddyPress (2.4)
+     *
+     * @param bool  $value  Whether or not to skip First letter Avatar.
+     * @param array $params Array of parameters for the avatar request.
+     */
+    $disable_choice_avatar = bp_get_option('bp-disable-choice-avatar');
+    if ($disable_choice_avatar == 1) {
+        $user_id   = '';
+        $item_name = '';
+
+        if ($params['object'] == 'user') {
+            $item_name = bp_core_get_user_displayname($params['item_id']);
+            $user_id   = $params['item_id'];
+        }
+
+        $background = bp_get_background_letter($item_name);
+
+        $letter = bp_get_first_letter($item_name);
+
+        if ($letter != '') {
+
+            return bp_get_text_avatar_html($letter, $background, $html_class, $html_css_id, $html_width, $html_height);
+        }
+    }
+
         /**
          * Filters whether or not to skip Gravatar check.
          *
@@ -686 +714 @@
 }
 
 /**
+ * Get html content for text avatar
+ * @param $letter
+ * @param $background_color
+ * @param $html_class
+ * @param $html_css_id
+ * @param $html_width
+ * @param $html_height
+ * @return String
+ */
+function bp_get_text_avatar_html($letter, $background_color, $html_class, $html_css_id, $html_width, $html_height)
+{
+
+    $width     = preg_replace("/[^0-9]/", '', $html_width);
+    $height    = preg_replace("/[^0-9]/", '', $html_height);
+    $font_size = 16;
+
+    $styles = array();
+
+    if ($width > 0) {
+        $styles[] = "width: {$width}px;";
+    }
+
+    if ($height > 0) {
+        $styles[] = "height: {$height}px;";
+
+        $font_size = round($height / 1.5);
+    }
+
+    if (!empty($background_color)) {
+        $styles[] = "background-color: $background_color;";
+    }
+
+    if ($font_size > 0) {
+        $styles[] = "font-size: {$font_size}px";
+    }
+
+    $styles = implode("", $styles);
+
+    $html_class = substr(trim($html_class), 0, -1);
+    $html_class .= ' text-avatar"';
+
+    return sprintf('<div style="%s;" %s %s %s id="%s">%s</div>', $styles, $html_width, $html_height, $html_class, $html_css_id, $letter);
+}
+
+/**
  * Delete an existing avatar.
  *
  * @since 1.1.0

src/bp-core/bp-core-options.php

@@ -118 +118 @@
         return apply_filters( 'bp_get_default_options', $options );
 }
 
+ /**
+ * Show avatar plugin?
+ *
+ * @since BuddyPress (2.4)
+ *
+ * @uses bp_get_option() To get the avatar show option.
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ *        Default: true.
+ * @return bool True if avatar show are disabled, otherwise false.
+ */
+function bp_disable_choice_avatar( $default = false ) {
+    return (bool) apply_filters( 'bp_disable_choice_avatar', (bool) bp_get_option( 'bp-disable-choice-avatar', $default ) );
+}
+
 /**
  * Add default options when BuddyPress is first activated.
  *

src/bp-core/classes/class-bp-admin.php

@@ -413 +413 @@
                         add_settings_field( 'bp-disable-avatar-uploads', __( 'Profile Photo Uploads', 'buddypress' ), 'bp_admin_setting_callback_avatar_uploads', 'buddypress', 'bp_xprofile' );
                         register_setting( 'buddypress', 'bp-disable-avatar-uploads', 'intval' );
 
+                        add_settings_field( 'bp-disable-choice-avatar', __( 'Default Profile Photo',  'buddypress' ), 'bp_admin_setting_choice_avatar_plugin', 'buddypress', 'bp_xprofile' );
+            register_setting( 'buddypress', 'bp-disable-choice-avatar', 'intval');
+
                         // Cover images.
                         if ( bp_is_active( 'xprofile', 'cover_image' ) ) {
                                 add_settings_field( 'bp-disable-cover-image-uploads', __( 'Cover Image Uploads', 'buddypress' ), 'bp_admin_setting_callback_cover_image_uploads', 'buddypress', 'bp_xprofile' );

src/bp-members/bp-members-functions.php

@@ -1374 +1374 @@
 add_action( 'wpmu_delete_user', 'bp_core_delete_avatar_on_user_delete' );
 add_action( 'delete_user', 'bp_core_delete_avatar_on_user_delete' );
 
+
+/**
+ *To get the first letter of the name of the current items
+ *
+ * @param  string $item_name name current items.
+ * @since BuddyPress (2.2.0)
+ * @return string.
+ */
+function bp_get_first_letter($item_name)
+{
+    $letter = '';
+    $valid_letter = '';
+
+    if(!empty($item_name)){
+        $letter = mb_substr($item_name, 0, 1);
+    }
+
+    if (preg_match("/^[a-zA-Z]+$/", $letter)) {
+        $valid_letter = $letter;
+   }
+
+    return apply_filters( 'bp_get_first_letter', $valid_letter, $item_name);
+}
+add_filter('bp_get_first_letter','mb_strtoupper');
+
+/**
+ * Get the background color of the letters the user
+ *
+ * @param  int $user_id ID of the user.
+ * @since BuddyPress (2.2.0)
+ * @return string.
+ */
+function bp_get_background_letter($name)
+{
+
+    return bp_get_background($name);
+}
+
+/**
+ * Getting the color code.
+ *
+ * @since BuddyPress (2.2.0)
+ * @return string.
+ */
+function bp_get_background($name){
+
+        $default_color = '333333';
+        $hash = 0;
+    $color = '#';
+    $value = 0;
+    $name_length = strlen($name);
+
+         if(!$name || empty($name)) {
+        return $color.$default_color;
+    }
+
+    for($i = 0; $i < $name_length; $i++) {
+        $hash = ord($name{$i})+(($hash << 5)-$hash);
+    }
+
+
+    for ($i=0; $i < 3; $i++) { 
+        $value = ($hash >> ($i*8)) & 0xFF;
+        $color .= substr('00'.dechex($value),-2);
+    }
+
+    return $color;
+}
+
+function bp_register_text_avatar_styles() {
+
+
+        $min = bp_core_get_minified_asset_suffix();
+        $url = buddypress()->plugin_url . 'bp-core/css/';
+
+        $style_file = "$urlavatar$min.css";
+
+        wp_register_style('bp-text-avatar',  "{$url}text-avatar{$min}.css", Array(), bp_get_version() );
+
+        $disable_choice_avatar = bp_get_option('bp-disable-choice-avatar');
+    if ($disable_choice_avatar == 1) {
+        wp_enqueue_style('bp-text-avatar');
+    }
+}
+add_action( 'bp_enqueue_scripts','bp_register_text_avatar_styles', 1 );
+add_action( 'bp_admin_enqueue_scripts', 'bp_register_text_avatar_styles',1);
+
 /**
  * Multibyte-safe ucfirst() support.
  *