No OneTemporary
Actions

Size

40 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/people/controller/PhabricatorPeopleApproveController.php b/src/applications/people/controller/PhabricatorPeopleApproveController.php
	index a906b15655..a63682239f 100644
	--- a/src/applications/people/controller/PhabricatorPeopleApproveController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleApproveController.php
	@@ -1,68 +1,65 @@
	<?php

	final class PhabricatorPeopleApproveController
	extends PhabricatorPeopleController {

	private $id;

	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id');
	}

	public function processRequest() {

	$request = $this->getRequest();
	$admin = $request->getUser();

	$user = id(new PhabricatorPeopleQuery())
	->setViewer($admin)
	->withIDs(array($this->id))
	->executeOne();
	if (!$user) {
	return new Aphront404Response();
	}

	$done_uri = $this->getApplicationURI('query/approval/');

	if ($request->isFormPost()) {
	id(new PhabricatorUserEditor())
	->setActor($admin)
	->approveUser($user, true);

	$title = pht(
	'Phabricator Account "%s" Approved',
	$user->getUsername());

	$body = sprintf(
	"%s\n\n %s\n\n",
	pht(
	'Your Phabricator account (%s) has been approved by %s. You can '.
	'login here:',
	$user->getUsername(),
	$admin->getUsername()),
	PhabricatorEnv::getProductionURI('/'));

	$mail = id(new PhabricatorMetaMTAMail())
	->addTos(array($user->getPHID()))
	->addCCs(array($admin->getPHID()))
	->setSubject('[Phabricator] '.$title)
	->setForceDelivery(true)
	->setBody($body)
	->saveAndSend();

	return id(new AphrontRedirectResponse())->setURI($done_uri);
	}

	- $dialog = id(new AphrontDialogView())
	- ->setUser($admin)
	+ return $this->newDialog()
	->setTitle(pht('Confirm Approval'))
	->appendChild(
	pht(
	'Allow %s to access this Phabricator install?',
	phutil_tag('strong', array(), $user->getUsername())))
	->addCancelButton($done_uri)
	->addSubmitButton(pht('Approve Account'));
	-
	- return id(new AphrontDialogResponse())->setDialog($dialog);
	}
	}
	diff --git a/src/applications/people/controller/PhabricatorPeopleCreateController.php b/src/applications/people/controller/PhabricatorPeopleCreateController.php
	index 15a34d0063..82a27e2f9e 100644
	--- a/src/applications/people/controller/PhabricatorPeopleCreateController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleCreateController.php
	@@ -1,108 +1,114 @@
	<?php

	final class PhabricatorPeopleCreateController
	extends PhabricatorPeopleController {

	public function handleRequest(AphrontRequest $request) {
	$admin = $request->getUser();

	id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
	$admin,
	$request,
	$this->getApplicationURI());

	$v_type = 'standard';
	if ($request->isFormPost()) {
	$v_type = $request->getStr('type');

	if ($v_type == 'standard' \|\| $v_type == 'bot' \|\| $v_type == 'list') {
	return id(new AphrontRedirectResponse())->setURI(
	$this->getApplicationURI('new/'.$v_type.'/'));
	}
	}

	$title = pht('Create New User');

	$standard_caption = pht(
	'Create a standard user account. These users can log in to Phabricator, '.
	'use the web interface and API, and receive email.');

	$standard_admin = pht(
	'Administrators are limited in their ability to access or edit these '.
	'accounts after account creation.');

	$bot_caption = pht(
	'Create a bot/script user account, to automate interactions with other '.
	'systems. These users can not use the web interface, but can use the '.
	'API.');

	$bot_admin = pht(
	'Administrators have greater access to edit these accounts.');

	$types = array();

	$can_create = $this->hasApplicationCapability(
	PeopleCreateUsersCapability::CAPABILITY);
	if ($can_create) {
	$types[] = array(
	'type' => 'standard',
	'name' => pht('Create Standard User'),
	'help' => pht('Create a standard user account.'),
	);
	}

	$types[] = array(
	'type' => 'bot',
	'name' => pht('Create Bot User'),
	'help' => pht('Create a new user for use with automated scripts.'),
	);

	$types[] = array(
	'type' => 'list',
	'name' => pht('Create Mailing List User'),
	'help' => pht(
	'Create a mailing list user to represent an existing, external '.
	'mailing list like a Google Group or a Mailman list.'),
	);

	$buttons = id(new AphrontFormRadioButtonControl())
	->setLabel(pht('Account Type'))
	->setName('type')
	->setValue($v_type);

	foreach ($types as $type) {
	$buttons->addButton($type['type'], $type['name'], $type['help']);
	}

	$form = id(new AphrontFormView())
	->setUser($admin)
	->appendRemarkupInstructions(
	pht(
	'Choose the type of user account to create. For a detailed '.
	'explanation of user account types, see [[ %s \| User Guide: '.
	'Account Roles ]].',
	PhabricatorEnv::getDoclink('User Guide: Account Roles')))
	->appendChild($buttons)
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($this->getApplicationURI())
	->setValue(pht('Continue')));

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title);
	+ $crumbs->setBorder(true);
	+
	+ $header = id(new PHUIHeaderView())
	+ ->setHeader($title)
	+ ->setHeaderIcon('fa-user');

	$box = id(new PHUIObjectBoxView())
	- ->setHeaderText($title)
	+ ->setHeaderText(pht('User'))
	+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
	->setForm($form);

	- return $this->buildApplicationPage(
	- array(
	- $crumbs,
	- $box,
	- ),
	- array(
	- 'title' => $title,
	- ));
	+ $view = id(new PHUITwoColumnView())
	+ ->setHeader($header)
	+ ->setFooter($box);
	+
	+ return $this->newPage()
	+ ->setTitle($title)
	+ ->setCrumbs($crumbs)
	+ ->appendChild($view);
	}

	}
	diff --git a/src/applications/people/controller/PhabricatorPeopleInviteSendController.php b/src/applications/people/controller/PhabricatorPeopleInviteSendController.php
	index 6a7049215d..e611606a79 100644
	--- a/src/applications/people/controller/PhabricatorPeopleInviteSendController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleInviteSendController.php
	@@ -1,219 +1,231 @@
	<?php

	final class PhabricatorPeopleInviteSendController
	extends PhabricatorPeopleInviteController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$this->requireApplicationCapability(
	PeopleCreateUsersCapability::CAPABILITY);

	$is_confirm = false;
	$errors = array();
	$confirm_errors = array();
	$e_emails = true;

	$message = $request->getStr('message');
	$emails = $request->getStr('emails');
	$severity = PHUIInfoView::SEVERITY_ERROR;
	if ($request->isFormPost()) {
	// NOTE: We aren't using spaces as a delimiter here because email
	// addresses with names often include spaces.
	$email_list = preg_split('/[,;\n]+/', $emails);
	foreach ($email_list as $key => $email) {
	if (!strlen(trim($email))) {
	unset($email_list[$key]);
	}
	}

	if ($email_list) {
	$e_emails = null;
	} else {
	$e_emails = pht('Required');
	$errors[] = pht(
	'To send invites, you must enter at least one email address.');
	}

	if (!$errors) {
	$is_confirm = true;

	$actions = PhabricatorAuthInviteAction::newActionListFromAddresses(
	$viewer,
	$email_list);

	$any_valid = false;
	$all_valid = true;
	foreach ($actions as $action) {
	if ($action->willSend()) {
	$any_valid = true;
	} else {
	$all_valid = false;
	}
	}

	if (!$any_valid) {
	$confirm_errors[] = pht(
	'None of the provided addresses are valid invite recipients. '.
	'Review the table below for details. Revise the address list '.
	'to continue.');
	} else if ($all_valid) {
	$confirm_errors[] = pht(
	'All of the addresses appear to be valid invite recipients. '.
	'Confirm the actions below to continue.');
	$severity = PHUIInfoView::SEVERITY_NOTICE;
	} else {
	$confirm_errors[] = pht(
	'Some of the addresses you entered do not appear to be '.
	'valid recipients. Review the table below. You can revise '.
	'the address list, or ignore these errors and continue.');
	$severity = PHUIInfoView::SEVERITY_WARNING;
	}

	if ($any_valid && $request->getBool('confirm')) {

	// TODO: The copywriting on this mail could probably be more
	// engaging and we could have a fancy HTML version.

	$template = array();
	$template[] = pht(
	'%s has invited you to join Phabricator.',
	$viewer->getFullName());

	if (strlen(trim($message))) {
	$template[] = $message;
	}

	$template[] = pht(
	'To register an account and get started, follow this link:');

	// This isn't a variable; it will be replaced later on in the
	// daemons once they generate the URI.
	$template[] = '{$INVITE_URI}';

	$template[] = pht(
	'If you already have an account, you can follow the link to '.
	'quickly verify this email address.');

	$template = implode("\n\n", $template);

	foreach ($actions as $action) {
	if ($action->willSend()) {
	$action->sendInvite($viewer, $template);
	}
	}

	// TODO: This is a bit anticlimactic. We don't really have anything
	// to show the user because the action is happening in the background
	// and the invites won't exist yet. After T5166 we can show a
	// better progress bar.
	return id(new AphrontRedirectResponse())
	->setURI($this->getApplicationURI());
	}
	}
	}

	if ($is_confirm) {
	$title = pht('Confirm Invites');
	} else {
	$title = pht('Invite Users');
	}

	$crumbs = $this->buildApplicationCrumbs();
	if ($is_confirm) {
	$crumbs->addTextCrumb(pht('Confirm'));
	} else {
	$crumbs->addTextCrumb(pht('Invite Users'));
	}
	+ $crumbs->setBorder(true);

	$confirm_box = null;
	+ $info_view = null;
	if ($is_confirm) {

	$handles = array();
	if ($actions) {
	$handles = $this->loadViewerHandles(mpull($actions, 'getUserPHID'));
	}

	$invite_table = id(new PhabricatorAuthInviteActionTableView())
	->setUser($viewer)
	->setInviteActions($actions)
	->setHandles($handles);

	$confirm_form = null;
	if ($any_valid) {
	$confirm_form = id(new AphrontFormView())
	->setUser($viewer)
	->addHiddenInput('message', $message)
	->addHiddenInput('emails', $emails)
	->addHiddenInput('confirm', true)
	->appendRemarkupInstructions(
	pht(
	'If everything looks good, click Send Invitations to '.
	'deliver email invitations these users. Otherwise, edit the '.
	'email list or personal message at the bottom of the page to '.
	'revise the invitations.'))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Send Invitations')));
	}

	+ $info_view = id(new PHUIInfoView())
	+ ->setErrors($confirm_errors)
	+ ->setSeverity($severity);
	+
	$confirm_box = id(new PHUIObjectBoxView())
	- ->setInfoView(
	- id(new PHUIInfoView())
	- ->setErrors($confirm_errors)
	- ->setSeverity($severity))
	->setHeaderText(pht('Confirm Invites'))
	->setTable($invite_table)
	- ->appendChild($confirm_form);
	+ ->appendChild($confirm_form)
	+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
	}

	$form = id(new AphrontFormView())
	->setUser($viewer)
	->appendRemarkupInstructions(
	pht(
	'To invite users to Phabricator, enter their email addresses below. '.
	'Separate addresses with commas or newlines.'))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel(pht('Email Addresses'))
	->setName(pht('emails'))
	->setValue($emails)
	->setError($e_emails)
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL))
	->appendRemarkupInstructions(
	pht(
	'You can optionally include a heartfelt personal message in '.
	'the email.'))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel(pht('Message'))
	->setName(pht('message'))
	->setValue($message))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(
	$is_confirm
	? pht('Update Preview')
	: pht('Continue'))
	->addCancelButton($this->getApplicationURI('invite/')));

	+ $header = id(new PHUIHeaderView())
	+ ->setHeader($title)
	+ ->setHeaderIcon('fa-group');
	+
	$box = id(new PHUIObjectBoxView())
	->setHeaderText(
	$is_confirm
	? pht('Revise Invites')
	: pht('Invite Users'))
	->setFormErrors($errors)
	- ->setForm($form);
	+ ->setForm($form)
	+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);

	- return $this->buildApplicationPage(
	- array(
	- $crumbs,
	+ $view = id(new PHUITwoColumnView())
	+ ->setHeader($header)
	+ ->setFooter(array(
	+ $info_view,
	$confirm_box,
	$box,
	- ),
	- array(
	- 'title' => $title,
	));
	+
	+ return $this->newPage()
	+ ->setTitle($title)
	+ ->setCrumbs($crumbs)
	+ ->appendChild($view);
	+
	}

	}
	diff --git a/src/applications/people/controller/PhabricatorPeopleLdapController.php b/src/applications/people/controller/PhabricatorPeopleLdapController.php
	index 2e030ad580..1a6530ab31 100644
	--- a/src/applications/people/controller/PhabricatorPeopleLdapController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleLdapController.php
	@@ -1,216 +1,214 @@
	<?php

	final class PhabricatorPeopleLdapController
	extends PhabricatorPeopleController {

	public function handleRequest(AphrontRequest $request) {
	$this->requireApplicationCapability(
	PeopleCreateUsersCapability::CAPABILITY);
	$admin = $request->getUser();

	$content = array();

	$form = id(new AphrontFormView())
	->setAction($request->getRequestURI()
	->alter('search', 'true')->alter('import', null))
	->setUser($admin)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('LDAP username'))
	->setName('username'))
	->appendChild(
	id(new AphrontFormPasswordControl())
	->setDisableAutocomplete(true)
	->setLabel(pht('Password'))
	->setName('password'))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('LDAP query'))
	->setCaption(pht('A filter such as %s.', '(objectClass=*)'))
	->setName('query'))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Search')));

	$panel = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Import LDAP Users'))
	->setForm($form);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Import Ldap Users'),
	$this->getApplicationURI('/ldap/'));

	$nav = $this->buildSideNavView();
	- $nav->setCrumbs($crumbs);
	$nav->selectFilter('ldap');
	$nav->appendChild($content);

	if ($request->getStr('import')) {
	$nav->appendChild($this->processImportRequest($request));
	}

	$nav->appendChild($panel);

	if ($request->getStr('search')) {
	$nav->appendChild($this->processSearchRequest($request));
	}

	- return $this->buildApplicationPage(
	- $nav,
	- array(
	- 'title' => pht('Import Ldap Users'),
	- ));
	+ return $this->newPage()
	+ ->setTitle(pht('Import Ldap Users'))
	+ ->setCrumbs($crumbs)
	+ ->setNavigation($nav);
	}

	private function processImportRequest($request) {
	$admin = $request->getUser();
	$usernames = $request->getArr('usernames');
	$emails = $request->getArr('email');
	$names = $request->getArr('name');

	$notice_view = new PHUIInfoView();
	$notice_view->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$notice_view->setTitle(pht('Import Successful'));
	$notice_view->setErrors(array(
	pht('Successfully imported users from LDAP'),
	));

	$list = new PHUIObjectItemListView();
	$list->setNoDataString(pht('No users imported?'));

	foreach ($usernames as $username) {
	$user = new PhabricatorUser();
	$user->setUsername($username);
	$user->setRealname($names[$username]);

	$email_obj = id(new PhabricatorUserEmail())
	->setAddress($emails[$username])
	->setIsVerified(1);
	try {
	id(new PhabricatorUserEditor())
	->setActor($admin)
	->createNewUser($user, $email_obj);

	id(new PhabricatorExternalAccount())
	->setUserPHID($user->getPHID())
	->setAccountType('ldap')
	->setAccountDomain('self')
	->setAccountID($username)
	->save();

	$header = pht('Successfully added %s', $username);
	$attribute = null;
	$color = 'fa-check green';
	} catch (Exception $ex) {
	$header = pht('Failed to add %s', $username);
	$attribute = $ex->getMessage();
	$color = 'fa-times red';
	}

	$item = id(new PHUIObjectItemView())
	->setHeader($header)
	->addAttribute($attribute)
	->setStatusIcon($color);

	$list->addItem($item);
	}

	return array(
	$notice_view,
	$list,
	);

	}

	private function processSearchRequest($request) {
	$panel = new PHUIBoxView();
	$admin = $request->getUser();

	$search = $request->getStr('query');

	$ldap_provider = PhabricatorLDAPAuthProvider::getLDAPProvider();
	if (!$ldap_provider) {
	throw new Exception(pht('No LDAP provider enabled!'));
	}

	$ldap_adapter = $ldap_provider->getAdapter();
	$ldap_adapter->setLoginUsername($request->getStr('username'));
	$ldap_adapter->setLoginPassword(
	new PhutilOpaqueEnvelope($request->getStr('password')));

	// This causes us to connect and bind.
	// TODO: Clean up this discard mode stuff.
	DarkConsoleErrorLogPluginAPI::enableDiscardMode();
	$ldap_adapter->getAccountID();
	DarkConsoleErrorLogPluginAPI::disableDiscardMode();

	$results = $ldap_adapter->searchLDAP('%Q', $search);

	foreach ($results as $key => $record) {
	$account_id = $ldap_adapter->readLDAPRecordAccountID($record);
	if (!$account_id) {
	unset($results[$key]);
	continue;
	}

	$info = array(
	$account_id,
	$ldap_adapter->readLDAPRecordEmail($record),
	$ldap_adapter->readLDAPRecordRealName($record),
	);
	$results[$key] = $info;
	$results[$key][] = $this->renderUserInputs($info);
	}

	$form = id(new AphrontFormView())
	->setUser($admin);

	$table = new AphrontTableView($results);
	$table->setHeaders(
	array(
	pht('Username'),
	pht('Email'),
	pht('Real Name'),
	pht('Import?'),
	));
	$form->appendChild($table);
	$form->setAction($request->getRequestURI()
	->alter('import', 'true')->alter('search', null))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Import')));

	$panel->appendChild($form);

	return $panel;
	}

	private function renderUserInputs($user) {
	$username = $user[0];
	return hsprintf(
	'%s%s%s',
	phutil_tag(
	'input',
	array(
	'type' => 'checkbox',
	'name' => 'usernames[]',
	'value' => $username,
	)),
	phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => "email[$username]",
	'value' => $user[1],
	)),
	phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => "name[$username]",
	'value' => $user[2],
	)));
	}

	}
	diff --git a/src/applications/people/controller/PhabricatorPeopleNewController.php b/src/applications/people/controller/PhabricatorPeopleNewController.php
	index 2590129c09..60f9f47b5d 100644
	--- a/src/applications/people/controller/PhabricatorPeopleNewController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleNewController.php
	@@ -1,229 +1,235 @@
	<?php

	final class PhabricatorPeopleNewController
	extends PhabricatorPeopleController {

	public function handleRequest(AphrontRequest $request) {
	$type = $request->getURIData('type');
	$admin = $request->getUser();

	$is_bot = false;
	$is_list = false;
	switch ($type) {
	case 'standard':
	$this->requireApplicationCapability(
	PeopleCreateUsersCapability::CAPABILITY);
	break;
	case 'bot':
	$is_bot = true;
	break;
	case 'list':
	$is_list = true;
	break;
	default:
	return new Aphront404Response();
	}

	$user = new PhabricatorUser();
	$require_real_name = PhabricatorEnv::getEnvConfig('user.require-real-name');

	$e_username = true;
	$e_realname = $require_real_name ? true : null;
	$e_email = true;
	$errors = array();

	$welcome_checked = true;

	$new_email = null;

	if ($request->isFormPost()) {
	$welcome_checked = $request->getInt('welcome');

	$user->setUsername($request->getStr('username'));

	$new_email = $request->getStr('email');
	if (!strlen($new_email)) {
	$errors[] = pht('Email is required.');
	$e_email = pht('Required');
	} else if (!PhabricatorUserEmail::isAllowedAddress($new_email)) {
	$e_email = pht('Invalid');
	$errors[] = PhabricatorUserEmail::describeAllowedAddresses();
	} else {
	$e_email = null;
	}

	$user->setRealName($request->getStr('realname'));

	if (!strlen($user->getUsername())) {
	$errors[] = pht('Username is required.');
	$e_username = pht('Required');
	} else if (!PhabricatorUser::validateUsername($user->getUsername())) {
	$errors[] = PhabricatorUser::describeValidUsername();
	$e_username = pht('Invalid');
	} else {
	$e_username = null;
	}

	if (!strlen($user->getRealName()) && $require_real_name) {
	$errors[] = pht('Real name is required.');
	$e_realname = pht('Required');
	} else {
	$e_realname = null;
	}

	if (!$errors) {
	try {

	$email = id(new PhabricatorUserEmail())
	->setAddress($new_email)
	->setIsVerified(0);

	// Automatically approve the user, since an admin is creating them.
	$user->setIsApproved(1);

	// If the user is a bot or list, approve their email too.
	if ($is_bot \|\| $is_list) {
	$email->setIsVerified(1);
	}

	id(new PhabricatorUserEditor())
	->setActor($admin)
	->createNewUser($user, $email);

	if ($is_bot) {
	id(new PhabricatorUserEditor())
	->setActor($admin)
	->makeSystemAgentUser($user, true);
	}

	if ($is_list) {
	id(new PhabricatorUserEditor())
	->setActor($admin)
	->makeMailingListUser($user, true);
	}

	if ($welcome_checked && !$is_bot && !$is_list) {
	$user->sendWelcomeEmail($admin);
	}

	$response = id(new AphrontRedirectResponse())
	->setURI('/p/'.$user->getUsername().'/');
	return $response;
	} catch (AphrontDuplicateKeyQueryException $ex) {
	$errors[] = pht('Username and email must be unique.');

	$same_username = id(new PhabricatorUser())
	->loadOneWhere('username = %s', $user->getUsername());
	$same_email = id(new PhabricatorUserEmail())
	->loadOneWhere('address = %s', $new_email);

	if ($same_username) {
	$e_username = pht('Duplicate');
	}

	if ($same_email) {
	$e_email = pht('Duplicate');
	}
	}
	}
	}

	$form = id(new AphrontFormView())
	->setUser($admin);

	if ($is_bot) {
	$form->appendRemarkupInstructions(
	pht('You are creating a new bot user account.'));
	} else if ($is_list) {
	$form->appendRemarkupInstructions(
	pht('You are creating a new mailing list user account.'));
	} else {
	$form->appendRemarkupInstructions(
	pht('You are creating a new standard user account.'));
	}

	$form
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Username'))
	->setName('username')
	->setValue($user->getUsername())
	->setError($e_username))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Real Name'))
	->setName('realname')
	->setValue($user->getRealName())
	->setError($e_realname))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Email'))
	->setName('email')
	->setValue($new_email)
	->setCaption(PhabricatorUserEmail::describeAllowedAddresses())
	->setError($e_email));

	if (!$is_bot && !$is_list) {
	$form->appendChild(
	id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'welcome',
	1,
	pht('Send "Welcome to Phabricator" email with login instructions.'),
	$welcome_checked));
	}

	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($this->getApplicationURI())
	->setValue(pht('Create User')));

	if ($is_bot) {
	$form
	->appendChild(id(new AphrontFormDividerControl()))
	->appendRemarkupInstructions(
	pht(
	'Why do bot accounts need an email address?'.
	"\n\n".
	'Although bots do not normally receive email from Phabricator, '.
	'they can interact with other systems which require an email '.
	'address. Examples include:'.
	"\n\n".
	" - If the account takes actions which //send// email, we need ".
	" an address to use in the //From// header.\n".
	" - If the account creates commits, Git and Mercurial require ".
	" an email address for authorship.\n".
	" - If you send email //to// Phabricator on behalf of the ".
	" account, the address can identify the sender.\n".
	" - Some internal authentication functions depend on accounts ".
	" having an email address.\n".
	"\n\n".
	"The address will automatically be verified, so you do not need ".
	"to be able to receive mail at this address, and can enter some ".
	"invalid or nonexistent (but correctly formatted) address like ".
	"`bot@yourcompany.com` if you prefer."));
	}


	$title = pht('Create New User');

	- $form_box = id(new PHUIObjectBoxView())
	- ->setHeaderText($title)
	+ $box = id(new PHUIObjectBoxView())
	+ ->setHeaderText(pht('User'))
	->setFormErrors($errors)
	+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
	->setForm($form);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title);
	+ $crumbs->setBorder(true);

	- return $this->buildApplicationPage(
	- array(
	- $crumbs,
	- $form_box,
	- ),
	- array(
	- 'title' => $title,
	- ));
	+ $header = id(new PHUIHeaderView())
	+ ->setHeader($title)
	+ ->setHeaderIcon('fa-user');
	+
	+ $view = id(new PHUITwoColumnView())
	+ ->setHeader($header)
	+ ->setFooter($box);
	+
	+ return $this->newPage()
	+ ->setTitle($title)
	+ ->setCrumbs($crumbs)
	+ ->appendChild($view);
	}

	}
	diff --git a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
	index cb258d17ac..9f132a18d8 100644
	--- a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
	@@ -1,98 +1,107 @@
	<?php

	final class PhabricatorPeopleProfileEditController
	extends PhabricatorPeopleProfileController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$id = $request->getURIData('id');

	$user = id(new PhabricatorPeopleQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needProfileImage(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$user) {
	return new Aphront404Response();
	}

	$this->setUser($user);

	$done_uri = $this->getApplicationURI("manage/{$id}/");

	$field_list = PhabricatorCustomField::getObjectFields(
	$user,
	PhabricatorCustomField::ROLE_EDIT);
	$field_list
	->setViewer($viewer)
	->readFieldsFromStorage($user);

	$validation_exception = null;
	if ($request->isFormPost()) {
	$xactions = $field_list->buildFieldTransactionsFromRequest(
	new PhabricatorUserTransaction(),
	$request);

	$editor = id(new PhabricatorUserProfileEditor())
	->setActor($viewer)
	->setContentSource(
	PhabricatorContentSource::newFromRequest($request))
	->setContinueOnNoEffect(true);

	try {
	$editor->applyTransactions($user, $xactions);
	return id(new AphrontRedirectResponse())->setURI($done_uri);
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;
	}
	}

	$title = pht('Edit Profile');

	$form = id(new AphrontFormView())
	->setUser($viewer);

	$field_list->appendFieldsToForm($form);
	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($done_uri)
	->setValue(pht('Save Profile')));

	$allow_public = PhabricatorEnv::getEnvConfig('policy.allow-public');
	$note = null;
	if ($allow_public) {
	$note = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->appendChild(pht(
	'Information on user profiles on this install is publicly '.
	'visible.'));
	}

	$form_box = id(new PHUIObjectBoxView())
	- ->setHeaderText(pht('Edit Profile'))
	+ ->setHeaderText(pht('Profile'))
	->setValidationException($validation_exception)
	+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
	->setForm($form);

	- if ($note) {
	- $form_box->setInfoView($note);
	- }
	-
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Edit Profile'));
	+ $crumbs->setBorder(true);

	$nav = $this->getProfileMenu();
	$nav->selectFilter(PhabricatorPeopleProfilePanelEngine::PANEL_MANAGE);

	+ $header = id(new PHUIHeaderView())
	+ ->setHeader(pht('Edit Profile: %s', $user->getFullName()))
	+ ->setHeaderIcon('fa-pencil');
	+
	+ $view = id(new PHUITwoColumnView())
	+ ->setHeader($header)
	+ ->setFooter(array(
	+ $note,
	+ $form_box,
	+ ));
	+
	return $this->newPage()
	->setTitle($title)
	->setCrumbs($crumbs)
	->setNavigation($nav)
	- ->appendChild($form_box);
	+ ->appendChild($view);
	}
	}
	diff --git a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
	index cf78dd9c03..29b2290153 100644
	--- a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
	@@ -1,268 +1,278 @@
	<?php

	final class PhabricatorPeopleProfilePictureController
	extends PhabricatorPeopleProfileController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$id = $request->getURIData('id');

	$user = id(new PhabricatorPeopleQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needProfileImage(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$user) {
	return new Aphront404Response();
	}

	$this->setUser($user);
	$name = $user->getUserName();

	$done_uri = '/p/'.$name.'/';

	$supported_formats = PhabricatorFile::getTransformableImageFormats();
	$e_file = true;
	$errors = array();

	if ($request->isFormPost()) {
	$phid = $request->getStr('phid');
	$is_default = false;
	if ($phid == PhabricatorPHIDConstants::PHID_VOID) {
	$phid = null;
	$is_default = true;
	} else if ($phid) {
	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($phid))
	->executeOne();
	} else {
	if ($request->getFileExists('picture')) {
	$file = PhabricatorFile::newFromPHPUpload(
	$_FILES['picture'],
	array(
	'authorPHID' => $viewer->getPHID(),
	'canCDN' => true,
	));
	} else {
	$e_file = pht('Required');
	$errors[] = pht(
	'You must choose a file when uploading a new profile picture.');
	}
	}

	if (!$errors && !$is_default) {
	if (!$file->isTransformableImage()) {
	$e_file = pht('Not Supported');
	$errors[] = pht(
	'This server only supports these image formats: %s.',
	implode(', ', $supported_formats));
	} else {
	$xform = PhabricatorFileTransform::getTransformByKey(
	PhabricatorFileThumbnailTransform::TRANSFORM_PROFILE);
	$xformed = $xform->executeTransform($file);
	}
	}

	if (!$errors) {
	if ($is_default) {
	$user->setProfileImagePHID(null);
	} else {
	$user->setProfileImagePHID($xformed->getPHID());
	$xformed->attachToObject($user->getPHID());
	}
	$user->save();
	return id(new AphrontRedirectResponse())->setURI($done_uri);
	}
	}

	$title = pht('Edit Profile Picture');

	$form = id(new PHUIFormLayoutView())
	->setUser($viewer);

	$default_image = PhabricatorFile::loadBuiltin($viewer, 'profile.png');

	$images = array();

	$current = $user->getProfileImagePHID();
	$has_current = false;
	if ($current) {
	$files = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($current))
	->execute();
	if ($files) {
	$file = head($files);
	if ($file->isTransformableImage()) {
	$has_current = true;
	$images[$current] = array(
	'uri' => $file->getBestURI(),
	'tip' => pht('Current Picture'),
	);
	}
	}
	}

	$builtins = array(
	'user1.png',
	'user2.png',
	'user3.png',
	'user4.png',
	'user5.png',
	'user6.png',
	'user7.png',
	'user8.png',
	'user9.png',
	);
	foreach ($builtins as $builtin) {
	$file = PhabricatorFile::loadBuiltin($viewer, $builtin);
	$images[$file->getPHID()] = array(
	'uri' => $file->getBestURI(),
	'tip' => pht('Builtin Image'),
	);
	}

	// Try to add external account images for any associated external accounts.
	$accounts = id(new PhabricatorExternalAccountQuery())
	->setViewer($viewer)
	->withUserPHIDs(array($user->getPHID()))
	->needImages(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->execute();

	foreach ($accounts as $account) {
	$file = $account->getProfileImageFile();
	if ($account->getProfileImagePHID() != $file->getPHID()) {
	// This is a default image, just skip it.
	continue;
	}

	$provider = PhabricatorAuthProvider::getEnabledProviderByKey(
	$account->getProviderKey());
	if ($provider) {
	$tip = pht('Picture From %s', $provider->getProviderName());
	} else {
	$tip = pht('Picture From External Account');
	}

	if ($file->isTransformableImage()) {
	$images[$file->getPHID()] = array(
	'uri' => $file->getBestURI(),
	'tip' => $tip,
	);
	}
	}

	$images[PhabricatorPHIDConstants::PHID_VOID] = array(
	'uri' => $default_image->getBestURI(),
	'tip' => pht('Default Picture'),
	);

	require_celerity_resource('people-profile-css');
	Javelin::initBehavior('phabricator-tooltips', array());

	$buttons = array();
	foreach ($images as $phid => $spec) {
	$button = javelin_tag(
	'button',
	array(
	'class' => 'grey profile-image-button',
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $spec['tip'],
	'size' => 300,
	),
	),
	phutil_tag(
	'img',
	array(
	'height' => 50,
	'width' => 50,
	'src' => $spec['uri'],
	)));

	$button = array(
	phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => 'phid',
	'value' => $phid,
	)),
	$button,
	);

	$button = phabricator_form(
	$viewer,
	array(
	'class' => 'profile-image-form',
	'method' => 'POST',
	),
	$button);

	$buttons[] = $button;
	}

	if ($has_current) {
	$form->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Current Picture'))
	->setValue(array_shift($buttons)));
	}

	$form->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Use Picture'))
	->setValue($buttons));

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($title)
	->setFormErrors($errors)
	+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
	->setForm($form);

	$upload_form = id(new AphrontFormView())
	->setUser($viewer)
	->setEncType('multipart/form-data')
	->appendChild(
	id(new AphrontFormFileControl())
	->setName('picture')
	->setLabel(pht('Upload Picture'))
	->setError($e_file)
	->setCaption(
	pht('Supported formats: %s', implode(', ', $supported_formats))))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($done_uri)
	->setValue(pht('Upload Picture')));

	$upload_box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Upload New Picture'))
	+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
	->setForm($upload_form);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Edit Profile Picture'));
	+ $crumbs->setBorder(true);

	$nav = $this->getProfileMenu();
	$nav->selectFilter(PhabricatorPeopleProfilePanelEngine::PANEL_MANAGE);

	+ $header = id(new PHUIHeaderView())
	+ ->setHeader(pht('Edit Profile Picture'))
	+ ->setHeaderIcon('fa-camera');
	+
	+ $view = id(new PHUITwoColumnView())
	+ ->setHeader($header)
	+ ->setFooter(array(
	+ $form_box,
	+ $upload_box,
	+ ));
	+
	return $this->newPage()
	->setTitle($title)
	->setCrumbs($crumbs)
	->setNavigation($nav)
	- ->appendChild(
	- array(
	- $form_box,
	- $upload_box,
	- ));
	+ ->appendChild($view);
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Apr 7, 9:07 AM (1 d, 1 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1166069
Default Alt Text: (40 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions