10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

- strict typing with UM settings;

Browse Source
This commit is contained in:
Mykyta Synelnikov
2024-03-07 02:02:03 +02:00
parent abc0b9b331
commit 41e9a50e0b
5 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/class-enqueue.php
+2 -2
View File
@@ -104,7 +104,7 @@ final class Enqueue extends \um\common\Enqueue {
wp_register_script( 'um_admin_blocks_shortcodes', $js_url . 'admin/block-renderer' . $suffix . '.js', array( 'wp-i18n', 'wp-blocks', 'wp-components' ), UM_VERSION, true ); wp_register_script( 'um_admin_blocks_shortcodes', $js_url . 'admin/block-renderer' . $suffix . '.js', array( 'wp-i18n', 'wp-blocks', 'wp-components' ), UM_VERSION, true );
wp_set_script_translations( 'um_admin_blocks_shortcodes', 'ultimate-member' ); wp_set_script_translations( 'um_admin_blocks_shortcodes', 'ultimate-member' );
$notifications_enabled = 0; $notifications_enabled = false;
if ( false !== UM()->account()->is_notifications_tab_visible() ) { if ( false !== UM()->account()->is_notifications_tab_visible() ) {
$notifications_enabled = UM()->options()->get( 'account_tab_notifications' ); $notifications_enabled = UM()->options()->get( 'account_tab_notifications' );
} }
@@ -112,7 +112,7 @@ final class Enqueue extends \um\common\Enqueue {
$um_account_settings = array( $um_account_settings = array(
'general' => array( 'general' => array(
'label' => __( 'General', 'ultimate-member' ), 'label' => __( 'General', 'ultimate-member' ),
'enabled' => 1, 'enabled' => true,
), ),
'password' => array( 'password' => array(
'label' => __( 'Password', 'ultimate-member' ), 'label' => __( 'Password', 'ultimate-member' ),
includes/admin/class-site-health.php
+1 -1
View File
@@ -513,7 +513,7 @@ class Site_Health {
'value' => UM()->options()->get( 'enable_reset_password_limit' ) ? $labels['yes'] : $labels['no'], 'value' => UM()->options()->get( 'enable_reset_password_limit' ) ? $labels['yes'] : $labels['no'],
), ),
); );
if ( 1 === absint( UM()->options()->get( 'enable_reset_password_limit' ) ) ) { if ( UM()->options()->get( 'enable_reset_password_limit' ) ) {
$access_other_settings['um-reset_password_limit_number'] = array( $access_other_settings['um-reset_password_limit_number'] = array(
'label' => __( 'Reset Password Limit ', 'ultimate-member' ), 'label' => __( 'Reset Password Limit ', 'ultimate-member' ),
'value' => UM()->options()->get( 'reset_password_limit_number' ), 'value' => UM()->options()->get( 'reset_password_limit_number' ),
includes/admin/core/class-admin-settings.php
+3 -2
View File
@@ -786,6 +786,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
'use_um_gravatar_default_image' => array( 'use_um_gravatar_default_image' => array(
'sanitize' => 'bool', 'sanitize' => 'bool',
), ),
'delete_comments' => array(
'sanitize' => 'bool',
),
'toggle_password' => array( 'toggle_password' => array(
'sanitize' => 'bool', 'sanitize' => 'bool',
), ),
@@ -1416,7 +1419,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
'args' => array( 'args' => array(
'textarea_rows' => 6, 'textarea_rows' => 6,
), ),
'conditional' => array( 'account_tab_delete', '=', '1' ),
), ),
array( array(
'id' => 'delete_account_no_pass_required_text', 'id' => 'delete_account_no_pass_required_text',
@@ -1426,7 +1428,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
'args' => array( 'args' => array(
'textarea_rows' => 6, 'textarea_rows' => 6,
), ),
'conditional' => array( 'account_tab_delete', '=', '0' ),
), ),
), ),
), ),
includes/class-config.php
+33 -36
View File
@@ -530,65 +530,65 @@ if ( ! class_exists( 'um\Config' ) ) {
'require_strongpass' => false, 'require_strongpass' => false,
'password_min_chars' => 8, 'password_min_chars' => 8,
'password_max_chars' => 30, 'password_max_chars' => 30,
'account_tab_password' => 1, 'account_tab_password' => true,
'account_tab_privacy' => 1, 'account_tab_privacy' => true,
'account_tab_notifications' => 1, 'account_tab_notifications' => true,
'account_tab_delete' => 1, 'account_tab_delete' => true,
'delete_account_text' => __( 'Are you sure you want to delete your account? This will erase all of your account data from the site. To delete your account enter your password below.', 'ultimate-member' ), 'delete_account_text' => __( 'Are you sure you want to delete your account? This will erase all of your account data from the site. To delete your account enter your password below.', 'ultimate-member' ),
'delete_account_no_pass_required_text' => __( 'Are you sure you want to delete your account? This will erase all of your account data from the site. To delete your account, click on the button below.', 'ultimate-member' ), 'delete_account_no_pass_required_text' => __( 'Are you sure you want to delete your account? This will erase all of your account data from the site. To delete your account, click on the button below.', 'ultimate-member' ),
'account_name' => 1, 'account_name' => true,
'account_name_disable' => 0, 'account_name_disable' => false,
'account_name_require' => 1, 'account_name_require' => true,
'account_email' => 1, 'account_email' => true,
'account_general_password' => 0, 'account_general_password' => false,
'account_hide_in_directory' => 1, 'account_hide_in_directory' => true,
'account_hide_in_directory_default' => 'No', 'account_hide_in_directory_default' => 'No',
'photo_thumb_sizes' => array( 40, 80, 190 ), 'photo_thumb_sizes' => array( 40, 80, 190 ),
'cover_thumb_sizes' => array( 300, 600 ), 'cover_thumb_sizes' => array( 300, 600 ),
'accessible' => 0, 'accessible' => 0,
'access_redirect' => '', 'access_redirect' => '',
'access_exclude_uris' => array(), 'access_exclude_uris' => array(),
'home_page_accessible' => 1, 'home_page_accessible' => true,
'category_page_accessible' => 1, 'category_page_accessible' => true,
'restricted_post_title_replace' => 1, 'restricted_post_title_replace' => true,
'restricted_access_post_title' => __( 'Restricted content', 'ultimate-member' ), 'restricted_access_post_title' => __( 'Restricted content', 'ultimate-member' ),
'restricted_access_message' => '', 'restricted_access_message' => '',
'restricted_blocks' => 0, 'restricted_blocks' => false,
'enable_blocks' => 0, 'enable_blocks' => false,
'restricted_block_message' => '', 'restricted_block_message' => '',
'enable_reset_password_limit' => 1, 'enable_reset_password_limit' => true,
'reset_password_limit_number' => 3, 'reset_password_limit_number' => 3,
'change_password_request_limit' => false, 'change_password_request_limit' => false,
'blocked_emails' => '', 'blocked_emails' => '',
'blocked_words' => 'admin' . "\r\n" . 'administrator' . "\r\n" . 'webmaster' . "\r\n" . 'support' . "\r\n" . 'staff', 'blocked_words' => 'admin' . "\r\n" . 'administrator' . "\r\n" . 'webmaster' . "\r\n" . 'support' . "\r\n" . 'staff',
'allowed_choice_callbacks' => '', 'allowed_choice_callbacks' => '',
'allow_url_redirect_confirm' => 1, 'allow_url_redirect_confirm' => true,
'default_avatar' => '', 'default_avatar' => '',
'default_cover' => '', 'default_cover' => '',
'disable_profile_photo_upload' => 0, 'disable_profile_photo_upload' => false,
'profile_show_metaicon' => 0, 'profile_show_metaicon' => false,
'profile_menu' => 1, 'profile_menu' => true,
'profile_menu_default_tab' => 'main', 'profile_menu_default_tab' => 'main',
'profile_menu_icons' => 1, 'profile_menu_icons' => true,
'form_asterisk' => 0, 'form_asterisk' => false,
'profile_title' => '{display_name} | {site_name}', 'profile_title' => '{display_name} | {site_name}',
'profile_desc' => '{display_name} is on {site_name}. Join {site_name} to view {display_name}\'s profile', 'profile_desc' => '{display_name} is on {site_name}. Join {site_name} to view {display_name}\'s profile',
'admin_email' => get_bloginfo( 'admin_email' ), 'admin_email' => get_bloginfo( 'admin_email' ),
'mail_from' => get_bloginfo( 'name' ), 'mail_from' => get_bloginfo( 'name' ),
'mail_from_addr' => get_bloginfo( 'admin_email' ), 'mail_from_addr' => get_bloginfo( 'admin_email' ),
'email_html' => 1, 'email_html' => true,
'image_orientation_by_exif' => 0, 'image_orientation_by_exif' => false,
'image_compression' => 60, 'image_compression' => 60,
'image_max_width' => 1000, 'image_max_width' => 1000,
'cover_min_width' => 1000, 'cover_min_width' => 1000,
'profile_photo_max_size' => 999999999, 'profile_photo_max_size' => 999999999,
'cover_photo_max_size' => 999999999, 'cover_photo_max_size' => 999999999,
'custom_roles_increment' => 1, 'custom_roles_increment' => 1,
'um_profile_object_cache_stop' => 0, 'um_profile_object_cache_stop' => false,
'rest_api_version' => '2.0', 'rest_api_version' => '2.0',
'member_directory_own_table' => 0, 'member_directory_own_table' => false,
'profile_show_bio' => false, 'profile_show_bio' => false,
'profile_show_html_bio' => 0, 'profile_show_html_bio' => false,
'profile_bio_maxchars' => 180, 'profile_bio_maxchars' => 180,
'profile_noindex' => 0, 'profile_noindex' => 0,
'activation_link_expiry_time' => '', 'activation_link_expiry_time' => '',
@@ -599,7 +599,7 @@ if ( ! class_exists( 'um\Config' ) ) {
'secure_notify_admins_banned_accounts' => false, 'secure_notify_admins_banned_accounts' => false,
'secure_notify_admins_banned_accounts__interval' => 'instant', 'secure_notify_admins_banned_accounts__interval' => 'instant',
'secure_allowed_redirect_hosts' => '', 'secure_allowed_redirect_hosts' => '',
'delete_comments' => 0, 'delete_comments' => false,
); );
add_filter( 'um_get_tabs_from_config', '__return_true' ); add_filter( 'um_get_tabs_from_config', '__return_true' );
@@ -616,26 +616,26 @@ if ( ! class_exists( 'um\Config' ) ) {
if ( ! isset( $tab['default_privacy'] ) ) { if ( ! isset( $tab['default_privacy'] ) ) {
$this->settings_defaults[ 'profile_tab_' . $id . '_privacy' ] = 0; $this->settings_defaults[ 'profile_tab_' . $id . '_privacy' ] = 0;
$this->settings_defaults[ 'profile_tab_' . $id . '_roles' ] = ''; $this->settings_defaults[ 'profile_tab_' . $id . '_roles' ] = '';
} }
} }
foreach ( $this->email_notifications as $key => $notification ) { foreach ( $this->email_notifications as $key => $notification ) {
$this->settings_defaults[ $key . '_on' ] = ! empty( $notification['default_active'] ); $this->settings_defaults[ $key . '_on' ] = ! empty( $notification['default_active'] );
$this->settings_defaults[ $key . '_sub' ] = $notification['subject']; $this->settings_defaults[ $key . '_sub' ] = $notification['subject'];
$this->settings_defaults[ $key ] = $notification['body']; $this->settings_defaults[ $key ] = $notification['body'];
} }
foreach ( $this->core_pages as $page_s => $page ) { foreach ( $this->core_pages as $page_s => $page ) {
$page_id = UM()->options()->get_core_page_id( $page_s ); $page_id = UM()->options()->get_core_page_id( $page_s );
$this->settings_defaults[ $page_id ] = ''; $this->settings_defaults[ $page_id ] = '';
} }
foreach( $this->core_form_meta_all as $key => $value ) { foreach ( $this->core_form_meta_all as $key => $value ) {
$this->settings_defaults[ str_replace( '_um_', '', $key ) ] = $value; $this->settings_defaults[ str_replace( '_um_', '', $key ) ] = $value;
} }
/** /**
* UM hook * UM hook
* *
@@ -661,8 +661,6 @@ if ( ! class_exists( 'um\Config' ) ) {
$this->permalinks = $this->get_core_pages(); $this->permalinks = $this->get_core_pages();
$this->default_roles_metadata = array( $this->default_roles_metadata = array(
/* /*
* All caps map * All caps map
@@ -808,7 +806,6 @@ if ( ! class_exists( 'um\Config' ) ) {
); );
} }
/** /**
* Get UM Pages * Get UM Pages
* *
includes/core/class-access.php
+4 -4
View File
@@ -1772,10 +1772,10 @@ if ( ! class_exists( 'um\core\Access' ) ) {
$access = UM()->options()->get( 'accessible' ); $access = UM()->options()->get( 'accessible' );
if ( $access == 2 ) { if ( $access == 2 ) {
//global settings for accessible home page // Global settings for accessible home page
$home_page_accessible = UM()->options()->get( 'home_page_accessible' ); $home_page_accessible = UM()->options()->get( 'home_page_accessible' );
if ( $home_page_accessible == 0 ) { if ( ! $home_page_accessible ) {
//get redirect URL if not set get login page by default //get redirect URL if not set get login page by default
$redirect = UM()->options()->get( 'access_redirect' ); $redirect = UM()->options()->get( 'access_redirect' );
if ( ! $redirect ) { if ( ! $redirect ) {
@@ -1795,9 +1795,9 @@ if ( ! class_exists( 'um\core\Access' ) ) {
$access = UM()->options()->get( 'accessible' ); $access = UM()->options()->get( 'accessible' );
if ( $access == 2 ) { if ( $access == 2 ) {
//global settings for accessible home page // Global settings for accessible home page
$category_page_accessible = UM()->options()->get( 'category_page_accessible' ); $category_page_accessible = UM()->options()->get( 'category_page_accessible' );
if ( $category_page_accessible == 0 ) { if ( ! $category_page_accessible ) {
//get redirect URL if not set get login page by default //get redirect URL if not set get login page by default
$redirect = UM()->options()->get( 'access_redirect' ); $redirect = UM()->options()->get( 'access_redirect' );
if ( ! $redirect ) { if ( ! $redirect ) {