minor fixes for the google filestorage backend
This commit is contained in:
parent
445f52ef8b
commit
1224d7ec01
|
@ -178,7 +178,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
|
||||||
if ($collection == '/' || $collection == '\.' || $collection == '.') {
|
if ($collection == '/' || $collection == '\.' || $collection == '.') {
|
||||||
$uri = 'https://docs.google.com/feeds/default/private/full';
|
$uri = 'https://docs.google.com/feeds/default/private/full';
|
||||||
// Get parent content link
|
// Get parent content link
|
||||||
} else if ($dom = $this->getResource(basename($dir))) {
|
} else if ($dom = $this->getResource(basename($collection))) {
|
||||||
$uri = $dom->getElementsByTagName('content')->item(0)->getAttribute('src');
|
$uri = $dom->getElementsByTagName('content')->item(0)->getAttribute('src');
|
||||||
}
|
}
|
||||||
if (isset($uri)) {
|
if (isset($uri)) {
|
||||||
|
@ -341,7 +341,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$title = basename($path);
|
$title = basename($path2);
|
||||||
// Construct post data
|
// Construct post data
|
||||||
$postData = '<?xml version="1.0" encoding="UTF-8"?>';
|
$postData = '<?xml version="1.0" encoding="UTF-8"?>';
|
||||||
$postData .= '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:docs="http://schemas.google.com/docs/2007" xmlns:gd="http://schemas.google.com/g/2005" gd:etag='.$etag.'>';
|
$postData .= '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:docs="http://schemas.google.com/docs/2007" xmlns:gd="http://schemas.google.com/g/2005" gd:etag='.$etag.'>';
|
||||||
|
@ -352,13 +352,13 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
|
||||||
} else {
|
} else {
|
||||||
// Move to different collection
|
// Move to different collection
|
||||||
if ($collectionEntry = $this->getResource($collection)) {
|
if ($collectionEntry = $this->getResource($collection)) {
|
||||||
$feedUri = $colelctionEntry->getElementsByTagName('content')->item(0)->getAttribute('src');
|
$feedUri = $collectionEntry->getElementsByTagName('content')->item(0)->getAttribute('src');
|
||||||
// Construct post data
|
// Construct post data
|
||||||
$postData = '<?xml version="1.0" encoding="UTF-8"?>';
|
$postData = '<?xml version="1.0" encoding="UTF-8"?>';
|
||||||
$postData .= '<entry xmlns="http://www.w3.org/2005/Atom">';
|
$postData .= '<entry xmlns="http://www.w3.org/2005/Atom">';
|
||||||
$postData .= '<id>'.$entry->getElementsByTagName('id')->item(0).'</id>';
|
$postData .= '<id>'.$entry->getElementsByTagName('id')->item(0).'</id>';
|
||||||
$postData .= '</entry>';
|
$postData .= '</entry>';
|
||||||
$this->sendRequest($uri, 'POST', $postData);
|
$this->sendRequest($feedUri, 'POST', $postData);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -424,7 +424,6 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!isset($uploadUri) && $entry) {
|
if (!isset($uploadUri) && $entry) {
|
||||||
$etag = $entry->getAttribute('gd:etag');
|
|
||||||
$links = $entry->getElementsByTagName('link');
|
$links = $entry->getElementsByTagName('link');
|
||||||
foreach ($links as $link) {
|
foreach ($links as $link) {
|
||||||
if ($link->getAttribute('rel') == 'http://schemas.google.com/g/2005#resumable-create-media') {
|
if ($link->getAttribute('rel') == 'http://schemas.google.com/g/2005#resumable-create-media') {
|
||||||
|
|
Loading…
Reference in New Issue