From 23abfa9dd86dc9bf274122920d3bd0475177adec Mon Sep 17 00:00:00 2001
From: Garrett Hyder <garrett@eclipsecreative.ca>
Date: Thu, 18 Jun 2015 10:39:28 -0700
Subject: [PATCH 1/2] Added User Filtering

---
 UserTags.php               | 76 +++++++++++++++++++++++++++++++++++++-
 assets/js/user_taxonomy.js | 14 +++++++
 2 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/UserTags.php b/UserTags.php
index 53dd674..ed2e26e 100755
--- a/UserTags.php
+++ b/UserTags.php
@@ -64,6 +64,10 @@ public function __construct() {
 		add_action( 'edit_user_profile_update', array( $this, 'ut_save_profile' ) );
 		add_filter( 'sanitize_user', array( $this, 'restrict_username' ) );
 		add_action( 'wp_head', array( $this, 'admin_ajax' ) );
+
+		// User Query Filter
+		add_filter( 'pre_user_query', array( $this, 'ut_users_filter_query' ) );
+		add_action( 'restrict_manage_users', array( $this, 'ut_users_filter' ) );
 	}
 
 	function ut_enqueue_scripts( $hook ) {
@@ -377,8 +381,7 @@ public function set_user_column_values( $display, $column, $term_id ) {
 			$args = array( 'taxonomy' => $tax->name, 'term' => $term->slug );
 		}
 
-		return $count;
-//		return "<a href='" . esc_url( add_query_arg( $args, 'users.php' ) ) . "'>$count</a>";
+		return "<a href='" . esc_url( add_query_arg( $args, 'users.php' ) ) . "'>".$count."</a>";
 	}
 
 	/**
@@ -560,6 +563,75 @@ function admin_ajax() {
 		</script><?php
 	}
 
+	/**
+	 * User Query Filter
+	 */
+	function ut_users_filter_query( $query ) {
+		global $wpdb, $wp_query, $pagenow;
+
+		if ( ! is_admin() || $pagenow != 'users.php' )
+			return $query;
+
+		if ( isset( $_GET['taxonomy'] ) && ! empty( $_GET['taxonomy'] ) && isset( $_GET['term'] ) && ! empty( $_GET['term'] ) ) {
+			$term_slug = $_GET['term'];
+		} else {
+			$ut_taxonomies = get_site_option( 'ut_taxonomies' );
+			if ( !empty( $ut_taxonomies ) && is_array( $ut_taxonomies ) ) {
+				foreach ( $ut_taxonomies as $ut_taxonomy ) {
+					extract( $ut_taxonomy );
+					$taxonomy_slug = ! empty( $slug ) ? $slug : ut_taxonomy_name( $name );
+					$taxonomy_slug = strlen( $taxonomy_slug ) > 32 ? substr( $taxonomy_slug, 0, 32 ) : $taxonomy_slug;
+					$taxonomy = get_taxonomy($taxonomy_slug);
+					if ( $taxonomy && isset( $_GET[$taxonomy_slug] ) && ! empty( $_GET[$taxonomy_slug] ) ) {
+						$term_slug = $_GET[$taxonomy_slug];
+						continue;
+					}
+				}
+			}
+		}
+
+		if ( ! empty( $term_slug ) ) {
+			$query->query_from .= " INNER JOIN {$wpdb->term_relationships} ON {$wpdb->users}.`ID` = {$wpdb->term_relationships}.`object_id` INNER JOIN {$wpdb->term_taxonomy} ON {$wpdb->term_relationships}.`term_taxonomy_id` = {$wpdb->term_taxonomy}.`term_taxonomy_id` INNER JOIN {$wpdb->terms} ON {$wpdb->terms}.`term_id` = {$wpdb->term_taxonomy}.`term_id`";
+			$query->query_where .= " AND {$wpdb->terms}.`slug` = '{$term_slug}'";
+		}
+
+		return $query;
+
+	}
+
+	/**
+	 * User Filter
+	 */
+	function ut_users_filter() {
+		$ut_taxonomies = get_site_option( 'ut_taxonomies' );
+		if ( empty( $ut_taxonomies ) || ! is_array( $ut_taxonomies ) ) {
+			return;
+		}
+
+		foreach ( $ut_taxonomies as $ut_taxonomy ) {
+			extract( $ut_taxonomy );
+			$taxonomy_slug = ! empty( $slug ) ? $slug : ut_taxonomy_name( $name );
+			$taxonomy_slug = strlen( $taxonomy_slug ) > 32 ? substr( $taxonomy_slug, 0, 32 ) : $taxonomy_slug;
+			$taxonomy = get_taxonomy($taxonomy_slug);
+			if ( $taxonomy ) { ?>
+				<label class="screen-reader-text" for="<?php echo $taxonomy_slug; ?>"><?php esc_html_e( 'Filter by '.$name, WP_UT_TRANSLATION_DOMAIN ); ?></label>
+				<select name="<?php echo $taxonomy_slug; ?>" id="<?php echo $taxonomy_slug; ?>" class="taxonomy-filter" style="display:inline-block; float:none;">
+					<option value=''><?php esc_html_e( 'Filter by '.$name, WP_UT_TRANSLATION_DOMAIN ); ?></option>
+					<?php
+					$taxonomy_terms = get_terms( $taxonomy_slug );
+					foreach ( $taxonomy_terms as $taxonomy_term ) : ?>
+						<option value="<?php echo esc_attr( $taxonomy_term->slug ); ?>"<?php if ( isset( $_GET[$taxonomy_slug] ) && ! empty( $_GET[$taxonomy_slug] ) && $_GET[$taxonomy_slug] == $taxonomy_term->slug) { echo ' selected="selected"'; } ?>><?php echo $taxonomy_term->name; ?></option>
+					<?php endforeach; ?>
+				</select>
+			<?php
+			}
+		}
+		submit_button( __( 'Filter', WP_UT_TRANSLATION_DOMAIN ), 'secondary', 'ut-filter-users', false );
+
+		wp_nonce_field( 'ut-filter-users', 'ut-filter-users-nonce' );
+
+	}
+
 }
 
 /**
diff --git a/assets/js/user_taxonomy.js b/assets/js/user_taxonomy.js
index bf2eac1..931d582 100755
--- a/assets/js/user_taxonomy.js
+++ b/assets/js/user_taxonomy.js
@@ -276,4 +276,18 @@ jQuery(document).ready(function ($) {
             jQuery('.user-taxonomies-page #message.below-h2').remove();
         });
     }, 3000);
+    // User Taxonomy Filters
+    jQuery('.users-php select.taxonomy-filter').each( function() {
+        if ($(this).val() != '') {
+            $('select.taxonomy-filter').not(this).prop('disabled', true);
+        }
+    });
+
+    jQuery('.users-php').on('change', 'select.taxonomy-filter', function() {
+        if ($(this).val() == '') {
+            $('select.taxonomy-filter').prop('disabled', false);
+        } else {
+            $('select.taxonomy-filter').not(this).prop('disabled', true);
+        }
+    });
 });

From 3de2f8d95e264aeef711cf09f5ee144c8bc11750 Mon Sep 17 00:00:00 2001
From: Garrett Hyder <garrett@eclipsecreative.ca>
Date: Thu, 18 Jun 2015 10:50:50 -0700
Subject: [PATCH 2/2] Added Reset Button

---
 UserTags.php               |  7 ++++++-
 assets/css/style.css       |  9 +++++++++
 assets/js/user_taxonomy.js | 10 +++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/UserTags.php b/UserTags.php
index ed2e26e..0192393 100755
--- a/UserTags.php
+++ b/UserTags.php
@@ -615,7 +615,7 @@ function ut_users_filter() {
 			$taxonomy = get_taxonomy($taxonomy_slug);
 			if ( $taxonomy ) { ?>
 				<label class="screen-reader-text" for="<?php echo $taxonomy_slug; ?>"><?php esc_html_e( 'Filter by '.$name, WP_UT_TRANSLATION_DOMAIN ); ?></label>
-				<select name="<?php echo $taxonomy_slug; ?>" id="<?php echo $taxonomy_slug; ?>" class="taxonomy-filter" style="display:inline-block; float:none;">
+				<select name="<?php echo $taxonomy_slug; ?>" id="<?php echo $taxonomy_slug; ?>" class="ut-taxonomy-filter">
 					<option value=''><?php esc_html_e( 'Filter by '.$name, WP_UT_TRANSLATION_DOMAIN ); ?></option>
 					<?php
 					$taxonomy_terms = get_terms( $taxonomy_slug );
@@ -630,6 +630,11 @@ function ut_users_filter() {
 
 		wp_nonce_field( 'ut-filter-users', 'ut-filter-users-nonce' );
 
+		?>
+		<a class="ut-reset-filters button-primary" href="users.php" title="Reset User Filters">Reset Filters</a>
+		<?php
+
+
 	}
 
 }
diff --git a/assets/css/style.css b/assets/css/style.css
index ac3e29b..002a128 100755
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -216,4 +216,13 @@ ul.user-profile-taxonomy .ntdelbutton {
     background: white;
     padding: 10px;
     width: 400px;
+}
+
+.ut-taxonomy-filter {
+    display:inline-block;
+    float:none;
+}
+
+.ut-reset-filters {
+    margin-left: 10px;
 }
\ No newline at end of file
diff --git a/assets/js/user_taxonomy.js b/assets/js/user_taxonomy.js
index 931d582..aa7667c 100755
--- a/assets/js/user_taxonomy.js
+++ b/assets/js/user_taxonomy.js
@@ -277,17 +277,17 @@ jQuery(document).ready(function ($) {
         });
     }, 3000);
     // User Taxonomy Filters
-    jQuery('.users-php select.taxonomy-filter').each( function() {
+    jQuery('.users-php select.ut-taxonomy-filter').each( function() {
         if ($(this).val() != '') {
-            $('select.taxonomy-filter').not(this).prop('disabled', true);
+            $('select.ut-taxonomy-filter').not(this).prop('disabled', true);
         }
     });
 
-    jQuery('.users-php').on('change', 'select.taxonomy-filter', function() {
+    jQuery('.users-php').on('change', 'select.ut-taxonomy-filter', function() {
         if ($(this).val() == '') {
-            $('select.taxonomy-filter').prop('disabled', false);
+            $('select.ut-taxonomy-filter').prop('disabled', false);
         } else {
-            $('select.taxonomy-filter').not(this).prop('disabled', true);
+            $('select.ut-taxonomy-filter').not(this).prop('disabled', true);
         }
     });
 });