From 9c7d4df8ffc746ca86a4b4ae69642134fccc818e Mon Sep 17 00:00:00 2001
From: Ultimate Member <umplugin@gmail.com>
Date: Thu, 3 Dec 2015 21:37:17 +0200
Subject: [PATCH] New members query filter

---
 core/um-fields.php          | 15 ++++++++++++---
 core/um-filters-members.php |  3 +++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/um-fields.php b/core/um-fields.php
index 0db89032..c5c98f07 100644
--- a/core/um-fields.php
+++ b/core/um-fields.php
@@ -1521,6 +1521,9 @@ class UM_Fields {
 				
 			/* Multi-Select dropdown */
 			case 'multiselect':
+			
+				$max_selections = ( isset( $max_selections ) ) ? absint( $max_selections ) : 0;
+				
 				$output .= '<div class="um-field' . $classes . '"' . $conditional . ' data-key="'.$key.'">';
 
 						if ( isset( $data['allowclear'] ) && $data['allowclear'] == 0 ) {
@@ -1535,7 +1538,7 @@ class UM_Fields {
 
 						$output .= '<div class="um-field-area">';
 						
-						$output .= '<select multiple="multiple" name="'.$key.'[]" id="'.$key.'" data-validate="'.$validate.'" data-key="'.$key.'" class="'.$this->get_class($key, $data, $class).'" style="width: 100%" data-placeholder="'.$placeholder.'">';
+						$output .= '<select multiple="multiple" name="'.$key.'[]" id="'.$key.'" data-maxsize="'. $max_selections . '" data-validate="'.$validate.'" data-key="'.$key.'" class="'.$this->get_class($key, $data, $class).'" style="width: 100%" data-placeholder="'.$placeholder.'">';
 						
 						if ( isset($options) && $options == 'builtin'){
 							$options = $ultimatemember->builtin->get ( $filter );
@@ -1555,8 +1558,14 @@ class UM_Fields {
 						
 							$v = rtrim($v);
 							
-							$output .= '<option value="'.$v.'" ';
-							if ( $this->is_selected($key, $v, $data) ) { 
+							if ( is_string( $k ) ) {
+								$opt_value = $k;
+							} else {
+								$opt_value = $v;
+							}
+							
+							$output .= '<option value="'.$opt_value.'" ';
+							if ( $this->is_selected($key, $opt_value, $data) ) { 
 								$output.= 'selected';
 							}
 							$output .= '>'.$v.'</option>';
diff --git a/core/um-filters-members.php b/core/um-filters-members.php
index 979ea59d..43921fd7 100644
--- a/core/um-filters-members.php
+++ b/core/um-filters-members.php
@@ -99,6 +99,9 @@
 
 		}
 		
+		// allow filtering
+		$query_args = apply_filters('um_query_args_filter', $query_args );
+		
 		if ( count ($query_args['meta_query']) == 1 ) {
 			unset( $query_args['meta_query'] );
 		}