From 33bc4846293e8180e55c7176972974430f2e041f Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Tue, 24 Sep 2024 13:18:48 +0300 Subject: [PATCH] * Admin Users bulk-actions * Admin single user actions * Frontend single user action --- assets/css/admin/users.css | 33 +++ assets/css/admin/users.min.css | 2 +- assets/css/admin/users.sass | 23 +++ assets/js/admin/block-restrictions.min.js | 2 +- assets/js/admin/security.min.js | 2 +- assets/js/um-gdpr.min.js | 2 +- assets/js/um-scripts.js | 4 +- assets/js/um-scripts.min.js | 2 +- assets/libs/raty/um-raty.min.js | 2 +- includes/admin/class-actions-listener.php | 160 ++++++++++++++ includes/admin/class-admin.php | 78 ++----- includes/admin/class-users-columns.php | 113 +++++++++- includes/admin/core/class-admin-notices.php | 3 - includes/admin/core/class-admin-users.php | 170 --------------- includes/class-init.php | 2 +- includes/common/class-users.php | 82 ++++++-- includes/core/class-member-directory.php | 45 ++-- includes/core/class-rewrite.php | 4 +- includes/core/class-user.php | 49 +---- includes/core/um-actions-core.php | 161 --------------- includes/core/um-filters-user.php | 55 ----- includes/frontend/class-actions-listener.php | 207 +++++++++++++++++++ includes/frontend/class-init.php | 40 ++++ includes/frontend/class-user-profile.php | 69 +++++++ includes/frontend/class-users.php | 81 ++++++++ includes/um-deprecated-hooks.php | 30 +++ 26 files changed, 858 insertions(+), 563 deletions(-) create mode 100644 includes/admin/class-actions-listener.php delete mode 100644 includes/admin/core/class-admin-users.php delete mode 100644 includes/core/um-actions-core.php create mode 100644 includes/frontend/class-actions-listener.php create mode 100644 includes/frontend/class-user-profile.php create mode 100644 includes/frontend/class-users.php diff --git a/assets/css/admin/users.css b/assets/css/admin/users.css index bb7b01fc..f4d527c3 100644 --- a/assets/css/admin/users.css +++ b/assets/css/admin/users.css @@ -1,3 +1,36 @@ +.um-admin.users-php .um_account_status { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: stretch; + flex-wrap: nowrap; +} +.um-admin.users-php .um_account_status span { + margin: 0 0 2px 0; + padding: 0; +} +.um-admin.users-php .um_account_status ul { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: baseline; + flex-wrap: wrap; + column-gap: 4px; + row-gap: 0; + margin: 0 0 4px 0; + padding: 0; +} +.um-admin.users-php .um_account_status ul li { + margin: 0; + padding: 0; +} +.um-admin.users-php .um_account_status ul li a.um-set-status-rejected, .um-admin.users-php .um_account_status ul li a.um-deactivate-user { + color: #b32d2e; +} +.um-admin.users-php .um_account_status ul li a.um-set-status-rejected:active, .um-admin.users-php .um_account_status ul li a.um-set-status-rejected:hover, .um-admin.users-php .um_account_status ul li a.um-deactivate-user:active, .um-admin.users-php .um_account_status ul li a.um-deactivate-user:hover { + color: #b32d2e; +} + .um-admin.users-php .subsubsub li.subsep { display: block; visibility: hidden; diff --git a/assets/css/admin/users.min.css b/assets/css/admin/users.min.css index eb6d1dc7..1efe0289 100644 --- a/assets/css/admin/users.min.css +++ b/assets/css/admin/users.min.css @@ -1 +1 @@ -.um-admin.users-php .subsubsub li.subsep{display:block;visibility:hidden;height:0}.um-admin-modal .um-admin-infobox label{font-weight:700;display:block;color:#333;cursor:default}.um-admin-modal .um-admin-infobox p{color:#666;padding-top:15px}.um-admin-modal .um-admin-infobox>p:not(:first-child){border-top:1px solid #e5e5e5}.um-admin-modal .um-admin-infobox>p:first-child{margin-top:0;padding-top:0}.um-admin-modal .um-admin-infobox>.um-row>p{border-top:1px solid #e5e5e5}.um-admin-modal .um-admin-infobox>.um-row>p:last-child{margin-bottom:0}#UM_preview_registration .um-admin-modal-foot{display:none} \ No newline at end of file +.um-admin.users-php .um_account_status{display:flex;flex-direction:column;justify-content:flex-start;align-items:stretch;flex-wrap:nowrap}.um-admin.users-php .um_account_status span{margin:0 0 2px 0;padding:0}.um-admin.users-php .um_account_status ul{display:flex;flex-direction:row;justify-content:flex-start;align-items:baseline;flex-wrap:wrap;column-gap:4px;row-gap:0;margin:0 0 4px 0;padding:0}.um-admin.users-php .um_account_status ul li{margin:0;padding:0}.um-admin.users-php .um_account_status ul li a.um-deactivate-user,.um-admin.users-php .um_account_status ul li a.um-set-status-rejected{color:#b32d2e}.um-admin.users-php .um_account_status ul li a.um-deactivate-user:active,.um-admin.users-php .um_account_status ul li a.um-deactivate-user:hover,.um-admin.users-php .um_account_status ul li a.um-set-status-rejected:active,.um-admin.users-php .um_account_status ul li a.um-set-status-rejected:hover{color:#b32d2e}.um-admin.users-php .subsubsub li.subsep{display:block;visibility:hidden;height:0}.um-admin-modal .um-admin-infobox label{font-weight:700;display:block;color:#333;cursor:default}.um-admin-modal .um-admin-infobox p{color:#666;padding-top:15px}.um-admin-modal .um-admin-infobox>p:not(:first-child){border-top:1px solid #e5e5e5}.um-admin-modal .um-admin-infobox>p:first-child{margin-top:0;padding-top:0}.um-admin-modal .um-admin-infobox>.um-row>p{border-top:1px solid #e5e5e5}.um-admin-modal .um-admin-infobox>.um-row>p:last-child{margin-bottom:0}#UM_preview_registration .um-admin-modal-foot{display:none} \ No newline at end of file diff --git a/assets/css/admin/users.sass b/assets/css/admin/users.sass index fe61d28f..09b3756e 100644 --- a/assets/css/admin/users.sass +++ b/assets/css/admin/users.sass @@ -1,5 +1,28 @@ @import "selectors" +@import "mixins" +.#{$prefix}admin.users-php + .um_account_status + +flex( column, flex-start, stretch, nowrap ) + span + margin: 0 0 2px 0 + padding: 0 + ul + +flex( row, flex-start, baseline, wrap ) + column-gap: 4px + row-gap: 0 + margin: 0 0 4px 0 + padding: 0 + li + margin: 0 + padding: 0 + a + &.um-set-status-rejected, + &.um-deactivate-user + color: #b32d2e + &:active, + &:hover + color: #b32d2e .#{$prefix}admin.users-php .subsubsub li.subsep diff --git a/assets/js/admin/block-restrictions.min.js b/assets/js/admin/block-restrictions.min.js index 50daef62..203ca795 100644 --- a/assets/js/admin/block-restrictions.min.js +++ b/assets/js/admin/block-restrictions.min.js @@ -1 +1 @@ -"use strict";var um_components=wp.components,umSelectControl=um_components.SelectControl,umTextareaControl=um_components.TextareaControl;function um_admin_blocks_custom_fields(e,t){return wp.hooks.applyFilters("um_admin_blocks_custom_fields",[],e,t)}var um_block_restriction=wp.compose.createHigherOrderComponent(function(s){var _={um_who_access:"um_block_settings_hide",um_roles_access:"um_block_settings_hide",um_message_type:"um_block_settings_hide",um_message_content:"um_block_settings_hide"},_=wp.hooks.applyFilters("um_admin_blocks_condition_fields_default",_);return function(t){var e=void 0!==t.attributes.um_is_restrict&&t.attributes.um_is_restrict;return!0!==t.attributes.um_is_restrict?(_.um_who_access="um_block_settings_hide",_.um_roles_access="um_block_settings_hide",_.um_message_type="um_block_settings_hide",_.um_message_content="um_block_settings_hide"):(_.um_who_access="",0===parseInt(t.attributes.um_who_access)||void 0===t.attributes.um_who_access?(_.um_roles_access="um_block_settings_hide",_.um_message_type="um_block_settings_hide",_.um_message_content="um_block_settings_hide"):(1===parseInt(t.attributes.um_who_access)&&(_.um_roles_access=""),_.um_message_type="",2===parseInt(t.attributes.um_message_type)?_.um_message_content="":_.um_message_content="um_block_settings_hide")),_=wp.hooks.applyFilters("um_admin_blocks_condition_fields",_,t),wp.element.createElement(wp.element.Fragment,{},wp.element.createElement(s,t),wp.element.createElement(wp.blockEditor.InspectorControls,{},wp.element.createElement(wp.components.PanelBody,{title:wp.i18n.__("Ultimate Member: Content Restriction","ultimate-member"),className:"um_block_settings"},wp.element.createElement(wp.components.ToggleControl,{label:wp.i18n.__("Restrict access?","ultimate-member"),checked:e,onChange:function(e){t.setAttributes({um_is_restrict:e}),!1===e?(_.um_who_access="um_block_settings_hide",_.um_roles_access="um_block_settings_hide",_.um_message_type="um_block_settings_hide",_.um_message_content="um_block_settings_hide"):_.um_who_access="",_=wp.hooks.applyFilters("um_admin_blocks_condition_fields_on_change",_,"um_is_restrict",e)}}),wp.element.createElement(umSelectControl,{type:"number",className:_.um_who_access,label:wp.i18n.__("Who can access this block?","ultimate-member"),value:t.attributes.um_who_access,options:[{label:wp.i18n.__("Everyone","ultimate-member"),value:0},{label:wp.i18n.__("Logged in users","ultimate-member"),value:1},{label:wp.i18n.__("Logged out users","ultimate-member"),value:2}],onChange:function(e){t.setAttributes({um_who_access:e}),0===parseInt(e)?(_.um_message_type="um_block_settings_hide",_.um_message_content="um_block_settings_hide",_.um_roles_access="um_block_settings_hide"):1===parseInt(e)?(_.um_message_type="",_.um_roles_access=""):(_.um_message_type="",_.um_roles_access="um_block_settings_hide"),_=wp.hooks.applyFilters("um_admin_blocks_condition_fields_on_change",_,"um_who_access",e)}}),wp.element.createElement(umSelectControl,{multiple:!0,className:_.um_roles_access,label:wp.i18n.__("What roles can access this block?","ultimate-member"),value:t.attributes.um_roles_access,options:um_restrict_roles,onChange:function(e){t.setAttributes({um_roles_access:e})}}),wp.element.createElement(umSelectControl,{type:"number",className:_.um_message_type,label:wp.i18n.__("Restriction action","ultimate-member"),value:t.attributes.um_message_type,options:[{label:wp.i18n.__("Hide block","ultimate-member"),value:0},{label:wp.i18n.__("Show global default message","ultimate-member"),value:1},{label:wp.i18n.__("Show custom message","ultimate-member"),value:2}],onChange:function(e){t.setAttributes({um_message_type:e}),2===parseInt(e)?_.um_message_content="":_.um_message_content="um_block_settings_hide"}}),wp.element.createElement(umTextareaControl,{type:"number",className:_.um_message_content,label:wp.i18n.__("Custom restricted access message","ultimate-member"),value:t.attributes.um_message_content,onChange:function(e){t.setAttributes({um_message_content:e})}}),um_admin_blocks_custom_fields(_,t))))}},"um_block_restriction");wp.hooks.addFilter("editor.BlockEdit","um-block/um_block_restriction",um_block_restriction); \ No newline at end of file +var um_components=wp.components,umSelectControl=um_components.SelectControl,umTextareaControl=um_components.TextareaControl;function um_admin_blocks_custom_fields(e,t){return wp.hooks.applyFilters("um_admin_blocks_custom_fields",[],e,t)}var um_block_restriction=wp.compose.createHigherOrderComponent(function(s){var _={um_who_access:"um_block_settings_hide",um_roles_access:"um_block_settings_hide",um_message_type:"um_block_settings_hide",um_message_content:"um_block_settings_hide"},_=wp.hooks.applyFilters("um_admin_blocks_condition_fields_default",_);return function(t){var e=void 0!==t.attributes.um_is_restrict&&t.attributes.um_is_restrict;return!0!==t.attributes.um_is_restrict?(_.um_who_access="um_block_settings_hide",_.um_roles_access="um_block_settings_hide",_.um_message_type="um_block_settings_hide",_.um_message_content="um_block_settings_hide"):(_.um_who_access="",0===parseInt(t.attributes.um_who_access)||void 0===t.attributes.um_who_access?(_.um_roles_access="um_block_settings_hide",_.um_message_type="um_block_settings_hide",_.um_message_content="um_block_settings_hide"):(1===parseInt(t.attributes.um_who_access)&&(_.um_roles_access=""),_.um_message_type="",2===parseInt(t.attributes.um_message_type)?_.um_message_content="":_.um_message_content="um_block_settings_hide")),_=wp.hooks.applyFilters("um_admin_blocks_condition_fields",_,t),wp.element.createElement(wp.element.Fragment,{},wp.element.createElement(s,t),wp.element.createElement(wp.blockEditor.InspectorControls,{},wp.element.createElement(wp.components.PanelBody,{title:wp.i18n.__("Ultimate Member: Content Restriction","ultimate-member"),className:"um_block_settings"},wp.element.createElement(wp.components.ToggleControl,{label:wp.i18n.__("Restrict access?","ultimate-member"),checked:e,onChange:function(e){t.setAttributes({um_is_restrict:e}),!1===e?(_.um_who_access="um_block_settings_hide",_.um_roles_access="um_block_settings_hide",_.um_message_type="um_block_settings_hide",_.um_message_content="um_block_settings_hide"):_.um_who_access="",_=wp.hooks.applyFilters("um_admin_blocks_condition_fields_on_change",_,"um_is_restrict",e)}}),wp.element.createElement(umSelectControl,{type:"number",className:_.um_who_access,label:wp.i18n.__("Who can access this block?","ultimate-member"),value:t.attributes.um_who_access,options:[{label:wp.i18n.__("Everyone","ultimate-member"),value:0},{label:wp.i18n.__("Logged in users","ultimate-member"),value:1},{label:wp.i18n.__("Logged out users","ultimate-member"),value:2}],onChange:function(e){t.setAttributes({um_who_access:e}),0===parseInt(e)?(_.um_message_type="um_block_settings_hide",_.um_message_content="um_block_settings_hide",_.um_roles_access="um_block_settings_hide"):1===parseInt(e)?(_.um_message_type="",_.um_roles_access=""):(_.um_message_type="",_.um_roles_access="um_block_settings_hide"),_=wp.hooks.applyFilters("um_admin_blocks_condition_fields_on_change",_,"um_who_access",e)}}),wp.element.createElement(umSelectControl,{multiple:!0,className:_.um_roles_access,label:wp.i18n.__("What roles can access this block?","ultimate-member"),value:t.attributes.um_roles_access,options:um_restrict_roles,onChange:function(e){t.setAttributes({um_roles_access:e})}}),wp.element.createElement(umSelectControl,{type:"number",className:_.um_message_type,label:wp.i18n.__("Restriction action","ultimate-member"),value:t.attributes.um_message_type,options:[{label:wp.i18n.__("Hide block","ultimate-member"),value:0},{label:wp.i18n.__("Show global default message","ultimate-member"),value:1},{label:wp.i18n.__("Show custom message","ultimate-member"),value:2}],onChange:function(e){t.setAttributes({um_message_type:e}),2===parseInt(e)?_.um_message_content="":_.um_message_content="um_block_settings_hide"}}),wp.element.createElement(umTextareaControl,{type:"number",className:_.um_message_content,label:wp.i18n.__("Custom restricted access message","ultimate-member"),value:t.attributes.um_message_content,onChange:function(e){t.setAttributes({um_message_content:e})}}),um_admin_blocks_custom_fields(_,t))))}},"um_block_restriction");wp.hooks.addFilter("editor.BlockEdit","um-block/um_block_restriction",um_block_restriction); \ No newline at end of file diff --git a/assets/js/admin/security.min.js b/assets/js/admin/security.min.js index 680722e6..1fc8d38c 100644 --- a/assets/js/admin/security.min.js +++ b/assets/js/admin/security.min.js @@ -1 +1 @@ -jQuery(document).ready(function(){const n=jQuery(".um-secure-scan-results"),t=jQuery(".um-secure-scan-content"),e=jQuery("input[data-field_id^='banned_capabilities']");var c={init:function(){n.css({"margin-top":"10px",padding:"10px","padding-bottom":"10px","background-color":"#fff",display:"block","max-height":"200px",height:"500px","overflow-y":"scroll"}),t.on("click",function(e){c.effect(),e.preventDefault(),jQuery(this).prop("disabled",!0),n.empty(),c.log(wp.i18n.__("Scanning site..","ultimate-member")),c.ajax("")}),e.on("change",function(){t.after(' '+wp.i18n.__("You can start the scan now but you must save the settings to apply the selected capabilities after the scan is complete.","ultimate-member")+""),e.off("change")})},ajax:function(e){let a=[];n.parents(".um-form-table").find('input[type="checkbox"][data-field_id^="banned_capabilities_"]:checked').each(function(){a.push(jQuery(this).data("field_id").replace("banned_capabilities_",""))});e={nonce:um_admin_scripts.nonce,capabilities:a,last_scanned_capability:e};wp.ajax.send("um_secure_scan_affected_users",{data:e,success:function(e){e.completed?e.completed&&(n.empty(),c.log(e.recommendations),n.find(".current").removeClass("current"),t.prop("disabled",!1)):(c.ajax(e.last_scanned_capability),c.log(e.message))}})},log:function(e){n.find(".current").removeClass("current"),n.append(''+e+"
")},effect:function(){setInterval(function(){n.find(".current").fadeTo(100,.1).fadeTo(200,1)},1e3)}};c.init()}); \ No newline at end of file +jQuery(document).ready(function(){let t=jQuery(".um-secure-scan-results"),n=jQuery(".um-secure-scan-content"),e=jQuery("input[data-field_id^='banned_capabilities']");var c={init:function(){t.css({"margin-top":"10px",padding:"10px","padding-bottom":"10px","background-color":"#fff",display:"block","max-height":"200px",height:"500px","overflow-y":"scroll"}),n.on("click",function(e){c.effect(),e.preventDefault(),jQuery(this).prop("disabled",!0),t.empty(),c.log(wp.i18n.__("Scanning site..","ultimate-member")),c.ajax("")}),e.on("change",function(){n.after(' '+wp.i18n.__("You can start the scan now but you must save the settings to apply the selected capabilities after the scan is complete.","ultimate-member")+""),e.off("change")})},ajax:function(e){let a=[];t.parents(".um-form-table").find('input[type="checkbox"][data-field_id^="banned_capabilities_"]:checked').each(function(){a.push(jQuery(this).data("field_id").replace("banned_capabilities_",""))});e={nonce:um_admin_scripts.nonce,capabilities:a,last_scanned_capability:e};wp.ajax.send("um_secure_scan_affected_users",{data:e,success:function(e){e.completed?e.completed&&(t.empty(),c.log(e.recommendations),t.find(".current").removeClass("current"),n.prop("disabled",!1)):(c.ajax(e.last_scanned_capability),c.log(e.message))}})},log:function(e){t.find(".current").removeClass("current"),t.append(''+e+"
")},effect:function(){setInterval(function(){t.find(".current").fadeTo(100,.1).fadeTo(200,1)},1e3)}};c.init()}); \ No newline at end of file diff --git a/assets/js/um-gdpr.min.js b/assets/js/um-gdpr.min.js index 98f5ff88..76470131 100644 --- a/assets/js/um-gdpr.min.js +++ b/assets/js/um-gdpr.min.js @@ -1 +1 @@ -!function(){"use strict";jQuery(document).on("click","a.um-toggle-gdpr",function(e){var e=jQuery(e.currentTarget),t=e.closest(".um-field-area"),g=t.find(".um-gdpr-content");g.is(":visible")?(t.find("a.um-toggle-gdpr").text(e.data("toggle-show")),g.hide().find("a.um-toggle-gdpr").remove(),e.length&&e.get(0).scrollIntoView()):(t.find("a.um-toggle-gdpr").text(e.data("toggle-hide")),g.show().prepend(e.clone()))})}(); \ No newline at end of file +jQuery(document).on("click","a.um-toggle-gdpr",function(e){var e=jQuery(e.currentTarget),t=e.closest(".um-field-area"),g=t.find(".um-gdpr-content");g.is(":visible")?(t.find("a.um-toggle-gdpr").text(e.data("toggle-show")),g.hide().find("a.um-toggle-gdpr").remove(),e.length&&e.get(0).scrollIntoView()):(t.find("a.um-toggle-gdpr").text(e.data("toggle-hide")),g.show().prepend(e.clone()))}); \ No newline at end of file diff --git a/assets/js/um-scripts.js b/assets/js/um-scripts.js index a14ddb83..0e005ffe 100644 --- a/assets/js/um-scripts.js +++ b/assets/js/um-scripts.js @@ -417,7 +417,7 @@ jQuery(document).ready(function() { e.preventDefault(); var hook = jQuery(this).data('hook'); var user_id = jQuery(this).data('user_id'); - var arguments = jQuery(this).data('arguments'); + var args = jQuery(this).data('args'); if ( jQuery(this).data('js-remove') ){ jQuery(this).parents('.'+jQuery(this).data('js-remove')).fadeOut('fast'); @@ -430,7 +430,7 @@ jQuery(document).ready(function() { action: 'um_muted_action', hook: hook, user_id: user_id, - arguments: arguments, + arguments: args, nonce: um_scripts.nonce }, success: function(data){ diff --git a/assets/js/um-scripts.min.js b/assets/js/um-scripts.min.js index 40e412d4..087cfa13 100644 --- a/assets/js/um-scripts.min.js +++ b/assets/js/um-scripts.min.js @@ -1 +1 @@ -function um_sanitize_value(e,t){var a=document.createElement("div"),e=(a.innerText=e,a.innerHTML);return t&&jQuery(t).val(e),e}function um_unsanitize_value(e){var t=document.createElement("textarea");return t.innerHTML=e,0===t.childNodes.length?"":t.childNodes[0].nodeValue}jQuery(document).ready(function(){function n(e){var a=jQuery(e.currentTarget),e=a.find(":selected");1'),a.find(".um-single-image-preview").removeAttr("style").hide(),a.find(".ajax-upload-dragdrop").show(),a.find(".um-modal-btn.um-finish-upload").addClass("disabled"),um_modal_responsive()}}):(a=jQuery(this).parents(".um-field"),n=a.data("mode"),i=a.find(".um-single-image-preview img").attr("src"),e=a.find('input[type="hidden"]#'+a.data("key")+"-"+jQuery(this).parents("form").find('input[type="hidden"][name="form_id"]').val()).val(),r={data:{mode:n,filename:e,src:i,nonce:um_scripts.nonce},success:function(){a.find(".um-single-image-preview img").replaceWith(''),a.find(".um-single-image-preview").removeAttr("style").hide(),a.find(".um-btn-auto-width").html(a.data("upload-label")),a.find('input[type="hidden"]').val("empty_file")}},"register"!==n&&(r.data.user_id=jQuery(this).parents("form").find("#user_id").val())),wp.ajax.send("um_remove_file",r)}),jQuery(document.body).on("click",".um-single-file-preview a.cancel",function(e){e.preventDefault();let t=!1;0'),a.find(".um-single-image-preview").removeAttr("style").hide(),a.find(".ajax-upload-dragdrop").show(),a.find(".um-modal-btn.um-finish-upload").addClass("disabled"),um_modal_responsive()}}):(a=jQuery(this).parents(".um-field"),n=a.data("mode"),i=a.find(".um-single-image-preview img").attr("src"),e=a.find('input[type="hidden"]#'+a.data("key")+"-"+jQuery(this).parents("form").find('input[type="hidden"][name="form_id"]').val()).val(),r={data:{mode:n,filename:e,src:i,nonce:um_scripts.nonce},success:function(){a.find(".um-single-image-preview img").replaceWith(''),a.find(".um-single-image-preview").removeAttr("style").hide(),a.find(".um-btn-auto-width").html(a.data("upload-label")),a.find('input[type="hidden"]').val("empty_file")}},"register"!==n&&(r.data.user_id=jQuery(this).parents("form").find("#user_id").val())),wp.ajax.send("um_remove_file",r)}),jQuery(document.body).on("click",".um-single-file-preview a.cancel",function(e){e.preventDefault();let t=!1;0",{name:this.opt.scoreName,type:"hidden"}).appendTo(this)},_createCancel:function(){var t=this.opt.path+this.opt.cancelOff,e=i("<"+this.opt.starType+" />",{title:this.opt.cancelHint,class:this.opt.cancelClass});"img"===this.opt.starType?e.attr({src:t,alt:"x"}):e.attr("data-alt","x").addClass(t),"left"===this.opt.cancelPlace?this.self.prepend(" ").prepend(e):this.self.append(" ").append(e),this.cancel=e},_createScore:function(){var t=i(this.opt.targetScore);this.score=t.length?t:r._buildScoreField.call(this)},_createStars:function(){for(var t=1;t<=this.opt.number;t++){var e=r._nameForIndex.call(this,t),e={alt:t,src:this.opt.path+this.opt[e]};(e="img"!==this.opt.starType?{"data-alt":t,class:e.src}:e).title=r._getHint.call(this,t),i("<"+this.opt.starType+" />",e).appendTo(this),this.opt.space&&this.self.append(te?(s=this.opt.iconRange[e],i=r._getRangeIcon.call(this,s,n),a<=s.range&&r._setIcon.call(this,o,i),a===s.range&&e++):(i=this.opt[n?"starOn":"starOff"],r._setIcon.call(this,o,i))}},_getRangeIcon:function(t,e){return e?t.on||this.opt.starOn:t.off||this.opt.starOff},_getScoreByPosition:function(t,e){var a,s=parseInt(e.alt||e.getAttribute("data-alt"),10);return this.opt.half&&(a=r._getSize.call(this),t=parseFloat((t.pageX-i(e).offset().left)/a),s=this.opt.precision?s-1+t:s-1+(.5=t?"starOn":"starOff"},_roundStars:function(t){var e,a=(t%1).toFixed(2);a>this.opt.round.down&&(e="starOn",this.opt.halfShow&&a=e.number&&(t=e.number-1,a=10);e=r._getSize.call(this)/10,t=i(this.stars[t]),e=t.offset().left+e*parseInt(a,10),a=i.Event("mousemove",{pageX:e});t.trigger(a)})},readOnly:function(e){return this.each(function(){var t=i(this);t.data("readonly")!==e&&((e?(t.off(".um_raty").children("img").off(".um_raty"),r._lock):(r._binds.call(this),r._unlock)).call(this),t.data("readonly",e))})},reload:function(){return r.set.call(this,{})},score:function(){var t=i(this);return arguments.length?r.setScore.apply(t,arguments):r.getScore.call(t)},set:function(a){return this.each(function(){var t=i(this),e=t.data("options"),e=i.extend({},e,a);t.um_raty(e)})},setScore:function(t){return this.each(function(){!0!==i(this).data("readonly")&&(r._apply.call(this,t),r._target.call(this,t))})}};i.fn.um_raty=function(t){return r[t]?r[t].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof t&&t?void i.error("Method "+t+" does not exist!"):r.init.apply(this,arguments)},i.fn.um_raty.defaults={cancel:!1,cancelClass:"raty-cancel",cancelHint:wp.i18n.__("Cancel this rating!","ultimate-member"),cancelOff:"cancel-off.png",cancelOn:"cancel-on.png",cancelPlace:"left",click:void 0,half:!1,halfShow:!0,hints:["bad","poor","regular","good","gorgeous"],iconRange:void 0,mouseout:void 0,mouseover:void 0,noRatedMsg:wp.i18n.__("Not rated yet!","ultimate-member"),number:5,numberMax:20,path:void 0,precision:!1,readOnly:!1,round:{down:.25,full:.6,up:.76},score:void 0,scoreName:"score",single:!1,space:!0,starHalf:"star-half.png",starOff:"star-off.png",starOn:"star-on.png",starType:"img",target:void 0,targetFormat:"{score}",targetKeep:!1,targetScore:void 0,targetText:"",targetType:"hint"}}(jQuery); \ No newline at end of file +!function(i){var r={init:function(t){return this.each(function(){this.self=i(this),r.destroy.call(this.self),this.opt=i.extend(!0,{},i.fn.um_raty.defaults,t),r._adjustCallback.call(this),r._adjustNumber.call(this),"img"!==this.opt.starType&&r._adjustStarType.call(this),r._adjustPath.call(this),r._createStars.call(this),this.opt.cancel&&r._createCancel.call(this),this.opt.precision&&r._adjustPrecision.call(this),r._createScore.call(this),r._apply.call(this,this.opt.score),r._target.call(this,this.opt.score),(this.opt.readOnly?r._lock:(this.style.cursor="pointer",r._binds)).call(this),this.self.data("options",this.opt)})},_adjustCallback:function(){for(var t=["number","readOnly","score","scoreName","target"],e=0;e",{name:this.opt.scoreName,type:"hidden"}).appendTo(this)},_createCancel:function(){var t=this.opt.path+this.opt.cancelOff,e=i("<"+this.opt.starType+" />",{title:this.opt.cancelHint,class:this.opt.cancelClass});"img"===this.opt.starType?e.attr({src:t,alt:"x"}):e.attr("data-alt","x").addClass(t),"left"===this.opt.cancelPlace?this.self.prepend(" ").prepend(e):this.self.append(" ").append(e),this.cancel=e},_createScore:function(){var t=i(this.opt.targetScore);this.score=t.length?t:r._buildScoreField.call(this)},_createStars:function(){for(var t=1;t<=this.opt.number;t++){var e=r._nameForIndex.call(this,t),e={alt:t,src:this.opt.path+this.opt[e]};(e="img"!==this.opt.starType?{"data-alt":t,class:e.src}:e).title=r._getHint.call(this,t),i("<"+this.opt.starType+" />",e).appendTo(this),this.opt.space&&this.self.append(te?(s=this.opt.iconRange[e],i=r._getRangeIcon.call(this,s,n),a<=s.range&&r._setIcon.call(this,o,i),a===s.range&&e++):(i=this.opt[n?"starOn":"starOff"],r._setIcon.call(this,o,i))}},_getRangeIcon:function(t,e){return e?t.on||this.opt.starOn:t.off||this.opt.starOff},_getScoreByPosition:function(t,e){var a,s=parseInt(e.alt||e.getAttribute("data-alt"),10);return this.opt.half&&(a=r._getSize.call(this),t=parseFloat((t.pageX-i(e).offset().left)/a),s=this.opt.precision?s-1+t:s-1+(.5=t?"starOn":"starOff"},_roundStars:function(t){var e,a=(t%1).toFixed(2);a>this.opt.round.down&&(e="starOn",this.opt.halfShow&&a=e.number&&(t=e.number-1,a=10);e=r._getSize.call(this)/10,t=i(this.stars[t]),e=t.offset().left+e*parseInt(a,10),a=i.Event("mousemove",{pageX:e});t.trigger(a)})},readOnly:function(e){return this.each(function(){var t=i(this);t.data("readonly")!==e&&((e?(t.off(".um_raty").children("img").off(".um_raty"),r._lock):(r._binds.call(this),r._unlock)).call(this),t.data("readonly",e))})},reload:function(){return r.set.call(this,{})},score:function(){var t=i(this);return arguments.length?r.setScore.apply(t,arguments):r.getScore.call(t)},set:function(a){return this.each(function(){var t=i(this),e=t.data("options"),e=i.extend({},e,a);t.um_raty(e)})},setScore:function(t){return this.each(function(){!0!==i(this).data("readonly")&&(r._apply.call(this,t),r._target.call(this,t))})}};i.fn.um_raty=function(t){return r[t]?r[t].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof t&&t?void i.error("Method "+t+" does not exist!"):r.init.apply(this,arguments)},i.fn.um_raty.defaults={cancel:!1,cancelClass:"raty-cancel",cancelHint:wp.i18n.__("Cancel this rating!","ultimate-member"),cancelOff:"cancel-off.png",cancelOn:"cancel-on.png",cancelPlace:"left",click:void 0,half:!1,halfShow:!0,hints:["bad","poor","regular","good","gorgeous"],iconRange:void 0,mouseout:void 0,mouseover:void 0,noRatedMsg:wp.i18n.__("Not rated yet!","ultimate-member"),number:5,numberMax:20,path:void 0,precision:!1,readOnly:!1,round:{down:.25,full:.6,up:.76},score:void 0,scoreName:"score",single:!1,space:!0,starHalf:"star-half.png",starOff:"star-off.png",starOn:"star-on.png",starType:"img",target:void 0,targetFormat:"{score}",targetKeep:!1,targetScore:void 0,targetText:"",targetType:"hint"}}(jQuery); \ No newline at end of file diff --git a/includes/admin/class-actions-listener.php b/includes/admin/class-actions-listener.php new file mode 100644 index 00000000..81442364 --- /dev/null +++ b/includes/admin/class-actions-listener.php @@ -0,0 +1,160 @@ +common()->users()->can_current_user_edit_user( $user_id ) ) { + $result = UM()->common()->users()->approve( $user_id ); + if ( $result ) { + $redirect = add_query_arg( array( 'update' => 'um_approved', 'approved_count' => 1 ), $redirect ); + } + } + + wp_safe_redirect( $redirect ); + exit; + case 'reactivate_user': + if ( empty( $_REQUEST['uid'] ) || ! is_numeric( $_REQUEST['uid'] ) ) { + die( esc_html__( 'Invalid user ID', 'ultimate-member' ) ); + } + + $user_id = absint( $_REQUEST['uid'] ); + + check_admin_referer( "reactivate_user{$user_id}" ); + + $redirect = wp_get_referer(); + if ( UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + $result = UM()->common()->users()->reactivate( $user_id ); + if ( $result ) { + $redirect = add_query_arg( array( 'update' => 'um_reactivated', 'reactivated_count' => 1 ), $redirect ); + } + } + wp_safe_redirect( $redirect ); + exit; + case 'put_user_as_pending': + if ( empty( $_REQUEST['uid'] ) || ! is_numeric( $_REQUEST['uid'] ) ) { + die( esc_html__( 'Invalid user ID', 'ultimate-member' ) ); + } + + $user_id = absint( $_REQUEST['uid'] ); + + check_admin_referer( "put_user_as_pending{$user_id}" ); + + $redirect = wp_get_referer(); + if ( UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + $result = UM()->common()->users()->set_as_pending( $user_id ); + if ( $result ) { + $redirect = add_query_arg( array( 'update' => 'um_pending', 'pending_count' => 1 ), $redirect ); + } + } + wp_safe_redirect( $redirect ); + exit; + case 'resend_user_activation': + if ( empty( $_REQUEST['uid'] ) || ! is_numeric( $_REQUEST['uid'] ) ) { + die( esc_html__( 'Invalid user ID', 'ultimate-member' ) ); + } + + $user_id = absint( $_REQUEST['uid'] ); + + check_admin_referer( "resend_user_activation{$user_id}" ); + + $redirect = wp_get_referer(); + if ( UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + $result = UM()->common()->users()->send_activation( $user_id ); + if ( $result ) { + $redirect = add_query_arg( array( 'update' => 'um_resend_activation', 'resend_activation_count' => 1 ), $redirect ); + } + } + wp_safe_redirect( $redirect ); + exit; + case 'reject_user': + if ( empty( $_REQUEST['uid'] ) || ! is_numeric( $_REQUEST['uid'] ) ) { + die( esc_html__( 'Invalid user ID', 'ultimate-member' ) ); + } + + $user_id = absint( $_REQUEST['uid'] ); + + check_admin_referer( "reject_user{$user_id}" ); + + $redirect = wp_get_referer(); + if ( UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + $result = UM()->common()->users()->reject( $user_id ); + if ( $result ) { + $redirect = add_query_arg( array( 'update' => 'um_rejected', 'rejected_count' => 1 ), $redirect ); + } + } + wp_safe_redirect( $redirect ); + exit; + case 'deactivate_user': + if ( empty( $_REQUEST['uid'] ) || ! is_numeric( $_REQUEST['uid'] ) ) { + die( esc_html__( 'Invalid user ID', 'ultimate-member' ) ); + } + + $user_id = absint( $_REQUEST['uid'] ); + + check_admin_referer( "deactivate_user{$user_id}" ); + + $redirect = wp_get_referer(); + if ( UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + $result = UM()->common()->users()->deactivate( $user_id ); + if ( $result ) { + $redirect = add_query_arg( array( 'update' => 'um_deactivate', 'deactivated_count' => 1 ), $redirect ); + } + } + wp_safe_redirect( $redirect ); + exit; + } + } + } + + public function extends_individual_nonce_actions( $actions ) { + $actions[] = 'approve_user'; + $actions[] = 'reactivate_user'; + $actions[] = 'put_user_as_pending'; + $actions[] = 'resend_user_activation'; + $actions[] = 'reject_user'; + $actions[] = 'deactivate_user'; + return $actions; + } + } +} diff --git a/includes/admin/class-admin.php b/includes/admin/class-admin.php index 5a3717cd..c34d913c 100644 --- a/includes/admin/class-admin.php +++ b/includes/admin/class-admin.php @@ -67,7 +67,6 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { add_action( 'um_admin_do_action__purge_temp', array( &$this, 'purge_temp' ) ); add_action( 'um_admin_do_action__manual_upgrades_request', array( &$this, 'manual_upgrades_request' ) ); add_action( 'um_admin_do_action__duplicate_form', array( &$this, 'duplicate_form' ) ); - add_action( 'um_admin_do_action__user_action', array( &$this, 'user_action' ) ); add_action( 'um_admin_do_action__check_templates_version', array( &$this, 'check_templates_version' ) ); add_action( 'um_admin_do_action__install_core_pages', array( &$this, 'install_core_pages' ) ); @@ -79,6 +78,7 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { } public function includes() { + $this->actions_listener(); $this->enqueue(); $this->notices(); $this->secure(); @@ -1841,69 +1841,6 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { exit; } - /** - * Various user actions. - */ - public function user_action() { - if ( ! current_user_can( 'edit_users' ) ) { - die(); - } - if ( ! isset( $_REQUEST['sub'] ) ) { - die(); - } - if ( ! isset( $_REQUEST['user_id'] ) ) { - die(); - } - - um_fetch_user( absint( $_REQUEST['user_id'] ) ); - - $subaction = sanitize_key( $_REQUEST['sub'] ); - - /** - * UM hook - * - * @type action - * @title um_admin_user_action_hook - * @description Action on bulk user subaction - * @input_vars - * [{"var":"$subaction","type":"string","desc":"Bulk Subaction"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_admin_user_action_hook', 'function_name', 10, 1 ); - * @example - * - */ - do_action( 'um_admin_user_action_hook', $subaction ); - /** - * UM hook - * - * @type action - * @title um_admin_user_action_{$subaction}_hook - * @description Action on bulk user subaction - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_admin_user_action_{$subaction}_hook', 'function_name', 10 ); - * @example - * - */ - do_action( "um_admin_user_action_{$subaction}_hook" ); - - um_reset_user(); - - wp_safe_redirect( add_query_arg( 'update', 'um_user_updated', admin_url( '?page=ultimatemember' ) ) ); - exit; - } - /** * Manual check templates versions. */ @@ -1947,7 +1884,6 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { $action = sanitize_key( $_REQUEST['um_adm_action'] ); $individual_nonce_actions = array( - 'user_action', 'duplicate_form', ); $individual_nonce_actions = apply_filters( 'um_adm_action_individual_nonce_actions', $individual_nonce_actions ); @@ -2072,6 +2008,18 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { return $parent_file; } + /** + * @since 2.8.7 + * + * @return Actions_Listener + */ + public function actions_listener() { + if ( empty( UM()->classes['um\admin\actions_listener'] ) ) { + UM()->classes['um\admin\actions_listener'] = new Actions_Listener(); + } + return UM()->classes['um\admin\actions_listener']; + } + /** * @since 2.7.0 * diff --git a/includes/admin/class-users-columns.php b/includes/admin/class-users-columns.php index 57cce403..76989262 100644 --- a/includes/admin/class-users-columns.php +++ b/includes/admin/class-users-columns.php @@ -46,7 +46,7 @@ if ( ! class_exists( 'um\admin\Users_Columns' ) ) { * @return array */ public function manage_users_columns( $columns ) { - $columns['account_status'] = __( 'Status', 'ultimate-member' ); + $columns['um_account_status'] = __( 'Status', 'ultimate-member' ); return $columns; } @@ -60,10 +60,91 @@ if ( ! class_exists( 'um\admin\Users_Columns' ) ) { * @return string */ public function manage_users_custom_column( $value, $column_name, $user_id ) { - if ( 'account_status' === $column_name ) { - um_fetch_user( $user_id ); - $value = um_user( 'account_status_name' ); - um_reset_user(); + if ( 'um_account_status' !== $column_name ) { + return $value; + } + + $status = UM()->common()->users()->get_status( $user_id, 'formatted' ); + + $status = apply_filters( 'um_users_column_account_status', $status, $user_id ); + + $value = '' . esc_html( $status ) . ''; + + if ( get_current_user_id() === $user_id ) { + return $value; + } + + $row_actions = array(); + if ( UM()->common()->users()->can_be_approved( $user_id ) ) { + $url = add_query_arg( + array( + 'um_adm_action' => 'approve_user', + 'uid' => $user_id, + '_wpnonce' => wp_create_nonce( 'approve_user' . $user_id ), + ), + admin_url( 'users.php' ) + ); + $row_actions[] = '' . esc_html__( 'Approve', 'ultimate-member' ) . ''; + } + if ( UM()->common()->users()->can_be_reactivated( $user_id ) ) { + $url = add_query_arg( + array( + 'um_adm_action' => 'reactivate_user', + 'uid' => $user_id, + '_wpnonce' => wp_create_nonce( 'reactivate_user' . $user_id ), + ), + admin_url( 'users.php' ) + ); + $row_actions[] = '' . esc_html__( 'Reactivate', 'ultimate-member' ) . ''; + } + if ( UM()->common()->users()->can_be_set_as_pending( $user_id ) ) { + $url = add_query_arg( + array( + 'um_adm_action' => 'put_user_as_pending', + 'uid' => $user_id, + '_wpnonce' => wp_create_nonce( 'put_user_as_pending' . $user_id ), + ), + admin_url( 'users.php' ) + ); + $row_actions[] = '' . esc_html__( 'Put as pending', 'ultimate-member' ) . ''; + } + if ( UM()->common()->users()->can_activation_send( $user_id ) ) { + $url = add_query_arg( + array( + 'um_adm_action' => 'resend_user_activation', + 'uid' => $user_id, + '_wpnonce' => wp_create_nonce( 'resend_user_activation' . $user_id ), + ), + admin_url( 'users.php' ) + ); + $row_actions[] = '' . esc_html__( 'Resend activation email', 'ultimate-member' ) . ''; + } + if ( UM()->common()->users()->can_be_rejected( $user_id ) ) { + $url = add_query_arg( + array( + 'um_adm_action' => 'reject_user', + 'uid' => $user_id, + '_wpnonce' => wp_create_nonce( 'reject_user' . $user_id ), + ), + admin_url( 'users.php' ) + ); + $row_actions[] = '' . esc_html__( 'Reject', 'ultimate-member' ) . ''; + } + if ( UM()->common()->users()->can_be_deactivated( $user_id ) ) { + $url = add_query_arg( + array( + 'um_adm_action' => 'deactivate_user', + 'uid' => $user_id, + '_wpnonce' => wp_create_nonce( 'deactivate_user' . $user_id ), + ), + admin_url( 'users.php' ) + ); + $row_actions[] = '' . esc_html__( 'Deactivate', 'ultimate-member' ) . ''; + } + + $row_actions = apply_filters( 'um_users_column_account_status_row_actions', $row_actions, $user_id ); + if ( ! empty( $row_actions ) ) { + $value .= '
  • ' . implode( '
  • |
  • ', $row_actions ) . '
'; } return $value; } @@ -180,7 +261,6 @@ if ( ! class_exists( 'um\admin\Users_Columns' ) ) { * @return array */ private function get_user_bulk_actions() { - // @todo check verified users module for the proper integration. remove old integration way $um_actions = array( 'um_approve_membership' => __( 'Approve Membership', 'ultimate-member' ), 'um_reject_membership' => __( 'Reject Membership', 'ultimate-member' ), @@ -232,6 +312,23 @@ if ( ! class_exists( 'um\admin\Users_Columns' ) ) { return $actions; } + private function get_statuses_filter_options() { + $statuses = UM()->common()->users()->statuses_list(); + /** + * Filters the user statuses added via Ultimate Member plugin. + * + * Note: Statuses format is 'key' => 'title' + * + * @since 2.8.7 + * @hook um_user_statuses_admin_filter_options + * + * @param {array} $statuses User statuses in Ultimate Member environment. + * + * @return {array} User statuses. + */ + return apply_filters( 'um_user_statuses_admin_filter_options', $statuses ); + } + /** * Adds HTML with the filter by the Ultimate Member status. * @@ -250,7 +347,7 @@ if ( ! class_exists( 'um\admin\Users_Columns' ) ) { // need to add there additional nonce field because WordPress native _wpnonce field isn't visible on the users.php screen then custom actions wp_nonce_field( 'um-bulk-users', '_um_wpnonce', false ); - $statuses = UM()->common()->users()->statuses_list(); + $statuses = $this->get_statuses_filter_options(); ?>
@@ -503,7 +600,7 @@ if ( ! class_exists( 'um\admin\Users_Columns' ) ) { * @param string $uri * @return string */ - private function set_redirect_uri( $uri ) { + public function set_redirect_uri( $uri ) { if ( ! empty( $_REQUEST['s'] ) ) { $uri = add_query_arg( 's', sanitize_text_field( $_REQUEST['s'] ), $uri ); } diff --git a/includes/admin/core/class-admin-notices.php b/includes/admin/core/class-admin-notices.php index b9222e09..94641895 100644 --- a/includes/admin/core/class-admin-notices.php +++ b/includes/admin/core/class-admin-notices.php @@ -490,9 +490,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) { case 'um_settings_updated': $messages[0]['content'] = __( 'Settings have been saved successfully.', 'ultimate-member' ); break; - case 'um_user_updated': - $messages[0]['content'] = __( 'User has been updated.', 'ultimate-member' ); - break; case 'um_users_updated': $messages[0]['content'] = __( 'Users have been updated.', 'ultimate-member' ); break; diff --git a/includes/admin/core/class-admin-users.php b/includes/admin/core/class-admin-users.php deleted file mode 100644 index 8612c377..00000000 --- a/includes/admin/core/class-admin-users.php +++ /dev/null @@ -1,170 +0,0 @@ - - */ - do_action( "um_admin_custom_hook_{$action}", UM()->user()->id ); - break; - - case 'um_delete': - if ( is_admin() ) { - wp_die( esc_html__( 'This action is not allowed in backend.', 'ultimate-member' ) ); - } - UM()->user()->delete(); - break; - } - } - - /** - * Add UM Bulk actions to Users List Table - * @deprecated 2.8.7 - */ - public function restrict_manage_users() { - ?> -
- - - - - - - -
- - - - roles()->get_priority_user_role( get_current_user_id() ); - $role = get_role( $rolename ); - - if ( empty( $role ) ) { - wp_die( esc_html__( 'You do not have enough permissions to do that.', 'ultimate-member' ) ); - } - - if ( ! current_user_can( 'edit_users' ) && ! $role->has_cap( 'edit_users' ) ) { - wp_die( esc_html__( 'You do not have enough permissions to do that.', 'ultimate-member' ) ); - } - - check_admin_referer( 'bulk-users' ); - - $users = array_map( 'absint', (array) $_REQUEST['users'] ); - $bulk_action = current( array_filter( $_REQUEST['um_bulk_action'] ) ); - - foreach ( $users as $user_id ) { - UM()->user()->set( $user_id ); - - /** - * UM hook - * - * @type action - * @title um_admin_user_action_hook - * @description Action on bulk user action - * @input_vars - * [{"var":"$bulk_action","type":"string","desc":"Bulk Action"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_admin_user_action_hook{$action}', 'function_name', 10, 1 ); - * @example - * - */ - do_action( 'um_admin_user_action_hook', $bulk_action ); - - /** - * UM hook - * - * @type action - * @title um_admin_user_action_{$bulk_action}_hook - * @description Action on bulk user action - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_admin_user_action_{$bulk_action}_hook', 'function_name', 10 ); - * @example - * - */ - do_action( "um_admin_user_action_{$bulk_action}_hook" ); - } - - $uri = $this->set_redirect_uri( admin_url( 'users.php' ) ); - $uri = add_query_arg( 'update', 'um_users_updated', $uri ); - - wp_safe_redirect( $uri ); - exit; - } - - if ( ! empty( $_REQUEST['um_bulkedit'] ) ) { - $uri = $this->set_redirect_uri( admin_url( 'users.php' ) ); - wp_safe_redirect( $uri ); - exit; - } - } - } -} diff --git a/includes/class-init.php b/includes/class-init.php index 8cd2d914..9c8f811b 100644 --- a/includes/class-init.php +++ b/includes/class-init.php @@ -1451,7 +1451,7 @@ if ( ! class_exists( 'UM' ) ) { require_once 'core/um-actions-form.php'; require_once 'core/um-actions-access.php'; require_once 'core/um-actions-wpadmin.php'; - require_once 'core/um-actions-core.php'; +// require_once 'core/um-actions-core.php'; require_once 'core/um-actions-ajax.php'; require_once 'core/um-actions-login.php'; require_once 'core/um-actions-register.php'; diff --git a/includes/common/class-users.php b/includes/common/class-users.php index e440f621..f8a8b512 100644 --- a/includes/common/class-users.php +++ b/includes/common/class-users.php @@ -103,10 +103,10 @@ class Users { public function statuses_list() { $statuses = array( 'approved' => __( 'Approved', 'ultimate-member' ), - 'awaiting_admin_review' => __( 'Pending review', 'ultimate-member' ), + 'awaiting_admin_review' => __( 'Pending administrator review', 'ultimate-member' ), 'awaiting_email_confirmation' => __( 'Waiting email confirmation', 'ultimate-member' ), - 'inactive' => __( 'Inactive', 'ultimate-member' ), - 'rejected' => __( 'Rejected', 'ultimate-member' ), + 'inactive' => __( 'Membership inactive', 'ultimate-member' ), + 'rejected' => __( 'Membership rejected', 'ultimate-member' ), ); /** * Filters the user statuses added via Ultimate Member plugin. @@ -114,13 +114,13 @@ class Users { * Note: Statuses format is 'key' => 'title' * * @since 2.8.7 - * @hook um_admin_get_user_statuses + * @hook um_user_statuses * * @param {array} $statuses User statuses in Ultimate Member environment. * * @return {array} User statuses. */ - return apply_filters( 'um_admin_get_user_statuses', $statuses ); + return apply_filters( 'um_user_statuses', $statuses ); } /** @@ -184,8 +184,18 @@ class Users { * * @return string */ - public function get_status( $user_id ) { - return get_user_meta( $user_id, 'account_status', true ); + public function get_status( $user_id, $format = 'raw' ) { + $status = get_user_meta( $user_id, 'account_status', true ); + if ( 'raw' === $format ) { + return $status; + } + + $all_statuses = $this->statuses_list(); + if ( array_key_exists( $status, $all_statuses ) ) { + return $all_statuses[ $status ]; + } + + return __( 'Undefined', 'ultimate-member' ); } /** @@ -280,9 +290,34 @@ class Users { return get_password_reset_key( $userdata ); } - public function can_activation_send( $user_id ) { + public function can_current_user_edit_user( $user_id ) { $current_user_id = get_current_user_id(); if ( $current_user_id === $user_id ) { + return true; + } + + if ( ! self::user_exists( $user_id ) ) { + return false; + } + + $rolename = UM()->roles()->get_priority_user_role( $current_user_id ); + $role = get_role( $rolename ); + + if ( null === $role ) { + return false; + } + + // Make Ultimate Member bulk actions only when the current user has 'edit_users' capability. + if ( ! current_user_can( 'edit_users' ) && ! $role->has_cap( 'edit_users' ) ) { + return false; + } + + return true; + } + + public function can_activation_send( $user_id ) { + $current_user_id = get_current_user_id(); + if ( $current_user_id === $user_id || ! self::user_exists( $user_id ) ) { return false; } @@ -357,7 +392,7 @@ class Users { */ public function can_be_deactivated( $user_id ) { $current_user_id = get_current_user_id(); - if ( $current_user_id === $user_id ) { + if ( $current_user_id === $user_id || ! self::user_exists( $user_id ) ) { return false; } @@ -440,7 +475,7 @@ class Users { */ public function can_be_rejected( $user_id ) { $current_user_id = get_current_user_id(); - if ( $current_user_id === $user_id ) { + if ( $current_user_id === $user_id || ! self::user_exists( $user_id ) ) { return false; } @@ -523,7 +558,7 @@ class Users { */ public function can_be_set_as_pending( $user_id ) { $current_user_id = get_current_user_id(); - if ( $current_user_id === $user_id ) { + if ( $current_user_id === $user_id || ! self::user_exists( $user_id ) ) { return false; } @@ -598,7 +633,7 @@ class Users { */ public function can_be_approved( $user_id ) { $current_user_id = get_current_user_id(); - if ( $current_user_id === $user_id ) { + if ( $current_user_id === $user_id || ! self::user_exists( $user_id ) ) { return false; } @@ -618,6 +653,27 @@ class Users { return 'approved' !== $status; } + /** + * @param int $user_id + * + * @return bool + */ + public static function user_exists( $user_id ) { + /** + * @var bool[] $search_results + */ + static $search_results = array(); + + if ( array_key_exists( $user_id, $search_results ) ) { + return $search_results[ $user_id ]; + } + + $user = get_userdata( $user_id ); + + $search_results[ $user_id ] = false !== $user; + return $search_results[ $user_id ]; + } + /** * Approve user. * @@ -684,7 +740,7 @@ class Users { */ public function can_be_reactivated( $user_id ) { $current_user_id = get_current_user_id(); - if ( $current_user_id === $user_id ) { + if ( $current_user_id === $user_id || ! self::user_exists( $user_id ) ) { return false; } diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php index d9cdea0e..ea83dffa 100644 --- a/includes/core/class-member-directory.php +++ b/includes/core/class-member-directory.php @@ -2589,21 +2589,18 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { return $pagination_data; } - /** * @param int $user_id * * @return array */ - function build_user_actions_list( $user_id ) { - + private function build_user_actions_list( $user_id ) { $actions = array(); if ( ! is_user_logged_in() ) { return $actions; } - if ( get_current_user_id() != $user_id ) { - + if ( get_current_user_id() !== $user_id ) { if ( UM()->roles()->um_current_user_can( 'edit', $user_id ) ) { $actions['um-editprofile'] = array( 'title' => esc_html__( 'Edit Profile', 'ultimate-member' ), @@ -2611,31 +2608,17 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { ); } - /** - * UM hook - * - * @type filter - * @title um_admin_user_actions_hook - * @description Extend admin actions for each user - * @input_vars - * [{"var":"$actions","type":"array","desc":"Actions for user"}] - * @change_log - * ["Since: 2.0"] - * @usage - * - * @example - * - */ - $admin_actions = apply_filters( 'um_admin_user_actions_hook', array(), $user_id ); + $admin_actions = UM()->frontend()->users()->get_actions_list( $user_id ); if ( ! empty( $admin_actions ) ) { foreach ( $admin_actions as $id => $arr ) { - $url = add_query_arg( array( 'um_action' => $id, 'uid' => $user_id ), um_get_core_page( 'user' ) ); + $url = add_query_arg( + array( + 'um_action' => $id, + 'uid' => $user_id, + 'nonce' => wp_create_nonce( $id . $user_id ), + ), + um_user_profile_url( $user_id ) + ); $actions[ $id ] = array( 'title' => esc_html( $arr['label'] ), @@ -2645,9 +2628,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { } $actions = apply_filters( 'um_member_directory_users_card_actions', $actions, $user_id ); - } else { - if ( empty( UM()->user()->cannot_edit ) ) { $actions['um-editprofile'] = array( 'title' => esc_html__( 'Edit Profile', 'ultimate-member' ), @@ -2671,15 +2652,13 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { return $actions; } - /** * @param int $user_id * @param array $directory_data * * @return array */ - function build_user_card_data( $user_id, $directory_data ) { - + public function build_user_card_data( $user_id, $directory_data ) { um_fetch_user( $user_id ); $dropdown_actions = $this->build_user_actions_list( $user_id ); diff --git a/includes/core/class-rewrite.php b/includes/core/class-rewrite.php index 13578add..7d238716 100644 --- a/includes/core/class-rewrite.php +++ b/includes/core/class-rewrite.php @@ -234,8 +234,8 @@ if ( ! class_exists( 'um\core\Rewrite' ) ) { $user_id = $this->get_user_id_by_user_login_slug(); } - if ( 'user_id' === $permalink_base ) { - $user_id = UM()->user()->user_exists_by_id( um_queried_user() ); + if ( 'user_id' === $permalink_base && UM()->common()->users()::user_exists( um_queried_user() ) ) { + $user_id = um_queried_user(); } if ( 'hash' === $permalink_base ) { diff --git a/includes/core/class-user.php b/includes/core/class-user.php index 0654ef31..68f53dd9 100644 --- a/includes/core/class-user.php +++ b/includes/core/class-user.php @@ -1725,28 +1725,7 @@ if ( ! class_exists( 'um\core\User' ) ) { function get_admin_actions() { $items = array(); - /** - * UM hook - * - * @type filter - * @title um_admin_user_actions_hook - * @description Extend admin actions for each user - * @input_vars - * [{"var":"$actions","type":"array","desc":"Actions for user"}] - * @change_log - * ["Since: 2.0"] - * @usage - * - * @example - * - */ - $actions = apply_filters( 'um_admin_user_actions_hook', array(), um_profile_id() ); + $actions = UM()->frontend()->users()->get_actions_list( um_profile_id() ); if ( empty( $actions ) ) { return $items; } @@ -1756,10 +1735,9 @@ if ( ! class_exists( 'um\core\User' ) ) { array( 'um_action' => $id, 'uid' => um_profile_id(), + 'nonce' => wp_create_nonce( $id . um_profile_id() ), ) ); - /*$url = add_query_arg( 'um_action', $id ); - $url = add_query_arg( 'uid', um_profile_id(), $url );*/ $items[] = '' . esc_html( $arr['label'] ) . ''; } return $items; @@ -2111,32 +2089,15 @@ if ( ! class_exists( 'um\core\User' ) ) { /** * This method checks if a user exists or not in your site based on the user ID. * - * @usage user()->user_exists_by_id( $user_id ); ?> + * @deprecated 2.8.7 * * @param int $user_id A user ID must be passed to check if the user exists * * @return bool|int - * - * @example Basic Usage - - user()->user_exists_by_id( 15 ); - if ( $boolean ) { - // That user exists - } - - ?> - - * */ public function user_exists_by_id( $user_id ) { - $aux = get_userdata( absint( $user_id ) ); - if ( $aux == false ) { - return false; - } else { - return $user_id; - } + _deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()::user_exists' ); + return UM()->common()->users()::user_exists( $user_id ) ? $user_id : false; } /** diff --git a/includes/core/um-actions-core.php b/includes/core/um-actions-core.php deleted file mode 100644 index f0e0ef08..00000000 --- a/includes/core/um-actions-core.php +++ /dev/null @@ -1,161 +0,0 @@ -user()->user_exists_by_id( $uid ) ) { - return; - } - - if ( ! empty( $uid ) && is_super_admin( $uid ) ) { - wp_die( esc_html__( 'Super administrators can not be modified.', 'ultimate-member' ) ); - } - - $role = get_role( UM()->roles()->get_priority_user_role( get_current_user_id() ) ); - $can_edit_users = current_user_can( 'edit_users' ) && $role->has_cap( 'edit_users' ); - - switch ( $action ) { - default: - /** - * UM hook - * - * @type action - * @title um_action_user_request_hook - * @description Integration for user actions - * @input_vars - * [{"var":"$action","type":"string","desc":"Action for user"}, - * {"var":"$user_id","type":"int","desc":"User ID"}] - * @change_log - * ["Since: 2.0"] - * @usage add_action( 'um_action_user_request_hook', 'function_name', 10, 2 ); - * @example - * - */ - do_action( 'um_action_user_request_hook', $action, $uid ); - break; - - case 'edit': - UM()->fields()->editing = true; - if ( ! um_is_myprofile() ) { - if ( ! UM()->roles()->um_current_user_can( 'edit', um_profile_id() ) ) { - exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) ); - } - } else { - if ( ! um_can_edit_my_profile() ) { - $url = um_edit_my_profile_cancel_uri(); - exit( wp_redirect( $url ) ); - } - } - break; - - case 'um_switch_user': - if ( ! current_user_can( 'manage_options' ) ) { - return; - } - UM()->user()->auto_login( $uid ); - exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) ); - break; - - case 'um_reject_membership': - if ( ! $can_edit_users ) { - wp_die( esc_html__( 'You do not have permission to make this action.', 'ultimate-member' ) ); - } - - um_fetch_user( $uid ); - UM()->common()->users()->reject( $uid ); - exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) ); - break; - - case 'um_approve_membership': - if ( ! $can_edit_users ) { - wp_die( esc_html__( 'You do not have permission to make this action.', 'ultimate-member' ) ); - } - - um_fetch_user( $uid ); - - UM()->common()->users()->approve( $uid ); - exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) ); - break; - - case 'um_reactivate': - if ( ! $can_edit_users ) { - wp_die( esc_html__( 'You do not have permission to make this action.', 'ultimate-member' ) ); - } - - um_fetch_user( $uid ); - - UM()->common()->users()->reactivate( $uid ); - exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) ); - break; - - case 'um_put_as_pending': - if ( ! $can_edit_users ) { - wp_die( esc_html__( 'You do not have permission to make this action.', 'ultimate-member' ) ); - } - - um_fetch_user( $uid ); - UM()->common()->users()->set_as_pending( $uid ); - exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) ); - break; - - case 'um_resend_activation': - if ( ! $can_edit_users ) { - wp_die( esc_html__( 'You do not have permission to make this action.', 'ultimate-member' ) ); - } - - um_fetch_user( $uid ); - UM()->common()->users()->send_activation( $uid ); - exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) ); - break; - - case 'um_deactivate': - if ( ! $can_edit_users ) { - wp_die( esc_html__( 'You do not have permission to make this action.', 'ultimate-member' ) ); - } - - um_fetch_user( $uid ); - UM()->common()->users()->deactivate( $uid ); - exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) ); - break; - - case 'um_delete': - if ( ! UM()->roles()->um_current_user_can( 'delete', $uid ) ) { - wp_die( esc_html__( 'You do not have permission to delete this user.', 'ultimate-member' ) ); - } - - um_fetch_user( $uid ); - UM()->user()->delete(); - exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) ); - break; - - } -} -add_action( 'template_redirect', 'um_action_request_process', 10000 ); diff --git a/includes/core/um-filters-user.php b/includes/core/um-filters-user.php index c696a411..4d0eb375 100644 --- a/includes/core/um-filters-user.php +++ b/includes/core/um-filters-user.php @@ -3,61 +3,6 @@ if ( ! defined( 'ABSPATH' ) ) { exit; } -/** - * Main admin user actions. - * - * @param array $actions - * @param int $user_id - * - * @return array - */ -function um_admin_user_actions_hook( $actions, $user_id ) { - um_fetch_user( $user_id ); - - $role = get_role( UM()->roles()->get_priority_user_role( get_current_user_id() ) ); - - $can_edit_users = null !== $role && current_user_can( 'edit_users' ) && $role->has_cap( 'edit_users' ); - if ( $can_edit_users ) { - $account_status = um_user( 'account_status' ); - - if ( 'awaiting_admin_review' === $account_status ) { - $actions['um_approve_membership'] = array( 'label' => __( 'Approve Membership', 'ultimate-member' ) ); - $actions['um_reject_membership'] = array( 'label' => __( 'Reject Membership', 'ultimate-member' ) ); - } - - if ( 'rejected' === $account_status ) { - $actions['um_approve_membership'] = array( 'label' => __( 'Approve Membership', 'ultimate-member' ) ); - } - - if ( 'approved' === $account_status ) { - $actions['um_put_as_pending'] = array( 'label' => __( 'Put as Pending Review', 'ultimate-member' ) ); - } - - if ( 'awaiting_email_confirmation' === $account_status ) { - $actions['um_resend_activation'] = array( 'label' => __( 'Resend Activation Email', 'ultimate-member' ) ); - } - - if ( 'inactive' !== $account_status ) { - $actions['um_deactivate'] = array( 'label' => __( 'Deactivate this account', 'ultimate-member' ) ); - } - - if ( 'inactive' === $account_status ) { - $actions['um_reactivate'] = array( 'label' => __( 'Reactivate this account', 'ultimate-member' ) ); - } - } - - if ( UM()->roles()->um_current_user_can( 'delete', $user_id ) ) { - $actions['um_delete'] = array( 'label' => __( 'Delete this user', 'ultimate-member' ) ); - } - - if ( current_user_can( 'manage_options' ) && ! is_super_admin( $user_id ) ) { - $actions['um_switch_user'] = array( 'label' => __( 'Login as this user', 'ultimate-member' ) ); - } - - return $actions; -} -add_filter( 'um_admin_user_actions_hook', 'um_admin_user_actions_hook', 10, 2 ); - /** * Filter user basename. * diff --git a/includes/frontend/class-actions-listener.php b/includes/frontend/class-actions-listener.php new file mode 100644 index 00000000..467d0a6f --- /dev/null +++ b/includes/frontend/class-actions-listener.php @@ -0,0 +1,207 @@ +common()->users()::user_exists( $user_id ) ) { + return; + } + + if ( get_current_user_id() === $user_id ) { + return; + } + + if ( ! empty( $user_id ) && is_super_admin( $user_id ) ) { + wp_die( esc_html__( 'Super administrators can not be modified.', 'ultimate-member' ) ); + } + + $action = sanitize_key( $_REQUEST['um_action'] ); + // phpcs:enable WordPress.Security.NonceVerification -- there is nonce verification below for each case + switch ( $action ) { + case 'approve_user': + if ( ! wp_verify_nonce( $_REQUEST['nonce'], "approve_user{$user_id}" ) ) { + wp_die( esc_html__( 'The link you followed has expired.', 'ultimate-member' ) ); + } + + if ( ! UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + wp_die( esc_html__( 'You do not have permission to edit this user.', 'ultimate-member' ) ); + } + + $result = UM()->common()->users()->approve( $user_id ); + if ( ! $result ) { + wp_die( esc_html__( 'Something went wrong.', 'ultimate-member' ) ); + } + + um_safe_redirect( UM()->permalinks()->get_current_url( true ) ); + exit; + case 'reactivate_user': + if ( ! wp_verify_nonce( $_REQUEST['nonce'], "reactivate_user{$user_id}" ) ) { + wp_die( esc_html__( 'The link you followed has expired.', 'ultimate-member' ) ); + } + + if ( ! UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + wp_die( esc_html__( 'You do not have permission to edit this user.', 'ultimate-member' ) ); + } + + $result = UM()->common()->users()->reactivate( $user_id ); + if ( ! $result ) { + wp_die( esc_html__( 'Something went wrong.', 'ultimate-member' ) ); + } + + um_safe_redirect( UM()->permalinks()->get_current_url( true ) ); + exit; + case 'put_user_as_pending': + if ( ! wp_verify_nonce( $_REQUEST['nonce'], "put_user_as_pending{$user_id}" ) ) { + wp_die( esc_html__( 'The link you followed has expired.', 'ultimate-member' ) ); + } + + if ( ! UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + wp_die( esc_html__( 'You do not have permission to edit this user.', 'ultimate-member' ) ); + } + + $result = UM()->common()->users()->set_as_pending( $user_id ); + if ( ! $result ) { + wp_die( esc_html__( 'Something went wrong.', 'ultimate-member' ) ); + } + + um_safe_redirect( UM()->permalinks()->get_current_url( true ) ); + exit; + case 'resend_user_activation': + if ( ! wp_verify_nonce( $_REQUEST['nonce'], "resend_user_activation{$user_id}" ) ) { + wp_die( esc_html__( 'The link you followed has expired.', 'ultimate-member' ) ); + } + + if ( ! UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + wp_die( esc_html__( 'You do not have permission to edit this user.', 'ultimate-member' ) ); + } + + $result = UM()->common()->users()->send_activation( $user_id ); + if ( ! $result ) { + wp_die( esc_html__( 'Something went wrong.', 'ultimate-member' ) ); + } + + um_safe_redirect( UM()->permalinks()->get_current_url( true ) ); + exit; + case 'reject_user': + if ( ! wp_verify_nonce( $_REQUEST['nonce'], "reject_user{$user_id}" ) ) { + wp_die( esc_html__( 'The link you followed has expired.', 'ultimate-member' ) ); + } + + if ( ! UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + wp_die( esc_html__( 'You do not have permission to edit this user.', 'ultimate-member' ) ); + } + + $result = UM()->common()->users()->reject( $user_id ); + if ( ! $result ) { + wp_die( esc_html__( 'Something went wrong.', 'ultimate-member' ) ); + } + + um_safe_redirect( UM()->permalinks()->get_current_url( true ) ); + exit; + case 'deactivate_user': + if ( ! wp_verify_nonce( $_REQUEST['nonce'], "deactivate_user{$user_id}" ) ) { + wp_die( esc_html__( 'The link you followed has expired.', 'ultimate-member' ) ); + } + + if ( ! UM()->common()->users()->can_current_user_edit_user( $user_id ) ) { + wp_die( esc_html__( 'You do not have permission to edit this user.', 'ultimate-member' ) ); + } + + $result = UM()->common()->users()->deactivate( $user_id ); + if ( ! $result ) { + wp_die( esc_html__( 'Something went wrong.', 'ultimate-member' ) ); + } + + um_safe_redirect( UM()->permalinks()->get_current_url( true ) ); + exit; + case 'switch_user': + if ( ! current_user_can( 'manage_options' ) ) { + return; + } + + if ( ! wp_verify_nonce( $_REQUEST['nonce'], "switch_user{$user_id}" ) ) { + wp_die( esc_html__( 'The link you followed has expired.', 'ultimate-member' ) ); + } + + UM()->user()->auto_login( $user_id ); + + um_safe_redirect( UM()->permalinks()->get_current_url( true ) ); + exit; + case 'delete': + if ( ! wp_verify_nonce( $_REQUEST['nonce'], "delete{$user_id}" ) ) { + wp_die( esc_html__( 'The link you followed has expired.', 'ultimate-member' ) ); + } + + if ( ! UM()->roles()->um_current_user_can( 'delete', $user_id ) ) { + wp_die( esc_html__( 'You do not have permission to delete this user.', 'ultimate-member' ) ); + } + + um_fetch_user( $user_id ); + UM()->user()->delete(); + + um_safe_redirect( UM()->permalinks()->get_current_url( true ) ); + exit; + default: + /** + * UM hook + * + * @type action + * @title um_action_user_request_hook + * @description Integration for user actions + * @input_vars + * [{"var":"$action","type":"string","desc":"Action for user"}, + * {"var":"$user_id","type":"int","desc":"User ID"}] + * @change_log + * ["Since: 2.0"] + * @usage add_action( 'um_action_user_request_hook', 'function_name', 10, 2 ); + * @example + * + */ + do_action( 'um_action_user_request_hook', $action, $user_id ); + break; + } + } + } +} diff --git a/includes/frontend/class-init.php b/includes/frontend/class-init.php index b34cd983..1d3d460f 100644 --- a/includes/frontend/class-init.php +++ b/includes/frontend/class-init.php @@ -20,9 +20,25 @@ if ( ! class_exists( 'um\frontend\Init' ) ) { * @used-by \UM::includes() */ public function includes() { + $this->actions_listener(); $this->enqueue(); $this->modal(); $this->secure(); + $this->user_profile(); + $this->users(); + } + + /** + * @since 2.8.7 + * + * @return Actions_Listener + */ + public function actions_listener() { + if ( empty( UM()->classes['um\frontend\actions_listener'] ) ) { + UM()->classes['um\frontend\actions_listener'] = new Actions_Listener(); + } + + return UM()->classes['um\frontend\actions_listener']; } /** @@ -62,5 +78,29 @@ if ( ! class_exists( 'um\frontend\Init' ) ) { } return UM()->classes['um\frontend\secure']; } + + /** + * @since 2.8.7 + * + * @return User_Profile + */ + public function user_profile() { + if ( empty( UM()->classes['um\frontend\user_profile'] ) ) { + UM()->classes['um\frontend\user_profile'] = new User_Profile(); + } + return UM()->classes['um\frontend\user_profile']; + } + + /** + * @since 2.8.7 + * + * @return Users + */ + public function users() { + if ( empty( UM()->classes['um\frontend\users'] ) ) { + UM()->classes['um\frontend\users'] = new Users(); + } + return UM()->classes['um\frontend\users']; + } } } diff --git a/includes/frontend/class-user-profile.php b/includes/frontend/class-user-profile.php new file mode 100644 index 00000000..f77cd3cc --- /dev/null +++ b/includes/frontend/class-user-profile.php @@ -0,0 +1,69 @@ +common()->users()::user_exists( $uid ) ) { + return; + } + + if ( ! empty( $uid ) && is_super_admin( $uid ) ) { + wp_die( esc_html__( 'Super administrators can not be modified.', 'ultimate-member' ) ); + } + + UM()->fields()->editing = true; + + if ( ! um_is_myprofile() && ! UM()->roles()->um_current_user_can( 'edit', um_profile_id() ) ) { + um_safe_redirect( UM()->permalinks()->get_current_url( true ) ); + exit; + } + + if ( ! um_can_edit_my_profile() ) { + um_safe_redirect( um_edit_my_profile_cancel_uri() ); + exit; + } + } + } +} diff --git a/includes/frontend/class-users.php b/includes/frontend/class-users.php new file mode 100644 index 00000000..585cbcd9 --- /dev/null +++ b/includes/frontend/class-users.php @@ -0,0 +1,81 @@ +roles()->get_priority_user_role( get_current_user_id() ); + $role = get_role( $priority_role ); + + $can_edit_users = null !== $role && current_user_can( 'edit_users' ) && $role->has_cap( 'edit_users' ); + if ( $can_edit_users ) { + if ( UM()->common()->users()->can_be_approved( $user_id ) ) { + $actions['approve_user'] = array( 'label' => __( 'Approve Membership', 'ultimate-member' ) ); + } + if ( UM()->common()->users()->can_be_reactivated( $user_id ) ) { + $actions['reactivate_user'] = array( 'label' => __( 'Reactivate this account', 'ultimate-member' ) ); + } + if ( UM()->common()->users()->can_be_set_as_pending( $user_id ) ) { + $actions['put_user_as_pending'] = array( 'label' => __( 'Put as Pending Review', 'ultimate-member' ) ); + } + if ( UM()->common()->users()->can_activation_send( $user_id ) ) { + $actions['resend_user_activation'] = array( 'label' => __( 'Resend Activation Email', 'ultimate-member' ) ); + } + if ( UM()->common()->users()->can_be_rejected( $user_id ) ) { + $actions['reject_user'] = array( 'label' => __( 'Reject Membership', 'ultimate-member' ) ); + } + if ( UM()->common()->users()->can_be_deactivated( $user_id ) ) { + $actions['deactivate_user'] = array( 'label' => __( 'Deactivate this account', 'ultimate-member' ) ); + } + } + + if ( UM()->roles()->um_current_user_can( 'delete', $user_id ) ) { + $actions['delete'] = array( 'label' => __( 'Delete this user', 'ultimate-member' ) ); + } + + if ( current_user_can( 'manage_options' ) && ! is_super_admin( $user_id ) ) { + $actions['switch_user'] = array( 'label' => __( 'Login as this user', 'ultimate-member' ) ); + } + + /** + * Filters users actions list in Ultimate Member frontend. + * + * @since 1.3.x + * @hook um_admin_user_actions_hook + * + * @param {array} $actions CPT keys. + * @param {int} $user_id User ID. + * + * @return {array} CPT keys. + * + * @example Add `um_custom_action` action to the users actions list on frontend. + * function um_custom_admin_user_actions_hook( $actions, $user_id ) { + * $actions['um_custom_action'] = array( 'label' => 'um_custom_action_label' ); + * return $actions; + * } + * add_filter( 'um_admin_user_actions_hook', 'um_custom_admin_user_actions_hook', 10, 2 ); + */ + return apply_filters( 'um_admin_user_actions_hook', $actions, $user_id ); + } +} diff --git a/includes/um-deprecated-hooks.php b/includes/um-deprecated-hooks.php index 0a0fa5c7..3231ab27 100644 --- a/includes/um-deprecated-hooks.php +++ b/includes/um-deprecated-hooks.php @@ -65,3 +65,33 @@ if ( ! defined( 'ABSPATH' ) ) { * * @param {int} $user_id User ID. Since 2.0 */ + +/** + * Fires for handle admin user_action scripts. + * + * @since 1.3.x + * @depecated 2.8.7 WordPress native `handle_bulk_actions-users` hook is used. Use action hook `um_handle_bulk_actions-users-{$current_action}` for custom user bulk actions instead. + * @hook um_admin_user_action_hook + * + * @param {string} $bulk_action Bulk action key + */ + +/** + * Fires for handle admin user_action scripts. + * Where $bulk_action is a bulk action key + * + * @since 1.3.x + * @depecated 2.8.7 WordPress native `handle_bulk_actions-users` hook is used. Use action hook `um_handle_bulk_actions-users-{$current_action}` for custom user bulk actions instead. + * @hook um_admin_user_action_{$bulk_action}_hook + */ + +/** + * Fires for handle custom admin user_action scripts. + * Where $action is a bulk action key + * + * @since 1.3.x + * @depecated 2.8.7 WordPress native `handle_bulk_actions-users` hook is used. Use action hook `um_handle_bulk_actions-users-{$current_action}` for custom user bulk actions instead. + * @hook um_admin_custom_hook_{$action} + * + * @param {int} $user_id User ID. + */