From 603b595675680fa562fcbcc68c3ef7692088e84f Mon Sep 17 00:00:00 2001 From: Giri Dhar Date: Tue, 7 Mar 2017 21:02:10 +0530 Subject: [PATCH 1/2] register redirect url --- includes/class-users-wp-activator.php | 12 ++++++++++++ includes/class-users-wp-forms.php | 3 ++- public/assets/images/arrow18x11.png | Bin 0 -> 396 bytes public/assets/images/down-arrow18x11.png | Bin 0 -> 412 bytes 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 public/assets/images/arrow18x11.png create mode 100644 public/assets/images/down-arrow18x11.png diff --git a/includes/class-users-wp-activator.php b/includes/class-users-wp-activator.php index 012c754f..70c4e8db 100644 --- a/includes/class-users-wp-activator.php +++ b/includes/class-users-wp-activator.php @@ -232,6 +232,18 @@ public static function uwp_create_tables() sort_order int(11) NOT NULL, is_default enum( '0', '1' ) NOT NULL DEFAULT '0', is_dummy enum( '0', '1' ) NOT NULL DEFAULT '0', + expand_custom_value int(11) NULL DEFAULT NULL, + searching_range_mode int(11) NULL DEFAULT NULL, + expand_search int(11) NULL DEFAULT NULL, + front_search_title varchar(255) CHARACTER SET utf8 NULL DEFAULT NULL, + first_search_value int(11) NULL DEFAULT NULL, + first_search_text varchar(255) CHARACTER SET utf8 NULL DEFAULT NULL, + last_search_text varchar(255) CHARACTER SET utf8 NULL DEFAULT NULL, + search_min_value int(11) NULL DEFAULT NULL, + search_max_value int(11) NULL DEFAULT NULL, + search_diff_value int(11) NULL DEFAULT NULL, + search_condition varchar(100) NULL DEFAULT NULL, + field_data_type varchar(255) NULL DEFAULT NULL, PRIMARY KEY (id) ) $collate AUTO_INCREMENT=1 ;"; diff --git a/includes/class-users-wp-forms.php b/includes/class-users-wp-forms.php index 3038067a..66e1ec26 100644 --- a/includes/class-users-wp-forms.php +++ b/includes/class-users-wp-forms.php @@ -310,7 +310,8 @@ public function process_register($data = array(), $files = array()) { $errors->add('invalid_userorpass', __('Error: Invalid username or Password.', 'userswp')); return $errors; } else { - wp_redirect(home_url('/')); + $regsiter_redirect = apply_filters('uwp_register_redirect_url', home_url('/')); + wp_redirect($regsiter_redirect); exit(); } } else { diff --git a/public/assets/images/arrow18x11.png b/public/assets/images/arrow18x11.png new file mode 100644 index 0000000000000000000000000000000000000000..a6a5f5000b68b8459b3a26311e9c9a3702a1e7d4 GIT binary patch literal 396 zcmV;70dxL|P)IV>Z2&7ZqqbC*S%tH^e+$_ zc5K_e1|o4GOw$xumK|7@^~&1TAP~ZUjSE~HJC39Kws0ikI36Q;p|^)PnnY1_=KFpN z=o}!J*L6XA+6zK_;(6W!CkuV0)uHEfW;lIAd$<rCf5;b%jRfwTEUw zA1#5jfYa{CWkkqpAzj#SUPtV?Ty=EA!XyksF=Xf~l9k2xcmh0aKcv1Z!9D|$^xyQx qUm)#@msRBD)pb3us_OGcfB^uFoo`5P^Clnw00004_1uMlyYsk{_EKSquvMg6^+x}*4Nea(dmhJk!pI22iAYTL5yBo|P2!axl z1M-P%*l*%EJ`BUKK+!USL=;5=q7mVl%4OSt;F88unx=}lZzPfDx$r!1%9)cED`x;9 zGY?(YeJhHhlT6jX2*+{W!EBSiwmmrqoZ#0Eeu=ITRSnf5Ns=S5kF!15q5c7{uGoK6 zsTgAg^*hqh{2|#PKj*X0pYL10)JCcDWz5YE$>W7Y4cQkS?BUl72Y*Lm+!B+|>3wva zkv+FFMbQN+6p7$@98 Date: Wed, 8 Mar 2017 23:23:09 +0530 Subject: [PATCH 2/2] adv search compatibility --- admin/assets/js/users-wp-admin.js | 21 +++++ .../settings/class-users-wp-form-builder.php | 22 +++++ includes/class-users-wp-activator.php | 2 + includes/class-users-wp-forms.php | 2 +- includes/helpers.php | 92 +++++++++++++++---- uninstall.php | 23 +++-- 6 files changed, 135 insertions(+), 27 deletions(-) diff --git a/admin/assets/js/users-wp-admin.js b/admin/assets/js/users-wp-admin.js index 7814b7bf..237e2140 100644 --- a/admin/assets/js/users-wp-admin.js +++ b/admin/assets/js/users-wp-admin.js @@ -220,6 +220,27 @@ jQuery(document).ready(function () { }); }); +function uwp_data_type_changed(obj, cont) { + if (obj && cont) { + jQuery('#licontainer_' + cont).find('.decimal-point-wrapper').hide(); + if (jQuery(obj).val() == 'FLOAT') { + jQuery('#licontainer_' + cont).find('.decimal-point-wrapper').show(); + } + + if (jQuery(obj).val() == 'FLOAT' || jQuery(obj).val() == 'INT') { + jQuery('#licontainer_' + cont).find('.uwp-price-extra-set').show(); + + if(jQuery('#licontainer_' + cont).find(".uwp-price-extra-set input[name='extra[is_price]']:checked").val()=='1'){ + jQuery('#licontainer_' + cont).find('.uwp-price-extra').show(); + } + + }else{ + jQuery('#licontainer_' + cont).find('.uwp-price-extra-set').hide(); + jQuery('#licontainer_' + cont).find('.uwp-price-extra').hide(); + } + } +} + function save_field(id) { if (jQuery('#licontainer_' + id + ' #htmlvar_name').length > 0) { diff --git a/admin/settings/class-users-wp-form-builder.php b/admin/settings/class-users-wp-form-builder.php index 3821ffa2..a30300ac 100644 --- a/admin/settings/class-users-wp-form-builder.php +++ b/admin/settings/class-users-wp-form-builder.php @@ -754,6 +754,23 @@ class="handlediv close">
    data_type)) { + $value = esc_attr($field_info->data_type); + }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){ + $value = $cf['defaults']['data_type']; + } + ?> + + user_email; @@ -287,10 +287,7 @@ function uwp_get_usermeta( $user_id = false, $key = '', $default = false ) { } elseif ($key == 'uwp_account_bio') { $value = $user_data->description; } else { - if( !is_array( $usermeta ) ) { - $usermeta = array(); - } - $value = isset( $usermeta[ $key ] ) ? $usermeta[ $key ] : $default; + $value = $usermeta ? $usermeta : $default; } $value = apply_filters( 'uwp_get_usermeta', $value, $user_id, $key, $default ); return apply_filters( 'uwp_get_usermeta_' . $key, $value, $user_id, $key, $default ); @@ -302,20 +299,12 @@ function uwp_update_usermeta( $user_id = false, $key, $value ) { return false; } - $usermeta = get_user_meta( $user_id, 'uwp_usermeta', true ); - - if( !is_array( $usermeta ) ) { - $usermeta = array(); - } - - $usermeta[ $key ] = $value; - - $usermeta = apply_filters( 'uwp_update_usermeta', $usermeta, $user_id, $key, $value ); - $usermeta = apply_filters( 'uwp_update_usermeta_' . $key, $usermeta, $user_id, $key, $value ); + $value = apply_filters( 'uwp_update_usermeta', $value, $user_id, $key ); + $value = apply_filters( 'uwp_update_usermeta_' . $key, $value, $user_id, $key ); - do_action( 'uwp_before_update_usermeta', $usermeta, $user_id, $key, $value ); + do_action( 'uwp_before_update_usermeta', $user_id, $key, $value ); - update_user_meta($user_id, 'uwp_usermeta', $usermeta); + update_user_meta($user_id, $key, $value); return true; } @@ -1277,6 +1266,9 @@ function get_uwp_users_list() { $number = uwp_get_option('profile_no_of_items', 10); + $where = ''; + $where = apply_filters('uwp_users_search_where', $where); + var_dump($where); if ($keyword) { $users = $wpdb->get_results($wpdb->prepare( @@ -2217,4 +2209,68 @@ function uwp_ucwords($string, $charset='UTF-8') { } else { return ucwords($string); } -} \ No newline at end of file +} + +function uwp_builder_data_type_text($output,$result_str,$cf,$field_info){ + ob_start(); + + $dt_value = ''; + if (isset($field_info->data_type)) { + $dt_value = esc_attr($field_info->data_type); + }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){ + $dt_value = $cf['defaults']['data_type']; + } + ?> +
  • + +
    + + +
    + +
    +
    • + + decimal_point)) { + $value = esc_attr($field_info->decimal_point); + }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){ + $value = $cf['defaults']['decimal_point']; + } + ?> + +
  • + +
    + +
    +
    +
    • + prefix . 'uwp_form_fields'; + $rows = $wpdb->get_results("select * from " . $table_name . ""); + + // Delete user meta for all users + $meta_type = 'user'; + $user_id = 0; // This will be ignored, since we are deleting for all users. + $meta_key = 'uwp_usermeta'; + $meta_value = ''; // Also ignored. The meta will be deleted regardless of value. + $delete_all = true; + + foreach ($rows as $row) { + delete_metadata( $meta_type, $user_id, $row->htmlvar_name, $meta_value, $delete_all ); + } + // Drop tables. // Drop form fields table $table_name = $wpdb->prefix . 'uwp_form_fields'; @@ -40,13 +55,5 @@ $extras_table_name = $wpdb->prefix . 'uwp_form_extras'; $sql = "DROP TABLE IF EXISTS $extras_table_name"; $wpdb->query($sql); - - // Delete user meta for all users - $meta_type = 'user'; - $user_id = 0; // This will be ignored, since we are deleting for all users. - $meta_key = 'uwp_usermeta'; - $meta_value = ''; // Also ignored. The meta will be deleted regardless of value. - $delete_all = true; - delete_metadata( $meta_type, $user_id, $meta_key, $meta_value, $delete_all ); } \ No newline at end of file