10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-14 04:06:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add an account option to require first and last name

Browse Source
This commit is contained in:
champsupertramp
2016-07-03 16:49:50 +08:00
parent c69f8098f2
commit 7baf1b6a1a
2 changed files with 70 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/um-actions-account.php
+60 -56
View File
@@ -92,76 +92,80 @@
add_action('um_submit_account_errors_hook','um_submit_account_errors_hook');
function um_submit_account_errors_hook( $args ) {
global $ultimatemember;
// errors on general tab
if ( isset($_POST['um_account_submit']) && $_POST['um_account_submit'] != __('Delete Account','ultimatemember') ) {
$current_tab = isset( $_POST['_um_account_tab'] ) ? $_POST['_um_account_tab']: '';
if( $current_tab != 'password' ){
if ( isset($_POST['first_name']) && strlen(trim( $_POST['first_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('first_name', __('You must provide your first name','ultimatemember') );
}
if ( isset($_POST['last_name']) && strlen(trim( $_POST['last_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('last_name', __('You must provide your last name','ultimatemember') );
}
if ( isset($_POST['user_email']) && strlen(trim( $_POST['user_email'] ) ) == 0 ) {
$ultimatemember->form->add_error('user_email', __('You must provide your e-mail','ultimatemember') );
}
if ( isset($_POST['user_email']) && !is_email( $_POST['user_email'] ) ) {
$ultimatemember->form->add_error('user_email', __('Please provide a valid e-mail','ultimatemember') );
}
if ( email_exists( $_POST['user_email'] ) && email_exists( $_POST['user_email'] ) != get_current_user_id() ) {
$ultimatemember->form->add_error('user_email', __('Email already linked to another account','ultimatemember') );
}
}
}
$ultimatemember->account->current_tab = 'general';
$current_tab = isset( $_POST['_um_account_tab'] ) ? $_POST['_um_account_tab']: '';
$user = get_user_by('login', um_user('user_login') );
// change password
if ( $_POST['current_user_password'] != '' || $_POST['user_password'] != '' || $_POST['confirm_user_password'] != '') {
if ( $_POST['current_user_password'] == '' || ! wp_check_password( $_POST['current_user_password'], $user->data->user_pass, $user->data->ID ) ) {
if( isset( $_POST['_um_account_tab'] ) && $current_tab != "delete" ){
// errors on general tab
if ( isset($_POST['um_account_submit']) ) {
if( $current_tab != 'password' ){
$account_name_require = um_get_option("account_name_require");
$ultimatemember->form->add_error('current_user_password', __('This is not your password','ultimatemember') );
$ultimatemember->account->current_tab = 'password';
} else { // correct password
if ( isset($_POST['first_name']) && ( strlen(trim( $_POST['first_name'] ) ) == 0 && $account_name_require ) ) {
$ultimatemember->form->add_error('first_name', __('You must provide your first name','ultimatemember') );
}
if ( $_POST['user_password'] != $_POST['confirm_user_password'] && $_POST['user_password'] ) {
$ultimatemember->form->add_error('user_password', __('Your new password does not match','ultimatemember') );
$ultimatemember->account->current_tab = 'password';
if ( isset($_POST['last_name']) && ( strlen(trim( $_POST['last_name'] ) ) == 0 && $account_name_require ) ) {
$ultimatemember->form->add_error('last_name', __('You must provide your last name','ultimatemember') );
}
if ( isset($_POST['user_email']) && strlen(trim( $_POST['user_email'] ) ) == 0 ) {
$ultimatemember->form->add_error('user_email', __('You must provide your e-mail','ultimatemember') );
}
if ( isset($_POST['user_email']) && !is_email( $_POST['user_email'] ) ) {
$ultimatemember->form->add_error('user_email', __('Please provide a valid e-mail','ultimatemember') );
}
if ( email_exists( $_POST['user_email'] ) && email_exists( $_POST['user_email'] ) != get_current_user_id() ) {
$ultimatemember->form->add_error('user_email', __('Email already linked to another account','ultimatemember') );
}
}
if ( um_get_option('account_require_strongpass') ) {
}
$ultimatemember->account->current_tab = 'general';
if ( strlen( utf8_decode( $_POST['user_password'] ) ) < 8 ) {
$ultimatemember->form->add_error('user_password', __('Your password must contain at least 8 characters','ultimatemember') );
}
// change password
if ( $_POST['current_user_password'] != '' || $_POST['user_password'] != '' || $_POST['confirm_user_password'] != '') {
if ( $_POST['current_user_password'] == '' || ! wp_check_password( $_POST['current_user_password'], $user->data->user_pass, $user->data->ID ) ) {
if ( strlen( utf8_decode( $_POST['user_password'] ) ) > 30 ) {
$ultimatemember->form->add_error('user_password', __('Your password must contain less than 30 characters','ultimatemember') );
}
$ultimatemember->form->add_error('current_user_password', __('This is not your password','ultimatemember') );
$ultimatemember->account->current_tab = 'password';
} else { // correct password
if ( !$ultimatemember->validation->strong_pass( $_POST['user_password'] ) ) {
$ultimatemember->form->add_error('user_password', __('Your password must contain at least one lowercase letter, one capital letter and one number','ultimatemember') );
if ( $_POST['user_password'] != $_POST['confirm_user_password'] && $_POST['user_password'] ) {
$ultimatemember->form->add_error('user_password', __('Your new password does not match','ultimatemember') );
$ultimatemember->account->current_tab = 'password';
}
}
if ( um_get_option('account_require_strongpass') ) {
if ( strlen( utf8_decode( $_POST['user_password'] ) ) < 8 ) {
$ultimatemember->form->add_error('user_password', __('Your password must contain at least 8 characters','ultimatemember') );
}
if ( strlen( utf8_decode( $_POST['user_password'] ) ) > 30 ) {
$ultimatemember->form->add_error('user_password', __('Your password must contain less than 30 characters','ultimatemember') );
}
if ( !$ultimatemember->validation->strong_pass( $_POST['user_password'] ) ) {
$ultimatemember->form->add_error('user_password', __('Your password must contain at least one lowercase letter, one capital letter and one number','ultimatemember') );
$ultimatemember->account->current_tab = 'password';
}
}
}
}
if ( ! empty( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
$ultimatemember->form->add_error('user_login', __('Your username is invalid','ultimatemember') );
return;
}
}
if ( ! empty( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
$ultimatemember->form->add_error('user_login', __('Your username is invalid','ultimatemember') );
return;
}
// delete account
if ( isset( $_POST['um_account_submit'] ) && $_POST['_um_account_tab'] == "delete" ) {
if ( strlen(trim( $_POST['single_user_password'] ) ) == 0 ) {
um-config.php
+10
View File
@@ -317,6 +317,16 @@ $this->sections[] = array(
'on' => __('On','ultimatemember'),
'off' => __('Off','ultimatemember'),
),
array(
'id' => 'account_name_require',
'type' => 'switch',
'title' => __( 'Require First & Last Name','ultimatemember' ),
'default' => 1,
'desc' => __('Require first and laste name?','ultimatemember'),
'on' => __('On','ultimatemember'),
'off' => __('Off','ultimatemember'),
'required' => array( 'account_name', '=', '1' ),
),
array(
'id' => 'account_email',