Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
19f94774
Commit
19f94774
authored
13 years ago
by
Michael Gapczynski
Browse files
Options
Downloads
Patches
Plain Diff
Don't overwrite fake directory stream for Dropbox and Google Drive
parent
c67ae2e7
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/files_external/lib/dropbox.php
+2
-3
2 additions, 3 deletions
apps/files_external/lib/dropbox.php
apps/files_external/lib/google.php
+2
-2
2 additions, 2 deletions
apps/files_external/lib/google.php
with
4 additions
and
5 deletions
apps/files_external/lib/dropbox.php
+
2
−
3
View file @
19f94774
...
@@ -33,7 +33,6 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
...
@@ -33,7 +33,6 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
$oauth
=
new
Dropbox_OAuth_Curl
(
$params
[
'app_key'
],
$params
[
'app_secret'
]);
$oauth
=
new
Dropbox_OAuth_Curl
(
$params
[
'app_key'
],
$params
[
'app_secret'
]);
$oauth
->
setToken
(
$params
[
'token'
],
$params
[
'token_secret'
]);
$oauth
->
setToken
(
$params
[
'token'
],
$params
[
'token_secret'
]);
$this
->
dropbox
=
new
Dropbox_API
(
$oauth
,
'dropbox'
);
$this
->
dropbox
=
new
Dropbox_API
(
$oauth
,
'dropbox'
);
}
}
private
function
getMetaData
(
$path
,
$list
=
false
)
{
private
function
getMetaData
(
$path
,
$list
=
false
)
{
...
@@ -84,8 +83,8 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
...
@@ -84,8 +83,8 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
foreach
(
$contents
as
$file
)
{
foreach
(
$contents
as
$file
)
{
$files
[]
=
basename
(
$file
[
'path'
]);
$files
[]
=
basename
(
$file
[
'path'
]);
}
}
OC_FakeDirStream
::
$dirs
[
'dropbox'
]
=
$files
;
OC_FakeDirStream
::
$dirs
[
'dropbox'
.
$path
]
=
$files
;
return
opendir
(
'fakedir://dropbox'
);
return
opendir
(
'fakedir://dropbox'
.
$path
);
}
}
return
false
;
return
false
;
}
}
...
...
This diff is collapsed.
Click to expand it.
apps/files_external/lib/google.php
+
2
−
2
View file @
19f94774
...
@@ -237,8 +237,8 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
...
@@ -237,8 +237,8 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
$this
->
entries
[
$name
]
=
$entry
;
$this
->
entries
[
$name
]
=
$entry
;
}
}
}
}
OC_FakeDirStream
::
$dirs
[
'google'
]
=
$files
;
OC_FakeDirStream
::
$dirs
[
'google'
.
$path
]
=
$files
;
return
opendir
(
'fakedir://google'
);
return
opendir
(
'fakedir://google'
.
$path
);
}
}
public
function
stat
(
$path
)
{
public
function
stat
(
$path
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment