No OneTemporary
Actions

Size

68 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php b/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
	index c784fb12a7..1e2d588016 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
	@@ -1,101 +1,101 @@
	<?php

	final class PhabricatorSettingsPanelAccount
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'account';
	}

	public function getPanelName() {
	return pht('Account');
	}

	public function getPanelGroup() {
	return pht('Account Information');
	}

	public function processRequest(AphrontRequest $request) {
	$user = $request->getUser();
	$editable = PhabricatorEnv::getEnvConfig('account.editable');

	$e_realname = $editable ? true : null;
	$errors = array();
	if ($request->isFormPost()) {

	if ($editable) {
	$user->setRealName($request->getStr('realname'));
	if (!strlen($user->getRealName())) {
	$errors[] = 'Real name must be nonempty.';
	$e_realname = 'Required';
	}
	}

	$new_timezone = $request->getStr('timezone');
	if (in_array($new_timezone, DateTimeZone::listIdentifiers(), true)) {
	$user->setTimezoneIdentifier($new_timezone);
	} else {
	$errors[] = 'The selected timezone is not a valid timezone.';
	}

	if (!$errors) {
	$user->save();
	return id(new AphrontRedirectResponse())
	->setURI($this->getPanelURI('?saved=true'));
	}
	}

	$notice = null;
	if (!$errors) {
	if ($request->getStr('saved')) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$notice->setTitle('Changes Saved');
	$notice->appendChild('<p>Your changes have been saved.</p>');
	$notice = $notice->render();
	}
	} else {
	$notice = new AphrontErrorView();
	$notice->setTitle('Form Errors');
	$notice->setErrors($errors);
	$notice = $notice->render();
	}

	$timezone_ids = DateTimeZone::listIdentifiers();
	$timezone_id_map = array_combine($timezone_ids, $timezone_ids);

	$form = new AphrontFormView();
	$form
	->setUser($user)
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Username')
	->setValue($user->getUsername()))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Real Name')
	->setName('realname')
	->setError($e_realname)
	->setValue($user->getRealName())
	->setDisabled(!$editable))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Timezone')
	->setName('timezone')
	->setOptions($timezone_id_map)
	->setValue($user->getTimezoneIdentifier()))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save'));

	$panel = new AphrontPanelView();
	$panel->setHeader('Account Settings');
	- $panel->setWidth(AphrontPanelView::WIDTH_FORM);
	$panel->appendChild($form);
	+ $panel->setNoBackground();

	return array(
	$notice,
	$panel,
	);
	}
	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php b/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php
	index 378e273e22..bdcfd8cada 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php
	@@ -1,107 +1,107 @@
	<?php

	final class PhabricatorSettingsPanelConduit
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'conduit';
	}

	public function getPanelName() {
	return pht('Conduit');
	}

	public function getPanelGroup() {
	return pht('Authentication');
	}

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

	if ($request->isFormPost()) {
	if (!$request->isDialogFormPost()) {
	$dialog = new AphrontDialogView();
	$dialog->setUser($user);
	$dialog->setTitle('Really regenerate session?');
	$dialog->setSubmitURI($this->getPanelURI());
	$dialog->addSubmitButton('Regenerate');
	$dialog->addCancelbutton($this->getPanelURI());
	$dialog->appendChild(
	'<p>Really destroy the old certificate? Any established '.
	'sessions will be terminated.');

	return id(new AphrontDialogResponse())
	->setDialog($dialog);
	}

	$conn = $user->establishConnection('w');
	queryfx(
	$conn,
	'DELETE FROM %T WHERE userPHID = %s AND type LIKE %>',
	PhabricatorUser::SESSION_TABLE,
	$user->getPHID(),
	'conduit');

	// This implicitly regenerates the certificate.
	$user->setConduitCertificate(null);
	$user->save();
	return id(new AphrontRedirectResponse())
	->setURI($this->getPanelURI('?regenerated=true'));
	}

	if ($request->getStr('regenerated')) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$notice->setTitle('Certificate Regenerated');
	$notice->appendChild(
	'<p>Your old certificate has been destroyed and you have been issued '.
	'a new certificate. Sessions established under the old certificate '.
	'are no longer valid.</p>');
	$notice = $notice->render();
	} else {
	$notice = null;
	}

	$cert_form = new AphrontFormView();
	$cert_form
	->setUser($user)
	->appendChild(
	'<p class="aphront-form-instructions">This certificate allows you to '.
	'authenticate over Conduit, the Phabricator API. Normally, you just '.
	'run <tt>arc install-certificate</tt> to install it.')
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Certificate')
	->setHeight(AphrontFormTextAreaControl::HEIGHT_SHORT)
	->setValue($user->getConduitCertificate()));

	$cert = new AphrontPanelView();
	$cert->setHeader('Arcanist Certificate');
	$cert->appendChild($cert_form);
	- $cert->setWidth(AphrontPanelView::WIDTH_FORM);
	+ $cert->setNoBackground();

	$regen_form = new AphrontFormView();
	$regen_form
	->setUser($user)
	->setAction($this->getPanelURI())
	->setWorkflow(true)
	->appendChild(
	'<p class="aphront-form-instructions">You can regenerate this '.
	'certificate, which will invalidate the old certificate and create '.
	'a new one.</p>')
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Regenerate Certificate'));

	$regen = new AphrontPanelView();
	$regen->setHeader('Regenerate Certificate');
	$regen->appendChild($regen_form);
	- $regen->setWidth(AphrontPanelView::WIDTH_FORM);
	+ $regen->setNoBackground();

	return array(
	$notice,
	$cert,
	$regen,
	);
	}
	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
	index b4fbdc457f..c52244cafb 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
	@@ -1,166 +1,166 @@
	<?php

	final class PhabricatorSettingsPanelDisplayPreferences
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'display';
	}

	public function getPanelName() {
	return pht('Display Preferences');
	}

	public function getPanelGroup() {
	return pht('Application Settings');
	}

	public function processRequest(AphrontRequest $request) {
	$user = $request->getUser();
	$preferences = $user->loadPreferences();

	$pref_monospaced = PhabricatorUserPreferences::PREFERENCE_MONOSPACED;
	$pref_editor = PhabricatorUserPreferences::PREFERENCE_EDITOR;
	$pref_multiedit = PhabricatorUserPreferences::PREFERENCE_MULTIEDIT;
	$pref_titles = PhabricatorUserPreferences::PREFERENCE_TITLES;
	$pref_symbols = PhabricatorUserPreferences::PREFERENCE_DIFFUSION_SYMBOLS;
	$pref_monospaced_textareas =
	PhabricatorUserPreferences::PREFERENCE_MONOSPACED_TEXTAREAS;

	if ($request->isFormPost()) {
	$monospaced = $request->getStr($pref_monospaced);

	// Prevent the user from doing stupid things.
	$monospaced = preg_replace('/[^a-z0-9 ,"]+/i', '', $monospaced);

	$preferences->setPreference($pref_titles, $request->getStr($pref_titles));
	$preferences->setPreference($pref_editor, $request->getStr($pref_editor));
	$preferences->setPreference(
	$pref_multiedit,
	$request->getStr($pref_multiedit));
	$preferences->setPreference(
	$pref_symbols,
	$request->getStr($pref_symbols));
	$preferences->setPreference($pref_monospaced, $monospaced);
	$preferences->setPreference(
	$pref_monospaced_textareas,
	$request->getStr($pref_monospaced_textareas));

	$preferences->save();
	return id(new AphrontRedirectResponse())
	->setURI($this->getPanelURI('?saved=true'));
	}

	$example_string = <<<EXAMPLE
	// This is what your monospaced font currently looks like.
	function helloWorld() {
	alert("Hello world!");
	}
	EXAMPLE;

	$editor_doc_link = phutil_render_tag(
	'a',
	array(
	'href' => PhabricatorEnv::getDoclink(
	'article/User_Guide_Configuring_an_External_Editor.html'),
	),
	'User Guide: Configuring an External Editor');

	$font_default = PhabricatorEnv::getEnvConfig('style.monospace');
	$font_default = phutil_escape_html($font_default);

	$pref_symbols_value = $preferences->getPreference($pref_symbols);
	$pref_monospaced_textareas_value = $preferences
	->getPreference($pref_monospaced_textareas);
	if (!$pref_monospaced_textareas_value) {
	$pref_monospaced_textareas_value = 'disabled';
	}

	$form = id(new AphrontFormView())
	->setUser($user)
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Page Titles')
	->setName($pref_titles)
	->setValue($preferences->getPreference($pref_titles))
	->setOptions(
	array(
	'glyph' =>
	"In page titles, show Tool names as unicode glyphs: \xE2\x9A\x99",
	'text' =>
	'In page titles, show Tool names as plain text: [Differential]',
	)))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Editor Link')
	->setName($pref_editor)
	->setCaption(
	'Link to edit files in external editor. '.
	'%f is replaced by filename, %l by line number, %r by repository '.
	'callsign, %% by literal %. '.
	"For documentation, see {$editor_doc_link}.")
	->setValue($preferences->getPreference($pref_editor)))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Edit Multiple Files')
	->setName($pref_multiedit)
	->setOptions(array(
	'' => 'Supported (paths separated by spaces)',
	'disable' => 'Not Supported',
	))
	->setValue($preferences->getPreference($pref_multiedit)))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Monospaced Font')
	->setName($pref_monospaced)
	->setCaption(
	'Overrides default fonts in tools like Differential.<br />'.
	'(Default: '.$font_default.')')
	->setValue($preferences->getPreference($pref_monospaced)))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setValue(
	'<pre class="PhabricatorMonospaced">'.
	phutil_escape_html($example_string).
	'</pre>'))
	->appendChild(
	id(new AphrontFormRadioButtonControl())
	->setLabel('Symbol Links')
	->setName($pref_symbols)
	->setValue($pref_symbols_value ? $pref_symbols_value : 'enabled')
	->addButton('enabled', 'Enabled (default)',
	'Use this setting to disable linking symbol names in Differential '.
	'and Diffusion to their definitions. This is enabled by default.')
	->addButton('disabled', 'Disabled', null))
	->appendChild(
	id(new AphrontFormRadioButtonControl())
	->setLabel('Monospaced Textareas')
	->setName($pref_monospaced_textareas)
	->setValue($pref_monospaced_textareas_value)
	->addButton('enabled', 'Enabled',
	'Show all textareas using the monospaced font defined above.')
	->addButton('disabled', 'Disabled', null))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save Preferences'));

	$panel = new AphrontPanelView();
	- $panel->setWidth(AphrontPanelView::WIDTH_WIDE);
	$panel->setHeader('Display Preferences');
	$panel->appendChild($form);
	+ $panel->setNoBackground();

	$error_view = null;
	if ($request->getStr('saved') === 'true') {
	$error_view = id(new AphrontErrorView())
	->setTitle('Preferences Saved')
	->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
	->setErrors(array('Your preferences have been saved.'));
	}

	return array(
	$error_view,
	$panel,
	);
	}
	}

	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
	index b60a74b64d..072c1dcb9e 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
	@@ -1,353 +1,354 @@
	<?php

	final class PhabricatorSettingsPanelEmailAddresses
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'email';
	}

	public function getPanelName() {
	return pht('Email Addresses');
	}

	public function getPanelGroup() {
	return pht('Email');
	}

	public function processRequest(AphrontRequest $request) {
	$user = $request->getUser();
	$editable = PhabricatorEnv::getEnvConfig('account.editable');

	$uri = $request->getRequestURI();
	$uri->setQueryParams(array());

	if ($editable) {
	$new = $request->getStr('new');
	if ($new) {
	return $this->returnNewAddressResponse($request, $uri, $new);
	}

	$delete = $request->getInt('delete');
	if ($delete) {
	return $this->returnDeleteAddressResponse($request, $uri, $delete);
	}
	}

	$verify = $request->getInt('verify');
	if ($verify) {
	return $this->returnVerifyAddressResponse($request, $uri, $verify);
	}

	$primary = $request->getInt('primary');
	if ($primary) {
	return $this->returnPrimaryAddressResponse($request, $uri, $primary);
	}

	$emails = id(new PhabricatorUserEmail())->loadAllWhere(
	'userPHID = %s ORDER BY address',
	$user->getPHID());

	$rowc = array();
	$rows = array();
	foreach ($emails as $email) {

	$button_verify = javelin_render_tag(
	'a',
	array(
	'class' => 'button small grey',
	'href' => $uri->alter('verify', $email->getID()),
	'sigil' => 'workflow',
	),
	'Verify');

	$button_make_primary = javelin_render_tag(
	'a',
	array(
	'class' => 'button small grey',
	'href' => $uri->alter('primary', $email->getID()),
	'sigil' => 'workflow',
	),
	'Make Primary');

	$button_remove = javelin_render_tag(
	'a',
	array(
	'class' => 'button small grey',
	'href' => $uri->alter('delete', $email->getID()),
	'sigil' => 'workflow'
	),
	'Remove');

	$button_primary = phutil_render_tag(
	'a',
	array(
	'class' => 'button small disabled',
	),
	'Primary');

	if (!$email->getIsVerified()) {
	$action = $button_verify;
	} else if ($email->getIsPrimary()) {
	$action = $button_primary;
	} else {
	$action = $button_make_primary;
	}

	if ($email->getIsPrimary()) {
	$remove = $button_primary;
	$rowc[] = 'highlighted';
	} else {
	$remove = $button_remove;
	$rowc[] = null;
	}

	$rows[] = array(
	phutil_escape_html($email->getAddress()),
	$action,
	$remove,
	);
	}

	$table = new AphrontTableView($rows);
	$table->setHeaders(
	array(
	'Email',
	'Status',
	'Remove',
	));
	$table->setColumnClasses(
	array(
	'wide',
	'action',
	'action',
	));
	$table->setRowClasses($rowc);
	$table->setColumnVisibility(
	array(
	true,
	true,
	$editable,
	));

	$view = new AphrontPanelView();
	if ($editable) {
	$view->addButton(
	javelin_render_tag(
	'a',
	array(
	'href' => $uri->alter('new', 'true'),
	'class' => 'green button',
	'sigil' => 'workflow',
	),
	'Add New Address'));
	}
	$view->setHeader('Email Addresses');
	$view->appendChild($table);
	+ $view->setNoBackground();

	return $view;
	}

	private function returnNewAddressResponse(
	AphrontRequest $request,
	PhutilURI $uri,
	$new) {

	$user = $request->getUser();

	$e_email = true;
	$email = trim($request->getStr('email'));
	$errors = array();
	if ($request->isDialogFormPost()) {

	if ($new == 'verify') {
	// The user clicked "Done" from the "an email has been sent" dialog.
	return id(new AphrontReloadResponse())->setURI($uri);
	}

	if (!strlen($email)) {
	$e_email = 'Required';
	$errors[] = 'Email is required.';
	} else if (!PhabricatorUserEmail::isAllowedAddress($email)) {
	$e_email = 'Invalid';
	$errors[] = PhabricatorUserEmail::describeAllowedAddresses();
	}

	if (!$errors) {
	$object = id(new PhabricatorUserEmail())
	->setAddress($email)
	->setIsVerified(0);

	try {

	id(new PhabricatorUserEditor())
	->setActor($user)
	->addEmail($user, $object);

	$object->sendVerificationEmail($user);

	$dialog = id(new AphrontDialogView())
	->setUser($user)
	->addHiddenInput('new', 'verify')
	->setTitle('Verification Email Sent')
	->appendChild(
	'<p>A verification email has been sent. Click the link in the '.
	'email to verify your address.</p>')
	->setSubmitURI($uri)
	->addSubmitButton('Done');

	return id(new AphrontDialogResponse())->setDialog($dialog);
	} catch (AphrontQueryDuplicateKeyException $ex) {
	$email = 'Duplicate';
	$errors[] = 'Another user already has this email.';
	}
	}
	}

	if ($errors) {
	$errors = id(new AphrontErrorView())
	->setErrors($errors);
	}

	$form = id(new AphrontFormLayoutView())
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Email')
	->setName('email')
	->setValue($request->getStr('email'))
	->setCaption(PhabricatorUserEmail::describeAllowedAddresses())
	->setError($e_email));

	$dialog = id(new AphrontDialogView())
	->setUser($user)
	->addHiddenInput('new', 'true')
	->setTitle('New Address')
	->appendChild($errors)
	->appendChild($form)
	->addSubmitButton('Save')
	->addCancelButton($uri);

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	private function returnDeleteAddressResponse(
	AphrontRequest $request,
	PhutilURI $uri,
	$email_id) {

	$user = $request->getUser();

	// NOTE: You can only delete your own email addresses, and you can not
	// delete your primary address.
	$email = id(new PhabricatorUserEmail())->loadOneWhere(
	'id = %d AND userPHID = %s AND isPrimary = 0',
	$email_id,
	$user->getPHID());

	if (!$email) {
	return new Aphront404Response();
	}

	if ($request->isFormPost()) {

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

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

	$address = $email->getAddress();

	$dialog = id(new AphrontDialogView())
	->setUser($user)
	->addHiddenInput('delete', $email_id)
	->setTitle("Really delete address '{$address}'?")
	->appendChild(
	'<p>Are you sure you want to delete this address? You will no '.
	'longer be able to use it to login.</p>')
	->addSubmitButton('Delete')
	->addCancelButton($uri);

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	private function returnVerifyAddressResponse(
	AphrontRequest $request,
	PhutilURI $uri,
	$email_id) {

	$user = $request->getUser();

	// NOTE: You can only send more email for your unverified addresses.
	$email = id(new PhabricatorUserEmail())->loadOneWhere(
	'id = %d AND userPHID = %s AND isVerified = 0',
	$email_id,
	$user->getPHID());

	if (!$email) {
	return new Aphront404Response();
	}

	if ($request->isFormPost()) {
	$email->sendVerificationEmail($user);
	return id(new AphrontRedirectResponse())->setURI($uri);
	}

	$address = $email->getAddress();

	$dialog = id(new AphrontDialogView())
	->setUser($user)
	->addHiddenInput('verify', $email_id)
	->setTitle("Send Another Verification Email?")
	->appendChild(
	'<p>Send another copy of the verification email to '.
	phutil_escape_html($address).'?</p>')
	->addSubmitButton('Send Email')
	->addCancelButton($uri);

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	private function returnPrimaryAddressResponse(
	AphrontRequest $request,
	PhutilURI $uri,
	$email_id) {

	$user = $request->getUser();

	// NOTE: You can only make your own verified addresses primary.
	$email = id(new PhabricatorUserEmail())->loadOneWhere(
	'id = %d AND userPHID = %s AND isVerified = 1 AND isPrimary = 0',
	$email_id,
	$user->getPHID());

	if (!$email) {
	return new Aphront404Response();
	}

	if ($request->isFormPost()) {

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

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

	$address = $email->getAddress();

	$dialog = id(new AphrontDialogView())
	->setUser($user)
	->addHiddenInput('primary', $email_id)
	->setTitle("Change primary email address?")
	->appendChild(
	'<p>If you change your primary address, Phabricator will send all '.
	'email to '.phutil_escape_html($address).'.</p>')
	->addSubmitButton('Change Primary Address')
	->addCancelButton($uri);

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
	index 7209f263bd..dadca328a6 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
	@@ -1,294 +1,294 @@
	<?php

	final class PhabricatorSettingsPanelEmailPreferences
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'emailpreferences';
	}

	public function getPanelName() {
	return pht('Email Preferences');
	}

	public function getPanelGroup() {
	return pht('Email');
	}

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

	$preferences = $user->loadPreferences();

	$pref_re_prefix = PhabricatorUserPreferences::PREFERENCE_RE_PREFIX;
	$pref_vary = PhabricatorUserPreferences::PREFERENCE_VARY_SUBJECT;
	$pref_no_self_mail = PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL;

	$errors = array();
	if ($request->isFormPost()) {

	if (PhabricatorMetaMTAMail::shouldMultiplexAllMail()) {
	if ($request->getStr($pref_re_prefix) == 'default') {
	$preferences->unsetPreference($pref_re_prefix);
	} else {
	$preferences->setPreference(
	$pref_re_prefix,
	$request->getBool($pref_re_prefix));
	}

	if ($request->getStr($pref_vary) == 'default') {
	$preferences->unsetPreference($pref_vary);
	} else {
	$preferences->setPreference(
	$pref_vary,
	$request->getBool($pref_vary));
	}
	}

	$preferences->setPreference(
	$pref_no_self_mail,
	$request->getStr($pref_no_self_mail));

	$new_tags = $request->getArr('mailtags');
	$mailtags = $preferences->getPreference('mailtags', array());
	$all_tags = $this->getMailTags();
	if (!PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	$all_tags = array_diff_key($all_tags, $this->getManiphestMailTags());
	}
	foreach ($all_tags as $key => $label) {
	$mailtags[$key] = (bool)idx($new_tags, $key, false);
	}
	$preferences->setPreference('mailtags', $mailtags);

	$preferences->save();

	return id(new AphrontRedirectResponse())
	->setURI($this->getPanelURI('?saved=true'));
	}

	$notice = null;
	if (!$errors) {
	if ($request->getStr('saved')) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$notice->setTitle('Changes Saved');
	$notice->appendChild('<p>Your changes have been saved.</p>');
	}
	} else {
	$notice = new AphrontErrorView();
	$notice->setTitle('Form Errors');
	$notice->setErrors($errors);
	}

	$re_prefix_default = PhabricatorEnv::getEnvConfig('metamta.re-prefix')
	? 'Enabled'
	: 'Disabled';

	$vary_default = PhabricatorEnv::getEnvConfig('metamta.vary-subjects')
	? 'Vary'
	: 'Do Not Vary';

	$re_prefix_value = $preferences->getPreference($pref_re_prefix);
	if ($re_prefix_value === null) {
	$re_prefix_value = 'default';
	} else {
	$re_prefix_value = $re_prefix_value
	? 'true'
	: 'false';
	}

	$vary_value = $preferences->getPreference($pref_vary);
	if ($vary_value === null) {
	$vary_value = 'default';
	} else {
	$vary_value = $vary_value
	? 'true'
	: 'false';
	}

	$form = new AphrontFormView();
	$form
	->setUser($user)
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Self Actions')
	->setName($pref_no_self_mail)
	->setOptions(
	array(
	'0' => 'Send me an email when I take an action',
	'1' => 'Do not send me an email when I take an action',
	))
	->setCaption('You can disable email about your own actions.')
	->setValue($preferences->getPreference($pref_no_self_mail, 0)));

	if (PhabricatorMetaMTAMail::shouldMultiplexAllMail()) {
	$re_control = id(new AphrontFormSelectControl())
	->setName($pref_re_prefix)
	->setOptions(
	array(
	'default' => 'Use Server Default ('.$re_prefix_default.')',
	'true' => 'Enable "Re:" prefix',
	'false' => 'Disable "Re:" prefix',
	))
	->setValue($re_prefix_value);

	$vary_control = id(new AphrontFormSelectControl())
	->setName($pref_vary)
	->setOptions(
	array(
	'default' => 'Use Server Default ('.$vary_default.')',
	'true' => 'Vary Subjects',
	'false' => 'Do Not Vary Subjects',
	))
	->setValue($vary_value);
	} else {
	$re_control = id(new AphrontFormStaticControl())
	->setValue('Server Default ('.$re_prefix_default.')');

	$vary_control = id(new AphrontFormStaticControl())
	->setValue('Server Default ('.$vary_default.')');
	}

	$form
	->appendChild(
	$re_control
	->setLabel('Add "Re:" Prefix')
	->setCaption(
	'Enable this option to fix threading in Mail.app on OS X Lion, '.
	'or if you like "Re:" in your email subjects.'))
	->appendChild(
	$vary_control
	->setLabel('Vary Subjects')
	->setCaption(
	'This option adds more information to email subjects, but may '.
	'break threading in some clients.'));

	$form
	->appendChild(
	'<br />'.
	'<p class="aphront-form-instructions">'.
	'You can customize what mail you receive from Phabricator here.'.
	'</p>'.
	'<p class="aphront-form-instructions">'.
	'<strong>NOTE:</strong> If an update makes several changes (like '.
	'adding CCs to a task, closing it, and adding a comment) you will '.
	'still receive an email as long as at least one of the changes '.
	'is set to notify you.'.
	'</p>'
	);

	$mailtags = $preferences->getPreference('mailtags', array());

	$form
	->appendChild(
	$this->buildMailTagCheckboxes(
	$this->getDifferentialMailTags(),
	$mailtags)
	->setLabel('Differential'));

	if (PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	$form->appendChild(
	$this->buildMailTagCheckboxes(
	$this->getManiphestMailTags(),
	$mailtags)
	->setLabel('Maniphest'));
	}

	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save Preferences'));

	$panel = new AphrontPanelView();
	$panel->setHeader('Email Preferences');
	- $panel->setWidth(AphrontPanelView::WIDTH_FORM);
	$panel->appendChild($form);
	+ $panel->setNoBackground();

	return id(new AphrontNullView())
	->appendChild(
	array(
	$notice,
	$panel,
	));
	}

	private function getMailTags() {
	return array(
	MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEWERS =>
	pht("Send me email when a revision's reviewers change."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_CLOSED =>
	pht("Send me email when a revision is closed."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_CC =>
	pht("Send me email when a revision's CCs change."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMENT =>
	pht("Send me email when a revision is commented on."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_UPDATED =>
	pht("Send me email when a revision is updated."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEW_REQUEST =>
	pht("Send me email when I am requested to review a revision."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_OTHER =>
	pht("Send me email for any other activity not listed above."),

	MetaMTANotificationType::TYPE_MANIPHEST_STATUS =>
	pht("Send me email when a task's status changes."),
	MetaMTANotificationType::TYPE_MANIPHEST_OWNER =>
	pht("Send me email when a task's owner changes."),
	MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY =>
	pht("Send me email when a task's priority changes."),
	MetaMTANotificationType::TYPE_MANIPHEST_CC =>
	pht("Send me email when a task's CCs change."),
	MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS =>
	pht("Send me email when a task's associated projects change."),
	MetaMTANotificationType::TYPE_MANIPHEST_COMMENT =>
	pht("Send me email when a task is commented on."),
	MetaMTANotificationType::TYPE_MANIPHEST_OTHER =>
	pht("Send me email for any other activity not listed above."),

	);
	}

	private function getManiphestMailTags() {
	return array_select_keys(
	$this->getMailTags(),
	array(
	MetaMTANotificationType::TYPE_MANIPHEST_STATUS,
	MetaMTANotificationType::TYPE_MANIPHEST_OWNER,
	MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY,
	MetaMTANotificationType::TYPE_MANIPHEST_CC,
	MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS,
	MetaMTANotificationType::TYPE_MANIPHEST_COMMENT,
	MetaMTANotificationType::TYPE_MANIPHEST_OTHER,
	));
	}

	private function getDifferentialMailTags() {
	return array_select_keys(
	$this->getMailTags(),
	array(
	MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEWERS,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_CLOSED,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_CC,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMENT,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_UPDATED,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEW_REQUEST,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_OTHER,
	));
	}

	private function buildMailTagCheckboxes(
	array $tags,
	array $prefs) {

	$control = new AphrontFormCheckboxControl();
	foreach ($tags as $key => $label) {
	$control->addCheckbox(
	'mailtags['.$key.']',
	1,
	$label,
	idx($prefs, $key, 1));
	}

	return $control;
	}

	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php b/src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php
	index 047a3387c9..ebff08540a 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php
	@@ -1,85 +1,86 @@
	<?php

	final class PhabricatorSettingsPanelLDAP
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'ldap';
	}

	public function getPanelName() {
	return pht('LDAP');
	}

	public function getPanelGroup() {
	return pht('Linked Accounts');
	}

	public function isEnabled() {
	$ldap_provider = new PhabricatorLDAPProvider();
	return $ldap_provider->isProviderEnabled();
	}

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

	$ldap_info = id(new PhabricatorUserLDAPInfo())->loadOneWhere(
	'userID = %d',
	$user->getID());

	$forms = array();

	if (!$ldap_info) {
	$unlink = 'Link LDAP Account';
	$unlink_form = new AphrontFormView();
	$unlink_form
	->setUser($user)
	->setAction('/ldap/login/')
	->appendChild(
	'<p class="aphront-form-instructions">There is currently no '.
	'LDAP account linked to your Phabricator account. You can link an ' .
	'account, which will allow you to use it to log into Phabricator</p>')
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('LDAP username')
	->setName('username'))
	->appendChild(
	id(new AphrontFormPasswordControl())
	->setLabel('Password')
	->setName('password'))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue("Link LDAP Account \xC2\xBB"));

	$forms['Link Account'] = $unlink_form;
	} else {
	$unlink = 'Unlink LDAP Account';
	$unlink_form = new AphrontFormView();
	$unlink_form
	->setUser($user)
	->appendChild(
	'<p class="aphront-form-instructions">You may unlink this account '.
	'from your LDAP account. This will prevent you from logging in with '.
	'your LDAP credentials.</p>')
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton('/ldap/unlink/', $unlink));

	$forms['Unlink Account'] = $unlink_form;
	}

	$panel = new AphrontPanelView();
	$panel->setHeader('LDAP Account Settings');
	- $panel->setWidth(AphrontPanelView::WIDTH_FORM);
	+ $panel->setNoBackground();
	+
	foreach ($forms as $name => $form) {
	if ($name) {
	$panel->appendChild('<br /><h1>'.$name.'</h1><br />');
	}
	$panel->appendChild($form);
	}

	return array(
	$panel,
	);
	}
	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php b/src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php
	index 8027e42dcc..41565afbdb 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php
	@@ -1,292 +1,293 @@
	<?php

	final class PhabricatorSettingsPanelOAuth
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'oauth-'.$this->provider->getProviderKey();
	}

	public function getPanelName() {
	return $this->provider->getProviderName();
	}

	public function getPanelGroup() {
	return pht('Linked Accounts');
	}

	public function buildPanels() {
	$panels = array();

	$providers = PhabricatorOAuthProvider::getAllProviders();
	foreach ($providers as $provider) {
	$panel = clone $this;
	$panel->setOAuthProvider($provider);
	$panels[] = $panel;
	}

	return $panels;
	}

	public function isEnabled() {
	return $this->provider->isProviderEnabled();
	}

	private $provider;

	public function setOAuthProvider(PhabricatorOAuthProvider $oauth_provider) {
	$this->provider = $oauth_provider;
	return $this;
	}

	private function prepareAuthForm(AphrontFormView $form) {
	$provider = $this->provider;

	$auth_uri = $provider->getAuthURI();
	$client_id = $provider->getClientID();
	$redirect_uri = $provider->getRedirectURI();
	$minimum_scope = $provider->getMinimumScope();

	$form
	->setAction($auth_uri)
	->setMethod('GET')
	->addHiddenInput('redirect_uri', $redirect_uri)
	->addHiddenInput('client_id', $client_id)
	->addHiddenInput('scope', $minimum_scope);

	foreach ($provider->getExtraAuthParameters() as $key => $value) {
	$form->addHiddenInput($key, $value);
	}

	return $form;
	}

	public function processRequest(AphrontRequest $request) {
	$user = $request->getUser();
	$provider = $this->provider;
	$notice = null;
	$provider_name = $provider->getProviderName();
	$provider_key = $provider->getProviderKey();

	$oauth_info = id(new PhabricatorUserOAuthInfo())->loadOneWhere(
	'userID = %d AND oauthProvider = %s',
	$user->getID(),
	$provider->getProviderKey());

	if ($request->isFormPost() && $oauth_info) {
	$notice = $this->refreshProfileImage($request, $oauth_info);
	}

	$form = new AphrontFormView();
	$form->setUser($user);

	$forms = array();
	$forms[] = $form;
	if (!$oauth_info) {
	$form
	->appendChild(
	'<p class="aphront-form-instructions">There is currently no '.
	phutil_escape_html($provider_name).' account linked to your '.
	'Phabricator account. You can link an account, which will allow you '.
	'to use it to log into Phabricator.</p>');

	$this->prepareAuthForm($form);

	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Link '.$provider_name." Account \xC2\xBB"));
	} else {
	$expires = $oauth_info->getTokenExpires();

	$form
	->appendChild(
	'<p class="aphront-form-instructions">Your account is linked with '.
	'a '.phutil_escape_html($provider_name).' account. You may use your '.
	phutil_escape_html($provider_name).' credentials to log into '.
	'Phabricator.</p>')
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel($provider_name.' ID')
	->setValue($oauth_info->getOAuthUID())
	)
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel($provider_name.' Name')
	->setValue($oauth_info->getAccountName())
	)
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel($provider_name.' URI')
	->setValue($oauth_info->getAccountURI())
	);

	if (!$expires \|\| $expires > time()) {
	$form->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Refresh Profile Image from '.$provider_name)
	);
	}

	if (!$provider->isProviderLinkPermanent()) {
	$unlink = 'Unlink '.$provider_name.' Account';
	$unlink_form = new AphrontFormView();
	$unlink_form
	->setUser($user)
	->appendChild(
	'<p class="aphront-form-instructions">You may unlink this account '.
	'from your '.phutil_escape_html($provider_name).' account. This '.
	'will prevent you from logging in with your '.
	phutil_escape_html($provider_name).' credentials.</p>')
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton('/oauth/'.$provider_key.'/unlink/', $unlink));
	$forms['Unlink Account'] = $unlink_form;
	}

	if ($expires) {
	if ($expires <= time()) {
	$expires_text = "Expired";
	} else {
	$expires_text = phabricator_datetime($expires, $user);
	}
	} else {
	$expires_text = 'No Information Available';
	}

	$scope = $oauth_info->getTokenScope();
	if (!$scope) {
	$scope = 'No Information Available';
	}

	$status = $oauth_info->getTokenStatus();
	$readable_status = PhabricatorUserOAuthInfo::getReadableTokenStatus(
	$status);
	$rappable_status = PhabricatorUserOAuthInfo::getRappableTokenStatus(
	$status);
	$beat = self::getBeat();
	$rap = $beat . "Yo yo yo<br />".
	'My name\'s DJ Token and I\'m here to say<br />'.
	// pronounce as "dollar rappable status" for meter to work
	"$rappable_status, hey hey hey hey<br />".
	'I rap \'bout tokens, that might be why<br />'.
	'I\'m such a cool and popular guy';

	$token_form = new AphrontFormView();
	$token_form
	->setUser($user)
	->appendChild(
	'<p class="aphront-from-instructions">'.$rap.'</p>')
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Token Status')
	->setValue($readable_status))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Expires')
	->setValue($expires_text))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Scope')
	->setValue($scope));

	if ($expires <= time()) {
	$this->prepareAuthForm($token_form);
	$token_form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Refresh '.$provider_name.' Token')
	);
	}

	$forms['Account Token Information'] = $token_form;
	}

	$panel = new AphrontPanelView();
	$panel->setHeader($provider_name.' Account Settings');
	- $panel->setWidth(AphrontPanelView::WIDTH_FORM);
	+ $panel->setNoBackground();
	+
	foreach ($forms as $name => $form) {
	if ($name) {
	$panel->appendChild('<br /><h1>'.$name.'</h1><br />');
	}
	$panel->appendChild($form);
	}

	return id(new AphrontNullView())
	->appendChild(
	array(
	$notice,
	$panel,
	));
	}

	private function refreshProfileImage(
	AphrontRequest $request,
	PhabricatorUserOAuthInfo $oauth_info) {

	$user = $request->getUser();
	$provider = $this->provider;
	$error = false;
	$userinfo_uri = new PhutilURI($provider->getUserInfoURI());
	$token = $oauth_info->getToken();
	try {
	$userinfo_uri->setQueryParam('access_token', $token);
	$user_data = HTTPSFuture::loadContent($userinfo_uri);
	$provider->setUserData($user_data);
	$provider->setAccessToken($token);
	$image = $provider->retrieveUserProfileImage();
	if ($image) {
	$file = PhabricatorFile::newFromFileData(
	$image,
	array(
	'name' => $provider->getProviderKey().'-profile.jpg',
	'authorPHID' => $user->getPHID(),
	));

	$xformer = new PhabricatorImageTransformer();

	// Resize OAuth image to a reasonable size
	$small_xformed = $xformer->executeProfileTransform(
	$file,
	$width = 50,
	$min_height = 50,
	$max_height = 50);

	$user->setProfileImagePHID($small_xformed->getPHID());
	$user->save();
	} else {
	$error = 'Unable to retrieve image.';
	}
	} catch (Exception $e) {
	if ($e instanceof PhabricatorOAuthProviderException) {
	$error = sprintf('Unable to retrieve image from %s',
	$provider->getProviderName());
	} else {
	$error = 'Unable to save image.';
	}
	}
	$notice = new AphrontErrorView();
	if ($error) {
	$notice
	->setTitle('Error Refreshing Profile Picture')
	->setErrors(array($error));
	} else {
	$notice
	->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
	->setTitle('Successfully Refreshed Profile Picture');
	}
	return $notice;
	}

	private static function getBeat() {
	// Gangsta's Paradise (karaoke version).
	// Chosen because it's the only thing I listen to.
	$song_id = "Gangsta\\'s Paradise";

	// Make a musical note which you can click for the beat.
	$beat = '<a href="javascript:void(0);" onclick="javascript:alert('.
	"'Think about $song_id.'".
	'); return 0;">♫ </a>';
	return $beat;
	}
	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php b/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php
	index a26ff94b79..e7d6e69879 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php
	@@ -1,171 +1,171 @@
	<?php

	final class PhabricatorSettingsPanelPassword
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'password';
	}

	public function getPanelName() {
	return pht('Password');
	}

	public function getPanelGroup() {
	return pht('Authentication');
	}

	public function isEnabled() {
	// There's no sense in showing a change password panel if the user
	// can't change their password...

	if (!PhabricatorEnv::getEnvConfig('account.editable')) {
	return false;
	}

	// ...or this install doesn't support password authentication at all.

	if (!PhabricatorEnv::getEnvConfig('auth.password-auth-enabled')) {
	return false;
	}

	return true;
	}

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

	$min_len = PhabricatorEnv::getEnvConfig('account.minimum-password-length');
	$min_len = (int)$min_len;

	// NOTE: To change your password, you need to prove you own the account,
	// either by providing the old password or by carrying a token to
	// the workflow from a password reset email.

	$token = $request->getStr('token');

	$valid_token = false;
	if ($token) {
	$email_address = $request->getStr('email');
	$email = id(new PhabricatorUserEmail())->loadOneWhere(
	'address = %s',
	$email_address);
	if ($email) {
	$valid_token = $user->validateEmailToken($email, $token);
	}
	}

	$e_old = true;
	$e_new = true;
	$e_conf = true;

	$errors = array();
	if ($request->isFormPost()) {
	if (!$valid_token) {
	$envelope = new PhutilOpaqueEnvelope($request->getStr('old_pw'));
	if (!$user->comparePassword($envelope)) {
	$errors[] = 'The old password you entered is incorrect.';
	$e_old = 'Invalid';
	}
	}

	$pass = $request->getStr('new_pw');
	$conf = $request->getStr('conf_pw');

	if (strlen($pass) < $min_len) {
	$errors[] = 'Your new password is too short.';
	$e_new = 'Too Short';
	}

	if ($pass !== $conf) {
	$errors[] = 'New password and confirmation do not match.';
	$e_conf = 'Invalid';
	}

	if (!$errors) {
	// This write is unguarded because the CSRF token has already
	// been checked in the call to $request->isFormPost() and
	// the CSRF token depends on the password hash, so when it
	// is changed here the CSRF token check will fail.
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();

	$envelope = new PhutilOpaqueEnvelope($pass);
	id(new PhabricatorUserEditor())
	->setActor($user)
	->changePassword($user, $envelope);

	unset($unguarded);

	if ($valid_token) {
	// If this is a password set/reset, kick the user to the home page
	// after we update their account.
	$next = '/';
	} else {
	$next = $this->getPanelURI('?saved=true');
	}

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

	$notice = null;
	if (!$errors) {
	if ($request->getStr('saved')) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$notice->setTitle('Changes Saved');
	$notice->appendChild('<p>Your password has been updated.</p>');
	}
	} else {
	$notice = new AphrontErrorView();
	$notice->setTitle('Error Changing Password');
	$notice->setErrors($errors);
	}

	$len_caption = null;
	if ($min_len) {
	$len_caption = 'Minimum password length: '.$min_len.' characters.';
	}

	$form = new AphrontFormView();
	$form
	->setUser($user)
	->addHiddenInput('token', $token);

	if (!$valid_token) {
	$form->appendChild(
	id(new AphrontFormPasswordControl())
	->setLabel('Old Password')
	->setError($e_old)
	->setName('old_pw'));
	}

	$form
	->appendChild(
	id(new AphrontFormPasswordControl())
	->setLabel('New Password')
	->setError($e_new)
	->setName('new_pw'));
	$form
	->appendChild(
	id(new AphrontFormPasswordControl())
	->setLabel('Confirm Password')
	->setCaption($len_caption)
	->setError($e_conf)
	->setName('conf_pw'));
	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save'));

	$panel = new AphrontPanelView();
	$panel->setHeader('Change Password');
	- $panel->setWidth(AphrontPanelView::WIDTH_FORM);
	$panel->appendChild($form);
	+ $panel->setNoBackground();

	return array(
	$notice,
	$panel,
	);
	}
	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php b/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php
	index e2e59284e4..3eb398aa4b 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php
	@@ -1,209 +1,209 @@
	<?php

	final class PhabricatorSettingsPanelProfile
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'profile';
	}

	public function getPanelName() {
	return pht('Profile');
	}

	public function getPanelGroup() {
	return pht('Account Information');
	}

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

	$profile = id(new PhabricatorUserProfile())->loadOneWhere(
	'userPHID = %s',
	$user->getPHID());
	if (!$profile) {
	$profile = new PhabricatorUserProfile();
	$profile->setUserPHID($user->getPHID());
	}

	$supported_formats = PhabricatorFile::getTransformableImageFormats();

	$e_image = null;
	$errors = array();
	if ($request->isFormPost()) {
	$profile->setTitle($request->getStr('title'));
	$profile->setBlurb($request->getStr('blurb'));

	$sex = $request->getStr('sex');
	$sexes = array(PhutilPerson::SEX_MALE, PhutilPerson::SEX_FEMALE);
	if (in_array($sex, $sexes)) {
	$user->setSex($sex);
	} else {
	$user->setSex(null);
	}

	// Checked in runtime.
	$user->setTranslation($request->getStr('translation'));

	$default_image = $request->getExists('default_image');
	if ($default_image) {
	$profile->setProfileImagePHID(null);
	$user->setProfileImagePHID(null);
	} else if (!empty($_FILES['image'])) {
	$err = idx($_FILES['image'], 'error');
	if ($err != UPLOAD_ERR_NO_FILE) {
	$file = PhabricatorFile::newFromPHPUpload(
	$_FILES['image'],
	array(
	'authorPHID' => $user->getPHID(),
	));
	$okay = $file->isTransformableImage();
	if ($okay) {
	$xformer = new PhabricatorImageTransformer();

	// Generate the large picture for the profile page.
	$large_xformed = $xformer->executeProfileTransform(
	$file,
	$width = 280,
	$min_height = 140,
	$max_height = 420);
	$profile->setProfileImagePHID($large_xformed->getPHID());

	// Generate the small picture for comments, etc.
	$small_xformed = $xformer->executeProfileTransform(
	$file,
	$width = 50,
	$min_height = 50,
	$max_height = 50);
	$user->setProfileImagePHID($small_xformed->getPHID());
	} else {
	$e_image = 'Not Supported';
	$errors[] =
	'This server only supports these image formats: '.
	implode(', ', $supported_formats).'.';
	}
	}
	}

	if (!$errors) {
	$user->save();
	$profile->save();
	$response = id(new AphrontRedirectResponse())
	->setURI($this->getPanelURI('?saved=true'));
	return $response;
	}
	}

	$error_view = null;
	if ($errors) {
	$error_view = new AphrontErrorView();
	$error_view->setTitle('Form Errors');
	$error_view->setErrors($errors);
	} else {
	if ($request->getStr('saved')) {
	$error_view = new AphrontErrorView();
	$error_view->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$error_view->setTitle('Changes Saved');
	$error_view->appendChild('<p>Your changes have been saved.</p>');
	$error_view = $error_view->render();
	}
	}

	$img_src = $user->loadProfileImageURI();
	$profile_uri = PhabricatorEnv::getURI('/p/'.$user->getUsername().'/');

	$sexes = array(
	PhutilPerson::SEX_UNKNOWN => 'Unknown',
	PhutilPerson::SEX_MALE => 'Male',
	PhutilPerson::SEX_FEMALE => 'Female',
	);

	$translations = array();
	$symbols = id(new PhutilSymbolLoader())
	->setType('class')
	->setAncestorClass('PhabricatorTranslation')
	->setConcreteOnly(true)
	->selectAndLoadSymbols();
	foreach ($symbols as $symbol) {
	$class = $symbol['name'];
	$translations[$class] = newv($class, array())->getName();
	}
	asort($translations);
	$default = PhabricatorEnv::newObjectFromConfig('translation.provider');
	$translations = array(
	'' => 'Server Default ('.$default->getName().')',
	) + $translations;

	$form = new AphrontFormView();
	$form
	->setUser($request->getUser())
	->setEncType('multipart/form-data')
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Title')
	->setName('title')
	->setValue($profile->getTitle())
	->setCaption('Serious business title.'))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setOptions($sexes)
	->setLabel('Sex')
	->setName('sex')
	->setValue($user->getSex()))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setOptions($translations)
	->setLabel('Translation')
	->setName('translation')
	->setValue($user->getTranslation()))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel('Profile URI')
	->setValue(
	phutil_render_tag(
	'a',
	array(
	'href' => $profile_uri,
	),
	phutil_escape_html($profile_uri))))
	->appendChild(
	'<p class="aphront-form-instructions">Write something about yourself! '.
	'Make sure to include <strong>important information</strong> like '.
	'your favorite Pokemon and which Starcraft race you play.</p>')
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Blurb')
	->setName('blurb')
	->setValue($profile->getBlurb()))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel('Profile Image')
	->setValue(
	phutil_render_tag(
	'img',
	array(
	'src' => $img_src,
	))))
	->appendChild(
	id(new AphrontFormImageControl())
	->setLabel('Change Image')
	->setName('image')
	->setError($e_image)
	->setCaption('Supported formats: '.implode(', ', $supported_formats)))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save')
	->addCancelButton('/p/'.$user->getUsername().'/'));

	$panel = new AphrontPanelView();
	$panel->setHeader('Edit Profile Details');
	$panel->appendChild($form);
	- $panel->setWidth(AphrontPanelView::WIDTH_FORM);
	+ $panel->setNoBackground();

	return array(
	$error_view,
	$panel,
	);
	}

	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
	index 0a4929af71..7bf018a2b5 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
	@@ -1,265 +1,266 @@
	<?php

	final class PhabricatorSettingsPanelSSHKeys
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'ssh';
	}

	public function getPanelName() {
	return pht('SSH Public Keys');
	}

	public function getPanelGroup() {
	return pht('Authentication');
	}

	public function isEnabled() {
	return PhabricatorEnv::getEnvConfig('auth.sshkeys.enabled');
	}

	public function processRequest(AphrontRequest $request) {

	$user = $request->getUser();

	$edit = $request->getStr('edit');
	$delete = $request->getStr('delete');
	if (!$edit && !$delete) {
	return $this->renderKeyListView($request);
	}

	$id = nonempty($edit, $delete);

	if ($id && is_numeric($id)) {
	// NOTE: Prevent editing/deleting of keys you don't own.
	$key = id(new PhabricatorUserSSHKey())->loadOneWhere(
	'userPHID = %s AND id = %d',
	$user->getPHID(),
	(int)$id);
	if (!$key) {
	return new Aphront404Response();
	}
	} else {
	$key = new PhabricatorUserSSHKey();
	$key->setUserPHID($user->getPHID());
	}

	if ($delete) {
	return $this->processDelete($request, $key);
	}

	$e_name = true;
	$e_key = true;
	$errors = array();
	$entire_key = $key->getEntireKey();
	if ($request->isFormPost()) {
	$key->setName($request->getStr('name'));
	$entire_key = $request->getStr('key');

	if (!strlen($entire_key)) {
	$errors[] = 'You must provide an SSH Public Key.';
	$e_key = 'Required';
	} else {
	$parts = str_replace("\n", '', trim($entire_key));
	$parts = preg_split('/\s+/', $parts);
	if (count($parts) == 2) {
	$parts[] = ''; // Add an empty comment part.
	} else if (count($parts) == 3) {
	// This is the expected case.
	} else {
	if (preg_match('/private\s*key/i', $entire_key)) {
	// Try to give the user a better error message if it looks like
	// they uploaded a private key.
	$e_key = 'Invalid';
	$errors[] = 'Provide your public key, not your private key!';
	} else {
	$e_key = 'Invalid';
	$errors[] = 'Provided public key is not properly formatted.';
	}
	}

	if (!$errors) {
	list($type, $body, $comment) = $parts;
	if (!preg_match('/^ssh-dsa\|ssh-rsa$/', $type)) {
	$e_key = 'Invalid';
	$errors[] = 'Public key should be "ssh-dsa" or "ssh-rsa".';
	} else {
	$key->setKeyType($type);
	$key->setKeyBody($body);
	$key->setKeyHash(md5($body));
	$key->setKeyComment($comment);

	$e_key = null;
	}
	}
	}

	if (!strlen($key->getName())) {
	$errors[] = 'You must name this public key.';
	$e_name = 'Required';
	} else {
	$e_name = null;
	}

	if (!$errors) {
	try {
	$key->save();
	return id(new AphrontRedirectResponse())
	->setURI($this->getPanelURI());
	} catch (AphrontQueryDuplicateKeyException $ex) {
	$e_key = 'Duplicate';
	$errors[] = 'This public key is already associated with a user '.
	'account.';
	}
	}
	}

	$error_view = null;
	if ($errors) {
	$error_view = new AphrontErrorView();
	$error_view->setTitle('Form Errors');
	$error_view->setErrors($errors);
	}

	$is_new = !$key->getID();

	if ($is_new) {
	$header = 'Add New SSH Public Key';
	$save = 'Add Key';
	} else {
	$header = 'Edit SSH Public Key';
	$save = 'Save Changes';
	}

	$form = id(new AphrontFormView())
	->setUser($user)
	->addHiddenInput('edit', $is_new ? 'true' : $key->getID())
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Name')
	->setName('name')
	->setValue($key->getName())
	->setError($e_name))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Public Key')
	->setName('key')
	->setValue($entire_key)
	->setError($e_key))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($this->getPanelURI())
	->setValue($save));

	$panel = new AphrontPanelView();
	$panel->setHeader($header);
	- $panel->setWidth(AphrontPanelView::WIDTH_FORM);
	$panel->appendChild($form);
	+ $panel->setNoBackground();

	return id(new AphrontNullView())
	->appendChild(
	array(
	$error_view,
	$panel,
	));
	}

	private function renderKeyListView(AphrontRequest $request) {

	$user = $request->getUser();

	$keys = id(new PhabricatorUserSSHKey())->loadAllWhere(
	'userPHID = %s',
	$user->getPHID());

	$rows = array();
	foreach ($keys as $key) {
	$rows[] = array(
	phutil_render_tag(
	'a',
	array(
	'href' => $this->getPanelURI('?edit='.$key->getID()),
	),
	phutil_escape_html($key->getName())),
	phutil_escape_html($key->getKeyComment()),
	phutil_escape_html($key->getKeyType()),
	phabricator_date($key->getDateCreated(), $user),
	phabricator_time($key->getDateCreated(), $user),
	javelin_render_tag(
	'a',
	array(
	'href' => $this->getPanelURI('?delete='.$key->getID()),
	'class' => 'small grey button',
	'sigil' => 'workflow',
	),
	'Delete'),
	);
	}

	$table = new AphrontTableView($rows);
	$table->setNoDataString("You haven't added any SSH Public Keys.");
	$table->setHeaders(
	array(
	'Name',
	'Comment',
	'Type',
	'Created',
	'Time',
	'',
	));
	$table->setColumnClasses(
	array(
	'wide pri',
	'',
	'',
	'',
	'right',
	'action',
	));

	$panel = new AphrontPanelView();
	$panel->addButton(
	phutil_render_tag(
	'a',
	array(
	'href' => $this->getPanelURI('?edit=true'),
	'class' => 'green button',
	),
	'Add New Public Key'));
	$panel->setHeader('SSH Public Keys');
	$panel->appendChild($table);
	+ $panel->setNoBackground();

	return $panel;
	}

	private function processDelete(
	AphrontRequest $request,
	PhabricatorUserSSHKey $key) {

	$user = $request->getUser();

	$name = phutil_escape_html($key->getName());

	if ($request->isDialogFormPost()) {
	$key->delete();
	return id(new AphrontReloadResponse())
	->setURI($this->getPanelURI());
	}

	$dialog = id(new AphrontDialogView())
	->setUser($user)
	->addHiddenInput('delete', $key->getID())
	->setTitle('Really delete SSH Public Key?')
	->appendChild(
	'<p>The key "<strong>'.$name.'</strong>" will be permanently deleted, '.
	'and you will not longer be able to use the corresponding private key '.
	'to authenticate.</p>')
	->addSubmitButton('Delete Public Key')
	->addCancelButton($this->getPanelURI());

	return id(new AphrontDialogResponse())
	->setDialog($dialog);
	}

	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php
	index 9cffc41b6a..57df2da13e 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php
	@@ -1,73 +1,73 @@
	<?php

	final class PhabricatorSettingsPanelSearchPreferences
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'search';
	}

	public function getPanelName() {
	return pht('Search Preferences');
	}

	public function getPanelGroup() {
	return pht('Application Settings');
	}

	public function processRequest(AphrontRequest $request) {
	$user = $request->getUser();
	$preferences = $user->loadPreferences();

	$pref_jump = PhabricatorUserPreferences::PREFERENCE_SEARCHBAR_JUMP;
	$pref_shortcut = PhabricatorUserPreferences::PREFERENCE_SEARCH_SHORTCUT;

	if ($request->isFormPost()) {
	$preferences->setPreference($pref_jump,
	$request->getBool($pref_jump));

	$preferences->setPreference($pref_shortcut,
	$request->getBool($pref_shortcut));

	$preferences->save();
	return id(new AphrontRedirectResponse())
	->setURI($this->getPanelURI('?saved=true'));
	}

	$form = id(new AphrontFormView())
	->setUser($user)
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->addCheckbox($pref_jump,
	1,
	'Enable jump nav functionality in all search boxes.',
	$preferences->getPreference($pref_jump, 1))
	->addCheckbox($pref_shortcut,
	1,
	"Press '/' to focus the search input.",
	$preferences->getPreference($pref_shortcut, 1))
	)
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save'));

	$panel = new AphrontPanelView();
	- $panel->setWidth(AphrontPanelView::WIDTH_FORM);
	$panel->setHeader('Search Preferences');
	$panel->appendChild($form);
	+ $panel->setNoBackground();

	$error_view = null;
	if ($request->getStr('saved') === 'true') {
	$error_view = id(new AphrontErrorView())
	->setTitle('Preferences Saved')
	->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
	->setErrors(array('Your preferences have been saved.'));
	}

	return array(
	$error_view,
	$panel,
	);
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Dec 2, 11:51 AM (22 h, 3 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 431850
Default Alt Text: (68 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions