View Options

	diff --git a/src/applications/macro/controller/PhabricatorMacroAudioController.php b/src/applications/macro/controller/PhabricatorMacroAudioController.php
	index 92b98e5564..7e2b924637 100644
	--- a/src/applications/macro/controller/PhabricatorMacroAudioController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroAudioController.php
	@@ -1,153 +1,160 @@
	<?php

	final class PhabricatorMacroAudioController extends PhabricatorMacroController {

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

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

	$macro = id(new PhabricatorMacroQuery())
	->setViewer($viewer)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	))
	->withIDs(array($id))
	->executeOne();

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

	$errors = array();
	$view_uri = $this->getApplicationURI('/view/'.$macro->getID().'/');

	$e_file = null;
	$file = null;

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

	if ($request->getBool('behaviorForm')) {
	$xactions[] = id(new PhabricatorMacroTransaction())
	->setTransactionType(
	PhabricatorMacroTransaction::TYPE_AUDIO_BEHAVIOR)
	->setNewValue($request->getStr('audioBehavior'));
	} else {
	$file = null;
	if ($request->getFileExists('file')) {
	$file = PhabricatorFile::newFromPHPUpload(
	$_FILES['file'],
	array(
	'name' => $request->getStr('name'),
	'authorPHID' => $viewer->getPHID(),
	'isExplicitUpload' => true,
	));
	}

	if ($file) {
	if (!$file->isAudio()) {
	$errors[] = pht('You must upload audio.');
	$e_file = pht('Invalid');
	} else {
	$xactions[] = id(new PhabricatorMacroTransaction())
	->setTransactionType(PhabricatorMacroTransaction::TYPE_AUDIO)
	->setNewValue($file->getPHID());
	}
	} else {
	$errors[] = pht('You must upload an audio file.');
	$e_file = pht('Required');
	}
	}

	if (!$errors) {
	id(new PhabricatorMacroEditor())
	->setActor($viewer)
	->setContinueOnNoEffect(true)
	->setContentSourceFromRequest($request)
	->applyTransactions($macro, $xactions);

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

	$form = id(new AphrontFormView())
	->addHiddenInput('behaviorForm', 1)
	->setUser($viewer);

	$options = id(new AphrontFormRadioButtonControl())
	->setLabel(pht('Audio Behavior'))
	->setName('audioBehavior')
	->setValue(
	nonempty(
	$macro->getAudioBehavior(),
	PhabricatorFileImageMacro::AUDIO_BEHAVIOR_NONE));

	$options->addButton(
	PhabricatorFileImageMacro::AUDIO_BEHAVIOR_NONE,
	pht('Do Not Play'),
	pht('Do not play audio.'));

	$options->addButton(
	PhabricatorFileImageMacro::AUDIO_BEHAVIOR_ONCE,
	pht('Play Once'),
	pht('Play audio once, when the viewer looks at the macro.'));

	$options->addButton(
	PhabricatorFileImageMacro::AUDIO_BEHAVIOR_LOOP,
	pht('Play Continuously'),
	pht(
	'Play audio continuously, treating the macro as an audio source. '.
	'Best for ambient sounds.'));

	$form->appendChild($options);
	-
	- $form
	- ->appendChild(
	+ $form->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Save Audio Behavior'))
	->addCancelButton($view_uri));

	$crumbs = $this->buildApplicationCrumbs();

	- $title = pht('Edit Audio Behavior');
	+ $title = pht('Edit Audio: %s', $macro->getName());
	$crumb = pht('Edit Audio');

	$crumbs->addTextCrumb(pht('Macro "%s"', $macro->getName()), $view_uri);
	$crumbs->addTextCrumb($crumb, $request->getRequestURI());
	+ $crumbs->setBorder(true);

	$upload_form = id(new AphrontFormView())
	->setEncType('multipart/form-data')
	->setUser($viewer)
	->appendChild(
	id(new AphrontFormFileControl())
	->setLabel(pht('Audio File'))
	->setName('file'))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Upload File')));

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

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

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

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 15:25 (3 w, 23 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1125970
Default Alt Text: (5 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions