The authentication information in the link you clicked is '. 'invalid or out of date. Make sure you are copy-and-pasting the '. 'entire link into your browser. You can try again, or request '. 'a new email.
'); $view->appendChild( 'The LDAP account you just authorized is already linked to '. 'another Phabricator account. Before you can link it to a '. 'different LDAP account, you must unlink the old account.
' ); - $dialog->addCancelButton('/settings/page/ldap/'); + $dialog->addCancelButton('/settings/panel/ldap/'); return id(new AphrontDialogResponse())->setDialog($dialog); } else { return id(new AphrontRedirectResponse()) - ->setURI('/settings/page/ldap/'); + ->setURI('/settings/panel/ldap/'); } } if (!$request->isDialogFormPost()) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); $dialog->setTitle('Link LDAP Account'); $dialog->appendChild( 'Link your LDAP account to your Phabricator account?
'); $dialog->addHiddenInput('username', $request->getStr('username')); $dialog->addHiddenInput('password', $request->getStr('password')); $dialog->addSubmitButton('Link Accounts'); - $dialog->addCancelButton('/settings/page/ldap/'); + $dialog->addCancelButton('/settings/panel/ldap/'); return id(new AphrontDialogResponse())->setDialog($dialog); } $ldap_info->setUserID($current_user->getID()); $this->saveLDAPInfo($ldap_info); return id(new AphrontRedirectResponse()) - ->setURI('/settings/page/ldap/'); + ->setURI('/settings/panel/ldap/'); } if ($ldap_info->getID()) { $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites(); $known_user = id(new PhabricatorUser())->load( $ldap_info->getUserID()); $session_key = $known_user->establishSession('web'); $this->saveLDAPInfo($ldap_info); $request->setCookie('phusr', $known_user->getUsername()); $request->setCookie('phsid', $session_key); $uri = new PhutilURI('/login/validate/'); $uri->setQueryParams( array( 'phusr' => $known_user->getUsername(), )); return id(new AphrontRedirectResponse())->setURI((string)$uri); } $controller = newv('PhabricatorLDAPRegistrationController', array($this->getRequest())); $controller->setLDAPProvider($this->provider); $controller->setLDAPInfo($ldap_info); return $this->delegateToController($controller); } } $ldap_form = new AphrontFormView(); $ldap_form ->setUser($request->getUser()) ->setAction('/ldap/login/') ->appendChild( id(new AphrontFormTextControl()) ->setLabel('LDAP username') ->setName('username') ->setValue($ldap_username)) ->appendChild( id(new AphrontFormPasswordControl()) ->setLabel('Password') ->setName('password')); $ldap_form ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Login')); $panel = new AphrontPanelView(); $panel->setWidth(AphrontPanelView::WIDTH_FORM); $panel->appendChild('You will not be able to login using this account '. 'once you unlink it. Continue?
'); $dialog->addSubmitButton('Unlink Account'); - $dialog->addCancelButton('/settings/page/ldap/'); + $dialog->addCancelButton('/settings/panel/ldap/'); return id(new AphrontDialogResponse())->setDialog($dialog); } $ldap_info->delete(); return id(new AphrontRedirectResponse()) - ->setURI('/settings/page/ldap/'); + ->setURI('/settings/panel/ldap/'); } } diff --git a/src/applications/auth/controller/PhabricatorOAuthLoginController.php b/src/applications/auth/controller/PhabricatorOAuthLoginController.php index d87e7a2cd..b351aa87f 100644 --- a/src/applications/auth/controller/PhabricatorOAuthLoginController.php +++ b/src/applications/auth/controller/PhabricatorOAuthLoginController.php @@ -1,355 +1,355 @@ provider = PhabricatorOAuthProvider::newProvider($data['provider']); } public function processRequest() { $current_user = $this->getRequest()->getUser(); $provider = $this->provider; if (!$provider->isProviderEnabled()) { return new Aphront400Response(); } $provider_name = $provider->getProviderName(); $provider_key = $provider->getProviderKey(); $request = $this->getRequest(); if ($request->getStr('error')) { $error_view = id(new PhabricatorOAuthFailureView()) ->setRequest($request); return $this->buildErrorResponse($error_view); } $error_response = $this->retrieveAccessToken($provider); if ($error_response) { return $error_response; } $userinfo_uri = new PhutilURI($provider->getUserInfoURI()); $userinfo_uri->setQueryParam('access_token', $this->accessToken); $userinfo_uri = (string)$userinfo_uri; try { $user_data = HTTPSFuture::loadContent($userinfo_uri); if ($user_data === false) { throw new PhabricatorOAuthProviderException( "Request to '{$userinfo_uri}' failed!"); } $provider->setUserData($user_data); } catch (PhabricatorOAuthProviderException $e) { return $this->buildErrorResponse(new PhabricatorOAuthFailureView(), $e); } $provider->setAccessToken($this->accessToken); $user_id = $provider->retrieveUserID(); $provider_key = $provider->getProviderKey(); $oauth_info = $this->retrieveOAuthInfo($provider); if ($current_user->getPHID()) { if ($oauth_info->getID()) { if ($oauth_info->getUserID() != $current_user->getID()) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); $dialog->setTitle('Already Linked to Another Account'); $dialog->appendChild( hsprintf( 'The %s account you just authorized is already linked to '. 'another Phabricator account. Before you can associate your %s '. 'account with this Phabriactor account, you must unlink it from '. 'the Phabricator account it is currently linked to.
', $provider_name, $provider_name)); - $dialog->addCancelButton('/settings/page/'.$provider_key.'/'); + $dialog->addCancelButton($provider->getSettingsPanelURI()); return id(new AphrontDialogResponse())->setDialog($dialog); } else { $this->saveOAuthInfo($oauth_info); // Refresh token. return id(new AphrontRedirectResponse()) - ->setURI('/settings/page/'.$provider_key.'/'); + ->setURI($provider->getSettingsPanelURI()); } } $existing_oauth = id(new PhabricatorUserOAuthInfo())->loadOneWhere( 'userID = %d AND oauthProvider = %s', $current_user->getID(), $provider_key); if ($existing_oauth) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); $dialog->setTitle('Already Linked to an Account From This Provider'); $dialog->appendChild( hsprintf( 'The account you are logged in with is already linked to a %s '. 'account. Before you can link it to a different %s account, you '. 'must unlink the old account.
', $provider_name, $provider_name)); - $dialog->addCancelButton('/settings/page/'.$provider_key.'/'); + $dialog->addCancelButton($provider->getSettingsPanelURI()); return id(new AphrontDialogResponse())->setDialog($dialog); } if (!$request->isDialogFormPost()) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); $dialog->setTitle('Link '.$provider_name.' Account'); $dialog->appendChild( hsprintf( 'Link your %s account to your Phabricator account?
', $provider_name)); $dialog->addHiddenInput('confirm_token', $provider->getAccessToken()); $dialog->addHiddenInput('expires', $oauth_info->getTokenExpires()); $dialog->addHiddenInput('state', $this->oauthState); $dialog->addHiddenInput('scope', $oauth_info->getTokenScope()); $dialog->addSubmitButton('Link Accounts'); - $dialog->addCancelButton('/settings/page/'.$provider_key.'/'); + $dialog->addCancelButton($provider->getSettingsPanelURI()); return id(new AphrontDialogResponse())->setDialog($dialog); } $oauth_info->setUserID($current_user->getID()); $this->saveOAuthInfo($oauth_info); return id(new AphrontRedirectResponse()) - ->setURI('/settings/page/'.$provider_key.'/'); + ->setURI($provider->getSettingsPanelURI()); } // Login with known auth. if ($oauth_info->getID()) { $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites(); $known_user = id(new PhabricatorUser())->load($oauth_info->getUserID()); $request->getApplicationConfiguration()->willAuthenticateUserWithOAuth( $known_user, $oauth_info, $provider); $session_key = $known_user->establishSession('web'); $this->saveOAuthInfo($oauth_info); $request->setCookie('phusr', $known_user->getUsername()); $request->setCookie('phsid', $session_key); $uri = new PhutilURI('/login/validate/'); $uri->setQueryParams( array( 'phusr' => $known_user->getUsername(), )); return id(new AphrontRedirectResponse())->setURI((string)$uri); } $oauth_email = $provider->retrieveUserEmail(); if ($oauth_email) { $known_email = id(new PhabricatorUserEmail()) ->loadOneWhere('address = %s', $oauth_email); if ($known_email) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); $dialog->setTitle('Already Linked to Another Account'); $dialog->appendChild( hsprintf( 'The %s account you just authorized has an email address which '. 'is already in use by another Phabricator account. To link the '. 'accounts, log in to your Phabricator account and then go to '. 'Settings.
', $provider_name)); $user = id(new PhabricatorUser()) ->loadOneWhere('phid = %s', $known_email->getUserPHID()); $oauth_infos = id(new PhabricatorUserOAuthInfo()) ->loadAllWhere('userID = %d', $user->getID()); if ($oauth_infos) { $providers = array(); foreach ($oauth_infos as $info) { $provider = $info->getOAuthProvider(); $providers[] = PhabricatorOAuthProvider::newProvider($provider) ->getProviderName(); } $dialog->appendChild( hsprintf( 'The account is associated with: %s.
', implode(', ', $providers))); } $dialog->addCancelButton('/login/'); return id(new AphrontDialogResponse())->setDialog($dialog); } } if (!$provider->isProviderRegistrationEnabled()) { $dialog = new AphrontDialogView(); $dialog->setUser($current_user); $dialog->setTitle('No Account Registration With '.$provider_name); $dialog->appendChild( hsprintf( 'You can not register a new account using %s; you can only use '. 'your %s account to log into an existing Phabricator account which '. 'you have registered through other means.
', $provider_name, $provider_name)); $dialog->addCancelButton('/login/'); return id(new AphrontDialogResponse())->setDialog($dialog); } $controller = PhabricatorEnv::newObjectFromConfig( 'controller.oauth-registration', array($this->getRequest())); $controller->setOAuthProvider($provider); $controller->setOAuthInfo($oauth_info); $controller->setOAuthState($this->oauthState); return $this->delegateToController($controller); } private function buildErrorResponse(PhabricatorOAuthFailureView $view, Exception $e = null) { $provider = $this->provider; $provider_name = $provider->getProviderName(); $view->setOAuthProvider($provider); if ($e) { $view->setException($e); } return $this->buildStandardPageResponse( $view, array( 'title' => $provider_name.' Auth Failed', )); } private function retrieveAccessToken(PhabricatorOAuthProvider $provider) { $request = $this->getRequest(); $token = $request->getStr('confirm_token'); if ($token) { $this->tokenExpires = $request->getInt('expires'); $this->accessToken = $token; $this->oauthState = $request->getStr('state'); return null; } $client_id = $provider->getClientID(); $client_secret = $provider->getClientSecret(); $redirect_uri = $provider->getRedirectURI(); $auth_uri = $provider->getTokenURI(); $code = $request->getStr('code'); $query_data = array( 'client_id' => $client_id, 'client_secret' => $client_secret, 'redirect_uri' => $redirect_uri, 'code' => $code, ) + $provider->getExtraTokenParameters(); $future = new HTTPSFuture($auth_uri, $query_data); $future->setMethod('POST'); try { list($response) = $future->resolvex(); } catch (Exception $ex) { return $this->buildErrorResponse(new PhabricatorOAuthFailureView()); } $data = $provider->decodeTokenResponse($response); $token = idx($data, 'access_token'); if (!$token) { return $this->buildErrorResponse(new PhabricatorOAuthFailureView()); } $this->tokenExpires = $provider->getTokenExpiryFromArray($data); $this->accessToken = $token; $this->oauthState = $request->getStr('state'); return null; } private function retrieveOAuthInfo(PhabricatorOAuthProvider $provider) { $oauth_info = id(new PhabricatorUserOAuthInfo())->loadOneWhere( 'oauthProvider = %s and oauthUID = %s', $provider->getProviderKey(), $provider->retrieveUserID()); $scope = $this->getRequest()->getStr('scope'); if (!$oauth_info) { $oauth_info = new PhabricatorUserOAuthInfo(); $oauth_info->setOAuthProvider($provider->getProviderKey()); $oauth_info->setOAuthUID($provider->retrieveUserID()); // some providers don't tell you what scope you got, so default // to the minimum Phabricator requires rather than assuming no scope if (!$scope) { $scope = $provider->getMinimumScope(); } } $oauth_info->setAccountURI($provider->retrieveUserAccountURI()); $oauth_info->setAccountName($provider->retrieveUserAccountName()); $oauth_info->setToken($provider->getAccessToken()); $oauth_info->setTokenStatus(PhabricatorUserOAuthInfo::TOKEN_STATUS_GOOD); $oauth_info->setTokenScope($scope); // If we have out-of-date expiration info, just clear it out. Then replace // it with good info if the provider gave it to us. $expires = $oauth_info->getTokenExpires(); if ($expires <= time()) { $expires = null; } if ($this->tokenExpires) { $expires = $this->tokenExpires; } $oauth_info->setTokenExpires($expires); return $oauth_info; } private function saveOAuthInfo(PhabricatorUserOAuthInfo $info) { // UNGUARDED WRITES: Logging-in users don't have their CSRF set up yet. $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites(); $info->save(); } } diff --git a/src/applications/auth/controller/PhabricatorOAuthUnlinkController.php b/src/applications/auth/controller/PhabricatorOAuthUnlinkController.php index 6d7de0192..c156c8d55 100644 --- a/src/applications/auth/controller/PhabricatorOAuthUnlinkController.php +++ b/src/applications/auth/controller/PhabricatorOAuthUnlinkController.php @@ -1,68 +1,68 @@ provider = PhabricatorOAuthProvider::newProvider($data['provider']); } public function processRequest() { $request = $this->getRequest(); $user = $request->getUser(); $provider = $this->provider; if ($provider->isProviderLinkPermanent()) { throw new Exception( "You may not unlink accounts from this OAuth provider."); } $provider_key = $provider->getProviderKey(); $oauth_info = id(new PhabricatorUserOAuthInfo())->loadOneWhere( 'userID = %d AND oauthProvider = %s', $user->getID(), $provider_key); if (!$oauth_info) { return new Aphront400Response(); } if (!$request->isDialogFormPost()) { $dialog = new AphrontDialogView(); $dialog->setUser($user); $dialog->setTitle('Really unlink account?'); $dialog->appendChild( 'You will not be able to login using this account '. 'once you unlink it. Continue?
'); $dialog->addSubmitButton('Unlink Account'); - $dialog->addCancelButton('/settings/page/'.$provider_key.'/'); + $dialog->addCancelButton($provider->getSettingsPanelURI()); return id(new AphrontDialogResponse())->setDialog($dialog); } $oauth_info->delete(); return id(new AphrontRedirectResponse()) - ->setURI('/settings/page/'.$provider_key.'/'); + ->setURI($provider->getSettingsPanelURI()); } } diff --git a/src/applications/auth/oauth/provider/PhabricatorOAuthProvider.php b/src/applications/auth/oauth/provider/PhabricatorOAuthProvider.php index 33b3a8539..9f491b0df 100644 --- a/src/applications/auth/oauth/provider/PhabricatorOAuthProvider.php +++ b/src/applications/auth/oauth/provider/PhabricatorOAuthProvider.php @@ -1,176 +1,182 @@ setOAuthProvider($this); + return $panel->getPanelURI(); + } + /** * If the provider needs extra stuff in the auth request, return it here. * For example, Google needs a response_type parameter. */ public function getExtraAuthParameters() { return array(); } /** * If the provider supports application login, the diagnostics page can try * to test it. Most providers do not support this (Facebook does). */ public function shouldDiagnoseAppLogin() { return false; } abstract public function getTokenURI(); /** * Access tokens expire based on an implementation-specific key. */ abstract protected function getTokenExpiryKey(); public function getTokenExpiryFromArray(array $data) { $key = $this->getTokenExpiryKey(); if ($key) { $expiry_value = idx($data, $key, 0); if ($expiry_value) { return time() + $expiry_value; } } return 0; } /** * If the provider needs extra stuff in the token request, return it here. * For example, Google needs a grant_type parameter. */ public function getExtraTokenParameters() { return array(); } abstract public function getUserInfoURI(); abstract public function getMinimumScope(); abstract public function setUserData($data); abstract public function retrieveUserID(); abstract public function retrieveUserEmail(); abstract public function retrieveUserAccountName(); abstract public function retrieveUserProfileImage(); abstract public function retrieveUserAccountURI(); abstract public function retrieveUserRealName(); /** * Override this if the provider returns the token response as, e.g., JSON * or XML. */ public function decodeTokenResponse($response) { $data = null; parse_str($response, $data); return $data; } public function __construct() { } /** * This is where the OAuth provider will redirect the user after the user * grants Phabricator access. */ final public function getRedirectURI() { $key = $this->getProviderKey(); return PhabricatorEnv::getURI('/oauth/'.$key.'/login/'); } final public function setAccessToken($access_token) { $this->accessToken = $access_token; return $this; } final public function getAccessToken() { return $this->accessToken; } /** * Often used within setUserData to make sure $data is not completely * junk. More granular validations of data might be necessary depending on * the provider and are generally encouraged. */ final protected function validateUserData($data) { if (empty($data) || !is_array($data)) { throw new PhabricatorOAuthProviderException(); } return true; } public static function newProvider($which) { switch ($which) { case self::PROVIDER_FACEBOOK: $class = 'PhabricatorOAuthProviderFacebook'; break; case self::PROVIDER_GITHUB: $class = 'PhabricatorOAuthProviderGitHub'; break; case self::PROVIDER_GOOGLE: $class = 'PhabricatorOAuthProviderGoogle'; break; case self::PROVIDER_PHABRICATOR: $class = 'PhabricatorOAuthProviderPhabricator'; break; case self::PROVIDER_DISQUS: $class = 'PhabricatorOAuthProviderDisqus'; break; default: throw new Exception('Unknown OAuth provider.'); } return newv($class, array()); } public static function getAllProviders() { $all = array( self::PROVIDER_FACEBOOK, self::PROVIDER_GITHUB, self::PROVIDER_GOOGLE, self::PROVIDER_PHABRICATOR, self::PROVIDER_DISQUS, ); $providers = array(); foreach ($all as $provider) { $providers[$provider] = self::newProvider($provider); } return $providers; } } diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php index 7d3005ecb..ae8ee54f1 100644 --- a/src/applications/differential/view/DifferentialChangesetListView.php +++ b/src/applications/differential/view/DifferentialChangesetListView.php @@ -1,318 +1,318 @@ changesets = $changesets; return $this; } public function setVisibleChangesets($visible_changesets) { $this->visibleChangesets = $visible_changesets; return $this; } public function setInlineCommentControllerURI($uri) { $this->inlineURI = $uri; return $this; } public function setUser(PhabricatorUser $user) { $this->user = $user; return $this; } public function setRepository(PhabricatorRepository $repository) { $this->repository = $repository; return $this; } public function setDiff(DifferentialDiff $diff) { $this->diff = $diff; return $this; } public function setRenderingReferences(array $references) { $this->references = $references; return $this; } public function setSymbolIndexes(array $indexes) { $this->symbolIndexes = $indexes; return $this; } public function setRenderURI($render_uri) { $this->renderURI = $render_uri; return $this; } public function setWhitespace($whitespace) { $this->whitespace = $whitespace; return $this; } public function setVsMap(array $vs_map) { $this->vsMap = $vs_map; return $this; } public function getVsMap() { return $this->vsMap; } public function setStandaloneURI($uri) { $this->standaloneURI = $uri; return $this; } public function setRawFileURIs($l, $r) { $this->leftRawFileURI = $l; $this->rightRawFileURI = $r; return $this; } public function render() { require_celerity_resource('differential-changeset-view-css'); $changesets = $this->changesets; // TODO: Restore this once we make it through the redesign, it has funky // interactions with things and there are various reports that it's slow. // Javelin::initBehavior('buoyant', array()); Javelin::initBehavior('differential-toggle-files', array()); $output = array(); $mapping = array(); foreach ($changesets as $key => $changeset) { $file = $changeset->getFilename(); $class = 'differential-changeset'; if (!$this->inlineURI) { $class .= ' differential-changeset-noneditable'; } $ref = $this->references[$key]; $detail = new DifferentialChangesetDetailView(); $view_options = $this->renderViewOptionsDropdown( $detail, $ref, $changeset); $prefs = $this->user->loadPreferences(); $pref_symbols = $prefs->getPreference( PhabricatorUserPreferences::PREFERENCE_DIFFUSION_SYMBOLS); $detail->setChangeset($changeset); $detail->addButton($view_options); if ($pref_symbols != 'disabled') { $detail->setSymbolIndex(idx($this->symbolIndexes, $key)); } $detail->setVsChangesetID(idx($this->vsMap, $changeset->getID())); $detail->setEditable(true); $uniq_id = 'diff-'.$changeset->getAnchorName(); if (isset($this->visibleChangesets[$key])) { $load = 'Loading...'; $mapping[$uniq_id] = $ref; } else { $load = javelin_render_tag( 'a', array( 'href' => '#'.$uniq_id, 'meta' => array( 'id' => $uniq_id, 'ref' => $ref, 'kill' => true, ), 'sigil' => 'differential-load', 'mustcapture' => true, ), 'Load'); } $detail->appendChild( phutil_render_tag( 'div', array( 'id' => $uniq_id, ), '| %s | '. '%s | '. '|||
'.$home_link.'
'; $settings_link = phutil_render_tag( 'a', array( - 'href' => '/settings/page/email/', + 'href' => '/settings/panel/email/', ), 'Return to Email Settings'); $settings_link = ''.$settings_link.'
'; if (!$email) { $content = id(new AphrontErrorView()) ->setTitle('Unable To Verify') ->appendChild( 'The verification code is incorrect, the email address has '. 'been removed, or the email address is owned by another user. Make '. 'sure you followed the link in the email correctly.
'); } else if ($email->getIsVerified()) { $content = id(new AphrontErrorView()) ->setSeverity(AphrontErrorView::SEVERITY_NOTICE) ->setTitle('Address Already Verified') ->appendChild( 'This email address has already been verified.
'. $settings_link); } else { $guard = AphrontWriteGuard::beginScopedUnguardedWrites(); $email->setIsVerified(1); $email->save(); unset($guard); $content = id(new AphrontErrorView()) ->setSeverity(AphrontErrorView::SEVERITY_NOTICE) ->setTitle('Address Verified') ->appendChild( 'This email address has now been verified. Thanks!
'. $home_link. $settings_link); } return $this->buildStandardPageResponse( $content, array( 'title' => 'Verify Email', )); } } diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php index 3d60cec5a..8f4a727fd 100644 --- a/src/applications/people/controller/PhabricatorPeopleProfileController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php @@ -1,237 +1,237 @@ username = idx($data, 'username'); $this->page = idx($data, 'page'); } public function getProfileUser() { return $this->profileUser; } public function processRequest() { $viewer = $this->getRequest()->getUser(); $user = id(new PhabricatorUser())->loadOneWhere( 'userName = %s', $this->username); if (!$user) { return new Aphront404Response(); } $this->profileUser = $user; require_celerity_resource('phabricator-profile-css'); $profile = id(new PhabricatorUserProfile())->loadOneWhere( 'userPHID = %s', $user->getPHID()); if (!$profile) { $profile = new PhabricatorUserProfile(); } $username = phutil_escape_uri($user->getUserName()); $nav = new AphrontSideNavFilterView(); $nav->setBaseURI(new PhutilURI('/p/'.$username.'/')); $nav->addFilter('feed', 'Feed'); $nav->addFilter('about', 'About'); $nav->addSpacer(); $nav->addLabel('Activity'); $external_arrow = "\xE2\x86\x97"; $nav->addFilter( null, "Revisions {$external_arrow}", '/differential/filter/revisions/'.$username.'/'); $nav->addFilter( null, "Tasks {$external_arrow}", '/maniphest/view/action/?users='.$user->getPHID()); $nav->addFilter( null, "Commits {$external_arrow}", '/audit/view/author/'.$username.'/'); $oauths = id(new PhabricatorUserOAuthInfo())->loadAllWhere( 'userID = %d', $user->getID()); $oauths = mpull($oauths, null, 'getOAuthProvider'); $providers = PhabricatorOAuthProvider::getAllProviders(); $added_spacer = false; foreach ($providers as $provider) { if (!$provider->isProviderEnabled()) { continue; } $provider_key = $provider->getProviderKey(); if (!isset($oauths[$provider_key])) { continue; } $name = $provider->getProviderName().' Profile'; $href = $oauths[$provider_key]->getAccountURI(); if ($href) { if (!$added_spacer) { $nav->addSpacer(); $nav->addLabel('Linked Accounts'); $added_spacer = true; } $nav->addFilter(null, $name.' '.$external_arrow, $href); } } $this->page = $nav->selectFilter($this->page, 'feed'); switch ($this->page) { case 'feed': $content = $this->renderUserFeed($user); break; case 'about': $content = $this->renderBasicInformation($user, $profile); break; default: throw new Exception("Unknown page '{$this->page}'!"); } $picture = $user->loadProfileImageURI(); $header = new PhabricatorProfileHeaderView(); $header ->setProfilePicture($picture) ->setName($user->getUserName().' ('.$user->getRealName().')') ->setDescription($profile->getTitle()); if ($user->getIsDisabled()) { $header->setStatus('Disabled'); } else { $statuses = id(new PhabricatorUserStatus())->loadCurrentStatuses( array($user->getPHID())); if ($statuses) { $header->setStatus(reset($statuses)->getStatusDescription($viewer)); } } $header->appendChild($nav); $nav->appendChild( '| PHID | '.phutil_escape_html($user->getPHID()).' |
|---|---|
| User Since | '.phabricator_datetime($user->getDateCreated(), $viewer). ' |
| Blurb | '.$blurb.' |
|---|
Your changes have been saved.
'); $notice = $notice->render(); } } else { $notice = new AphrontErrorView(); $notice->setTitle('Form Errors'); $notice->setErrors($errors); $notice = $notice->render(); } $timezone_ids = DateTimeZone::listIdentifiers(); $timezone_id_map = array_combine($timezone_ids, $timezone_ids); $form = new AphrontFormView(); $form ->setUser($user) - ->setEncType('multipart/form-data') ->appendChild( id(new AphrontFormStaticControl()) ->setLabel('Username') ->setValue($user->getUsername())) ->appendChild( id(new AphrontFormTextControl()) ->setLabel('Real Name') ->setName('realname') ->setError($e_realname) ->setValue($user->getRealName()) ->setDisabled(!$editable)) ->appendChild( id(new AphrontFormSelectControl()) ->setLabel('Timezone') ->setName('timezone') ->setOptions($timezone_id_map) ->setValue($user->getTimezoneIdentifier())) ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Save')); $panel = new AphrontPanelView(); $panel->setHeader('Account Settings'); $panel->setWidth(AphrontPanelView::WIDTH_FORM); $panel->appendChild($form); - return id(new AphrontNullView()) - ->appendChild( - array( - $notice, - $panel, - )); + return array( + $notice, + $panel, + ); } } diff --git a/src/applications/settings/panel/PhabricatorUserConduitSettingsPanelController.php b/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php similarity index 83% rename from src/applications/settings/panel/PhabricatorUserConduitSettingsPanelController.php rename to src/applications/settings/panel/PhabricatorSettingsPanelConduit.php index 2946374ff..d009e0ba5 100644 --- a/src/applications/settings/panel/PhabricatorUserConduitSettingsPanelController.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php @@ -1,114 +1,123 @@ getRequest(); + public function getPanelGroup() { + return pht('Authentication'); + } + + public function processRequest(AphrontRequest $request) { $user = $request->getUser(); if ($request->isFormPost()) { if (!$request->isDialogFormPost()) { $dialog = new AphrontDialogView(); $dialog->setUser($user); $dialog->setTitle('Really regenerate session?'); - $dialog->setSubmitURI('/settings/page/conduit/'); + $dialog->setSubmitURI($this->getPanelURI()); $dialog->addSubmitButton('Regenerate'); - $dialog->addCancelbutton('/settings/page/conduit/'); + $dialog->addCancelbutton($this->getPanelURI()); $dialog->appendChild( 'Really destroy the old certificate? Any established '. 'sessions will be terminated.'); return id(new AphrontDialogResponse()) ->setDialog($dialog); } $conn = $user->establishConnection('w'); queryfx( $conn, 'DELETE FROM %T WHERE userPHID = %s AND type LIKE %>', PhabricatorUser::SESSION_TABLE, $user->getPHID(), 'conduit'); // This implicitly regenerates the certificate. $user->setConduitCertificate(null); $user->save(); return id(new AphrontRedirectResponse()) - ->setURI('/settings/page/conduit/?regenerated=true'); + ->setURI($this->getPanelURI('?regenerated=true')); } if ($request->getStr('regenerated')) { $notice = new AphrontErrorView(); $notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE); $notice->setTitle('Certificate Regenerated'); $notice->appendChild( '
Your old certificate has been destroyed and you have been issued '. 'a new certificate. Sessions established under the old certificate '. 'are no longer valid.
'); $notice = $notice->render(); } else { $notice = null; } $cert_form = new AphrontFormView(); $cert_form ->setUser($user) ->appendChild( 'This certificate allows you to '. 'authenticate over Conduit, the Phabricator API. Normally, you just '. 'run arc install-certificate to install it.') ->appendChild( id(new AphrontFormTextAreaControl()) ->setLabel('Certificate') ->setHeight(AphrontFormTextAreaControl::HEIGHT_SHORT) ->setValue($user->getConduitCertificate())); $cert = new AphrontPanelView(); $cert->setHeader('Arcanist Certificate'); $cert->appendChild($cert_form); $cert->setWidth(AphrontPanelView::WIDTH_FORM); $regen_form = new AphrontFormView(); $regen_form ->setUser($user) - ->setAction('/settings/page/conduit/') + ->setAction($this->getPanelURI()) + ->setWorkflow(true) ->appendChild( '
You can regenerate this '. 'certificate, which will invalidate the old certificate and create '. 'a new one.
') ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Regenerate Certificate')); $regen = new AphrontPanelView(); $regen->setHeader('Regenerate Certificate'); $regen->appendChild($regen_form); $regen->setWidth(AphrontPanelView::WIDTH_FORM); - return id(new AphrontNullView()) - ->appendChild( - array( - $notice, - $cert, - $regen, - )); + return array( + $notice, + $cert, + $regen, + ); } } diff --git a/src/applications/settings/panel/PhabricatorUserPreferenceSettingsPanelController.php b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php similarity index 89% rename from src/applications/settings/panel/PhabricatorUserPreferenceSettingsPanelController.php rename to src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php index 09d5c10ce..5d78441ca 100644 --- a/src/applications/settings/panel/PhabricatorUserPreferenceSettingsPanelController.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php @@ -1,141 +1,148 @@ getRequest(); + public function getPanelGroup() { + return pht('Application Settings'); + } + + public function processRequest(AphrontRequest $request) { $user = $request->getUser(); $preferences = $user->loadPreferences(); $pref_monospaced = PhabricatorUserPreferences::PREFERENCE_MONOSPACED; $pref_editor = PhabricatorUserPreferences::PREFERENCE_EDITOR; $pref_titles = PhabricatorUserPreferences::PREFERENCE_TITLES; $pref_symbols = PhabricatorUserPreferences::PREFERENCE_DIFFUSION_SYMBOLS; if ($request->isFormPost()) { $monospaced = $request->getStr($pref_monospaced); // Prevent the user from doing stupid things. $monospaced = preg_replace('/[^a-z0-9 ,"]+/i', '', $monospaced); $preferences->setPreference($pref_titles, $request->getStr($pref_titles)); $preferences->setPreference($pref_editor, $request->getStr($pref_editor)); $preferences->setPreference($pref_symbols, $request->getStr($pref_symbols)); $preferences->setPreference($pref_monospaced, $monospaced); $preferences->save(); return id(new AphrontRedirectResponse()) - ->setURI('/settings/page/preferences/?saved=true'); + ->setURI($this->getPanelURI('?saved=true')); } $example_string = <<'.
phutil_escape_html($example_string).
''))
->appendChild(
id(new AphrontFormRadioButtonControl())
->setLabel('Symbol Links')
->setName($pref_symbols)
->setValue($preferences->getPreference($pref_symbols) ?: 'enabled')
->addButton('enabled', 'Enabled (default)',
'Use this setting to disable linking symbol names in Differential '.
'and Diffusion to their definitions. This is enabled by default.')
->addButton('disabled', 'Disabled', null))
->appendChild(
id(new AphrontFormSubmitControl())
->setValue('Save Preferences'));
$panel = new AphrontPanelView();
$panel->setWidth(AphrontPanelView::WIDTH_WIDE);
$panel->setHeader('Display Preferences');
$panel->appendChild($form);
$error_view = null;
if ($request->getStr('saved') === 'true') {
$error_view = id(new AphrontErrorView())
->setTitle('Preferences Saved')
->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
->setErrors(array('Your preferences have been saved.'));
}
- return id(new AphrontNullView())
- ->appendChild(
- array(
- $error_view,
- $panel,
- ));
+ return array(
+ $error_view,
+ $panel,
+ );
}
}
diff --git a/src/applications/settings/panel/PhabricatorUserEmailSettingsPanelController.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
similarity index 88%
rename from src/applications/settings/panel/PhabricatorUserEmailSettingsPanelController.php
rename to src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
index e3af10992..f541d3d5f 100644
--- a/src/applications/settings/panel/PhabricatorUserEmailSettingsPanelController.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
@@ -1,348 +1,370 @@
getRequest();
+ public function processRequest(AphrontRequest $request) {
$user = $request->getUser();
- $editable = $this->getAccountEditable();
+ $editable = PhabricatorEnv::getEnvConfig('account.editable');
$uri = $request->getRequestURI();
$uri->setQueryParams(array());
if ($editable) {
$new = $request->getStr('new');
if ($new) {
- return $this->returnNewAddressResponse($uri, $new);
+ return $this->returnNewAddressResponse($request, $uri, $new);
}
$delete = $request->getInt('delete');
if ($delete) {
- return $this->returnDeleteAddressResponse($uri, $delete);
+ return $this->returnDeleteAddressResponse($request, $uri, $delete);
}
}
$verify = $request->getInt('verify');
if ($verify) {
- return $this->returnVerifyAddressResponse($uri, $verify);
+ return $this->returnVerifyAddressResponse($request, $uri, $verify);
}
$primary = $request->getInt('primary');
if ($primary) {
- return $this->returnPrimaryAddressResponse($uri, $primary);
+ return $this->returnPrimaryAddressResponse($request, $uri, $primary);
}
$emails = id(new PhabricatorUserEmail())->loadAllWhere(
'userPHID = %s ORDER BY address',
$user->getPHID());
$rowc = array();
$rows = array();
foreach ($emails as $email) {
$button_verify = javelin_render_tag(
'a',
array(
'class' => 'button small grey',
'href' => $uri->alter('verify', $email->getID()),
'sigil' => 'workflow',
),
'Verify');
$button_make_primary = javelin_render_tag(
'a',
array(
'class' => 'button small grey',
'href' => $uri->alter('primary', $email->getID()),
'sigil' => 'workflow',
),
'Make Primary');
$button_remove = javelin_render_tag(
'a',
array(
'class' => 'button small grey',
'href' => $uri->alter('delete', $email->getID()),
'sigil' => 'workflow'
),
'Remove');
$button_primary = phutil_render_tag(
'a',
array(
'class' => 'button small disabled',
),
'Primary');
if (!$email->getIsVerified()) {
$action = $button_verify;
} else if ($email->getIsPrimary()) {
$action = $button_primary;
} else {
$action = $button_make_primary;
}
if ($email->getIsPrimary()) {
$remove = $button_primary;
$rowc[] = 'highlighted';
} else {
$remove = $button_remove;
$rowc[] = null;
}
$rows[] = array(
phutil_escape_html($email->getAddress()),
$action,
$remove,
);
}
$table = new AphrontTableView($rows);
$table->setHeaders(
array(
'Email',
'Status',
'Remove',
));
$table->setColumnClasses(
array(
'wide',
'action',
'action',
));
$table->setRowClasses($rowc);
$table->setColumnVisibility(
array(
true,
true,
$editable,
));
$view = new AphrontPanelView();
if ($editable) {
$view->addButton(
javelin_render_tag(
'a',
array(
'href' => $uri->alter('new', 'true'),
'class' => 'green button',
'sigil' => 'workflow',
),
'Add New Address'));
}
$view->setHeader('Email Addresses');
$view->appendChild($table);
return $view;
}
- private function returnNewAddressResponse(PhutilURI $uri, $new) {
- $request = $this->getRequest();
+ private function returnNewAddressResponse(
+ AphrontRequest $request,
+ PhutilURI $uri,
+ $new) {
+
$user = $request->getUser();
$e_email = true;
$email = trim($request->getStr('email'));
$errors = array();
if ($request->isDialogFormPost()) {
if ($new == 'verify') {
// The user clicked "Done" from the "an email has been sent" dialog.
return id(new AphrontReloadResponse())->setURI($uri);
}
if (!strlen($email)) {
$e_email = 'Required';
$errors[] = 'Email is required.';
} else if (!PhabricatorUserEmail::isAllowedAddress($email)) {
$e_email = 'Invalid';
$errors[] = PhabricatorUserEmail::describeAllowedAddresses();
}
if (!$errors) {
$object = id(new PhabricatorUserEmail())
->setAddress($email)
->setIsVerified(0);
try {
id(new PhabricatorUserEditor())
->setActor($user)
->addEmail($user, $object);
$object->sendVerificationEmail($user);
$dialog = id(new AphrontDialogView())
->setUser($user)
->addHiddenInput('new', 'verify')
->setTitle('Verification Email Sent')
->appendChild(
'A verification email has been sent. Click the link in the '. 'email to verify your address.
') ->setSubmitURI($uri) ->addSubmitButton('Done'); return id(new AphrontDialogResponse())->setDialog($dialog); } catch (AphrontQueryDuplicateKeyException $ex) { $email = 'Duplicate'; $errors[] = 'Another user already has this email.'; } } } if ($errors) { $errors = id(new AphrontErrorView()) ->setWidth(AphrontErrorView::WIDTH_DIALOG) ->setErrors($errors); } $form = id(new AphrontFormLayoutView()) ->appendChild( id(new AphrontFormTextControl()) ->setLabel('Email') ->setName('email') ->setValue($request->getStr('email')) ->setCaption(PhabricatorUserEmail::describeAllowedAddresses()) ->setError($e_email)); $dialog = id(new AphrontDialogView()) ->setUser($user) ->addHiddenInput('new', 'true') ->setTitle('New Address') ->appendChild($errors) ->appendChild($form) ->addSubmitButton('Save') ->addCancelButton($uri); return id(new AphrontDialogResponse())->setDialog($dialog); } - private function returnDeleteAddressResponse(PhutilURI $uri, $email_id) { - $request = $this->getRequest(); + private function returnDeleteAddressResponse( + AphrontRequest $request, + PhutilURI $uri, + $email_id) { + $user = $request->getUser(); // NOTE: You can only delete your own email addresses, and you can not // delete your primary address. $email = id(new PhabricatorUserEmail())->loadOneWhere( 'id = %d AND userPHID = %s AND isPrimary = 0', $email_id, $user->getPHID()); if (!$email) { return new Aphront404Response(); } if ($request->isFormPost()) { id(new PhabricatorUserEditor()) ->setActor($user) ->removeEmail($user, $email); return id(new AphrontRedirectResponse())->setURI($uri); } $address = $email->getAddress(); $dialog = id(new AphrontDialogView()) ->setUser($user) ->addHiddenInput('delete', $email_id) ->setTitle("Really delete address '{$address}'?") ->appendChild( 'Are you sure you want to delete this address? You will no '. 'longer be able to use it to login.
') ->addSubmitButton('Delete') ->addCancelButton($uri); return id(new AphrontDialogResponse())->setDialog($dialog); } - private function returnVerifyAddressResponse(PhutilURI $uri, $email_id) { - $request = $this->getRequest(); + private function returnVerifyAddressResponse( + AphrontRequest $request, + PhutilURI $uri, + $email_id) { + $user = $request->getUser(); // NOTE: You can only send more email for your unverified addresses. $email = id(new PhabricatorUserEmail())->loadOneWhere( 'id = %d AND userPHID = %s AND isVerified = 0', $email_id, $user->getPHID()); if (!$email) { return new Aphront404Response(); } if ($request->isFormPost()) { $email->sendVerificationEmail($user); return id(new AphrontRedirectResponse())->setURI($uri); } $address = $email->getAddress(); $dialog = id(new AphrontDialogView()) ->setUser($user) ->addHiddenInput('verify', $email_id) ->setTitle("Send Another Verification Email?") ->appendChild( 'Send another copy of the verification email to '. phutil_escape_html($address).'?
') ->addSubmitButton('Send Email') ->addCancelButton($uri); return id(new AphrontDialogResponse())->setDialog($dialog); } - private function returnPrimaryAddressResponse(PhutilURI $uri, $email_id) { - $request = $this->getRequest(); + private function returnPrimaryAddressResponse( + AphrontRequest $request, + PhutilURI $uri, + $email_id) { + $user = $request->getUser(); // NOTE: You can only make your own verified addresses primary. $email = id(new PhabricatorUserEmail())->loadOneWhere( 'id = %d AND userPHID = %s AND isVerified = 1 AND isPrimary = 0', $email_id, $user->getPHID()); if (!$email) { return new Aphront404Response(); } if ($request->isFormPost()) { id(new PhabricatorUserEditor()) ->setActor($user) ->changePrimaryEmail($user, $email); return id(new AphrontRedirectResponse())->setURI($uri); } $address = $email->getAddress(); $dialog = id(new AphrontDialogView()) ->setUser($user) ->addHiddenInput('primary', $email_id) ->setTitle("Change primary email address?") ->appendChild( 'If you change your primary address, Phabricator will send all '. 'email to '.phutil_escape_html($address).'.
') ->addSubmitButton('Change Primary Address') ->addCancelButton($uri); return id(new AphrontDialogResponse())->setDialog($dialog); } } diff --git a/src/applications/settings/panel/PhabricatorUserEmailPreferenceSettingsPanelController.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php similarity index 95% rename from src/applications/settings/panel/PhabricatorUserEmailPreferenceSettingsPanelController.php rename to src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php index f411636eb..a3d8d127a 100644 --- a/src/applications/settings/panel/PhabricatorUserEmailPreferenceSettingsPanelController.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php @@ -1,263 +1,274 @@ getRequest(); + public function getPanelKey() { + return 'emailpreferences'; + } + + public function getPanelName() { + return pht('Email Preferences'); + } + + public function getPanelGroup() { + return pht('Email'); + } + + public function processRequest(AphrontRequest $request) { $user = $request->getUser(); $preferences = $user->loadPreferences(); $pref_re_prefix = PhabricatorUserPreferences::PREFERENCE_RE_PREFIX; $pref_vary = PhabricatorUserPreferences::PREFERENCE_VARY_SUBJECT; $pref_no_self_mail = PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL; $errors = array(); if ($request->isFormPost()) { if (PhabricatorMetaMTAMail::shouldMultiplexAllMail()) { if ($request->getStr($pref_re_prefix) == 'default') { $preferences->unsetPreference($pref_re_prefix); } else { $preferences->setPreference( $pref_re_prefix, $request->getBool($pref_re_prefix)); } if ($request->getStr($pref_vary) == 'default') { $preferences->unsetPreference($pref_vary); } else { $preferences->setPreference( $pref_vary, $request->getBool($pref_vary)); } } $preferences->setPreference( $pref_no_self_mail, $request->getStr($pref_no_self_mail)); $new_tags = $request->getArr('mailtags'); $mailtags = $preferences->getPreference('mailtags', array()); foreach ($this->getMailTags() as $key => $label) { $mailtags[$key] = (bool)idx($new_tags, $key, false); } $preferences->setPreference('mailtags', $mailtags); $preferences->save(); return id(new AphrontRedirectResponse()) - ->setURI('/settings/page/emailpref/?saved=true'); + ->setURI($this->getPanelURI('?saved=true')); } $notice = null; if (!$errors) { if ($request->getStr('saved')) { $notice = new AphrontErrorView(); $notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE); $notice->setTitle('Changes Saved'); $notice->appendChild('Your changes have been saved.
'); } } else { $notice = new AphrontErrorView(); $notice->setTitle('Form Errors'); $notice->setErrors($errors); } $re_prefix_default = PhabricatorEnv::getEnvConfig('metamta.re-prefix') ? 'Enabled' : 'Disabled'; $vary_default = PhabricatorEnv::getEnvConfig('metamta.vary-subjects') ? 'Vary' : 'Do Not Vary'; $re_prefix_value = $preferences->getPreference($pref_re_prefix); if ($re_prefix_value === null) { $re_prefix_value = 'default'; } else { $re_prefix_value = $re_prefix_value ? 'true' : 'false'; } $vary_value = $preferences->getPreference($pref_vary); if ($vary_value === null) { $vary_value = 'default'; } else { $vary_value = $vary_value ? 'true' : 'false'; } $form = new AphrontFormView(); $form ->setUser($user) ->appendChild( id(new AphrontFormSelectControl()) ->setLabel('Self Actions') ->setName($pref_no_self_mail) ->setOptions( array( '0' => 'Send me an email when I take an action', '1' => 'Do not send me an email when I take an action', )) ->setCaption('You can disable email about your own actions.') ->setValue($preferences->getPreference($pref_no_self_mail, 0))); if (PhabricatorMetaMTAMail::shouldMultiplexAllMail()) { $re_control = id(new AphrontFormSelectControl()) ->setName($pref_re_prefix) ->setOptions( array( 'default' => 'Use Server Default ('.$re_prefix_default.')', 'true' => 'Enable "Re:" prefix', 'false' => 'Disable "Re:" prefix', )) ->setValue($re_prefix_value); $vary_control = id(new AphrontFormSelectControl()) ->setName($pref_vary) ->setOptions( array( 'default' => 'Use Server Default ('.$vary_default.')', 'true' => 'Vary Subjects', 'false' => 'Do Not Vary Subjects', )) ->setValue($vary_value); } else { $re_control = id(new AphrontFormStaticControl()) ->setValue('Server Default ('.$re_prefix_default.')'); $vary_control = id(new AphrontFormStaticControl()) ->setValue('Server Default ('.$vary_default.')'); } $form ->appendChild( $re_control ->setLabel('Add "Re:" Prefix') ->setCaption( 'Enable this option to fix threading in Mail.app on OS X Lion, '. 'or if you like "Re:" in your email subjects.')) ->appendChild( $vary_control ->setLabel('Vary Subjects') ->setCaption( 'This option adds more information to email subjects, but may '. 'break threading in some clients.')); $form ->appendChild( ''. 'You can customize what mail you receive from Phabricator here.'. '
'. ''. 'NOTE: If an update makes several changes (like '. 'adding CCs to a task, closing it, and adding a comment) you will '. 'still receive an email as long as at least one of the changes '. 'is set to notify you.'. '
' ); $mailtags = $preferences->getPreference('mailtags', array()); $form ->appendChild( $this->buildMailTagCheckboxes( $this->getDifferentialMailTags(), $mailtags) ->setLabel('Differential')) ->appendChild( $this->buildMailTagCheckboxes( $this->getManiphestMailTags(), $mailtags) ->setLabel('Maniphest')); $form ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Save Preferences')); $panel = new AphrontPanelView(); $panel->setHeader('Email Preferences'); $panel->setWidth(AphrontPanelView::WIDTH_FORM); $panel->appendChild($form); return id(new AphrontNullView()) ->appendChild( array( $notice, $panel, )); } private function getMailTags() { return array( MetaMTANotificationType::TYPE_DIFFERENTIAL_CC => "Send me email when a revision's CCs change.", MetaMTANotificationType::TYPE_DIFFERENTIAL_CLOSED => "Send me email when a revision is closed.", MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS => "Send me email when a task's associated projects change.", MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY => "Send me email when a task's priority changes.", MetaMTANotificationType::TYPE_MANIPHEST_CC => "Send me email when a task's CCs change.", ); } private function getManiphestMailTags() { return array_select_keys( $this->getMailTags(), array( MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS, MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY, MetaMTANotificationType::TYPE_MANIPHEST_CC, )); } private function getDifferentialMailTags() { return array_select_keys( $this->getMailTags(), array( MetaMTANotificationType::TYPE_DIFFERENTIAL_CC, MetaMTANotificationType::TYPE_DIFFERENTIAL_CLOSED, )); } private function buildMailTagCheckboxes( array $tags, array $prefs) { $control = new AphrontFormCheckboxControl(); foreach ($tags as $key => $label) { $control->addCheckbox( 'mailtags['.$key.']', 1, $label, idx($prefs, $key, 1)); } return $control; } } diff --git a/src/applications/settings/panel/PhabricatorUserLDAPSettingsPanelController.php b/src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php similarity index 82% rename from src/applications/settings/panel/PhabricatorUserLDAPSettingsPanelController.php rename to src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php index c422c1db7..c74143058 100644 --- a/src/applications/settings/panel/PhabricatorUserLDAPSettingsPanelController.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php @@ -1,87 +1,101 @@ getRequest(); - $user = $request->getUser(); + public function getPanelKey() { + return 'ldap'; + } + + public function getPanelName() { + return pht('LDAP'); + } + + public function getPanelGroup() { + return pht('Linked Accounts'); + } + + public function isEnabled() { + $ldap_provider = new PhabricatorLDAPProvider(); + return $ldap_provider->isProviderEnabled(); + } + + public function processRequest(AphrontRequest $request) { + $user = $request->getUser(); $ldap_info = id(new PhabricatorUserLDAPInfo())->loadOneWhere( 'userID = %d', $user->getID()); $forms = array(); if (!$ldap_info) { $unlink = 'Link LDAP Account'; $unlink_form = new AphrontFormView(); $unlink_form ->setUser($user) ->setAction('/ldap/login/') ->appendChild( 'There is currently no '. 'LDAP account linked to your Phabricator account. You can link an ' . 'account, which will allow you to use it to log into Phabricator
') ->appendChild( id(new AphrontFormTextControl()) ->setLabel('LDAP username') ->setName('username')) ->appendChild( id(new AphrontFormPasswordControl()) ->setLabel('Password') ->setName('password')) ->appendChild( id(new AphrontFormSubmitControl()) ->setValue("Link LDAP Account \xC2\xBB")); $forms['Link Account'] = $unlink_form; } else { $unlink = 'Unlink LDAP Account'; $unlink_form = new AphrontFormView(); $unlink_form ->setUser($user) ->appendChild( 'You may unlink this account '. 'from your LDAP account. This will prevent you from logging in with '. 'your LDAP credentials.
') ->appendChild( id(new AphrontFormSubmitControl()) ->addCancelButton('/ldap/unlink/', $unlink)); $forms['Unlink Account'] = $unlink_form; } $panel = new AphrontPanelView(); $panel->setHeader('LDAP Account Settings'); $panel->setWidth(AphrontPanelView::WIDTH_FORM); foreach ($forms as $name => $form) { if ($name) { $panel->appendChild('There is currently no '. phutil_escape_html($provider_name).' account linked to your '. 'Phabricator account. You can link an account, which will allow you '. 'to use it to log into Phabricator.
'); $this->prepareAuthForm($form); $form ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Link '.$provider_name." Account \xC2\xBB")); } else { $expires = $oauth_info->getTokenExpires(); $form ->appendChild( 'Your account is linked with '. 'a '.phutil_escape_html($provider_name).' account. You may use your '. phutil_escape_html($provider_name).' credentials to log into '. 'Phabricator.
') ->appendChild( id(new AphrontFormStaticControl()) ->setLabel($provider_name.' ID') ->setValue($oauth_info->getOAuthUID()) ) ->appendChild( id(new AphrontFormStaticControl()) ->setLabel($provider_name.' Name') ->setValue($oauth_info->getAccountName()) ) ->appendChild( id(new AphrontFormStaticControl()) ->setLabel($provider_name.' URI') ->setValue($oauth_info->getAccountURI()) ); if (!$expires || $expires > time()) { $form->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Refresh Profile Image from '.$provider_name) ); } if (!$provider->isProviderLinkPermanent()) { $unlink = 'Unlink '.$provider_name.' Account'; $unlink_form = new AphrontFormView(); $unlink_form ->setUser($user) ->appendChild( 'You may unlink this account '. 'from your '.phutil_escape_html($provider_name).' account. This '. 'will prevent you from logging in with your '. phutil_escape_html($provider_name).' credentials.
') ->appendChild( id(new AphrontFormSubmitControl()) ->addCancelButton('/oauth/'.$provider_key.'/unlink/', $unlink)); $forms['Unlink Account'] = $unlink_form; } if ($expires) { if ($expires <= time()) { $expires_text = "Expired"; } else { $expires_text = phabricator_datetime($expires, $user); } } else { $expires_text = 'No Information Available'; } $scope = $oauth_info->getTokenScope(); if (!$scope) { $scope = 'No Information Available'; } $status = $oauth_info->getTokenStatus(); $status = PhabricatorUserOAuthInfo::getReadableTokenStatus($status); $token_form = new AphrontFormView(); $token_form ->setUser($user) ->appendChild( 'insert rap about tokens
') ->appendChild( id(new AphrontFormStaticControl()) ->setLabel('Token Status') ->setValue($status)) ->appendChild( id(new AphrontFormStaticControl()) ->setLabel('Expires') ->setValue($expires_text)) ->appendChild( id(new AphrontFormStaticControl()) ->setLabel('Scope') ->setValue($scope)); if ($expires <= time()) { $this->prepareAuthForm($token_form); $token_form ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Refresh '.$provider_name.' Token') ); } $forms['Account Token Information'] = $token_form; } $panel = new AphrontPanelView(); $panel->setHeader($provider_name.' Account Settings'); $panel->setWidth(AphrontPanelView::WIDTH_FORM); foreach ($forms as $name => $form) { if ($name) { $panel->appendChild('Your password has been updated.
'); } } else { $notice = new AphrontErrorView(); $notice->setTitle('Error Changing Password'); $notice->setErrors($errors); } $len_caption = null; if ($min_len) { $len_caption = 'Minimum password length: '.$min_len.' characters.'; } $form = new AphrontFormView(); $form ->setUser($user) ->addHiddenInput('token', $token); if (!$valid_token) { $form->appendChild( id(new AphrontFormPasswordControl()) ->setLabel('Old Password') ->setError($e_old) ->setName('old_pw')); } $form ->appendChild( id(new AphrontFormPasswordControl()) ->setLabel('New Password') ->setError($e_new) ->setName('new_pw')); $form ->appendChild( id(new AphrontFormPasswordControl()) ->setLabel('Confirm Password') ->setCaption($len_caption) ->setError($e_conf) ->setName('conf_pw')); $form ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Save')); $panel = new AphrontPanelView(); $panel->setHeader('Change Password'); $panel->setWidth(AphrontPanelView::WIDTH_FORM); $panel->appendChild($form); - return id(new AphrontNullView()) - ->appendChild( - array( - $notice, - $panel, - )); + return array( + $notice, + $panel, + ); } } diff --git a/src/applications/settings/panel/PhabricatorUserProfileSettingsPanelController.php b/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php similarity index 92% rename from src/applications/settings/panel/PhabricatorUserProfileSettingsPanelController.php rename to src/applications/settings/panel/PhabricatorSettingsPanelProfile.php index 26f0fa591..3ef026961 100644 --- a/src/applications/settings/panel/PhabricatorUserProfileSettingsPanelController.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php @@ -1,218 +1,225 @@ getRequest(); + public function getPanelGroup() { + return pht('Account Information'); + } + + public function processRequest(AphrontRequest $request) { $user = $request->getUser(); $profile = id(new PhabricatorUserProfile())->loadOneWhere( 'userPHID = %s', $user->getPHID()); if (!$profile) { $profile = new PhabricatorUserProfile(); $profile->setUserPHID($user->getPHID()); } $supported_formats = PhabricatorFile::getTransformableImageFormats(); $e_image = null; $errors = array(); if ($request->isFormPost()) { $profile->setTitle($request->getStr('title')); $profile->setBlurb($request->getStr('blurb')); $sex = $request->getStr('sex'); $sexes = array(PhutilPerson::SEX_MALE, PhutilPerson::SEX_FEMALE); if (in_array($sex, $sexes)) { $user->setSex($sex); } else { $user->setSex(null); } // Checked in runtime. $user->setTranslation($request->getStr('translation')); $default_image = $request->getExists('default_image'); if ($default_image) { $profile->setProfileImagePHID(null); $user->setProfileImagePHID(null); } else if (!empty($_FILES['image'])) { $err = idx($_FILES['image'], 'error'); if ($err != UPLOAD_ERR_NO_FILE) { $file = PhabricatorFile::newFromPHPUpload( $_FILES['image'], array( 'authorPHID' => $user->getPHID(), )); $okay = $file->isTransformableImage(); if ($okay) { $xformer = new PhabricatorImageTransformer(); // Generate the large picture for the profile page. $large_xformed = $xformer->executeProfileTransform( $file, $width = 280, $min_height = 140, $max_height = 420); $profile->setProfileImagePHID($large_xformed->getPHID()); // Generate the small picture for comments, etc. $small_xformed = $xformer->executeProfileTransform( $file, $width = 50, $min_height = 50, $max_height = 50); $user->setProfileImagePHID($small_xformed->getPHID()); } else { $e_image = 'Not Supported'; $errors[] = 'This server only supports these image formats: '. implode(', ', $supported_formats).'.'; } } } if (!$errors) { $user->save(); $profile->save(); $response = id(new AphrontRedirectResponse()) - ->setURI('/settings/page/profile/?saved=true'); + ->setURI($this->getPanelURI('?saved=true')); return $response; } } $error_view = null; if ($errors) { $error_view = new AphrontErrorView(); $error_view->setTitle('Form Errors'); $error_view->setErrors($errors); } else { if ($request->getStr('saved')) { $error_view = new AphrontErrorView(); $error_view->setSeverity(AphrontErrorView::SEVERITY_NOTICE); $error_view->setTitle('Changes Saved'); $error_view->appendChild('Your changes have been saved.
'); $error_view = $error_view->render(); } } $img_src = $user->loadProfileImageURI(); $profile_uri = PhabricatorEnv::getURI('/p/'.$user->getUsername().'/'); $sexes = array( PhutilPerson::SEX_UNKNOWN => 'Unknown', PhutilPerson::SEX_MALE => 'Male', PhutilPerson::SEX_FEMALE => 'Female', ); $translations = array(); $symbols = id(new PhutilSymbolLoader()) ->setType('class') ->setAncestorClass('PhabricatorTranslation') ->setConcreteOnly(true) ->selectAndLoadSymbols(); foreach ($symbols as $symbol) { $class = $symbol['name']; $translations[$class] = newv($class, array())->getName(); } asort($translations); $default = PhabricatorEnv::newObjectFromConfig('translation.provider'); $translations = array( '' => 'Server Default ('.$default->getName().')', ) + $translations; $form = new AphrontFormView(); $form ->setUser($request->getUser()) - ->setAction('/settings/page/profile/') ->setEncType('multipart/form-data') ->appendChild( id(new AphrontFormTextControl()) ->setLabel('Title') ->setName('title') ->setValue($profile->getTitle()) ->setCaption('Serious business title.')) ->appendChild( id(new AphrontFormSelectControl()) ->setOptions($sexes) ->setLabel('Sex') ->setName('sex') ->setValue($user->getSex())) ->appendChild( id(new AphrontFormSelectControl()) ->setOptions($translations) ->setLabel('Translation') ->setName('translation') ->setValue($user->getTranslation())) ->appendChild( id(new AphrontFormMarkupControl()) ->setLabel('Profile URI') ->setValue( phutil_render_tag( 'a', array( 'href' => $profile_uri, ), phutil_escape_html($profile_uri)))) ->appendChild( 'Write something about yourself! '. 'Make sure to include important information like '. - 'your favorite pokemon and which Starcraft race you play.
') + 'your favorite Pokemon and which Starcraft race you play.') ->appendChild( id(new AphrontFormTextAreaControl()) ->setLabel('Blurb') ->setName('blurb') ->setValue($profile->getBlurb())) ->appendChild( id(new AphrontFormMarkupControl()) ->setLabel('Profile Image') ->setValue( phutil_render_tag( 'img', array( 'src' => $img_src, )))) ->appendChild( id(new AphrontFormImageControl()) ->setLabel('Change Image') ->setName('image') ->setError($e_image) ->setCaption('Supported formats: '.implode(', ', $supported_formats))) ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Save') ->addCancelButton('/p/'.$user->getUsername().'/')); $panel = new AphrontPanelView(); $panel->setHeader('Edit Profile Details'); $panel->appendChild($form); $panel->setWidth(AphrontPanelView::WIDTH_FORM); - return id(new AphrontNullView()) - ->appendChild( - array( - $error_view, - $panel, - )); + return array( + $error_view, + $panel, + ); } } diff --git a/src/applications/settings/panel/PhabricatorUserSSHKeysSettingsPanelController.php b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php similarity index 86% rename from src/applications/settings/panel/PhabricatorUserSSHKeysSettingsPanelController.php rename to src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php index fb7c7ef67..0942e8ead 100644 --- a/src/applications/settings/panel/PhabricatorUserSSHKeysSettingsPanelController.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php @@ -1,270 +1,281 @@ getRequest(); $user = $request->getUser(); $edit = $request->getStr('edit'); $delete = $request->getStr('delete'); if (!$edit && !$delete) { - return $this->renderKeyListView(); + return $this->renderKeyListView($request); } $id = nonempty($edit, $delete); if ($id && is_numeric($id)) { // NOTE: Prevent editing/deleting of keys you don't own. $key = id(new PhabricatorUserSSHKey())->loadOneWhere( 'userPHID = %s AND id = %d', $user->getPHID(), - $id); + (int)$id); if (!$key) { return new Aphront404Response(); } } else { $key = new PhabricatorUserSSHKey(); $key->setUserPHID($user->getPHID()); } if ($delete) { - return $this->processDelete($key); + return $this->processDelete($request, $key); } $e_name = true; $e_key = true; $errors = array(); $entire_key = $key->getEntireKey(); if ($request->isFormPost()) { $key->setName($request->getStr('name')); $entire_key = $request->getStr('key'); if (!strlen($entire_key)) { $errors[] = 'You must provide an SSH Public Key.'; $e_key = 'Required'; } else { $parts = str_replace("\n", '', trim($entire_key)); $parts = preg_split('/\s+/', $parts); if (count($parts) == 2) { $parts[] = ''; // Add an empty comment part. } else if (count($parts) == 3) { // This is the expected case. } else { if (preg_match('/private\s*key/i', $entire_key)) { // Try to give the user a better error message if it looks like // they uploaded a private key. $e_key = 'Invalid'; $errors[] = 'Provide your public key, not your private key!'; } else { $e_key = 'Invalid'; $errors[] = 'Provided public key is not properly formatted.'; } } if (!$errors) { list($type, $body, $comment) = $parts; if (!preg_match('/^ssh-dsa|ssh-rsa$/', $type)) { $e_key = 'Invalid'; $errors[] = 'Public key should be "ssh-dsa" or "ssh-rsa".'; } else { $key->setKeyType($type); $key->setKeyBody($body); $key->setKeyHash(md5($body)); $key->setKeyComment($comment); $e_key = null; } } } if (!strlen($key->getName())) { $errors[] = 'You must name this public key.'; $e_name = 'Required'; } else { $e_name = null; } if (!$errors) { try { $key->save(); return id(new AphrontRedirectResponse()) - ->setURI(self::PANEL_BASE_URI); + ->setURI($this->getPanelURI()); } catch (AphrontQueryDuplicateKeyException $ex) { $e_key = 'Duplicate'; $errors[] = 'This public key is already associated with a user '. 'account.'; } } } $error_view = null; if ($errors) { $error_view = new AphrontErrorView(); $error_view->setTitle('Form Errors'); $error_view->setErrors($errors); } $is_new = !$key->getID(); if ($is_new) { $header = 'Add New SSH Public Key'; $save = 'Add Key'; } else { $header = 'Edit SSH Public Key'; $save = 'Save Changes'; } $form = id(new AphrontFormView()) ->setUser($user) ->addHiddenInput('edit', $is_new ? 'true' : $key->getID()) ->appendChild( id(new AphrontFormTextControl()) ->setLabel('Name') ->setName('name') ->setValue($key->getName()) ->setError($e_name)) ->appendChild( id(new AphrontFormTextAreaControl()) ->setLabel('Public Key') ->setName('key') ->setValue($entire_key) ->setError($e_key)) ->appendChild( id(new AphrontFormSubmitControl()) - ->addCancelButton(self::PANEL_BASE_URI) + ->addCancelButton($this->getPanelURI()) ->setValue($save)); $panel = new AphrontPanelView(); $panel->setHeader($header); $panel->setWidth(AphrontPanelView::WIDTH_FORM); $panel->appendChild($form); return id(new AphrontNullView()) ->appendChild( array( $error_view, $panel, )); } - private function renderKeyListView() { - $request = $this->getRequest(); + private function renderKeyListView(AphrontRequest $request) { + $user = $request->getUser(); $keys = id(new PhabricatorUserSSHKey())->loadAllWhere( 'userPHID = %s', $user->getPHID()); $rows = array(); foreach ($keys as $key) { $rows[] = array( phutil_render_tag( 'a', array( - 'href' => '/settings/page/sshkeys/?edit='.$key->getID(), + 'href' => $this->getPanelURI('?edit='.$key->getID()), ), phutil_escape_html($key->getName())), phutil_escape_html($key->getKeyComment()), phutil_escape_html($key->getKeyType()), phabricator_date($key->getDateCreated(), $user), phabricator_time($key->getDateCreated(), $user), javelin_render_tag( 'a', array( - 'href' => '/settings/page/sshkeys/?delete='.$key->getID(), + 'href' => $this->getPanelURI('?delete='.$key->getID()), 'class' => 'small grey button', 'sigil' => 'workflow', ), 'Delete'), ); } $table = new AphrontTableView($rows); $table->setNoDataString("You haven't added any SSH Public Keys."); $table->setHeaders( array( 'Name', 'Comment', 'Type', 'Created', 'Time', '', )); $table->setColumnClasses( array( 'wide pri', '', '', '', 'right', 'action', )); $panel = new AphrontPanelView(); $panel->addButton( phutil_render_tag( 'a', array( - 'href' => '/settings/page/sshkeys/?edit=true', + 'href' => $this->getPanelURI('?edit=true'), 'class' => 'green button', ), 'Add New Public Key')); $panel->setHeader('SSH Public Keys'); $panel->appendChild($table); return $panel; } - private function processDelete(PhabricatorUserSSHKey $key) { - $request = $this->getRequest(); + private function processDelete( + AphrontRequest $request, + PhabricatorUserSSHKey $key) { + $user = $request->getUser(); $name = phutil_escape_html($key->getName()); if ($request->isDialogFormPost()) { $key->delete(); return id(new AphrontReloadResponse()) - ->setURI(self::PANEL_BASE_URI); + ->setURI($this->getPanelURI()); } $dialog = id(new AphrontDialogView()) ->setUser($user) ->addHiddenInput('delete', $key->getID()) ->setTitle('Really delete SSH Public Key?') ->appendChild( 'The key "'.$name.'" will be permanently deleted, '. 'and you will not longer be able to use the corresponding private key '. 'to authenticate.
') ->addSubmitButton('Delete Public Key') - ->addCancelButton(self::PANEL_BASE_URI); + ->addCancelButton($this->getPanelURI()); return id(new AphrontDialogResponse()) ->setDialog($dialog); } } diff --git a/src/applications/settings/panel/PhabricatorUserSearchSettingsPanelController.php b/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php similarity index 79% rename from src/applications/settings/panel/PhabricatorUserSearchSettingsPanelController.php rename to src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php index 2caf2b892..9cf063775 100644 --- a/src/applications/settings/panel/PhabricatorUserSearchSettingsPanelController.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php @@ -1,82 +1,89 @@ getRequest(); + public function getPanelGroup() { + return pht('Application Settings'); + } + + public function processRequest(AphrontRequest $request) { $user = $request->getUser(); $preferences = $user->loadPreferences(); $pref_jump = PhabricatorUserPreferences::PREFERENCE_SEARCHBAR_JUMP; $pref_shortcut = PhabricatorUserPreferences::PREFERENCE_SEARCH_SHORTCUT; if ($request->isFormPost()) { $preferences->setPreference($pref_jump, $request->getBool($pref_jump)); $preferences->setPreference($pref_shortcut, $request->getBool($pref_shortcut)); $preferences->save(); return id(new AphrontRedirectResponse()) - ->setURI('/settings/page/search/?saved=true'); + ->setURI($this->getPanelURI('?saved=true')); } $form = id(new AphrontFormView()) ->setUser($user) - ->setAction('/settings/page/search/') ->appendChild( id(new AphrontFormCheckboxControl()) ->addCheckbox($pref_jump, 1, 'Enable jump nav functionality in all search boxes.', $preferences->getPreference($pref_jump, 1)) ->addCheckbox($pref_shortcut, 1, - '\'/\' focuses search box.', + "Press '/' to focus the search input.", $preferences->getPreference($pref_shortcut, 1)) ) ->appendChild( id(new AphrontFormSubmitControl()) ->setValue('Save')); $panel = new AphrontPanelView(); $panel->setWidth(AphrontPanelView::WIDTH_FORM); $panel->setHeader('Search Preferences'); $panel->appendChild($form); $error_view = null; if ($request->getStr('saved') === 'true') { $error_view = id(new AphrontErrorView()) ->setTitle('Preferences Saved') ->setSeverity(AphrontErrorView::SEVERITY_NOTICE) ->setErrors(array('Your preferences have been saved.')); } - return id(new AphrontNullView()) - ->appendChild( - array( - $error_view, - $panel, - )); + return array( + $error_view, + $panel, + ); } } diff --git a/src/applications/settings/panel/PhabricatorUserSettingsPanelController.php b/src/applications/settings/panel/PhabricatorUserSettingsPanelController.php deleted file mode 100644 index 7df448ecb..000000000 --- a/src/applications/settings/panel/PhabricatorUserSettingsPanelController.php +++ /dev/null @@ -1,26 +0,0 @@ -