Ticket #4677: 4677.5.patch

src/bp-activity/bp-activity-template.php

@@ -1606 +1606 @@
                 // Set item_id and object (default to user)
                 switch ( $activities_template->activity->component ) {
                         case 'groups' :
+                                if ( bp_disable_group_avatar_uploads() ) {
+                                        return false;
+                                }
+
                                 $object  = 'group';
                                 $item_id = $activities_template->activity->item_id;
                                 $link    = '';

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

@@ -182 +182 @@
 <?php
 }
 
+/**
+ * 'Enable group avatars' field markup.
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_admin_setting_callback_group_avatar_uploads() {
+?>
+        <input id="bp-disable-group-avatar-uploads" name="bp-disable-group-avatar-uploads" type="checkbox" value="1" <?php checked( ! bp_disable_group_avatar_uploads() ); ?> />
+        <label for="bp-disable-group-avatar-uploads"><?php _e( 'Allow customizable avatars for groups', 'buddypress' ); ?></label>
+<?php
+}
+
 /** Forums Section ************************************************************/
 
 /**
@@ -280 +292 @@
                         }
                 }
 
-                // Some legacy options are not registered with the Settings API
+                // Some legacy options are not registered with the Settings API, or are reversed in the UI.
                 $legacy_options = array(
                         'bp-disable-account-deletion',
                         'bp-disable-avatar-uploads',
+                        'bp-disable-group-avatar-uploads',
                         'bp_disable_blogforum_comments',
                         'bp-disable-profile-sync',
                         'bp_restrict_group_creation',

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

@@ -337 +337 @@
                         // Add the main section
                         add_settings_section( 'bp_xprofile', _x( 'Profile Settings', 'BuddyPress setting tab', 'buddypress' ), 'bp_admin_setting_callback_xprofile_section', 'buddypress' );
 
-                        $avatar_setting = 'bp_xprofile';
+                        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' );
 
                         // Profile sync setting
                         add_settings_field( 'bp-disable-profile-sync',   __( 'Profile Syncing',  'buddypress' ), 'bp_admin_setting_callback_profile_sync',     'buddypress', 'bp_xprofile' );
@@ -351 +352 @@
                         // Add the main section
                         add_settings_section( 'bp_groups',        __( 'Groups Settings',  'buddypress' ), 'bp_admin_setting_callback_groups_section',   'buddypress'              );
 
-                        if ( empty( $avatar_setting ) ) {
-                                $avatar_setting = 'bp_groups';
-                        }
-
                         // Allow subscriptions setting
                         add_settings_field( 'bp_restrict_group_creation', __( 'Group Creation',   'buddypress' ), 'bp_admin_setting_callback_group_creation',   'buddypress', 'bp_groups' );
                         register_setting  ( 'buddypress',         'bp_restrict_group_creation',   'intval'                                                                                );
+
+                        // Allow group avatars.
+                        add_settings_field( 'bp-disable-group-avatar-uploads', __( 'Group Photo Uploads', 'buddypress' ), 'bp_admin_setting_callback_group_avatar_uploads', 'buddypress', 'bp_groups' );
+                        register_setting( 'buddypress', 'bp-disable-group-avatar-uploads', 'intval' );
                 }
 
                 /** Forums ************************************************************/
@@ -393 +394 @@
                                 register_setting  ( 'buddypress',         '_bp_enable_akismet',   'intval'                                                                                  );
                         }
                 }
-
-                /** Avatar upload for users or groups ************************************/
-
-                if ( ! empty( $avatar_setting ) ) {
-                    // Allow avatar uploads
-                    add_settings_field( 'bp-disable-avatar-uploads', __( 'Profile Photo Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
-                    register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                    );
-                }
         }
 
         /**

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

@@ -1800 +1800 @@
         if ( bp_is_active( 'groups' ) ) {
                 // Group creation
                 if ( bp_is_group_create() && bp_is_group_creation_step( 'group-avatar' ) && 'crop-image' !== bp_get_avatar_admin_step() ) {
-                        $retval = ! bp_core_get_root_option( 'bp-disable-avatar-uploads' );
+                        $retval = ! bp_disable_group_avatar_uploads();
 
                 // Group Manage
                 } elseif ( bp_is_group_admin_page() && bp_is_group_admin_screen( 'group-avatar' ) && 'crop-image' !== bp_get_avatar_admin_step() ) {
-                        $retval = ! bp_core_get_root_option( 'bp-disable-avatar-uploads' );
+                        $retval = ! bp_disable_group_avatar_uploads();
                 }
         }
 

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

@@ -55 +55 @@
                 // Avatar uploads
                 'bp-disable-avatar-uploads'       => false,
 
+                // Group Profile Photos
+                'bp-disable-group-avatar-uploads' => false,
+
                 // Allow users to delete their own accounts
                 'bp-disable-account-deletion'     => false,
 
@@ -581 +584 @@
 }
 
 /**
+ * Are group avatars disabled?
+ *
+ * For backward compatibility, this option falls back on the value of 'bp-disable-avatar-uploads' when no value is
+ * found in the database.
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ *                      Defaults to the value of `bp_disable_avatar_uploads()`.
+ * @return bool True if group avatar uploads are disabled, otherwise false.
+ */
+function bp_disable_group_avatar_uploads( $default = null ) {
+        $disabled = bp_get_option( 'bp-disable-group-avatar-uploads', '' );
+
+        if ( '' === $disabled ) {
+                if ( is_null( $default ) ) {
+                        $disabled = bp_disable_avatar_uploads();
+                } else {
+                        $disabled = $default;
+                }
+        }
+
+        /**
+         * Filters whether or not members are able to upload group avatars.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param bool $disabled Whether or not members are able to upload their groups avatars.
+         * @param bool $default  Default value passed to the function.
+         */
+        return (bool) apply_filters( 'bp_disable_group_avatar_uploads', $disabled, $default );
+}
+
+/**
  * Are members able to delete their own accounts?
  *
  * @since BuddyPress (1.6.0)

src/bp-groups/bp-groups-loader.php

@@ -298 +298 @@
                 ) );
 
                 // If avatar uploads are not disabled, add avatar option
-                $disabled_avatar_uploads = (int) bp_core_get_root_option( 'bp-disable-avatar-uploads' );
+                $disabled_avatar_uploads = (int) bp_disable_group_avatar_uploads();
                 if ( ! $disabled_avatar_uploads && $bp->avatar->show_avatars ) {
                         $this->group_creation_steps['group-avatar'] = array(
                                 'name'     => _x( 'Photo', 'Group screen nav', 'buddypress' ),
@@ -574 +574 @@
                                         'position'        => 10,
                                 ), $default_params );
 
-                                if ( ! (int) bp_get_option( 'bp-disable-avatar-uploads' ) && buddypress()->avatar->show_avatars ) {
+                                if ( ! bp_disable_group_avatar_uploads() && buddypress()->avatar->show_avatars ) {
                                         $sub_nav[] = array_merge( array(
                                                 'name'        => __( 'Photo', 'buddypress' ),
                                                 'slug'        => 'group-avatar',

src/bp-groups/bp-groups-screens.php

@@ -906 +906 @@
                 return false;
 
         // If the logged-in user doesn't have permission or if avatar uploads are disabled, then stop here
-        if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) || ! buddypress()->avatar->show_avatars )
+        if ( ! bp_is_item_admin() || bp_disable_group_avatar_uploads() || ! buddypress()->avatar->show_avatars )
                 return false;
 
         $bp = buddypress();

src/bp-groups/bp-groups-template.php

@@ -709 +709 @@
                                 $classes[] = 'is-mod';
                 }
 
+                // Whether a group avatar will appear.
+                if ( bp_disable_group_avatar_uploads() || ! buddypress()->avatar->show_avatars ) {
+                        $classes[] = 'group-no-avatar';
+                } else {
+                        $classes[] = 'group-has-avatar';
+                }
+
                 /**
                  * Filters classes that will be applied to row class of the current group in the loop.
                  *
@@ -858 +865 @@
         function bp_get_group_avatar( $args = '' ) {
                 global $groups_template;
 
-                // Bail if avatars are turned off
-                // @todo Should we maybe still filter this?
-                if ( ! buddypress()->avatar->show_avatars ) {
+                // Bail if avatars are turned off.
+                if ( bp_disable_group_avatar_uploads() || ! buddypress()->avatar->show_avatars ) {
                         return false;
                 }
 

src/bp-templates/bp-legacy/buddypress/groups/groups-loop.php

@@ -38 +38 @@
         <?php while ( bp_groups() ) : bp_the_group(); ?>
 
                 <li <?php bp_group_class(); ?>>
-                        <div class="item-avatar">
-                                <a href="<?php bp_group_permalink(); ?>"><?php bp_group_avatar( 'type=thumb&width=50&height=50' ); ?></a>
-                        </div>
+                        <?php if ( ! bp_disable_group_avatar_uploads() ) : ?>
+                                <div class="item-avatar">
+                                        <a href="<?php bp_group_permalink(); ?>"><?php bp_group_avatar( 'type=thumb&width=50&height=50' ); ?></a>
+                                </div>
+                        <?php endif; ?>
 
                         <div class="item">
                                 <div class="item-title"><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a></div>

src/bp-templates/bp-legacy/buddypress/groups/single/group-header.php

@@ -29 +29 @@
 
 </div><!-- #item-actions -->
 
-<div id="item-header-avatar">
-        <a href="<?php bp_group_permalink(); ?>" title="<?php bp_group_name(); ?>">
+<?php if ( ! bp_disable_group_avatar_uploads() ) : ?>
+        <div id="item-header-avatar">
+                <a href="<?php bp_group_permalink(); ?>" title="<?php bp_group_name(); ?>">
 
-                <?php bp_group_avatar(); ?>
+                        <?php bp_group_avatar(); ?>
 
-        </a>
-</div><!-- #item-header-avatar -->
+                </a>
+        </div><!-- #item-header-avatar -->
+<?php endif; ?>
 
 <div id="item-header-content">
         <span class="highlight"><?php bp_group_type(); ?></span>
@@ -61 +63 @@
 <?php
 do_action( 'bp_after_group_header' );
 do_action( 'template_notices' );
-?>
- No newline at end of file
+?>

src/bp-templates/bp-legacy/buddypress/members/single/groups/invites.php

@@ -7 +7 @@
                 <?php while ( bp_groups() ) : bp_the_group(); ?>
 
                         <li>
-                                <div class="item-avatar">
-                                        <a href="<?php bp_group_permalink(); ?>"><?php bp_group_avatar( 'type=thumb&width=50&height=50' ); ?></a>
-                                </div>
+                                <?php if ( ! bp_disable_group_avatar_uploads() ) : ?>
+                                        <div class="item-avatar">
+                                                <a href="<?php bp_group_permalink(); ?>"><?php bp_group_avatar( 'type=thumb&width=50&height=50' ); ?></a>
+                                        </div>
+                                <?php endif; ?>
 
                                 <h4><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a><span class="small"> - <?php printf( _nx( '%d member', '%d members', bp_get_group_total_members( false ),'Group member count', 'buddypress' ), bp_get_group_total_members( false )  ); ?></span></h4>
 

src/bp-templates/bp-legacy/css/buddypress.css

@@ -1281 +1281 @@
         margin: 10px 0 0 60px;
         width: 50%;
 }
+#buddypress ul.item-list li.group-no-avatar div.item-desc {
+        margin-left: 0;
+}
 #buddypress ul.item-list li div.action {
         position: absolute;
         top: 15px;