No OneTemporary
Actions

Size

46 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
	index 2821e8ea95..fcc9aa822b 100644
	--- a/src/applications/diviner/controller/DivinerBookController.php
	+++ b/src/applications/diviner/controller/DivinerBookController.php
	@@ -1,120 +1,101 @@
	<?php

	final class DivinerBookController extends DivinerController {

	private $bookName;

	public function shouldAllowPublic() {
	return true;
	}

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

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

	$book = id(new DivinerBookQuery())
	->setViewer($viewer)
	->withNames(array($this->bookName))
	->executeOne();

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

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->setBorder(true);

	$crumbs->addTextCrumb(
	$book->getShortTitle(),
	'/book/'.$book->getName().'/');

	$header = id(new PHUIHeaderView())
	->setHeader($book->getTitle())
	->setUser($viewer)
	- ->setPolicyObject($book);
	+ ->setPolicyObject($book)
	+ ->setEpoch($book->getDateModified());

	$document = new PHUIDocumentView();
	$document->setHeader($header);
	$document->addClass('diviner-view');
	-
	$document->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS);

	- $properties = $this->buildPropertyList($book);
	-
	$atoms = id(new DivinerAtomQuery())
	->setViewer($viewer)
	->withBookPHIDs(array($book->getPHID()))
	->execute();

	$atoms = msort($atoms, 'getSortKey');

	$group_spec = $book->getConfig('groups');
	if (!is_array($group_spec)) {
	$group_spec = array();
	}

	$groups = mgroup($atoms, 'getGroupName');
	$groups = array_select_keys($groups, array_keys($group_spec)) + $groups;
	if (isset($groups[''])) {
	$no_group = $groups[''];
	unset($groups['']);
	$groups[''] = $no_group;
	}

	$out = array();
	foreach ($groups as $group => $atoms) {
	$group_name = $book->getGroupName($group);
	if (!strlen($group_name)) {
	$group_name = pht('Free Radicals');
	}
	$section = id(new DivinerSectionView())
	->setHeader($group_name);
	$section->addContent($this->renderAtomList($atoms));
	$out[] = $section;
	}

	$preface = $book->getPreface();
	$preface_view = null;
	if (strlen($preface)) {
	$preface_view =
	PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($preface),
	'default',
	$viewer);
	}

	- $document->appendChild($properties);
	$document->appendChild($preface_view);
	$document->appendChild($out);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$document,
	),
	array(
	'title' => $book->getTitle(),
	));
	}

	- private function buildPropertyList(DivinerLiveBook $book) {
	- $viewer = $this->getRequest()->getUser();
	- $view = id(new PHUIPropertyListView())
	- ->setUser($viewer);
	-
	- $policies = PhabricatorPolicyQuery::renderPolicyDescriptions(
	- $viewer,
	- $book);
	-
	- $view->addProperty(
	- pht('Updated'),
	- phabricator_datetime($book->getDateModified(), $viewer));
	-
	- return $view;
	- }
	-
	}
	diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
	index faafe0ee3f..7a0018924d 100644
	--- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php
	+++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
	@@ -1,685 +1,688 @@
	<?php

	final class LegalpadDocumentSignController extends LegalpadController {

	public function shouldAllowPublic() {
	return true;
	}

	public function shouldAllowLegallyNonCompliantUsers() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getUser();

	$document = id(new LegalpadDocumentQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->needDocumentBodies(true)
	->executeOne();
	if (!$document) {
	return new Aphront404Response();
	}

	list($signer_phid, $signature_data) = $this->readSignerInformation(
	$document,
	$request);

	$signature = null;

	$type_individual = LegalpadDocument::SIGNATURE_TYPE_INDIVIDUAL;
	$is_individual = ($document->getSignatureType() == $type_individual);
	switch ($document->getSignatureType()) {
	case LegalpadDocument::SIGNATURE_TYPE_NONE:
	// nothing to sign means this should be true
	$has_signed = true;
	// this is a status UI element
	$signed_status = null;
	break;
	case LegalpadDocument::SIGNATURE_TYPE_INDIVIDUAL:
	if ($signer_phid) {
	// TODO: This is odd and should probably be adjusted after
	// grey/external accounts work better, but use the omnipotent
	// viewer to check for a signature so we can pick up
	// anonymous/grey signatures.

	$signature = id(new LegalpadDocumentSignatureQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withDocumentPHIDs(array($document->getPHID()))
	->withSignerPHIDs(array($signer_phid))
	->executeOne();

	if ($signature && !$viewer->isLoggedIn()) {
	return $this->newDialog()
	->setTitle(pht('Already Signed'))
	->appendParagraph(pht('You have already signed this document!'))
	->addCancelButton('/'.$document->getMonogram(), pht('Okay'));
	}
	}

	$signed_status = null;
	if (!$signature) {
	$has_signed = false;
	$signature = id(new LegalpadDocumentSignature())
	->setSignerPHID($signer_phid)
	->setDocumentPHID($document->getPHID())
	->setDocumentVersion($document->getVersions());

	// If the user is logged in, show a notice that they haven't signed.
	// If they aren't logged in, we can't be as sure, so don't show
	// anything.
	if ($viewer->isLoggedIn()) {
	$signed_status = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setErrors(
	array(
	pht('You have not signed this document yet.'),
	));
	}
	} else {
	$has_signed = true;
	$signature_data = $signature->getSignatureData();

	// In this case, we know they've signed.
	$signed_at = $signature->getDateCreated();

	if ($signature->getIsExemption()) {
	$exemption_phid = $signature->getExemptionPHID();
	$handles = $this->loadViewerHandles(array($exemption_phid));
	$exemption_handle = $handles[$exemption_phid];

	$signed_text = pht(
	'You do not need to sign this document. '.
	'%s added a signature exemption for you on %s.',
	$exemption_handle->renderLink(),
	phabricator_datetime($signed_at, $viewer));
	} else {
	$signed_text = pht(
	'You signed this document on %s.',
	phabricator_datetime($signed_at, $viewer));
	}

	$signed_status = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
	->setErrors(array($signed_text));
	}

	$field_errors = array(
	'name' => true,
	'email' => true,
	'agree' => true,
	);
	$signature->setSignatureData($signature_data);
	break;

	case LegalpadDocument::SIGNATURE_TYPE_CORPORATION:
	$signature = id(new LegalpadDocumentSignature())
	->setDocumentPHID($document->getPHID())
	->setDocumentVersion($document->getVersions());

	if ($viewer->isLoggedIn()) {
	$has_signed = false;

	$signed_status = null;
	} else {
	// This just hides the form.
	$has_signed = true;

	$login_text = pht(
	'This document requires a corporate signatory. You must log in to '.
	'accept this document on behalf of a company you represent.');
	$signed_status = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setErrors(array($login_text));
	}

	$field_errors = array(
	'name' => true,
	'address' => true,
	'contact.name' => true,
	'email' => true,
	);
	$signature->setSignatureData($signature_data);
	break;
	}

	$errors = array();
	if ($request->isFormOrHisecPost() && !$has_signed) {

	// Require two-factor auth to sign legal documents.
	if ($viewer->isLoggedIn()) {
	$engine = new PhabricatorAuthSessionEngine();
	$engine->requireHighSecuritySession(
	$viewer,
	$request,
	'/'.$document->getMonogram());
	}

	list($form_data, $errors, $field_errors) = $this->readSignatureForm(
	$document,
	$request);

	$signature_data = $form_data + $signature_data;

	$signature->setSignatureData($signature_data);
	$signature->setSignatureType($document->getSignatureType());
	$signature->setSignerName((string)idx($signature_data, 'name'));
	$signature->setSignerEmail((string)idx($signature_data, 'email'));

	$agree = $request->getExists('agree');
	if (!$agree) {
	$errors[] = pht(
	'You must check "I agree to the terms laid forth above."');
	$field_errors['agree'] = pht('Required');
	}

	if ($viewer->isLoggedIn() && $is_individual) {
	$verified = LegalpadDocumentSignature::VERIFIED;
	} else {
	$verified = LegalpadDocumentSignature::UNVERIFIED;
	}
	$signature->setVerified($verified);

	if (!$errors) {
	$signature->save();

	// If the viewer is logged in, signing for themselves, send them to
	// the document page, which will show that they have signed the
	// document. Unless of course they were required to sign the
	// document to use Phabricator; in that case try really hard to
	// re-direct them to where they wanted to go.
	//
	// Otherwise, send them to a completion page.
	if ($viewer->isLoggedIn() && $is_individual) {
	$next_uri = '/'.$document->getMonogram();
	if ($document->getRequireSignature()) {
	$request_uri = $request->getRequestURI();
	$next_uri = (string) $request_uri;
	}
	} else {
	$this->sendVerifySignatureEmail(
	$document,
	$signature);

	$next_uri = $this->getApplicationURI('done/');
	}

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

	$document_body = $document->getDocumentBody();
	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($viewer);
	$engine->addObject(
	$document_body,
	LegalpadDocumentBody::MARKUP_FIELD_TEXT);
	$engine->process();

	$document_markup = $engine->getOutput(
	$document_body,
	LegalpadDocumentBody::MARKUP_FIELD_TEXT);

	$title = $document_body->getTitle();

	$manage_uri = $this->getApplicationURI('view/'.$document->getID().'/');

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$document,
	PhabricatorPolicyCapability::CAN_EDIT);

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	+ ->setUser($viewer)
	+ ->setPolicyObject($document)
	+ ->setEpoch($document->getDateModified())
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-pencil'))
	->setText(pht('Manage Document'))
	->setHref($manage_uri)
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$preamble = null;
	if (strlen($document->getPreamble())) {
	$preamble_text = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent(
	$document->getPreamble()),
	'default',
	$viewer);

	$preamble = id(new PHUIPropertyListView())
	->addSectionHeader(pht('Preamble'))
	->addTextContent($preamble_text);
	}

	$content = id(new PHUIDocumentView())
	->addClass('legalpad')
	->setHeader($header)
	->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS)
	->appendChild(
	array(
	$signed_status,
	$preamble,
	$document_markup,
	));

	if (!$has_signed) {
	$error_view = null;
	if ($errors) {
	$error_view = id(new PHUIInfoView())
	->setErrors($errors);
	}

	$signature_form = $this->buildSignatureForm(
	$document,
	$signature,
	$field_errors);

	switch ($document->getSignatureType()) {
	case LegalpadDocument::SIGNATURE_TYPE_NONE:
	$subheader = null;
	break;
	case LegalpadDocument::SIGNATURE_TYPE_INDIVIDUAL:
	case LegalpadDocument::SIGNATURE_TYPE_CORPORATION:
	$subheader = id(new PHUIHeaderView())
	->setHeader(pht('Agree and Sign Document'))
	->setBleedHeader(true);
	break;
	}

	$content->appendChild(
	array(
	$subheader,
	$error_view,
	$signature_form,
	));
	}

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->setBorder(true);
	$crumbs->addTextCrumb($document->getMonogram());

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$content,
	),
	array(
	'title' => $title,
	'pageObjects' => array($document->getPHID()),
	));
	}

	private function readSignerInformation(
	LegalpadDocument $document,
	AphrontRequest $request) {

	$viewer = $request->getUser();
	$signer_phid = null;
	$signature_data = array();

	switch ($document->getSignatureType()) {
	case LegalpadDocument::SIGNATURE_TYPE_NONE:
	break;
	case LegalpadDocument::SIGNATURE_TYPE_INDIVIDUAL:
	if ($viewer->isLoggedIn()) {
	$signer_phid = $viewer->getPHID();
	$signature_data = array(
	'name' => $viewer->getRealName(),
	'email' => $viewer->loadPrimaryEmailAddress(),
	);
	} else if ($request->isFormPost()) {
	$email = new PhutilEmailAddress($request->getStr('email'));
	if (strlen($email->getDomainName())) {
	$email_obj = id(new PhabricatorUserEmail())
	->loadOneWhere('address = %s', $email->getAddress());
	if ($email_obj) {
	return $this->signInResponse();
	}
	$external_account = id(new PhabricatorExternalAccountQuery())
	->setViewer($viewer)
	->withAccountTypes(array('email'))
	->withAccountDomains(array($email->getDomainName()))
	->withAccountIDs(array($email->getAddress()))
	->loadOneOrCreate();
	if ($external_account->getUserPHID()) {
	return $this->signInResponse();
	}
	$signer_phid = $external_account->getPHID();
	}
	}
	break;
	case LegalpadDocument::SIGNATURE_TYPE_CORPORATION:
	$signer_phid = $viewer->getPHID();
	if ($signer_phid) {
	$signature_data = array(
	'contact.name' => $viewer->getRealName(),
	'email' => $viewer->loadPrimaryEmailAddress(),
	'actorPHID' => $viewer->getPHID(),
	);
	}
	break;
	}

	return array($signer_phid, $signature_data);
	}

	private function buildSignatureForm(
	LegalpadDocument $document,
	LegalpadDocumentSignature $signature,
	array $errors) {

	$viewer = $this->getRequest()->getUser();
	$data = $signature->getSignatureData();

	$form = id(new AphrontFormView())
	->setUser($viewer);

	$signature_type = $document->getSignatureType();
	switch ($signature_type) {
	case LegalpadDocument::SIGNATURE_TYPE_NONE:
	// bail out of here quick
	return;
	case LegalpadDocument::SIGNATURE_TYPE_INDIVIDUAL:
	$this->buildIndividualSignatureForm(
	$form,
	$document,
	$signature,
	$errors);
	break;
	case LegalpadDocument::SIGNATURE_TYPE_CORPORATION:
	$this->buildCorporateSignatureForm(
	$form,
	$document,
	$signature,
	$errors);
	break;
	default:
	throw new Exception(
	pht(
	'This document has an unknown signature type ("%s").',
	$signature_type));
	}

	$form
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->setError(idx($errors, 'agree', null))
	->addCheckbox(
	'agree',
	'agree',
	pht('I agree to the terms laid forth above.'),
	false));
	if ($document->getRequireSignature()) {
	$cancel_uri = '/logout/';
	$cancel_text = pht('Log Out');
	} else {
	$cancel_uri = $this->getApplicationURI();
	$cancel_text = pht('Cancel');
	}
	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Sign Document'))
	->addCancelButton($cancel_uri, $cancel_text));

	return $form;
	}

	private function buildIndividualSignatureForm(
	AphrontFormView $form,
	LegalpadDocument $document,
	LegalpadDocumentSignature $signature,
	array $errors) {

	$data = $signature->getSignatureData();

	$form
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Name'))
	->setValue(idx($data, 'name', ''))
	->setName('name')
	->setError(idx($errors, 'name', null)));

	$viewer = $this->getRequest()->getUser();
	if (!$viewer->isLoggedIn()) {
	$form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Email'))
	->setValue(idx($data, 'email', ''))
	->setName('email')
	->setError(idx($errors, 'email', null)));
	}

	return $form;
	}

	private function buildCorporateSignatureForm(
	AphrontFormView $form,
	LegalpadDocument $document,
	LegalpadDocumentSignature $signature,
	array $errors) {

	$data = $signature->getSignatureData();

	$form
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Company Name'))
	->setValue(idx($data, 'name', ''))
	->setName('name')
	->setError(idx($errors, 'name', null)))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel(pht('Company Address'))
	->setValue(idx($data, 'address', ''))
	->setName('address')
	->setError(idx($errors, 'address', null)))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Contact Name'))
	->setValue(idx($data, 'contact.name', ''))
	->setName('contact.name')
	->setError(idx($errors, 'contact.name', null)))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Contact Email'))
	->setValue(idx($data, 'email', ''))
	->setName('email')
	->setError(idx($errors, 'email', null)));

	return $form;
	}

	private function readSignatureForm(
	LegalpadDocument $document,
	AphrontRequest $request) {

	$signature_type = $document->getSignatureType();
	switch ($signature_type) {
	case LegalpadDocument::SIGNATURE_TYPE_INDIVIDUAL:
	$result = $this->readIndividualSignatureForm(
	$document,
	$request);
	break;
	case LegalpadDocument::SIGNATURE_TYPE_CORPORATION:
	$result = $this->readCorporateSignatureForm(
	$document,
	$request);
	break;
	default:
	throw new Exception(
	pht(
	'This document has an unknown signature type ("%s").',
	$signature_type));
	}

	return $result;
	}

	private function readIndividualSignatureForm(
	LegalpadDocument $document,
	AphrontRequest $request) {

	$signature_data = array();
	$errors = array();
	$field_errors = array();


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

	if (!strlen($name)) {
	$field_errors['name'] = pht('Required');
	$errors[] = pht('Name field is required.');
	} else {
	$field_errors['name'] = null;
	}
	$signature_data['name'] = $name;

	$viewer = $request->getUser();
	if ($viewer->isLoggedIn()) {
	$email = $viewer->loadPrimaryEmailAddress();
	} else {
	$email = $request->getStr('email');

	$addr_obj = null;
	if (!strlen($email)) {
	$field_errors['email'] = pht('Required');
	$errors[] = pht('Email field is required.');
	} else {
	$addr_obj = new PhutilEmailAddress($email);
	$domain = $addr_obj->getDomainName();
	if (!$domain) {
	$field_errors['email'] = pht('Invalid');
	$errors[] = pht('A valid email is required.');
	} else {
	$field_errors['email'] = null;
	}
	}
	}
	$signature_data['email'] = $email;

	return array($signature_data, $errors, $field_errors);
	}

	private function readCorporateSignatureForm(
	LegalpadDocument $document,
	AphrontRequest $request) {

	$viewer = $request->getUser();
	if (!$viewer->isLoggedIn()) {
	throw new Exception(
	pht(
	'You can not sign a document on behalf of a corporation unless '.
	'you are logged in.'));
	}

	$signature_data = array();
	$errors = array();
	$field_errors = array();

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

	if (!strlen($name)) {
	$field_errors['name'] = pht('Required');
	$errors[] = pht('Company name is required.');
	} else {
	$field_errors['name'] = null;
	}
	$signature_data['name'] = $name;

	$address = $request->getStr('address');
	if (!strlen($address)) {
	$field_errors['address'] = pht('Required');
	$errors[] = pht('Company address is required.');
	} else {
	$field_errors['address'] = null;
	}
	$signature_data['address'] = $address;

	$contact_name = $request->getStr('contact.name');
	if (!strlen($contact_name)) {
	$field_errors['contact.name'] = pht('Required');
	$errors[] = pht('Contact name is required.');
	} else {
	$field_errors['contact.name'] = null;
	}
	$signature_data['contact.name'] = $contact_name;

	$email = $request->getStr('email');
	$addr_obj = null;
	if (!strlen($email)) {
	$field_errors['email'] = pht('Required');
	$errors[] = pht('Contact email is required.');
	} else {
	$addr_obj = new PhutilEmailAddress($email);
	$domain = $addr_obj->getDomainName();
	if (!$domain) {
	$field_errors['email'] = pht('Invalid');
	$errors[] = pht('A valid email is required.');
	} else {
	$field_errors['email'] = null;
	}
	}
	$signature_data['email'] = $email;

	return array($signature_data, $errors, $field_errors);
	}

	private function sendVerifySignatureEmail(
	LegalpadDocument $doc,
	LegalpadDocumentSignature $signature) {

	$signature_data = $signature->getSignatureData();
	$email = new PhutilEmailAddress($signature_data['email']);
	$doc_name = $doc->getTitle();
	$doc_link = PhabricatorEnv::getProductionURI('/'.$doc->getMonogram());
	$path = $this->getApplicationURI(sprintf(
	'/verify/%s/',
	$signature->getSecretKey()));
	$link = PhabricatorEnv::getProductionURI($path);

	$name = idx($signature_data, 'name');

	$body = <<<EOBODY
	{$name}:

	This email address was used to sign a Legalpad document in Phabricator:

	{$doc_name}

	Please verify you own this email address and accept the agreement by clicking
	this link:

	{$link}

	Your signature is not valid until you complete this verification step.

	You can review the document here:

	{$doc_link}

	EOBODY;

	id(new PhabricatorMetaMTAMail())
	->addRawTos(array($email->getAddress()))
	->setSubject(pht('[Legalpad] Signature Verification'))
	->setForceDelivery(true)
	->setBody($body)
	->setRelatedPHID($signature->getDocumentPHID())
	->saveAndSend();
	}

	private function signInResponse() {
	return id(new Aphront403Response())
	->setForbiddenText(pht(
	'The email address specified is associated with an account. '.
	'Please login to that account and sign this document again.'));
	}

	}
	diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
	index e5c2970ed5..6883858ad5 100644
	--- a/src/applications/phriction/controller/PhrictionDocumentController.php
	+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
	@@ -1,458 +1,448 @@
	<?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();

	$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)
	->withSlugs(array($slug))
	->executeOne();

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

	if (!$document) {

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

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

	$notice = new PHUIInfoView();
	$notice->setSeverity(PHUIInfoView::SEVERITY_NODATA);
	$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);
	$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);
	} 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)
	->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("Unknown document status '{$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)
	->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);

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

	$header = id(new PHUIHeaderView())
	->setUser($user)
	->setPolicyObject($document)
	- ->setHeader($page_title);
	+ ->setHeader($page_title)
	+ ->setEpoch($content->getDateCreated());

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

	$page_content = id(new PHUIDocumentView())
	->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS)
	->setHeader($header)
	->setActionListID($action_id)
	->appendChild(
	array(
	$actions,
	$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()));

	- $age = time() - $content->getDateCreated();
	- $age = floor($age / (60 * 60 * 24));
	- if ($age < 1) {
	- $when = pht('Today');
	- } else if ($age == 1) {
	- $when = pht('Yesterday');
	- } else {
	- $when = pht('%d Days Ago', $age);
	- }
	- $view->addProperty(pht('Last Updated'), $when);
	-
	return $view;
	}

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

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

	$action_view = id(new PhabricatorActionListView())
	->setUser($user)
	->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>');
	$list[] = $this->renderChildDocumentLink($child);
	$grand = idx($grandchildren_dicts, $child['slug'], array());
	if ($grand) {
	$list[] = hsprintf('<ul>');
	foreach ($grand as $grandchild) {
	$list[] = hsprintf('<li>');
	$list[] = $this->renderChildDocumentLink($grandchild);
	$list[] = hsprintf('</li>');
	}
	$list[] = hsprintf('</ul>');
	}
	$list[] = hsprintf('</li>');
	}
	if ($more_children) {
	$list[] = phutil_tag('li', array(), pht('More...'));
	}

	$content = array(
	phutil_tag(
	'div',
	array(
	'class' => 'phriction-children-header '.
	'sprite-gradient gradient-lightblue-header',
	),
	pht('Document Hierarchy')),
	phutil_tag(
	'div',
	array(
	'class' => 'phriction-children',
	),
	phutil_tag('ul', array(), $list)),
	);

	return id(new PHUIDocumentView())
	->appendChild($content);
	}

	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/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
	index 8db57095f4..ad3561d930 100644
	--- a/src/view/phui/PHUIHeaderView.php
	+++ b/src/view/phui/PHUIHeaderView.php
	@@ -1,273 +1,289 @@
	<?php

	final class PHUIHeaderView extends AphrontView {

	const PROPERTY_STATUS = 1;

	private $objectName;
	private $header;
	private $tags = array();
	private $image;
	private $imageURL = null;
	private $subheader;
	private $headerColor;
	private $noBackground;
	private $bleedHeader;
	private $properties = array();
	private $actionLinks = array();
	private $buttonBar = null;
	private $policyObject;
	+ private $epoch;

	public function setHeader($header) {
	$this->header = $header;
	return $this;
	}

	public function setObjectName($object_name) {
	$this->objectName = $object_name;
	return $this;
	}

	public function setNoBackground($nada) {
	$this->noBackground = $nada;
	return $this;
	}

	public function addTag(PHUITagView $tag) {
	$this->tags[] = $tag;
	return $this;
	}

	public function setImage($uri) {
	$this->image = $uri;
	return $this;
	}

	public function setImageURL($url) {
	$this->imageURL = $url;
	return $this;
	}

	public function setSubheader($subheader) {
	$this->subheader = $subheader;
	return $this;
	}

	public function setBleedHeader($bleed) {
	$this->bleedHeader = $bleed;
	return $this;
	}

	public function setHeaderColor($color) {
	$this->headerColor = $color;
	return $this;
	}

	public function setPolicyObject(PhabricatorPolicyInterface $object) {
	$this->policyObject = $object;
	return $this;
	}

	public function addProperty($property, $value) {
	$this->properties[$property] = $value;
	return $this;
	}

	public function addActionLink(PHUIButtonView $button) {
	$this->actionLinks[] = $button;
	return $this;
	}

	public function setButtonBar(PHUIButtonBarView $bb) {
	$this->buttonBar = $bb;
	return $this;
	}

	public function setStatus($icon, $color, $name) {
	$header_class = 'phui-header-status';

	if ($color) {
	$icon = $icon.' '.$color;
	$header_class = $header_class.'-'.$color;
	}

	$img = id(new PHUIIconView())
	->setIconFont($icon);

	$tag = phutil_tag(
	'span',
	array(
	'class' => "{$header_class} plr",
	),
	array(
	$img,
	$name,
	));

	return $this->addProperty(self::PROPERTY_STATUS, $tag);
	}

	+ public function setEpoch($epoch) {
	+ $age = time() - $epoch;
	+ $age = floor($age / (60 * 60 * 24));
	+ if ($age < 1) {
	+ $when = pht('Today');
	+ } else if ($age == 1) {
	+ $when = pht('Yesterday');
	+ } else {
	+ $when = pht('%d Days Ago', $age);
	+ }
	+
	+ $this->setStatus('fa-clock-o bluegrey', null, pht('Updated %s', $when));
	+ return $this;
	+ }
	+
	public function render() {
	require_celerity_resource('phui-header-view-css');

	$classes = array();
	$classes[] = 'phui-header-shell';

	if ($this->noBackground) {
	$classes[] = 'phui-header-no-backgound';
	}

	if ($this->bleedHeader) {
	$classes[] = 'phui-bleed-header';
	}

	if ($this->headerColor) {
	$classes[] = 'sprite-gradient';
	$classes[] = 'gradient-'.$this->headerColor.'-header';
	}

	if ($this->properties \|\| $this->policyObject \|\| $this->subheader) {
	$classes[] = 'phui-header-tall';
	}

	$image = null;
	if ($this->image) {
	$image = phutil_tag(
	($this->imageURL ? 'a' : 'span'),
	array(
	'href' => $this->imageURL,
	'class' => 'phui-header-image',
	'style' => 'background-image: url('.$this->image.')',
	),
	' ');
	$classes[] = 'phui-header-has-image';
	}

	$header = array();

	if ($this->actionLinks) {
	$actions = array();
	foreach ($this->actionLinks as $button) {
	$button->setColor(PHUIButtonView::SIMPLE);
	$button->addClass(PHUI::MARGIN_SMALL_LEFT);
	$button->addClass('phui-header-action-link');
	$actions[] = $button;
	}
	$header[] = phutil_tag(
	'div',
	array(
	'class' => 'phui-header-action-links',
	),
	$actions);
	}

	if ($this->buttonBar) {
	$header[] = phutil_tag(
	'div',
	array(
	'class' => 'phui-header-action-links',
	),
	$this->buttonBar);
	}
	$header[] = $this->header;

	if ($this->objectName) {
	array_unshift(
	$header,
	phutil_tag(
	'a',
	array(
	'href' => '/'.$this->objectName,
	),
	$this->objectName),
	' ');
	}

	if ($this->tags) {
	$header[] = ' ';
	$header[] = phutil_tag(
	'span',
	array(
	'class' => 'phui-header-tags',
	),
	array_interleave(' ', $this->tags));
	}

	if ($this->subheader) {
	$header[] = phutil_tag(
	'div',
	array(
	'class' => 'phui-header-subheader',
	),
	$this->subheader);
	}

	if ($this->properties \|\| $this->policyObject) {
	$property_list = array();
	foreach ($this->properties as $type => $property) {
	switch ($type) {
	case self::PROPERTY_STATUS:
	$property_list[] = $property;
	break;
	default:
	throw new Exception('Incorrect Property Passed');
	break;
	}
	}

	if ($this->policyObject) {
	$property_list[] = $this->renderPolicyProperty($this->policyObject);
	}

	$header[] = phutil_tag(
	'div',
	array(
	'class' => 'phui-header-subheader',
	),
	$property_list);
	}

	return phutil_tag(
	'div',
	array(
	'class' => implode(' ', $classes),
	),
	array(
	$image,
	phutil_tag(
	'h1',
	array(
	'class' => 'phui-header-view grouped',
	),
	$header),
	));
	}

	private function renderPolicyProperty(PhabricatorPolicyInterface $object) {
	$policies = PhabricatorPolicyQuery::loadPolicies(
	$this->getUser(),
	$object);

	$view_capability = PhabricatorPolicyCapability::CAN_VIEW;
	$policy = idx($policies, $view_capability);
	if (!$policy) {
	return null;
	}

	$phid = $object->getPHID();

	$icon = id(new PHUIIconView())
	->setIconFont($policy->getIcon().' bluegrey');

	$link = javelin_tag(
	'a',
	array(
	'class' => 'policy-link',
	'href' => '/policy/explain/'.$phid.'/'.$view_capability.'/',
	'sigil' => 'workflow',
	),
	$policy->getShortName());

	return array($icon, $link);
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Sep 7, 10:25 AM (1 d, 3 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 223113
Default Alt Text: (46 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions