10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-13 19:56:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from ultimatemember/dev

Browse Source 
Fixed conditional form fields & Remove duplicate user IDs in directory
This commit is contained in:
Ultimate Member
2015-11-26 01:13:30 +10:00
parent f6a8f26d83 f6ef053dda
commit af6921758d
8 changed files with 149 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/um-functions.js
+39 -12
View File
@@ -4,7 +4,8 @@ var live_value;
function um_conditional(){
jQuery('.um-field.um-is-conditional').each(function(){
//console.log('-----');
var found = 0;
for (var i = 0; i < 5; i++) {
var action0 = jQuery(this).data('cond-'+i+'-action');
@@ -12,73 +13,91 @@ function um_conditional(){
var operator0 = jQuery(this).data('cond-'+i+'-operator');
var value0 = jQuery(this).data('cond-'+i+'-value');
if ( action0 == 'show' && field0 == live_field ) {
if ( action0 == 'show' && field0 == live_field && typeof value0 !== 'undefined' ) {
//console.log( 'show',i,'conditional='+value0, 'option='+live_value );
if ( operator0 == 'empty' ) {
if ( !live_value || live_value == '' ) {
if ( !live_value || live_value == '' || found > 0 ) {
jQuery(this).fadeIn();
found++;
} else {
jQuery(this).hide();
}
}
if ( operator0 == 'not empty' ) {
if ( live_value && live_value != '' ) {
if ( live_value && live_value != '' || found > 0 ) {
jQuery(this).fadeIn();
found++;
} else {
jQuery(this).hide();
}
}
if ( operator0 == 'equals to' ) {
if ( value0 == live_value ) {
if ( value0 == live_value || found > 0 ) {
jQuery(this).fadeIn();
found++;
} else {
jQuery(this).hide();
}
}
if ( operator0 == 'not equals' ) {
if ( jQuery.isNumeric( value0 ) && parseInt( live_value ) != parseInt( value0 ) && live_value ) {
if ( jQuery.isNumeric( value0 ) && parseInt( live_value ) != parseInt( value0 ) && live_value || found > 0 ) {
jQuery(this).fadeIn();
} else if ( !jQuery.isNumeric( value0 ) && value0 != live_value ) {
found++;
} else if ( !jQuery.isNumeric( value0 ) && value0 != live_value || found > 0 ) {
jQuery(this).fadeIn();
found++;
} else {
jQuery(this).hide();
}
}
if ( operator0 == 'greater than' ) {
if ( jQuery.isNumeric( value0 ) && parseInt( live_value ) > parseInt( value0 ) ) {
if ( jQuery.isNumeric( value0 ) && parseInt( live_value ) > parseInt( value0 ) || found > 0) {
jQuery(this).fadeIn();
found++;
} else {
jQuery(this).hide();
}
}
if ( operator0 == 'less than' ) {
if ( jQuery.isNumeric( value0 ) && parseInt( live_value ) < parseInt( value0 ) && live_value ) {
if ( jQuery.isNumeric( value0 ) && parseInt( live_value ) < parseInt( value0 ) && live_value || found > 0) {
jQuery(this).fadeIn();
found++;
} else {
jQuery(this).hide();
}
}
if ( operator0 == 'contains' ) {
if ( live_value && live_value.indexOf( value0 ) >= 0 ) {
if ( live_value && live_value.indexOf( value0 ) >= 0 || found > 0 ) {
jQuery(this).fadeIn();
found++;
} else {
jQuery(this).hide();
}
}
}
if ( action0 == 'hide' && field0 == live_field ) {
if ( action0 == 'hide' && field0 == live_field && typeof value0 !== 'undefined' ) {
if ( operator0 == 'empty' ) {
if ( !live_value || live_value == '' ) {
jQuery(this).hide();
found++;
} else {
jQuery(this).fadeIn();
}
@@ -87,6 +106,7 @@ function um_conditional(){
if ( operator0 == 'not empty' ) {
if ( live_value && live_value != '' ) {
jQuery(this).hide();
found++;
} else {
jQuery(this).fadeIn();
}
@@ -95,6 +115,7 @@ function um_conditional(){
if ( operator0 == 'equals to' ) {
if ( value0 == live_value ) {
jQuery(this).hide();
found++;
} else {
jQuery(this).fadeIn();
}
@@ -103,8 +124,10 @@ function um_conditional(){
if ( operator0 == 'not equals' ) {
if ( jQuery.isNumeric( value0 ) && parseInt( live_value ) != parseInt( value0 ) && live_value ) {
jQuery(this).hide();
found++;
} else if ( !jQuery.isNumeric( value0 ) && value0 != live_value ) {
jQuery(this).hide();
found++;
} else {
jQuery(this).fadeIn();
}
@@ -113,6 +136,7 @@ function um_conditional(){
if ( operator0 == 'greater than' ) {
if ( jQuery.isNumeric( value0 ) && parseInt( live_value ) > parseInt( value0 ) ) {
jQuery(this).hide();
found++;
} else {
jQuery(this).fadeIn();
}
@@ -121,6 +145,7 @@ function um_conditional(){
if ( operator0 == 'less than' ) {
if ( jQuery.isNumeric( value0 ) && parseInt( live_value ) < parseInt( value0 ) && live_value ) {
jQuery(this).hide();
found++;
} else {
jQuery(this).fadeIn();
}
@@ -129,11 +154,13 @@ function um_conditional(){
if ( operator0 == 'contains' ) {
if ( live_value && live_value.indexOf( value0 ) >= 0 ) {
jQuery(this).hide();
found++;
} else {
jQuery(this).fadeIn();
}
}
//console.log( 'hide',i,value0, live_value );
}
}
core/um-access.php
+2 -1
View File
@@ -25,9 +25,10 @@ class UM_Access {
do_action('um_access_post_settings');
if ( $this->redirect_handler && !$this->allow_access ) {
if ( $this->redirect_handler && !$this->allow_access && ! um_is_core_page('login') ) {
// login page add protected page automatically
if ( strstr( $this->redirect_handler, um_get_core_page('login') ) ){
$curr = $ultimatemember->permalinks->get_current_url();
$this->redirect_handler = esc_url( add_query_arg('redirect_to', $curr, $this->redirect_handler) );
core/um-actions-access.php
+6 -3
View File
@@ -63,11 +63,14 @@
add_action('um_access_category_settings','um_access_category_settings');
function um_access_category_settings() {
global $post, $wp_query, $ultimatemember;
if ( is_single() && get_the_category() ) {
if ( is_single() || get_the_category() ) {
$categories = get_the_category();
foreach( $categories as $cat ) {
$term_id = $cat->term_id;
$opt = get_option("category_$term_id");
if ( isset( $opt['_um_accessible'] ) ) {
switch( $opt['_um_accessible'] ) {
@@ -88,8 +91,8 @@
case 2:
if ( !is_user_logged_in() )
$ultimatemember->access->redirect_handler = ( isset( $opt['_um_redirect'] ) ) ? $opt['_um_redirect'] : um_get_core_page('login');
if ( ! is_user_logged_in() )
$ultimatemember->access->redirect_handler = ( isset( $opt['_um_redirect'] ) && ! empty( $opt['_um_redirect'] ) ) ? $opt['_um_redirect'] : um_get_core_page('login');
if ( is_user_logged_in() && isset( $opt['_um_roles'] ) && !empty( $opt['_um_roles'] ) ){
if ( !in_array( um_user('role'), $opt['_um_roles'] ) ) {
core/um-actions-form.php
+2
View File
@@ -155,6 +155,8 @@
foreach( $fields as $key => $array ) {
$array = apply_filters('um_get_custom_field_array', $array, $fields );
if ( isset( $array['type'] ) && $array['type'] == 'checkbox' && isset( $array['required'] ) && $array['required'] == 1 && !isset( $args[$key] ) ) {
$ultimatemember->form->add_error($key, sprintf(__('%s is required.','ultimatemember'), $array['title'] ) );
}
core/um-actions-wpadmin.php
+58 -55
View File
@@ -6,80 +6,83 @@
add_action('init','um_block_wpadmin_for_guests');
function um_block_wpadmin_for_guests() {
global $pagenow;
if ( isset( $_REQUEST['um_panic_key'] ) && $_REQUEST['um_panic_key'] == um_get_option('panic_key') ) {
exit( wp_redirect( add_query_arg('_verified_key', $_REQUEST['um_panic_key'], wp_login_url() ) ) );
}
if ( !isset( $_REQUEST['_verified_key'] ) || $_REQUEST['_verified_key'] != um_get_option('panic_key') ) {
// Logout screen
if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && is_user_logged_in() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'logout' ) {
$redirect = um_get_core_page('logout');
if ( isset( $_REQUEST['redirect_to'] ) && !empty( $_REQUEST['redirect_to'] ) ) {
$redirect = add_query_arg( 'redirect_to', $_REQUEST['redirect_to'], $redirect );
}
exit( wp_redirect( $redirect ) );
}
// Login screen
if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && !is_user_logged_in() && !isset( $_REQUEST['action'] ) ) {
// Logout screen
if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && is_user_logged_in() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'logout' ) {
$redirect = um_get_core_page('logout');
$allowed = um_get_option('wpadmin_login');
$allowed = apply_filters('um_whitelisted_wpadmin_access', $allowed );
if ( !$allowed ) {
$act = um_get_option('wpadmin_login_redirect');
$custom_url = um_get_option('wpadmin_login_redirect_url');
if ( $act == 'um_login_page' || !$custom_url ) {
$redirect = um_get_core_page('login');
} else {
$redirect = $custom_url;
if ( isset( $_REQUEST['redirect_to'] ) && !empty( $_REQUEST['redirect_to'] ) ) {
$redirect = add_query_arg( 'redirect_to', $_REQUEST['redirect_to'], $redirect );
}
exit( wp_redirect( $redirect ) );
}
}
// Login screen
if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && !is_user_logged_in() && !isset( $_REQUEST['action'] ) ) {
// Register screen
if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && !is_user_logged_in() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'register' ) {
$allowed = um_get_option('wpadmin_register');
$allowed = apply_filters('um_whitelisted_wpadmin_access', $allowed );
if ( !$allowed ) {
$allowed = um_get_option('wpadmin_login');
$allowed = apply_filters('um_whitelisted_wpadmin_access', $allowed );
$act = um_get_option('wpadmin_register_redirect');
$custom_url = um_get_option('wpadmin_register_redirect_url');
if ( $act == 'um_register_page' || !$custom_url ) {
$redirect = um_get_core_page('register');
} else {
$redirect = $custom_url;
if ( !$allowed ) {
$act = um_get_option('wpadmin_login_redirect');
$custom_url = um_get_option('wpadmin_login_redirect_url');
if ( $act == 'um_login_page' || !$custom_url ) {
$redirect = um_get_core_page('login');
} else {
$redirect = $custom_url;
}
exit( wp_redirect( $redirect ) );
}
}
// Register screen
if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && !is_user_logged_in() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'register' ) {
$allowed = um_get_option('wpadmin_register');
$allowed = apply_filters('um_whitelisted_wpadmin_access', $allowed );
if ( !$allowed ) {
$act = um_get_option('wpadmin_register_redirect');
$custom_url = um_get_option('wpadmin_register_redirect_url');
if ( $act == 'um_register_page' || !$custom_url ) {
$redirect = um_get_core_page('register');
} else {
$redirect = $custom_url;
}
exit( wp_redirect( $redirect ) );
}
exit( wp_redirect( $redirect ) );
}
}
// Lost password page
if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'lostpassword' ) {
exit( wp_redirect( um_get_core_page('password-reset') ) );
}
// Prevention for logged in user
if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && is_user_logged_in() ) {
// Lost password page
if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'lostpassword' ) {
exit( wp_redirect( um_get_core_page('password-reset') ) );
}
// Prevention for logged in user
if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && is_user_logged_in() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] != 'postpass' ) {
if ( !um_user('can_access_wpadmin') ) {
exit( wp_redirect( home_url() ) );
} else {
exit( wp_redirect( admin_url() ) );
}
if ( !um_user('can_access_wpadmin') ) {
exit( wp_redirect( home_url() ) );
} else {
exit( wp_redirect( admin_url() ) );
}
}
}
}
/***
core/um-fields.php
+1
View File
@@ -581,6 +581,7 @@ class UM_Fields {
if ( isset( $array['conditions'] ) && is_array( $array['conditions'] ) && !$this->viewing ) {
$array['conditional'] = '';
foreach( $array['conditions'] as $cond_id => $cond ) {
$array['conditional'] .= ' data-cond-'.$cond_id.'-action="'. $cond[0] . '" data-cond-'.$cond_id.'-field="'. $cond[1] . '" data-cond-'.$cond_id.'-operator="'. $cond[2] . '" data-cond-'.$cond_id.'-value="'. $cond[3] . '"';
}
core/um-filters-fields.php
+40
View File
@@ -261,4 +261,44 @@
return $array;
}
/***
*** @validate conditional logic
***/
add_filter('um_get_custom_field_array', 'um_get_custom_field_array',99,2);
function um_get_custom_field_array( $array, $fields ){
if( isset( $array['conditions'] ) ){
$found = 0;
for( $a = 0; $a < count( $array['conditions'] ); $a++ ){
if( isset( $array['conditional_value'] ) || isset( $array['conditional_value'.$a] ) ){
if( isset( $array['conditions'] ) && ! empty( $array['conditions'] ) ){
$arr_conditions = array();
foreach ($array['conditions'] as $key => $value) {
$metakey = $fields[ $value[1] ]['metakey'] ;
$arr_conditions[ $metakey ] = $_POST[ $metakey ];
}
foreach ($array['conditions'] as $key => $value) {
$metakey = $fields[ $value[1] ]['metakey'] ;
$arr_conditions[ $metakey ] = $_POST[ $metakey ];
if( isset( $_POST[ $metakey ] ) && isset( $array['conditional_value'] ) && $_POST[ $metakey ] !== $array['conditional_value'] ){
$array['required'] = 0;
}
if( isset( $_POST[ $metakey ] ) && isset( $array['conditional_value'.$a] ) && $_POST[ $metakey ] !== $array['conditional_value'.$a] ){
$array['required'] = 0;
}
}
}
}
}
}
return $array;
}
core/um-members.php
+1 -2
View File
@@ -136,14 +136,13 @@ class UM_Members {
$query_args = array();
$query_args = apply_filters( 'um_prepare_user_query_args', $query_args, $args );
$users = new WP_User_Query( $query_args );
// number of profiles for mobile
if ( $ultimatemember->mobile->isMobile() && isset( $profiles_per_page_mobile ) )
$profiles_per_page = $profiles_per_page_mobile;
$array['users'] = $users->results;
$array['users'] = array_unique( $users->results );
$array['total_users'] = (isset( $max_users ) && $max_users && $max_users <= $users->total_users ) ? $max_users : $users->total_users;