-
+
@@ -190,28 +193,28 @@ class UM_Admin_DragDrop {
-
+
-
+
-
-
+
+
-
+
id;
-
+
if ( !is_admin() ) return false;
if ( strstr( $screen_id, 'ultimatemember') || strstr( $screen_id, 'um_') || strstr($screen_id, 'user') || strstr($screen_id, 'profile') )return true;
@@ -238,6 +238,8 @@ class UM_Admin_Enqueue {
if ( isset( $post->post_type ) ) return true;
+ if ( isset( $tax->name ) ) return true;
+
return false;
}
@@ -290,4 +292,4 @@ class UM_Admin_Enqueue {
}
-}
\ No newline at end of file
+}
diff --git a/admin/core/um-admin-filters-fields.php b/admin/core/um-admin-filters-fields.php
index 62b081ff..4e09a6a9 100644
--- a/admin/core/um-admin-filters-fields.php
+++ b/admin/core/um-admin-filters-fields.php
@@ -9,23 +9,23 @@
if ( isset($array['conditional_field']) && !empty( $array['conditional_action'] ) && !empty( $array['conditional_operator'] ) ) {
$array['conditions'][] = array( $array['conditional_action'], $array['conditional_field'], $array['conditional_operator'], $array['conditional_value'] );
}
-
+
if ( isset($array['conditional_field1']) && !empty( $array['conditional_action1'] ) && !empty( $array['conditional_operator1'] ) ) {
$array['conditions'][] = array( $array['conditional_action1'], $array['conditional_field1'], $array['conditional_operator1'], $array['conditional_value1'] );
}
-
+
if ( isset($array['conditional_field2']) && !empty( $array['conditional_action2'] ) && !empty( $array['conditional_operator2'] ) ) {
$array['conditions'][] = array( $array['conditional_action2'], $array['conditional_field2'], $array['conditional_operator2'], $array['conditional_value2'] );
}
-
+
if ( isset($array['conditional_field3']) && !empty( $array['conditional_action3'] ) && !empty( $array['conditional_operator3'] ) ) {
$array['conditions'][] = array( $array['conditional_action3'], $array['conditional_field3'], $array['conditional_operator3'], $array['conditional_value3'] );
}
-
+
if ( isset($array['conditional_field4']) && !empty( $array['conditional_action4'] ) && !empty( $array['conditional_operator4'] ) ) {
$array['conditions'][] = array( $array['conditional_action4'], $array['conditional_field4'], $array['conditional_operator4'], $array['conditional_value4'] );
}
-
+
return $array;
}
@@ -36,26 +36,26 @@
function um_admin_pre_save_fields_hook( $array ){
global $ultimatemember;
extract( $array );
-
+
$metabox = new UM_Admin_Metabox();
-
+
$fields_without_metakey = array('block','shortcode','spacing','divider','group');
$fields_without_metakey = apply_filters('um_fields_without_metakey', $fields_without_metakey );
-
+
$fields = $ultimatemember->query->get_attr('custom_fields', $form_id);
$count = 1;
if ( isset( $fields ) && !empty( $fields) ) $count = count($fields)+1;
-
+
// set unique meta key
if ( in_array( $field_type, $fields_without_metakey ) && !isset($array['post']['_metakey']) ) {
$array['post']['_metakey'] = "um_{$field_type}_{$form_id}_{$count}";
}
-
+
// set position
if ( !isset( $array['post']['_position'] ) ) {
$array['post']['_position'] = $count;
}
-
+
return $array;
}
@@ -66,24 +66,24 @@
function um_admin_field_update_error_handling( $errors, $array ){
global $ultimatemember;
extract( $array );
-
+
$field_attr = $ultimatemember->builtin->get_core_field_attrs( $field_type );
-
+
if ( isset( $field_attr['validate'] ) ) {
-
+
$validate = $field_attr['validate'];
foreach ( $validate as $post_input => $arr ) {
-
+
$mode = $arr['mode'];
-
+
switch ( $mode ) {
-
+
case 'numeric':
if ( !empty( $array['post'][$post_input] ) && !is_numeric( $array['post'][$post_input] ) ){
$errors[$post_input] = $validate[$post_input]['error'];
}
break;
-
+
case 'unique':
if ( !isset( $array['post']['edit_mode'] ) ) {
if ( $ultimatemember->builtin->unique_field_err( $array['post'][$post_input] ) ) {
@@ -91,43 +91,42 @@
}
}
break;
-
+
case 'required':
if ( $array['post'][$post_input] == '' )
$errors[$post_input] = $validate[$post_input]['error'];
break;
-
+
case 'range-start':
if ( $ultimatemember->builtin->date_range_start_err( $array['post'][$post_input] ) && $array['post']['_range'] == 'date_range' )
$errors[$post_input] = $ultimatemember->builtin->date_range_start_err( $array['post'][$post_input] );
break;
-
+
case 'range-end':
if ( $ultimatemember->builtin->date_range_end_err( $array['post'][$post_input], $array['post']['_range_start'] ) && $array['post']['_range'] == 'date_range' )
$errors[$post_input] = $ultimatemember->builtin->date_range_end_err( $array['post'][$post_input], $array['post']['_range_start'] );
break;
-
+
}
-
+
}
-
+
}
return $errors;
-
+
}
/***
*** @Filter validation types on loop
****/
add_filter('um_builtin_validation_types_continue_loop', 'um_builtin_validation_types_continue_loop', 1, 4);
- function um_builtin_validation_types_continue_loop( $break, $key, $form_id, $field_array ){
-
+ function um_builtin_validation_types_continue_loop( $break, $key, $form_id, $field_array ){
// show unique username validation only for user_login field
- if( $field_array['metakey'] == 'user_login' && $key !== 'unique_username' ){
- return false;
- }
+ if ( isset( $field_array['metakey'] ) && $field_array['metakey'] == 'user_login' && $key !== 'unique_username' ){
+ return false;
+ }
- return $break;
- }
\ No newline at end of file
+ return $break;
+ }
diff --git a/core/um-actions-access.php b/core/um-actions-access.php
index 25d805df..3b3fe3c7 100644
--- a/core/um-actions-access.php
+++ b/core/um-actions-access.php
@@ -389,8 +389,8 @@
if ( is_user_logged_in() ){
- if( isset( $opt['_um_redirect'] ) && ! empty( $opt['_um_redirect'] ) ) {
- $redirect = $opt['_um_redirect'];
+ if( isset( $opt['_um_redirect2'] ) && ! empty( $opt['_um_redirect2'] ) ) {
+ $redirect = $opt['_um_redirect2'];
}else{
$redirect = site_url();
}
@@ -478,7 +478,7 @@
case 1:
if ( is_user_logged_in() )
- $redirect = ( isset( $opt['_um_redirect'] ) && !empty( $opt['_um_redirect'] ) ) ? $opt['_um_redirect'] : site_url();
+ $redirect = ( isset( $opt['_um_redirect2'] ) && !empty( $opt['_um_redirect2'] ) ) ? $opt['_um_redirect2'] : site_url();
$redirect = $ultimatemember->access->set_referer( $redirect, "categories_1" );
$ultimatemember->access->redirect_handler = $redirect;
if ( !is_user_logged_in() )
@@ -566,8 +566,8 @@
if ( is_user_logged_in() ){
- if( isset( $opt['_um_redirect'] ) && ! empty( $opt['_um_redirect'] ) ) {
- $redirect = $opt['_um_redirect'];
+ if( isset( $opt['_um_redirect2'] ) && ! empty( $opt['_um_redirect2'] ) ) {
+ $redirect = $opt['_um_redirect2'];
}else{
$redirect = site_url();
}
@@ -703,7 +703,7 @@
case 1: // Logged out users only
if ( is_user_logged_in() ){
- $redirect = ( isset( $opt['_um_redirect'] ) && ! empty( $opt['_um_redirect'] ) ) ? $opt['_um_redirect'] : site_url();
+ $redirect = ( isset( $opt['_um_redirect2'] ) && ! empty( $opt['_um_redirect2'] ) ) ? $opt['_um_redirect2'] : site_url();
$redirect = $ultimatemember->access->set_referer( $redirect, "page_cat_1a_t{$cat->term_id}_pt{$post_type}" );
$ultimatemember->access->redirect_handler = $redirect;
$ultimatemember->access->allow_access = false;
diff --git a/core/um-api.php b/core/um-api.php
index c2d2481a..b2bdd4ef 100644
--- a/core/um-api.php
+++ b/core/um-api.php
@@ -20,8 +20,9 @@ class UM_REST_API {
add_action( 'init', array( $this, 'add_endpoint' ) );
add_action( 'template_redirect', array( $this, 'process_query' ), -1 );
add_filter( 'query_vars', array( $this, 'query_vars' ) );
- add_action( 'show_user_profile', array( $this, 'user_key_field' ) );
- add_action( 'edit_user_profile', array( $this, 'user_key_field' ) );
+
+ add_action( 'um_user_profile_section', array( $this, 'user_key_field' ), 2 );
+
add_action( 'personal_options_update', array( $this, 'update_key' ) );
add_action( 'edit_user_profile_update', array( $this, 'update_key' ) );
@@ -863,4 +864,4 @@ class UM_REST_API {
return hash( 'md5', $user->um_user_secret_key . $user->um_user_public_key );
}
-}
\ No newline at end of file
+}
diff --git a/core/um-user.php b/core/um-user.php
index e4cdef05..9ef6c651 100644
--- a/core/um-user.php
+++ b/core/um-user.php
@@ -61,6 +61,7 @@ class UM_User {
$um_user_role = get_user_meta($user->ID,'role',true);
?>
+