fix broken paths in versions app

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 920f8c3348a39f411c5955c353e2a8615f270d00..fa24383fdf22c8263de49e3f13c3e256b104d3bb 100644 (file)
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -58,9 +58,8 @@ class Storage {
        public function store($filename) {\r
                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
                        list($uid, $filename) = self::getUidAndFilename($filename);\r
-                       $userHome = \OC_User::getHome($uid);\r
-                       $files_view = new \OC_FilesystemView($userHome.'/files');\r
-                       $users_view = new \OC_FilesystemView($userHome);\r
+                       $files_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/files');\r
+                       $users_view = new \OC_FilesystemView('/'.\OCP\User::getUser());\r
 \r
                        //check if source file already exist as version to avoid recursions.\r
                        // todo does this check work?\r
@@ -95,9 +94,10 @@ class Storage {
 \r
                        // check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)\r
                        if ($uid == \OCP\User::getUser()) {\r
-                               $versions_fileview = new \OC_FilesystemView($userHome.'/files_versions');\r
-                               $versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');\r
-                               $matches=glob($versionsFolderName.'/'.$filename.'.v*');\r
+                               $versions_fileview = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_versions');\r
+                               $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);\r
+                               $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('');\r
+                               $matches=glob($versionsName.'.v*');\r
                                sort($matches);\r
                                $parts=explode('.v',end($matches));\r
                                if((end($parts)+Storage::DEFAULTMININTERVAL)>time()) {\r
@@ -128,7 +128,7 @@ class Storage {
 \r
                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
                        list($uid, $filename) = self::getUidAndFilename($filename);\r
-                       $users_view = new \OC_FilesystemView(\OC_User::getHome($uid));\r
+                       $users_view = new \OC_FilesystemView('/'.\OCP\User::getUser());\r
 \r
                        // rollback\r
                        if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {\r
@@ -151,12 +151,12 @@ class Storage {
        public static function isversioned($filename) {\r
                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
                        list($uid, $filename) = self::getUidAndFilename($filename);\r
-                       $versions_fileview = new \OC_FilesystemView(\OC_User::getHome($uid).'/files_versions');\r
+                       $versions_fileview = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_versions');\r
 \r
-                       $versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');\r
+                       $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);\r
 \r
                        // check for old versions\r
-                       $matches=glob($versionsFolderName.$filename.'.v*');\r
+                       $matches=glob($versionsName.'.v*');\r
                        if(count($matches)>0) {\r
                                return true;\r
                        }else{\r
@@ -176,22 +176,20 @@ class Storage {
         * @returns array\r
         */\r
        public static function getVersions( $filename, $count = 0 ) {\r
-\r
                if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {\r
                        list($uid, $filename) = self::getUidAndFilename($filename);\r
-                       $versions_fileview = new \OC_FilesystemView(\OC_User::getHome($uid).'/files_versions');\r
+                       $versions_fileview = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_versions');\r
 \r
-                       $versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');\r
+                       $versionsName = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);\r
                        $versions = array();\r
-\r
                        // fetch for old versions\r
-                       $matches = glob( $versionsFolderName.'/'.$filename.'.v*' );\r
+                       $matches = glob( $versionsName.'.v*' );\r
 \r
                        sort( $matches );\r
 \r
                        $i = 0;\r
 \r
-                       $files_view = new \OC_FilesystemView(\OC_User::getHome($uid).'/files');\r
+                       $files_view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files');\r
                        $local_file = $files_view->getLocalFile($filename);\r
                        foreach( $matches as $ma ) {\r
 \r
@@ -248,10 +246,10 @@ class Storage {
                        list($uid, $filename) = self::getUidAndFilename($filename);\r
                        $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');\r
 \r
-                       $versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');\r
+                       $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);\r
 \r
                        // check for old versions\r
-                       $matches = glob( $versionsFolderName.'/'.$filename.'.v*' );\r
+                       $matches = glob( $versionsName.'.v*' );\r
 \r
                        if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {\r
 \r
@@ -262,7 +260,7 @@ class Storage {
 \r
                                foreach( $deleteItems as $de ) {\r
 \r
-                                       unlink( $versionsFolderName.'/'.$filename.'.v'.$de );\r
+                                       unlink( $versionsName.'.v'.$de );\r
 \r
                                }\r
                        }\r