diff --git a/assets/js/admin/secure.js b/assets/js/admin/security.js similarity index 100% rename from assets/js/admin/secure.js rename to assets/js/admin/security.js diff --git a/assets/js/admin/secure.min.js b/assets/js/admin/security.min.js similarity index 100% rename from assets/js/admin/secure.min.js rename to assets/js/admin/security.min.js diff --git a/includes/admin/class-enqueue.php b/includes/admin/class-enqueue.php index 01118a53..c92dda07 100644 --- a/includes/admin/class-enqueue.php +++ b/includes/admin/class-enqueue.php @@ -584,8 +584,8 @@ final class Enqueue extends \um\common\Enqueue { wp_enqueue_style( 'um_admin_roles' ); } elseif ( 'ultimate-member_page_um_options' === $hook ) { // phpcs:ignore WordPress.Security.NonceVerification - if ( isset( $_GET['tab'], $_GET['section'] ) && 'advanced' === $_GET['tab'] && 'secure' === $_GET['section'] ) { - wp_register_script( 'um_admin_secure', $js_url . 'admin/secure' . $suffix . '.js', array( 'jquery', 'wp-i18n' ), UM_VERSION, true ); + if ( isset( $_GET['tab'], $_GET['section'] ) && 'advanced' === $_GET['tab'] && 'security' === $_GET['section'] ) { + wp_register_script( 'um_admin_secure', $js_url . 'admin/security' . $suffix . '.js', array( 'jquery', 'wp-i18n' ), UM_VERSION, true ); wp_set_script_translations( 'um_admin_secure', 'ultimate-member' ); wp_enqueue_script( 'um_admin_secure' ); } diff --git a/includes/admin/class-secure.php b/includes/admin/class-secure.php index 2830bd85..6395a98a 100644 --- a/includes/admin/class-secure.php +++ b/includes/admin/class-secure.php @@ -90,11 +90,6 @@ if ( ! class_exists( 'um\admin\Secure' ) ) { */ public function admin_init() { global $wpdb; - // Dismiss admin notice after the first visit to Secure settings page. - if ( isset( $_REQUEST['page'], $_REQUEST['tab'], $_REQUEST['section'] ) && 'um_options' === sanitize_key( $_REQUEST['page'] ) && 'advanced' === sanitize_key( $_REQUEST['tab'] ) && 'secure' === sanitize_key( $_REQUEST['section'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification - UM()->admin()->notices()->dismiss( 'secure_settings' ); - } - if ( isset( $_REQUEST['um_secure_expire_all_sessions'] ) && ! wp_doing_ajax() ) { if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'um-secure-expire-session-nonce' ) || ! current_user_can( 'manage_options' ) ) { // This nonce is not valid or current logged-in user has no administrative rights. @@ -300,8 +295,8 @@ if ( ! class_exists( 'um\admin\Secure' ) ) { ) ); - $settings['advanced']['sections']['secure'] = array( - 'title' => __( 'Secure', 'ultimate-member' ), + $settings['advanced']['sections']['security'] = array( + 'title' => __( 'Security', 'ultimate-member' ), 'description' => __( 'This feature scans for suspicious registered accounts, bans the usage of administrative capabilities to site subscribers/members, allows the website administrators to force all users to reset their passwords, preventing users from logging-in using their old passwords that may have been exposed.', 'ultimate-member' ), 'fields' => $secure_fields, ); diff --git a/includes/admin/core/class-admin-notices.php b/includes/admin/core/class-admin-notices.php index 9a251f81..86e51a7b 100644 --- a/includes/admin/core/class-admin-notices.php +++ b/includes/admin/core/class-admin-notices.php @@ -31,8 +31,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) { add_action( 'wp_ajax_um_dismiss_notice', array( &$this, 'dismiss_notice' ) ); add_action( 'admin_init', array( &$this, 'force_dismiss_notice' ) ); - - add_action( 'current_screen', array( &$this, 'create_list_for_screen' ) ); } /** @@ -82,13 +80,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) { do_action( 'um_admin_create_notices' ); } - public function create_list_for_screen() { - if ( UM()->admin()->screen()->is_own_screen() ) { - $this->secure_settings(); - } - } - - /** * @return array */ @@ -838,39 +829,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) { } } - /** - * First time installed Secure settings. - */ - public function secure_settings() { - ob_start(); - ?> -

-
- -

-

- - -

- add_notice( - 'secure_settings', - array( - 'class' => 'warning', - 'message' => $message, - 'dismissible' => true, - ), - 1 - ); - } - public function common_secure() { if ( UM()->options()->get( 'lock_register_forms' ) ) { ob_start(); ?>

- Settings > Secure > Lock All Register Forms.', 'ultimate-member' ); ?> + Settings > Advanced > Security > Lock All Register Forms.', 'ultimate-member' ); ?>

- Settings > Secure > Display Login form notice to reset passwords.', 'ultimate-member' ); ?> + Settings > Advanced > Security > Display Login form notice to reset passwords.', 'ultimate-member' ); ?>

- Settings > Secure > Enable ban for administrative capabilities.', 'ultimate-member' ); ?> + Settings > Advanced > Security > Enable ban for administrative capabilities.', 'ultimate-member' ); ?>

' . esc_html__( 'Click here to lock them now.', 'ultimate-member' ) . ''; - $content .= ' ' . esc_html__( 'You can unblock the Register forms later. Just go to Ultimate Member > Settings > Secure > uncheck the option "Lock All Register Forms".', 'ultimate-member' ); + $content .= ' ' . esc_html__( 'You can unblock the Register forms later. Just go to Ultimate Member > Settings > Advanced > Security and uncheck the option "Lock All Register Forms".', 'ultimate-member' ); $content .= $br . $br; $suspicious_accounts_url = admin_url( 'users.php?um_status=inactive' ); diff --git a/includes/class-config.php b/includes/class-config.php index 6bbdf72b..aa8e1bf6 100644 --- a/includes/class-config.php +++ b/includes/class-config.php @@ -507,7 +507,7 @@ if ( ! class_exists( 'um\Config' ) ) { ), 'suspicious-activity' => array( 'key' => 'suspicious-activity', - 'title' => __( 'Secure: Suspicious Account Activity', 'ultimate-member' ), + 'title' => __( 'Security: Suspicious Account Activity', 'ultimate-member' ), 'subject' => __( '[{site_name}] Suspicious Account Activity', 'ultimate-member' ), 'body' => 'This is to inform you that there are suspicious activities with the following accounts: {user_profile_link}', 'description' => __( 'Whether to receive notification when suspicious account activity is detected.', 'ultimate-member' ),