No OneTemporary
Actions

Size

6 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/people/storage/preferences/PhabricatorUserPreferences.php b/src/applications/people/storage/preferences/PhabricatorUserPreferences.php
	index 42438a3ada..f84b87c0d4 100644
	--- a/src/applications/people/storage/preferences/PhabricatorUserPreferences.php
	+++ b/src/applications/people/storage/preferences/PhabricatorUserPreferences.php
	@@ -1,39 +1,39 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class PhabricatorUserPreferences extends PhabricatorUserDAO {

	const PREFERENCE_MONOSPACED = 'monospaced';
	const PREFERENCE_TITLES = 'titles';

	protected $userPHID;
	protected $preferences;

	public function getConfiguration() {
	return array(
	self::CONFIG_SERIALIZATION => array(
	'preferences' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_TIMESTAMPS => false,
	) + parent::getConfiguration();
	}

	public function getPreference($key) {
	- return $this->getPreferences()[$key];
	+ return idx($this->getPreferences(), $key);
	}
	}
	diff --git a/src/applications/people/storage/preferences/__init__.php b/src/applications/people/storage/preferences/__init__.php
	index 642ad05c2c..a49e820852 100644
	--- a/src/applications/people/storage/preferences/__init__.php
	+++ b/src/applications/people/storage/preferences/__init__.php
	@@ -1,12 +1,14 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'applications/people/storage/base');

	+phutil_require_module('phutil', 'utils');
	+

	phutil_require_source('PhabricatorUserPreferences.php');
	diff --git a/src/applications/preferences/controller/edit/PhabricatorEditPreferencesController.php b/src/applications/preferences/controller/edit/PhabricatorEditPreferencesController.php
	index cf10592b58..eb2d34bbbf 100644
	--- a/src/applications/preferences/controller/edit/PhabricatorEditPreferencesController.php
	+++ b/src/applications/preferences/controller/edit/PhabricatorEditPreferencesController.php
	@@ -1,111 +1,113 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/
	class PhabricatorEditPreferencesController
	extends PhabricatorPreferencesController {

	public function processRequest() {

	$request = $this->getRequest();
	$user = $request->getUser();
	$preferences = $user->loadPreferences();

	if ($request->isFormPost()) {
	$monospaced = $request->getStr(
	PhabricatorUserPreferences::PREFERENCE_MONOSPACED);

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

	$pref_dict = array(
	PhabricatorUserPreferences::PREFERENCE_TITLES =>
	$request->getStr(PhabricatorUserPreferences::PREFERENCE_TITLES),
	PhabricatorUserPreferences::PREFERENCE_MONOSPACED =>
	$monospaced);

	$preferences->setPreferences($pref_dict);
	$preferences->save();
	return id(new AphrontRedirectResponse())
	->setURI('/preferences/?saved=true');
	}

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

	$form = id(new AphrontFormView())
	->setAction('/preferences/')
	->setUser($user)
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Page Titles')
	->setName(PhabricatorUserPreferences::PREFERENCE_TITLES)
	->setValue($preferences->getPreference(
	PhabricatorUserPreferences::PREFERENCE_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('Monospaced Font')
	->setName(PhabricatorUserPreferences::PREFERENCE_MONOSPACED)
	->setCaption(
	'Overrides default fonts in tools like Differential. '.
	'(Default: 10px "Menlo", "Consolas", "Monaco", '.
	'monospace)')
	->setValue($preferences->getPreference(
	PhabricatorUserPreferences::PREFERENCE_MONOSPACED)))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setValue(
	'<pre class="PhabricatorMonospaced">'.
	phutil_escape_html($example_string).
	'</pre>'))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save Preferences'));

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

	$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 $this->buildStandardPageResponse(
	array(
	$error_view,
	$panel,
	),
	array(
	'title' => 'Edit Preferences',
	));

	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Dec 2, 1:00 AM (22 h, 6 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 431525
Default Alt Text: (6 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions