Merge remote-tracking branch 'remotes/origin/fix_reset_pass_hash_after_approve'

# Conflicts:
#	includes/core/class-password.php
#	includes/core/um-filters-profile.php
#	includes/um-short-functions.php
This commit is contained in:
nikitasinelnikov
2019-05-07 10:55:00 +03:00
11 changed files with 178 additions and 74 deletions
+41
View File
@@ -380,6 +380,9 @@ if ( ! class_exists( 'um\core\Mail' ) ) {
*/
$message = apply_filters( 'um_email_send_message_content', $message, $slug, $args );
add_filter( 'um_template_tags_patterns_hook', array( &$this, 'add_placeholder' ), 10, 1 );
add_filter( 'um_template_tags_replaces_hook', array( &$this, 'add_replace_placeholder' ), 10, 1 );
// Convert tags in email template
return um_convert_tags( $message, $args );
}
@@ -427,6 +430,10 @@ if ( ! class_exists( 'um\core\Mail' ) ) {
* }
* ?>
*/
add_filter( 'um_template_tags_patterns_hook', array( UM()->mail(), 'add_placeholder' ), 10, 1 );
add_filter( 'um_template_tags_replaces_hook', array( UM()->mail(), 'add_replace_placeholder' ), 10, 1 );
$subject = apply_filters( 'um_email_send_subject', UM()->options()->get( $template . '_sub' ), $template );
$this->subject = um_convert_tags( $subject , $args );
@@ -568,5 +575,39 @@ if ( ! class_exists( 'um\core\Mail' ) ) {
return false;
}
}
/**
* UM Placeholders for site url, admin email, submit registration
*
* @param $placeholders
*
* @return array
*/
function add_placeholder( $placeholders ) {
$placeholders[] = '{site_url}';
$placeholders[] = '{admin_email}';
$placeholders[] = '{submitted_registration}';
$placeholders[] = '{login_url}';
$placeholders[] = '{password}';
return $placeholders;
}
/**
* UM Replace Placeholders for site url, admin email, submit registration
*
* @param $replace_placeholders
*
* @return array
*/
function add_replace_placeholder( $replace_placeholders ) {
$replace_placeholders[] = get_bloginfo( 'url' );
$replace_placeholders[] = um_admin_email();
$replace_placeholders[] = um_user_submitted_registration();
$replace_placeholders[] = um_get_core_page( 'login' );
$replace_placeholders[] = esc_html__( 'Your set password', 'ultimate-member' );
return $replace_placeholders;
}
}
}
+2
View File
@@ -684,6 +684,7 @@ if ( ! class_exists( 'um\core\Password' ) ) {
*/
function add_placeholder( $placeholders ) {
$placeholders[] = '{password_reset_link}';
$placeholders[] = '{password}';
return $placeholders;
}
@@ -697,6 +698,7 @@ if ( ! class_exists( 'um\core\Password' ) ) {
*/
function add_replace_placeholder( $replace_placeholders ) {
$replace_placeholders[] = um_user( 'password_reset_link' );
$replace_placeholders[] = esc_html__( 'Your set password', 'ultimate-member' );
return $replace_placeholders;
}
}
+31
View File
@@ -394,5 +394,36 @@ if ( ! class_exists( 'um\core\Profile' ) ) {
<?php
}
/**
* UM Placeholders for user link, avatar link
*
* @param $placeholders
*
* @return array
*/
function add_placeholder( $placeholders ) {
$placeholders[] = '{user_profile_link}';
$placeholders[] = '{user_avatar_url}';
$placeholders[] = '{password}';
return $placeholders;
}
/**
* UM Replace Placeholders for user link, avatar link
*
* @param $replace_placeholders
*
* @return array
*/
function add_replace_placeholder( $replace_placeholders ) {
$replace_placeholders[] = um_get_user_avatar_url();
$replace_placeholders[] = um_user_profile_url();
$replace_placeholders[] = esc_html__( 'Your set password', 'ultimate-member' );
return $replace_placeholders;
}
}
}
+33
View File
@@ -983,6 +983,8 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
* @return mixed|string
*/
function convert_locker_tags( $str ) {
add_filter( 'um_template_tags_patterns_hook', array( &$this, 'add_placeholder' ), 10, 1 );
add_filter( 'um_template_tags_replaces_hook', array( &$this, 'add_replace_placeholder' ), 10, 1 );
return um_convert_tags( $str, array(), false );
}
@@ -1002,6 +1004,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
'{display_name}',
'{user_avatar_small}',
'{username}',
'{nickname}',
);
/**
@@ -1047,6 +1050,10 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
$value = um_user( 'user_login' );
}
if ( $usermeta == 'nickname' ) {
$value = um_profile( 'nickname' );
}
/**
* UM hook
*
@@ -1158,5 +1165,31 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
return $template;
}
/**
* UM Placeholders for login referrer
*
* @param $placeholders
*
* @return array
*/
function add_placeholder( $placeholders ) {
$placeholders[] = '{login_referrer}';
return $placeholders;
}
/**
* UM Replace Placeholders for login referrer
*
* @param $replace_placeholders
*
* @return array
*/
function add_replace_placeholder( $replace_placeholders ) {
$replace_placeholders[] = um_dynamic_login_page_redirect();
return $replace_placeholders;
}
}
}
+1 -1
View File
@@ -482,8 +482,8 @@ function um_profile_dynamic_meta_desc() {
$content = um_convert_tags( UM()->options()->get( 'profile_desc' ) );
$user_id = um_user( 'ID' );
$url = um_user_profile_url();
$url = um_user_profile_url();
$avatar = um_get_user_avatar_url( $user_id, 'original' );
um_reset_user(); ?>
+1 -9
View File
@@ -18,15 +18,7 @@ function um_dynamic_user_profile_pagetitle( $title, $sep = '' ) {
um_fetch_user( um_get_requested_user() );
$search = array(
'{display_name}',
'{site_name}'
);
$replace = array(
um_user( 'display_name' ),
UM()->options()->get( 'site_name' )
);
$profile_title = str_replace( $search, $replace, $profile_title );
$profile_title = um_convert_tags( $profile_title );
$title = $profile_title;
+2 -16
View File
@@ -108,6 +108,7 @@ function um_clean_user_basename( $value ) {
* @return array
*/
function um_replace_placeholders() {
$search = array(
'{display_name}',
'{first_name}',
@@ -115,18 +116,11 @@ function um_replace_placeholders() {
'{gender}',
'{username}',
'{email}',
'{password}',
'{login_url}',
'{login_referrer}',
'{site_name}',
'{site_url}',
'{admin_email}',
'{user_profile_link}',
'{user_account_link}',
'{submitted_registration}',
'{user_avatar_url}',
);
/**
* UM hook
*
@@ -157,16 +151,8 @@ function um_replace_placeholders() {
um_user( 'gender' ),
um_user( 'user_login' ),
um_user( 'user_email' ),
um_user( '_um_cool_but_hard_to_guess_plain_pw' ),
um_get_core_page( 'login' ),
um_dynamic_login_page_redirect(),
UM()->options()->get( 'site_name' ),
get_bloginfo( 'url' ),
um_admin_email(),
um_user_profile_url(),
um_get_core_page( 'account' ),
um_user_submitted_registration(),
um_get_user_avatar_url(),
);
/**
+5
View File
@@ -6351,6 +6351,11 @@ msgstr ""
msgid "Comments"
msgstr ""
#: includes/core/class-profile.php:424 includes/core/class-mail.php:609
#: includes/core/class-password.php:701
msgid "Your set password"
msgstr ""
#: includes/core/class-rest-api.php:217
msgid "You must specify both a token and API key!"
msgstr ""
+52 -47
View File
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Ultimate Member\n"
"POT-Creation-Date: 2019-04-23 11:40+0300\n"
"PO-Revision-Date: 2019-04-23 11:40+0300\n"
"POT-Creation-Date: 2019-05-07 10:52+0300\n"
"PO-Revision-Date: 2019-05-07 10:52+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: en_US\n"
@@ -158,7 +158,7 @@ msgstr ""
#: includes/admin/core/class-admin-builder.php:1143
#: includes/core/class-form.php:155 includes/core/class-form.php:328
#: includes/core/class-password.php:531
#: includes/core/class-password.php:533
msgid "This is not possible for security reasons."
msgstr ""
@@ -253,16 +253,16 @@ msgstr ""
msgid "Yes"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:183
#: includes/admin/core/class-admin-enqueue.php:184
msgid "e.g. Member Directory"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:185
#: includes/admin/core/class-admin-enqueue.php:186
msgid "e.g. New Registration Form"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:230
#: includes/admin/core/class-admin-enqueue.php:261
#: includes/admin/core/class-admin-enqueue.php:231
#: includes/admin/core/class-admin-enqueue.php:262
#: includes/admin/core/class-admin-forms.php:832
#: includes/admin/core/class-admin-forms.php:846
#: includes/admin/core/class-admin-forms.php:951
@@ -272,39 +272,39 @@ msgstr ""
msgid "Remove"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:231
#: includes/admin/core/class-admin-enqueue.php:262
#: includes/admin/core/class-admin-enqueue.php:232
#: includes/admin/core/class-admin-enqueue.php:263
#: includes/admin/core/class-admin-forms.php:1028
msgid "Select"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:259
#: includes/admin/core/class-admin-enqueue.php:260
msgid "Are sure, maybe some settings not saved"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:485
#: includes/admin/core/class-admin-enqueue.php:486
#: includes/core/class-builtin.php:698 includes/core/class-builtin.php:701
#: includes/core/class-builtin.php:1155 includes/core/class-builtin.php:1158
msgid "Password"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:489
#: includes/admin/core/class-admin-enqueue.php:490
#: includes/core/class-account.php:104
msgid "Privacy"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:493
#: includes/admin/core/class-admin-enqueue.php:494
#: includes/core/class-account.php:110
msgid "Notifications"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:497
#: includes/admin/core/class-admin-enqueue.php:498
#: includes/admin/core/list-tables/roles-list-table.php:338
#: includes/admin/core/list-tables/roles-list-table.php:406
msgid "Delete"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:547
#: includes/admin/core/class-admin-enqueue.php:548
msgid "Ultimate Member Blocks"
msgstr ""
@@ -2624,78 +2624,78 @@ msgstr ""
msgid "Run"
msgstr ""
#: includes/admin/core/class-admin-users.php:109
#: includes/admin/core/class-admin-users.php:112
#: includes/admin/core/class-admin-users.php:116
#: includes/admin/core/class-admin-users.php:119
msgid "UM Action"
msgstr ""
#: includes/admin/core/class-admin-users.php:116
#: includes/admin/core/class-admin-users.php:123
#: includes/core/class-fields.php:2332
msgid "Apply"
msgstr ""
#: includes/admin/core/class-admin-users.php:158
#: includes/admin/core/class-admin-users.php:165
#: includes/core/um-filters-user.php:20 includes/core/um-filters-user.php:25
msgid "Approve Membership"
msgstr ""
#: includes/admin/core/class-admin-users.php:161
#: includes/admin/core/class-admin-users.php:168
#: includes/core/um-filters-user.php:21
msgid "Reject Membership"
msgstr ""
#: includes/admin/core/class-admin-users.php:164
#: includes/admin/core/class-admin-users.php:171
#: includes/core/um-filters-user.php:29
msgid "Put as Pending Review"
msgstr ""
#: includes/admin/core/class-admin-users.php:167
#: includes/admin/core/class-admin-users.php:174
#: includes/core/um-filters-user.php:33
msgid "Resend Activation E-mail"
msgstr ""
#: includes/admin/core/class-admin-users.php:170
#: includes/admin/core/class-admin-users.php:177
msgid "Deactivate"
msgstr ""
#: includes/admin/core/class-admin-users.php:173
#: includes/admin/core/class-admin-users.php:180
msgid "Reactivate"
msgstr ""
#: includes/admin/core/class-admin-users.php:196 templates/account.php:38
#: includes/admin/core/class-admin-users.php:203 templates/account.php:38
#: templates/account.php:62
msgid "View profile"
msgstr ""
#: includes/admin/core/class-admin-users.php:200
#: includes/admin/core/class-admin-users.php:207
msgid "Info"
msgstr ""
#: includes/admin/core/class-admin-users.php:305
#: includes/admin/core/class-admin-users.php:312
#: includes/admin/templates/dashboard/users.php:11
#: includes/core/class-user.php:819
msgid "Approved"
msgstr ""
#: includes/admin/core/class-admin-users.php:306
#: includes/admin/core/class-admin-users.php:313
msgid "Pending review"
msgstr ""
#: includes/admin/core/class-admin-users.php:307
#: includes/admin/core/class-admin-users.php:314
msgid "Waiting e-mail confirmation"
msgstr ""
#: includes/admin/core/class-admin-users.php:308
#: includes/admin/core/class-admin-users.php:315
#: includes/admin/templates/dashboard/users.php:37
msgid "Inactive"
msgstr ""
#: includes/admin/core/class-admin-users.php:309
#: includes/admin/core/class-admin-users.php:316
#: includes/admin/templates/dashboard/users.php:16
msgid "Rejected"
msgstr ""
#: includes/admin/core/class-admin-users.php:369
#: includes/admin/core/class-admin-users.php:376
msgid "You do not have enough permissions to do that."
msgstr ""
@@ -4250,7 +4250,7 @@ msgstr ""
msgid "You must add a shortcode to the content area"
msgstr ""
#: includes/core/class-builtin.php:663 includes/core/class-user.php:1541
#: includes/core/class-builtin.php:663 includes/core/class-user.php:1545
msgid "Only me"
msgstr ""
@@ -6441,44 +6441,49 @@ msgstr ""
msgid "You can not edit this user"
msgstr ""
#: includes/core/class-password.php:456
#: includes/core/class-mail.php:609 includes/core/class-password.php:701
#: includes/core/class-profile.php:424
msgid "Your set password"
msgstr ""
#: includes/core/class-password.php:458
msgid "Please provide your username or email"
msgstr ""
#: includes/core/class-password.php:460
#: includes/core/class-password.php:462
msgid "We can't find an account registered with that address or username"
msgstr ""
#: includes/core/class-password.php:479
#: includes/core/class-password.php:481
msgid ""
"You have reached the limit for requesting password change for this user "
"already. Contact support if you cannot open the email"
msgstr ""
#: includes/core/class-password.php:535
#: includes/core/class-password.php:537
msgid "You must enter a new password"
msgstr ""
#: includes/core/class-password.php:541 includes/core/um-actions-account.php:59
#: includes/core/class-password.php:543 includes/core/um-actions-account.php:59
msgid "Your password must contain at least 8 characters"
msgstr ""
#: includes/core/class-password.php:545 includes/core/um-actions-account.php:63
#: includes/core/class-password.php:547 includes/core/um-actions-account.php:63
msgid "Your password must contain less than 30 characters"
msgstr ""
#: includes/core/class-password.php:549 includes/core/um-actions-account.php:67
#: includes/core/class-password.php:551 includes/core/um-actions-account.php:67
#: includes/core/um-actions-form.php:476
msgid ""
"Your password must contain at least one lowercase letter, one capital letter "
"and one number"
msgstr ""
#: includes/core/class-password.php:555
#: includes/core/class-password.php:557
msgid "You must confirm your new password"
msgstr ""
#: includes/core/class-password.php:559 includes/core/um-actions-form.php:485
#: includes/core/class-password.php:561 includes/core/um-actions-form.php:485
msgid "Your passwords do not match"
msgstr ""
@@ -6676,12 +6681,12 @@ msgid "Super administrators can not be modified."
msgstr ""
#: includes/core/um-actions-core.php:89 includes/core/um-actions-core.php:100
#: includes/core/um-actions-core.php:110 includes/core/um-actions-core.php:120
#: includes/core/um-actions-core.php:130
#: includes/core/um-actions-core.php:113 includes/core/um-actions-core.php:123
#: includes/core/um-actions-core.php:136
msgid "You do not have permission to make this action."
msgstr ""
#: includes/core/um-actions-core.php:140
#: includes/core/um-actions-core.php:146
msgid "You do not have permission to delete this user."
msgstr ""
@@ -7021,11 +7026,11 @@ msgstr ""
msgid "Login as this user"
msgstr ""
#: includes/um-short-functions.php:724
#: includes/um-short-functions.php:741
msgid "date submitted"
msgstr ""
#: includes/um-short-functions.php:730
#: includes/um-short-functions.php:747
msgid "(empty)"
msgstr ""
+5
View File
@@ -6401,6 +6401,11 @@ msgstr ""
msgid "Comments"
msgstr ""
#: includes/core/class-profile.php:424 includes/core/class-mail.php:609
#: includes/core/class-password.php:701
msgid "Your set password"
msgstr ""
#: includes/core/class-rest-api.php:217
msgid "You must specify both a token and API key!"
msgstr ""
+5 -1
View File
@@ -133,11 +133,12 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
= Important: UM2.0+ is a significant update to the code base from 1.3.88. Please make sure you take a full-site backup with restore point before updating the plugin =
= 2.0.44: April 23, 2019 =
= 2.0.44: May 07, 2019 =
* Enhancements:
- Added automatically template saver when you upgrade your theme
- Added default value for Date and Time user profile fields
- Updated Scroll library
* Bugfixes:
- Added nocache headers to reset password form
@@ -151,6 +152,9 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
- Restriction options for Terms and access on front-end
- Plugin/Theme upgrader
- Remove duplicate data 'user_login' from metadata
- Replace placeholders duplicates
- Password Reset link regeneration
- Fixed issues with scroll on mobile devices
* Deprecated:
- "Is Account page?" and "Is User page?" options for WPML integration ( because WPML translations works properly )