No OneTemporary
Actions

Size

114 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
	index a50e713c0c..61248cbbf1 100644
	--- a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
	+++ b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
	@@ -1,141 +1,139 @@
	<?php

	/**
	* @group conduit
	*/
	final class PhabricatorConduitConsoleController
	extends PhabricatorConduitController {

	private $method;

	public function willProcessRequest(array $data) {
	$this->method = $data['method'];
	}

	public function processRequest() {

	$request = $this->getRequest();

	$methods = $this->getAllMethods();
	if (empty($methods[$this->method])) {
	return new Aphront404Response();
	}
	$this->setFilter('method/'.$this->method);

	$method_class = $methods[$this->method];
	$method_object = newv($method_class, array());

	$status = $method_object->getMethodStatus();
	$reason = $method_object->getMethodStatusDescription();

	$status_view = null;
	if ($status != ConduitAPIMethod::METHOD_STATUS_STABLE) {
	$status_view = new AphrontErrorView();
	switch ($status) {
	case ConduitAPIMethod::METHOD_STATUS_DEPRECATED:
	$status_view->setTitle('Deprecated Method');
	$status_view->appendChild(
	phutil_escape_html(
	nonempty(
	$reason,
	"This method is deprecated.")));
	break;
	case ConduitAPIMethod::METHOD_STATUS_UNSTABLE:
	$status_view->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$status_view->setTitle('Unstable Method');
	$status_view->appendChild(
	phutil_escape_html(
	nonempty(
	$reason,
	"This method is new and unstable. Its interface is subject ".
	"to change.")));
	break;
	}
	}

	- $error_description = array();
	$error_types = $method_object->defineErrorTypes();
	if ($error_types) {
	- $error_description[] = '<ul>';
	+ $error_description = array();
	foreach ($error_types as $error => $meaning) {
	$error_description[] = hsprintf(
	'<li><strong>%s:</strong> %s</li>',
	$error,
	$meaning);
	}
	- $error_description[] = '</ul>';
	- $error_description = implode("\n", $error_description);
	+ $error_description = phutil_tag('ul', array(), $error_description);
	} else {
	$error_description = "This method does not raise any specific errors.";
	}

	$form = new AphrontFormView();
	$form
	->setUser($request->getUser())
	->setAction('/api/'.$this->method)
	->addHiddenInput('allowEmptyParams', 1)
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Description')
	->setValue($method_object->getMethodDescription()))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Returns')
	->setValue($method_object->defineReturnType()))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel('Errors')
	->setValue($error_description))
	->appendChild(
	'<p class="aphront-form-instructions">Enter parameters using '.
	'<strong>JSON</strong>. For instance, to enter a list, type: '.
	'<tt>["apple", "banana", "cherry"]</tt>');

	$params = $method_object->defineParamTypes();
	foreach ($params as $param => $desc) {
	$form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel($param)
	->setName("params[{$param}]")
	->setCaption($desc));
	}

	$form
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Output Format')
	->setName('output')
	->setOptions(
	array(
	'human' => 'Human Readable',
	'json' => 'JSON',
	)))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Call Method'));

	$panel = new AphrontPanelView();
	$panel->setHeader('Conduit API: '.phutil_escape_html($this->method));
	$panel->appendChild($form);
	$panel->setWidth(AphrontPanelView::WIDTH_FULL);

	return $this->buildStandardPageResponse(
	array(
	$status_view,
	$panel,
	),
	array(
	'title' => 'Conduit Console - '.$this->method,
	));
	}

	private function getAllMethods() {
	$classes = $this->getAllMethodImplementationClasses();
	$methods = array();
	foreach ($classes as $class) {
	$name = ConduitAPIMethod::getAPIMethodNameFromClassName($class);
	$methods[$name] = $class;
	}
	return $methods;
	}
	}
	diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php
	index 5983bbc1ae..57ee007a08 100644
	--- a/src/applications/config/controller/PhabricatorConfigEditController.php
	+++ b/src/applications/config/controller/PhabricatorConfigEditController.php
	@@ -1,503 +1,503 @@
	<?php

	final class PhabricatorConfigEditController
	extends PhabricatorConfigController {

	private $key;

	public function willProcessRequest(array $data) {
	$this->key = $data['key'];
	}

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


	$options = PhabricatorApplicationConfigOptions::loadAllOptions();
	if (empty($options[$this->key])) {
	// This may be a dead config entry, which existed in the past but no
	// longer exists. Allow it to be edited so it can be reviewed and
	// deleted.
	$option = id(new PhabricatorConfigOption())
	->setKey($this->key)
	->setType('wild')
	->setDefault(null)
	->setDescription(
	pht(
	"This configuration option is unknown. It may be misspelled, ".
	"or have existed in a previous version of Phabricator."));
	$group = null;
	$group_uri = $this->getApplicationURI();
	} else {
	$option = $options[$this->key];
	$group = $option->getGroup();
	$group_uri = $this->getApplicationURI('group/'.$group->getKey().'/');
	}

	$issue = $request->getStr('issue');
	if ($issue) {
	// If the user came here from an open setup issue, send them back.
	$done_uri = $this->getApplicationURI('issue/'.$issue.'/');
	} else {
	$done_uri = $group_uri;
	}

	// Check if the config key is already stored in the database.
	// Grab the value if it is.
	$config_entry = id(new PhabricatorConfigEntry())
	->loadOneWhere(
	'configKey = %s AND namespace = %s',
	$this->key,
	'default');
	if (!$config_entry) {
	$config_entry = id(new PhabricatorConfigEntry())
	->setConfigKey($this->key)
	->setNamespace('default')
	->setIsDeleted(true);
	}

	$e_value = null;
	$errors = array();
	if ($request->isFormPost() && !$option->getLocked()) {

	$result = $this->readRequest(
	$option,
	$request);

	list($e_value, $value_errors, $display_value, $xaction) = $result;
	$errors = array_merge($errors, $value_errors);

	if (!$errors) {

	$editor = id(new PhabricatorConfigEditor())
	->setActor($user)
	->setContinueOnNoEffect(true)
	->setContentSource(
	PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_WEB,
	array(
	'ip' => $request->getRemoteAddr(),
	)));

	try {
	$editor->applyTransactions($config_entry, array($xaction));
	return id(new AphrontRedirectResponse())->setURI($done_uri);
	} catch (PhabricatorConfigValidationException $ex) {
	$e_value = pht('Invalid');
	$errors[] = $ex->getMessage();
	}
	}
	} else {
	$display_value = $this->getDisplayValue($option, $config_entry);
	}

	$form = new AphrontFormView();
	$form->setFlexible(true);

	$error_view = null;
	if ($errors) {
	$error_view = id(new AphrontErrorView())
	->setTitle(pht('You broke everything!'))
	->setErrors($errors);
	} else if ($option->getHidden()) {
	$msg = pht(
	"This configuration is hidden and can not be edited or viewed from ".
	"the web interface.");

	$error_view = id(new AphrontErrorView())
	->setTitle(pht('Configuration Hidden'))
	->setSeverity(AphrontErrorView::SEVERITY_WARNING)
	->appendChild('<p>'.phutil_escape_html($msg).'</p>');
	} else if ($option->getLocked()) {
	$msg = pht(
	"This configuration is locked and can not be edited from the web ".
	"interface.");

	$error_view = id(new AphrontErrorView())
	->setTitle(pht('Configuration Locked'))
	->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
	->appendChild('<p>'.phutil_escape_html($msg).'</p>');
	}

	if ($option->getHidden()) {
	$control = null;
	} else {
	$control = $this->renderControl(
	$option,
	$display_value,
	$e_value);
	}

	$engine = new PhabricatorMarkupEngine();
	$engine->addObject($option, 'description');
	$engine->process();
	$description = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	- phutil_safe_html($engine->getOutput($option, 'description')));
	+ $engine->getOutput($option, 'description'));

	$form
	->setUser($user)
	->addHiddenInput('issue', $request->getStr('issue'))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Description'))
	->setValue($description))
	->appendChild($control);

	$submit_control = id(new AphrontFormSubmitControl())
	->addCancelButton($done_uri);

	if (!$option->getLocked()) {
	$submit_control->setValue(pht('Save Config Entry'));
	}

	$form->appendChild($submit_control);

	$examples = $this->renderExamples($option);
	if ($examples) {
	$form->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Examples'))
	->setValue($examples));
	}

	if (!$option->getHidden()) {
	$form->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Default'))
	->setValue($this->renderDefaults($option)));
	}

	$title = pht('Edit %s', $this->key);
	$short = pht('Edit');

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())
	->setName(pht('Config'))
	->setHref($this->getApplicationURI()));

	if ($group) {
	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())
	->setName($group->getName())
	->setHref($group_uri));
	}

	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())
	->setName($this->key)
	->setHref('/config/edit/'.$this->key));


	$xactions = id(new PhabricatorConfigTransactionQuery())
	->withObjectPHIDs(array($config_entry->getPHID()))
	->setViewer($user)
	->execute();

	$xaction_view = id(new PhabricatorApplicationTransactionView())
	->setUser($user)
	->setTransactions($xactions);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	id(new PhabricatorHeaderView())->setHeader($title),
	$error_view,
	$form,
	$xaction_view,
	),
	array(
	'title' => $title,
	'device' => true,
	));
	}

	private function readRequest(
	PhabricatorConfigOption $option,
	AphrontRequest $request) {

	$xaction = new PhabricatorConfigTransaction();
	$xaction->setTransactionType(PhabricatorConfigTransaction::TYPE_EDIT);

	$e_value = null;
	$errors = array();

	$value = $request->getStr('value');
	if (!strlen($value)) {
	$value = null;

	$xaction->setNewValue(
	array(
	'deleted' => true,
	'value' => null,
	));

	return array($e_value, $errors, $value, $xaction);
	}

	$type = $option->getType();
	$set_value = null;

	switch ($type) {
	case 'int':
	if (preg_match('/^-?[0-9]+$/', trim($value))) {
	$set_value = (int)$value;
	} else {
	$e_value = pht('Invalid');
	$errors[] = pht('Value must be an integer.');
	}
	break;
	case 'string':
	case 'enum':
	$set_value = (string)$value;
	break;
	case 'list<string>':
	$set_value = $request->getStrList('value');
	break;
	case 'set':
	$set_value = array_fill_keys($request->getStrList('value'), true);
	break;
	case 'bool':
	switch ($value) {
	case 'true':
	$set_value = true;
	break;
	case 'false':
	$set_value = false;
	break;
	default:
	$e_value = pht('Invalid');
	$errors[] = pht('Value must be boolean, "true" or "false".');
	break;
	}
	break;
	case 'class':
	if (!class_exists($value)) {
	$e_value = pht('Invalid');
	$errors[] = pht('Class does not exist.');
	} else {
	$base = $option->getBaseClass();
	if (!is_subclass_of($value, $base)) {
	$e_value = pht('Invalid');
	$errors[] = pht('Class is not of valid type.');
	} else {
	$set_value = $value;
	}
	}
	break;
	default:
	$json = json_decode($value, true);
	if ($json === null && strtolower($value) != 'null') {
	$e_value = pht('Invalid');
	$errors[] = pht(
	'The given value must be valid JSON. This means, among '.
	'other things, that you must wrap strings in double-quotes.');
	} else {
	$set_value = $json;
	}
	break;
	}

	if (!$errors) {
	$xaction->setNewValue(
	array(
	'deleted' => false,
	'value' => $set_value,
	));
	} else {
	$xaction = null;
	}

	return array($e_value, $errors, $value, $xaction);
	}

	private function getDisplayValue(
	PhabricatorConfigOption $option,
	PhabricatorConfigEntry $entry) {

	if ($entry->getIsDeleted()) {
	return null;
	}

	$type = $option->getType();
	$value = $entry->getValue();
	switch ($type) {
	case 'int':
	case 'string':
	case 'enum':
	return $value;
	case 'bool':
	return $value ? 'true' : 'false';
	case 'list<string>':
	return implode("\n", nonempty($value, array()));
	case 'set':
	return implode("\n", nonempty(array_keys($value), array()));
	default:
	return PhabricatorConfigJSON::prettyPrintJSON($value);
	}
	}

	private function renderControl(
	PhabricatorConfigOption $option,
	$display_value,
	$e_value) {

	$type = $option->getType();
	switch ($type) {
	case 'int':
	case 'string':
	$control = id(new AphrontFormTextControl());
	break;
	case 'bool':
	$control = id(new AphrontFormSelectControl())
	->setOptions(
	array(
	'' => pht('(Use Default)'),
	'true' => idx($option->getBoolOptions(), 0),
	'false' => idx($option->getBoolOptions(), 1),
	));
	break;
	case 'enum':
	$options = array_mergev(
	array(
	array('' => pht('(Use Default)')),
	$option->getEnumOptions(),
	));
	$control = id(new AphrontFormSelectControl())
	->setOptions($options);
	break;
	case 'class':
	$symbols = id(new PhutilSymbolLoader())
	->setType('class')
	->setAncestorClass($option->getBaseClass())
	->setConcreteOnly(true)
	->selectSymbolsWithoutLoading();
	$names = ipull($symbols, 'name', 'name');
	asort($names);
	$names = array(
	'' => pht('(Use Default)'),
	) + $names;

	$control = id(new AphrontFormSelectControl())
	->setOptions($names);
	break;
	case 'list<string>':
	case 'set':
	$control = id(new AphrontFormTextAreaControl())
	->setCaption(pht('Separate values with newlines or commas.'));
	break;
	default:
	$control = id(new AphrontFormTextAreaControl())
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
	->setCustomClass('PhabricatorMonospaced')
	->setCaption(pht('Enter value in JSON.'));
	break;
	}

	$control
	->setLabel('Value')
	->setError($e_value)
	->setValue($display_value)
	->setName('value');

	if ($option->getLocked()) {
	$control->setDisabled(true);
	}

	return $control;
	}

	private function renderExamples(PhabricatorConfigOption $option) {
	$examples = $option->getExamples();
	if (!$examples) {
	return null;
	}

	$table = array();
	- $table[] = '<tr class="column-labels">';
	- $table[] = '<th>'.pht('Example').'</th>';
	- $table[] = '<th>'.pht('Value').'</th>';
	- $table[] = '</tr>';
	+ $table[] = hsprintf(
	+ '<tr class="column-labels"><th>%s</th><th>%s</th></tr>',
	+ pht('Example'),
	+ pht('Value'));
	foreach ($examples as $example) {
	list($value, $description) = $example;

	if ($value === null) {
	- $value = '<em>'.pht('(empty)').'</em>';
	+ $value = phutil_tag('em', array(), pht('(empty)'));
	} else {
	- $value = nl2br(phutil_escape_html($value));
	+ $value = phutil_escape_html_newlines($value);
	}

	- $table[] = '<tr>';
	- $table[] = '<th>'.phutil_escape_html($description).'</th>';
	- $table[] = '<td>'.$value.'</td>';
	- $table[] = '</tr>';
	+ $table[] = hsprintf(
	+ '<tr><th>%s</th><td>%s</td></tr>',
	+ $description,
	+ $value);
	}

	require_celerity_resource('config-options-css');

	return phutil_tag(
	'table',
	array(
	'class' => 'config-option-table',
	),
	- new PhutilSafeHTML(implode("\n", $table)));
	+ $table);
	}

	private function renderDefaults(PhabricatorConfigOption $option) {
	$stack = PhabricatorEnv::getConfigSourceStack();
	$stack = $stack->getStack();

	/*

	TODO: Once DatabaseSource lands, do this:

	foreach ($stack as $key => $source) {
	unset($stack[$key]);
	if ($source instanceof PhabricatorConfigDatabaseSource) {
	break;
	}
	}

	*/


	$table = array();
	- $table[] = '<tr class="column-labels">';
	- $table[] = '<th>'.pht('Source').'</th>';
	- $table[] = '<th>'.pht('Value').'</th>';
	- $table[] = '</tr>';
	+ $table[] = hsprintf(
	+ '<tr class="column-labels"><th>%s</th><th>%s</th></tr>',
	+ pht('Source'),
	+ pht('Value'));
	foreach ($stack as $key => $source) {
	$value = $source->getKeys(
	array(
	$option->getKey(),
	));

	if (!array_key_exists($option->getKey(), $value)) {
	- $value = '<em>'.pht('(empty)').'</em>';
	+ $value = phutil_tag('em', array(), pht('(empty)'));
	} else {
	$value = PhabricatorConfigJSON::prettyPrintJSON(
	$value[$option->getKey()]);
	}

	- $table[] = '<tr>';
	- $table[] = '<th>'.phutil_escape_html($source->getName()).'</th>';
	- $table[] = '<td>'.$value.'</td>';
	- $table[] = '</tr>';
	+ $table[] = hsprintf(
	+ '<tr><th>%s</th><td>%s</td></tr>',
	+ $source->getName(),
	+ $value);
	}

	require_celerity_resource('config-options-css');

	return phutil_tag(
	'table',
	array(
	'class' => 'config-option-table',
	),
	- new PhutilSafeHTML(implode("\n", $table)));
	+ $table);
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php
	index d764f560e3..afe4847c8c 100644
	--- a/src/applications/differential/controller/DifferentialDiffViewController.php
	+++ b/src/applications/differential/controller/DifferentialDiffViewController.php
	@@ -1,157 +1,159 @@
	<?php

	final class DifferentialDiffViewController extends DifferentialController {

	private $id;

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

	public function processRequest() {
	$request = $this->getRequest();

	$diff = id(new DifferentialDiff())->load($this->id);
	if (!$diff) {
	return new Aphront404Response();
	}

	if ($diff->getRevisionID()) {
	$top_panel = new AphrontPanelView();
	$top_panel->setWidth(AphrontPanelView::WIDTH_WIDE);
	$link = phutil_tag(
	'a',
	array(
	'href' => PhabricatorEnv::getURI('/D'.$diff->getRevisionID()),
	),
	'D'.$diff->getRevisionID());
	$top_panel->appendChild(
	"<h1>".pht('This diff belongs to revision %s', $link)."</h1>");
	} else {
	$action_panel = new AphrontPanelView();
	$action_panel->setHeader('Preview Diff');
	$action_panel->setWidth(AphrontPanelView::WIDTH_WIDE);
	$action_panel->appendChild(
	'<p class="aphront-panel-instructions">'.pht('Review the diff for '.
	'correctness. When you are satisfied, either <strong>create a new '.
	'revision</strong> or <strong>update an existing revision</strong>.'));

	// TODO: implmenent optgroup support in AphrontFormSelectControl?
	$select = array();
	- $select[] = '<optgroup label="Create New Revision">';
	- $select[] = '<option value="">'.
	- pht('Create a new Revision...').
	- '</option>';
	- $select[] = '</optgroup>';
	+ $select[] = hsprintf('<optgroup label="%s">', pht('Create New Revision'));
	+ $select[] = hsprintf(
	+ '<option value="">%s</option>',
	+ pht('Create a new Revision...'));
	+ $select[] = hsprintf('</optgroup>');

	$revision_data = new DifferentialRevisionListData(
	DifferentialRevisionListData::QUERY_OPEN_OWNED,
	array($request->getUser()->getPHID()));
	$revisions = $revision_data->loadRevisions();

	if ($revisions) {
	- $select[] = '<optgroup label="'.pht('Update Existing Revision').'">';
	+ $select[] = hsprintf(
	+ '<optgroup label="%s">',
	+ pht('Update Existing Revision'));
	foreach ($revisions as $revision) {
	$select[] = phutil_tag(
	'option',
	array(
	'value' => $revision->getID(),
	),
	$revision->getTitle());
	}
	- $select[] = '</optgroup>';
	+ $select[] = hsprintf('</optgroup>');
	}

	- $select =
	- '<select name="revisionID">'.
	- implode("\n", $select).
	- '</select>';
	+ $select = phutil_tag(
	+ 'select',
	+ array('name' => 'revisionID'),
	+ $select);

	$action_form = new AphrontFormView();
	$action_form
	->setUser($request->getUser())
	->setAction('/differential/revision/edit/')
	->addHiddenInput('diffID', $diff->getID())
	->addHiddenInput('viaDiffView', 1)
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Attach To'))
	->setValue($select))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Continue')));

	$action_panel->appendChild($action_form);

	$top_panel = $action_panel;
	}

	$props = id(new DifferentialDiffProperty())->loadAllWhere(
	'diffID = %d',
	$diff->getID());
	$props = mpull($props, 'getData', 'getName');

	$aux_fields = DifferentialFieldSelector::newSelector()
	->getFieldSpecifications();
	foreach ($aux_fields as $key => $aux_field) {
	if (!$aux_field->shouldAppearOnDiffView()) {
	unset($aux_fields[$key]);
	} else {
	$aux_field->setUser($this->getRequest()->getUser());
	}
	}

	$dict = array();
	foreach ($aux_fields as $key => $aux_field) {
	$aux_field->setDiff($diff);
	$aux_field->setManualDiff($diff);
	$aux_field->setDiffProperties($props);
	$value = $aux_field->renderValueForDiffView();
	if (strlen($value)) {
	$label = rtrim($aux_field->renderLabelForDiffView(), ':');
	$dict[$label] = $value;
	}
	}

	$property_view = new PhabricatorPropertyListView();
	foreach ($dict as $key => $value) {
	$property_view->addProperty($key, $value);
	}

	$changesets = $diff->loadChangesets();
	$changesets = msort($changesets, 'getSortKey');

	$table_of_contents = id(new DifferentialDiffTableOfContentsView())
	->setChangesets($changesets)
	->setVisibleChangesets($changesets)
	->setUnitTestData(idx($props, 'arc:unit', array()));

	$refs = array();
	foreach ($changesets as $changeset) {
	$refs[$changeset->getID()] = $changeset->getID();
	}

	$details = id(new DifferentialChangesetListView())
	->setChangesets($changesets)
	->setVisibleChangesets($changesets)
	->setRenderingReferences($refs)
	->setStandaloneURI('/differential/changeset/')
	->setDiff($diff)
	->setTitle(pht('Diff %d', $diff->getID()))
	->setUser($request->getUser());

	return $this->buildStandardPageResponse(
	id(new DifferentialPrimaryPaneView())
	->appendChild(
	array(
	$top_panel->render(),
	$property_view,
	$table_of_contents->render(),
	$details->render(),
	)),
	array(
	'title' => pht('Diff View'),
	));
	}

	}
	diff --git a/src/applications/files/controller/PhabricatorFileUploadController.php b/src/applications/files/controller/PhabricatorFileUploadController.php
	index 94a1130ca5..cab1f145f6 100644
	--- a/src/applications/files/controller/PhabricatorFileUploadController.php
	+++ b/src/applications/files/controller/PhabricatorFileUploadController.php
	@@ -1,118 +1,117 @@
	<?php

	final class PhabricatorFileUploadController extends PhabricatorFileController {

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

	$e_file = true;
	$errors = array();
	if ($request->isFormPost()) {
	if (!$request->getFileExists('file')) {
	$e_file = pht('Required');
	$errors[] = pht('You must select a file to upload.');
	} else {
	$file = PhabricatorFile::newFromPHPUpload(
	idx($_FILES, 'file'),
	array(
	'name' => $request->getStr('name'),
	'authorPHID' => $user->getPHID(),
	));
	}

	if (!$errors) {
	return id(new AphrontRedirectResponse())->setURI($file->getViewURI());
	}
	}

	$support_id = celerity_generate_unique_node_id();
	$instructions = id(new AphrontFormMarkupControl())
	->setControlID($support_id)
	->setControlStyle('display: none')
	- ->setValue(
	- '<br /><br />'.
	+ ->setValue(hsprintf(
	+ '<br /><br /><strong>%s</strong> %s<br /><br />',
	+ pht('Drag and Drop:'),
	pht(
	- '<strong>Drag and Drop:</strong> You can also upload files by '.
	- 'dragging and dropping them from your desktop onto this page or '.
	- 'the Phabricator home page.').
	- '<br /><br />');
	+ 'You can also upload files by dragging and dropping them from your '.
	+ 'desktop onto this page or the Phabricator home page.')));

	$form = id(new AphrontFormView())
	->setFlexible(true)
	->setUser($user)
	->setEncType('multipart/form-data')
	->appendChild(
	id(new AphrontFormFileControl())
	->setLabel(pht('File'))
	->setName('file')
	->setError($e_file)
	->setCaption($this->renderUploadLimit()))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Name'))
	->setName('name')
	->setValue($request->getStr('name'))
	->setCaption(pht('Optional file display name.')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Upload'))
	->addCancelButton('/file/'))
	->appendChild($instructions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())
	->setName(pht('Upload'))
	->setHref($request->getRequestURI()));

	$title = pht('Upload File');

	$header = id(new PhabricatorHeaderView())
	->setHeader($title);

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

	$global_upload = id(new PhabricatorGlobalUploadTargetView())
	->setShowIfSupportedID($support_id);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$header,
	$errors,
	$form,
	$global_upload,
	),
	array(
	'title' => $title,
	'device' => true,
	));
	}

	private function renderUploadLimit() {
	$limit = PhabricatorEnv::getEnvConfig('storage.upload-size-limit');
	$limit = phabricator_parse_bytes($limit);
	if ($limit) {
	$formatted = phabricator_format_bytes($limit);
	return 'Maximum file size: '.$formatted;
	}

	$doc_href = PhabricatorEnv::getDocLink(
	'article/Configuring_File_Upload_Limits.html');
	$doc_link = phutil_tag(
	'a',
	array(
	'href' => $doc_href,
	'target' => '_blank',
	),
	'Configuring File Upload Limits');

	return hsprintf('Upload limit is not configured, see %s.', $doc_link);
	}

	}
	diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
	index f61062520d..b5fee57e90 100644
	--- a/src/applications/herald/controller/HeraldRuleController.php
	+++ b/src/applications/herald/controller/HeraldRuleController.php
	@@ -1,559 +1,560 @@
	<?php

	final class HeraldRuleController extends HeraldController {

	private $id;
	private $filter;

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

	public function processRequest() {

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

	$content_type_map = HeraldContentTypeConfig::getContentTypeMap();
	$rule_type_map = HeraldRuleTypeConfig::getRuleTypeMap();

	if ($this->id) {
	$rule = id(new HeraldRule())->load($this->id);
	if (!$rule) {
	return new Aphront404Response();
	}
	if (!$this->canEditRule($rule, $user)) {
	throw new Exception("You don't own this rule and can't edit it.");
	}
	} else {
	$rule = new HeraldRule();
	$rule->setAuthorPHID($user->getPHID());
	$rule->setMustMatchAll(true);

	$content_type = $request->getStr('content_type');
	if (!isset($content_type_map[$content_type])) {
	$content_type = HeraldContentTypeConfig::CONTENT_TYPE_DIFFERENTIAL;
	}
	$rule->setContentType($content_type);

	$rule_type = $request->getStr('rule_type');
	if (!isset($rule_type_map[$rule_type])) {
	$rule_type = HeraldRuleTypeConfig::RULE_TYPE_GLOBAL;
	}
	$rule->setRuleType($rule_type);
	}

	$local_version = id(new HeraldRule())->getConfigVersion();
	if ($rule->getConfigVersion() > $local_version) {
	throw new Exception(
	"This rule was created with a newer version of Herald. You can not ".
	"view or edit it in this older version. Upgrade your Phabricator ".
	"deployment.");
	}

	// Upgrade rule version to our version, since we might add newly-defined
	// conditions, etc.
	$rule->setConfigVersion($local_version);

	$rule_conditions = $rule->loadConditions();
	$rule_actions = $rule->loadActions();

	$rule->attachConditions($rule_conditions);
	$rule->attachActions($rule_actions);

	$e_name = true;
	$errors = array();
	if ($request->isFormPost() && $request->getStr('save')) {
	list($e_name, $errors) = $this->saveRule($rule, $request);
	if (!$errors) {
	$uri = '/herald/view/'.
	$rule->getContentType().'/'.
	$rule->getRuleType().'/';
	return id(new AphrontRedirectResponse())->setURI($uri);
	}
	}

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

	$must_match_selector = $this->renderMustMatchSelector($rule);
	$repetition_selector = $this->renderRepetitionSelector($rule);

	$handles = $this->loadHandlesForRule($rule);

	require_celerity_resource('herald-css');

	$content_type_name = $content_type_map[$rule->getContentType()];
	$rule_type_name = $rule_type_map[$rule->getRuleType()];

	$form = id(new AphrontFormView())
	->setUser($user)
	->setID('herald-rule-edit-form')
	->addHiddenInput('content_type', $rule->getContentType())
	->addHiddenInput('rule_type', $rule->getRuleType())
	->addHiddenInput('save', 1)
	->appendChild(
	// Build this explicitly (instead of using addHiddenInput())
	// so we can add a sigil to it.
	javelin_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => 'rule',
	'sigil' => 'rule',
	)))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Rule Name')
	->setName('name')
	->setError($e_name)
	->setValue($rule->getName()));

	$form
	->appendChild(
	id(new AphrontFormMarkupControl())
	- ->setValue(
	- "This <strong>${rule_type_name}</strong> rule triggers for " .
	- "<strong>${content_type_name}</strong>."))
	+ ->setValue(hsprintf(
	+ "This <strong>%s</strong> rule triggers for <strong>%s</strong>.",
	+ $rule_type_name,
	+ $content_type_name)))
	->appendChild(
	id(new AphrontFormInsetView())
	->setTitle('Conditions')
	->setRightButton(javelin_tag(
	'a',
	array(
	'href' => '#',
	'class' => 'button green',
	'sigil' => 'create-condition',
	'mustcapture' => true
	),
	'Create New Condition'))
	->setDescription(
	phutil_safe_html(
	'When '.$must_match_selector.' these conditions are met:'))
	->setContent(javelin_tag(
	'table',
	array(
	'sigil' => 'rule-conditions',
	'class' => 'herald-condition-table'
	),
	'')))
	->appendChild(
	id(new AphrontFormInsetView())
	->setTitle('Action')
	->setRightButton(javelin_tag(
	'a',
	array(
	'href' => '#',
	'class' => 'button green',
	'sigil' => 'create-action',
	'mustcapture' => true,
	),
	'Create New Action'))
	- ->setDescription(
	- phutil_safe_html(
	- 'Take these actions '.$repetition_selector.' this rule matches:'))
	+ ->setDescription(hsprintf(
	+ 'Take these actions %s this rule matches:',
	+ $repetition_selector))
	->setContent(javelin_tag(
	'table',
	array(
	'sigil' => 'rule-actions',
	'class' => 'herald-action-table',
	),
	'')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save Rule')
	->addCancelButton('/herald/view/'.$rule->getContentType().'/'));

	$this->setupEditorBehavior($rule, $handles);

	$panel = new AphrontPanelView();
	$panel->setHeader(
	$rule->getID()
	? pht('Edit Herald Rule')
	: pht('Create Herald Rule'));
	$panel->appendChild($form);
	$panel->setNoBackground();

	$nav = $this->renderNav();
	$nav->selectFilter(
	'view/'.$rule->getContentType().'/'.$rule->getRuleType());
	$nav->appendChild(
	array(
	$error_view,
	$panel,
	));

	return $this->buildStandardPageResponse(
	$nav,
	array(
	'title' => 'Edit Rule',
	));
	}

	private function canEditRule($rule, $user) {
	return
	($user->getIsAdmin()) \|\|
	($rule->getRuleType() == HeraldRuleTypeConfig::RULE_TYPE_GLOBAL) \|\|
	($rule->getAuthorPHID() == $user->getPHID());
	}

	private function saveRule($rule, $request) {
	$rule->setName($request->getStr('name'));
	$rule->setMustMatchAll(($request->getStr('must_match') == 'all'));

	$repetition_policy_param = $request->getStr('repetition_policy');
	$rule->setRepetitionPolicy(
	HeraldRepetitionPolicyConfig::toInt($repetition_policy_param)
	);

	$e_name = true;
	$errors = array();

	if (!strlen($rule->getName())) {
	$e_name = "Required";
	$errors[] = "Rule must have a name.";
	}

	$data = json_decode($request->getStr('rule'), true);
	if (!is_array($data) \|\|
	!$data['conditions'] \|\|
	!$data['actions']) {
	throw new Exception("Failed to decode rule data.");
	}

	$conditions = array();
	foreach ($data['conditions'] as $condition) {
	if ($condition === null) {
	// We manage this as a sparse array on the client, so may receive
	// NULL if conditions have been removed.
	continue;
	}

	$obj = new HeraldCondition();
	$obj->setFieldName($condition[0]);
	$obj->setFieldCondition($condition[1]);

	if (is_array($condition[2])) {
	$obj->setValue(array_keys($condition[2]));
	} else {
	$obj->setValue($condition[2]);
	}

	$cond_type = $obj->getFieldCondition();

	if ($cond_type == HeraldConditionConfig::CONDITION_REGEXP) {
	if (@preg_match($obj->getValue(), '') === false) {
	$errors[] =
	'The regular expression "'.$obj->getValue().'" is not valid. '.
	'Regular expressions must have enclosing characters (e.g. '.
	'"@/path/to/file@", not "/path/to/file") and be syntactically '.
	'correct.';
	}
	}

	if ($cond_type == HeraldConditionConfig::CONDITION_REGEXP_PAIR) {
	$json = json_decode($obj->getValue(), true);
	if (!is_array($json)) {
	$errors[] =
	'The regular expression pair "'.$obj->getValue().'" is not '.
	'valid JSON. Enter a valid JSON array with two elements.';
	} else {
	if (count($json) != 2) {
	$errors[] =
	'The regular expression pair "'.$obj->getValue().'" must have '.
	'exactly two elements.';
	} else {
	$key_regexp = array_shift($json);
	$val_regexp = array_shift($json);

	if (@preg_match($key_regexp, '') === false) {
	$errors[] =
	'The first regexp, "'.$key_regexp.'" in the regexp pair '.
	'is not a valid regexp.';
	}
	if (@preg_match($val_regexp, '') === false) {
	$errors[] =
	'The second regexp, "'.$val_regexp.'" in the regexp pair '.
	'is not a valid regexp.';
	}
	}
	}
	}

	$conditions[] = $obj;
	}

	$actions = array();
	foreach ($data['actions'] as $action) {
	if ($action === null) {
	// Sparse on the client; removals can give us NULLs.
	continue;
	}

	if (!isset($action[1])) {
	// Legitimate for any action which doesn't need a target, like
	// "Do nothing".
	$action[1] = null;
	}

	$actions[] = HeraldActionConfig::willSaveAction($rule->getRuleType(),
	$rule->getAuthorPHID(),
	$action);
	}

	$rule->attachConditions($conditions);
	$rule->attachActions($actions);

	if (!$errors) {
	try {

	$edit_action = $rule->getID() ? 'edit' : 'create';

	$rule->openTransaction();
	$rule->save();
	$rule->saveConditions($conditions);
	$rule->saveActions($actions);
	$rule->logEdit($request->getUser()->getPHID(), $edit_action);
	$rule->saveTransaction();

	} catch (AphrontQueryDuplicateKeyException $ex) {
	$e_name = "Not Unique";
	$errors[] = "Rule name is not unique. Choose a unique name.";
	}
	}

	return array($e_name, $errors);
	}

	private function setupEditorBehavior($rule, $handles) {
	$serial_conditions = array(
	array('default', 'default', ''),
	);

	if ($rule->getConditions()) {
	$serial_conditions = array();
	foreach ($rule->getConditions() as $condition) {

	$value = $condition->getValue();
	if (is_array($value)) {
	$value_map = array();
	foreach ($value as $k => $fbid) {
	$value_map[$fbid] = $handles[$fbid]->getName();
	}
	$value = $value_map;
	}

	$serial_conditions[] = array(
	$condition->getFieldName(),
	$condition->getFieldCondition(),
	$value,
	);
	}
	}

	$serial_actions = array(
	array('default', ''),
	);
	if ($rule->getActions()) {
	$serial_actions = array();
	foreach ($rule->getActions() as $action) {

	switch ($action->getAction()) {
	case HeraldActionConfig::ACTION_FLAG:
	$current_value = $action->getTarget();
	break;
	default:
	$target_map = array();
	foreach ((array)$action->getTarget() as $fbid) {
	$target_map[$fbid] = $handles[$fbid]->getName();
	}
	$current_value = $target_map;
	break;
	}

	$serial_actions[] = array(
	$action->getAction(),
	$current_value,
	);
	}
	}

	$all_rules = $this->loadRulesThisRuleMayDependUpon($rule);
	$all_rules = mpull($all_rules, 'getName', 'getID');
	asort($all_rules);

	$config_info = array();
	$config_info['fields']
	= HeraldFieldConfig::getFieldMapForContentType($rule->getContentType());
	$config_info['conditions'] = HeraldConditionConfig::getConditionMap();
	foreach ($config_info['fields'] as $field => $name) {
	$config_info['conditionMap'][$field] = array_keys(
	HeraldConditionConfig::getConditionMapForField($field));
	}
	foreach ($config_info['fields'] as $field => $fname) {
	foreach ($config_info['conditions'] as $condition => $cname) {
	$config_info['values'][$field][$condition] =
	HeraldValueTypeConfig::getValueTypeForFieldAndCondition(
	$field,
	$condition);
	}
	}

	$config_info['actions'] =
	HeraldActionConfig::getActionMessageMap($rule->getContentType(),
	$rule->getRuleType());

	$config_info['rule_type'] = $rule->getRuleType();

	foreach ($config_info['actions'] as $action => $name) {
	$config_info['targets'][$action] =
	HeraldValueTypeConfig::getValueTypeForAction($action,
	$rule->getRuleType());
	}

	Javelin::initBehavior(
	'herald-rule-editor',
	array(
	'root' => 'herald-rule-edit-form',
	'conditions' => (object)$serial_conditions,
	'actions' => (object)$serial_actions,
	'template' => $this->buildTokenizerTemplates() + array(
	'rules' => $all_rules,
	'colors' => PhabricatorFlagColor::getColorNameMap(),
	'defaultColor' => PhabricatorFlagColor::COLOR_BLUE,
	),
	'author' => array($rule->getAuthorPHID() =>
	$handles[$rule->getAuthorPHID()]->getName()),
	'info' => $config_info,
	));
	}

	private function loadHandlesForRule($rule) {
	$phids = array();

	foreach ($rule->getActions() as $action) {
	if (!is_array($action->getTarget())) {
	continue;
	}
	foreach ($action->getTarget() as $target) {
	$target = (array)$target;
	foreach ($target as $phid) {
	$phids[] = $phid;
	}
	}
	}

	foreach ($rule->getConditions() as $condition) {
	$value = $condition->getValue();
	if (is_array($value)) {
	foreach ($value as $phid) {
	$phids[] = $phid;
	}
	}
	}

	$phids[] = $rule->getAuthorPHID();

	return $this->loadViewerHandles($phids);
	}


	/**
	* Render the selector for the "When (all of \| any of) these conditions are
	* met:" element.
	*/
	private function renderMustMatchSelector($rule) {
	return AphrontFormSelectControl::renderSelectTag(
	$rule->getMustMatchAll() ? 'all' : 'any',
	array(
	'all' => 'all of',
	'any' => 'any of',
	),
	array(
	'name' => 'must_match',
	));
	}


	/**
	* Render the selector for "Take these actions (every time \| only the first
	* time) this rule matches..." element.
	*/
	private function renderRepetitionSelector($rule) {
	// Make the selector for choosing how often this rule should be repeated
	$repetition_policy = HeraldRepetitionPolicyConfig::toString(
	$rule->getRepetitionPolicy());
	$repetition_options = HeraldRepetitionPolicyConfig::getMapForContentType(
	$rule->getContentType());

	if (empty($repetition_options)) {
	// default option is 'every time'
	$repetition_selector = idx(
	HeraldRepetitionPolicyConfig::getMap(),
	HeraldRepetitionPolicyConfig::EVERY);
	return $repetition_selector;
	} else if (count($repetition_options) == 1) {
	// if there's only 1 option, just pick it for the user
	$repetition_selector = reset($repetition_options);
	return $repetition_selector;
	} else {
	return AphrontFormSelectControl::renderSelectTag(
	$repetition_policy,
	$repetition_options,
	array(
	'name' => 'repetition_policy',
	));
	}
	}


	protected function buildTokenizerTemplates() {
	$template = new AphrontTokenizerTemplateView();
	$template = $template->render();

	return array(
	'source' => array(
	'email' => '/typeahead/common/mailable/',
	'user' => '/typeahead/common/users/',
	'repository' => '/typeahead/common/repositories/',
	'package' => '/typeahead/common/packages/',
	'project' => '/typeahead/common/projects/',
	),
	'markup' => $template,
	);
	}


	/**
	* Load rules for the "Another Herald rule..." condition dropdown, which
	* allows one rule to depend upon the success or failure of another rule.
	*/
	private function loadRulesThisRuleMayDependUpon(HeraldRule $rule) {
	// Any rule can depend on a global rule.
	$all_rules = id(new HeraldRuleQuery())
	->withRuleTypes(array(HeraldRuleTypeConfig::RULE_TYPE_GLOBAL))
	->withContentTypes(array($rule->getContentType()))
	->execute();

	if ($rule->getRuleType() == HeraldRuleTypeConfig::RULE_TYPE_PERSONAL) {
	// Personal rules may depend upon your other personal rules.
	$all_rules += id(new HeraldRuleQuery())
	->withRuleTypes(array(HeraldRuleTypeConfig::RULE_TYPE_PERSONAL))
	->withContentTypes(array($rule->getContentType()))
	->withAuthorPHIDs(array($rule->getAuthorPHID()))
	->execute();
	}

	// A rule can not depend upon itself.
	unset($all_rules[$rule->getID()]);

	return $all_rules;
	}


	}
	diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	index 5b258baf8f..23fcf30bee 100644
	--- a/src/applications/maniphest/controller/ManiphestTaskEditController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	@@ -1,556 +1,553 @@
	<?php

	/**
	* @group maniphest
	*/
	final class ManiphestTaskEditController extends ManiphestController {

	private $id;

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

	public function processRequest() {

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

	$files = array();
	$parent_task = null;
	$template_id = null;

	if ($this->id) {
	$task = id(new ManiphestTask())->load($this->id);
	if (!$task) {
	return new Aphront404Response();
	}
	} else {
	$task = new ManiphestTask();
	$task->setPriority(ManiphestTaskPriority::getDefaultPriority());
	$task->setAuthorPHID($user->getPHID());

	// These allow task creation with defaults.
	if (!$request->isFormPost()) {
	$task->setTitle($request->getStr('title'));

	$default_projects = $request->getStr('projects');
	if ($default_projects) {
	$task->setProjectPHIDs(explode(';', $default_projects));
	}
	}

	$file_phids = $request->getArr('files', array());
	if (!$file_phids) {
	// Allow a single 'file' key instead, mostly since Mac OS X urlencodes
	// square brackets in URLs when passed to 'open', so you can't 'open'
	// a URL like '?files[]=xyz' and have PHP interpret it correctly.
	$phid = $request->getStr('file');
	if ($phid) {
	$file_phids = array($phid);
	}
	}

	if ($file_phids) {
	$files = id(new PhabricatorFile())->loadAllWhere(
	'phid IN (%Ls)',
	$file_phids);
	}

	$template_id = $request->getInt('template');

	// You can only have a parent task if you're creating a new task.
	$parent_id = $request->getInt('parent');
	if ($parent_id) {
	$parent_task = id(new ManiphestTask())->load($parent_id);
	}
	}

	$errors = array();
	$e_title = true;

	$extensions = ManiphestTaskExtensions::newExtensions();
	$aux_fields = $extensions->getAuxiliaryFieldSpecifications();

	if ($request->isFormPost()) {

	$changes = array();

	$new_title = $request->getStr('title');
	$new_desc = $request->getStr('description');
	$new_status = $request->getStr('status');

	$workflow = '';

	if ($task->getID()) {
	if ($new_title != $task->getTitle()) {
	$changes[ManiphestTransactionType::TYPE_TITLE] = $new_title;
	}
	if ($new_desc != $task->getDescription()) {
	$changes[ManiphestTransactionType::TYPE_DESCRIPTION] = $new_desc;
	}
	if ($new_status != $task->getStatus()) {
	$changes[ManiphestTransactionType::TYPE_STATUS] = $new_status;
	}
	} else {
	$task->setTitle($new_title);
	$task->setDescription($new_desc);
	$changes[ManiphestTransactionType::TYPE_STATUS] =
	ManiphestTaskStatus::STATUS_OPEN;

	$workflow = 'create';
	}

	$owner_tokenizer = $request->getArr('assigned_to');
	$owner_phid = reset($owner_tokenizer);

	if (!strlen($new_title)) {
	$e_title = pht('Required');
	$errors[] = pht('Title is required.');
	}

	foreach ($aux_fields as $aux_field) {
	$aux_field->setValueFromRequest($request);

	if ($aux_field->isRequired() && !strlen($aux_field->getValue())) {
	$errors[] = $aux_field->getLabel() . ' is required.';
	$aux_field->setError('Required');
	}

	if (strlen($aux_field->getValue())) {
	try {
	$aux_field->validate();
	} catch (Exception $e) {
	$errors[] = $e->getMessage();
	$aux_field->setError('Invalid');
	}
	}
	}

	if ($errors) {
	$task->setPriority($request->getInt('priority'));
	$task->setOwnerPHID($owner_phid);
	$task->setCCPHIDs($request->getArr('cc'));
	$task->setProjectPHIDs($request->getArr('projects'));
	} else {
	if ($request->getInt('priority') != $task->getPriority()) {
	$changes[ManiphestTransactionType::TYPE_PRIORITY] =
	$request->getInt('priority');
	}

	if ($owner_phid != $task->getOwnerPHID()) {
	$changes[ManiphestTransactionType::TYPE_OWNER] = $owner_phid;
	}

	if ($request->getArr('cc') != $task->getCCPHIDs()) {
	$changes[ManiphestTransactionType::TYPE_CCS] = $request->getArr('cc');
	}

	$new_proj_arr = $request->getArr('projects');
	$new_proj_arr = array_values($new_proj_arr);
	sort($new_proj_arr);

	$cur_proj_arr = $task->getProjectPHIDs();
	$cur_proj_arr = array_values($cur_proj_arr);
	sort($cur_proj_arr);

	if ($new_proj_arr != $cur_proj_arr) {
	$changes[ManiphestTransactionType::TYPE_PROJECTS] = $new_proj_arr;
	}

	if ($files) {
	$file_map = mpull($files, 'getPHID');
	$file_map = array_fill_keys($file_map, array());
	$changes[ManiphestTransactionType::TYPE_ATTACH] = array(
	PhabricatorPHIDConstants::PHID_TYPE_FILE => $file_map,
	);
	}

	$content_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_WEB,
	array(
	'ip' => $request->getRemoteAddr(),
	));

	$template = new ManiphestTransaction();
	$template->setAuthorPHID($user->getPHID());
	$template->setContentSource($content_source);
	$transactions = array();

	foreach ($changes as $type => $value) {
	$transaction = clone $template;
	$transaction->setTransactionType($type);
	$transaction->setNewValue($value);
	$transactions[] = $transaction;
	}

	if ($aux_fields) {
	$task->loadAndAttachAuxiliaryAttributes();
	foreach ($aux_fields as $aux_field) {
	$transaction = clone $template;
	$transaction->setTransactionType(
	ManiphestTransactionType::TYPE_AUXILIARY);
	$aux_key = $aux_field->getAuxiliaryKey();
	$transaction->setMetadataValue('aux:key', $aux_key);
	$transaction->setNewValue($aux_field->getValueForStorage());
	$transactions[] = $transaction;
	}
	}

	if ($transactions) {
	$is_new = !$task->getID();

	$event = new PhabricatorEvent(
	PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK,
	array(
	'task' => $task,
	'new' => $is_new,
	'transactions' => $transactions,
	));
	$event->setUser($user);
	$event->setAphrontRequest($request);
	PhutilEventEngine::dispatchEvent($event);

	$task = $event->getValue('task');
	$transactions = $event->getValue('transactions');

	$editor = new ManiphestTransactionEditor();
	$editor->setActor($user);
	$editor->setAuxiliaryFields($aux_fields);
	$editor->applyTransactions($task, $transactions);

	$event = new PhabricatorEvent(
	PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
	array(
	'task' => $task,
	'new' => $is_new,
	'transactions' => $transactions,
	));
	$event->setUser($user);
	$event->setAphrontRequest($request);
	PhutilEventEngine::dispatchEvent($event);
	}


	if ($parent_task) {
	id(new PhabricatorEdgeEditor())
	->setActor($user)
	->addEdge(
	$parent_task->getPHID(),
	PhabricatorEdgeConfig::TYPE_TASK_DEPENDS_ON_TASK,
	$task->getPHID())
	->save();
	$workflow = $parent_task->getID();
	}

	$redirect_uri = '/T'.$task->getID();

	if ($workflow) {
	$redirect_uri .= '?workflow='.$workflow;
	}

	return id(new AphrontRedirectResponse())
	->setURI($redirect_uri);
	}
	} else {
	if ($aux_fields) {
	$task->loadAndAttachAuxiliaryAttributes();
	foreach ($aux_fields as $aux_field) {
	$aux_key = $aux_field->getAuxiliaryKey();
	$value = $task->getAuxiliaryAttribute($aux_key);
	$aux_field->setValueFromStorage($value);
	}
	}

	if (!$task->getID()) {
	$task->setCCPHIDs(array(
	$user->getPHID(),
	));
	if ($template_id) {
	$template_task = id(new ManiphestTask())->load($template_id);
	if ($template_task) {
	$task->setCCPHIDs($template_task->getCCPHIDs());
	$task->setProjectPHIDs($template_task->getProjectPHIDs());
	$task->setOwnerPHID($template_task->getOwnerPHID());
	$task->setPriority($template_task->getPriority());

	if ($aux_fields) {
	$template_task->loadAndAttachAuxiliaryAttributes();
	foreach ($aux_fields as $aux_field) {
	if (!$aux_field->shouldCopyWhenCreatingSimilarTask()) {
	continue;
	}

	$aux_key = $aux_field->getAuxiliaryKey();
	$value = $template_task->getAuxiliaryAttribute($aux_key);
	$aux_field->setValueFromStorage($value);
	}
	}
	}
	}
	}
	}

	$phids = array_merge(
	array($task->getOwnerPHID()),
	$task->getCCPHIDs(),
	$task->getProjectPHIDs());

	if ($parent_task) {
	$phids[] = $parent_task->getPHID();
	}

	$phids = array_filter($phids);
	$phids = array_unique($phids);

	$handles = $this->loadViewerHandles($phids);

	$tvalues = mpull($handles, 'getFullName', 'getPHID');

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

	$priority_map = ManiphestTaskPriority::getTaskPriorityMap();

	if ($task->getOwnerPHID()) {
	$assigned_value = array(
	$task->getOwnerPHID() => $handles[$task->getOwnerPHID()]->getFullName(),
	);
	} else {
	$assigned_value = array();
	}

	if ($task->getCCPHIDs()) {
	$cc_value = array_select_keys($tvalues, $task->getCCPHIDs());
	} else {
	$cc_value = array();
	}

	if ($task->getProjectPHIDs()) {
	$projects_value = array_select_keys($tvalues, $task->getProjectPHIDs());
	} else {
	$projects_value = array();
	}

	$cancel_id = nonempty($task->getID(), $template_id);
	if ($cancel_id) {
	$cancel_uri = '/T'.$cancel_id;
	} else {
	$cancel_uri = '/maniphest/';
	}

	if ($task->getID()) {
	$button_name = pht('Save Task');
	$header_name = pht('Edit Task');
	} else if ($parent_task) {
	$cancel_uri = '/T'.$parent_task->getID();
	$button_name = pht('Create Task');
	$header_name = pht('Create New Subtask');
	} else {
	$button_name = pht('Create Task');
	$header_name = pht('Create New Task');
	}

	require_celerity_resource('maniphest-task-edit-css');

	$project_tokenizer_id = celerity_generate_unique_node_id();

	$form = new AphrontFormView();
	$form
	->setUser($user)
	->setAction($request->getRequestURI()->getPath())
	->addHiddenInput('template', $template_id);

	if ($parent_task) {
	$form
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel(pht('Parent Task'))
	->setValue($handles[$parent_task->getPHID()]->getFullName()))
	->addHiddenInput('parent', $parent_task->getID());
	}

	$form
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel(pht('Title'))
	->setName('title')
	->setError($e_title)
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
	->setValue($task->getTitle()));

	if ($task->getID()) {
	// Only show this in "edit" mode, not "create" mode, since creating a
	// non-open task is kind of silly and it would just clutter up the
	// "create" interface.
	$form
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Status'))
	->setName('status')
	->setValue($task->getStatus())
	->setOptions(ManiphestTaskStatus::getTaskStatusMap()));
	}

	$form
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Assigned To'))
	->setName('assigned_to')
	->setValue($assigned_value)
	->setUser($user)
	->setDatasource('/typeahead/common/users/')
	->setLimit(1))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('CC'))
	->setName('cc')
	->setValue($cc_value)
	->setUser($user)
	->setDatasource('/typeahead/common/mailable/'))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Priority'))
	->setName('priority')
	->setOptions($priority_map)
	->setValue($task->getPriority()))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setValue($projects_value)
	->setID($project_tokenizer_id)
	->setCaption(
	javelin_tag(
	'a',
	array(
	'href' => '/project/create/',
	'mustcapture' => true,
	'sigil' => 'project-create',
	),
	pht('Create New Project')))
	->setDatasource('/typeahead/common/projects/'));

	if ($aux_fields) {
	foreach ($aux_fields as $aux_field) {
	if ($aux_field->isRequired() &&
	!$aux_field->getError() &&
	!$aux_field->getValue()) {
	$aux_field->setError(true);
	}

	$aux_control = $aux_field->renderControl();
	$form->appendChild($aux_control);
	}
	}

	require_celerity_resource('aphront-error-view-css');

	Javelin::initBehavior('project-create', array(
	'tokenizerID' => $project_tokenizer_id,
	));

	if ($files) {
	- $file_display = array();
	- foreach ($files as $file) {
	- $file_display[] = phutil_escape_html($file->getName());
	- }
	- $file_display = implode('<br />', $file_display);
	+ $file_display = mpull($files, 'getName');
	+ $file_display = array_interleave(phutil_tag('br'), $file_display);

	$form->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Files'))
	->setValue($file_display));

	foreach ($files as $ii => $file) {
	$form->addHiddenInput('files['.$ii.']', $file->getPHID());
	}
	}


	$description_control = new PhabricatorRemarkupControl();
	// "Upsell" creating tasks via email in create flows if the instance is
	// configured for this awesomeness.
	$email_create = PhabricatorEnv::getEnvConfig(
	'metamta.maniphest.public-create-email');
	if (!$task->getID() && $email_create) {
	$email_hint = pht(
	'You can also create tasks by sending an email to: %s',
	phutil_tag('tt', array(), $email_create));
	$description_control->setCaption($email_hint);
	}

	$description_control
	->setLabel(pht('Description'))
	->setName('description')
	->setID('description-textarea')
	->setValue($task->getDescription())
	->setUser($user);

	$form
	->appendChild($description_control);

	if (!$task->getID()) {
	$form
	->appendChild(
	id(new AphrontFormDragAndDropUploadControl())
	->setLabel(pht('Attached Files'))
	->setName('files')
	->setActivatedClass('aphront-panel-view-drag-and-drop'));
	}

	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($cancel_uri)
	->setValue($button_name));

	$panel = new AphrontPanelView();
	$panel->setWidth(AphrontPanelView::WIDTH_FULL);
	$panel->setHeader($header_name);
	$panel->appendChild($form);
	$panel->setNoBackground();

	$description_preview_panel =
	'<div class="aphront-panel-preview aphront-panel-preview-full">
	<div class="maniphest-description-preview-header">
	Description Preview
	</div>
	<div id="description-preview">
	<div class="aphront-panel-preview-loading-text">
	Loading preview...
	</div>
	</div>
	</div>';

	Javelin::initBehavior(
	'maniphest-description-preview',
	array(
	'preview' => 'description-preview',
	'textarea' => 'description-textarea',
	'uri' => '/maniphest/task/descriptionpreview/',
	));

	if ($task->getID()) {
	$page_objects = array( $task->getPHID() );
	} else {
	$page_objects = array();
	}

	return $this->buildApplicationPage(
	array(
	$error_view,
	$panel,
	$description_preview_panel
	),
	array(
	'title' => $header_name,
	'pageObjects' => $page_objects,
	'device' => true
	));
	}
	}
	diff --git a/src/applications/paste/controller/PhabricatorPasteEditController.php b/src/applications/paste/controller/PhabricatorPasteEditController.php
	index 63beb71670..29d0272209 100644
	--- a/src/applications/paste/controller/PhabricatorPasteEditController.php
	+++ b/src/applications/paste/controller/PhabricatorPasteEditController.php
	@@ -1,212 +1,211 @@
	<?php

	final class PhabricatorPasteEditController extends PhabricatorPasteController {

	private $id;

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


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

	$parent = null;
	$parent_id = null;
	if (!$this->id) {
	$is_create = true;

	$paste = new PhabricatorPaste();

	$parent_id = $request->getStr('parent');
	if ($parent_id) {
	// NOTE: If the Paste is forked from a paste which the user no longer
	// has permission to see, we still let them edit it.
	$parent = id(new PhabricatorPasteQuery())
	->setViewer($user)
	->withIDs(array($parent_id))
	->needContent(true)
	->needRawContent(true)
	->execute();
	$parent = head($parent);

	if ($parent) {
	$paste->setParentPHID($parent->getPHID());
	$paste->setViewPolicy($parent->getViewPolicy());
	}
	}

	$paste->setAuthorPHID($user->getPHID());
	} else {
	$is_create = false;

	$paste = id(new PhabricatorPasteQuery())
	->setViewer($user)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->withIDs(array($this->id))
	->executeOne();
	if (!$paste) {
	return new Aphront404Response();
	}
	}

	$text = null;
	$e_text = true;
	$errors = array();
	if ($request->isFormPost()) {

	if ($is_create) {
	$text = $request->getStr('text');
	if (!strlen($text)) {
	$e_text = 'Required';
	$errors[] = 'The paste may not be blank.';
	} else {
	$e_text = null;
	}
	}

	$paste->setTitle($request->getStr('title'));
	$paste->setLanguage($request->getStr('language'));
	$paste->setViewPolicy($request->getStr('can_view'));

	// NOTE: The author is the only editor and can always view the paste,
	// so it's impossible for them to choose an invalid policy.

	if (!$errors) {
	if ($is_create) {
	$paste_file = PhabricatorFile::newFromFileData(
	$text,
	array(
	'name' => $paste->getTitle(),
	'mime-type' => 'text/plain; charset=utf-8',
	'authorPHID' => $user->getPHID(),
	));
	$paste->setFilePHID($paste_file->getPHID());
	}
	$paste->save();
	return id(new AphrontRedirectResponse())->setURI($paste->getURI());
	}
	} else {
	if ($is_create && $parent) {
	$paste->setTitle('Fork of '.$parent->getFullName());
	$paste->setLanguage($parent->getLanguage());
	$text = $parent->getRawContent();
	}
	}

	$error_view = null;
	if ($errors) {
	$error_view = id(new AphrontErrorView())
	->setTitle('A fatal omission!')
	->setErrors($errors);
	}

	$form = new AphrontFormView();
	$form->setFlexible(true);

	$langs = array(
	'' => '(Detect From Filename in Title)',
	) + PhabricatorEnv::getEnvConfig('pygments.dropdown-choices');

	$form
	->setUser($user)
	->addHiddenInput('parent', $parent_id)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Title')
	->setValue($paste->getTitle())
	->setName('title'))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Language')
	->setName('language')
	->setValue($paste->getLanguage())
	->setOptions($langs));

	$policies = id(new PhabricatorPolicyQuery())
	->setViewer($user)
	->setObject($paste)
	->execute();

	$form->appendChild(
	id(new AphrontFormPolicyControl())
	->setUser($user)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	->setPolicyObject($paste)
	->setPolicies($policies)
	->setName('can_view'));

	if ($is_create) {
	$form
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Text')
	->setError($e_text)
	->setValue($text)
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
	->setCustomClass('PhabricatorMonospaced')
	->setName('text'));
	} else {
	$fork_link = phutil_tag(
	'a',
	array(
	'href' => $this->getApplicationURI('?parent='.$paste->getID())
	),
	'Fork'
	);
	$form
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel('Text')
	- ->setValue(
	- 'Paste text can not be edited. '.
	- $fork_link.' to create a new paste.'
	- ));
	+ ->setValue(hsprintf(
	+ 'Paste text can not be edited. %s to create a new paste.',
	+ $fork_link)));
	}

	$submit = new AphrontFormSubmitControl();

	if (!$is_create) {
	$submit->addCancelButton($paste->getURI());
	$submit->setValue(pht('Save Paste'));
	$title = pht('Edit %s', $paste->getFullName());
	$short = pht('Edit');
	} else {
	$submit->setValue(pht('Create Paste'));
	$title = pht('Create Paste');
	$short = pht('Create');
	}

	$form
	->appendChild($submit);

	$crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
	if (!$is_create) {
	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())
	->setName('P'.$paste->getID())
	->setHref('/P'.$paste->getID()));
	}
	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())->setName($short));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	id(new PhabricatorHeaderView())->setHeader($title),
	$error_view,
	$form,
	),
	array(
	'title' => $title,
	'device' => true,
	));
	}

	}
	diff --git a/src/applications/phortune/control/PhortuneMonthYearExpiryControl.php b/src/applications/phortune/control/PhortuneMonthYearExpiryControl.php
	index a4701aa11c..b9c48cd595 100644
	--- a/src/applications/phortune/control/PhortuneMonthYearExpiryControl.php
	+++ b/src/applications/phortune/control/PhortuneMonthYearExpiryControl.php
	@@ -1,91 +1,86 @@
	<?php

	final class PhortuneMonthYearExpiryControl extends AphrontFormControl {
	private $monthValue;
	private $yearValue;

	public function setMonthInputValue($value) {
	$this->monthValue = $value;
	return $this;
	}
	private function getMonthInputValue() {
	return $this->monthValue;
	}
	private function getCurrentMonth() {
	return phabricator_format_local_time(
	time(),
	$this->getUser(),
	'm');
	}

	public function setYearInputValue($value) {
	$this->yearValue = $value;
	return $this;
	}
	private function getYearInputValue() {
	return $this->yearValue;
	}
	private function getCurrentYear() {
	return phabricator_format_local_time(
	time(),
	$this->getUser(),
	'Y');
	}

	protected function getCustomControlClass() {
	return 'aphront-form-control-text';
	}

	protected function renderInput() {
	if (!$this->getUser()) {
	throw new Exception('You must setUser() before render()!');
	}

	// represent months like a credit card does
	$months = array(
	'01' => '01',
	'02' => '02',
	'03' => '03',
	'04' => '04',
	'05' => '05',
	'06' => '06',
	'07' => '07',
	'08' => '08',
	'09' => '09',
	'10' => '10',
	'11' => '11',
	'12' => '12',
	);

	$current_year = $this->getCurrentYear();
	$years = range($current_year, $current_year + 20);
	$years = array_fuse($years);

	if ($this->getMonthInputValue()) {
	$selected_month = $this->getMonthInputValue();
	} else {
	$selected_month = $this->getCurrentMonth();
	}
	$months_sel = AphrontFormSelectControl::renderSelectTag(
	$selected_month,
	$months,
	array(
	'sigil' => 'month-input',
	));

	$years_sel = AphrontFormSelectControl::renderSelectTag(
	$this->getYearInputValue(),
	$years,
	array(
	'sigil' => 'year-input',
	));

	- return self::renderSingleView(
	- array(
	- $months_sel,
	- $years_sel
	- )
	- );
	+ return hsprintf('%s%s', $months_sel, $years_sel);
	}

	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
	index 97b1a21c4b..b5b4d00d35 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
	@@ -1,170 +1,170 @@
	<?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_dark_console = PhabricatorUserPreferences::PREFERENCE_DARK_CONSOLE;
	$pref_editor = PhabricatorUserPreferences::PREFERENCE_EDITOR;
	$pref_multiedit = PhabricatorUserPreferences::PREFERENCE_MULTIEDIT;
	$pref_titles = PhabricatorUserPreferences::PREFERENCE_TITLES;
	$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_monospaced, $monospaced);
	$preferences->setPreference(
	$pref_monospaced_textareas,
	$request->getStr($pref_monospaced_textareas));
	$preferences->setPreference(
	$pref_dark_console,
	$request->getBool($pref_dark_console));

	$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_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');

	$pref_monospaced_textareas_value = $preferences
	->getPreference($pref_monospaced_textareas);
	if (!$pref_monospaced_textareas_value) {
	$pref_monospaced_textareas_value = 'disabled';
	}
	$pref_dark_console_value = $preferences->getPreference($pref_dark_console);
	if (!$pref_dark_console_value) {
	$pref_dark_console_value = 0;
	}

	$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(hsprintf(
	'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 %s.',
	$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(hsprintf(
	'Overrides default fonts in tools like Differential.<br />'.
	'(Default: %s)',
	$font_default))
	->setValue($preferences->getPreference($pref_monospaced)))
	->appendChild(
	id(new AphrontFormMarkupControl())
	- ->setValue(
	- '<pre class="PhabricatorMonospaced">'.
	- phutil_escape_html($example_string).
	- '</pre>'))
	+ ->setValue(phutil_tag(
	+ 'pre',
	+ array('class' => 'PhabricatorMonospaced'),
	+ $example_string)))
	->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 AphrontFormRadioButtonControl())
	->setLabel('Dark Console')
	->setName($pref_dark_console)
	->setValue($pref_dark_console_value ?
	$pref_dark_console_value : 0)
	->addButton(1, 'Enabled',
	'Enabling and using the built-in debugging console.')
	->addButton(0, 'Disabled', null))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save Preferences'));


	$panel = new AphrontPanelView();
	$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/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
	index 2bc75bc744..9440e476b4 100644
	--- a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
	+++ b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
	@@ -1,457 +1,456 @@
	<?php

	/**
	* @group slowvote
	*/
	final class PhabricatorSlowvotePollController
	extends PhabricatorSlowvoteController {

	private $id;

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

	public function processRequest() {

	$request = $this->getRequest();
	$user = $request->getUser();
	$viewer_phid = $user->getPHID();

	$poll = id(new PhabricatorSlowvotePoll())->load($this->id);
	if (!$poll) {
	return new Aphront404Response();
	}

	$options = id(new PhabricatorSlowvoteOption())->loadAllWhere(
	'pollID = %d',
	$poll->getID());
	$choices = id(new PhabricatorSlowvoteChoice())->loadAllWhere(
	'pollID = %d',
	$poll->getID());
	$comments = id(new PhabricatorSlowvoteComment())->loadAllWhere(
	'pollID = %d',
	$poll->getID());

	$choices_by_option = mgroup($choices, 'getOptionID');
	$comments_by_user = mpull($comments, null, 'getAuthorPHID');
	$choices_by_user = mgroup($choices, 'getAuthorPHID');
	$viewer_choices = idx($choices_by_user, $viewer_phid, array());
	$viewer_comment = idx($comments_by_user, $viewer_phid, null);

	$comment_text = null;
	if ($viewer_comment) {
	$comment_text = $viewer_comment->getCommentText();
	}

	if ($request->isFormPost()) {
	$comment = idx($comments_by_user, $viewer_phid, null);
	if ($comment) {
	$comment->delete();
	}

	$comment_text = $request->getStr('comments');
	if (strlen($comment_text)) {
	id(new PhabricatorSlowvoteComment())
	->setAuthorPHID($viewer_phid)
	->setPollID($poll->getID())
	->setCommentText($comment_text)
	->save();
	}

	$votes = $request->getArr('vote');

	switch ($poll->getMethod()) {
	case PhabricatorSlowvotePoll::METHOD_PLURALITY:
	// Enforce only one vote.
	$votes = array_slice($votes, 0, 1);
	break;
	case PhabricatorSlowvotePoll::METHOD_APPROVAL:
	// No filtering.
	break;
	default:
	throw new Exception("Unknown poll method!");
	}

	foreach ($viewer_choices as $viewer_choice) {
	$viewer_choice->delete();
	}

	foreach ($votes as $vote) {
	id(new PhabricatorSlowvoteChoice())
	->setAuthorPHID($viewer_phid)
	->setPollID($poll->getID())
	->setOptionID($vote)
	->save();
	}

	return id(new AphrontRedirectResponse())->setURI('/V'.$poll->getID());
	}

	require_celerity_resource('phabricator-slowvote-css');

	$phids = array_merge(
	mpull($choices, 'getAuthorPHID'),
	mpull($comments, 'getAuthorPHID'),
	array(
	$poll->getAuthorPHID(),
	));

	$query = new PhabricatorObjectHandleData($phids);
	$handles = $query->loadHandles();
	$objects = $query->loadObjects();

	if ($poll->getShuffle()) {
	shuffle($options);
	}

	$option_markup = array();
	foreach ($options as $option) {
	$option_markup[] = $this->renderPollOption(
	$poll,
	$viewer_choices,
	$option);
	}
	- $option_markup = implode("\n", $option_markup);

	$comments_by_option = array();
	switch ($poll->getMethod()) {
	case PhabricatorSlowvotePoll::METHOD_PLURALITY:
	$choice_ids = array();
	foreach ($choices_by_user as $user_phid => $user_choices) {
	$choice_ids[$user_phid] = head($user_choices)->getOptionID();
	}
	foreach ($comments as $comment) {
	$choice = idx($choice_ids, $comment->getAuthorPHID());
	if ($choice) {
	$comments_by_option[$choice][] = $comment;
	}
	}
	break;
	case PhabricatorSlowvotePoll::METHOD_APPROVAL:
	// All comments are grouped in approval voting.
	break;
	default:
	throw new Exception("Unknown poll method!");
	}

	$result_markup = $this->renderResultMarkup(
	$poll,
	$options,
	$choices,
	$comments,
	$viewer_choices,
	$choices_by_option,
	$comments_by_option,
	$handles,
	$objects);

	if ($viewer_choices) {
	$instructions =
	'Your vote has been recorded... but there is still ample time to '.
	'rethink your position. Have you thoroughly considered all possible '.
	'eventualities?';
	} else {
	$instructions =
	'This is a weighty matter indeed. Consider your choices with the '.
	'greatest of care.';
	}

	$form = id(new AphrontFormView())
	->setUser($user)
	->appendChild(
	'<p class="aphront-form-instructions">'.$instructions.'</p>')
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel('Vote')
	->setValue($option_markup))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Comments')
	->setHeight(AphrontFormTextAreaControl::HEIGHT_SHORT)
	->setName('comments')
	->setValue($comment_text))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Cautiously Engage in Deliberations'));


	$panel = new AphrontPanelView();
	$panel->setHeader(phutil_escape_html($poll->getQuestion()));
	$panel->setWidth(AphrontPanelView::WIDTH_WIDE);

	$panel->appendChild($form);
	$panel->appendChild('<br /><br />');
	$panel->appendChild($result_markup);

	return $this->buildStandardPageResponse(
	$panel,
	array(
	'title' => 'V'.$poll->getID().' '.$poll->getQuestion(),
	));
	}

	private function renderComments(array $comments, array $handles) {
	assert_instances_of($comments, 'PhabricatorSlowvoteComment');
	assert_instances_of($handles, 'PhabricatorObjectHandle');

	$viewer = $this->getRequest()->getUser();

	$engine = PhabricatorMarkupEngine::newSlowvoteMarkupEngine();

	$comment_markup = array();
	foreach ($comments as $comment) {
	$handle = $handles[$comment->getAuthorPHID()];

	$markup = phutil_safe_html(
	$engine->markupText($comment->getCommentText()));

	require_celerity_resource('phabricator-remarkup-css');

	$comment_markup[] =
	'<tr>'.
	'<th>'.
	$handle->renderLink().
	'<div class="phabricator-slowvote-datestamp">'.
	phabricator_datetime($comment->getDateCreated(), $viewer).
	'</div>'.
	'<td>'.
	'<div class="phabricator-remarkup">'.
	$markup.
	'</div>'.
	'</td>'.
	'</tr>';
	}

	if ($comment_markup) {
	$comment_markup = phutil_tag(
	'table',
	array(
	'class' => 'phabricator-slowvote-comments',
	),
	new PhutilSafeHTML(implode("\n", $comment_markup)));
	} else {
	$comment_markup = null;
	}

	return $comment_markup;
	}

	private function renderPollOption(
	PhabricatorSlowvotePoll $poll,
	array $viewer_choices,
	PhabricatorSlowvoteOption $option) {
	assert_instances_of($viewer_choices, 'PhabricatorSlowvoteChoice');

	$id = $option->getID();
	switch ($poll->getMethod()) {
	case PhabricatorSlowvotePoll::METHOD_PLURALITY:

	// Render a radio button.

	$selected_option = head($viewer_choices);
	if ($selected_option) {
	$selected = $selected_option->getOptionID();
	} else {
	$selected = null;
	}

	if ($selected == $id) {
	$checked = "checked";
	} else {
	$checked = null;
	}

	$input = phutil_tag(
	'input',
	array(
	'type' => 'radio',
	'name' => 'vote[]',
	'value' => $id,
	'checked' => $checked,
	));
	break;
	case PhabricatorSlowvotePoll::METHOD_APPROVAL:

	// Render a check box.

	$checked = null;
	foreach ($viewer_choices as $choice) {
	if ($choice->getOptionID() == $id) {
	$checked = 'checked';
	break;
	}
	}

	$input = phutil_tag(
	'input',
	array(
	'type' => 'checkbox',
	'name' => 'vote[]',
	'checked' => $checked,
	'value' => $id,
	));
	break;
	default:
	throw new Exception("Unknown poll method!");
	}

	if ($checked) {
	$checked_class = 'phabricator-slowvote-checked';
	} else {
	$checked_class = null;
	}

	return phutil_tag(
	'label',
	array(
	'class' => 'phabricator-slowvote-label '.$checked_class,
	),
	array($input, $option->getName()));
	}

	private function renderVoteCount(
	PhabricatorSlowvotePoll $poll,
	array $choices,
	array $chosen) {
	assert_instances_of($choices, 'PhabricatorSlowvoteChoice');
	assert_instances_of($chosen, 'PhabricatorSlowvoteChoice');

	switch ($poll->getMethod()) {
	case PhabricatorSlowvotePoll::METHOD_PLURALITY:
	$out_of_total = count($choices);
	break;
	case PhabricatorSlowvotePoll::METHOD_APPROVAL:
	// Count unique respondents for approval votes.
	$out_of_total = count(mpull($choices, null, 'getAuthorPHID'));
	break;
	default:
	throw new Exception("Unknown poll method!");
	}

	return sprintf(
	'%d / %d (%d%%)',
	number_format(count($chosen)),
	number_format($out_of_total),
	$out_of_total
	? round(100 * count($chosen) / $out_of_total)
	: 0);
	}

	private function renderResultMarkup(
	PhabricatorSlowvotePoll $poll,
	array $options,
	array $choices,
	array $comments,
	array $viewer_choices,
	array $choices_by_option,
	array $comments_by_option,
	array $handles,
	array $objects) {
	assert_instances_of($options, 'PhabricatorSlowvoteOption');
	assert_instances_of($choices, 'PhabricatorSlowvoteChoice');
	assert_instances_of($comments, 'PhabricatorSlowvoteComment');
	assert_instances_of($viewer_choices, 'PhabricatorSlowvoteChoice');
	assert_instances_of($handles, 'PhabricatorObjectHandle');
	assert_instances_of($objects, 'PhabricatorLiskDAO');

	$viewer_phid = $this->getRequest()->getUser()->getPHID();

	$can_see_responses = false;
	$need_vote = false;
	switch ($poll->getResponseVisibility()) {
	case PhabricatorSlowvotePoll::RESPONSES_VISIBLE:
	$can_see_responses = true;
	break;
	case PhabricatorSlowvotePoll::RESPONSES_VOTERS:
	$can_see_responses = (bool)$viewer_choices;
	$need_vote = true;
	break;
	case PhabricatorSlowvotePoll::RESPONSES_OWNER:
	$can_see_responses = ($viewer_phid == $poll->getAuthorPHID());
	break;
	}

	$result_markup = id(new AphrontFormLayoutView())
	->appendChild('<h1>Ongoing Deliberation</h1>');

	if (!$can_see_responses) {
	if ($need_vote) {
	$reason = "You must vote to see the results.";
	} else {
	$reason = "The results are not public.";
	}
	$result_markup
	->appendChild(
	'<p class="aphront-form-instructions"><em>'.$reason.'</em></p>');
	return $result_markup;
	}

	foreach ($options as $option) {
	$id = $option->getID();

	$chosen = idx($choices_by_option, $id, array());
	$users = array_select_keys($handles, mpull($chosen, 'getAuthorPHID'));
	if ($users) {
	$user_markup = array();
	foreach ($users as $handle) {
	$object = idx($objects, $handle->getPHID());
	if (!$object) {
	continue;
	}

	$profile_image = $handle->getImageURI();

	$user_markup[] = phutil_tag(
	'a',
	array(
	'href' => $handle->getURI(),
	'class' => 'phabricator-slowvote-facepile',
	),
	phutil_tag(
	'img',
	array(
	'src' => $profile_image,
	)));
	}
	$user_markup = implode('', $user_markup);
	} else {
	$user_markup = 'This option has failed to appeal to anyone.';
	}

	$comment_markup = $this->renderComments(
	idx($comments_by_option, $id, array()),
	$handles);

	$vote_count = $this->renderVoteCount(
	$poll,
	$choices,
	$chosen);

	$result_markup->appendChild(
	'<div>'.
	'<div class="phabricator-slowvote-count">'.
	$vote_count.
	'</div>'.
	'<h1>'.phutil_escape_html($option->getName()).'</h1>'.
	'<hr class="phabricator-slowvote-hr" />'.
	$user_markup.
	'<div style="clear: both;">'.
	'<hr class="phabricator-slowvote-hr" />'.
	$comment_markup.
	'</div>');
	}

	if ($poll->getMethod() == PhabricatorSlowvotePoll::METHOD_APPROVAL &&
	$comments) {
	$comment_markup = $this->renderComments(
	$comments,
	$handles);
	$result_markup->appendChild(
	'<h1>Motions Proposed for Consideration</h1>');
	$result_markup->appendChild($comment_markup);
	}

	return $result_markup;
	}
	}
	diff --git a/src/view/form/control/AphrontFormCheckboxControl.php b/src/view/form/control/AphrontFormCheckboxControl.php
	index 00a85f52a9..4d452c448e 100644
	--- a/src/view/form/control/AphrontFormCheckboxControl.php
	+++ b/src/view/form/control/AphrontFormCheckboxControl.php
	@@ -1,53 +1,52 @@
	<?php

	final class AphrontFormCheckboxControl extends AphrontFormControl {

	private $boxes = array();

	public function addCheckbox($name, $value, $label, $checked = false) {
	$this->boxes[] = array(
	'name' => $name,
	'value' => $value,
	'label' => $label,
	'checked' => $checked,
	);
	return $this;
	}

	protected function getCustomControlClass() {
	return 'aphront-form-control-checkbox';
	}

	protected function renderInput() {
	$rows = array();
	foreach ($this->boxes as $box) {
	$id = celerity_generate_unique_node_id();
	$checkbox = phutil_tag(
	'input',
	array(
	'id' => $id,
	'type' => 'checkbox',
	'name' => $box['name'],
	'value' => $box['value'],
	'checked' => $box['checked'] ? 'checked' : null,
	'disabled' => $this->getDisabled() ? 'disabled' : null,
	));
	$label = phutil_tag(
	'label',
	array(
	'for' => $id,
	),
	$box['label']);
	- $rows[] =
	- '<tr>'.
	- '<td>'.$checkbox.'</td>'.
	- '<th>'.$label.'</th>'.
	- '</tr>';
	+ $rows[] = hsprintf(
	+ '<tr><td>%s</td><th>%s</th></tr>',
	+ $checkbox,
	+ $label);
	}
	- return
	- '<table class="aphront-form-control-checkbox-layout">'.
	- implode("\n", $rows).
	- '</table>';
	+ return phutil_tag(
	+ 'table',
	+ array('class' => 'aphront-form-control-checkbox-layout'),
	+ $rows);
	}

	}
	diff --git a/src/view/form/control/AphrontFormControl.php b/src/view/form/control/AphrontFormControl.php
	index 6bbdfe853e..0e21457e29 100644
	--- a/src/view/form/control/AphrontFormControl.php
	+++ b/src/view/form/control/AphrontFormControl.php
	@@ -1,166 +1,168 @@
	<?php

	abstract class AphrontFormControl extends AphrontView {

	private $label;
	private $caption;
	private $error;
	private $name;
	private $value;
	private $disabled;
	private $id;
	private $controlID;
	private $controlStyle;

	public function setID($id) {
	$this->id = $id;
	return $this;
	}

	public function getID() {
	return $this->id;
	}

	public function setControlID($control_id) {
	$this->controlID = $control_id;
	return $this;
	}

	public function getControlID() {
	return $this->controlID;
	}

	public function setControlStyle($control_style) {
	$this->controlStyle = $control_style;
	return $this;
	}

	public function getControlStyle() {
	return $this->controlStyle;
	}

	public function setLabel($label) {
	$this->label = $label;
	return $this;
	}

	public function getLabel() {
	return $this->label;
	}

	public function setCaption($caption) {
	$this->caption = $caption;
	return $this;
	}

	public function getCaption() {
	return $this->caption;
	}

	public function setError($error) {
	$this->error = $error;
	return $this;
	}

	public function getError() {
	return $this->error;
	}

	public function setName($name) {
	$this->name = $name;
	return $this;
	}

	public function getName() {
	return $this->name;
	}

	public function setValue($value) {
	$this->value = $value;
	return $this;
	}

	public function getValue() {
	return $this->value;
	}

	public function setDisabled($disabled) {
	$this->disabled = $disabled;
	return $this;
	}

	public function getDisabled() {
	return $this->disabled;
	}

	abstract protected function renderInput();
	abstract protected function getCustomControlClass();

	protected function shouldRender() {
	return true;
	}

	final public function render() {
	if (!$this->shouldRender()) {
	return null;
	}

	$custom_class = $this->getCustomControlClass();

	if (strlen($this->getLabel())) {
	- $label =
	- '<label class="aphront-form-label">'.
	- phutil_escape_html($this->getLabel()).
	- '</label>';
	+ $label = phutil_tag(
	+ 'label',
	+ array('class' => 'aphront-form-label'),
	+ $this->getLabel());
	} else {
	$label = null;
	$custom_class .= ' aphront-form-control-nolabel';
	}

	- $input =
	- '<div class="aphront-form-input">'.
	- $this->renderInput().
	- '</div>';
	+ $input = phutil_tag(
	+ 'div',
	+ array('class' => 'aphront-form-input'),
	+ $this->renderInput());

	if (strlen($this->getError())) {
	$error = $this->getError();
	if ($error === true) {
	- $error =
	- '<div class="aphront-form-error aphront-form-required">'.
	- 'Required'.
	- '</div>';
	+ $error = phutil_tag(
	+ 'div',
	+ array('class' => 'aphront-form-error aphront-form-required'),
	+ 'Required');
	} else {
	- $error =
	- '<div class="aphront-form-error">'.
	- phutil_escape_html($error).
	- '</div>';
	+ $error = phutil_tag(
	+ 'div',
	+ array('class' => 'aphront-form-error'),
	+ $error);
	}
	} else {
	$error = null;
	}

	if (strlen($this->getCaption())) {
	$caption = phutil_tag(
	'div',
	array('class' => 'aphront-form-caption'),
	$this->getCaption());
	} else {
	$caption = null;
	}

	- return phutil_render_tag(
	+ return phutil_tag(
	'div',
	array(
	'class' => "aphront-form-control {$custom_class}",
	'id' => $this->controlID,
	'style' => $this->controlStyle,
	),
	- $label.
	- $error.
	- $input.
	- $caption.
	-
	- // TODO: Remove this once the redesign finishes up.
	- '<div style="clear: both;"></div>');
	+ array(
	+ $label,
	+ $error,
	+ $input,
	+ $caption,
	+
	+ // TODO: Remove this once the redesign finishes up.
	+ phutil_tag('div', array('style' => 'clear: both;'), ''),
	+ ));
	}
	}
	diff --git a/src/view/form/control/AphrontFormDividerControl.php b/src/view/form/control/AphrontFormDividerControl.php
	index 7b9090b9a5..b76d9e055b 100644
	--- a/src/view/form/control/AphrontFormDividerControl.php
	+++ b/src/view/form/control/AphrontFormDividerControl.php
	@@ -1,13 +1,13 @@
	<?php

	final class AphrontFormDividerControl extends AphrontFormControl {

	protected function getCustomControlClass() {
	return 'aphront-form-control-divider';
	}

	protected function renderInput() {
	- return '<hr />';
	+ return phutil_tag('hr');
	}

	}
	diff --git a/src/view/form/control/AphrontFormImageControl.php b/src/view/form/control/AphrontFormImageControl.php
	index ba2adb2c92..8e84d6fefc 100644
	--- a/src/view/form/control/AphrontFormImageControl.php
	+++ b/src/view/form/control/AphrontFormImageControl.php
	@@ -1,37 +1,36 @@
	<?php

	final class AphrontFormImageControl extends AphrontFormControl {

	protected function getCustomControlClass() {
	return 'aphront-form-control-image';
	}

	protected function renderInput() {
	$id = celerity_generate_unique_node_id();

	- return
	+ return hsprintf(
	+ '%s<div style="clear: both;">%s%s</div>',
	phutil_tag(
	'input',
	array(
	'type' => 'file',
	'name' => $this->getName(),
	- )).
	- '<div style="clear: both;">'.
	+ )),
	phutil_tag(
	'input',
	array(
	'type' => 'checkbox',
	'name' => 'default_image',
	'class' => 'default-image',
	'id' => $id,
	- )).
	+ )),
	phutil_tag(
	'label',
	array(
	'for' => $id,
	),
	- 'Use Default Image instead').
	- '</div>';
	+ 'Use Default Image instead'));
	}

	}
	diff --git a/src/view/form/control/AphrontFormRadioButtonControl.php b/src/view/form/control/AphrontFormRadioButtonControl.php
	index 6d6547c8b6..1fca18e9d5 100644
	--- a/src/view/form/control/AphrontFormRadioButtonControl.php
	+++ b/src/view/form/control/AphrontFormRadioButtonControl.php
	@@ -1,64 +1,63 @@
	<?php

	final class AphrontFormRadioButtonControl extends AphrontFormControl {

	private $buttons = array();

	public function addButton($value, $label, $caption, $class = null) {
	$this->buttons[] = array(
	'value' => $value,
	'label' => $label,
	'caption' => $caption,
	'class' => $class,
	);
	return $this;
	}

	protected function getCustomControlClass() {
	return 'aphront-form-control-radio';
	}

	protected function renderInput() {
	$rows = array();
	foreach ($this->buttons as $button) {
	$id = celerity_generate_unique_node_id();
	$radio = phutil_tag(
	'input',
	array(
	'id' => $id,
	'type' => 'radio',
	'name' => $this->getName(),
	'value' => $button['value'],
	'checked' => ($button['value'] == $this->getValue())
	? 'checked'
	: null,
	'disabled' => $this->getDisabled() ? 'disabled' : null,
	));
	$label = phutil_tag(
	'label',
	array(
	'for' => $id,
	'class' => $button['class'],
	),
	$button['label']);

	if (strlen($button['caption'])) {
	- $label .=
	- '<div class="aphront-form-radio-caption">'.
	- phutil_escape_html($button['caption']).
	- '</div>';
	+ $label = hsprintf(
	+ '%s<div class="aphront-form-radio-caption">%s</div>',
	+ $label,
	+ $button['caption']);
	}
	- $rows[] =
	- '<tr>'.
	- '<td>'.$radio.'</td>'.
	- '<th>'.$label.'</th>'.
	- '</tr>';
	+ $rows[] = hsprintf(
	+ '<tr><td>%s</td><th>%s</th></tr>',
	+ $radio,
	+ $label);
	}

	- return
	- '<table class="aphront-form-control-radio-layout">'.
	- implode("\n", $rows).
	- '</table>';
	+ return phutil_tag(
	+ 'table',
	+ array('class' => 'aphront-form-control-radio-layout'),
	+ $rows);
	}

	}
	diff --git a/src/view/form/control/AphrontFormRecaptchaControl.php b/src/view/form/control/AphrontFormRecaptchaControl.php
	index 25bc39792c..078eb1afc2 100644
	--- a/src/view/form/control/AphrontFormRecaptchaControl.php
	+++ b/src/view/form/control/AphrontFormRecaptchaControl.php
	@@ -1,62 +1,62 @@
	<?php

	/**
	*
	* @phutil-external-symbol function recaptcha_get_html
	* @phutil-external-symbol function recaptcha_check_answer
	*/
	final class AphrontFormRecaptchaControl extends AphrontFormControl {

	protected function getCustomControlClass() {
	return 'aphront-form-control-recaptcha';
	}

	protected function shouldRender() {
	return self::isRecaptchaEnabled();
	}

	public static function isRecaptchaEnabled() {
	return PhabricatorEnv::getEnvConfig('recaptcha.enabled');
	}

	private static function requireLib() {
	$root = phutil_get_library_root('phabricator');
	require_once dirname($root).'/externals/recaptcha/recaptchalib.php';
	}

	public static function hasCaptchaResponse(AphrontRequest $request) {
	return $request->getBool('recaptcha_response_field');
	}

	public static function processCaptcha(AphrontRequest $request) {
	if (!self::isRecaptchaEnabled()) {
	return true;
	}

	self::requireLib();

	$challenge = $request->getStr('recaptcha_challenge_field');
	$response = $request->getStr('recaptcha_response_field');
	$resp = recaptcha_check_answer(
	PhabricatorEnv::getEnvConfig('recaptcha.private-key'),
	$_SERVER['REMOTE_ADDR'],
	$challenge,
	$response);

	return (bool)@$resp->is_valid;
	}

	protected function renderInput() {
	self::requireLib();

	$uri = new PhutilURI(PhabricatorEnv::getEnvConfig('phabricator.base-uri'));
	$protocol = $uri->getProtocol();
	$use_ssl = ($protocol == 'https');

	- return recaptcha_get_html(
	+ return phutil_safe_html(recaptcha_get_html(
	PhabricatorEnv::getEnvConfig('recaptcha.public-key'),
	$error = null,
	- $use_ssl);
	+ $use_ssl));
	}

	}
	diff --git a/src/view/form/control/AphrontFormStaticControl.php b/src/view/form/control/AphrontFormStaticControl.php
	index d72fa37586..47060ea292 100644
	--- a/src/view/form/control/AphrontFormStaticControl.php
	+++ b/src/view/form/control/AphrontFormStaticControl.php
	@@ -1,13 +1,13 @@
	<?php

	final class AphrontFormStaticControl extends AphrontFormControl {

	protected function getCustomControlClass() {
	return 'aphront-form-control-static';
	}

	protected function renderInput() {
	- return phutil_escape_html($this->getValue());
	+ return $this->getValue();
	}

	}
	diff --git a/src/view/form/control/AphrontFormSubmitControl.php b/src/view/form/control/AphrontFormSubmitControl.php
	index c2ccb915e5..a6f505f905 100644
	--- a/src/view/form/control/AphrontFormSubmitControl.php
	+++ b/src/view/form/control/AphrontFormSubmitControl.php
	@@ -1,36 +1,36 @@
	<?php

	final class AphrontFormSubmitControl extends AphrontFormControl {

	protected $cancelButton;

	public function addCancelButton($href, $label = 'Cancel') {
	$this->cancelButton = phutil_tag(
	'a',
	array(
	'href' => $href,
	'class' => 'button grey',
	),
	$label);
	return $this;
	}

	protected function getCustomControlClass() {
	return 'aphront-form-control-submit';
	}

	protected function renderInput() {
	$submit_button = null;
	if ($this->getValue()) {
	$submit_button = phutil_tag(
	'button',
	array(
	'name' => '__submit__',
	'disabled' => $this->getDisabled() ? 'disabled' : null,
	),
	$this->getValue());
	}
	- return $submit_button.$this->cancelButton;
	+ return hsprintf('%s%s', $submit_button, $this->cancelButton);
	}

	}
	diff --git a/src/view/form/control/AphrontFormToggleButtonsControl.php b/src/view/form/control/AphrontFormToggleButtonsControl.php
	index 43f83ed1b9..1c2fb3a673 100644
	--- a/src/view/form/control/AphrontFormToggleButtonsControl.php
	+++ b/src/view/form/control/AphrontFormToggleButtonsControl.php
	@@ -1,52 +1,52 @@
	<?php

	final class AphrontFormToggleButtonsControl extends AphrontFormControl {

	private $baseURI;
	private $param;

	private $buttons;

	public function setBaseURI(PhutilURI $uri, $param) {
	$this->baseURI = $uri;
	$this->param = $param;
	return $this;
	}

	public function setButtons(array $buttons) {
	$this->buttons = $buttons;
	return $this;
	}

	protected function getCustomControlClass() {
	return 'aphront-form-control-togglebuttons';
	}

	protected function renderInput() {
	if (!$this->baseURI) {
	throw new Exception('Call setBaseURI() before render()!');
	}

	$selected = $this->getValue();

	$out = array();
	foreach ($this->buttons as $value => $label) {
	if ($value == $selected) {
	$more = ' toggle-selected toggle-fixed';
	} else {
	$more = null;
	}

	$out[] = phutil_tag(
	'a',
	array(
	'class' => 'toggle'.$more,
	'href' => $this->baseURI->alter($this->param, $value),
	),
	$label);
	}

	- return implode('', $out);
	+ return $out;
	}

	}
	diff --git a/src/view/form/control/PhabricatorRemarkupControl.php b/src/view/form/control/PhabricatorRemarkupControl.php
	index 42b5d143b8..e34f090fcb 100644
	--- a/src/view/form/control/PhabricatorRemarkupControl.php
	+++ b/src/view/form/control/PhabricatorRemarkupControl.php
	@@ -1,162 +1,164 @@
	<?php

	final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl {
	private $disableMacro = false;
	+
	public function setDisableMacros($disable) {
	$this->disableMacro = $disable;
	return $this;
	}
	+
	protected function renderInput() {
	$id = $this->getID();
	if (!$id) {
	$id = celerity_generate_unique_node_id();
	$this->setID($id);
	}

	// We need to have this if previews render images, since Ajax can not
	// currently ship JS or CSS.
	require_celerity_resource('lightbox-attachment-css');

	Javelin::initBehavior(
	'aphront-drag-and-drop-textarea',
	array(
	'target' => $id,
	'activatedClass' => 'aphront-textarea-drag-and-drop',
	'uri' => '/file/dropupload/',
	));

	Javelin::initBehavior('phabricator-remarkup-assist', array());
	Javelin::initBehavior('phabricator-tooltips', array());

	$actions = array(
	'b' => array(
	'tip' => pht('Bold'),
	),
	'i' => array(
	'tip' => pht('Italics'),
	),
	'tt' => array(
	'tip' => pht('Monospaced'),
	),
	array(
	'spacer' => true,
	),
	'ul' => array(
	'tip' => pht('Bulleted List'),
	),
	'ol' => array(
	'tip' => pht('Numbered List'),
	),
	'code' => array(
	'tip' => pht('Code Block'),
	),
	'table' => array(
	'tip' => pht('Table'),
	)
	);
	if (!$this->disableMacro and function_exists('imagettftext')) {
	$actions[] = array(
	'spacer' => true,
	);
	$actions['meme'] = array(
	'tip' => pht('Meme'),
	);
	}
	$actions['help'] = array(
	'tip' => pht('Help'),
	'align' => 'right',
	'href' => PhabricatorEnv::getDoclink(
	'article/Remarkup_Reference.html'),
	);

	$buttons = array();
	foreach ($actions as $action => $spec) {
	if (idx($spec, 'spacer')) {
	$buttons[] = phutil_tag(
	'span',
	array(
	'class' => 'remarkup-assist-separator',
	),
	'');
	continue;
	}
	$classes = array();
	$classes[] = 'remarkup-assist-button';
	if (idx($spec, 'align') == 'right') {
	$classes[] = 'remarkup-assist-right';
	}

	$href = idx($spec, 'href', '#');
	if ($href == '#') {
	$meta = array('action' => $action);
	$mustcapture = true;
	$target = null;
	} else {
	$meta = array();
	$mustcapture = null;
	$target = '_blank';
	}

	$tip = idx($spec, 'tip');
	if ($tip) {
	$meta['tip'] = $tip;
	}

	require_celerity_resource('sprite-icon-css');

	$buttons[] = javelin_tag(
	'a',
	array(
	'class' => implode(' ', $classes),
	'href' => $href,
	'sigil' => 'remarkup-assist has-tooltip',
	'meta' => $meta,
	'mustcapture' => $mustcapture,
	'target' => $target,
	'tabindex' => -1,
	),
	phutil_tag(
	'div',
	array(
	'class' => 'remarkup-assist sprite-icon remarkup-assist-'.$action,
	),
	''));
	}

	$buttons = phutil_tag(
	'div',
	array(
	'class' => 'remarkup-assist-bar',
	),
	$buttons);

	$monospaced_textareas = null;
	$monospaced_textareas_class = null;
	$user = $this->getUser();

	if ($user) {
	$monospaced_textareas = $user
	->loadPreferences()
	->getPreference(
	PhabricatorUserPreferences::PREFERENCE_MONOSPACED_TEXTAREAS);
	if ($monospaced_textareas == 'enabled') {
	$monospaced_textareas_class = 'PhabricatorMonospaced';
	}
	}

	$this->setCustomClass(
	'remarkup-assist-textarea '.$monospaced_textareas_class);

	return javelin_tag(
	'div',
	array(
	'sigil' => 'remarkup-assist-control',
	),
	$this->renderHTMLView(
	array(
	$buttons,
	parent::renderInput(),
	)));
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Oct 16, 3:47 AM (1 d, 12 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 272397
Default Alt Text: (114 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions