View Options

	diff --git a/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php b/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php
	index 88565243c3..d0ff45b38c 100644
	--- a/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php
	@@ -1,36 +1,40 @@
	<?php

	final class PhabricatorAuthNeedsApprovalController
	extends PhabricatorAuthController {

	public function shouldRequireLogin() {
	return false;
	}

	public function shouldRequireEmailVerification() {
	return false;
	}

	+ public function shouldRequireEnabledUser() {
	+ return false;
	+ }
	+
	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$wait_for_approval = pht(
	"Your account has been created, but needs to be approved by an ".
	"administrator. You'll receive an email once your account is approved.");

	$dialog = id(new AphrontDialogView())
	->setUser($user)
	->setTitle(pht('Wait for Approval'))
	->appendChild($wait_for_approval)
	->addCancelButton('/', pht('Wait Patiently'));

	return $this->buildApplicationPage(
	$dialog,
	array(
	'title' => pht('Wait For Approval'),
	'device' => true,
	));
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorEmailVerificationController.php b/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	index 091575309e..87c9c746f1 100644
	--- a/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	+++ b/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	@@ -1,88 +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()) {
	$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,
	));
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 16:39 (2 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1126564
Default Alt Text: (4 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions