diff options
| author | jfd <jfd@lance> | 2012-08-25 03:13:59 +0200 |
|---|---|---|
| committer | jfd <jfd@lance> | 2012-08-25 03:13:59 +0200 |
| commit | dc3bec62113b39254c4488b0502d7852328fdc84 (patch) | |
| tree | f2aaf10908d5d666d3b894befe6c02382f4f10d9 /apps/files_versions | |
| parent | e8ffd5c04249f84770e618eeb57f39c2e93afe35 (diff) | |
| download | nextcloud-server-dc3bec62113b39254c4488b0502d7852328fdc84.tar.gz nextcloud-server-dc3bec62113b39254c4488b0502d7852328fdc84.zip | |
OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files
Diffstat (limited to 'apps/files_versions')
| -rw-r--r-- | apps/files_versions/lib/versions.php | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index f146676757d..30f0b93a7ff 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -64,14 +64,15 @@ class Storage { $files_view = \OCP\Files::getStorage("files");
$users_view = \OCP\Files::getStorage("files_versions");
$users_view->chroot(\OCP\User::getUser().'/');
-
- if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
- $pos = strpos($source, '/files', 1);
- $uid = substr($source, 1, $pos - 1);
- $filename = substr($source, $pos + 6);
- } else {
+
+ //FIXME OC_Share no longer exists
+ //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+ // $pos = strpos($source, '/files', 1);
+ // $uid = substr($source, 1, $pos - 1);
+ // $filename = substr($source, $pos + 6);
+ //} else {
$uid = \OCP\User::getUser();
- }
+ //}
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory') . $this->view->getAbsolutePath('');
@@ -134,13 +135,14 @@ class Storage { $users_view = \OCP\Files::getStorage("files_versions");
$users_view->chroot(\OCP\User::getUser().'/');
- if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
- $pos = strpos($source, '/files', 1);
- $uid = substr($source, 1, $pos - 1);
- $filename = substr($source, $pos + 6);
- } else {
+ //FIXME OC_Share no longer exists
+ //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+ // $pos = strpos($source, '/files', 1);
+ // $uid = substr($source, 1, $pos - 1);
+ // $filename = substr($source, $pos + 6);
+ //} else {
$uid = \OCP\User::getUser();
- }
+ //}
// rollback
if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
@@ -163,10 +165,11 @@ class Storage { public static function isversioned($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
$versions_fileview = \OCP\Files::getStorage("files_versions");
- if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
- $pos = strpos($source, '/files', 1);
- $filename = substr($source, $pos + 6);
- }
+ //FIXME OC_Share no longer exists
+ //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+ // $pos = strpos($source, '/files', 1);
+ // $filename = substr($source, $pos + 6);
+ //}
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
@@ -194,13 +197,14 @@ class Storage { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
- if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
- $pos = strpos($source, '/files', 1);
- $uid = substr($source, 1, $pos - 1);
- $filename = substr($source, $pos + 6);
- } else {
+ //FIXME OC_Share no longer exists
+ //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+ // $pos = strpos($source, '/files', 1);
+ // $uid = substr($source, 1, $pos - 1);
+ // $filename = substr($source, $pos + 6);
+ //} else {
$uid = \OCP\User::getUser();
- }
+ //}
$versions_fileview = \OCP\Files::getStorage('files_versions');
$versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
$versions = array();
@@ -267,13 +271,14 @@ class Storage { public static function expire($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
- if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
- $pos = strpos($source, '/files', 1);
- $uid = substr($source, 1, $pos - 1);
- $filename = substr($source, $pos + 6);
- } else {
+ //FIXME OC_Share no longer exists
+ //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+ // $pos = strpos($source, '/files', 1);
+ // $uid = substr($source, 1, $pos - 1);
+ // $filename = substr($source, $pos + 6);
+ //} else {
$uid = \OCP\User::getUser();
- }
+ //}
$versions_fileview = \OCP\Files::getStorage("files_versions");
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
|