No OneTemporary
Actions

Size

32 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/conf/default.conf.php b/conf/default.conf.php
	index bbdfae0187..5caf71509c 100644
	--- a/conf/default.conf.php
	+++ b/conf/default.conf.php
	@@ -1,257 +1,255 @@
	<?php

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

	return array(

	// The root URI which Phabricator is installed on.
	// Example: "http://phabricator.example.com/"
	'phabricator.base-uri' => null,

	// The Conduit URI for API access to this install. Normally this is just
	// the 'base-uri' plus "/api/" (e.g. "http://phabricator.example.com/api/"),
	// but make sure you specify 'https' if you have HTTPS configured.
	'phabricator.conduit-uri' => null,


	// The default PHID for users who haven't uploaded a profile image. It should
	// be 50x50px.
	'user.default-profile-image-phid' => 'PHID-FILE-f57aaefce707fc4060ef',

	// -- Access Control -------------------------------------------------------- //

	// Phabricator users have one of three access levels: "anyone", "verified",
	// or "admin". "anyone" means every user, including users who do not have
	// accounts or are not logged into the system. "verified" is users who have
	// accounts, are logged in, and have satisfied whatever verification steps
	// the configuration requires (e.g., email verification and/or manual
	// approval). "admin" is verified users with the "administrator" flag set.

	// These configuration options control which access level is required to read
	// data from Phabricator (e.g., view revisions and comments in Differential)
	// and write data to Phabricator (e.g., upload files and create diffs). By
	// default they are both set to "verified", meaning only verified user
	// accounts can interact with the system in any meaningful way.

	// If you are configuring an install for an open source project, you may
	// want to reduce the "phabricator.read-access" requirement to "anyone". This
	// will allow anyone to browse Phabricator content, even without logging in.

	// Alternatively, you could raise the "phabricator.write-access" requirement
	// to "admin", effectively creating a read-only install.


	// Controls the minimum access level required to read data from Phabricator
	// (e.g., view revisions in Differential). Allowed values are "anyone",
	// "verified", or "admin". Note that "anyone" includes users who are not
	// logged in! You should leave this at 'verified' unless you want your data
	// to be publicly readable (e.g., you are developing open source software).
	'phabricator.read-access' => 'verified',

	// Controls the minimum access level required to write data to Phabricator
	// (e.g., create new revisions in Differential). Allowed values are
	// "verified" or "admin". Setting this to "admin" will effectively create a
	// read-only install.
	'phabricator.write-access' => 'verified',


	// -- DarkConsole ----------------------------------------------------------- //

	// DarkConsole is a administrative debugging/profiling tool built into
	// Phabricator. You can leave it disabled unless you're developing against
	// Phabricator.

	// Determines whether or not DarkConsole is available. DarkConsole exposes
	// some data like queries and stack traces, so you should be careful about
	// turning it on in production (although users can not normally see it, even
	// if the deployment configuration enables it).
	'darkconsole.enabled' => true,

	// Always enable DarkConsole, even for logged out users. This potentially
	// exposes sensitive information to users, so make sure untrusted users can
	// not access an install running in this mode. You should definitely leave
	// this off in production. It is only really useful for using DarkConsole
	// utilties to debug or profile logged-out pages. You must set
	// 'darkconsole.enabled' to use this option.
	'darkconsole.always-on' => false,


	// Allows you to mask certain configuration values from appearing in the
	// "Config" tab of DarkConsole.
	'darkconsole.config-mask' => array(
	'mysql.pass',
	'amazon-ses.secret-key',
	'recaptcha.private-key',
	'phabricator.csrf-key',
	'facebook.application-secret',
	'github.secret',
	),

	// -- MySQL --------------------------------------------------------------- //

	// The username to use when connecting to MySQL.
	'mysql.user' => 'root',

	// The password to use when connecting to MySQL.
	'mysql.pass' => '',

	// The MySQL server to connect to.
	'mysql.host' => 'localhost',


	// -- Email ----------------------------------------------------------------- //

	// Some Phabricator tools send email notifications, e.g. when Differential
	// revisions are updated or Maniphest tasks are changed. These options allow
	// you to configure how email is delivered.

	// You can test your mail setup by going to "MetaMTA" in the web interface,
	// clicking "Send New Message", and then composing a message.

	// Default address to send mail "From".
	'metamta.default-address' => 'noreply@example.com',

	// When a user takes an action which generates an email notification (like
	// commenting on a Differential revision), Phabricator can either send that
	// mail "From" the user's email address (like "alincoln@logcabin.com") or
	// "From" the 'metamta.default-address' address. The user experience is
	// generally better if Phabricator uses the user's real address as the "From"
	// since the messages are easier to organize when they appear in mail clients,
	// but this will only work if the server is authorized to send email on behalf
	// of the "From" domain. Practically, this means:
	// - If you are doing an install for Example Corp and all the users will
	// have corporate @corp.example.com addresses and any hosts Phabricator
	// is running on are authorized to send email from corp.example.com,
	// you can enable this to make the user experience a little better.
	// - If you are doing an install for an open source project and your
	// users will be registering via Facebook and using personal email
	// addresses, you MUST NOT enable this or virtually all of your outgoing
	// email will vanish into SFP blackholes.
	// - If your install is anything else, you're much safer leaving this
	// off since the risk in turning it on is that your outgoing mail will
	// mostly never arrive.
	'metamta.can-send-as-user' => false,

	// Adapter class to use to transmit mail to the MTA. The default uses
	// PHPMailerLite, which will invoke PHP's mail() function. This is appropriate
	// if mail() actually works on your host, but if you haven't configured mail
	// it may not be so great. You can also use Amazon SES, by changing this to
	// 'PhabricatorMailImplementationAmazonSESAdapter', signing up for SES, and
	// filling in your 'amazon-ses.access-key' and 'amazon-ses.secret-key' below.
	'metamta.mail-adapter' =>
	'PhabricatorMailImplementationPHPMailerLiteAdapter',

	// When email is sent, try to hand it off to the MTA immediately. This may
	// be worth disabling if your MTA infrastructure is slow or unreliable. If you
	// disable this option, you must run the 'metamta_mta.php' daemon or mail
	// won't be handed off to the MTA. If you're using Amazon SES it can be a
	// little slugish sometimes so it may be worth disabling this and moving to
	// the daemon after you've got your install up and running. If you have a
	// properly configured local MTA it should not be necessary to disable this.
	'metamta.send-immediately' => true,

	// If you're using Amazon SES to send email, provide your AWS access key
	// and AWS secret key here. To set up Amazon SES with Phabricator, you need
	// to:
	// - Make sure 'metamta.mail-adapter' is set to:
	// "PhabricatorMailImplementationAmazonSESAdapter"
	// - Make sure 'metamta.can-send-as-user' is false.
	// - Make sure 'metamta.default-address' is configured to something sensible.
	// - Make sure 'metamta.default-address' is a validated SES "From" address.
	'amazon-ses.access-key' => null,
	'amazon-ses.secret-key' => null,


	// -- Facebook ------------------------------------------------------------ //

	// Can users use Facebook credentials to login to Phabricator?
	'facebook.auth-enabled' => false,

	// The Facebook "Application ID" to use for Facebook API access.
	'facebook.application-id' => null,

	// The Facebook "Application Secret" to use for Facebook API access.
	'facebook.application-secret' => null,


	// -- Github ---------------------------------------------------------------- //

	// Can users use Github credentials to login to Phabricator?
	'github.auth-enabled' => false,

	// The Github "Client ID" to use for Github API access.
	'github.application-id' => null,

	// The Github "Secret" to use for Github API access.
	'github.application-secret' => null,


	- // Github Authorize URI. You don't need to change this unless Github changes
	- // its API in the future (this is unlikely).
	- 'github.authorize-uri' => 'https://github.com/login/oauth/authorize',
	-
	- // Github Access Token URI. You don't need to change this unless Github
	- // changes its API in the future (this is unlikely).
	- 'github.access-token-uri' => 'https://github.com/login/oauth/access_token',
	-
	-
	// -- Recaptcha ------------------------------------------------------------- //

	// Is Recaptcha enabled? If disabled, captchas will not appear.
	'recaptcha.enabled' => false,

	// Your Recaptcha public key, obtained from Recaptcha.
	'recaptcha.public-key' => null,

	// Your Recaptcha private key, obtained from Recaptcha.
	'recaptcha.private-key' => null,


	// -- Misc ------------------------------------------------------------------ //

	// This is hashed with other inputs to generate CSRF tokens. If you want, you
	// can change it to some other string which is unique to your install. This
	// will make your install more secure in a vague, mostly theoretical way. But
	// it will take you like 3 seconds of mashing on your keyboard to set it up so
	// you might as well.
	'phabricator.csrf-key' => '0b7ec0592e0a2829d8b71df2fa269b2c6172eca3',

	// Version string displayed in the footer. You probably should leave this
	// alone.
	'phabricator.version' => 'UNSTABLE',


	// -- Files ----------------------------------------------------------------- //

	// Lists which uploaded file types may be viewed in the browser. If a file
	// has a mime type which does not appear in this list, it will always be
	// downloaded instead of displayed. This is a security consideration: if a
	// user uploads a file of type "text/html" and it is displayed as
	// "text/html", they can eaily execute XSS attacks. This is also a usability
	// consideration, since browsers tend to freak out when viewing enormous
	// binary files.
	//
	// The keys in this array are viewable mime types; the values are the mime
	// types they will be delivered as when they are viewed in the browser.
	- 'files.viewable-mime-types' => array(
	+ 'files.viewable-mime-types' => array(
	'image/jpeg' => 'image/jpeg',
	'image/jpg' => 'image/jpg',
	'image/png' => 'image/png',
	'text/plain' => 'text/plain; charset=utf-8',
	),

	+// -- Customization --------------------------------------------------------- //
	+
	+ // Paths to additional phutil libraries to load.
	+ 'load-libraries' => array(),
	+
	+ 'aphront.default-application-configuration-class' =>
	+ 'AphrontDefaultApplicationConfiguration',
	);
	diff --git a/src/aphront/console/plugin/config/DarkConsoleConfigPlugin.php b/src/aphront/console/plugin/config/DarkConsoleConfigPlugin.php
	index 853e0c4ef1..bd67c45f2b 100755
	--- a/src/aphront/console/plugin/config/DarkConsoleConfigPlugin.php
	+++ b/src/aphront/console/plugin/config/DarkConsoleConfigPlugin.php
	@@ -1,69 +1,100 @@
	<?php

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

	class DarkConsoleConfigPlugin extends DarkConsolePlugin {

	public function getName() {
	return 'Config';
	}

	public function getDescription() {
	return 'Information about Phabricator configuration';
	}

	public function generateData() {
	- return PhabricatorEnv::getAllConfigKeys();
	+ $lib_data = array();
	+ foreach (PhutilBootloader::getInstance()->getAllLibraries() as $lib) {
	+ $lib_data[$lib] = phutil_get_library_root($lib);
	+ }
	+ return array(
	+ 'config' => PhabricatorEnv::getAllConfigKeys(),
	+ 'libraries' => $lib_data,
	+ );
	}

	public function render() {

	$data = $this->getData();
	- ksort($data);
	-
	+
	+ $lib_data = $data['libraries'];
	+
	+ $lib_rows = array();
	+ foreach ($lib_data as $key => $value) {
	+ $lib_rows[] = array(
	+ phutil_escape_html($key),
	+ phutil_escape_html($value),
	+ );
	+ }
	+
	+ $lib_table = new AphrontTableView($lib_rows);
	+ $lib_table->setHeaders(
	+ array(
	+ 'Library',
	+ 'Loaded From',
	+ ));
	+ $lib_table->setColumnClasses(
	+ array(
	+ 'header',
	+ 'wide wrap',
	+ ));
	+
	+ $config_data = $data['config'];
	+ ksort($config_data);
	+
	$mask = PhabricatorEnv::getEnvConfig('darkconsole.config-mask');
	$mask = array_fill_keys($mask, true);
	-
	+
	$rows = array();
	- foreach ($data as $key => $value) {
	+ foreach ($config_data as $key => $value) {
	if (empty($mask[$key])) {
	$display_value = is_array($value) ? json_encode($value) : $value;
	$display_value = phutil_escape_html($display_value);
	} else {
	$display_value = phutil_escape_html('<Masked>');
	}
	$rows[] = array(
	phutil_escape_html($key),
	$display_value,
	);
	}

	$table = new AphrontTableView($rows);
	$table->setHeaders(
	array(
	'Key',
	'Value',
	));
	$table->setColumnClasses(
	array(
	'header',
	'wide wrap',
	));

	- return $table->render();
	+ return $lib_table->render().$table->render();
	}
	}
	diff --git a/src/aphront/console/plugin/config/__init__.php b/src/aphront/console/plugin/config/__init__.php
	index 3d244d156e..3a5d4625ac 100644
	--- a/src/aphront/console/plugin/config/__init__.php
	+++ b/src/aphront/console/plugin/config/__init__.php
	@@ -1,16 +1,17 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'aphront/console/plugin/base');
	phutil_require_module('phabricator', 'infrastructure/env');
	phutil_require_module('phabricator', 'view/control/table');

	phutil_require_module('phutil', 'markup');
	+phutil_require_module('phutil', 'moduleutils');


	phutil_require_source('DarkConsoleConfigPlugin.php');
	diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
	index 4047a6c7c0..0ef8fd2786 100644
	--- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
	+++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
	@@ -1,287 +1,293 @@
	<?php

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

	/**
	* @group aphront
	*/
	class AphrontDefaultApplicationConfiguration
	extends AphrontApplicationConfiguration {

	+ public function __construct() {
	+
	+ }
	+
	public function getApplicationName() {
	return 'aphront-default';
	}

	public function getURIMap() {
	- return array(
	+ return $this->getResourceURIMapRules() + array(
	'/' => array(
	'$' => 'PhabricatorDirectoryMainController',
	),
	'/directory/' => array(
	'item/$'
	=> 'PhabricatorDirectoryItemListController',
	'item/edit/(?:(?P<id>\d+)/)?$'
	=> 'PhabricatorDirectoryItemEditController',
	'item/delete/(?P<id>\d+)/'
	=> 'PhabricatorDirectoryItemDeleteController',
	'category/$'
	=> 'PhabricatorDirectoryCategoryListController',
	'category/edit/(?:(?P<id>\d+)/)?$'
	=> 'PhabricatorDirectoryCategoryEditController',
	'category/delete/(?P<id>\d+)/'
	=> 'PhabricatorDirectoryCategoryDeleteController',
	),
	'/file/' => array(
	'$' => 'PhabricatorFileListController',
	'upload/$' => 'PhabricatorFileUploadController',
	'(?P<view>info)/(?P<phid>[^/]+)/' => 'PhabricatorFileViewController',
	'(?P<view>view)/(?P<phid>[^/]+)/' => 'PhabricatorFileViewController',
	'(?P<view>download)/(?P<phid>[^/]+)/' => 'PhabricatorFileViewController',
	),
	'/phid/' => array(
	'$' => 'PhabricatorPHIDLookupController',
	'list/$' => 'PhabricatorPHIDListController',
	'type/$' => 'PhabricatorPHIDTypeListController',
	'type/edit/(?:(?P<id>\d+)/)?$' => 'PhabricatorPHIDTypeEditController',
	'new/$' => 'PhabricatorPHIDAllocateController',
	),
	'/people/' => array(
	'$' => 'PhabricatorPeopleListController',
	'edit/(?:(?P<username>\w+)/)?$' => 'PhabricatorPeopleEditController',
	),
	'/p/(?P<username>\w+)/$' => 'PhabricatorPeopleProfileController',
	'/profile/' => array(
	'edit/$' => 'PhabricatorPeopleProfileEditController',
	),
	'/conduit/' => array(
	'$' => 'PhabricatorConduitConsoleController',
	'method/(?P<method>[^/]+)$' => 'PhabricatorConduitConsoleController',
	'log/$' => 'PhabricatorConduitLogController',
	),
	'/api/(?P<method>[^/]+)$' => 'PhabricatorConduitAPIController',


	'/D(?P<id>\d+)' => 'DifferentialRevisionViewController',
	'/differential/' => array(
	'$' => 'DifferentialRevisionListController',
	'filter/(?P<filter>\w+)/$' => 'DifferentialRevisionListController',
	'diff/' => array(
	'(?P<id>\d+)/$' => 'DifferentialDiffViewController',
	'create/$' => 'DifferentialDiffCreateController',
	),
	'changeset/$' => 'DifferentialChangesetViewController',
	'revision/edit/(?:(?P<id>\d+)/)?$'
	=> 'DifferentialRevisionEditController',
	'comment/' => array(
	'preview/(?P<id>\d+)/$' => 'DifferentialCommentPreviewController',
	'save/$' => 'DifferentialCommentSaveController',
	'inline/' => array(
	'preview/(?P<id>\d+)/$' =>
	'DifferentialInlineCommentPreviewController',
	'edit/(?P<id>\d+)/$' => 'DifferentialInlineCommentEditController',
	),
	),
	'attach/(?P<id>\d+)/(?P<type>\w+)/$' => 'DifferentialAttachController',
	'subscribe/(?P<action>add\|rem)/(?P<id>\d+)/$'
	=> 'DifferentialSubscribeController',
	),

	- '/res/' => array(
	- '(?P<package>pkg/)?(?P<hash>[a-f0-9]{8})/(?P<path>.+\.(?:css\|js))$'
	- => 'CelerityResourceController',
	- ),
	-
	'/typeahead/' => array(
	'common/(?P<type>\w+)/$'
	=> 'PhabricatorTypeaheadCommonDatasourceController',
	),

	'/mail/' => array(
	'$' => 'PhabricatorMetaMTAListController',
	'send/$' => 'PhabricatorMetaMTASendController',
	'view/(?P<id>\d+)/$' => 'PhabricatorMetaMTAViewController',
	'lists/$' => 'PhabricatorMetaMTAMailingListsController',
	'lists/edit/(?:(?P<id>\d+)/)?$'
	=> 'PhabricatorMetaMTAMailingListEditController',
	),

	'/login/' => array(
	'$' => 'PhabricatorLoginController',
	'email/$' => 'PhabricatorEmailLoginController',
	'etoken/(?P<token>\w+)/$' => 'PhabricatorEmailTokenController',
	),
	+
	'/logout/$' => 'PhabricatorLogoutController',
	- '/facebook-auth/' => array(
	- '$' => 'PhabricatorFacebookAuthController',
	- 'diagnose/$' => 'PhabricatorFacebookAuthDiagnosticsController',
	- ),

	'/oauth/' => array(
	'(?P<provider>github\|facebook)/' => array(
	'login/$' => 'PhabricatorOAuthLoginController',
	'diagnose/$' => 'PhabricatorOAuthDiagnosticsController',
	'unlink/$' => 'PhabricatorOAuthUnlinkController',
	),
	),

	'/xhprof/' => array(
	'profile/(?P<phid>[^/]+)/$' => 'PhabricatorXHProfProfileController',
	),

	'/~/' => 'DarkConsoleController',

	'/settings/' => array(
	'(?:page/(?P<page>[^/]+)/)?$' => 'PhabricatorUserSettingsController',
	),

	'/maniphest/' => array(
	'$' => 'ManiphestTaskListController',
	'view/(?P<view>\w+)/$' => 'ManiphestTaskListController',
	'task/' => array(
	'create/$' => 'ManiphestTaskEditController',
	'edit/(?P<id>\d+)/$' => 'ManiphestTaskEditController',
	),
	'transaction/' => array(
	'save/' => 'ManiphestTransactionSaveController',
	),
	'select/search/$' => 'ManiphestTaskSelectorSearchController',
	),

	'/T(?P<id>\d+)$' => 'ManiphestTaskDetailController',

	'/github-post-receive/(?P<id>\d+)/(?P<token>[^/]+)/$'
	=> 'PhabricatorRepositoryGitHubPostReceiveController',

	'/repository/' => array(
	'$' => 'PhabricatorRepositoryListController',
	'create/$' => 'PhabricatorRepositoryCreateController',
	'edit/(?P<id>\d+)/$' => 'PhabricatorRepositoryEditController',
	'delete/(?P<id>\d+)/$' => 'PhabricatorRepositoryDeleteController',
	),

	'/search/' => array(
	'$' => 'PhabricatorSearchController',
	'(?P<id>\d+)/$' => 'PhabricatorSearchController',
	),

	'/project/' => array(
	'$' => 'PhabricatorProjectListController',
	'edit/(?:(?P<id>\d+)/)?$' => 'PhabricatorProjectEditController',
	'view/(?P<id>\d+)/$' => 'PhabricatorProjectProfileController',
	'affiliation/(?P<id>\d+)/$'
	=> 'PhabricatorProjectAffiliationEditController',
	- )
	+ ),
	+
	+ );
	+ }
	+
	+ protected function getResourceURIMapRules() {
	+ return array(
	+ '/res/' => array(
	+ '(?P<package>pkg/)?(?P<hash>[a-f0-9]{8})/(?P<path>.+\.(?:css\|js))$'
	+ => 'CelerityResourceController',
	+ ),
	);
	}

	public function buildRequest() {
	$request = new AphrontRequest($this->getHost(), $this->getPath());
	$request->setRequestData($_GET + $_POST);
	$request->setApplicationConfiguration($this);
	return $request;
	}

	public function handleException(Exception $ex) {

	$class = phutil_escape_html(get_class($ex));
	$message = phutil_escape_html($ex->getMessage());

	$content =
	'<div class="aphront-unhandled-exception">'.
	'<h1>Unhandled Exception "'.$class.'": '.$message.'</h1>'.
	'<code>'.phutil_escape_html((string)$ex).'</code>'.
	'</div>';

	if ($this->getRequest()->isAjax()) {
	$dialog = new AphrontDialogView();
	$dialog
	->setTitle('Exception!')
	->setClass('aphront-exception-dialog')
	->setUser($this->getRequest()->getUser())
	->appendChild($content)
	->addCancelButton('/');

	$response = new AphrontDialogResponse();
	$response->setDialog($dialog);

	return $response;
	}

	$view = new PhabricatorStandardPageView();
	$view->setRequest($this->getRequest());
	$view->appendChild($content);

	$response = new AphrontWebpageResponse();
	$response->setContent($view->render());

	return $response;
	}

	public function willSendResponse(AphrontResponse $response) {
	$request = $this->getRequest();
	if ($response instanceof AphrontDialogResponse) {
	if (!$request->isAjax()) {
	$view = new PhabricatorStandardPageView();
	$view->setRequest($request);
	$view->appendChild(
	'<div style="padding: 2em 0;">'.
	$response->buildResponseString().
	'</div>');
	$response = new AphrontWebpageResponse();
	$response->setContent($view->render());
	return $response;
	} else {
	return id(new AphrontAjaxResponse())
	->setContent(array(
	'dialog' => $response->buildResponseString(),
	));
	}
	} else if ($response instanceof AphrontRedirectResponse) {
	if ($request->isAjax()) {
	return id(new AphrontAjaxResponse())
	->setContent(
	array(
	'redirect' => $response->getURI(),
	));
	}
	} else if ($response instanceof Aphront404Response) {

	$failure = new AphrontRequestFailureView();
	$failure->setHeader('404 Not Found');
	$failure->appendChild(
	'<p>The page you requested was not found.</p>');

	$view = new PhabricatorStandardPageView();
	$view->setTitle('404 Not Found');
	$view->setRequest($this->getRequest());
	$view->appendChild($failure);

	$response = new AphrontWebpageResponse();
	$response->setContent($view->render());
	$response->setHTTPResponseCode(404);
	return $response;
	}

	return $response;
	}

	public function build404Controller() {
	return array(new Phabricator404Controller($this->getRequest()), array());
	}


	}
	diff --git a/webroot/index.php b/webroot/index.php
	index e9a74d221c..4bb283b4c1 100644
	--- a/webroot/index.php
	+++ b/webroot/index.php
	@@ -1,154 +1,174 @@
	<?php

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

	error_reporting(E_ALL \| E_STRICT);

	-$env = getenv('PHABRICATOR_ENV');
	+$env = getenv('PHABRICATOR_ENV'); // Apache
	if (!$env) {
	- header('Content-Type: text/plain');
	- die(
	- "CONFIG ERROR: ".
	+ if (isset($_SERVER['PHABRICATOR_ENV'])) {
	+ $env = $_SERVER['PHABRICATOR_ENV']; // HipHop
	+ }
	+}
	+
	+if (!$env) {
	+ phabricator_fatal_config_error(
	"The 'PHABRICATOR_ENV' environmental variable is not defined. Modify ".
	"your httpd.conf to include 'SetEnv PHABRICATOR_ENV <env>', where '<env>' ".
	"is one of 'development', 'production', or a custom environment.");
	}

	if (!function_exists('mysql_connect')) {
	- header('Content-Type: text/plain');
	- die(
	- "CONFIG ERROR: ".
	- "the PHP MySQL extension is not installed. This extension is required.");
	+ phabricator_fatal_config_error(
	+ "The PHP MySQL extension is not installed. This extension is required.");
	+}
	+
	+if (!isset($_REQUEST['__path__'])) {
	+ phabricator_fatal_config_error(
	+ "__path__ is not set. Your rewrite rules are not configured correctly.");
	}

	require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php';

	$conf = phabricator_read_config_file($env);
	$conf['phabricator.env'] = $env;

	setup_aphront_basics();

	phutil_require_module('phabricator', 'infrastructure/env');
	PhabricatorEnv::setEnvConfig($conf);

	phutil_require_module('phabricator', 'aphront/console/plugin/xhprof/api');
	DarkConsoleXHProfPluginAPI::hookProfiler();

	phutil_require_module('phabricator', 'aphront/console/plugin/errorlog/api');
	set_error_handler(array('DarkConsoleErrorLogPluginAPI', 'handleError'));
	set_exception_handler(array('DarkConsoleErrorLogPluginAPI', 'handleException'));

	+foreach (PhabricatorEnv::getEnvConfig('load-libraries') as $library) {
	+ phutil_load_library($library);
	+}
	+
	+
	$host = $_SERVER['HTTP_HOST'];
	$path = $_REQUEST['__path__'];

	-// Based on the host and path, choose which application should serve the
	-// request. The default is the Aphront demo, but you'll want to replace this
	-// with whichever other applications you're running.
	-
	switch ($host) {
	default:
	- phutil_require_module('phutil', 'autoload');
	- phutil_autoload_class('AphrontDefaultApplicationConfiguration');
	- $application = new AphrontDefaultApplicationConfiguration();
	+ $config_key = 'aphront.default-application-configuration-class';
	+ $config_class = PhabricatorEnv::getEnvConfig($config_key);
	+ PhutilSymbolLoader::loadClass($config_class);
	+ $application = newv($config_class, array());
	break;
	}

	$application->setHost($host);
	$application->setPath($path);
	$application->willBuildRequest();
	$request = $application->buildRequest();
	$application->setRequest($request);
	list($controller, $uri_data) = $application->buildController();
	try {
	$controller->willBeginExecution();

	$controller->willProcessRequest($uri_data);
	$response = $controller->processRequest();
	} catch (AphrontRedirectException $ex) {
	$response = id(new AphrontRedirectResponse())
	->setURI($ex->getURI());
	} catch (Exception $ex) {
	$response = $application->handleException($ex);
	}

	$response = $application->willSendResponse($response);

	$response->setRequest($request);

	$response_string = $response->buildResponseString();

	$code = $response->getHTTPResponseCode();
	if ($code != 200) {
	header("HTTP/1.0 {$code}");
	}

	$headers = $response->getCacheHeaders();
	$headers = array_merge($headers, $response->getHeaders());
	foreach ($headers as $header) {
	list($header, $value) = $header;
	header("{$header}: {$value}");
	}

	+// TODO: This shouldn't be possible in a production-configured environment.
	if (isset($_REQUEST['__profile__']) &&
	($_REQUEST['__profile__'] == 'all')) {
	$profile = DarkConsoleXHProfPluginAPI::stopProfiler();
	$profile =
	'<div style="text-align: center; background: #ff00ff; padding: 1em;
	font-size: 24px; font-weight: bold;">'.
	'<a href="/xhprof/profile/'.$profile.'/">'.
	'>>> View Profile <<<'.
	'</a>'.
	'</div>';
	if (strpos($response_string, '<body>') !== false) {
	$response_string = str_replace(
	'<body>',
	'<body>'.$profile,
	$response_string);
	} else {
	echo $profile;
	}
	}

	echo $response_string;


	/**
	* @group aphront
	*/
	function setup_aphront_basics() {
	$aphront_root = dirname(dirname(__FILE__));
	$libraries_root = dirname($aphront_root);

	- ini_set('include_path', ini_get('include_path').':'.$libraries_root.'/');
	+ ini_set('include_path', $libraries_root.':'.ini_get('include_path'));
	@include_once 'libphutil/src/__phutil_library_init__.php';
	if (!@constant('__LIBPHUTIL__')) {
	echo "ERROR: Unable to load libphutil. Update your PHP 'include_path' to ".
	"include the parent directory of libphutil/.\n";
	exit(1);
	}

	- if (!ini_get('date.timezone')) {
	- date_default_timezone_set('America/Los_Angeles');
	- }
	-
	- phutil_load_library($libraries_root.'/arcanist/src');
	+ // Load Phabricator itself using the absolute path, so we never end up doing
	+ // anything surprising (loading index.php and libraries from different
	+ // directories).
	phutil_load_library($aphront_root.'/src');
	+ phutil_load_library('arcanist/src');
	}

	function __autoload($class_name) {
	PhutilSymbolLoader::loadClass($class_name);
	}
	+
	+function phabricator_fatal_config_error($msg) {
	+ header('Content-Type: text/plain', $replace = true, $http_error = 500);
	+ $error = "CONFIG ERROR: ".$msg."\n";
	+
	+ error_log($error);
	+ echo $error;
	+
	+ die();
	+}
	+

File Metadata

Mime Type: text/x-diff
Expires: Mon, Jul 28, 6:43 PM (1 w, 3 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 187362
Default Alt Text: (32 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions