Ticket #8582: 8582.12.recommandations.patch

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

@@ -210 +210 @@
  */
 function bp_admin_setting_callback_membership_requests() {
 ?>
-        <input id="bp-enable-membership-requests" name="bp-enable-membership-requests" type="checkbox" value="1" <?php checked( bp_get_membership_requests_required( 'raw' ) ); ?> <?php if ( bp_get_signup_allowed() ) { echo 'disabled="disabled"'; } ?> />
+        <input id="bp-enable-membership-requests" name="bp-enable-membership-requests" type="checkbox" value="1" <?php checked( bp_get_membership_requests_required( 'raw' ) ); ?> <?php disabled( bp_get_signup_allowed() ); ?> />
         <label for="bp-enable-membership-requests"><?php esc_html_e( 'Allow visitors to request site membership. If enabled, an administrator must approve each new site membership request.', 'buddypress' ); ?></label>
         <?php if ( bp_get_signup_allowed() ) : ?>
                 <p class="description"><?php esc_html_e( 'Public registration is currently enabled. If you wish to require approval for new memberships, disable public registration and enable the membership requests feature.', 'buddypress' ); ?></p>

src/bp-core/bp-core-filters.php

@@ -501 +501 @@
          * @param string $title            The site title.
          */
         if ( apply_filters( 'bp_core_signup_send_activation_key_multisite_blog', true, $user, $user_email, $key, $is_signup_resend, $domain, $path, $title ) ) {
-
                 bp_send_email( 'core-user-registration-with-blog', array( array( $user_email => $salutation ) ), $args );
-
         }
 
         // Return false to stop the original WPMU function from continuing.
@@ -590 +588 @@
          * @param bool   $is_signup_resend Is the site admin sending this email?
          */
         if ( apply_filters( 'bp_core_signup_send_activation_key_multisite', true, $user, $user_email, $key, $is_signup_resend ) ) {
-
                 bp_send_email( 'core-user-registration', array( array( $user_email => $salutation ) ), $args );
-
         }
 
         // Return false to stop the original WPMU function from continuing.

src/bp-core/bp-core-functions.php

@@ -4162 +4162 @@
                 ),
         );
 
-        $members_membership_request= array(
+        $members_membership_request = array(
                 'description'      => __( 'Someone has requested membership on this site.', 'buddypress' ),
                 'named_salutation' => true,
                 'unsubscribe'      => array(
@@ -4171 +4171 @@
                 ),
         );
 
-        $members_membership_request_rejected= array(
+        $members_membership_request_rejected = array(
                 'description'      => __( 'A site membership request has been rejected.', 'buddypress' ),
                 'named_salutation' => false,
                 'unsubscribe'      => false,

src/bp-members/bp-members-admin.php

@@ -178 +178 @@
                 <?php if ( bp_members_site_requests_enabled() ) : ?>
                         <h2><?php esc_html_e( 'Site Request Information', 'buddypress' ); ?></h2>
                         <table class="signup-profile-data-drawer wp-list-table widefat fixed striped">
-                                <?php if ( ! empty( $signup_object->domain ) || ! empty( $signup_object->path )  ): ?>
+                                <?php if ( ! empty( $signup_object->domain ) || ! empty( $signup_object->path ) ) : ?>
                                         <tr>
                                                 <td class="column-fields"><?php esc_html_e( 'Site Title', 'buddypress' ); ?></td>
                                                 <td><?php echo esc_html( $signup_object->title ); ?></td>

src/bp-members/bp-members-membership-requests.php

@@ -144 +144 @@
  *
  * @since 10.0.0
  *
- * @param BP_Signup $signup  The signup object that has been created.
+ * @param BP_Signup $signup The signup object that has been created.
  */
 function bp_members_membership_requests_notify_site_admins( $signup ) {
 

src/bp-members/bp-members-notifications.php

@@ -256 +256 @@
                                 <tr id="members-notification-settings-invitation_accepted">
                                         <td></td>
                                         <td><?php echo esc_html_x( 'Someone accepts your membership invitation', 'Member settings on notification settings page', 'buddypress' ); ?></td>
-                                        <td class="yes"><input type="radio" name="notifications[notification_members_invitation_accepted]" id="notification-members-invitation-accepted-yes" value="yes" <?php checked( $allow_acceptance_emails, 'yes', true ) ?>/><label for="notification-members-invitation-accepted-yes" class="bp-screen-reader-text"><?php
+                                        <td class="yes"><input type="radio" name="notifications[notification_members_invitation_accepted]" id="notification-members-invitation-accepted-yes" value="yes" <?php checked( $allow_acceptance_emails, 'yes', true ) ?>/><label for="notification-members-invitation-accepted-yes" class="bp-screen-reader-text">
+                                                <?php
                                                 /* translators: accessibility text */
                                                 esc_html_e( 'Yes, send email', 'buddypress' );
-                                        ?></label></td>
-                                        <td class="no"><input type="radio" name="notifications[notification_members_invitation_accepted]" id="notification-members-invitation-accepted-no" value="no" <?php checked( $allow_acceptance_emails, 'no', true ) ?>/><label for="notification-members-invitation-accepted-no" class="bp-screen-reader-text"><?php
+                                                ?>
+                                        </label></td>
+                                        <td class="no"><input type="radio" name="notifications[notification_members_invitation_accepted]" id="notification-members-invitation-accepted-no" value="no" <?php checked( $allow_acceptance_emails, 'no', true ) ?>/><label for="notification-members-invitation-accepted-no" class="bp-screen-reader-text">
+                                                <?php
                                                 /* translators: accessibility text */
                                                 esc_html_e( 'No, do not send email', 'buddypress' );
-                                        ?></label></td>
+                                                ?>
+                                        </label></td>
                                 </tr>
                                 <?php
                         endif;
@@ -276 +280 @@
                                 <tr id="members-notification-settings-submitted_membership_request">
                                         <td></td>
                                         <td><?php echo esc_html_x( 'Someone has requested site membership', 'Member settings on notification settings page', 'buddypress' ) ?></td>
-                                        <td class="yes"><input type="radio" name="notifications[notification_members_membership_request]" id="notification-members-submitted_membership_request-yes" value="yes" <?php checked( $allow_request_emails, 'yes', true ) ?>/><label for="notification-members-submitted_membership_request-yes" class="bp-screen-reader-text"><?php
+                                        <td class="yes"><input type="radio" name="notifications[notification_members_membership_request]" id="notification-members-submitted_membership_request-yes" value="yes" <?php checked( $allow_request_emails, 'yes', true ) ?>/><label for="notification-members-submitted_membership_request-yes" class="bp-screen-reader-text">
+                                                <?php
                                                 /* translators: accessibility text */
                                                 esc_html_e( 'Yes, send email', 'buddypress' );
-                                        ?></label></td>
-                                        <td class="no"><input type="radio" name="notifications[notification_members_membership_request]" id="notification-members-submitted_membership_request-no" value="no" <?php checked( $allow_request_emails, 'no', true ) ?>/><label for="notification-members-submitted_membership_request-no" class="bp-screen-reader-text"><?php
+                                                ?>
+                                        </label></td>
+                                        <td class="no"><input type="radio" name="notifications[notification_members_membership_request]" id="notification-members-submitted_membership_request-no" value="no" <?php checked( $allow_request_emails, 'no', true ) ?>/><label for="notification-members-submitted_membership_request-no" class="bp-screen-reader-text">
+                                                <?php
                                                 /* translators: accessibility text */
                                                 esc_html_e( 'No, do not send email', 'buddypress' );
-                                        ?></label></td>
+                                                ?>
+                                        </label></td>
                                 </tr>
                                 <?php
                         endif;

src/bp-members/classes/class-bp-members-list-table.php

@@ -377 +377 @@
                                 )
                         );
 
-                        foreach( $field_groups as $field_group ) {
-                                foreach( $field_group->fields as $field ) {
+                        foreach ( $field_groups as $field_group ) {
+                                foreach ( $field_group->fields as $field ) {
                                         $this->signup_field_labels[ $field->id ] = $field->name;
                                 }
                         }

src/bp-members/classes/class-bp-members-ms-list-table.php

@@ -369 +369 @@
                                         )
                                 );
 
-                                foreach( $field_groups as $field_group ) {
-                                        foreach( $field_group->fields as $field ) {
+                                foreach ( $field_groups as $field_group ) {
+                                        foreach ( $field_group->fields as $field ) {
                                                 $this->signup_field_labels[ $field->id ] = $field->name;
                                         }
                                 }