@@ -67,7 +67,7 @@ class Restricted_Site_Access { /** * Plugin basename. * - * @var array $basename The plugin base name. + * @var string $basename The plugin base name. */ private static $basename; @@ -81,7 +81,7 @@ class Restricted_Site_Access { /** * Settings page slug. * - * @var array $settings_page The settings page slug. + * @var string $settings_page The settings page slug. */ private static $settings_page = 'reading'; @@ -146,7 +146,7 @@ public static function add_actions() { add_action( 'activate_' . self::$basename, array( __CLASS__, 'activation' ), 10, 1 ); add_action( 'deactivate_' . self::$basename, array( __CLASS__, 'deactivation' ), 10, 1 ); - add_action( 'wpmu_new_blog', array( __CLASS__, 'set_defaults' ), 10, 6 ); + add_action( 'wpmu_new_blog', array( __CLASS__, 'set_defaults' ) ); add_action( 'admin_enqueue_scripts', array( __CLASS__, 'enqueue_admin_script' ) ); add_action( 'wp_ajax_rsa_notice_dismiss', array( __CLASS__, 'ajax_notice_dismiss' ) ); @@ -156,7 +156,7 @@ public static function add_actions() { add_filter( 'pre_site_option_blog_public', array( __CLASS__, 'pre_option_blog_public' ), 10, 1 ); add_filter( 'application_password_is_api_request', array( __CLASS__, 'is_api_request' ) ); - // Hide admin bar for selected user roles. + // phpcs:ignore WordPressVIPMinimum.UserExperience.AdminBarRemoval.RemovalDetected -- Hide admin bar for selected user roles. add_filter( 'show_admin_bar', array( __CLASS__, 'hide_admin_bar_for_roles' ), 10, 1 ); // Prevent WordPress from auto-resolving 404 URLs. @@ -300,14 +300,9 @@ public static function ajax_notice_dismiss() { /** * Set RSA defaults for new site. * - * @param int $blog_id Blog ID. - * @param int $user_id User ID. - * @param string $domain Site domain. - * @param string $path Site path. - * @param int $site_id Site ID. Only relevant on multi-network installs. - * @param array $meta Meta data. Used to set initial site options. + * @param int $blog_id New site/blog ID. */ - public static function set_defaults( $blog_id, $user_id, $domain, $path, $site_id, $meta ) { + public static function set_defaults( $blog_id ) { if ( 'enforce' === self::get_network_mode() ) { return; } @@ -315,6 +310,7 @@ public static function set_defaults( $blog_id, $user_id, $domain, $path, $site_i $network_options = self::get_options( true ); $blog_public = get_site_option( 'blog_public', 2 ); + // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.switch_to_blog_switch_to_blog -- Only used to set options/change DB prefix. switch_to_blog( $blog_id ); update_option( 'rsa_options', self::sanitize_options( $network_options ) ); update_option( 'blog_public', (int) $blog_public ); @@ -380,7 +376,7 @@ protected static function populate_fields_array() { * @return string */ private static function get_config_network_mode() { - /** + /* * Get the network mode from the RSA_NETWORK_MODE constant. * Only allow 'enforce' or 'default'. */ @@ -395,7 +391,7 @@ private static function get_config_network_mode() { * Get current plugin network mode */ private static function get_network_mode() { - /** + /* * Get the network mode from the RSA_NETWORK_MODE constant. * Only allow 'enforce' or 'default'. */ @@ -560,7 +556,7 @@ public static function restrict_access( $wp ) { $request_uri = self::get_request_uri( $wp ); if ( is_array( $results ) && ! empty( $results ) ) { - /** + /* * This conditional prevents a redirect loop if the redirect URL * belongs to the same domain. */ @@ -581,6 +577,7 @@ public static function restrict_access( $wp ) { if ( ! filter_var( $results['url'], FILTER_VALIDATE_URL ) ) { $results['url'] = home_url( $results['url'] ); } + // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.cookies_setcookie -- This cookie is necessary to prevent redirection loops, caching handled. setcookie( 'wp-rsa_redirect', self::generate_redirection_cookie( $results['url'] ), 0, $cookie_path ); } } @@ -737,11 +734,11 @@ public static function restrict_access_check( $wp ) { case 2: if ( ! empty( self::$rsa_options['redirect_url'] ) ) { if ( ! empty( self::$rsa_options['redirect_path'] ) ) { - /** + /* * This conditional prevents a redirect loop if the redirect URL * belongs to the same domain. */ - // phpcs:ignore WordPress.Security.NonceVerification.Recommended + // phpcs:ignore WordPressVIPMinimum.Variables.RestrictedVariables.cache_constraints___COOKIE -- This cookie is necessary to prevent redirection loops, caching handled. if ( isset( $_COOKIE['wp-rsa_redirect'] ) && self::generate_redirection_cookie( home_url( $request_uri ) ) === $_COOKIE['wp-rsa_redirect'] ) { self::$rsa_options['redirect_url'] = home_url( $request_uri ); } else { @@ -1117,12 +1114,13 @@ public static function enqueue_settings_script() { $script_path = 'assets/js/build/settings.min.js'; $script_asset_path = plugin_dir_path( __FILE__ ) . 'assets/js/build/settings.min.asset.php'; $script_asset = file_exists( $script_asset_path ) + // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable -- file_exists check ensures this is safe. ? require $script_asset_path : array( 'dependencies' => array(), 'version' => filemtime( $script_path ), ); - $script_url = plugins_url( $script_path, __FILE__ ); + $script_url = plugins_url( $script_path, __FILE__ ); wp_enqueue_script( 'rsa-settings', $script_url, $script_asset['dependencies'], $script_asset['version'], true ); @@ -1148,12 +1146,13 @@ public static function enqueue_admin_script() { $script_path = 'assets/js/build/admin.min.js'; $script_asset_path = plugin_dir_path( __FILE__ ) . 'assets/js/build/admin.min.asset.php'; $script_asset = file_exists( $script_asset_path ) + // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable -- file_exists check ensures this is safe. ? require $script_asset_path : array( 'dependencies' => array(), 'version' => filemtime( $script_path ), ); - $script_url = plugins_url( $script_path, __FILE__ ); + $script_url = plugins_url( $script_path, __FILE__ ); wp_enqueue_script( 'rsa-admin', $script_url, $script_asset['dependencies'], $script_asset['version'], true ); @@ -1450,6 +1449,7 @@ public static function blog_privacy_selector() { * @return array Sanitized input */ public static function sanitize_options( $input ) { + $new_input = array(); $new_input['approach'] = (int) $input['approach']; if ( $new_input['approach'] < 1 || $new_input['approach'] > 4 ) { $new_input['approach'] = self::$fields['approach']['default']; @@ -1590,7 +1590,7 @@ public static function settings_field_allowed() {