open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix 3rdparty paths, initialise OAuth in correct order

Browse Source
remotes/origin/stable5
Tom Needham 13 years ago
parent 9ec035e3d3
commit e7f7693b2f
1 changed files with 6 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      lib/oauth.php

10
lib/oauth.php
Unescape View File

@ -37,12 +37,13 @@ class OC_OAuth {
*/ */
private static function init(){ private static function init(){
// Include the libraries // Include the libraries
require_once(OC::$THIRDPARTYROOT.'3rdparty/oauth-php/library/OAuthServer.php'); require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthServer.php');
require_once(OC::$THIRDPARTYROOT.'3rdparty/oauth-php/library/OAuthStore.php'); require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthStore.php');
require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthRequestVerifier.php');
// Initialise the OAuth store
self::$store = OAuthStore::instance('Session');
// Create the server object // Create the server object
self::$server = new OAuthServer(); self::$server = new OAuthServer();
// Initialise the OAuth store
self::$store = OAuthStore::instance('owncloud');
} }
/** /**
@ -109,6 +110,7 @@ class OC_OAuth {
* @return string|int * @return string|int
*/ */
public static function isAuthorised(){ public static function isAuthorised(){
self::init();
if(OAuthRequestVerifier::requestIsSigned()){ if(OAuthRequestVerifier::requestIsSigned()){
try{ try{
$req = new OAuthRequestVerifier(); $req = new OAuthRequestVerifier();

Write Preview
Loading…
Cancel
Save