From 9e4a0b5309013999b869d45610ae33e3b4c4c20e Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Sun, 10 Dec 2017 16:32:12 +0200 Subject: [PATCH] - removed redundant data; --- includes/admin/core/class-admin-metabox.php | 20 +------------------ includes/admin/core/class-admin-settings.php | 2 +- .../templates/access/restrict_content.php | 11 +--------- .../admin/templates/directory/appearance.php | 1 - .../admin/templates/directory/general.php | 7 ------- .../admin/templates/directory/pagination.php | 3 --- .../admin/templates/directory/profile.php | 9 --------- includes/admin/templates/directory/search.php | 7 ------- includes/admin/templates/role/admin.php | 6 ------ includes/admin/templates/role/delete.php | 2 -- includes/admin/templates/role/general.php | 2 -- includes/admin/templates/role/home.php | 2 -- includes/admin/templates/role/login.php | 2 -- includes/admin/templates/role/logout.php | 2 -- includes/admin/templates/role/profile.php | 2 -- includes/admin/templates/role/register.php | 11 ---------- .../admin/templates/role/wp-capabilities.php | 1 - 17 files changed, 3 insertions(+), 87 deletions(-) diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php index 2008749b..9b731860 100644 --- a/includes/admin/core/class-admin-metabox.php +++ b/includes/admin/core/class-admin-metabox.php @@ -216,7 +216,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { array( 'id' => '_um_custom_access_settings', 'type' => 'checkbox', - 'name' => '_um_custom_access_settings', 'label' => __( 'Restrict access to this content?', 'ultimate-member' ), 'description' => __( 'Activate content restriction for this post', 'ultimate-member' ), 'value' => ! empty( $data['_um_custom_access_settings'] ) ? $data['_um_custom_access_settings'] : 0, @@ -224,7 +223,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { array( 'id' => '_um_accessible', 'type' => 'select', - 'name' => '_um_accessible', 'label' => __( 'Who can access this content?', 'ultimate-member' ), 'description' => __( 'Activate content restriction for this post', 'ultimate-member' ), 'value' => ! empty( $data['_um_accessible'] ) ? $data['_um_accessible'] : 0, @@ -238,7 +236,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { array( 'id' => '_um_access_roles', 'type' => 'multi_checkbox', - 'name' => '_um_access_roles', 'label' => __( 'Select which roles can access this content', 'ultimate-member' ), 'description' => __( 'Activate content restriction for this post', 'ultimate-member' ), 'options' => UM()->roles()->get_roles( false, array( 'administrator' ) ), @@ -248,7 +245,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { array( 'id' => '_um_noaccess_action', 'type' => 'select', - 'name' => '_um_noaccess_action', 'label' => __( 'What happens when users without access tries to view the content?', 'ultimate-member' ), 'description' => __( 'Action when users without access tries to view the content', 'ultimate-member' ), 'value' => ! empty( $data['_um_noaccess_action'] ) ? $data['_um_noaccess_action'] : 0, @@ -261,7 +257,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { array( 'id' => '_um_restrict_by_custom_message', 'type' => 'select', - 'name' => '_um_restrict_by_custom_message', 'label' => __( 'Would you like to use the global default message or apply a custom message to this content?', 'ultimate-member' ), 'description' => __( 'Action when users without access tries to view the content', 'ultimate-member' ), 'value' => ! empty( $data['_um_restrict_by_custom_message'] ) ? $data['_um_restrict_by_custom_message'] : '0', @@ -274,7 +269,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { array( 'id' => '_um_restrict_custom_message', 'type' => 'wp_editor', - 'name' => '_um_restrict_custom_message', 'label' => __( 'Custom Restrict Content message', 'ultimate-member' ), 'description' => __( 'Changed global restrict message', 'ultimate-member' ), 'value' => ! empty( $data['_um_restrict_custom_message'] ) ? $data['_um_restrict_custom_message'] : '', @@ -283,7 +277,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { array( 'id' => '_um_access_redirect', 'type' => 'select', - 'name' => '_um_access_redirect', 'label' => __( 'Where should users be redirected to?', 'ultimate-member' ), 'description' => __( 'Select redirect to page when user hasn\'t access to content', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_redirect'] ) ? $data['_um_access_redirect'] : '0', @@ -296,7 +289,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { array( 'id' => '_um_access_redirect_url', 'type' => 'text', - 'name' => '_um_access_redirect_url', 'label' => __( 'Redirect URL', 'ultimate-member' ), 'description' => __( 'Changed global restrict message', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_redirect_url'] ) ? $data['_um_access_redirect_url'] : '', @@ -305,7 +297,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { array( 'id' => '_um_access_hide_from_queries', 'type' => 'checkbox', - 'name' => '_um_access_hide_from_queries', 'label' => __( 'Hide from queries', 'ultimate-member' ), 'description' => __( 'Hide this content from archives, RSS feeds etc for users who do not have permission to view this content', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_hide_from_queries'] ) ? $data['_um_access_hide_from_queries'] : '', @@ -344,7 +335,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { 'id' => '_um_custom_access_settings', 'type' => 'checkbox', 'class' => 'form-field', - 'name' => '_um_custom_access_settings', 'label' => __( 'Restrict access to this content?', 'ultimate-member' ), 'description' => __( 'Activate content restriction for this post', 'ultimate-member' ), 'value' => ! empty( $data['_um_custom_access_settings'] ) ? $data['_um_custom_access_settings'] : 0, @@ -353,7 +343,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { 'id' => '_um_accessible', 'type' => 'select', 'class' => 'form-field', - 'name' => '_um_accessible', 'label' => __( 'Who can access this content?', 'ultimate-member' ), 'description' => __( 'Activate content restriction for this post', 'ultimate-member' ), 'value' => ! empty( $data['_um_accessible'] ) ? $data['_um_accessible'] : 0, @@ -368,7 +357,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { 'id' => '_um_access_roles', 'type' => 'multi_checkbox', 'class' => 'form-field', - 'name' => '_um_access_roles', 'label' => __( 'Select which roles can access this content', 'ultimate-member' ), 'description' => __( 'Activate content restriction for this post', 'ultimate-member' ), 'value' => $_um_access_roles_value, @@ -380,7 +368,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { 'id' => '_um_noaccess_action', 'type' => 'select', 'class' => 'form-field', - 'name' => '_um_noaccess_action', 'label' => __( 'What happens when users without access tries to view the content?', 'ultimate-member' ), 'description' => __( 'Action when users without access tries to view the content', 'ultimate-member' ), 'value' => ! empty( $data['_um_noaccess_action'] ) ? $data['_um_noaccess_action'] : 0, @@ -394,7 +381,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { 'id' => '_um_restrict_by_custom_message', 'type' => 'select', 'class' => 'form-field', - 'name' => '_um_restrict_by_custom_message', 'label' => __( 'Would you like to use the global default message or apply a custom message to this content?', 'ultimate-member' ), 'description' => __( 'Action when users without access tries to view the content', 'ultimate-member' ), 'value' => ! empty( $data['_um_restrict_by_custom_message'] ) ? $data['_um_restrict_by_custom_message'] : '0', @@ -408,7 +394,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { 'id' => '_um_restrict_custom_message', 'type' => 'wp_editor', 'class' => 'form-field', - 'name' => '_um_restrict_custom_message', 'label' => __( 'Custom Restrict Content message', 'ultimate-member' ), 'description' => __( 'Changed global restrict message', 'ultimate-member' ), 'value' => ! empty( $data['_um_restrict_custom_message'] ) ? $data['_um_restrict_custom_message'] : '', @@ -418,7 +403,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { 'id' => '_um_access_redirect', 'type' => 'select', 'class' => 'form-field', - 'name' => '_um_access_redirect', 'label' => __( 'Where should users be redirected to?', 'ultimate-member' ), 'description' => __( 'Select redirect to page when user hasn\'t access to content', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_redirect'] ) ? $data['_um_access_redirect'] : '0', @@ -432,7 +416,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { 'id' => '_um_access_redirect_url', 'type' => 'text', 'class' => 'form-field', - 'name' => '_um_access_redirect_url', 'label' => __( 'Redirect URL', 'ultimate-member' ), 'description' => __( 'Changed global restrict message', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_redirect_url'] ) ? $data['_um_access_redirect_url'] : '', @@ -442,7 +425,6 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { 'id' => '_um_access_hide_from_queries', 'type' => 'checkbox', 'class' => 'form-field', - 'name' => '_um_access_hide_from_queries', 'label' => __( 'Hide from queries', 'ultimate-member' ), 'description' => __( 'Hide this content from archives, RSS feeds etc for users who do not have permission to view this content', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_hide_from_queries'] ) ? $data['_um_access_hide_from_queries'] : '', @@ -454,7 +436,7 @@ if ( ! class_exists( 'Admin_Metabox' ) ) { 'class' => 'um-restrict-content um-third-column', 'prefix_id' => 'um_content_restriction', 'without_wrapper' => true, - 'fields' => $fields + 'fields' => $fields ) )->render_form(); wp_nonce_field( basename( __FILE__ ), 'um_admin_save_taxonomy_restrict_content_nonce' ); diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php index 3f364282..9bbda965 100644 --- a/includes/admin/core/class-admin-settings.php +++ b/includes/admin/core/class-admin-settings.php @@ -2281,7 +2281,7 @@ Use Only Cookies: admin_forms( array( 'class' => 'um_options-' . $current_tab . '-' . $current_subtab . ' um-third-column', 'prefix_id' => 'um_options', - 'fields' => $section_fields + 'fields' => $section_fields ) )->render_form(); ?> '_um_custom_access_settings', 'type' => 'checkbox', - 'name' => '_um_custom_access_settings', 'label' => __( 'Restrict access to this content?', 'ultimate-member' ), 'tooltip' => __( 'Activate content restriction for this post', 'ultimate-member' ), 'value' => ! empty( $data['_um_custom_access_settings'] ) ? $data['_um_custom_access_settings'] : 0, @@ -30,7 +29,6 @@ if ( ! defined( 'ABSPATH' ) ) exit; array( 'id' => '_um_accessible', 'type' => 'select', - 'name' => '_um_accessible', 'label' => __( 'Who can access this content?', 'ultimate-member' ), 'tooltip' => __( 'Activate content restriction for this post', 'ultimate-member' ), 'value' => ! empty( $data['_um_accessible'] ) ? $data['_um_accessible'] : 0, @@ -44,7 +42,6 @@ if ( ! defined( 'ABSPATH' ) ) exit; array( 'id' => '_um_access_roles', 'type' => 'multi_checkbox', - 'name' => '_um_access_roles', 'label' => __( 'Select which roles can access this content', 'ultimate-member' ), 'tooltip' => __( 'Activate content restriction for this post', 'ultimate-member' ), 'value' => $_um_access_roles_value, @@ -55,7 +52,6 @@ if ( ! defined( 'ABSPATH' ) ) exit; array( 'id' => '_um_noaccess_action', 'type' => 'select', - 'name' => '_um_noaccess_action', 'label' => __( 'What happens when users without access tries to view the content?', 'ultimate-member' ), 'tooltip' => __( 'Action when users without access tries to view the content', 'ultimate-member' ), 'value' => ! empty( $data['_um_noaccess_action'] ) ? $data['_um_noaccess_action'] : 0, @@ -68,7 +64,6 @@ if ( ! defined( 'ABSPATH' ) ) exit; array( 'id' => '_um_restrict_by_custom_message', 'type' => 'select', - 'name' => '_um_restrict_by_custom_message', 'label' => __( 'Would you like to use the global default message or apply a custom message to this content?', 'ultimate-member' ), 'tooltip' => __( 'Action when users without access tries to view the content', 'ultimate-member' ), 'value' => ! empty( $data['_um_restrict_by_custom_message'] ) ? $data['_um_restrict_by_custom_message'] : '0', @@ -81,7 +76,6 @@ if ( ! defined( 'ABSPATH' ) ) exit; array( 'id' => '_um_restrict_custom_message', 'type' => 'wp_editor', - 'name' => '_um_restrict_custom_message', 'label' => __( 'Custom Restrict Content message', 'ultimate-member' ), 'tooltip' => __( 'Changed global restrict message', 'ultimate-member' ), 'value' => ! empty( $data['_um_restrict_custom_message'] ) ? $data['_um_restrict_custom_message'] : '', @@ -90,7 +84,6 @@ if ( ! defined( 'ABSPATH' ) ) exit; array( 'id' => '_um_access_redirect', 'type' => 'select', - 'name' => '_um_access_redirect', 'label' => __( 'Where should users be redirected to?', 'ultimate-member' ), 'tooltip' => __( 'Select redirect to page when user hasn\'t access to content', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_redirect'] ) ? $data['_um_access_redirect'] : '0', @@ -103,7 +96,6 @@ if ( ! defined( 'ABSPATH' ) ) exit; array( 'id' => '_um_access_redirect_url', 'type' => 'text', - 'name' => '_um_access_redirect_url', 'label' => __( 'Redirect URL', 'ultimate-member' ), 'tooltip' => __( 'Changed global restrict message', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_redirect_url'] ) ? $data['_um_access_redirect_url'] : '', @@ -112,7 +104,6 @@ if ( ! defined( 'ABSPATH' ) ) exit; array( 'id' => '_um_access_hide_from_queries', 'type' => 'checkbox', - 'name' => '_um_access_hide_from_queries', 'label' => __( 'Hide from queries', 'ultimate-member' ), 'tooltip' => __( 'Hide this content from archives, RSS feeds etc for users who do not have permission to view this content', 'ultimate-member' ), 'value' => ! empty( $data['_um_access_hide_from_queries'] ) ? $data['_um_access_hide_from_queries'] : '', @@ -123,7 +114,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; UM()->admin_forms( array( 'class' => 'um-restrict-content um-third-column', 'prefix_id' => 'um_content_restriction', - 'fields' => $fields + 'fields' => $fields ) )->render_form(); ?> \ No newline at end of file diff --git a/includes/admin/templates/directory/appearance.php b/includes/admin/templates/directory/appearance.php index 384e7642..2b8153fe 100644 --- a/includes/admin/templates/directory/appearance.php +++ b/includes/admin/templates/directory/appearance.php @@ -7,7 +7,6 @@ array( 'id' => '_um_directory_template', 'type' => 'select', - 'name' => '_um_directory_template', 'label' => __( 'Template', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_directory_template', null, um_get_option( 'directory_template' ) ), 'options' => UM()->shortcodes()->get_templates( 'members' ), diff --git a/includes/admin/templates/directory/general.php b/includes/admin/templates/directory/general.php index c909d018..ffbc02ac 100644 --- a/includes/admin/templates/directory/general.php +++ b/includes/admin/templates/directory/general.php @@ -24,13 +24,11 @@ if ( $show_these_users ) { array( 'id' => '_um_mode', 'type' => 'hidden', - 'name' => '_um_mode', 'value' => 'directory', ), array( 'id' => '_um_roles', 'type' => 'select', - 'name' => '_um_roles', 'label' => __( 'User Roles to Display', 'ultimate-member' ), 'tooltip' => __( 'If you do not want to show all members, select only user roles to appear in this directory', 'ultimate-member' ), 'options' => UM()->roles()->get_roles(), @@ -40,7 +38,6 @@ if ( $show_these_users ) { array( 'id' => '_um_has_profile_photo', 'type' => 'checkbox', - 'name' => '_um_has_profile_photo', 'label' => __( 'Only show members who have uploaded a profile photo', 'ultimate-member' ), 'tooltip' => __( 'If \'Use Gravatars\' as profile photo is enabled, this option is ignored', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_has_profile_photo' ), @@ -48,14 +45,12 @@ if ( $show_these_users ) { array( 'id' => '_um_has_cover_photo', 'type' => 'checkbox', - 'name' => '_um_has_cover_photo', 'label' => __( 'Only show members who have uploaded a cover photo', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_has_cover_photo' ), ), array( 'id' => '_um_sortby', 'type' => 'select', - 'name' => '_um_sortby', 'label' => __( 'Sort users by', 'ultimate-member' ), 'tooltip' => __( 'Sort users by a specific parameter in the directory', 'ultimate-member' ), 'options' => apply_filters( 'um_admin_directory_sort_users_select', array( @@ -73,7 +68,6 @@ if ( $show_these_users ) { array( 'id' => '_um_sortby_custom', 'type' => 'text', - 'name' => '_um_sortby_custom', 'label' => __( 'Meta key', 'ultimate-member' ), 'tooltip' => __( 'To sort by a custom field, enter the meta key of field here', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_sortby_custom', null, 'na' ), @@ -82,7 +76,6 @@ if ( $show_these_users ) { array( 'id' => '_um_show_these_users', 'type' => 'textarea', - 'name' => '_um_show_these_users', 'label' => __( 'Only show specific users (Enter one username per line)', 'ultimate-member' ), 'value' => $show_these_users, ) diff --git a/includes/admin/templates/directory/pagination.php b/includes/admin/templates/directory/pagination.php index cc23c016..545801b7 100644 --- a/includes/admin/templates/directory/pagination.php +++ b/includes/admin/templates/directory/pagination.php @@ -7,7 +7,6 @@ array( 'id' => '_um_profiles_per_page', 'type' => 'text', - 'name' => '_um_profiles_per_page', 'label' => __( 'Number of profiles per page', 'ultimate-member' ), 'tooltip' => __( 'Number of profiles to appear on page for standard users', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_profiles_per_page', null, 12 ), @@ -16,7 +15,6 @@ array( 'id' => '_um_profiles_per_page_mobile', 'type' => 'text', - 'name' => '_um_profiles_per_page_mobile', 'label' => __( 'Number of profiles per page (for Mobiles & Tablets)', 'ultimate-member' ), 'tooltip' => __( 'Number of profiles to appear on page for mobile users', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_profiles_per_page_mobile', null, 8 ), @@ -25,7 +23,6 @@ array( 'id' => '_um_max_users', 'type' => 'text', - 'name' => '_um_max_users', 'label' => __( 'Maximum number of profiles', 'ultimate-member' ), 'tooltip' => __( 'Use this setting to control the maximum number of profiles to appear in this directory. Leave blank to disable this limit', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_max_users', null, 'na' ), diff --git a/includes/admin/templates/directory/profile.php b/includes/admin/templates/directory/profile.php index 70afd1c4..e54f0551 100644 --- a/includes/admin/templates/directory/profile.php +++ b/includes/admin/templates/directory/profile.php @@ -17,14 +17,12 @@ array( 'id' => '_um_profile_photo', 'type' => 'checkbox', - 'name' => '_um_profile_photo', 'label' => __( 'Enable Profile Photo', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_profile_photo', null, 1 ), ), array( 'id' => '_um_cover_photos', 'type' => 'checkbox', - 'name' => '_um_cover_photos', 'label' => __( 'Enable Cover Photo', 'ultimate-member' ), 'tooltip' => __( 'If turned on, the users cover photo will appear in the directory', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_cover_photos', null, 1 ), @@ -32,21 +30,18 @@ array( 'id' => '_um_show_name', 'type' => 'checkbox', - 'name' => '_um_show_name', 'label' => __( 'Show display name', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_show_name', null, 1 ), ), array( 'id' => '_um_show_tagline', 'type' => 'checkbox', - 'name' => '_um_show_tagline', 'label' => __( 'Show tagline below profile name', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_show_tagline' ), ), array( 'id' => '_um_tagline_fields', 'type' => 'multi_selects', - 'name' => '_um_tagline_fields', 'label' => __( 'Choose field(s) to display in tagline', 'ultimate-member' ), 'value' => $_um_tagline_fields, 'conditional' => array( '_um_show_tagline', '=', 1 ), @@ -57,14 +52,12 @@ array( 'id' => '_um_show_userinfo', 'type' => 'checkbox', - 'name' => '_um_show_userinfo', 'label' => __( 'Show extra user information below tagline?', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_show_userinfo' ), ), array( 'id' => '_um_userinfo_animate', 'type' => 'checkbox', - 'name' => '_um_userinfo_animate', 'label' => __( 'Enable reveal section transition by default', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_userinfo_animate' ), 'conditional' => array( '_um_show_userinfo', '=', 1 ) @@ -72,7 +65,6 @@ array( 'id' => '_um_reveal_fields', 'type' => 'multi_selects', - 'name' => '_um_reveal_fields', 'label' => __( 'Choose field(s) to display in reveal section', 'ultimate-member' ), 'value' => $_um_reveal_fields, 'add_text' => __( 'Add New Custom Field', 'ultimate-member' ), @@ -83,7 +75,6 @@ array( 'id' => '_um_show_social', 'type' => 'checkbox', - 'name' => '_um_show_social', 'label' => __( 'Show social connect icons', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_show_social' ), 'conditional' => array( '_um_show_userinfo', '=', 1 ) diff --git a/includes/admin/templates/directory/search.php b/includes/admin/templates/directory/search.php index 1840e744..520c0647 100644 --- a/includes/admin/templates/directory/search.php +++ b/includes/admin/templates/directory/search.php @@ -24,7 +24,6 @@ array( 'id' => '_um_search', 'type' => 'checkbox', - 'name' => '_um_search', 'label' => __( 'Enable Search feature', 'ultimate-member' ), 'tooltip' => __( 'If turned on, users will be able to search members in this directory', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_search' ), @@ -32,7 +31,6 @@ array( 'id' => '_um_must_search', 'type' => 'checkbox', - 'name' => '_um_must_search', 'label' => __( 'Show results only after search', 'ultimate-member' ), 'tooltip' => __( 'If turned on, member results will only appear after search is performed', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value( '_um_must_search' ), @@ -42,7 +40,6 @@ 'id' => '_um_roles_can_search', 'type' => 'select', 'multi' => true, - 'name' => '_um_roles_can_search', 'label' => __( 'User Roles that can use search', 'ultimate-member' ), 'tooltip' => __( 'If you want to allow specific user roles to be able to search only', 'ultimate-member' ), 'value' => $can_search_array, @@ -52,7 +49,6 @@ array( 'id' => '_um_search_fields', 'type' => 'multi_selects', - 'name' => '_um_search_fields', 'label' => __( 'Choose field(s) to enable in search', 'ultimate-member' ), 'value' => $_um_search_fields, 'conditional' => array( '_um_search', '=', 1 ), @@ -63,7 +59,6 @@ array( 'id' => '_um_directory_header', 'type' => 'text', - 'name' => '_um_directory_header', 'label' => __( 'Results Text', 'ultimate-member' ), 'tooltip' => __( 'Customize the search result text . e.g. Found 3,000 Members. Leave this blank to not show result text', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value('_um_directory_header', null, __('{total_users} Members','ultimate-member') ), @@ -72,7 +67,6 @@ array( 'id' => '_um_directory_header_single', 'type' => 'text', - 'name' => '_um_directory_header_single', 'label' => __( 'Single Result Text', 'ultimate-member' ), 'tooltip' => __( 'Same as above but in case of 1 user found only', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value('_um_directory_header_single', null, __('{total_users} Member','ultimate-member') ), @@ -81,7 +75,6 @@ array( 'id' => '_um_directory_no_users', 'type' => 'text', - 'name' => '_um_directory_no_users', 'label' => __( 'Custom text if no users were found', 'ultimate-member' ), 'tooltip' => __( 'This is the text that is displayed if no users are found during a search', 'ultimate-member' ), 'value' => UM()->query()->get_meta_value('_um_directory_no_users', null, __('We are sorry. We cannot find any users who match your search criteria.','ultimate-member') ), diff --git a/includes/admin/templates/role/admin.php b/includes/admin/templates/role/admin.php index 814a919e..4053cbbe 100644 --- a/includes/admin/templates/role/admin.php +++ b/includes/admin/templates/role/admin.php @@ -8,7 +8,6 @@ array( 'id' => '_um_can_access_wpadmin', 'type' => 'checkbox', - 'name' => '_um_can_access_wpadmin', 'label' => __( 'Can access wp-admin?', 'ultimate-member' ), 'tooltip' => __( 'The core admin role must always have access to wp-admin / WordPress backend', 'ultimate-member' ), 'value' => ! empty( $role['_um_can_access_wpadmin'] ) ? $role['_um_can_access_wpadmin'] : 0, @@ -16,7 +15,6 @@ array( 'id' => '_um_can_not_see_adminbar', 'type' => 'checkbox', - 'name' => '_um_can_not_see_adminbar', 'label' => __( 'Force hiding adminbar in frontend?', 'ultimate-member' ), 'tooltip' => __( 'Show/hide the adminbar on frontend', 'ultimate-member' ), 'value' => ! empty( $role['_um_can_not_see_adminbar'] ) ? $role['_um_can_not_see_adminbar'] : 0, @@ -24,7 +22,6 @@ array( 'id' => '_um_can_edit_everyone', 'type' => 'checkbox', - 'name' => '_um_can_edit_everyone', 'label' => __( 'Can edit other member accounts?', 'ultimate-member' ), 'tooltip' => __( 'Allow this role to edit accounts of other members', 'ultimate-member' ), 'value' => ! empty( $role['_um_can_edit_everyone'] ) ? $role['_um_can_edit_everyone'] : 0, @@ -32,7 +29,6 @@ array( 'id' => '_um_can_edit_roles', 'type' => 'select', - 'name' => '_um_can_edit_roles', 'label' => __( 'Can edit these user roles only', 'ultimate-member' ), 'tooltip' => __( 'Which roles that role can edit, choose none to allow role to edit all member roles', 'ultimate-member' ), 'options' => UM()->roles()->get_roles(), @@ -43,7 +39,6 @@ array( 'id' => '_um_can_delete_everyone', 'type' => 'checkbox', - 'name' => '_um_can_delete_everyone', 'label' => __( 'Can delete other member accounts?', 'ultimate-member' ), 'tooltip' => __( 'Allow this role to edit accounts of other members', 'ultimate-member' ), 'value' => ! empty( $role['_um_can_delete_everyone'] ) ? $role['_um_can_delete_everyone'] : 0, @@ -51,7 +46,6 @@ array( 'id' => '_um_can_delete_roles', 'type' => 'select', - 'name' => '_um_can_delete_roles', 'label' => __( 'Can delete these user roles only', 'ultimate-member' ), 'tooltip' => __( 'Which roles that role can edit, choose none to allow role to edit all member roles', 'ultimate-member' ), 'options' => UM()->roles()->get_roles(), diff --git a/includes/admin/templates/role/delete.php b/includes/admin/templates/role/delete.php index ebcb81ca..c9c3471a 100644 --- a/includes/admin/templates/role/delete.php +++ b/includes/admin/templates/role/delete.php @@ -9,7 +9,6 @@ array( 'id' => '_um_after_delete', 'type' => 'select', - 'name' => '_um_after_delete', 'label' => __( 'Action to be taken after account is deleted', 'ultimate-member' ), 'tooltip' => __( 'Select what happens when a user with this role deletes their own account', 'ultimate-member' ), 'value' => ! empty( $role['_um_after_delete'] ) ? $role['_um_after_delete'] : array(), @@ -21,7 +20,6 @@ array( 'id' => '_um_delete_redirect_url', 'type' => 'text', - 'name' => '_um_delete_redirect_url', 'label' => __( 'Set Custom Redirect URL', 'ultimate-member' ), 'tooltip' => __( 'Set a url to redirect this user role to after they delete account', 'ultimate-member' ), 'value' => ! empty( $role['_um_delete_redirect_url'] ) ? $role['_um_delete_redirect_url'] : '', diff --git a/includes/admin/templates/role/general.php b/includes/admin/templates/role/general.php index 676367b8..bd681e2c 100644 --- a/includes/admin/templates/role/general.php +++ b/includes/admin/templates/role/general.php @@ -8,7 +8,6 @@ array( 'id' => '_um_can_edit_profile', 'type' => 'checkbox', - 'name' => '_um_can_edit_profile', 'label' => __( 'Can edit their profile?', 'ultimate-member' ), 'tooltip' => __( 'Can this role edit his own profile?', 'ultimate-member' ), 'value' => ! empty( $role['_um_can_edit_profile'] ) ? $role['_um_can_edit_profile'] : 0, @@ -16,7 +15,6 @@ array( 'id' => '_um_can_delete_profile', 'type' => 'checkbox', - 'name' => '_um_can_delete_profile', 'label' => __( 'Can delete their account?', 'ultimate-member' ), 'tooltip' => __( 'Allow this role to delete their account and end their membership on your site', 'ultimate-member' ), 'value' => ! empty( $role['_um_can_delete_profile'] ) ? $role['_um_can_delete_profile'] : 0, diff --git a/includes/admin/templates/role/home.php b/includes/admin/templates/role/home.php index 44240693..4052b9c8 100644 --- a/includes/admin/templates/role/home.php +++ b/includes/admin/templates/role/home.php @@ -9,7 +9,6 @@ array( 'id' => '_um_default_homepage', 'type' => 'checkbox', - 'name' => '_um_default_homepage', 'label' => __( 'Can view default homepage?', 'ultimate-member' ), 'tooltip' => __( 'Allow this user role to view your site\'s homepage', 'ultimate-member' ), 'value' => ! empty( $role['_um_default_homepage'] ) ? $role['_um_default_homepage'] : 0, @@ -17,7 +16,6 @@ array( 'id' => '_um_redirect_homepage', 'type' => 'text', - 'name' => '_um_redirect_homepage', 'label' => __( 'Custom Homepage Redirect', 'ultimate-member' ), 'tooltip' => __( 'Set a url to redirect this user role to if they try to view your site\'s homepage', 'ultimate-member' ), 'value' => ! empty( $role['_um_redirect_homepage'] ) ? $role['_um_redirect_homepage'] : '', diff --git a/includes/admin/templates/role/login.php b/includes/admin/templates/role/login.php index ff673796..7c2330cf 100644 --- a/includes/admin/templates/role/login.php +++ b/includes/admin/templates/role/login.php @@ -9,7 +9,6 @@ array( 'id' => '_um_after_login', 'type' => 'select', - 'name' => '_um_after_login', 'label' => __( 'Action to be taken after login', 'ultimate-member' ), 'tooltip' => __( 'Select what happens when a user with this role logins to your site', 'ultimate-member' ), 'value' => ! empty( $role['_um_after_login'] ) ? $role['_um_after_login'] : array(), @@ -23,7 +22,6 @@ array( 'id' => '_um_login_redirect_url', 'type' => 'text', - 'name' => '_um_login_redirect_url', 'label' => __( 'Set Custom Redirect URL', 'ultimate-member' ), 'tooltip' => __( 'Set a url to redirect this user role to after they login with their account', 'ultimate-member' ), 'value' => ! empty( $role['_um_login_redirect_url'] ) ? $role['_um_login_redirect_url'] : '', diff --git a/includes/admin/templates/role/logout.php b/includes/admin/templates/role/logout.php index 51dd305a..654a51af 100644 --- a/includes/admin/templates/role/logout.php +++ b/includes/admin/templates/role/logout.php @@ -9,7 +9,6 @@ array( 'id' => '_um_after_logout', 'type' => 'select', - 'name' => '_um_after_logout', 'label' => __( 'Action to be taken after logout', 'ultimate-member' ), 'tooltip' => __( 'Select what happens when a user with this role logouts of your site', 'ultimate-member' ), 'value' => ! empty( $role['_um_after_logout'] ) ? $role['_um_after_logout'] : array(), @@ -21,7 +20,6 @@ array( 'id' => '_um_logout_redirect_url', 'type' => 'text', - 'name' => '_um_logout_redirect_url', 'label' => __( 'Set Custom Redirect URL', 'ultimate-member' ), 'tooltip' => __( 'Set a url to redirect this user role to after they logout from site', 'ultimate-member' ), 'value' => ! empty( $role['_um_logout_redirect_url'] ) ? $role['_um_logout_redirect_url'] : '', diff --git a/includes/admin/templates/role/profile.php b/includes/admin/templates/role/profile.php index 016c5c07..03fba778 100644 --- a/includes/admin/templates/role/profile.php +++ b/includes/admin/templates/role/profile.php @@ -8,7 +8,6 @@ array( 'id' => '_um_can_view_all', 'type' => 'checkbox', - 'name' => '_um_can_view_all', 'label' => __( 'Can view other member profiles?', 'ultimate-member' ), 'tooltip' => __( 'Can this role view all member profiles?', 'ultimate-member' ), 'value' => ! empty( $role['_um_can_view_all'] ) ? $role['_um_can_view_all'] : 0, @@ -16,7 +15,6 @@ array( 'id' => '_um_can_view_roles', 'type' => 'select', - 'name' => '_um_can_view_roles', 'label' => __( 'Can view these user roles only', 'ultimate-member' ), 'tooltip' => __( 'Which roles that role can view, choose none to allow role to view all member roles', 'ultimate-member' ), 'options' => UM()->roles()->get_roles(), diff --git a/includes/admin/templates/role/register.php b/includes/admin/templates/role/register.php index e24c80e7..4418689f 100644 --- a/includes/admin/templates/role/register.php +++ b/includes/admin/templates/role/register.php @@ -8,7 +8,6 @@ array( 'id' => '_um_status', 'type' => 'select', - 'name' => '_um_status', 'label' => __( 'Registration Status', 'ultimate-member' ), 'tooltip' => __( 'Select the status you would like this user role to have after they register on your site', 'ultimate-member' ), 'value' => ! empty( $role['_um_status'] ) ? $role['_um_status'] : array(), @@ -21,7 +20,6 @@ array( 'id' => '_um_auto_approve_act', 'type' => 'select', - 'name' => '_um_auto_approve_act', 'label' => __( 'Action to be taken after registration', 'ultimate-member' ), 'tooltip' => __( 'Select what action is taken after a person registers on your site. Depending on the status you can redirect them to their profile, a custom url or show a custom message', 'ultimate-member' ), 'value' => ! empty( $role['_um_auto_approve_act'] ) ? $role['_um_auto_approve_act'] : array(), @@ -34,7 +32,6 @@ array( 'id' => '_um_auto_approve_url', 'type' => 'text', - 'name' => '_um_auto_approve_url', 'label' => __( 'Set Custom Redirect URL', 'ultimate-member' ), 'value' => ! empty( $role['_um_auto_approve_url'] ) ? $role['_um_auto_approve_url'] : '', 'conditional' => array( '_um_auto_approve_act', '=', 'redirect_url' ) @@ -42,7 +39,6 @@ array( 'id' => '_um_login_email_activate', 'type' => 'checkbox', - 'name' => '_um_login_email_activate', 'label' => __( 'Login user after validating the activation link?', 'ultimate-member' ), 'tooltip' => __( 'Login the user after validating the activation link', 'ultimate-member' ), 'value' => ! empty( $role['_um_login_email_activate'] ) ? $role['_um_login_email_activate'] : 0, @@ -51,7 +47,6 @@ array( 'id' => '_um_checkmail_action', 'type' => 'select', - 'name' => '_um_checkmail_action', 'label' => __( 'Action to be taken after registration', 'ultimate-member' ), 'tooltip' => __( 'Select what action is taken after a person registers on your site. Depending on the status you can redirect them to their profile, a custom url or show a custom message', 'ultimate-member' ), 'value' => ! empty( $role['_um_checkmail_action'] ) ? $role['_um_checkmail_action'] : array(), @@ -64,7 +59,6 @@ array( 'id' => '_um_checkmail_message', 'type' => 'textarea', - 'name' => '_um_checkmail_message', 'label' => __( 'Personalize the custom message', 'ultimate-member' ), 'value' => ! empty( $role['_um_checkmail_message'] ) ? $role['_um_checkmail_message'] : __('Thank you for registering. Before you can login we need you to activate your account by clicking the activation link in the email we just sent you.','ultimate-member'), 'conditional' => array( '_um_checkmail_action', '=', 'show_message' ) @@ -72,7 +66,6 @@ array( 'id' => '_um_checkmail_url', 'type' => 'text', - 'name' => '_um_checkmail_url', 'label' => __( 'Set Custom Redirect URL', 'ultimate-member' ), 'value' => ! empty( $role['_um_checkmail_url'] ) ? $role['_um_checkmail_url'] : '', 'conditional' => array( '_um_checkmail_action', '=', 'redirect_url' ) @@ -80,7 +73,6 @@ array( 'id' => '_um_url_email_activate', 'type' => 'text', - 'name' => '_um_url_email_activate', 'label' => __( 'URL redirect after e-mail activation', 'ultimate-member' ), 'tooltip' => __( 'If you want users to go to a specific page other than login page after e-mail activation, enter the URL here.', 'ultimate-member' ), 'value' => ! empty( $role['_um_url_email_activate'] ) ? $role['_um_url_email_activate'] : '', @@ -89,7 +81,6 @@ array( 'id' => '_um_pending_action', 'type' => 'select', - 'name' => '_um_pending_action', 'label' => __( 'Action to be taken after registration', 'ultimate-member' ), 'tooltip' => __( 'Select what action is taken after a person registers on your site. Depending on the status you can redirect them to their profile, a custom url or show a custom message', 'ultimate-member' ), 'value' => ! empty( $role['_um_pending_action'] ) ? $role['_um_pending_action'] : array(), @@ -102,7 +93,6 @@ array( 'id' => '_um_pending_message', 'type' => 'textarea', - 'name' => '_um_pending_message', 'label' => __( 'Personalize the custom message', 'ultimate-member' ), 'value' => ! empty( $role['_um_pending_message'] ) ? $role['_um_pending_message'] : __('Thank you for applying for membership to our site. We will review your details and send you an email letting you know whether your application has been successful or not.','ultimate-member'), 'conditional' => array( '_um_pending_action', '=', 'show_message' ) @@ -110,7 +100,6 @@ array( 'id' => '_um_pending_url', 'type' => 'text', - 'name' => '_um_pending_url', 'label' => __( 'Set Custom Redirect URL', 'ultimate-member' ), 'conditional' => array( '_um_pending_action', '=', 'redirect_url' ), 'value' => ! empty( $role['_um_pending_url'] ) ? $role['_um_pending_url'] : '', diff --git a/includes/admin/templates/role/wp-capabilities.php b/includes/admin/templates/role/wp-capabilities.php index d8de0e86..01390fb3 100644 --- a/includes/admin/templates/role/wp-capabilities.php +++ b/includes/admin/templates/role/wp-capabilities.php @@ -25,7 +25,6 @@ array( 'id' => 'wp_capabilities', 'type' => 'multi_checkbox', - 'name' => 'wp_capabilities', 'options' => $fields, 'value' => ! empty( $role_capabilities ) ? $role_capabilities : array(), 'columns' => 3,