Skip to content

adv search compatibility #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stiofan merged 2 commits into from
Mar 8, 2017
Merged

adv search compatibility #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
603b595
register redirect url
viruthagiri Mar 7, 2017
1eb1287
adv search compatibility
viruthagiri Mar 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions admin/assets/js/users-wp-admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
22 changes: 22 additions & 0 deletions admin/settings/class-users-wp-form-builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,23 @@ class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>
<ul class="widefat post fixed" style="width:100%;">

<?php
// data_type
if(has_filter("uwp_builder_data_type_{$field_type}")){

echo apply_filters("uwp_builder_data_type_{$field_type}",'',$result_str,$cf,$field_info);

}else{
$value = '';
if (isset($field_info->data_type)) {
$value = esc_attr($field_info->data_type);
}elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
$value = $cf['defaults']['data_type'];
}
?>
<input type="hidden" name="data_type" id="data_type" value="<?php echo $value;?>"/>
<?php
}

// site_title
if(has_filter("uwp_builder_site_title_{$field_type}")){

Expand Down Expand Up @@ -1290,6 +1307,7 @@ public function uwp_admin_form_field_save($request_field = array(), $default = f
$site_title = $request_field['site_title'];
$form_label = isset($request_field['form_label']) ? $request_field['form_label'] : '';
$field_type = $request_field['field_type'];
$data_type = $request_field['data_type'];
$field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type;
$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
$default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';
Expand Down Expand Up @@ -1363,6 +1381,7 @@ public function uwp_admin_form_field_save($request_field = array(), $default = f
site_title = %s,
form_label = %s,
field_type = %s,
data_type = %s,
field_type_key = %s,
htmlvar_name = %s,
default_value = %s,
Expand Down Expand Up @@ -1391,6 +1410,7 @@ public function uwp_admin_form_field_save($request_field = array(), $default = f
$site_title,
$form_label,
$field_type,
$data_type,
$field_type_key,
$htmlvar_name,
$default_value,
Expand Down Expand Up @@ -1439,6 +1459,7 @@ public function uwp_admin_form_field_save($request_field = array(), $default = f
site_title = %s,
form_label = %s,
field_type = %s,
data_type = %s,
field_type_key = %s,
htmlvar_name = %s,
default_value = %s,
Expand All @@ -1465,6 +1486,7 @@ public function uwp_admin_form_field_save($request_field = array(), $default = f
$site_title,
$form_label,
$field_type,
$data_type,
$field_type_key,
$htmlvar_name,
$default_value,
Expand Down
14 changes: 14 additions & 0 deletions includes/class-users-wp-activator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ public static function uwp_create_tables()
$form_fields = "CREATE TABLE " . $table_name . " (
id int(11) NOT NULL AUTO_INCREMENT,
form_type varchar(100) NULL,
data_type varchar(100) NULL,
field_type varchar(255) NOT NULL COMMENT 'text,checkbox,radio,select,textarea',
field_type_key varchar(255) NOT NULL,
site_title varchar(255) NULL DEFAULT NULL,
Expand Down Expand Up @@ -232,6 +233,19 @@ 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_input_type varchar(255) NULL DEFAULT NULL,
field_data_type varchar(255) NULL DEFAULT NULL,
PRIMARY KEY (id)
) $collate AUTO_INCREMENT=1 ;";

Expand Down
5 changes: 3 additions & 2 deletions includes/class-users-wp-forms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ public function process_register($data = array(), $files = array()) {
$errors->add('invalid_userorpass', __('<strong>Error</strong>: 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 {
Expand Down Expand Up @@ -1067,7 +1068,7 @@ public function uwp_form_input_datepicker($html, $field, $value, $form_type){
$date_format = $extra_fields['date_format'];
$jquery_date_format = $date_format;

if (!empty($value)) {
if (!empty($value) && !is_string($value)) {
$value = date('Y-m-d', $value);
}

Expand Down
92 changes: 74 additions & 18 deletions includes/helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ function uwp_get_usermeta( $user_id = false, $key = '', $default = false ) {
}

$user_data = get_userdata($user_id);
$usermeta = get_user_meta( $user_id, 'uwp_usermeta', true );
$usermeta = get_user_meta( $user_id, $key, true );

if ($key == 'uwp_account_email') {
$value = $user_data->user_email;
Expand All @@ -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 );
Expand All @@ -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;
}
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -2217,4 +2209,68 @@ function uwp_ucwords($string, $charset='UTF-8') {
} else {
return ucwords($string);
}
}
}

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'];
}
?>
<li>
<label for="data_type"><?php _e('Field Data Type ? :', 'userswp'); ?></label>
<div class="uwp-input-wrap">

<select name="data_type" id="data_type"
onchange="javascript:uwp_data_type_changed(this, '<?php echo $result_str; ?>');">
<option
value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {
echo 'selected="selected"';
} ?>><?php _e('CHARACTER', 'userswp'); ?></option>
<option
value="INT" <?php if ($dt_value == 'INT') {
echo 'selected="selected"';
} ?>><?php _e('NUMBER', 'userswp'); ?></option>
<option
value="FLOAT" <?php if ($dt_value == 'FLOAT') {
echo 'selected="selected"';
} ?>><?php _e('DECIMAL', 'userswp'); ?></option>
</select>
<br/> <span><?php _e('Select Custom Field type', 'userswp'); ?></span>

</div>
</li>

<?php
$value = '';
if (isset($field_info->decimal_point)) {
$value = esc_attr($field_info->decimal_point);
}elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
$value = $cf['defaults']['decimal_point'];
}
?>

<li class="decimal-point-wrapper"
style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>">
<label for="decimal_point"><?php _e('Select decimal point :', 'userswp'); ?></label>
<div class="uwp-input-wrap">
<select name="decimal_point" id="decimal_point">
<option value=""><?php echo __('Select', 'userswp'); ?></option>
<?php for ($i = 1; $i <= 10; $i++) {
$selected = $i == $value ? 'selected="selected"' : ''; ?>
<option value="<?php echo $i; ?>" <?php echo $selected; ?>><?php echo $i; ?></option>
<?php } ?>
</select>
<br/> <span><?php _e('Decimal point to display after point', 'userswp'); ?></span>
</div>
</li>
<?php

$output = ob_get_clean();
return $output;
}
add_filter('uwp_builder_data_type_text','uwp_builder_data_type_text', 10, 4);
Binary file added public/assets/images/arrow18x11.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/down-arrow18x11.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 15 additions & 8 deletions uninstall.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,21 @@
delete_option('uwp_default_data_installed');
//delete_option('uwp_db_version');


$table_name = $wpdb->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';
Expand All @@ -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 );
}