View Options

	diff --git a/src/applications/auth/application/PhabricatorApplicationAuth.php b/src/applications/auth/application/PhabricatorApplicationAuth.php
	index 9781347f78..afb2c313df 100644
	--- a/src/applications/auth/application/PhabricatorApplicationAuth.php
	+++ b/src/applications/auth/application/PhabricatorApplicationAuth.php
	@@ -1,107 +1,106 @@
	<?php

	final class PhabricatorApplicationAuth extends PhabricatorApplication {

	public function canUninstall() {
	return false;
	}

	public function getBaseURI() {
	return '/auth/';
	}

	public function getIconName() {
	return 'authentication';
	}

	public function getHelpURI() {
	// NOTE: Although reasonable help exists for this in "Configuring Accounts
	// and Registration", specifying a help URI here means we get the menu
	// item in all the login/link interfaces, which is confusing and not
	// helpful.

	// TODO: Special case this, or split the auth and auth administration
	// applications?

	return null;
	}

	public function buildMainMenuItems(
	PhabricatorUser $user,
	PhabricatorController $controller = null) {

	$items = array();

	if ($user->isLoggedIn()) {
	$item = id(new PHUIListItemView())
	->addClass('core-menu-item')
	->setName(pht('Log Out'))
	->setIcon('power')
	->setWorkflow(true)
	->setHref('/logout/')
	->setSelected(($controller instanceof PhabricatorLogoutController));
	$items[] = $item;
	} else {
	if ($controller instanceof PhabricatorAuthController) {
	// Don't show the "Login" item on auth controllers, since they're
	// generally all related to logging in anyway.
	} else {
	$item = id(new PHUIListItemView())
	->addClass('core-menu-item')
	->setName(pht('Log In'))
	// TODO: Login icon?
	->setIcon('power')
	- ->setWorkflow(true)
	- ->setHref('/auth/login/');
	+ ->setHref('/auth/start/');
	$items[] = $item;
	}
	}

	return $items;
	}

	public function getApplicationGroup() {
	return self::GROUP_ADMIN;
	}

	public function getRoutes() {
	return array(
	'/auth/' => array(
	'' => 'PhabricatorAuthListController',
	'config/' => array(
	'new/' => 'PhabricatorAuthNewController',
	'new/(?P<className>[^/]+)/' => 'PhabricatorAuthEditController',
	'edit/(?P<id>\d+)/' => 'PhabricatorAuthEditController',
	'(?P<action>enable\|disable)/(?P<id>\d+)/' =>
	'PhabricatorAuthDisableController',
	),
	'login/(?P<pkey>[^/]+)/' => 'PhabricatorAuthLoginController',
	'register/(?:(?P<akey>[^/]+)/)?' => 'PhabricatorAuthRegisterController',
	'start/' => 'PhabricatorAuthStartController',
	'validate/' => 'PhabricatorAuthValidateController',
	'unlink/(?P<pkey>[^/]+)/' => 'PhabricatorAuthUnlinkController',
	'(?P<action>link\|refresh)/(?P<pkey>[^/]+)/'
	=> 'PhabricatorAuthLinkController',
	'confirmlink/(?P<akey>[^/]+)/'
	=> 'PhabricatorAuthConfirmLinkController',
	),

	'/oauth/(?P<provider>\w+)/login/'
	=> 'PhabricatorAuthOldOAuthRedirectController',

	'/login/' => array(
	'' => 'PhabricatorAuthStartController',
	'email/' => 'PhabricatorEmailLoginController',
	'etoken/(?P<token>\w+)/' => 'PhabricatorEmailTokenController',
	'refresh/' => 'PhabricatorRefreshCSRFController',
	'mustverify/' => 'PhabricatorMustVerifyEmailController',
	),

	'/emailverify/(?P<code>[^/]+)/' =>
	'PhabricatorEmailVerificationController',

	'/logout/' => 'PhabricatorLogoutController',
	);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Fri, Nov 14, 11:10 AM (1 d, 15 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 336978
Default Alt Text: (3 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions