From 8aaf5f1d13db25631732ba3377936d664eed15ee Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Tue, 14 Aug 2018 18:49:48 +0300 Subject: [PATCH 1/3] - 2.0.24 upgrade; - wp nativve ajax handlers --- assets/js/um-modal.js | 9 ++++-- assets/js/um-profile.js | 6 ++-- assets/js/um-scripts.js | 9 ++++-- .../admin/core/packages/2.0.24/functions.php | 29 +++++++++++++++++++ includes/admin/core/packages/2.0.24/hooks.php | 5 ++++ includes/admin/core/packages/2.0.24/init.php | 29 +++++++++++++++++++ includes/core/class-ajax-common.php | 5 ++-- includes/core/class-enqueue.php | 5 ---- 8 files changed, 81 insertions(+), 16 deletions(-) create mode 100644 includes/admin/core/packages/2.0.24/functions.php create mode 100644 includes/admin/core/packages/2.0.24/hooks.php create mode 100644 includes/admin/core/packages/2.0.24/init.php diff --git a/assets/js/um-modal.js b/assets/js/um-modal.js index 99c117b2..f1a480c9 100644 --- a/assets/js/um-modal.js +++ b/assets/js/um-modal.js @@ -30,9 +30,10 @@ jQuery(document).ready(function() { um_modal_responsive(); jQuery.ajax({ - url: um_scripts.remove_file, + url: wp.ajax.settings.url, type: 'post', data: { + action: 'um_remove_file', src: src } }); @@ -59,9 +60,10 @@ jQuery(document).ready(function() { um_modal_responsive(); jQuery.ajax({ - url: um_scripts.remove_file, + url: wp.ajax.settings.url, type: 'post', data: { + action: 'um_remove_file', src: src } }); @@ -105,10 +107,11 @@ jQuery(document).ready(function() { jQuery(this).html( jQuery(this).attr('data-processing') ).addClass('disabled'); jQuery.ajax({ - url: um_scripts.resize_image, + url: wp.ajax.settings.url, type: 'POST', dataType: 'json', data: { + action: 'um_resize_image', src : src, coord : coord, user_id : user_id, diff --git a/assets/js/um-profile.js b/assets/js/um-profile.js index 624639cb..cdc5145b 100644 --- a/assets/js/um-profile.js +++ b/assets/js/um-profile.js @@ -43,9 +43,10 @@ jQuery(document).ready(function() { metakey = 'profile_photo'; jQuery.ajax({ - url: um_scripts.delete_profile_photo, + url: wp.ajax.settings.url, type: 'post', data: { + action:'um_delete_profile_photo', metakey: metakey, user_id: user_id } @@ -65,9 +66,10 @@ jQuery(document).ready(function() { metakey = 'cover_photo'; jQuery.ajax({ - url: um_scripts.delete_cover_photo, + url: wp.ajax.settings.url, type: 'post', data: { + action: 'um_delete_cover_photo', metakey: metakey, user_id: user_id }, diff --git a/assets/js/um-scripts.js b/assets/js/um-scripts.js index f3132f48..539411d7 100644 --- a/assets/js/um-scripts.js +++ b/assets/js/um-scripts.js @@ -151,9 +151,10 @@ jQuery(document).ready(function() { parent.find('input[type=hidden]').val('empty_file'); jQuery.ajax({ - url: um_scripts.remove_file, + url: wp.ajax.settings.url, type: 'post', data: { + action: 'um_remove_file', src: src } }); @@ -170,9 +171,10 @@ jQuery(document).ready(function() { parent.find('input[type=hidden]').val('empty_file'); jQuery.ajax({ - url: um_scripts.remove_file, + url: wp.ajax.settings.url, type: 'post', data: { + action: 'um_remove_file', src: src } }); @@ -247,9 +249,10 @@ jQuery(document).ready(function() { var hook = jQuery(this).data('hook'); var container = jQuery(this).parents('.um').find('.um-ajax-items'); jQuery.ajax({ - url: um_scripts.ajax_paginate, + url: wp.ajax.settings.url, type: 'post', data: { + action: 'um_ajax_paginate', hook: hook, args: args }, diff --git a/includes/admin/core/packages/2.0.24/functions.php b/includes/admin/core/packages/2.0.24/functions.php new file mode 100644 index 00000000..083186a1 --- /dev/null +++ b/includes/admin/core/packages/2.0.24/functions.php @@ -0,0 +1,29 @@ +query( $wpdb->prepare( + "UPDATE {$wpdb->usermeta} + SET meta_value = CASE + WHEN meta_value = %s THEN 'Everyone' + WHEN meta_value = %s THEN 'Only me' + WHEN meta_value = %s THEN 'followed' + WHEN meta_value = %s THEN 'follower' + WHEN meta_value = %s THEN 'friends' + END + WHERE meta_key = 'profile_privacy'", + __( 'Everyone', 'ultimate-member' ), + __( 'Only me', 'ultimate-member' ), + __( 'Only people I follow can view my profile', 'um-followers' ), + __( 'Followers', 'um-followers' ), + __( 'Friends only', 'um-friends' ) + ) ); + + UM()->user()->remove_cache_all_users(); + + update_option( 'um_last_version_upgrade', '2.0.24' ); + + wp_send_json_success( array( 'message' => __( 'Privacy Settings was upgraded successfully', 'ultimate-member' ) ) ); +} \ No newline at end of file diff --git a/includes/admin/core/packages/2.0.24/hooks.php b/includes/admin/core/packages/2.0.24/hooks.php new file mode 100644 index 00000000..307a16ca --- /dev/null +++ b/includes/admin/core/packages/2.0.24/hooks.php @@ -0,0 +1,5 @@ + 'privacy2024', +); \ No newline at end of file diff --git a/includes/admin/core/packages/2.0.24/init.php b/includes/admin/core/packages/2.0.24/init.php new file mode 100644 index 00000000..ccf01dba --- /dev/null +++ b/includes/admin/core/packages/2.0.24/init.php @@ -0,0 +1,29 @@ + + + \ No newline at end of file diff --git a/includes/core/class-ajax-common.php b/includes/core/class-ajax-common.php index f71f6093..2563d215 100644 --- a/includes/core/class-ajax-common.php +++ b/includes/core/class-ajax-common.php @@ -32,15 +32,14 @@ if ( ! class_exists( 'um\core\AJAX_Common' ) ) { } - - add_action( 'wp_ajax_um_remove_file', array( UM()->files(), 'ajax_remove_file' ) ); add_action( 'wp_ajax_um_delete_profile_photo', array( UM()->profile(), 'ajax_delete_profile_photo' ) ); add_action( 'wp_ajax_um_delete_cover_photo', array( UM()->profile(), 'ajax_delete_cover_photo' ) ); add_action( 'wp_ajax_um_select_options', array( UM()->form(), 'ajax_select_options' ) ); add_action( 'wp_ajax_um_ajax_paginate', array( UM()->query(), 'ajax_paginate' ) ); add_action( 'wp_ajax_um_muted_action', array( UM()->form(), 'ajax_muted_action' ) ); + + add_action( 'wp_ajax_um_remove_file', array( UM()->files(), 'ajax_remove_file' ) ); add_action( 'wp_ajax_nopriv_um_remove_file', array( UM()->files(), 'ajax_remove_file' ) ); - add_action( 'wp_ajax_um_remove_file', array( UM()->files(), 'ajax_remove_file' ) ); add_action( 'wp_ajax_nopriv_um_fileupload', array( UM()->files(), 'ajax_file_upload' ) ); add_action( 'wp_ajax_um_fileupload', array( UM()->files(), 'ajax_file_upload' ) ); diff --git a/includes/core/class-enqueue.php b/includes/core/class-enqueue.php index d2891525..f1a170d6 100644 --- a/includes/core/class-enqueue.php +++ b/includes/core/class-enqueue.php @@ -137,12 +137,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { */ $localize_data = apply_filters( 'um_enqueue_localize_data', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ), - 'remove_file' => UM()->get_ajax_route( 'um\core\Files', 'ajax_remove_file' ), - 'delete_profile_photo' => UM()->get_ajax_route( 'um\core\Profile', 'ajax_delete_profile_photo' ), - 'delete_cover_photo' => UM()->get_ajax_route( 'um\core\Profile', 'ajax_delete_cover_photo' ), - 'resize_image' => UM()->get_ajax_route( 'um\core\Files', 'ajax_resize_image' ), 'muted_action' => UM()->get_ajax_route( 'um\core\Form', 'ajax_muted_action' ), - 'ajax_paginate' => UM()->get_ajax_route( 'um\core\Query', 'ajax_paginate' ), 'ajax_select_options' => UM()->get_ajax_route( 'um\core\Form', 'ajax_select_options' ), ) ); From 33c23bd4c277a4c3b2b77f4ca989393591205630 Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Wed, 15 Aug 2018 10:09:34 +0300 Subject: [PATCH 2/3] - changed dependencies notice; --- includes/class-dependencies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/class-dependencies.php b/includes/class-dependencies.php index 731a4487..4d31beef 100644 --- a/includes/class-dependencies.php +++ b/includes/class-dependencies.php @@ -163,7 +163,7 @@ if ( ! class_exists( 'um\Dependencies' ) ) { } elseif ( empty( $this->ext_required_version[$ext_key] ) || version_compare( $this->ext_required_version[$ext_key], $ext_ver, '>' ) ) { $message = sprintf( __( 'Sorry, but this version of %s does not work with extension "%s" %s version.', 'ultimate-member' ), ultimatemember_plugin_name, $ext_title, $ext_ver ) . '
' . - sprintf( __( 'Please update extension "%s" to the latest version, or install previous versions of %s.', 'ultimate-member' ), $ext_title, ultimatemember_plugin_name ); + sprintf( __( 'Please update extension "%s" to the latest version.', 'ultimate-member' ), $ext_title ); } return $message; From c539b4deab29a580967acd902b3774c90db77858 Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Wed, 15 Aug 2018 12:46:28 +0300 Subject: [PATCH 3/3] - purge temp files dir upgrade; --- README.md | 4 +-- .../admin/core/packages/2.0.24/functions.php | 25 +++---------------- includes/admin/core/packages/2.0.24/hooks.php | 2 +- includes/admin/core/packages/2.0.24/init.php | 4 +-- readme.txt | 7 +++++- ultimate-member.php | 2 +- 6 files changed, 15 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 7f6f208d..393a3d49 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Ultimate Member is the #1 user profile & membership plugin for WordPress. The pl | Latest Version |Requires at least|Stable Tag| | :------------: |:------------:|:------------:| -| 2.0.23 | WordPress 4.9 or higher| 2.0.23 | +| 2.0.24 | WordPress 4.9 or higher| 2.0.24 | Features of the plugin include: @@ -48,7 +48,7 @@ GNU Version 2 or Any Later Version Releases ==================== -[Official Release Version: 2.0.23](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.23). +[Official Release Version: 2.0.24](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.24). [Official Release Version: 1.3.88](https://github.com/ultimatemember/ultimatemember/releases). diff --git a/includes/admin/core/packages/2.0.24/functions.php b/includes/admin/core/packages/2.0.24/functions.php index 083186a1..b379280a 100644 --- a/includes/admin/core/packages/2.0.24/functions.php +++ b/includes/admin/core/packages/2.0.24/functions.php @@ -1,29 +1,10 @@ query( $wpdb->prepare( - "UPDATE {$wpdb->usermeta} - SET meta_value = CASE - WHEN meta_value = %s THEN 'Everyone' - WHEN meta_value = %s THEN 'Only me' - WHEN meta_value = %s THEN 'followed' - WHEN meta_value = %s THEN 'follower' - WHEN meta_value = %s THEN 'friends' - END - WHERE meta_key = 'profile_privacy'", - __( 'Everyone', 'ultimate-member' ), - __( 'Only me', 'ultimate-member' ), - __( 'Only people I follow can view my profile', 'um-followers' ), - __( 'Followers', 'um-followers' ), - __( 'Friends only', 'um-friends' ) - ) ); - - UM()->user()->remove_cache_all_users(); + UM()->files()->remove_dir( UM()->files()->upload_temp ); update_option( 'um_last_version_upgrade', '2.0.24' ); - wp_send_json_success( array( 'message' => __( 'Privacy Settings was upgraded successfully', 'ultimate-member' ) ) ); + wp_send_json_success( array( 'message' => __( 'Temporary dir was purged successfully', 'ultimate-member' ) ) ); } \ No newline at end of file diff --git a/includes/admin/core/packages/2.0.24/hooks.php b/includes/admin/core/packages/2.0.24/hooks.php index 307a16ca..d1820614 100644 --- a/includes/admin/core/packages/2.0.24/hooks.php +++ b/includes/admin/core/packages/2.0.24/hooks.php @@ -1,5 +1,5 @@ 'privacy2024', + 'tempfolder2024' => 'tempfolder2024', ); \ No newline at end of file diff --git a/includes/admin/core/packages/2.0.24/init.php b/includes/admin/core/packages/2.0.24/init.php index ccf01dba..8d97f6be 100644 --- a/includes/admin/core/packages/2.0.24/init.php +++ b/includes/admin/core/packages/2.0.24/init.php @@ -3,14 +3,14 @@