From d139e3c3cd19103cdb798f2fc80a1a461ac08615 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 24 Mar 2012 15:27:42 -0400
Subject: [PATCH] Move Google Docs storage backend to files_remote app
---
apps/files_remote/appinfo/app.php | 1 +
{lib/filestorage => apps/files_remote/lib}/google.php | 2 --
apps/files_remote/tests/config.php | 7 +++++++
3 files changed, 8 insertions(+), 2 deletions(-)
rename {lib/filestorage => apps/files_remote/lib}/google.php (99%)
diff --git a/apps/files_remote/appinfo/app.php b/apps/files_remote/appinfo/app.php
index 25473d87fe..02c1c3ae31 100644
--- a/apps/files_remote/appinfo/app.php
+++ b/apps/files_remote/appinfo/app.php
@@ -8,3 +8,4 @@
OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_remote/lib/ftp.php';
OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_remote/lib/webdav.php';
+OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_remote/lib/google.php';
diff --git a/lib/filestorage/google.php b/apps/files_remote/lib/google.php
similarity index 99%
rename from lib/filestorage/google.php
rename to apps/files_remote/lib/google.php
index 5de47650f6..0d6db1987f 100644
--- a/lib/filestorage/google.php
+++ b/apps/files_remote/lib/google.php
@@ -24,14 +24,12 @@ require_once 'common.inc.php';
class OC_Filestorage_Google extends OC_Filestorage_Common {
- private $datadir;
private $consumer;
private $oauth_token;
private $sig_method;
private $entries;
public function __construct($arguments) {
- $this->datadir = $arguments['datadir'];
$consumer_key = isset($arguments['consumer_key']) ? $arguments['consumer_key'] : 'anonymous';
$consumer_secret = isset($arguments['consumer_secret']) ? $arguments['consumer_secret'] : 'anonymous';
$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
diff --git a/apps/files_remote/tests/config.php b/apps/files_remote/tests/config.php
index e2eea72f24..9b40d2b98c 100644
--- a/apps/files_remote/tests/config.php
+++ b/apps/files_remote/tests/config.php
@@ -12,4 +12,11 @@ return array(
'password'=>'test',
'root'=>'/owncloud/files/webdav.php',
),
+ 'google'=>array(
+ 'consumer_key'=>'anonymous',
+ 'consumer_secret'=>'anonymous',
+ 'token'=>'test',
+ 'token_secret'=>'test',
+ 'root'=>'/google',
+ )
);
--
GitLab