Ticket #8470: 8470.patch

src/bp-activity/classes/class-bp-activity-component.php

@@ -502 +502 @@
                         )
                 );
         }
+
+        /**
+         * Add the Activity directory state.
+         *
+         * @since 8.0.0
+         *
+         * @param array   $states Optional. See BP_Component::admin_directory_states() for description.
+         * @param WP_Post $post   Optional. See BP_Component::admin_directory_states() for description.
+         * @return array          See BP_Component::admin_directory_states() for description.
+         */
+        public function admin_directory_states( $states = array(), $post = null ) {
+                $bp = buddypress();
+
+                if ( isset( $bp->pages->activity->id ) && (int) $bp->pages->activity->id === (int) $post->ID ) {
+                        $states['page_for_activity_directory'] = _x( 'BP Activity Page', 'page label', 'buddypress' );
+                }
+
+                return parent::admin_directory_states( $states, $post );
+        }
 }

src/bp-blogs/classes/class-bp-blogs-component.php

@@ -379 +379 @@
 
                 parent::rest_api_init( $controllers );
         }
+
+        /**
+         * Add the Sites directory states.
+         *
+         * @since 8.0.0
+         *
+         * @param array   $states Optional. See BP_Component::admin_directory_states() for description.
+         * @param WP_Post $post   Optional. See BP_Component::admin_directory_states() for description.
+         * @return array          See BP_Component::admin_directory_states() for description.
+         */
+        public function admin_directory_states( $states = array(), $post = null ) {
+                $bp = buddypress();
+
+                if ( isset( $bp->pages->blogs->id ) && (int) $bp->pages->blogs->id === (int) $post->ID ) {
+                        $states['page_for_sites_directory'] = _x( 'BP Sites Page', 'page label', 'buddypress' );
+                }
+
+                return parent::admin_directory_states( $states, $post );
+        }
 }

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

@@ -59 +59 @@
 // Add a new separator.
 add_action( 'bp_admin_menu', 'bp_admin_separator' );
 
+// Add a filter to include BP Components directory pages display states.
+add_filter( 'display_post_states', 'bp_admin_display_directory_states', 10, 2 );
+
 /**
  * When a new site is created in a multisite installation, run the activation
  * routine on that site.
@@ -234 +237 @@
          */
         do_action( 'bp_register_admin_settings' );
 }
+
+/**
+ * Dedicated filter to inform about BP components directory page states.
+ *
+ * @since 8.0.0
+ *
+ * @param string[] $post_states An array of post display states.
+ * @param WP_Post  $post        The current post object.
+ */
+function bp_admin_display_directory_states( $post_states = array(), $post = null ) {
+        /**
+         * Filter here to add BP Directory pages.
+         *
+         * Used internaly by BP_Component->admin_directory_states(). Please use the dynamic
+         * filter in BP_Component->admin_directory_states() to edit the directory state
+         * according to the component's ID.
+         *
+         * @since 8.0.0
+         *
+         * @param array    $value An empty array.
+         * @param WP_Post  $post  The current post object.
+         */
+        $directory_page_states = apply_filters( 'bp_admin_display_directory_states', array(), $post );
+
+        if ( $directory_page_states ) {
+                $post_states = array_merge( $post_states, $directory_page_states );
+        }
+
+        return $post_states;
+}

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

@@ -117 +117 @@
         // Set up an array of components (along with component names) that have directory pages.
         $directory_pages = bp_core_admin_get_directory_pages();
 
-        if ( !empty( $directory_pages ) ) : ?>
+        if ( ! empty( $directory_pages ) ) : ?>
 
-                <h3><?php _e( 'Directories', 'buddypress' ); ?></h3>
+                <h3><?php esc_html_e( 'Directories', 'buddypress' ); ?></h3>
 
-                <p><?php _e( 'Associate a WordPress Page with each BuddyPress component directory.', 'buddypress' ); ?></p>
+                <p><?php esc_html_e( 'Associate a WordPress Page with each BuddyPress component directory.', 'buddypress' ); ?></p>
 
                 <table class="form-table">
                         <tbody>
@@ -141 +141 @@
                                                                 'name'             => 'bp_pages[' . esc_attr( $name ) . ']',
                                                                 'echo'             => false,
                                                                 'show_option_none' => __( '- None -', 'buddypress' ),
-                                                                'selected'         => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
+                                                                'selected'         => ! empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
                                                         ) ); ?>
 
                                                         <?php if ( ! empty( $existing_pages[ $name ] ) && get_post( $existing_pages[ $name ] ) ) : ?>
 
                                                                 <a href="<?php echo esc_url( get_permalink( $existing_pages[$name] ) ); ?>" class="button-secondary" target="_bp">
-                                                                        <?php _e( 'View', 'buddypress' ); ?> <span class="dashicons dashicons-external" aria-hidden="true"></span>
+                                                                        <?php esc_html_e( 'View', 'buddypress' ); ?> <span class="dashicons dashicons-external" aria-hidden="true"></span>
                                                                         <span class="screen-reader-text"><?php esc_html_e( '(opens in a new tab)', 'buddypress' ); ?></span>
                                                                 </a>
 
@@ -185 +185 @@
 
         if ( !empty( $static_pages ) ) : ?>
 
-                <h3><?php _e( 'Registration', 'buddypress' ); ?></h3>
+                <h3><?php esc_html_e( 'Registration', 'buddypress' ); ?></h3>
 
                 <?php if ( bp_get_signup_allowed() || bp_get_members_invitations_allowed() ) : ?>
-                        <p><?php _e( 'Associate WordPress Pages with the following BuddyPress Registration pages.', 'buddypress' ); ?></p>
+                        <p>
+                                <?php esc_html_e( 'Associate WordPress Pages with the following BuddyPress Registration pages.', 'buddypress' ); ?>
+                                <?php esc_html_e( 'These pages will only be reachable by users who are not logged in.', 'buddypress' ); ?>
+                        </p>
                 <?php else : ?>
                         <?php if ( is_multisite() ) : ?>
                                 <p>
                                         <?php
-                                        /* translators: %s: the link to the Network settings page */
-                                        printf( __( 'Registration is currently disabled.  Before associating a page is allowed, please enable registration by selecting either the "User accounts may be registered" or "Both sites and user accounts can be registered" option on <a href="%s">this page</a>.', 'buddypress' ), network_admin_url( 'settings.php' ) );
+                                        printf(
+                                                /* translators: %s: the link to the Network settings page */
+                                                esc_html_x( 'Registration is currently disabled.  Before associating a page is allowed, please enable registration by selecting either the "User accounts may be registered" or "Both sites and user accounts can be registered" option on %s.', 'Disabled registration message for multisite config', 'buddypress' ),
+                                                sprintf(
+                                                        '<a href="%1$s">%2$s</a>',
+                                                        esc_url( network_admin_url( 'settings.php' ) ),
+                                                        esc_html_x( 'this page', 'Link text for the Multisite’s network settings page', 'buddypress' )
+                                                )
+                                        );
                                         ?>
                                 </p>
                         <?php else : ?>
                                 <p>
                                         <?php
-                                        /* translators: %s: the link to the Site settings page */
-                                        printf( __( 'Registration is currently disabled.  Before associating a page is allowed, please enable registration by clicking on the "Anyone can register" checkbox on <a href="%s">this page</a>.', 'buddypress' ), admin_url( 'options-general.php' ) );
+                                        printf(
+                                                /* translators: %s: the link to the Site general options page */
+                                                esc_html_x( 'Registration is currently disabled.  Before associating a page is allowed, please enable registration by clicking on the "Anyone can register" checkbox on %s.', 'Disabled registration message for regular site config', 'buddypress' ),
+                                                sprintf(
+                                                        '<a href="%1$s">%2$s</a>',
+                                                        esc_url( admin_url( 'options-general.php' ) ),
+                                                        esc_html_x( 'this page', 'Link text for the Site’s general options page', 'buddypress' )
+                                                )
+                                        );
                                         ?>
                                 </p>
                         <?php endif; ?>
@@ -228 +245 @@
                                                                 'selected'         => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
                                                         ) ) ?>
 
-                                                        <?php if ( ! empty( $existing_pages[ $name ] ) && get_post( $existing_pages[ $name ] ) ) : ?>
-
-                                                                <a href="<?php echo get_permalink( $existing_pages[$name] ); ?>" class="button-secondary" target="_bp"><?php _e( 'View', 'buddypress' ); ?></a>
-
-                                                        <?php endif; ?>
-
                                                         <?php if ( ! bp_is_root_blog() ) restore_current_blog(); ?>
 
                                                 </td>
