From dedf6e84a3563c262dbedab4d5aebff3b3001fd0 Mon Sep 17 00:00:00 2001
From: jonfalcon <darkutubuki143@gmail.com>
Date: Thu, 28 Jan 2016 10:16:14 -0800
Subject: [PATCH 1/2] Fix telno input styles

---
 assets/css/um-styles.css              | 6 +++++-
 assets/dynamic_css/dynamic_global.php | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/assets/css/um-styles.css b/assets/css/um-styles.css
index 5cebc45a..c3e2472f 100644
--- a/assets/css/um-styles.css
+++ b/assets/css/um-styles.css
@@ -381,6 +381,7 @@ p.um-notice.warning {
 }
 
 .um-form input[type=text],
+.um-form input[type=tel],
 .um-form input[type=number],
 .um-form input[type=password] {
 	padding: 0 12px !important;
@@ -407,6 +408,7 @@ p.um-notice.warning {
 }
 
 .um-form input[type=text]:focus,
+.um-form input[type=tel]:focus,
 .um-form input[type=number]:focus,
 .um-form input[type=password]:focus,
 .um-form textarea:focus {
@@ -415,9 +417,11 @@ p.um-notice.warning {
 }
 
 .um-form input[type=text].um-iconed,
+.um-form input[type=tel].um-iconed,
 .um-form input[type=password].um-iconed { padding-left: 44px !important }
 
 .um-form input[type=text].um-error,
+.um-form input[type=tel].um-error,
 .um-form input[type=password].um-error { border-color: #C74A4A !important }
 
 .um-form textarea {
@@ -737,4 +741,4 @@ span.um-req {
 	margin: 0 0 0 8px;
 	font-size: 14px;
 	display: inline-block;
-}
\ No newline at end of file
+}
diff --git a/assets/dynamic_css/dynamic_global.php b/assets/dynamic_css/dynamic_global.php
index f6187a41..0b7bb129 100644
--- a/assets/dynamic_css/dynamic_global.php
+++ b/assets/dynamic_css/dynamic_global.php
@@ -146,6 +146,7 @@ print ".um-$form_id.um .um-button.um-alt,
 if ( $form_border ) {
 print "
 .um-$form_id.um .um-form input[type=text],
+.um-$form_id.um .um-form input[type=tel],
 .um-$form_id.um .um-form input[type=number],
 .um-$form_id.um .um-form input[type=password],
 .um-$form_id.um .um-form textarea,
@@ -167,6 +168,7 @@ print "
 if ( $form_border_hover ) {
 print "
 .um-$form_id.um .um-form input[type=text]:focus,
+.um-$form_id.um .um-form input[type=tel]:focus,
 .um-$form_id.um .um-form input[type=number]:focus,
 .um-$form_id.um .um-form input[type=password]:focus,
 .um-$form_id.um .um-form textarea:focus {
@@ -178,6 +180,7 @@ print "
 if ( $form_bg_color ) {
 print "
 .um-$form_id.um .um-form input[type=text],
+.um-$form_id.um .um-form input[type=tel],
 .um-$form_id.um .um-form input[type=number],
 .um-$form_id.um .um-form input[type=password],
 .um-$form_id.um .um-form textarea,
@@ -192,6 +195,7 @@ print "
 if ( $form_bg_color_focus ) {
 print "
 .um-$form_id.um .um-form input[type=text]:focus,
+.um-$form_id.um .um-form input[type=tel]:focus,
 .um-$form_id.um .um-form input[type=number]:focus,
 .um-$form_id.um .um-form input[type=password]:focus,
 .um-$form_id.um .um-form textarea:focus {
@@ -270,6 +274,7 @@ if ( $form_text_color ) {
 print "
 
 .um-$form_id.um .um-form input[type=text],
+.um-$form_id.um .um-form input[type=tel],
 .um-$form_id.um .um-form input[type=password],
 .um-$form_id.um .um-form textarea
 {
@@ -298,4 +303,4 @@ print "
 }
 
 ?>
-</style>
\ No newline at end of file
+</style>

From 3bb5aba6a4e3bec887b12c3132030a92ef75169a Mon Sep 17 00:00:00 2001
From: jonfalcon <darkutubuki143@gmail.com>
Date: Fri, 29 Jan 2016 16:51:50 -0800
Subject: [PATCH 2/2] Fix unchecked access roles

---
 admin/templates/access/settings.php | 53 +++++++++++++++--------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/admin/templates/access/settings.php b/admin/templates/access/settings.php
index 52c359fb..521646d0 100644
--- a/admin/templates/access/settings.php
+++ b/admin/templates/access/settings.php
@@ -1,39 +1,39 @@
 	<?php
-		
+
 		$metabox = new UM_Admin_Metabox();
-		
+
 		do_action('um_admin_before_access_settings', $metabox);
-		
+
 	?>
-	
+
 	<h4><?php _e('Apply custom access settings?','ultimatemember'); ?> <?php $this->tooltip( __('Switch to yes to override global access settings','ultimatemember'), 'e'); ?></h4>
-	
+
 	<p>
 		<span><?php $metabox->ui_on_off('_um_custom_access_settings', 0, true, 1, '_um_custom_access_settings', 'xxx'); ?>	</span>
 	</p>
-	
+
 	<div class="_um_custom_access_settings">
-	
+
 		<h4><?php _e('Content Availability','ultimatemember'); ?> <?php $this->tooltip( __('Who can access this content?','ultimatemember'), 'e'); ?></h4>
-		
+
 		<p class="um-conditional-radio-group description" data-cond1="2" data-cond1-show="um-admin-access-roles" data-cond2="1" data-cond2-show="um-admin-access-loggedout">
-		
+
 			<?php $value = get_post_meta($post->ID, '_um_accessible', true); ?>
-			
+
 			<label><input type="radio" name="_um_accessible" value="0" <?php if (!isset($value) || $value == 0 ) echo 'checked="checked"'; ?> /> <?php _e('Content accessible to Everyone','ultimatemember'); ?></label><br />
 			<label><input type="radio" name="_um_accessible" value="1" <?php if (isset($value)) checked(1, $value); ?> /> <?php _e('Content accessible to Logged Out Users','ultimatemember'); ?></label><br />
 			<label><input type="radio" name="_um_accessible" value="2" <?php if (isset($value)) checked(2, $value); ?> /> <?php _e('Content accessible to Logged In Users','ultimatemember'); ?></label>
-			
+
 			<?php do_action( 'um_admin_extend_access_settings' ); ?>
-			
+
 		</p>
-		
+
 		<div class="um-admin-access-loggedout">
-		
+
 			<h4><label for="_um_access_redirect2"><?php _e('Redirect URL','ultimatemember'); ?></label> <?php $this->tooltip( __('This is the URL that user is redirected to If he is not permitted to view this content','ultimatemember'), 'e'); ?></h4>
-			
+
 			<p class="description">
-			
+
 				<?php $value = get_post_meta($post->ID, '_um_access_redirect2', true); ?>
 
 				<input type="text" name="_um_access_redirect2" id="_um_access_redirect2" value="<?php if ( isset( $value ) ) echo $value; ?>" class="widefat" />
@@ -41,31 +41,32 @@
 			</p>
 
 		</div>
-		
+
 		<div class="um-admin-access-roles">
-		
+
 			<h4><?php _e('Select the member roles that can see this content?','ultimatemember'); ?> <?php $this->tooltip( __('If you do not select any role, all members will be able to view this content','ultimatemember'), 'e'); ?></h4>
-			
+
 			<p class="description">
-			
+
 				<?php $value = get_post_meta($post->ID, '_um_access_roles', true); ?>
-				
+
+				<input type="hidden" name="_um_access_roles[]" value="0">
 				<?php foreach($ultimatemember->query->get_roles() as $role_id => $role) { ?>
 				<label><input type="checkbox" name="_um_access_roles[]" value="<?php echo $role_id; ?>" <?php if (  ( isset( $value ) && is_array( $value ) && in_array($role_id, $value ) ) || ( isset( $value ) && $role_id == $value ) ) echo 'checked="checked"'; ?> /> <?php echo $role; ?></label><br />
 				<?php } ?>
 
 			</p>
-			
+
 			<h4><label for="_um_access_redirect"><?php _e('Redirect URL','ultimatemember'); ?></label> <?php $this->tooltip( __('This is the URL that user is redirected to If he is not permitted to view this content','ultimatemember'), 'e'); ?></h4>
-			
+
 			<p class="description">
 
 				<?php $value = get_post_meta($post->ID, '_um_access_redirect', true); ?>
-				
+
 				<input type="text" name="_um_access_redirect" id="_um_access_redirect" value="<?php if ( isset( $value ) ) echo $value; ?>" class="widefat" />
 
 			</p>
 
 		</div>
-	
-	</div>
\ No newline at end of file
+
+	</div>