diff -r 000000000000 -r 4eba9c11703f web/Zend/Oauth/Http/UserAuthorization.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/Zend/Oauth/Http/UserAuthorization.php Mon Dec 13 18:29:26 2010 +0100 @@ -0,0 +1,78 @@ +assembleParams(); + $uri = Zend_Uri_Http::fromString($this->_consumer->getUserAuthorizationUrl()); + + $uri->setQuery( + $this->_httpUtility->toEncodedQueryString($params) + ); + + return $uri->getUri(); + } + + /** + * Assemble all parameters for inclusion in a redirect URL. + * + * @return array + */ + public function assembleParams() + { + $params = array( + 'oauth_token' => $this->_consumer->getLastRequestToken()->getToken(), + ); + + if (!Zend_Oauth_Client::$supportsRevisionA) { + $callback = $this->_consumer->getCallbackUrl(); + if (!empty($callback)) { + $params['oauth_callback'] = $callback; + } + } + + if (!empty($this->_parameters)) { + $params = array_merge($params, $this->_parameters); + } + + return $params; + } +}