@@ -266 +277 @@
 function bp_core_admin_slugs_setup_handler() {
 
         if ( isset( $_POST['bp-admin-pages-submit'] ) ) {
-                if ( !check_admin_referer( 'bp-admin-pages-setup' ) )
+                if ( ! check_admin_referer( 'bp-admin-pages-setup' ) ) {
                         return false;
+                }
 
                 // Then, update the directory pages.
                 if ( isset( $_POST['bp_pages'] ) ) {

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

@@ -471 +471 @@
                         add_action( 'bp_blocks_init', array( $this, 'blocks_init' ), 10 );
                 }
 
+                // Set directory page states.
+                add_filter( 'bp_admin_display_directory_states', array( $this, 'admin_directory_states' ), 10, 2 );
+
                 /**
                  * Fires at the end of the setup_actions method inside BP_Component.
                  *
@@ -946 +949 @@
                  */
                 do_action( 'bp_' . $this->id . '_blocks_init' );
         }
+
+        /**
+         * Add component's directory states.
+         *
+         * @since 8.0.0
+         *
+         * @param string[] $states An array of post display states.
+         * @param WP_Post  $post   The current post object.
+         * @return array           The component's directory states.
+         */
+        public function admin_directory_states( $states = array(), $post = null ) {
+                if ( $this->has_directory ) {
+                        /**
+                         * Filter here to edit the component's directory states.
+                         *
+                         * This is a dynamic hook that is based on the component string ID.
+                         *
+                         * @since 8.0.0
+                         *
+                         * @param string[] $states An array of post display states.
+                         */
+                        return apply_filters( 'bp_' . $this->id . '_admin_directory_states', $states );
+                }
+
+                return $states;
+        }
 }
 endif; // BP_Component.

src/bp-groups/classes/class-bp-groups-component.php

@@ -1064 +1064 @@
                         )
                 );
         }
+
+        /**
+         * Add the Groups directory states.
+         *
+         * @since 8.0.0
+         *
+         * @param array   $states Optional. See BP_Component::admin_directory_states() for description.
+         * @param WP_Post $post   Optional. See BP_Component::admin_directory_states() for description.
+         * @return array          See BP_Component::admin_directory_states() for description.
+         */
+        public function admin_directory_states( $states = array(), $post = null ) {
+                $bp = buddypress();
+
+                if ( isset( $bp->pages->groups->id ) && (int) $bp->pages->groups->id === (int) $post->ID ) {
+                        $states['page_for_groups_directory'] = _x( 'BP Groups Page', 'page label', 'buddypress' );
+                }
+
+                return parent::admin_directory_states( $states, $post );
+        }
 }

src/bp-members/classes/class-bp-members-component.php

@@ -835 +835 @@
                         )
                 );
         }
+
+        /**
+         * Add the Members directory states.
+         *
+         * @since 8.0.0
+         *
+         * @param array   $states Optional. See BP_Component::admin_directory_states() for description.
+         * @param WP_Post $post   Optional. See BP_Component::admin_directory_states() for description.
+         * @return array          See BP_Component::admin_directory_states() for description.
+         */
+        public function admin_directory_states( $states = array(), $post = null ) {
+                $bp = buddypress();
+
+                if ( isset( $bp->pages->members->id ) && (int) $bp->pages->members->id === (int) $post->ID ) {
+                        $states['page_for_members_directory'] = _x( 'BP Members Page', 'page label', 'buddypress' );
+                }
+
+                if ( bp_get_signup_allowed() || bp_get_members_invitations_allowed() ) {
+                        if ( isset( $bp->pages->register->id ) && (int) $bp->pages->register->id === (int) $post->ID ) {
+                                $states['page_for_bp_registration'] = _x( 'BP Registration Page', 'page label', 'buddypress' );
+                        }
+
+                        if ( isset( $bp->pages->activate->id ) && (int) $bp->pages->activate->id === (int) $post->ID ) {
+                                $states['page_for_bp_activation'] = _x( 'BP Activation Page', 'page label', 'buddypress' );
+                        }
+                }
+
+                return parent::admin_directory_states( $states, $post );
+        }
 }