From 7c85f7c4236aba8855f9f42df517acffd0d2f357 Mon Sep 17 00:00:00 2001
From: champsupertramp <heychampsupertramp@gmail.com>
Date: Mon, 11 Jul 2016 21:49:52 +0800
Subject: [PATCH] Fix user_login field validation type

---
 admin/core/um-admin-actions-modal.php  |  8 ++++----
 admin/core/um-admin-filters-fields.php | 15 +++++++++++++++
 admin/core/um-admin-metabox.php        | 10 ++++++----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/admin/core/um-admin-actions-modal.php b/admin/core/um-admin-actions-modal.php
index 9a309811..b8c4bfd9 100644
--- a/admin/core/um-admin-actions-modal.php
+++ b/admin/core/um-admin-actions-modal.php
@@ -249,21 +249,21 @@
 
 				<div class="um-admin-half">
 				
-					<?php if ( isset( $col1 ) ) {  foreach( $col1 as $opt ) $metabox->field_input ( $opt ); } ?>
+					<?php if ( isset( $col1 ) ) {  foreach( $col1 as $opt ) $metabox->field_input ( $opt, null, $metabox->edit_array ); } ?>
 					
 				</div>
 				
 				<div class="um-admin-half um-admin-right">
 				
-					<?php if ( isset( $col2 ) ) {  foreach( $col2 as $opt ) $metabox->field_input ( $opt ); } ?>
+					<?php if ( isset( $col2 ) ) {  foreach( $col2 as $opt ) $metabox->field_input ( $opt, null, $metabox->edit_array ); } ?>
 					
 				</div><div class="um-admin-clear"></div>
 				
-				<?php if ( isset( $col3 ) ) { foreach( $col3 as $opt ) $metabox->field_input ( $opt ); } ?>
+				<?php if ( isset( $col3 ) ) { foreach( $col3 as $opt ) $metabox->field_input ( $opt, null, $metabox->edit_array ); } ?>
 				
 				<div class="um-admin-clear"></div>
 				
-				<?php if ( isset( $col_full ) ) {foreach( $col_full as $opt ) $metabox->field_input ( $opt ); } ?>
+				<?php if ( isset( $col_full ) ) {foreach( $col_full as $opt ) $metabox->field_input ( $opt, null, $metabox->edit_array ); } ?>
 				
 				<?php do_action('um_admin_field_modal_footer', $arg2, $args, $metabox->in_edit, (isset( $metabox->edit_array ) ) ? $metabox->edit_array : '' ); ?>
 	
diff --git a/admin/core/um-admin-filters-fields.php b/admin/core/um-admin-filters-fields.php
index e83c4c3c..62b081ff 100644
--- a/admin/core/um-admin-filters-fields.php
+++ b/admin/core/um-admin-filters-fields.php
@@ -115,4 +115,19 @@
 
 		return $errors;
 		
+	}
+
+    /***
+    *** @Filter validation types on loop
+    ****/
+	add_filter('um_builtin_validation_types_continue_loop', 'um_builtin_validation_types_continue_loop', 1, 4);
+	function um_builtin_validation_types_continue_loop( $break, $key, $form_id, $field_array ){
+        
+
+        // show unique username validation only for user_login field
+		if( $field_array['metakey'] == 'user_login' && $key !== 'unique_username' ){
+               return false;
+		}
+
+		return $break;
 	}
\ No newline at end of file
diff --git a/admin/core/um-admin-metabox.php b/admin/core/um-admin-metabox.php
index 51549f31..0ea5482a 100644
--- a/admin/core/um-admin-metabox.php
+++ b/admin/core/um-admin-metabox.php
@@ -444,7 +444,7 @@ class UM_Admin_Metabox {
 	/***
 	***	@Show field input for edit
 	***/
-	function field_input ( $attribute, $form_id=null ) {
+	function field_input ( $attribute, $form_id=null, $field_args = array() ) {
 	
 		global 	$ultimatemember;
 		
@@ -582,9 +582,11 @@ class UM_Admin_Metabox {
 						<option value="" <?php selected( '', $this->edit_mode_value ); ?>></option>	
 						
 						<?php foreach( $ultimatemember->builtin->validation_types() as $key => $name ) { ?>
-						
-						<option value="<?php echo $key; ?>" <?php selected( $key, $this->edit_mode_value ); ?>><?php echo $name; ?></option>
-
+							<?php 
+								$continue = apply_filters("um_builtin_validation_types_continue_loop", true, $key, $form_id, $field_args );
+							if( $continue ){ ?>
+							<option value="<?php echo $key; ?>" <?php selected( $key, $this->edit_mode_value ); ?>><?php echo $name; ?></option>
+							<?php } ?>
 						<?php } ?>
 
 						</select>