From bb948b59afba833feba982ad719a022b088cf593 Mon Sep 17 00:00:00 2001 From: nikitasinelnikov Date: Sun, 23 Feb 2020 23:34:11 +0200 Subject: [PATCH] - fixed validation URLs; - code formatting; --- README.md | 3 +- includes/core/class-validation.php | 18 +-- includes/core/um-actions-form.php | 189 ++++++++++++++--------------- languages/ultimate-member-en_US.po | 102 +++++++++------- readme.txt | 4 +- 5 files changed, 158 insertions(+), 158 deletions(-) diff --git a/README.md b/README.md index b49b9cf2..c73f1e78 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,7 @@ Support requests in issues on this repository will be closed on sight. GNU Version 2 or Any Later Version ## Releases -[Official Release Version: 2.1.3](https://github.com/ultimatemember/ultimatemember/releases/tag/2.1.3). -[Official Release Candidate Version: 2.1.4-RC1](https://github.com/ultimatemember/ultimatemember/releases/tag/2.1.4-rc.1). +[Official Release Version: 2.1.4](https://github.com/ultimatemember/ultimatemember/releases/tag/2.1.4). ## Changelog [ From v1.0.0 to latest version ](https://wordpress.org/plugins/ultimate-member/changelog/). diff --git a/includes/core/class-validation.php b/includes/core/class-validation.php index 175b83ca..760e7c23 100644 --- a/includes/core/class-validation.php +++ b/includes/core/class-validation.php @@ -286,29 +286,15 @@ if ( ! class_exists( 'um\core\Validation' ) ) { * * @return bool */ - function is_url( $url, $social = false ){ + function is_url( $url, $social = false ) { if ( ! $url ) { return true; } if ( $social ) { - if ( ! filter_var( $url, FILTER_VALIDATE_URL ) && strstr( $url, $social ) ) { // starts with social requested + if ( strstr( $url, $social ) && '' != str_replace( $social, '', $url ) ) { return true; - } else { - - if ( filter_var( $url, FILTER_VALIDATE_URL ) && strstr( $url, $social ) ) { - return true; - } elseif ( preg_match( $this->regex_safe, $url ) ) { - - if ( strstr( $url, '.com' ) ) { - return false; - } else { - return true; - } - - } - } } else { diff --git a/includes/core/um-actions-form.php b/includes/core/um-actions-form.php index 501d30a6..6e17a832 100644 --- a/includes/core/um-actions-form.php +++ b/includes/core/um-actions-form.php @@ -445,21 +445,21 @@ function um_submit_form_errors_hook_( $args ) { } } - if ( isset( $array['type'] ) && $array['type'] == 'checkbox' && isset( $array['required'] ) && $array['required'] == 1 && !isset( $args[$key] ) ) { - UM()->form()->add_error($key, sprintf( __( '%s is required.', 'ultimate-member' ), $array['title'] ) ); + if ( isset( $array['type'] ) && $array['type'] == 'checkbox' && isset( $array['required'] ) && $array['required'] == 1 && ! isset( $args[ $key ] ) ) { + UM()->form()->add_error( $key, sprintf( __( '%s is required.', 'ultimate-member' ), $array['title'] ) ); } - if ( isset( $array['type'] ) && $array['type'] == 'radio' && isset( $array['required'] ) && $array['required'] == 1 && !isset( $args[$key] ) && !in_array($key, array('role_radio','role_select') ) ) { - UM()->form()->add_error($key, sprintf(__('%s is required.','ultimate-member'), $array['title'] ) ); + if ( isset( $array['type'] ) && $array['type'] == 'radio' && isset( $array['required'] ) && $array['required'] == 1 && ! isset( $args[ $key ] ) && ! in_array( $key, array( 'role_radio', 'role_select' ) ) ) { + UM()->form()->add_error( $key, sprintf( __( '%s is required.', 'ultimate-member'), $array['title'] ) ); } - if ( isset( $array['type'] ) && $array['type'] == 'multiselect' && isset( $array['required'] ) && $array['required'] == 1 && !isset( $args[$key] ) && !in_array($key, array('role_radio','role_select') ) ) { - UM()->form()->add_error($key, sprintf(__('%s is required.','ultimate-member'), $array['title'] ) ); + if ( isset( $array['type'] ) && $array['type'] == 'multiselect' && isset( $array['required'] ) && $array['required'] == 1 && ! isset( $args[ $key ] ) && ! in_array( $key, array( 'role_radio', 'role_select' ) ) ) { + UM()->form()->add_error( $key, sprintf( __( '%s is required.', 'ultimate-member' ), $array['title'] ) ); } if ( $key == 'role_select' || $key == 'role_radio' ) { - if ( isset( $array['required'] ) && $array['required'] == 1 && ( !isset( $args['role'] ) || empty( $args['role'] ) ) ) { - UM()->form()->add_error('role', __('Please specify account type.','ultimate-member') ); + if ( isset( $array['required'] ) && $array['required'] == 1 && ( ! isset( $args['role'] ) || empty( $args['role'] ) ) ) { + UM()->form()->add_error( 'role', __( 'Please specify account type.', 'ultimate-member' ) ); } } @@ -499,20 +499,20 @@ function um_submit_form_errors_hook_( $args ) { if ( isset( $args[ $key ] ) ) { if ( isset( $array['max_words'] ) && $array['max_words'] > 0 ) { - if ( str_word_count( $args[$key], 0, "éèàôù" ) > $array['max_words'] ) { - UM()->form()->add_error($key, sprintf(__('You are only allowed to enter a maximum of %s words','ultimate-member'), $array['max_words']) ); + if ( str_word_count( $args[ $key ], 0, "éèàôù" ) > $array['max_words'] ) { + UM()->form()->add_error( $key, sprintf( __( 'You are only allowed to enter a maximum of %s words', 'ultimate-member' ), $array['max_words'] ) ); } } if ( isset( $array['min_chars'] ) && $array['min_chars'] > 0 ) { - if ( $args[$key] && strlen( utf8_decode( $args[ $key ] ) ) < $array['min_chars'] ) { - UM()->form()->add_error($key, sprintf(__('Your %s must contain at least %s characters','ultimate-member'), $array['label'], $array['min_chars']) ); + if ( $args[ $key ] && strlen( utf8_decode( $args[ $key ] ) ) < $array['min_chars'] ) { + UM()->form()->add_error( $key, sprintf( __( 'Your %s must contain at least %s characters', 'ultimate-member' ), $array['label'], $array['min_chars'] ) ); } } if ( isset( $array['max_chars'] ) && $array['max_chars'] > 0 ) { - if ( $args[$key] && strlen( utf8_decode( $args[ $key ] ) ) > $array['max_chars'] ) { - UM()->form()->add_error($key, sprintf(__('Your %s must contain less than %s characters','ultimate-member'), $array['label'], $array['max_chars']) ); + if ( $args[ $key ] && strlen( utf8_decode( $args[ $key ] ) ) > $array['max_chars'] ) { + UM()->form()->add_error( $key, sprintf( __( 'Your %s must contain less than %s characters', 'ultimate-member' ), $array['label'], $array['max_chars'] ) ); } } @@ -520,52 +520,52 @@ function um_submit_form_errors_hook_( $args ) { if ( $profile_show_html_bio == 1 && $key !== 'description' ) { if ( isset( $array['html'] ) && $array['html'] == 0 ) { - if ( wp_strip_all_tags( $args[$key] ) != trim( $args[ $key ] ) ) { + if ( wp_strip_all_tags( $args[ $key ] ) != trim( $args[ $key ] ) ) { UM()->form()->add_error( $key, __( 'You can not use HTML tags here', 'ultimate-member' ) ); } } } if ( isset( $array['force_good_pass'] ) && $array['force_good_pass'] == 1 ) { - if ( ! UM()->validation()->strong_pass( $args[$key] ) ) { - UM()->form()->add_error($key, __('Your password must contain at least one lowercase letter, one capital letter and one number','ultimate-member') ); + if ( ! UM()->validation()->strong_pass( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __('Your password must contain at least one lowercase letter, one capital letter and one number', 'ultimate-member' ) ); } } if ( isset( $array['force_confirm_pass'] ) && $array['force_confirm_pass'] == 1 ) { - if ( $args[ 'confirm_' . $key] == '' && ! UM()->form()->has_error($key) ) { - UM()->form()->add_error( 'confirm_' . $key , __('Please confirm your password','ultimate-member') ); + if ( $args[ 'confirm_' . $key ] == '' && ! UM()->form()->has_error( $key ) ) { + UM()->form()->add_error( 'confirm_' . $key , __( 'Please confirm your password', 'ultimate-member' ) ); } - if ( $args[ 'confirm_' . $key] != $args[$key] && !UM()->form()->has_error($key) ) { - UM()->form()->add_error( 'confirm_' . $key , __('Your passwords do not match','ultimate-member') ); + if ( $args[ 'confirm_' . $key ] != $args[$key] && !UM()->form()->has_error( $key ) ) { + UM()->form()->add_error( 'confirm_' . $key , __( 'Your passwords do not match', 'ultimate-member' ) ); } } if ( isset( $array['min_selections'] ) && $array['min_selections'] > 0 ) { - if ( ( !isset($args[$key]) ) || ( isset( $args[$key] ) && is_array($args[$key]) && count( $args[$key] ) < $array['min_selections'] ) ) { - UM()->form()->add_error($key, sprintf(__('Please select at least %s choices','ultimate-member'), $array['min_selections'] ) ); + if ( ( ! isset( $args[ $key ] ) ) || ( isset( $args[ $key ] ) && is_array( $args[ $key ] ) && count( $args[ $key ] ) < $array['min_selections'] ) ) { + UM()->form()->add_error($key, sprintf( __( 'Please select at least %s choices', 'ultimate-member' ), $array['min_selections'] ) ); } } if ( isset( $array['max_selections'] ) && $array['max_selections'] > 0 ) { - if ( isset( $args[$key] ) && is_array($args[$key]) && count( $args[$key] ) > $array['max_selections'] ) { - UM()->form()->add_error($key, sprintf(__('You can only select up to %s choices','ultimate-member'), $array['max_selections'] ) ); + if ( isset( $args[ $key ] ) && is_array( $args[ $key ] ) && count( $args[ $key ] ) > $array['max_selections'] ) { + UM()->form()->add_error( $key, sprintf( __( 'You can only select up to %s choices', 'ultimate-member' ), $array['max_selections'] ) ); } } if ( isset( $array['min'] ) && is_numeric( $args[ $key ] ) ) { if ( isset( $args[ $key ] ) && $args[ $key ] < $array['min'] ) { - UM()->form()->add_error( $key, sprintf(__('Minimum number limit is %s','ultimate-member'), $array['min'] ) ); + UM()->form()->add_error( $key, sprintf( __( 'Minimum number limit is %s', 'ultimate-member' ), $array['min'] ) ); } } if ( isset( $array['max'] ) && is_numeric( $args[ $key ] ) ) { if ( isset( $args[ $key ] ) && $args[ $key ] > $array['max'] ) { - UM()->form()->add_error( $key, sprintf(__('Maximum number limit is %s','ultimate-member'), $array['max'] ) ); + UM()->form()->add_error( $key, sprintf( __( 'Maximum number limit is %s', 'ultimate-member' ), $array['max'] ) ); } } - if ( isset( $array['validate'] ) && !empty( $array['validate'] ) ) { + if ( ! empty( $array['validate'] ) ) { switch( $array['validate'] ) { @@ -596,74 +596,75 @@ function um_submit_form_errors_hook_( $args ) { break; case 'numeric': - if ( $args[$key] && !is_numeric( $args[$key] ) ) { - UM()->form()->add_error($key, __('Please enter numbers only in this field','ultimate-member') ); + if ( $args[ $key ] && ! is_numeric( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __( 'Please enter numbers only in this field', 'ultimate-member' ) ); } break; case 'phone_number': - if ( ! UM()->validation()->is_phone_number( $args[$key] ) ) { - UM()->form()->add_error($key, __('Please enter a valid phone number','ultimate-member') ); + if ( ! UM()->validation()->is_phone_number( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __( 'Please enter a valid phone number', 'ultimate-member' ) ); } break; case 'youtube_url': - if ( ! UM()->validation()->is_url( $args[$key], 'youtube.com' ) ) { - UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) ); + if ( ! UM()->validation()->is_url( $args[ $key ], 'youtube.com' ) ) { + UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) ); } break; case 'soundcloud_url': - if ( ! UM()->validation()->is_url( $args[$key], 'soundcloud.com' ) ) { - UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) ); + if ( ! UM()->validation()->is_url( $args[ $key ], 'soundcloud.com' ) ) { + UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) ); } break; case 'facebook_url': - if ( ! UM()->validation()->is_url( $args[$key], 'facebook.com' ) ) { - UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) ); + if ( ! UM()->validation()->is_url( $args[ $key ], 'facebook.com' ) ) { + UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) ); } break; case 'twitter_url': - if ( ! UM()->validation()->is_url( $args[$key], 'twitter.com' ) ) { - UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) ); + if ( ! UM()->validation()->is_url( $args[ $key ], 'twitter.com' ) ) { + UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) ); } break; case 'instagram_url': - if ( ! UM()->validation()->is_url( $args[$key], 'instagram.com' ) ) { - UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) ); + + if ( ! UM()->validation()->is_url( $args[ $key ], 'instagram.com' ) ) { + UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s profile URL', 'ultimate-member' ), $array['label'] ) ); } break; case 'google_url': - if ( ! UM()->validation()->is_url( $args[$key], 'plus.google.com' ) ) { - UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) ); + if ( ! UM()->validation()->is_url( $args[ $key ], 'plus.google.com' ) ) { + UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) ); } break; case 'linkedin_url': - if ( ! UM()->validation()->is_url( $args[$key], 'linkedin.com' ) ) { - UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) ); + if ( ! UM()->validation()->is_url( $args[ $key ], 'linkedin.com' ) ) { + UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) ); } break; case 'vk_url': - if ( ! UM()->validation()->is_url( $args[$key], 'vk.com' ) ) { - UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) ); + if ( ! UM()->validation()->is_url( $args[ $key ], 'vk.com' ) ) { + UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) ); } break; case 'url': - if ( ! UM()->validation()->is_url( $args[$key] ) ) { - UM()->form()->add_error($key, __('Please enter a valid URL','ultimate-member') ); + if ( ! UM()->validation()->is_url( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __( 'Please enter a valid URL', 'ultimate-member' ) ); } break; case 'skype': - if ( ! UM()->validation()->is_url( $args[$key], 'skype.com' ) ) { - UM()->form()->add_error($key, sprintf(__('Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) ); + if ( ! UM()->validation()->is_url( $args[ $key ], 'skype.com' ) ) { + UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) ); } break; @@ -675,7 +676,7 @@ function um_submit_form_errors_hook_( $args ) { UM()->form()->add_error( $key, __( 'Your username is already taken', 'ultimate-member' ) ); } elseif ( is_email( $args[ $key ] ) ) { UM()->form()->add_error( $key, __( 'Username cannot be an email', 'ultimate-member' ) ); - } elseif ( ! UM()->validation()->safe_username( $args[$key] ) ) { + } elseif ( ! UM()->validation()->safe_username( $args[ $key ] ) ) { UM()->form()->add_error( $key, __( 'Your username contains invalid characters', 'ultimate-member' ) ); } @@ -683,14 +684,14 @@ function um_submit_form_errors_hook_( $args ) { case 'unique_username_or_email': - if ( $args[$key] == '' ) { - UM()->form()->add_error($key, __('You must provide a username','ultimate-member') ); - } else if ( $mode == 'register' && username_exists( sanitize_user( $args[$key] ) ) ) { - UM()->form()->add_error($key, __('Your username is already taken','ultimate-member') ); - } else if ( $mode == 'register' && email_exists( $args[$key] ) ) { - UM()->form()->add_error($key, __('This email is already linked to an existing account','ultimate-member') ); - } else if ( ! UM()->validation()->safe_username( $args[$key] ) ) { - UM()->form()->add_error($key, __('Your username contains invalid characters','ultimate-member') ); + if ( $args[ $key ] == '' ) { + UM()->form()->add_error( $key, __( 'You must provide a username', 'ultimate-member' ) ); + } elseif ( $mode == 'register' && username_exists( sanitize_user( $args[ $key ] ) ) ) { + UM()->form()->add_error( $key, __( 'Your username is already taken', 'ultimate-member' ) ); + } elseif ( $mode == 'register' && email_exists( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __( 'This email is already linked to an existing account', 'ultimate-member' ) ); + } elseif ( ! UM()->validation()->safe_username( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __( 'Your username contains invalid characters', 'ultimate-member' ) ); } break; @@ -699,43 +700,42 @@ function um_submit_form_errors_hook_( $args ) { $args[ $key ] = trim( $args[ $key ] ); - if ( in_array( $key, array('user_email') ) ) { + if ( in_array( $key, array( 'user_email' ) ) ) { - if( ! isset( $args['user_id'] ) ){ + if ( ! isset( $args['user_id'] ) ){ $args['user_id'] = um_get_requested_user(); } $email_exists = email_exists( $args[ $key ] ); - if ( $args[ $key ] == '' && in_array( $key, array('user_email') ) ) { - UM()->form()->add_error( $key, __('You must provide your email','ultimate-member') ); - } else if ( in_array( $mode, array('register') ) && $email_exists ) { - UM()->form()->add_error($key, __('This email is already linked to an existing account','ultimate-member') ); - } else if ( in_array( $mode, array('profile') ) && $email_exists && $email_exists != $args['user_id'] ) { - UM()->form()->add_error( $key, __('This email is already linked to an existing account','ultimate-member') ); - } else if ( !is_email( $args[ $key ] ) ) { - UM()->form()->add_error( $key, __('This is not a valid email','ultimate-member') ); - } else if ( ! UM()->validation()->safe_username( $args[ $key ] ) ) { - UM()->form()->add_error( $key, __('Your email contains invalid characters','ultimate-member') ); + if ( $args[ $key ] == '' && in_array( $key, array( 'user_email' ) ) ) { + UM()->form()->add_error( $key, __( 'You must provide your email', 'ultimate-member' ) ); + } elseif ( in_array( $mode, array( 'register' ) ) && $email_exists ) { + UM()->form()->add_error( $key, __( 'This email is already linked to an existing account', 'ultimate-member' ) ); + } elseif ( in_array( $mode, array( 'profile' ) ) && $email_exists && $email_exists != $args['user_id'] ) { + UM()->form()->add_error( $key, __( 'This email is already linked to an existing account', 'ultimate-member' ) ); + } elseif ( !is_email( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __( 'This is not a valid email', 'ultimate-member') ); + } elseif ( ! UM()->validation()->safe_username( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __( 'Your email contains invalid characters', 'ultimate-member' ) ); } } else { - if ( $args[ $key ] != '' && !is_email( $args[ $key ] ) ) { - UM()->form()->add_error( $key, __('This is not a valid email','ultimate-member') ); - } else if ( $args[ $key ] != '' && email_exists( $args[ $key ] ) ) { - UM()->form()->add_error($key, __('This email is already linked to an existing account','ultimate-member') ); - } else if ( $args[ $key ] != '' ) { - - $users = get_users('meta_value='.$args[ $key ]); + if ( $args[ $key ] != '' && ! is_email( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __( 'This is not a valid email', 'ultimate-member' ) ); + } elseif ( $args[ $key ] != '' && email_exists( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __( 'This email is already linked to an existing account', 'ultimate-member' ) ); + } elseif ( $args[ $key ] != '' ) { + + $users = get_users( 'meta_value=' . $args[ $key ] ); foreach ( $users as $user ) { - if( $user->ID != $args['user_id'] ){ - UM()->form()->add_error( $key, __('This email is already linked to an existing account','ultimate-member') ); + if ( $user->ID != $args['user_id'] ) { + UM()->form()->add_error( $key, __( 'This email is already linked to an existing account', 'ultimate-member' ) ); } } - } } @@ -746,28 +746,27 @@ function um_submit_form_errors_hook_( $args ) { $args[ $key ] = trim( $args[ $key ] ); - if ( $args[ $key ] != '' && !is_email( $args[ $key ] ) ) { - UM()->form()->add_error( $key, __('This is not a valid email','ultimate-member') ); - } - + if ( $args[ $key ] != '' && ! is_email( $args[ $key ] ) ) { + UM()->form()->add_error( $key, __( 'This is not a valid email', 'ultimate-member' ) ); + } break; case 'unique_value': - if ( $args[$key] != '' ) { + if ( $args[ $key ] != '' ) { $args_unique_meta = array( - 'meta_key' => $key, - 'meta_value' => $args[ $key ], - 'compare' => '=', - 'exclude' => array( $args['user_id'] ), + 'meta_key' => $key, + 'meta_value' => $args[ $key ], + 'compare' => '=', + 'exclude' => array( $args['user_id'] ), ); $meta_key_exists = get_users( $args_unique_meta ); if ( $meta_key_exists ) { - UM()->form()->add_error( $key , __('You must provide a unique value','ultimate-member') ); + UM()->form()->add_error( $key , __( 'You must provide a unique value', 'ultimate-member' ) ); } } break; @@ -788,8 +787,8 @@ function um_submit_form_errors_hook_( $args ) { if ( $args[ $key ] != '' ) { - if ( ! ctype_lower( str_replace(' ', '',$args[$key] ) ) ){ - UM()->form()->add_error( $key , __('You must provide lowercase letters.','ultimate-member') ); + if ( ! ctype_lower( str_replace(' ', '', $args[ $key ] ) ) ) { + UM()->form()->add_error( $key , __( 'You must provide lowercase letters.', 'ultimate-member' ) ); } } diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po index f6b6d994..e789d210 100644 --- a/languages/ultimate-member-en_US.po +++ b/languages/ultimate-member-en_US.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Ultimate Member\n" -"POT-Creation-Date: 2020-02-14 11:52+0200\n" -"PO-Revision-Date: 2020-02-14 11:52+0200\n" +"POT-Creation-Date: 2020-02-23 23:33+0200\n" +"PO-Revision-Date: 2020-02-23 23:33+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: en_US\n" @@ -103,7 +103,7 @@ msgstr "" #: includes/admin/core/class-admin-builder.php:765 #: includes/admin/core/class-admin-dragdrop.php:33 #: includes/admin/core/class-admin-menu.php:106 -#: includes/core/class-fields.php:4532 +#: includes/core/class-fields.php:4535 msgid "Please login as administrator" msgstr "" @@ -331,44 +331,44 @@ msgstr "" msgid "No Icon" msgstr "" -#: includes/admin/core/class-admin-forms.php:876 +#: includes/admin/core/class-admin-forms.php:893 #: includes/admin/core/class-admin-upgrade.php:255 msgid "Run" msgstr "" -#: includes/admin/core/class-admin-forms.php:1016 -#: includes/admin/core/class-admin-forms.php:1035 -#: includes/admin/core/class-admin-forms.php:1158 -#: includes/admin/core/class-admin-forms.php:1167 -#: includes/admin/core/class-admin-forms.php:1402 -#: includes/admin/core/class-admin-forms.php:1416 -#: includes/admin/core/class-admin-forms.php:1507 -#: includes/admin/core/class-admin-forms.php:1529 +#: includes/admin/core/class-admin-forms.php:1033 +#: includes/admin/core/class-admin-forms.php:1052 +#: includes/admin/core/class-admin-forms.php:1178 +#: includes/admin/core/class-admin-forms.php:1187 +#: includes/admin/core/class-admin-forms.php:1422 +#: includes/admin/core/class-admin-forms.php:1436 +#: includes/admin/core/class-admin-forms.php:1527 +#: includes/admin/core/class-admin-forms.php:1549 #: includes/admin/core/class-admin-notices.php:398 #: includes/core/um-actions-profile.php:673 msgid "Remove" msgstr "" -#: includes/admin/core/class-admin-forms.php:1214 +#: includes/admin/core/class-admin-forms.php:1234 msgid "Select media" msgstr "" -#: includes/admin/core/class-admin-forms.php:1237 +#: includes/admin/core/class-admin-forms.php:1257 msgid "Select" msgstr "" -#: includes/admin/core/class-admin-forms.php:1238 +#: includes/admin/core/class-admin-forms.php:1258 msgid "Clear" msgstr "" -#: includes/admin/core/class-admin-forms.php:1508 -#: includes/admin/core/class-admin-forms.php:1530 +#: includes/admin/core/class-admin-forms.php:1528 +#: includes/admin/core/class-admin-forms.php:1550 #: includes/admin/templates/directory/sorting.php:23 msgid "Meta key" msgstr "" -#: includes/admin/core/class-admin-forms.php:1509 -#: includes/admin/core/class-admin-forms.php:1531 +#: includes/admin/core/class-admin-forms.php:1529 +#: includes/admin/core/class-admin-forms.php:1551 #: includes/admin/core/class-admin-metabox.php:2230 msgid "Label" msgstr "" @@ -3607,6 +3607,18 @@ msgstr "" msgid "Create additional metadata table..." msgstr "" +#: includes/admin/core/packages/2.1.5/functions.php:91 +msgid "Balance fields were updated successfully" +msgstr "" + +#: includes/admin/core/packages/2.1.5/functions.php:93 +msgid "Updated successfully" +msgstr "" + +#: includes/admin/core/packages/2.1.5/init.php:6 +msgid "Upgrade form fields..." +msgstr "" + #: includes/admin/templates/dashboard/cache.php:12 msgid "Run this task from time to time to keep your DB clean." msgstr "" @@ -4658,7 +4670,7 @@ msgid "Register" msgstr "" #: includes/class-config.php:135 includes/class-config.php:792 -#: includes/core/class-member-directory.php:2131 +#: includes/core/class-member-directory.php:2133 #: includes/core/um-actions-profile.php:1260 #: includes/core/um-actions-user.php:19 msgid "Logout" @@ -7121,14 +7133,14 @@ msgstr "" msgid "Save" msgstr "" -#: includes/core/class-fields.php:4265 +#: includes/core/class-fields.php:4268 #, php-format msgid "" "Your profile is looking a little empty. Why not add some " "information!" msgstr "" -#: includes/core/class-fields.php:4267 +#: includes/core/class-fields.php:4270 msgid "This user has not added any information to their profile yet." msgstr "" @@ -7244,14 +7256,14 @@ msgstr "" msgid "Age: {min_range} - {max_range} years old" msgstr "" -#: includes/core/class-member-directory.php:2076 -#: includes/core/class-member-directory.php:2120 +#: includes/core/class-member-directory.php:2078 +#: includes/core/class-member-directory.php:2122 #: includes/core/um-actions-profile.php:1227 #: includes/core/um-actions-profile.php:1258 msgid "Edit Profile" msgstr "" -#: includes/core/class-member-directory.php:2126 +#: includes/core/class-member-directory.php:2128 #: includes/core/um-actions-profile.php:1259 msgid "My Account" msgstr "" @@ -7658,65 +7670,69 @@ msgstr "" #: includes/core/um-actions-form.php:612 includes/core/um-actions-form.php:618 #: includes/core/um-actions-form.php:624 includes/core/um-actions-form.php:630 -#: includes/core/um-actions-form.php:636 includes/core/um-actions-form.php:642 -#: includes/core/um-actions-form.php:648 includes/core/um-actions-form.php:654 -#: includes/core/um-actions-form.php:666 +#: includes/core/um-actions-form.php:643 includes/core/um-actions-form.php:649 +#: includes/core/um-actions-form.php:655 includes/core/um-actions-form.php:667 #, php-format msgid "Please enter a valid %s username or profile URL" msgstr "" -#: includes/core/um-actions-form.php:660 +#: includes/core/um-actions-form.php:637 +#, php-format +msgid "Please enter a valid %s profile URL" +msgstr "" + +#: includes/core/um-actions-form.php:661 msgid "Please enter a valid URL" msgstr "" -#: includes/core/um-actions-form.php:673 includes/core/um-actions-form.php:687 +#: includes/core/um-actions-form.php:674 includes/core/um-actions-form.php:688 msgid "You must provide a username" msgstr "" -#: includes/core/um-actions-form.php:675 includes/core/um-actions-form.php:689 +#: includes/core/um-actions-form.php:676 includes/core/um-actions-form.php:690 msgid "Your username is already taken" msgstr "" -#: includes/core/um-actions-form.php:677 +#: includes/core/um-actions-form.php:678 msgid "Username cannot be an email" msgstr "" -#: includes/core/um-actions-form.php:679 includes/core/um-actions-form.php:693 +#: includes/core/um-actions-form.php:680 includes/core/um-actions-form.php:694 msgid "Your username contains invalid characters" msgstr "" -#: includes/core/um-actions-form.php:691 includes/core/um-actions-form.php:713 -#: includes/core/um-actions-form.php:715 includes/core/um-actions-form.php:727 -#: includes/core/um-actions-form.php:734 +#: includes/core/um-actions-form.php:692 includes/core/um-actions-form.php:714 +#: includes/core/um-actions-form.php:716 includes/core/um-actions-form.php:728 +#: includes/core/um-actions-form.php:735 msgid "This email is already linked to an existing account" msgstr "" -#: includes/core/um-actions-form.php:711 +#: includes/core/um-actions-form.php:712 msgid "You must provide your email" msgstr "" -#: includes/core/um-actions-form.php:717 includes/core/um-actions-form.php:725 +#: includes/core/um-actions-form.php:718 includes/core/um-actions-form.php:726 #: includes/core/um-actions-form.php:750 msgid "This is not a valid email" msgstr "" -#: includes/core/um-actions-form.php:719 +#: includes/core/um-actions-form.php:720 msgid "Your email contains invalid characters" msgstr "" -#: includes/core/um-actions-form.php:770 +#: includes/core/um-actions-form.php:769 msgid "You must provide a unique value" msgstr "" -#: includes/core/um-actions-form.php:780 +#: includes/core/um-actions-form.php:779 msgid "You must provide alphabetic letters" msgstr "" -#: includes/core/um-actions-form.php:792 +#: includes/core/um-actions-form.php:791 msgid "You must provide lowercase letters." msgstr "" -#: includes/core/um-actions-form.php:810 +#: includes/core/um-actions-form.php:809 #, php-format msgid "Your user description must contain less than %s characters" msgstr "" diff --git a/readme.txt b/readme.txt index 85de04f7..0faf1cec 100644 --- a/readme.txt +++ b/readme.txt @@ -7,7 +7,7 @@ Tags: community, member, membership, user-profile, user-registration Requires PHP: 5.6 Requires at least: 5.0 Tested up to: 5.3 -Stable tag: 2.1.3 +Stable tag: 2.1.4 License: GNU Version 2 or Any Later Version License URI: http://www.gnu.org/licenses/gpl-3.0.txt @@ -146,7 +146,7 @@ The plugin works with popular caching plugins by automatically excluding Ultimat * To learn more about version 2.1 please see this [topic](https://wordpress.org/support/topic/version-2-1-4/) * UM2.1+ is a significant update to the Member Directories' code base from 2.0.x. Please make sure you take a full-site backup with restore point before updating the plugin -= 2.1.4: February xx, 2020 = += 2.1.4: February 25, 2020 = * Enhancements: