Changeset 11155

Timestamp:

09/22/2016 01:50:49 AM (10 years ago)

Author:

r-a-y

Message:

Members: Auto-create registration pages when user registration is enabled.

Props r-a-y, boonebgorges.

See #7193.

Location:

trunk

Files:

• src/bp-members/classes/class-bp-members-admin.php (modified) (2 diffs)
• tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php (modified) (1 diff)

trunk/src/bp-members/classes/class-bp-members-admin.php

@@ -215 +215 @@
                                 add_filter( 'set-screen-option',    array( $this, 'signup_screen_options' ), 10, 3 );
                         }
+
+                        // Registration is turned on.
+                        add_action( 'update_site_option_registration',  array( $this, 'multisite_registration_on' ),   10, 2 );
+                        add_action( 'update_option_users_can_register', array( $this, 'single_site_registration_on' ), 10, 2 );
                 }
 
@@ -232 +236 @@
                         // Filter WP admin users list table to include users of the specified type.
                         add_filter( 'pre_get_users', array( $this, 'users_table_filter_by_type' ) );
+                }
+        }
+
+        /**
+         * Create registration pages when multisite user registration is turned on.
+         *
+         * @since 2.7.0
+         *
+         * @param string $option_name Current option name; value is always 'registration'.
+         * @param string $value
+         */
+        public function multisite_registration_on( $option_name, $value ) {
+                if ( 'user' === $value || 'all' === $value ) {
+                        bp_core_add_page_mappings( array(
+                                'register' => 1,
+                                'activate' => 1
+                        ) );
+                }
+        }
+
+        /**
+         * Create registration pages when single site registration is turned on.
+         *
+         * @since 2.7.0
+         *
+         * @param string $old_value
+         * @param string $value
+         */
+        public function single_site_registration_on( $old_value, $value ) {
+                // Single site.
+                if ( ! is_multisite() && ! empty( $value ) ) {
+                        bp_core_add_page_mappings( array(
+                                'register' => 1,
+                                'activate' => 1
+                        ) );
                 }
         }

trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php

@@ -286 +286 @@
                 $this->assertNotEmpty( $dir_pages->activity );
         }
+
+        /**
+         * @ticket BP7193
+         */
+        public function test_bp_core_get_directory_pages_autocreate_register_pages_single_site() {
+                if ( is_multisite() ) {
+                        return;
+                }
+
+                // Emulate being in the admin area.
+                if ( ! class_exists( 'BP_Members_Admin', false ) ) {
+                        require BP_PLUGIN_DIR . 'bp-members/classes/class-bp-members-admin.php';
+                }
+                $admin = new BP_Members_Admin;
+                add_action( 'update_option_users_can_register', array( $admin, 'single_site_registration_on' ), 10, 2 );
+
+                // Emulate turning registration on.
+                update_option( 'users_can_register', 1 );
+
+                // Now check directory pages.
+                $pages = bp_core_get_directory_pages();
+
+                $this->assertNotEmpty( $pages->register );
+                $this->assertNotEmpty( $pages->activate );
+
+                remove_action( 'update_option_users_can_register', array( $admin, 'single_site_registration_on' ), 10, 2 );
+        }
+
+        /**
+         * @ticket BP7193
+         */
+        public function test_bp_core_get_directory_pages_autocreate_register_pages_multisite() {
+                if ( ! is_multisite() ) {
+                        return;
+                }
+
+                // Emulate being in the network admin area.
+                if ( ! class_exists( 'BP_Members_Admin', false ) ) {
+                        require BP_PLUGIN_DIR . 'bp-members/classes/class-bp-members-admin.php';
+                }
+                $admin = new BP_Members_Admin;
+                add_action( 'update_site_option_registration', array( $admin, 'multisite_registration_on' ), 10, 2 );
+
+                // Emulate turning registration on.
+                update_site_option( 'registration', 'user' );
+
+                // Now check directory pages.
+                $pages = bp_core_get_directory_pages();
+
+                $this->assertNotEmpty( $pages->register );
+                $this->assertNotEmpty( $pages->activate );
+
+                remove_action( 'update_site_option_registration', array( $admin, 'multisite_registration_on' ), 10, 2 );
+        }
 }