diff --git a/assets/css/um-styles.css b/assets/css/um-styles.css index eafe1bd8..eac76277 100644 --- a/assets/css/um-styles.css +++ b/assets/css/um-styles.css @@ -175,6 +175,11 @@ p.um-notice { position: relative; } +p.um-notice a { + color: #fff; + text-decoration: underline; +} + p.um-notice i { position: absolute; right: 14px; @@ -201,6 +206,11 @@ p.um-notice.warning { padding: 8px 15px !important; } +p.um-notice.warning a { + color: #666; + text-decoration: underline; +} + /* - Errors */ diff --git a/assets/js/um-profile.js b/assets/js/um-profile.js index 4f2e4966..0d08085e 100644 --- a/assets/js/um-profile.js +++ b/assets/js/um-profile.js @@ -124,7 +124,8 @@ jQuery(document).ready(function() { jQuery( '.um-profile-edit a.um_delete-item' ).click( function(e) { e.preventDefault(); - if ( ! confirm( 'Are you sure that you want to delete this user?' ) ) { + + if ( ! confirm( wp.i18n.__( 'Are you sure that you want to delete this user?', 'ultimate-member' ) ) ) { return false; } }); diff --git a/assets/js/um-profile.min.js b/assets/js/um-profile.min.js index 947a4039..5765cf9c 100644 --- a/assets/js/um-profile.min.js +++ b/assets/js/um-profile.min.js @@ -1 +1 @@ -jQuery(document).ready(function(){jQuery(".um-profile.um-viewing .um-profile-body .um-row").each(function(){var e=jQuery(this);0==e.find(".um-field").length&&(e.prev(".um-row-heading").remove(),e.remove())}),jQuery(".um-profile.um-viewing .um-profile-body").length&&0==jQuery(".um-profile.um-viewing .um-profile-body").find(".um-field").length&&(jQuery(".um-row-heading,.um-row").remove(),jQuery(".um-profile-note").show()),jQuery(document.body).on("click",".um-profile-save",function(e){return e.preventDefault(),jQuery(this).parents(".um").find("form").submit(),!1}),jQuery(document.body).on("click",".um-profile-edit-a",function(e){jQuery(this).addClass("active")}),jQuery(document.body).on("click",".um-cover a.um-cover-add, .um-photo a",function(e){e.preventDefault()}),jQuery(document.body).on("click",".um-photo-modal",function(e){e.preventDefault();var t=jQuery(this).attr("data-src");return um_new_modal("um_view_photo","fit",!0,t),!1}),jQuery(document.body).on("click",".um-reset-profile-photo",function(e){return jQuery(".um-profile-photo-img img").attr("src",jQuery(this).attr("data-default_src")),user_id=jQuery(this).attr("data-user_id"),metakey="profile_photo",UM_hide_menus(),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_profile_photo",metakey:metakey,user_id:user_id,nonce:um_scripts.nonce}}),jQuery(this).parents("li").hide(),!1}),jQuery(document.body).on("click",".um-reset-cover-photo",function(e){var t=jQuery(this);return jQuery(".um-cover-overlay").hide(),jQuery(".um-cover-e").html(''),um_responsive(),user_id=jQuery(this).attr("data-user_id"),metakey="cover_photo",jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_cover_photo",metakey:metakey,user_id:user_id,nonce:um_scripts.nonce},success:function(e){t.hide()}}),UM_hide_menus(),!1}),jQuery(document.body).on("change, keyup",'textarea[id="um-meta-bio"]',function(){if(void 0!==jQuery(this).val()){var e=jQuery(this).attr("data-character-limit")-jQuery(this).val().length;jQuery("span.um-meta-bio-character span.um-bio-limit").text(e),e<5?jQuery("span.um-meta-bio-character").css("color","red"):jQuery("span.um-meta-bio-character").css("color","")}}),jQuery('textarea[id="um-meta-bio"]').trigger("change"),jQuery(".um-profile-edit a.um_delete-item").click(function(e){if(e.preventDefault(),!confirm("Are you sure that you want to delete this user?"))return!1}),jQuery(".um-profile-nav a").on("touchend",function(e){e.currentTarget.click()})}); \ No newline at end of file +jQuery(document).ready(function(){jQuery(".um-profile.um-viewing .um-profile-body .um-row").each(function(){var e=jQuery(this);0==e.find(".um-field").length&&(e.prev(".um-row-heading").remove(),e.remove())}),jQuery(".um-profile.um-viewing .um-profile-body").length&&0==jQuery(".um-profile.um-viewing .um-profile-body").find(".um-field").length&&(jQuery(".um-row-heading,.um-row").remove(),jQuery(".um-profile-note").show()),jQuery(document.body).on("click",".um-profile-save",function(e){return e.preventDefault(),jQuery(this).parents(".um").find("form").submit(),!1}),jQuery(document.body).on("click",".um-profile-edit-a",function(e){jQuery(this).addClass("active")}),jQuery(document.body).on("click",".um-cover a.um-cover-add, .um-photo a",function(e){e.preventDefault()}),jQuery(document.body).on("click",".um-photo-modal",function(e){e.preventDefault();var t=jQuery(this).attr("data-src");return um_new_modal("um_view_photo","fit",!0,t),!1}),jQuery(document.body).on("click",".um-reset-profile-photo",function(e){return jQuery(".um-profile-photo-img img").attr("src",jQuery(this).attr("data-default_src")),user_id=jQuery(this).attr("data-user_id"),metakey="profile_photo",UM_hide_menus(),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_profile_photo",metakey:metakey,user_id:user_id,nonce:um_scripts.nonce}}),jQuery(this).parents("li").hide(),!1}),jQuery(document.body).on("click",".um-reset-cover-photo",function(e){var t=jQuery(this);return jQuery(".um-cover-overlay").hide(),jQuery(".um-cover-e").html(''),um_responsive(),user_id=jQuery(this).attr("data-user_id"),metakey="cover_photo",jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_cover_photo",metakey:metakey,user_id:user_id,nonce:um_scripts.nonce},success:function(e){t.hide()}}),UM_hide_menus(),!1}),jQuery(document.body).on("change, keyup",'textarea[id="um-meta-bio"]',function(){if(void 0!==jQuery(this).val()){var e=jQuery(this).attr("data-character-limit")-jQuery(this).val().length;jQuery("span.um-meta-bio-character span.um-bio-limit").text(e),e<5?jQuery("span.um-meta-bio-character").css("color","red"):jQuery("span.um-meta-bio-character").css("color","")}}),jQuery('textarea[id="um-meta-bio"]').trigger("change"),jQuery(".um-profile-edit a.um_delete-item").click(function(e){if(e.preventDefault(),!confirm(wp.i18n.__("Are you sure that you want to delete this user?","ultimate-member")))return!1}),jQuery(".um-profile-nav a").on("touchend",function(e){e.currentTarget.click()})}); \ No newline at end of file diff --git a/includes/admin/core/class-admin-enqueue.php b/includes/admin/core/class-admin-enqueue.php index de486afc..617d6336 100644 --- a/includes/admin/core/class-admin-enqueue.php +++ b/includes/admin/core/class-admin-enqueue.php @@ -153,7 +153,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) { wp_register_style( 'um_modal', $this->front_css_baseurl . 'um-modal.css', array(), ultimatemember_version ); wp_register_style( 'um_styles', $this->front_css_baseurl . 'um-styles.css', array(), ultimatemember_version ); wp_register_style( 'um_members', $this->front_css_baseurl . 'um-members.css', array(), ultimatemember_version ); - wp_register_style( 'um_profile', $this->front_css_baseurl . 'um-profile.css', array(), ultimatemember_version ); + wp_register_style( 'um_profile', $this->front_css_baseurl . 'um-profile.css', array( 'wp-i18n' ), ultimatemember_version ); wp_register_style( 'um_account', $this->front_css_baseurl . 'um-account.css', array(), ultimatemember_version ); wp_register_style( 'um_misc', $this->front_css_baseurl . 'um-misc.css', array(), ultimatemember_version ); wp_register_style( 'um_default_css', $this->front_css_baseurl . 'um-old-default.css', array( 'um_crop', 'um_tipsy', 'um_raty', 'um_responsive', 'um_modal', 'um_styles', 'um_members', 'um_profile', 'um_account', 'um_misc', 'um_datetime_date', 'um_datetime_time', 'um_scrollbar' ), ultimatemember_version ); diff --git a/includes/core/class-enqueue.php b/includes/core/class-enqueue.php index 6c186946..03dc008b 100644 --- a/includes/core/class-enqueue.php +++ b/includes/core/class-enqueue.php @@ -142,7 +142,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { wp_register_script('um_dropdown', $this->js_baseurl . 'dropdown' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true ); wp_register_script('um_members', $this->js_baseurl . 'um-members' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-slider', 'um_dropdown', 'wp-hooks' ), ultimatemember_version, true ); - wp_register_script('um_profile', $this->js_baseurl . 'um-profile' . $this->suffix . '.js', array( 'jquery', 'wp-util' ), ultimatemember_version, true ); + wp_register_script('um_profile', $this->js_baseurl . 'um-profile' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'wp-i18n' ), ultimatemember_version, true ); wp_register_script('um_account', $this->js_baseurl . 'um-account' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true ); wp_register_script( 'um_gchart', 'https://www.google.com/jsapi', array(), ultimatemember_version, true ); diff --git a/includes/core/class-gdpr.php b/includes/core/class-gdpr.php index 23e9dc20..8bb9d3a0 100644 --- a/includes/core/class-gdpr.php +++ b/includes/core/class-gdpr.php @@ -1,7 +1,7 @@ */ - $allow_nonce_verification = apply_filters( "um_register_allow_nonce_verification", true ); + $allow_nonce_verification = apply_filters( 'um_register_allow_nonce_verification', true ); - if( ! $allow_nonce_verification ){ + if ( ! $allow_nonce_verification ) { return $args; } if ( ! wp_verify_nonce( $args['_wpnonce'], 'um_register_form' ) || empty( $args['_wpnonce'] ) || ! isset( $args['_wpnonce'] ) ) { - wp_die('Invalid Nonce.'); + wp_die( __( 'Invalid Nonce.', 'ultimate-member' ) ); } return $args; diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php index 47a5820c..52d46c49 100644 --- a/includes/core/um-actions-register.php +++ b/includes/core/um-actions-register.php @@ -263,8 +263,9 @@ add_action( 'um_registration_complete', 'um_check_user_status', 100, 2 ); * @return bool|int|WP_Error */ function um_submit_form_register( $args ) { - if ( isset( UM()->form()->errors ) ) + if ( isset( UM()->form()->errors ) ) { return false; + } /** * UM hook @@ -291,11 +292,11 @@ function um_submit_form_register( $args ) { extract( $args ); - if ( isset( $username ) && ! isset( $user_login ) ) { + if ( ! empty( $username ) && empty( $user_login ) ) { $user_login = $username; } - if ( ! empty( $first_name ) && ! empty( $last_name ) && ! isset( $user_login ) ) { + if ( ! empty( $first_name ) && ! empty( $last_name ) && empty( $user_login ) ) { if ( UM()->options()->get( 'permalink_base' ) == 'name' ) { $user_login = rawurlencode( strtolower( str_replace( " ", ".", $first_name . " " . $last_name ) ) ); @@ -319,13 +320,13 @@ function um_submit_form_register( $args ) { } } - if ( ! isset( $user_login ) && isset( $user_email ) && $user_email ) { + if ( empty( $user_login ) && ! empty( $user_email ) ) { $user_login = $user_email; } $unique_userID = UM()->query()->count_users() + 1; - if ( ! isset( $user_login ) || strlen( $user_login ) > 30 && ! is_email( $user_login ) ) { + if ( empty( $user_login ) || strlen( $user_login ) > 30 && ! is_email( $user_login ) ) { $user_login = 'user' . $unique_userID; } @@ -337,7 +338,7 @@ function um_submit_form_register( $args ) { $user_password = UM()->validation()->generate( 8 ); } - if ( ! isset( $user_email ) ) { + if ( empty( $user_email ) ) { $site_url = @$_SERVER['SERVER_NAME']; $user_email = 'nobody' . $unique_userID . '@' . $site_url; /** @@ -365,9 +366,9 @@ function um_submit_form_register( $args ) { } $credentials = array( - 'user_login' => $user_login, - 'user_password' => $user_password, - 'user_email' => trim( $user_email ), + 'user_login' => $user_login, + 'user_password' => $user_password, + 'user_email' => trim( $user_email ), ); $args['submitted'] = array_merge( $args['submitted'], $credentials ); @@ -422,11 +423,12 @@ function um_submit_form_register( $args ) { $user_role = apply_filters( 'um_registration_user_role', $user_role, $args ); $userdata = array( - 'user_login' => $user_login, - 'user_pass' => $user_password, - 'user_email' => $user_email, - 'role' => $user_role, + 'user_login' => $user_login, + 'user_pass' => $user_password, + 'user_email' => $user_email, + 'role' => $user_role, ); + $user_id = wp_insert_user( $userdata ); /**