No OneTemporary
Actions

Size

46 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/phriction/controller/PhrictionDeleteController.php b/src/applications/phriction/controller/PhrictionDeleteController.php
	index 236ad81dd7..58dc06a65b 100644
	--- a/src/applications/phriction/controller/PhrictionDeleteController.php
	+++ b/src/applications/phriction/controller/PhrictionDeleteController.php
	@@ -1,70 +1,64 @@
	<?php

	final class PhrictionDeleteController extends PhrictionController {

	- private $id;
	-
	- public function willProcessRequest(array $data) {
	- $this->id = $data['id'];
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');

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

	$document_uri = PhrictionDocument::getSlugURI($document->getSlug());

	$e_text = null;
	if ($request->isFormPost()) {
	$xactions = array();
	$xactions[] = id(new PhrictionTransaction())
	->setTransactionType(PhrictionTransaction::TYPE_DELETE)
	->setNewValue(true);

	$editor = id(new PhrictionTransactionEditor())
	- ->setActor($user)
	+ ->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true);
	try {
	$editor->applyTransactions($document, $xactions);
	return id(new AphrontRedirectResponse())->setURI($document_uri);
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$e_text = phutil_implode_html("\n", $ex->getErrorMessages());
	}
	}

	if ($e_text) {
	$dialog = id(new AphrontDialogView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setTitle(pht('Can Not Delete Document!'))
	->appendChild($e_text)
	->addCancelButton($document_uri);
	} else {
	$dialog = id(new AphrontDialogView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setTitle(pht('Delete Document?'))
	->appendChild(
	pht('Really delete this document? You can recover it later by '.
	'reverting to a previous version.'))
	->addSubmitButton(pht('Delete'))
	->addCancelButton($document_uri);
	}

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

	}
	diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
	index 6ce0065021..11d0b40dfd 100644
	--- a/src/applications/phriction/controller/PhrictionDiffController.php
	+++ b/src/applications/phriction/controller/PhrictionDiffController.php
	@@ -1,301 +1,295 @@
	<?php

	final class PhrictionDiffController extends PhrictionController {

	- private $id;
	-
	public function shouldAllowPublic() {
	return true;
	}

	- public function willProcessRequest(array $data) {
	- $this->id = $data['id'];
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');

	$document = id(new PhrictionDocumentQuery())
	- ->setViewer($user)
	- ->withIDs(array($this->id))
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	->needContent(true)
	->executeOne();
	if (!$document) {
	return new Aphront404Response();
	}

	$current = $document->getContent();

	$l = $request->getInt('l');
	$r = $request->getInt('r');

	$ref = $request->getStr('ref');
	if ($ref) {
	list($l, $r) = explode(',', $ref);
	}

	$content = id(new PhrictionContent())->loadAllWhere(
	'documentID = %d AND version IN (%Ld)',
	$document->getID(),
	array($l, $r));
	$content = mpull($content, null, 'getVersion');

	$content_l = idx($content, $l, null);
	$content_r = idx($content, $r, null);

	if (!$content_l \|\| !$content_r) {
	return new Aphront404Response();
	}

	$text_l = $content_l->getContent();
	$text_r = $content_r->getContent();

	$text_l = phutil_utf8_hard_wrap($text_l, 80);
	$text_l = implode("\n", $text_l);
	$text_r = phutil_utf8_hard_wrap($text_r, 80);
	$text_r = implode("\n", $text_r);

	$engine = new PhabricatorDifferenceEngine();
	$changeset = $engine->generateChangesetFromFileContent($text_l, $text_r);

	$changeset->setFilename($content_r->getTitle());

	$changeset->setOldProperties(
	array(
	'Title' => $content_l->getTitle(),
	));
	$changeset->setNewProperties(
	array(
	'Title' => $content_r->getTitle(),
	));

	$whitespace_mode = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;

	$parser = id(new DifferentialChangesetParser())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setChangeset($changeset)
	->setRenderingReference("{$l},{$r}");

	$parser->readParametersFromRequest($request);
	$parser->setWhitespaceMode($whitespace_mode);

	$engine = new PhabricatorMarkupEngine();
	- $engine->setViewer($user);
	+ $engine->setViewer($viewer);
	$engine->process();
	$parser->setMarkupEngine($engine);

	$spec = $request->getStr('range');
	list($range_s, $range_e, $mask) =
	DifferentialChangesetParser::parseRangeSpecification($spec);

	$parser->setRange($range_s, $range_e);
	$parser->setMask($mask);

	if ($request->isAjax()) {
	return id(new PhabricatorChangesetResponse())
	->setRenderedChangeset($parser->renderChangeset());
	}

	$changes = id(new DifferentialChangesetListView())
	->setUser($this->getViewer())
	->setChangesets(array($changeset))
	->setVisibleChangesets(array($changeset))
	->setRenderingReferences(array("{$l},{$r}"))
	->setRenderURI('/phriction/diff/'.$document->getID().'/')
	->setTitle(pht('Changes'))
	->setParser($parser);

	require_celerity_resource('phriction-document-css');

	$slug = $document->getSlug();

	$revert_l = $this->renderRevertButton($content_l, $current);
	$revert_r = $this->renderRevertButton($content_r, $current);

	$crumbs = $this->buildApplicationCrumbs();
	$crumb_views = $this->renderBreadcrumbs($slug);
	foreach ($crumb_views as $view) {
	$crumbs->addCrumb($view);
	}

	$crumbs->addTextCrumb(
	pht('History'),
	PhrictionDocument::getSlugURI($slug, 'history'));

	$title = pht('Version %s vs %s', $l, $r);

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setTall(true);

	$crumbs->addTextCrumb($title, $request->getRequestURI());


	$comparison_table = $this->renderComparisonTable(
	array(
	$content_r,
	$content_l,
	));

	$navigation_table = null;
	if ($l + 1 == $r) {
	$nav_l = ($l > 1);
	$nav_r = ($r != $current->getVersion());

	$uri = $request->getRequestURI();

	if ($nav_l) {
	$link_l = phutil_tag(
	'a',
	array(
	'href' => $uri->alter('l', $l - 1)->alter('r', $r - 1),
	'class' => 'button simple',
	),
	pht("\xC2\xAB Previous Change"));
	} else {
	$link_l = phutil_tag(
	'a',
	array(
	'href' => '#',
	'class' => 'button grey disabled',
	),
	pht('Original Change'));
	}

	$link_r = null;
	if ($nav_r) {
	$link_r = phutil_tag(
	'a',
	array(
	'href' => $uri->alter('l', $l + 1)->alter('r', $r + 1),
	'class' => 'button simple',
	),
	pht("Next Change \xC2\xBB"));
	} else {
	$link_r = phutil_tag(
	'a',
	array(
	'href' => '#',
	'class' => 'button grey disabled',
	),
	pht('Most Recent Change'));
	}

	$navigation_table = phutil_tag(
	'table',
	array('class' => 'phriction-history-nav-table'),
	phutil_tag('tr', array(), array(
	phutil_tag('td', array('class' => 'nav-prev'), $link_l),
	phutil_tag('td', array('class' => 'nav-next'), $link_r),
	)));
	}


	$output = hsprintf(
	'<div class="phriction-document-history-diff">'.
	'%s%s'.
	'<table class="phriction-revert-table">'.
	'<tr><td>%s</td><td>%s</td>'.
	'</table>'.
	'</div>',
	$comparison_table->render(),
	$navigation_table,
	$revert_l,
	$revert_r);


	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($output);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$changes,
	),
	array(
	'title' => pht('Document History'),
	));

	}

	private function renderRevertButton(
	PhrictionContent $content,
	PhrictionContent $current) {

	$document_id = $content->getDocumentID();
	$version = $content->getVersion();

	$hidden_statuses = array(
	PhrictionChangeType::CHANGE_DELETE => true, // Silly
	PhrictionChangeType::CHANGE_MOVE_AWAY => true, // Plain silly
	PhrictionChangeType::CHANGE_STUB => true, // Utterly silly
	);
	if (isset($hidden_statuses[$content->getChangeType()])) {
	// Don't show an edit/revert button for changes which deleted, moved or
	// stubbed the content since it's silly.
	return null;
	}

	if ($content->getID() == $current->getID()) {
	return phutil_tag(
	'a',
	array(
	'href' => '/phriction/edit/'.$document_id.'/',
	'class' => 'button simple',
	),
	pht('Edit Current Version'));
	}


	return phutil_tag(
	'a',
	array(
	'href' => '/phriction/edit/'.$document_id.'/?revert='.$version,
	'class' => 'button simple',
	),
	pht('Revert to Version %s...', $version));
	}

	private function renderComparisonTable(array $content) {
	assert_instances_of($content, 'PhrictionContent');

	- $user = $this->getRequest()->getUser();
	+ $viewer = $this->getViewer();

	$phids = mpull($content, 'getAuthorPHID');
	$handles = $this->loadViewerHandles($phids);

	$list = new PHUIObjectItemListView();

	$first = true;
	foreach ($content as $c) {
	$author = $handles[$c->getAuthorPHID()]->renderLink();
	$item = id(new PHUIObjectItemView())
	->setHeader(pht('%s by %s, %s',
	PhrictionChangeType::getChangeTypeLabel($c->getChangeType()),
	$author,
	pht('Version %s', $c->getVersion())))
	->addAttribute(pht('%s %s',
	- phabricator_date($c->getDateCreated(), $user),
	- phabricator_time($c->getDateCreated(), $user)));
	+ phabricator_date($c->getDateCreated(), $viewer),
	+ phabricator_time($c->getDateCreated(), $viewer)));

	if ($c->getDescription()) {
	$item->addAttribute($c->getDescription());
	}

	if ($first == true) {
	$item->setStatusIcon('fa-file green');
	$first = false;
	} else {
	$item->setStatusIcon('fa-file red');
	}

	$list->addItem($item);
	}

	return $list;
	}

	}
	diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
	index 699151bb91..452e45289b 100644
	--- a/src/applications/phriction/controller/PhrictionDocumentController.php
	+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
	@@ -1,461 +1,457 @@
	<?php

	final class PhrictionDocumentController
	extends PhrictionController {

	private $slug;

	public function shouldAllowPublic() {
	return true;
	}

	- public function willProcessRequest(array $data) {
	- $this->slug = $data['slug'];
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $this->slug = $request->getURIData('slug');

	$slug = PhabricatorSlug::normalize($this->slug);
	if ($slug != $this->slug) {
	$uri = PhrictionDocument::getSlugURI($slug);
	// Canonicalize pages to their one true URI.
	return id(new AphrontRedirectResponse())->setURI($uri);
	}

	require_celerity_resource('phriction-document-css');

	$document = id(new PhrictionDocumentQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withSlugs(array($slug))
	->executeOne();

	$version_note = null;
	$core_content = '';
	$move_notice = '';
	$properties = null;
	$content = null;

	if (!$document) {

	- $document = PhrictionDocument::initializeNewDocument($user, $slug);
	+ $document = PhrictionDocument::initializeNewDocument($viewer, $slug);

	$create_uri = '/phriction/edit/?slug='.$slug;

	$notice = new PHUIInfoView();
	$notice->setSeverity(PHUIInfoView::SEVERITY_WARNING);
	$notice->setTitle(pht('No content here!'));
	$notice->appendChild(
	pht(
	'No document found at %s. You can <strong>'.
	'<a href="%s">create a new document here</a></strong>.',
	phutil_tag('tt', array(), $slug),
	$create_uri));
	$core_content = $notice;

	$page_title = pht('Page Not Found');
	} else {
	$version = $request->getInt('v');
	if ($version) {
	$content = id(new PhrictionContent())->loadOneWhere(
	'documentID = %d AND version = %d',
	$document->getID(),
	$version);
	if (!$content) {
	return new Aphront404Response();
	}

	if ($content->getID() != $document->getContentID()) {
	- $vdate = phabricator_datetime($content->getDateCreated(), $user);
	+ $vdate = phabricator_datetime($content->getDateCreated(), $viewer);
	$version_note = new PHUIInfoView();
	$version_note->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$version_note->appendChild(
	pht('You are viewing an older version of this document, as it '.
	'appeared on %s.', $vdate));
	}
	} else {
	$content = id(new PhrictionContent())->load($document->getContentID());
	}
	$page_title = $content->getTitle();

	$properties = $this
	->buildPropertyListView($document, $content, $slug);

	$doc_status = $document->getStatus();
	$current_status = $content->getChangeType();
	if ($current_status == PhrictionChangeType::CHANGE_EDIT \|\|
	$current_status == PhrictionChangeType::CHANGE_MOVE_HERE) {

	- $core_content = $content->renderContent($user);
	+ $core_content = $content->renderContent($viewer);
	} else if ($current_status == PhrictionChangeType::CHANGE_DELETE) {
	$notice = new PHUIInfoView();
	$notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$notice->setTitle(pht('Document Deleted'));
	$notice->appendChild(
	pht('This document has been deleted. You can edit it to put new '.
	'content here, or use history to revert to an earlier version.'));
	$core_content = $notice->render();
	} else if ($current_status == PhrictionChangeType::CHANGE_STUB) {
	$notice = new PHUIInfoView();
	$notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$notice->setTitle(pht('Empty Document'));
	$notice->appendChild(
	pht('This document is empty. You can edit it to put some proper '.
	'content here.'));
	$core_content = $notice->render();
	} else if ($current_status == PhrictionChangeType::CHANGE_MOVE_AWAY) {
	$new_doc_id = $content->getChangeRef();

	$slug_uri = null;

	// If the new document exists and the viewer can see it, provide a link
	// to it. Otherwise, render a generic message.
	$new_docs = id(new PhrictionDocumentQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withIDs(array($new_doc_id))
	->execute();
	if ($new_docs) {
	$new_doc = head($new_docs);
	$slug_uri = PhrictionDocument::getSlugURI($new_doc->getSlug());
	}

	$notice = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE);

	if ($slug_uri) {
	$notice->appendChild(
	phutil_tag(
	'p',
	array(),
	pht(
	'This document has been moved to %s. You can edit it to put '.
	'new content here, or use history to revert to an earlier '.
	'version.',
	phutil_tag('a', array('href' => $slug_uri), $slug_uri))));
	} else {
	$notice->appendChild(
	phutil_tag(
	'p',
	array(),
	pht(
	'This document has been moved. You can edit it to put new '.
	'contne here, or use history to revert to an earlier '.
	'version.')));
	}

	$core_content = $notice->render();
	} else {
	throw new Exception(pht("Unknown document status '%s'!", $doc_status));
	}

	$move_notice = null;
	if ($current_status == PhrictionChangeType::CHANGE_MOVE_HERE) {
	$from_doc_id = $content->getChangeRef();

	$slug_uri = null;

	// If the old document exists and is visible, provide a link to it.
	$from_docs = id(new PhrictionDocumentQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withIDs(array($from_doc_id))
	->execute();
	if ($from_docs) {
	$from_doc = head($from_docs);
	$slug_uri = PhrictionDocument::getSlugURI($from_doc->getSlug());
	}

	$move_notice = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE);

	if ($slug_uri) {
	$move_notice->appendChild(
	pht(
	'This document was moved from %s.',
	phutil_tag('a', array('href' => $slug_uri), $slug_uri)));
	} else {
	// Render this for consistency, even though it's a bit silly.
	$move_notice->appendChild(
	pht('This document was moved from elsewhere.'));
	}
	}
	}

	$children = $this->renderDocumentChildren($slug);

	- $actions = $this->buildActionView($user, $document);
	+ $actions = $this->buildActionView($viewer, $document);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->setBorder(true);
	$crumb_views = $this->renderBreadcrumbs($slug);
	foreach ($crumb_views as $view) {
	$crumbs->addCrumb($view);
	}

	$action_button = id(new PHUIButtonView())
	->setTag('a')
	->setText(pht('Actions'))
	->setHref('#')
	->setIconFont('fa-bars')
	->addClass('phui-mobile-menu')
	->setDropdownMenu($actions);

	$header = id(new PHUIHeaderView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setPolicyObject($document)
	->setHeader($page_title)
	->addActionLink($action_button);

	if ($content) {
	$header->setEpoch($content->getDateCreated());
	}

	$prop_list = null;
	if ($properties) {
	$prop_list = new PHUIPropertyGroupView();
	$prop_list->addPropertyList($properties);
	}

	$page_content = id(new PHUIDocumentView())
	->setHeader($header)
	->appendChild(
	array(
	$prop_list,
	$version_note,
	$move_notice,
	$core_content,
	));

	return $this->buildApplicationPage(
	array(
	$crumbs->render(),
	$page_content,
	$children,
	),
	array(
	'pageObjects' => array($document->getPHID()),
	'title' => $page_title,
	));

	}

	private function buildPropertyListView(
	PhrictionDocument $document,
	PhrictionContent $content,
	$slug) {

	$viewer = $this->getRequest()->getUser();
	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($document);

	$view->addProperty(
	pht('Last Author'),
	$viewer->renderHandle($content->getAuthorPHID()));

	return $view;
	}

	private function buildActionView(
	- PhabricatorUser $user,
	+ PhabricatorUser $viewer,
	PhrictionDocument $document) {
	$can_edit = PhabricatorPolicyFilter::hasCapability(
	- $user,
	+ $viewer,
	$document,
	PhabricatorPolicyCapability::CAN_EDIT);

	$slug = PhabricatorSlug::normalize($this->slug);

	$action_view = id(new PhabricatorActionListView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($document);

	if (!$document->getID()) {
	return $action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Create This Document'))
	->setIcon('fa-plus-square')
	->setHref('/phriction/edit/?slug='.$slug));
	}

	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Document'))
	->setIcon('fa-pencil')
	->setHref('/phriction/edit/'.$document->getID().'/'));

	if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) {
	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Move Document'))
	->setIcon('fa-arrows')
	->setHref('/phriction/move/'.$document->getID().'/')
	->setWorkflow(true));

	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Delete Document'))
	->setIcon('fa-times')
	->setHref('/phriction/delete/'.$document->getID().'/')
	->setWorkflow(true));
	}

	return
	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setIcon('fa-list')
	->setHref(PhrictionDocument::getSlugURI($slug, 'history')));
	}

	private function renderDocumentChildren($slug) {

	$d_child = PhabricatorSlug::getDepth($slug) + 1;
	$d_grandchild = PhabricatorSlug::getDepth($slug) + 2;
	$limit = 250;

	$query = id(new PhrictionDocumentQuery())
	->setViewer($this->getRequest()->getUser())
	->withDepths(array($d_child, $d_grandchild))
	->withSlugPrefix($slug == '/' ? '' : $slug)
	->withStatuses(array(
	PhrictionDocumentStatus::STATUS_EXISTS,
	PhrictionDocumentStatus::STATUS_STUB,
	))
	->setLimit($limit)
	->setOrder(PhrictionDocumentQuery::ORDER_HIERARCHY)
	->needContent(true);

	$children = $query->execute();
	if (!$children) {
	return;
	}

	// We're going to render in one of three modes to try to accommodate
	// different information scales:
	//
	// - If we found fewer than $limit rows, we know we have all the children
	// and grandchildren and there aren't all that many. We can just render
	// everything.
	// - If we found $limit rows but the results included some grandchildren,
	// we just throw them out and render only the children, as we know we
	// have them all.
	// - If we found $limit rows and the results have no grandchildren, we
	// have a ton of children. Render them and then let the user know that
	// this is not an exhaustive list.

	if (count($children) == $limit) {
	$more_children = true;
	foreach ($children as $child) {
	if ($child->getDepth() == $d_grandchild) {
	$more_children = false;
	}
	}
	$show_grandchildren = false;
	} else {
	$show_grandchildren = true;
	$more_children = false;
	}

	$children_dicts = array();
	$grandchildren_dicts = array();
	foreach ($children as $key => $child) {
	$child_dict = array(
	'slug' => $child->getSlug(),
	'depth' => $child->getDepth(),
	'title' => $child->getContent()->getTitle(),
	);
	if ($child->getDepth() == $d_child) {
	$children_dicts[] = $child_dict;
	continue;
	} else {
	unset($children[$key]);
	if ($show_grandchildren) {
	$ancestors = PhabricatorSlug::getAncestry($child->getSlug());
	$grandchildren_dicts[end($ancestors)][] = $child_dict;
	}
	}
	}

	// Fill in any missing children.
	$known_slugs = mpull($children, null, 'getSlug');
	foreach ($grandchildren_dicts as $slug => $ignored) {
	if (empty($known_slugs[$slug])) {
	$children_dicts[] = array(
	'slug' => $slug,
	'depth' => $d_child,
	'title' => PhabricatorSlug::getDefaultTitle($slug),
	'empty' => true,
	);
	}
	}

	$children_dicts = isort($children_dicts, 'title');

	$list = array();
	foreach ($children_dicts as $child) {
	$list[] = hsprintf('<li class="remarkup-list-item">');
	$list[] = $this->renderChildDocumentLink($child);
	$grand = idx($grandchildren_dicts, $child['slug'], array());
	if ($grand) {
	$list[] = hsprintf('<ul class="remarkup-list">');
	foreach ($grand as $grandchild) {
	$list[] = hsprintf('<li class="remarkup-list-item">');
	$list[] = $this->renderChildDocumentLink($grandchild);
	$list[] = hsprintf('</li>');
	}
	$list[] = hsprintf('</ul>');
	}
	$list[] = hsprintf('</li>');
	}
	if ($more_children) {
	$list[] = phutil_tag(
	'li',
	array(
	'class' => 'remarkup-list-item',
	),
	pht('More...'));
	}

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Document Hierarchy'));

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild(phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup mlt mlb',
	),
	phutil_tag(
	'ul',
	array(
	'class' => 'remarkup-list',
	),
	$list)));

	return phutil_tag_div('phui-document-box', $box);
	}

	private function renderChildDocumentLink(array $info) {
	$title = nonempty($info['title'], pht('(Untitled Document)'));
	$item = phutil_tag(
	'a',
	array(
	'href' => PhrictionDocument::getSlugURI($info['slug']),
	),
	$title);

	if (isset($info['empty'])) {
	$item = phutil_tag('em', array(), $item);
	}

	return $item;
	}

	protected function getDocumentSlug() {
	return $this->slug;
	}

	}
	diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
	index dece03e350..546524123e 100644
	--- a/src/applications/phriction/controller/PhrictionEditController.php
	+++ b/src/applications/phriction/controller/PhrictionEditController.php
	@@ -1,292 +1,285 @@
	<?php

	final class PhrictionEditController
	extends PhrictionController {

	- private $id;
	-
	- public function willProcessRequest(array $data) {
	- $this->id = idx($data, 'id');
	- }
	-
	- public function processRequest() {
	-
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');

	$current_version = null;
	- if ($this->id) {
	+ if ($id) {
	$document = id(new PhrictionDocumentQuery())
	- ->setViewer($user)
	- ->withIDs(array($this->id))
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	->needContent(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$document) {
	return new Aphront404Response();
	}

	$current_version = $document->getContent()->getVersion();

	$revert = $request->getInt('revert');
	if ($revert) {
	$content = id(new PhrictionContent())->loadOneWhere(
	'documentID = %d AND version = %d',
	$document->getID(),
	$revert);
	if (!$content) {
	return new Aphront404Response();
	}
	} else {
	$content = $document->getContent();
	}

	} else {
	$slug = $request->getStr('slug');
	$slug = PhabricatorSlug::normalize($slug);
	if (!$slug) {
	return new Aphront404Response();
	}

	$document = id(new PhrictionDocumentQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withSlugs(array($slug))
	->needContent(true)
	->executeOne();

	if ($document) {
	$content = $document->getContent();
	$current_version = $content->getVersion();
	} else {
	- $document = PhrictionDocument::initializeNewDocument($user, $slug);
	+ $document = PhrictionDocument::initializeNewDocument($viewer, $slug);
	$content = $document->getContent();
	}
	}

	if ($request->getBool('nodraft')) {
	$draft = null;
	$draft_key = null;
	} else {
	if ($document->getPHID()) {
	$draft_key = $document->getPHID().':'.$content->getVersion();
	} else {
	$draft_key = 'phriction:'.$content->getSlug();
	}
	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	- $user->getPHID(),
	+ $viewer->getPHID(),
	$draft_key);
	}

	if ($draft &&
	strlen($draft->getDraft()) &&
	($draft->getDraft() != $content->getContent())) {
	$content_text = $draft->getDraft();

	$discard = phutil_tag(
	'a',
	array(
	'href' => $request->getRequestURI()->alter('nodraft', true),
	),
	pht('discard this draft'));

	$draft_note = new PHUIInfoView();
	$draft_note->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$draft_note->setTitle(pht('Recovered Draft'));
	$draft_note->appendChild(
	hsprintf(
	'<p>%s</p>',
	pht(
	'Showing a saved draft of your edits, you can %s.',
	$discard)));
	} else {
	$content_text = $content->getContent();
	$draft_note = null;
	}

	require_celerity_resource('phriction-document-css');

	$e_title = true;
	$e_content = true;
	$validation_exception = null;
	$notes = null;
	$title = $content->getTitle();
	$overwrite = false;

	if ($request->isFormPost()) {

	$title = $request->getStr('title');
	$content_text = $request->getStr('content');
	$notes = $request->getStr('description');
	$current_version = $request->getInt('contentVersion');
	$v_view = $request->getStr('viewPolicy');
	$v_edit = $request->getStr('editPolicy');

	$xactions = array();
	$xactions[] = id(new PhrictionTransaction())
	->setTransactionType(PhrictionTransaction::TYPE_TITLE)
	->setNewValue($title);
	$xactions[] = id(new PhrictionTransaction())
	->setTransactionType(PhrictionTransaction::TYPE_CONTENT)
	->setNewValue($content_text);
	$xactions[] = id(new PhrictionTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
	->setNewValue($v_view);
	$xactions[] = id(new PhrictionTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDIT_POLICY)
	->setNewValue($v_edit);

	$editor = id(new PhrictionTransactionEditor())
	- ->setActor($user)
	+ ->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true)
	->setDescription($notes)
	->setProcessContentVersionError(!$request->getBool('overwrite'))
	->setContentVersion($current_version);

	try {
	$editor->applyTransactions($document, $xactions);

	if ($draft) {
	$draft->delete();
	}

	$uri = PhrictionDocument::getSlugURI($document->getSlug());
	return id(new AphrontRedirectResponse())->setURI($uri);
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;
	$e_title = nonempty(
	$ex->getShortMessage(PhrictionTransaction::TYPE_TITLE),
	true);
	$e_content = nonempty(
	$ex->getShortMessage(PhrictionTransaction::TYPE_CONTENT),
	true);

	// if we're not supposed to process the content version error, then
	// overwrite that content...!
	if (!$editor->getProcessContentVersionError()) {
	$overwrite = true;
	}

	$document->setViewPolicy($v_view);
	$document->setEditPolicy($v_edit);
	}
	}

	if ($document->getID()) {
	$panel_header = pht('Edit Phriction Document');
	$page_title = pht('Edit Document');
	if ($overwrite) {
	$submit_button = pht('Overwrite Changes');
	} else {
	$submit_button = pht('Save Changes');
	}
	} else {
	$panel_header = pht('Create New Phriction Document');
	$submit_button = pht('Create Document');
	$page_title = pht('Create Document');
	}

	$uri = $document->getSlug();
	$uri = PhrictionDocument::getSlugURI($uri);
	$uri = PhabricatorEnv::getProductionURI($uri);

	$cancel_uri = PhrictionDocument::getSlugURI($document->getSlug());

	$policies = id(new PhabricatorPolicyQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->setObject($document)
	->execute();
	$view_capability = PhabricatorPolicyCapability::CAN_VIEW;
	$edit_capability = PhabricatorPolicyCapability::CAN_EDIT;

	$form = id(new AphrontFormView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->addHiddenInput('slug', $document->getSlug())
	->addHiddenInput('nodraft', $request->getBool('nodraft'))
	->addHiddenInput('contentVersion', $current_version)
	->addHiddenInput('overwrite', $overwrite)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Title'))
	->setValue($title)
	->setError($e_title)
	->setName('title'))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel(pht('URI'))
	->setValue($uri))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setLabel(pht('Content'))
	->setValue($content_text)
	->setError($e_content)
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
	->setName('content')
	->setID('document-textarea')
	- ->setUser($user))
	+ ->setUser($viewer))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setName('viewPolicy')
	->setPolicyObject($document)
	->setCapability($view_capability)
	->setPolicies($policies)
	->setCaption(
	$document->describeAutomaticCapability($view_capability)))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setName('editPolicy')
	->setPolicyObject($document)
	->setCapability($edit_capability)
	->setPolicies($policies)
	->setCaption(
	$document->describeAutomaticCapability($edit_capability)))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Edit Notes'))
	->setValue($notes)
	->setError(null)
	->setName('description'))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($cancel_uri)
	->setValue($submit_button));

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($panel_header)
	->setValidationException($validation_exception)
	->setForm($form);

	$preview = id(new PHUIRemarkupPreviewPanel())
	->setHeader(pht('Document Preview'))
	->setPreviewURI('/phriction/preview/')
	->setControlID('document-textarea')
	->addClass('phui-document-view');

	$crumbs = $this->buildApplicationCrumbs();
	if ($document->getID()) {
	$crumbs->addTextCrumb(
	$content->getTitle(),
	PhrictionDocument::getSlugURI($document->getSlug()));
	$crumbs->addTextCrumb(pht('Edit'));
	} else {
	$crumbs->addTextCrumb(pht('Create'));
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$draft_note,
	$form_box,
	$preview,
	),
	array(
	'title' => $page_title,
	));
	}

	}
	diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php
	index d874d55608..5ce6c7225c 100644
	--- a/src/applications/phriction/controller/PhrictionHistoryController.php
	+++ b/src/applications/phriction/controller/PhrictionHistoryController.php
	@@ -1,177 +1,172 @@
	<?php

	final class PhrictionHistoryController
	extends PhrictionController {

	private $slug;

	public function shouldAllowPublic() {
	return true;
	}

	- public function willProcessRequest(array $data) {
	- $this->slug = $data['slug'];
	- }
	-
	- public function processRequest() {
	-
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $this->slug = $request->getURIData('slug');

	$document = id(new PhrictionDocumentQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withSlugs(array(PhabricatorSlug::normalize($this->slug)))
	->needContent(true)
	->executeOne();
	if (!$document) {
	return new Aphront404Response();
	}

	$current = $document->getContent();

	$pager = new PHUIPagerView();
	$pager->setOffset($request->getInt('page'));
	$pager->setURI($request->getRequestURI(), 'page');

	$history = id(new PhrictionContent())->loadAllWhere(
	'documentID = %d ORDER BY version DESC LIMIT %d, %d',
	$document->getID(),
	$pager->getOffset(),
	$pager->getPageSize() + 1);
	$history = $pager->sliceResults($history);

	$author_phids = mpull($history, 'getAuthorPHID');
	$handles = $this->loadViewerHandles($author_phids);

	$list = new PHUIObjectItemListView();
	$list->setFlush(true);

	foreach ($history as $content) {

	$author = $handles[$content->getAuthorPHID()]->renderLink();
	$slug_uri = PhrictionDocument::getSlugURI($document->getSlug());
	$version = $content->getVersion();

	$diff_uri = new PhutilURI('/phriction/diff/'.$document->getID().'/');

	$vs_previous = null;
	if ($content->getVersion() != 1) {
	$vs_previous = $diff_uri
	->alter('l', $content->getVersion() - 1)
	->alter('r', $content->getVersion());
	}

	$vs_head = null;
	if ($content->getID() != $document->getContentID()) {
	$vs_head = $diff_uri
	->alter('l', $content->getVersion())
	->alter('r', $current->getVersion());
	}

	$change_type = PhrictionChangeType::getChangeTypeLabel(
	$content->getChangeType());
	switch ($content->getChangeType()) {
	case PhrictionChangeType::CHANGE_DELETE:
	$color = 'red';
	break;
	case PhrictionChangeType::CHANGE_EDIT:
	$color = 'lightbluetext';
	break;
	case PhrictionChangeType::CHANGE_MOVE_HERE:
	$color = 'yellow';
	break;
	case PhrictionChangeType::CHANGE_MOVE_AWAY:
	$color = 'orange';
	break;
	case PhrictionChangeType::CHANGE_STUB:
	$color = 'green';
	break;
	default:
	throw new Exception(pht('Unknown change type!'));
	break;
	}

	$item = id(new PHUIObjectItemView())
	->setHeader(pht('%s by %s', $change_type, $author))
	->setStatusIcon('fa-file '.$color)
	->addAttribute(
	phutil_tag(
	'a',
	array(
	'href' => $slug_uri.'?v='.$version,
	),
	pht('Version %s', $version)))
	->addAttribute(pht('%s %s',
	- phabricator_date($content->getDateCreated(), $user),
	- phabricator_time($content->getDateCreated(), $user)));
	+ phabricator_date($content->getDateCreated(), $viewer),
	+ phabricator_time($content->getDateCreated(), $viewer)));

	if ($content->getDescription()) {
	$item->addAttribute($content->getDescription());
	}

	if ($vs_previous) {
	$item->addIcon(
	'fa-reply',
	pht('Show Change'),
	array(
	'href' => $vs_previous,
	));
	} else {
	$item->addIcon(
	'fa-reply grey',
	phutil_tag('em', array(), pht('No previous change')));
	}

	if ($vs_head) {
	$item->addIcon(
	'fa-reply-all',
	pht('Show Later Changes'),
	array(
	'href' => $vs_head,
	));
	} else {
	$item->addIcon(
	'fa-reply-all grey',
	phutil_tag('em', array(), pht('No later changes')));
	}

	$list->addItem($item);
	}

	$crumbs = $this->buildApplicationCrumbs();
	$crumb_views = $this->renderBreadcrumbs($document->getSlug());
	foreach ($crumb_views as $view) {
	$crumbs->addCrumb($view);
	}
	$crumbs->addTextCrumb(
	pht('History'),
	PhrictionDocument::getSlugURI($document->getSlug(), 'history'));

	$header = new PHUIHeaderView();
	$header->setHeader(phutil_tag(
	'a',
	array('href' => PhrictionDocument::getSlugURI($document->getSlug())),
	head($history)->getTitle()));
	$header->setSubheader(pht('Document History'));

	$obj_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->setObjectList($list);

	$pager = id(new PHUIBoxView())
	->addClass('ml')
	->appendChild($pager);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$obj_box,
	$pager,
	),
	array(
	'title' => pht('Document History'),
	));

	}

	}
	diff --git a/src/applications/phriction/controller/PhrictionListController.php b/src/applications/phriction/controller/PhrictionListController.php
	index 8946d7c1b7..44ef95f178 100644
	--- a/src/applications/phriction/controller/PhrictionListController.php
	+++ b/src/applications/phriction/controller/PhrictionListController.php
	@@ -1,25 +1,21 @@
	<?php

	final class PhrictionListController
	extends PhrictionController {

	- private $queryKey;
	-
	public function shouldAllowPublic() {
	return true;
	}

	- public function willProcessRequest(array $data) {
	- $this->queryKey = idx($data, 'queryKey');
	- }
	+ public function handleRequest(AphrontRequest $request) {
	+ $querykey = $request->getURIData('queryKey');

	- public function processRequest() {
	$controller = id(new PhabricatorApplicationSearchController())
	- ->setQueryKey($this->queryKey)
	+ ->setQueryKey($querykey)
	->setSearchEngine(new PhrictionSearchEngine())
	->setNavigation($this->buildSideNavView());

	return $this->delegateToController($controller);
	}

	}
	diff --git a/src/applications/phriction/controller/PhrictionNewController.php b/src/applications/phriction/controller/PhrictionNewController.php
	index 48cd5fc8f0..c5659be6cc 100644
	--- a/src/applications/phriction/controller/PhrictionNewController.php
	+++ b/src/applications/phriction/controller/PhrictionNewController.php
	@@ -1,64 +1,63 @@
	<?php

	final class PhrictionNewController extends PhrictionController {

	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	- $slug = PhabricatorSlug::normalize($request->getStr('slug'));
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $slug = PhabricatorSlug::normalize($request->getStr('slug'));

	if ($request->isFormPost()) {
	$document = id(new PhrictionDocumentQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withSlugs(array($slug))
	->executeOne();
	$prompt = $request->getStr('prompt', 'no');
	$document_exists = $document && $document->getStatus() ==
	PhrictionDocumentStatus::STATUS_EXISTS;

	if ($document_exists && $prompt == 'no') {
	$dialog = new AphrontDialogView();
	$dialog->setSubmitURI('/phriction/new/')
	->setTitle(pht('Edit Existing Document?'))
	- ->setUser($user)
	+ ->setUser($viewer)
	->appendChild(pht(
	'The document %s already exists. Do you want to edit it instead?',
	phutil_tag('tt', array(), $slug)))
	->addHiddenInput('slug', $slug)
	->addHiddenInput('prompt', 'yes')
	->addCancelButton('/w/')
	->addSubmitButton(pht('Edit Document'));

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

	$uri = '/phriction/edit/?slug='.$slug;
	return id(new AphrontRedirectResponse())
	->setURI($uri);
	}

	if ($slug == '/') {
	$slug = '';
	}

	$view = id(new PHUIFormLayoutView())
	->appendChild(id(new AphrontFormTextControl())
	->setLabel('/w/')
	->setValue($slug)
	->setName('slug'));

	$dialog = id(new AphrontDialogView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setTitle(pht('New Document'))
	->setSubmitURI('/phriction/new/')
	->appendChild(phutil_tag('p',
	array(),
	pht('Create a new document at')))
	->appendChild($view)
	->addSubmitButton(pht('Create'))
	->addCancelButton('/w/');

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

	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jun 10, 1:10 AM (14 h, 13 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 140189
Default Alt Text: (46 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions