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

Merge pull request #98 from jonfalcon/master

Browse Source 
Fix select2 multi dropdown for wc orders
This commit is contained in:
Champ Camba
2016-02-25 17:29:42 +08:00
parent 7f6c994159 4c9bf39bf4
commit 70a99aadaa
2 changed files with 73 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/css/um-admin-select2.css
+2 -2
View File
@@ -61,9 +61,9 @@ body.um-admin .select2-drop-mask {
}
body.um-admin .select2-drop {
z-index: 10030 !important;
z-index: 999999 !important;
}
body.um-admin .select2-search {
z-index: 10040 !important;
}
}
core/um-actions-register.php
+71 -66
View File
@@ -8,7 +8,7 @@
global $ultimatemember;
$ultimatemember->user->approve();
}
/***
*** @account needs email validation
***/
@@ -17,7 +17,7 @@
global $ultimatemember;
$ultimatemember->user->email_pending();
}
/***
*** @account needs admin review
***/
@@ -26,7 +26,7 @@
global $ultimatemember;
$ultimatemember->user->pending();
}
/***
*** @add user to wordpress
***/
@@ -34,7 +34,7 @@
function um_add_user_frontend($args){
global $ultimatemember;
extract($args);
if ( isset( $username ) && !isset($args['user_login']) ) {
$user_login = $username;
@@ -54,8 +54,13 @@
}
if( !isset( $user_login ) && isset( $user_email ) && $user_email )
{
$user_login = $user_email;
}
$unique_userID = $ultimatemember->query->count_users() + 1;
if ( ! isset( $user_login ) ) {
$user_login = 'user' . $unique_userID;
}
@@ -67,30 +72,30 @@
if ( ! isset( $user_password ) ){
$user_password = $ultimatemember->validation->generate();
}
if( ! isset( $user_email ) ) {
$user_email = 'nobody' . $unique_userID . '@' . get_bloginfo('name');
}
$creds['user_login'] = $user_login;
$creds['user_password'] = $user_password;
$creds['user_email'] = $user_email;
$args['submitted'] = array_merge( $args['submitted'], $creds);
$args = array_merge($args, $creds);
do_action('um_before_new_user_register', $args);
$user_id = wp_create_user( $user_login, $user_password, $user_email );
do_action('um_after_new_user_register', $user_id, $args);
return $user_id;
}
/***
*** @after adding a new user
***/
@@ -98,50 +103,50 @@
function um_after_new_user_register($user_id, $args){
global $ultimatemember;
extract($args);
um_fetch_user( $user_id );
if ( !isset( $args['role'] ) ) {
$role = um_get_option('default_role');
}
if ( !in_array( $role, $ultimatemember->query->get_roles( false, array('admin') ) ) ) {
$role = um_get_option('default_role');
}
$ultimatemember->user->set_role( $role );
$ultimatemember->user->set_registration_details( $args['submitted'] );
$ultimatemember->user->set_plain_password( $args['user_password'] );
$ultimatemember->user->set_last_login();
do_action('um_new_user_registration_plain');
do_action('um_post_registration_save', $user_id, $args);
do_action('um_post_registration_listener', $user_id, $args);
do_action('um_post_registration', $user_id, $args);
}
/***
*** @Update user's profile after registration
***/
add_action('um_post_registration_save', 'um_post_registration_save', 10, 2);
function um_post_registration_save($user_id, $args){
global $ultimatemember;
unset( $args['user_id'] );
$args['_user_id'] = $user_id;
$args['is_signup'] = 1;
do_action('um_user_edit_profile', $args);
}
/***
*** @post-registration admin listender
***/
@@ -154,9 +159,9 @@
} else {
$ultimatemember->mail->send( um_admin_email(), 'notification_review', array('admin' => true ) );
}
}
/***
*** @post-registration procedure
***/
@@ -164,36 +169,36 @@
function um_post_registration($user_id, $args){
global $ultimatemember;
extract($args);
$status = um_user('status');
do_action("um_post_registration_global_hook", $user_id, $args);
do_action("um_post_registration_{$status}_hook", $user_id, $args);
if ( !is_admin() ) {
do_action("track_{$status}_user_registration");
// Priority redirect
if ( isset( $args['redirect_to'] ) ) {
exit( wp_redirect( $args['redirect_to'] ) );
}
if ( $status == 'approved' ) {
$ultimatemember->user->auto_login($user_id);
if ( um_user('auto_approve_act') == 'redirect_url' && um_user('auto_approve_url') !== '' ) exit( wp_redirect( um_user('auto_approve_url') ) );
if ( um_user('auto_approve_act') == 'redirect_profile' ) exit( wp_redirect( um_user_profile_url() ) );
}
if ( $status != 'approved' ) {
if ( um_user( $status . '_action' ) == 'redirect_url' && um_user( $status . '_url' ) != '' ) {
exit( wp_redirect( um_user( $status . '_url' ) ) );
}
if ( um_user( $status . '_action' ) == 'show_message' && um_user( $status . '_message' ) != '' ) {
$url = $ultimatemember->permalinks->get_current_url();
$url = add_query_arg( 'message', esc_attr( $status ), $url );
@@ -201,13 +206,13 @@
exit( wp_redirect( $url ) );
}
}
}
}
/***
*** @new user registration
***/
@@ -218,30 +223,30 @@
do_action('um_add_user_frontend', $args);
}
/***
*** @form processing
***/
add_action('um_submit_form_register', 'um_submit_form_register', 10);
function um_submit_form_register($args){
global $ultimatemember;
if ( !isset($ultimatemember->form->errors) ) do_action('um_user_registration', $args);
do_action('um_user_registration_extra_hook', $args );
}
/***
*** @Register user with predefined role in options
***/
add_action('um_after_register_fields', 'um_add_user_role');
function um_add_user_role( $args ){
global $ultimatemember;
if ( isset( $args['custom_fields']['role_select'] ) || isset( $args['custom_fields']['role_radio'] ) ) return;
if (isset($args['role']) && !empty($args['role'])) {
$role = $args['role'];
} else {
@@ -251,55 +256,55 @@
echo '<input type="hidden" name="role" id="role" value="' . $role . '" />';
}
/***
*** @Show the submit button (highest priority)
***/
add_action('um_after_register_fields', 'um_add_submit_button_to_register', 1000);
function um_add_submit_button_to_register($args){
global $ultimatemember;
// DO NOT add when reviewing user's details
if ( isset( $ultimatemember->user->preview ) && $ultimatemember->user->preview == true && is_admin() ) return;
$primary_btn_word = $args['primary_btn_word'];
$primary_btn_word = apply_filters('um_register_form_button_one', $primary_btn_word, $args );
$secondary_btn_word = $args['secondary_btn_word'];
$secondary_btn_word = apply_filters('um_register_form_button_two', $secondary_btn_word, $args );
$secondary_btn_url = ( isset( $args['secondary_btn_url'] ) && $args['secondary_btn_url'] ) ? $args['secondary_btn_url'] : um_get_core_page('login');
$secondary_btn_url = apply_filters('um_register_form_button_two_url', $secondary_btn_url, $args );
?>
<div class="um-col-alt">
<?php if ( isset($args['secondary_btn']) && $args['secondary_btn'] != 0 ) { ?>
<div class="um-left um-half"><input type="submit" value="<?php echo $primary_btn_word; ?>" class="um-button" /></div>
<div class="um-right um-half"><a href="<?php echo $secondary_btn_url; ?>" class="um-button um-alt"><?php echo $secondary_btn_word; ?></a></div>
<?php } else { ?>
<div class="um-center"><input type="submit" value="<?php echo $primary_btn_word; ?>" class="um-button" /></div>
<?php } ?>
<div class="um-clear"></div>
</div>
<?php
}
/***
*** @Show Fields
***/
add_action('um_main_register_fields', 'um_add_register_fields', 100);
function um_add_register_fields($args){
global $ultimatemember;
echo $ultimatemember->fields->display( 'register', $args );
}
}