From 2b8d2515a128e7b2569b7032653ce6e34d1427ad Mon Sep 17 00:00:00 2001
From: ultimatemember <umplugin@gmail.com>
Date: Wed, 21 Jan 2015 15:05:02 +0200
Subject: [PATCH] Updated readme

---
 admin/core/um-admin-metabox.php |  4 +--
 core/um-actions-wpadmin.php     | 45 +++++++++++++++++++++++++++++++++
 readme.txt                      |  4 +++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/admin/core/um-admin-metabox.php b/admin/core/um-admin-metabox.php
index e96790b9..8d3de100 100644
--- a/admin/core/um-admin-metabox.php
+++ b/admin/core/um-admin-metabox.php
@@ -820,7 +820,7 @@ class UM_Admin_Metabox {
 			case '_force_good_pass':
 				?>
 
-					<p><label for="_force_good_pass">Force strong password? <?php $this->tooltip('Whether to force user to use a strong password or not'); ?></label>
+					<p><label for="_force_good_pass">Force strong password? <?php $this->tooltip( __('Turn on to force users to create a strong password (must include 1 number and 1 uppercase character). If turned on this option is only applied to register forms and not to login forms.','ultimatemember') ); ?></label>
 						<?php if ( isset( $this->edit_mode_value ) ) $this->ui_on_off('_force_good_pass', $this->edit_mode_value ); else  $this->ui_on_off('_force_good_pass', 0 ); ?>
 					</p>
 				
@@ -830,7 +830,7 @@ class UM_Admin_Metabox {
 			case '_force_confirm_pass':
 				?>
 
-					<p><label for="_force_confirm_pass">Automatically add a confirm password field? <?php $this->tooltip('Whether to force user to confirm password or not'); ?></label>
+					<p><label for="_force_confirm_pass">Automatically add a confirm password field? <?php $this->tooltip( __('Turn on to add a confirm password field. If turned on the confirm password field will only show on register forms and not on login forms.','ultimatemember') ); ?></label>
 						<?php if ( isset( $this->edit_mode_value ) ) $this->ui_on_off('_force_confirm_pass', $this->edit_mode_value ); else  $this->ui_on_off('_force_confirm_pass', 1 ); ?>
 					</p>
 				
diff --git a/core/um-actions-wpadmin.php b/core/um-actions-wpadmin.php
index 0210ba81..eb211912 100644
--- a/core/um-actions-wpadmin.php
+++ b/core/um-actions-wpadmin.php
@@ -1,5 +1,50 @@
 <?php
 
+	/***
+	***	@redirect wp-admin for non guests
+	***/
+	add_action('init','um_block_wpadmin_for_guests');
+	function um_block_wpadmin_for_guests() {
+	global $pagenow;
+	
+		// Login screen
+		if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && !is_user_logged_in() && !isset( $_REQUEST['action'] ) ) {
+			
+			$allowed = um_get_option('wpadmin_login');
+			if ( !$allowed ) {
+				
+				$act = um_get_option('wpadmin_login_redirect');
+				$custom_url = um_get_option('wpadmin_login_redirect_url');
+				
+				if ( $act == 'um_login_page' || !$custom_url ) {
+					$redirect = um_get_core_page('login');
+				} else {
+					$redirect = $custom_url;
+				}
+				exit( wp_redirect( $redirect ) );
+			}
+		}
+		
+		// Register screen
+		if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && !is_user_logged_in() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'register' ) {
+			
+			$allowed = um_get_option('wpadmin_register');
+			if ( !$allowed ) {
+				
+				$act = um_get_option('wpadmin_register_redirect');
+				$custom_url = um_get_option('wpadmin_register_redirect_url');
+				
+				if ( $act == 'um_register_page' || !$custom_url ) {
+					$redirect = um_get_core_page('register');
+				} else {
+					$redirect = $custom_url;
+				}
+				exit( wp_redirect( $redirect ) );
+			}
+		}
+
+	}
+	
 	/***
 	***	@checks if user can access the backend
 	***/
diff --git a/readme.txt b/readme.txt
index 7955d5f5..d7cc1c78 100644
--- a/readme.txt
+++ b/readme.txt
@@ -17,6 +17,10 @@ The easiest way to create powerful online communities and beautiful user profile
 
 Ultimate Member is a powerful plugin that allows you to add beautiful user profiles to your site and create advanced online communities. The plugin enables users to sign up and become members of your site all from the front-end. With a focus on flexibility and simplicity creating a community and membership site with WordPress has never been so easy.
 
+**Beta release**
+
+Please note this is the first release of the plugin and whilst we have done a lot of testing to ensure plugin and theme compatibility it is possible that you may come across a bug or plugin/theme conflict. If you do we kindly ask you to post on our [community forum](https://ultimatemember.com/forums) so we can fix any potential issues you may find.
+
 Features of the plugin include:
 
 * Front-end user registration