View Options

	diff --git a/src/applications/auth/controller/PhabricatorEmailVerificationController.php b/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	index 87c9c746f1..4bbe9b2dc7 100644
	--- a/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	+++ b/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	@@ -1,100 +1,100 @@
	<?php

	final class PhabricatorEmailVerificationController
	extends PhabricatorAuthController {

	private $code;

	public function willProcessRequest(array $data) {
	$this->code = $data['code'];
	}

	public function shouldRequireEmailVerification() {
	// Since users need to be able to hit this endpoint in order to verify
	// email, we can't ever require email verification here.
	return false;
	}

	public function shouldRequireEnabledUser() {
	// Unapproved users are allowed to verify their email addresses. We'll kick
	// disabled users out later.
	return false;
	}

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();

	if ($user->getIsDisabled()) {
	// We allowed unapproved and disabled users to hit this controller, but
	// want to kick out disabled users now.
	return new Aphront400Response();
	}

	$email = id(new PhabricatorUserEmail())->loadOneWhere(
	'userPHID = %s AND verificationCode = %s',
	$user->getPHID(),
	$this->code);

	if (!$email) {
	$title = pht('Unable to Verify Email');
	$content = pht(
	'The verification code you provided is incorrect, or the email '.
	'address has been removed, or the email address is owned by another '.
	'user. Make sure you followed the link in the email correctly and are '.
	'logged in with the user account associated with the email address.');
	$continue = pht('Rats!');
	- } else if ($email->getIsVerified()) {
	+ } else if ($email->getIsVerified() && $user->getIsEmailVerified()) {
	$title = pht('Address Already Verified');
	$content = pht(
	'This email address has already been verified.');
	$continue = pht('Continue to Phabricator');
	} else {
	$guard = AphrontWriteGuard::beginScopedUnguardedWrites();
	$email->openTransaction();

	$email->setIsVerified(1);
	$email->save();

	// If the user just verified their primary email address, mark their
	// account as email verified.
	$user_primary = $user->loadPrimaryEmail();
	if ($user_primary->getID() == $email->getID()) {
	$user->setIsEmailVerified(1);
	$user->save();
	}

	$email->saveTransaction();
	unset($guard);

	$title = pht('Address Verified');
	$content = pht(
	'The email address %s is now verified.',
	phutil_tag('strong', array(), $email->getAddress()));
	$continue = pht('Continue to Phabricator');
	}

	$dialog = id(new AphrontDialogView())
	->setUser($user)
	->setTitle($title)
	->setMethod('GET')
	->addCancelButton('/', $continue)
	->appendChild($content);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())
	->setName(pht('Verify Email')));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$dialog,
	),
	array(
	'title' => pht('Verify Email'),
	'device' => true,
	));
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
	index beae85a3a9..efb4a3987e 100644
	--- a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
	+++ b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
	@@ -1,68 +1,68 @@
	<?php

	final class PhabricatorMustVerifyEmailController
	extends PhabricatorAuthController {

	public function shouldRequireLogin() {
	return false;
	}

	public function shouldRequireEmailVerification() {
	// NOTE: We don't technically need this since PhabricatorController forces
	// us here in either case, but it's more consistent with intent.
	return false;
	}

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$email = $user->loadPrimaryEmail();

	- if ($email->getIsVerified()) {
	+ if ($user->getIsEmailVerified()) {
	return id(new AphrontRedirectResponse())->setURI('/');
	}

	$email_address = $email->getAddress();

	$sent = null;
	if ($request->isFormPost()) {
	$email->sendVerificationEmail($user);
	$sent = new AphrontErrorView();
	$sent->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$sent->setTitle(pht('Email Sent'));
	$sent->appendChild(
	pht(
	'Another verification email was sent to %s.',
	phutil_tag('strong', array(), $email_address)));
	}

	$must_verify = pht(
	'You must verify your email address to login. You should have a '.
	'new email message from Phabricator with verification instructions '.
	'in your inbox (%s).',
	phutil_tag('strong', array(), $email_address));

	$send_again = pht(
	'If you did not receive an email, you can click the button below '.
	'to try sending another one.');

	$dialog = id(new AphrontDialogView())
	->setUser($user)
	->setTitle(pht('Check Your Email'))
	->appendParagraph($must_verify)
	->appendParagraph($send_again)
	->addSubmitButton(pht('Send Another Email'));

	return $this->buildApplicationPage(
	array(
	$sent,
	$dialog,
	),
	array(
	'title' => pht('Must Verify Email'),
	'device' => true
	));
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Mar 16, 11:43 PM (1 d, 15 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 963641
Default Alt Text: (5 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions