mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 17:02:03 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-06-04 21:47:14 +02:00
commit 080f585f39
6 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/oauth2callback.php
View File

@ -33,6 +33,14 @@ require_once(dirname(dirname(__FILE__)).'/config.php');
// The authorization code generated by the authorization server.
$code = required_param('code', PARAM_RAW);
// The state parameter we've given (used in moodle as a redirect url).
$state = required_param('state', PARAM_URL);
$state = required_param('state', PARAM_LOCALURL);
redirect(new moodle_url($state, array('code' => $code)));
$redirecturl = new moodle_url($state);
$params = $redirecturl->params();
if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) {
$redirecturl->param('oauth2code', $code);
redirect($redirecturl);
} else {
print_error('invalidsesskey');
}

12
lib/oauthlib.php
View File

@ -368,8 +368,8 @@ abstract class oauth2_client extends curl {
private $clientid = '';
/** var string The client secret. */
private $clientsecret = '';
/** var string URL to return to after authenticating */
private $returnurl = '';
/** var moodle_url URL to return to after authenticating */
private $returnurl = null;
/** var string scope of the authentication request */
private $scope = '';
/** var stdClass access token object */
@ -392,10 +392,10 @@ abstract class oauth2_client extends curl {
*
* @param string $clientid
* @param string $clientsecret
* @param string $returnurl
* @param moodle_url $returnurl
* @param string $scope
*/
public function __construct($clientid, $clientsecret, $returnurl, $scope) {
public function __construct($clientid, $clientsecret, moodle_url $returnurl, $scope) {
parent::__construct();
$this->clientid = $clientid;
$this->clientsecret = $clientsecret;
@ -425,7 +425,7 @@ abstract class oauth2_client extends curl {
// If we've been passed then authorization code generated by the
// authorization server try and upgrade the token to an access token.
$code = optional_param('code', null, PARAM_RAW);
$code = optional_param('oauth2code', null, PARAM_RAW);
if ($code && $this->upgrade_token($code)) {
return true;
}
@ -456,7 +456,7 @@ abstract class oauth2_client extends curl {
array('client_id' => $this->clientid,
'response_type' => 'code',
'redirect_uri' => $callbackurl->out(false),
'state' => $this->returnurl,
'state' => $this->returnurl->out_as_local_url(false),
'scope' => $this->scope,
));

2
portfolio/googledocs/lib.php
View File

@ -124,7 +124,7 @@ class portfolio_plugin_googledocs extends portfolio_plugin_push_base {
$clientid = $this->get_config('clientid');
$secret = $this->get_config('secret');
$this->googleoauth = new google_oauth($clientid, $secret, $returnurl->out(false), google_docs::REALM);
$this->googleoauth = new google_oauth($clientid, $secret, $returnurl, google_docs::REALM);
}
public function instance_sanity_check() {

2
portfolio/picasa/lib.php
View File

@ -124,7 +124,7 @@ class portfolio_plugin_picasa extends portfolio_plugin_push_base {
$clientid = $this->get_config('clientid');
$secret = $this->get_config('secret');
$this->googleoauth = new google_oauth($clientid, $secret, $returnurl->out(false), google_picasa::REALM);
$this->googleoauth = new google_oauth($clientid, $secret, $returnurl, google_picasa::REALM);
}
public function instance_sanity_check() {

8
repository/googledocs/lib.php
View File

@ -39,12 +39,14 @@ class repository_googledocs extends repository {
public function __construct($repositoryid, $context = SYSCONTEXTID, $options = array()) {
parent::__construct($repositoryid, $context, $options);
$returnurl = new moodle_url('/repository/repository_callback.php',
array('callback' => 'yes', 'repo_id' =>$this->id));
$returnurl = new moodle_url('/repository/repository_callback.php');
$returnurl->param('callback', 'yes');
$returnurl->param('repo_id', $this->id);
$returnurl->param('sesskey', sesskey());
$clientid = get_config('googledocs', 'clientid');
$secret = get_config('googledocs', 'secret');
$this->googleoauth = new google_oauth($clientid, $secret, $returnurl->out(false), google_docs::REALM);
$this->googleoauth = new google_oauth($clientid, $secret, $returnurl, google_docs::REALM);
$this->check_login();
}

8
repository/picasa/lib.php
View File

@ -41,12 +41,14 @@ class repository_picasa extends repository {
public function __construct($repositoryid, $context = SYSCONTEXTID, $options = array()) {
parent::__construct($repositoryid, $context, $options);
$returnurl = new moodle_url('/repository/repository_callback.php',
array('callback' => 'yes', 'repo_id' =>$this->id));
$returnurl = new moodle_url('/repository/repository_callback.php');
$returnurl->param('callback', 'yes');
$returnurl->param('repo_id', $this->id);
$returnurl->param('sesskey', sesskey());
$clientid = get_config('picasa', 'clientid');
$secret = get_config('picasa', 'secret');
$this->googleoauth = new google_oauth($clientid, $secret, $returnurl->out(false), google_picasa::REALM);
$this->googleoauth = new google_oauth($clientid, $secret, $returnurl, google_picasa::REALM);
$this->check_login();
}