From bd0f63980ba0d0e606f2dd7a65313f7e150d330a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 27 Jan 2018 12:51:48 -0800
Subject: Usability improvements to registration/verification workflow. This
 requires additional testing.

---
 Zotlabs/Module/Email_validation.php | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 Zotlabs/Module/Email_validation.php

(limited to 'Zotlabs/Module/Email_validation.php')

diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php
new file mode 100644
index 000000000..4cc016847
--- /dev/null
+++ b/Zotlabs/Module/Email_validation.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Zotlabs\Module;
+
+
+class Email_validation extends \Zotlabs\Web\Controller {
+
+	function post() {
+
+		if($_POST['token']) {
+			if(! account_approve(trim($_POST['token']))) {
+				notice('Token verification failed.');
+			}
+		}
+
+	}
+
+
+	function get() {
+
+		if(argc() > 1) {
+			$email = hex2bin(argv(1));
+		}
+
+		$o = replace_macros(get_markup_template('email_validation.tpl'), [
+			'$title' => t('Email Verification Required'),
+			'$desc' => sprintf( t('A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message.'),$email),
+			'$resend' => t('Resend Email'),
+			'$email' => bin2hex($email),
+			'$submit' => t('Submit'),
+			'$token' => [ 'token', t('Validation token'),'','' ],
+		]);
+		
+		return $o;
+
+	}
+
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 21f464a5577e84b808fd56efdc49117a64c8dc30 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 27 Jan 2018 15:20:43 -0800
Subject: Guranteed somebody will paste the verification link and not the
 token, especially before all the translations are completed. But even then...

---
 Zotlabs/Module/Email_validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs/Module/Email_validation.php')

diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php
index 4cc016847..162501140 100644
--- a/Zotlabs/Module/Email_validation.php
+++ b/Zotlabs/Module/Email_validation.php
@@ -8,7 +8,7 @@ class Email_validation extends \Zotlabs\Web\Controller {
 	function post() {
 
 		if($_POST['token']) {
-			if(! account_approve(trim($_POST['token']))) {
+			if(! account_approve(trim(basename($_POST['token'])))) {
 				notice('Token verification failed.');
 			}
 		}
-- 
cgit v1.2.3


From e4eff6a32bd6b9907c5c1a4454e5861f3712d380 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 29 Jan 2018 02:41:45 -0800
Subject: fix workflow for form based email validation when auto_channel_create
 is in effect. Eventually we will need to rework the workflow logic because it
 is getting a bit tangled.

---
 Zotlabs/Module/Email_validation.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Zotlabs/Module/Email_validation.php')

diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php
index 162501140..b8bb720cd 100644
--- a/Zotlabs/Module/Email_validation.php
+++ b/Zotlabs/Module/Email_validation.php
@@ -8,9 +8,18 @@ class Email_validation extends \Zotlabs\Web\Controller {
 	function post() {
 
 		if($_POST['token']) {
+			// This will redirect internally on success unless the channel is auto_created
 			if(! account_approve(trim(basename($_POST['token'])))) {
 				notice('Token verification failed.');
 			}
+			else {
+				if(get_config('system','auto_channel_create')) {
+					$next_page = get_config('system', 'workflow_channel_next', 'profiles');		
+				}
+				if($next_page) {
+					goaway(z_root() . '/' . $next_page);
+				}
+			}
 		}
 
 	}
-- 
cgit v1.2.3