From 1c0bda3d9868cf62788eaf88317af35326e0b4e7 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Tue, 8 Nov 2011 06:45:18 -0500
Subject: it is GPL General Public License not GPL Public License

---
 mod/uservalidationbyemail/manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/uservalidationbyemail')

diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index 232ba71ca..800dd2641 100644
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -8,7 +8,7 @@
 	<description>Simple user account validation via email.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
-- 
cgit v1.2.3


From 2aa0e3846b60a44c6f2dbfe2f9a690776533dca3 Mon Sep 17 00:00:00 2001
From: hypeJunction <ismayil.khayredinov@hypejunction.com>
Date: Mon, 12 Dec 2011 23:31:26 +0100
Subject: Fixed #4198 uservalidationbyemail respects the return value of the
 register,user hook

---
 mod/uservalidationbyemail/start.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'mod/uservalidationbyemail')

diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index 8de5d0522..576e12247 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -69,6 +69,12 @@ function uservalidationbyemail_disable_new_user($hook, $type, $value, $params) {
 		return;
 	}
 
+	// another plugin is requesting that registration be terminated
+	// no need for uservalidationbyemail
+	if (!$value) {
+		return $value;
+	}
+
 	// disable user to prevent showing up on the site
 	// set context so our canEdit() override works
 	elgg_push_context('uservalidationbyemail_new_user');
-- 
cgit v1.2.3


From 32d30e7b805e7c9c192b69516c211e90a2b3862e Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Thu, 15 Dec 2011 07:27:42 -0500
Subject: Refs #4196 integrates fix into 1.8 branch

---
 mod/uservalidationbyemail/lib/functions.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'mod/uservalidationbyemail')

diff --git a/mod/uservalidationbyemail/lib/functions.php b/mod/uservalidationbyemail/lib/functions.php
index eaca374f4..f3091f94d 100644
--- a/mod/uservalidationbyemail/lib/functions.php
+++ b/mod/uservalidationbyemail/lib/functions.php
@@ -87,7 +87,13 @@ function uservalidationbyemail_get_unvalidated_users_sql_where() {
 	global $CONFIG;
 
 	$validated_id = get_metastring_id('validated');
-	$one_id = get_metastring_id(1);
+	if ($validated_id === false) {
+		$validated_id = add_metastring('validated');
+	}
+	$one_id = get_metastring_id('1');
+	if ($one_id === false) {
+		$one_id = add_metastring('1');
+	}
 
 	// thanks to daveb@freenode for the SQL tips!
 	$wheres = array();
-- 
cgit v1.2.3


From 53e6eb8ad8c71ed04e33b32024e3e2ea4e6e2c18 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 17 Dec 2011 08:11:36 -0500
Subject: Fixes #4217 user validation by email now respects decisions by other
 plugins

---
 mod/uservalidationbyemail/start.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'mod/uservalidationbyemail')

diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index 576e12247..ea59a2e7b 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -75,6 +75,11 @@ function uservalidationbyemail_disable_new_user($hook, $type, $value, $params) {
 		return $value;
 	}
 
+	// has the user already been validated?
+	if (elgg_get_user_validation_status($user->guid) == true) {
+		return $value;
+	}
+
 	// disable user to prevent showing up on the site
 	// set context so our canEdit() override works
 	elgg_push_context('uservalidationbyemail_new_user');
-- 
cgit v1.2.3