Closes #227. Depends on #243 to work.

git-svn-id: https://code.elgg.org/elgg/trunk@1903 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 12 insertions, 1 deletions

diff --git a/actions/email/confirm.php b/actions/email/confirm.php
index 64c2c766a..39eb68908 100644
--- a/actions/email/confirm.php
+++ b/actions/email/confirm.php
@@ -14,6 +14,9 @@
 	global $CONFIG;
 
 	// Get user id
+	$access_status = access_get_show_hidden_status();
+	access_show_hidden_entities(true);
+	
 	$user_guid = (int)get_input('u');
 	$user = get_entity($user_guid);
 	
@@ -26,6 +29,8 @@
 			system_message(elgg_echo('email:confirm:success'));
 		
 			$user = get_entity($user_guid);
+			$user->enable();
+			
 			notify_user($user_guid, $CONFIG->site->guid, sprintf(elgg_echo('email:validate:success:subject'), $user->username), sprintf(elgg_echo('email:validate:success:body'), $user->name), NULL, 'email');
 			
 		} else
@@ -33,6 +38,8 @@
 	}
 	else
 		register_error(elgg_echo('email:confirm:fail'));
+		
+	access_show_hidden_entities($access_status);
 	
 	forward($_SERVER['HTTP_REFERER']);
 	exit;
diff --git a/actions/register.php b/actions/register.php
index 38d1893b9..059e69f50 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -39,15 +39,19 @@
 					) &&
 					($guid = register_user($username, $password, $name, $email))
 				) {
+					
+					$new_user = get_entity($guid);
 					if (($guid) && ($admin))
 					{
 						admin_gatekeeper(); // Only admins can make someone an admin
-						$new_user = get_entity($guid);
 						$new_user->admin = 'yes';
 					}
 					
 					// Send email validation on register only
 					request_email_validation($guid);
+					
+					// Now disable
+					$new_user->disable('new_user');
 					

 					system_message(sprintf(elgg_echo("registerok"),$CONFIG->sitename));