]> source.dussan.org Git - nextcloud-server.git/commitdiff
Moved hooks and versions.php into new lib directory
authorSam Tuke <samtuke@owncloud.com>
Tue, 3 Jul 2012 16:42:51 +0000 (17:42 +0100)
committerSam Tuke <samtuke@owncloud.com>
Tue, 3 Jul 2012 16:42:51 +0000 (17:42 +0100)
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes

apps/files_versions/ajax/expireAll.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/lib/hooks.php [new file with mode: 0644]
apps/files_versions/lib/versions.php [new file with mode: 0644]
apps/files_versions/versions.php [deleted file]

index f9cd74aed025f2af1e9079d6654a154caddcaf3e..238e3bdad4ddb31532a7f35ff1d487dfe20cf227 100644 (file)
@@ -28,7 +28,9 @@
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('files_versions');
 
-if( OCA_Versions\Storage::expireAll() ){
+$versions = new OCA_Versions\Storage( new OC_FilesystemView('') );
+
+if( $versions->expireAll() ){
        
        OCP\JSON::success();
        die();
index f29d1760b6f8b9027f97fa96108b092ba0beed59..1a0e21732ccb9fb4be6b2288777eb1d0425012c9 100644 (file)
@@ -1,8 +1,6 @@
 <?php
 OCP\JSON::checkAppEnabled('files_versions');
 
-require_once('apps/files_versions/versions.php');
-
 $userDirectory = "/".OCP\USER::getUser()."/files";
 $source = $_GET['source'];
 
index 105c5a102cbdd8ef041f522b52489706e67ac1f8..dba612e4b79399213c5a62306769dbec4a93e274 100644 (file)
@@ -1,6 +1,8 @@
 <?php
 
-require_once('files_versions/versions.php');
+//require_once('files_versions/versions.php');
+OC::$CLASSPATH['OCA_Versions\Storage'] = 'apps/files_versions/lib/versions.php';
+OC::$CLASSPATH['OCA_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php';
 
 OCP\App::registerAdmin('files_versions', 'settings');
 OCP\App::registerPersonal('files_versions','settings-personal');
@@ -8,7 +10,7 @@ OCP\App::registerPersonal('files_versions','settings-personal');
 OCP\Util::addscript('files_versions', 'versions');
 
 // Listen to write signals
-OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
+OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Hooks", "write_hook");
 // Listen to delete and rename signals
 OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Storage", "removeVersions");
 OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Storage", "renameVersions");
\ No newline at end of file
index ca03de0472bb8b3b6bcfea008cf569211212bb8d..e3332d7cdb6086319356604f41e37ba844927125 100644 (file)
@@ -30,11 +30,12 @@ if ( isset( $_GET['path'] ) ) {
        $path = $_GET['path'];
        $path = strip_tags( $path );
        $tmpl->assign( 'path', $path );
+       $versions = new OCA_Versions\Storage( new OC_FilesystemView('') );
 
        // roll back to old version if button clicked
         if( isset( $_GET['revert'] ) ) {
                
-               if( \OCA_Versions\Storage::rollback( $path, $_GET['revert'] ) ) {
+               if( $versions->rollback( $path, $_GET['revert'] ) ) {
                        
                        $tmpl->assign( 'outcome_stat', 'success' );
                        
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
new file mode 100644 (file)
index 0000000..8a74670
--- /dev/null
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * This class contains all hooks.
+ */
+namespace OCA_Versions;
+
+class Hooks {
+
+       /**
+        * listen to write event.
+        */
+       public static function write_hook( $params ) {
+       
+               if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+                       
+                       $versions = new Storage( new \OC_FilesystemView('') );
+                       
+                       $path = $params[\OC_Filesystem::signal_param_path];
+                       
+                       if($path<>'') $versions->store( $path );
+                       
+               }
+       }
+       
+}
+
+?>
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
new file mode 100644 (file)
index 0000000..af7ae11
--- /dev/null
@@ -0,0 +1,353 @@
+<?php\r
+/**\r
+ * Copyright (c) 2012 Frank Karlitschek <frank@owncloud.org>\r
+ * This file is licensed under the Affero General Public License version 3 or\r
+ * later.\r
+ * See the COPYING-README file.\r
+ */\r
+\r
+/**\r
+ * Versions\r
+ *\r
+ * A class to handle the versioning of files.\r
+ */\r
+\r
+namespace OCA_Versions;\r
+\r
+class Storage {\r
+\r
+\r
+       // config.php configuration:\r
+       //   - files_versions\r
+       //   - files_versionsfolder\r
+       //   - files_versionsblacklist\r
+       //   - files_versionsmaxfilesize\r
+       //   - files_versionsinterval \r
+       //   - files_versionmaxversions \r
+       //\r
+       // todo:\r
+       //   - finish porting to OC_FilesystemView to enable network transparency\r
+       //   - add transparent compression. first test if it´s worth it.\r
+\r
+       const DEFAULTENABLED=true; \r
+       const DEFAULTFOLDER='versions'; \r
+       const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp'; \r
+       const DEFAULTMAXFILESIZE=1048576; // 10MB \r
+       const DEFAULTMININTERVAL=1; // 2 min\r
+       const DEFAULTMAXVERSIONS=50;\r
+       \r
+       private $view;\r
+       \r
+       function __construct( $view ) {\r
+       \r
+               $this->view = $view;\r
+               \r
+       }\r
+\r
+       /**\r
+        * init the versioning and create the versions folder.\r
+        */\r
+       public static function init() {\r
+               if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
+                       // create versions folder\r
+                       $foldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);\r
+                       if(!is_dir($foldername)){\r
+                               mkdir($foldername);\r
+                       }\r
+               }\r
+       }\r
+\r
+\r
+       /**\r
+        * listen to write event.\r
+        */\r
+       public static function write_hook($params) {\r
+               if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
+                       $path = $params[\OC_Filesystem::signal_param_path];\r
+                       if($path<>'') $this->store($path);\r
+               }\r
+       }\r
+\r
+\r
+\r
+       /**\r
+        * store a new version of a file.\r
+        */\r
+       public function store($filename) {\r
+               if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
+                       if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
+                               $pos = strpos($source, '/files', 1);\r
+                               $uid = substr($source, 1, $pos - 1);\r
+                               $filename = substr($source, $pos + 6);\r
+                       } else {\r
+                               $uid = \OCP\User::getUser();\r
+                       }\r
+                       $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);\r
+                       $filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';\r
+                       Storage::init();\r
+\r
+                       // check if filename is a directory\r
+                       if(is_dir($filesfoldername.'/'.$filename)){\r
+                               return false;\r
+                       }\r
+\r
+                       // check filetype blacklist\r
+                       $blacklist=explode(' ',\OCP\Config::getSystemValue('files_versionsblacklist', Storage::DEFAULTBLACKLIST));\r
+                       foreach($blacklist as $bl) {\r
+                               $parts=explode('.', $filename);\r
+                               $ext=end($parts);\r
+                               if(strtolower($ext)==$bl) {\r
+                                       return false;\r
+                               }\r
+                       }\r
+                       \r
+                       // check filesize\r
+                       if(filesize($filesfoldername.'/'.$filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){\r
+                               return false;\r
+                       }\r
+\r
+\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
+                               $matches=glob($versionsFolderName.'/'.$filename.'.v*');\r
+                               sort($matches);\r
+                               $parts=explode('.v',end($matches));\r
+                               if((end($parts)+Storage::DEFAULTMININTERVAL)>time()){\r
+                                       return false;\r
+                               }\r
+                       }\r
+\r
+\r
+                       // create all parent folders\r
+                       $info=pathinfo($filename);      \r
+                       if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);   \r
+\r
+                       // store a new version of a file\r
+                       copy($filesfoldername.'/'.$filename,$versionsFolderName.'/'.$filename.'.v'.time());\r
+        \r
+                       // expire old revisions if necessary\r
+                       $this->expire($filename);\r
+               }\r
+       }\r
+\r
+\r
+       /**\r
+        * rollback to an old version of a file.\r
+        */\r
+       public function rollback( $filename, $revision ) {\r
+       \r
+               if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
+                       if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
+                               $pos = strpos($source, '/files', 1);\r
+                               $uid = substr($source, 1, $pos - 1);\r
+                               $filename = substr($source, $pos + 6);\r
+                       } else {\r
+                               $uid = \OCP\User::getUser();\r
+                       }\r
+                       $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'.$uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);\r
+                       \r
+                       $filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';\r
+                       \r
+                       // rollback\r
+                       if ( copy( $versionsFolderName.'/'.$filename.'.v'.$revision, $filesfoldername.'/'.$filename ) ) {\r
+                       \r
+                               return true;\r
+                               \r
+                       } else {\r
+                       \r
+                               return false;\r
+                               \r
+                       }\r
+                       \r
+               }\r
+               \r
+       }\r
+\r
+       /**\r
+        * check if old versions of a file exist.\r
+        */\r
+       public static function isversioned($filename) {\r
+               if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
+                       if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
+                               $pos = strpos($source, '/files', 1);\r
+                               $uid = substr($source, 1, $pos - 1);\r
+                               $filename = substr($source, $pos + 6);\r
+                       } else {\r
+                               $uid = \OCP\User::getUser();\r
+                       }\r
+                       $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);\r
+\r
+                       // check for old versions\r
+                       $matches=glob($versionsFolderName.'/'.$filename.'.v*');\r
+                       if(count($matches)>1){\r
+                               return true;\r
+                       }else{\r
+                               return false;\r
+                       }\r
+               }else{\r
+                       return(false);\r
+               }\r
+       }\r
+\r
+\r
+        \r
+        /**\r
+         * @brief get a list of all available versions of a file in descending chronological order\r
+         * @param $filename file to find versions of, relative to the user files dir\r
+         * @param $count number of versions to return\r
+         * @returns array\r
+         */\r
+        public static function getVersions( $filename, $count = 0 ) {\r
+        \r
+                if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {\r
+                \r
+                       if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
+                               $pos = strpos($source, '/files', 1);\r
+                               $uid = substr($source, 1, $pos - 1);\r
+                               $filename = substr($source, $pos + 6);\r
+                       } else {\r
+                               $uid = \OCP\User::getUser();\r
+                       }\r
+                       $versionsFolderName = \OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);\r
+                       $versions = array();         \r
+                       \r
+                       // fetch for old versions\r
+                       $matches = glob( $versionsFolderName.'/'.$filename.'.v*' );\r
+                       \r
+                       sort( $matches );\r
+                       \r
+                       $i = 0;\r
+                       \r
+                       foreach( $matches as $ma ) {\r
+                               \r
+                               $i++;\r
+                               $versions[$i]['cur'] = 0;\r
+                               $parts = explode( '.v', $ma );\r
+                               $versions[$i]['version'] = ( end( $parts ) );\r
+                               \r
+                               // if file with modified date exists, flag it in array as currently enabled version\r
+                               $curFile['fileName'] = basename( $parts[0] );\r
+                               $curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').\OC_Filesystem::getRoot().'/'.$curFile['fileName'];\r
+                               \r
+                               ( \md5_file( $ma ) == \md5_file( $curFile['filePath'] ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );\r
+                               \r
+                       }\r
+                       \r
+                       $versions = array_reverse( $versions );\r
+                       \r
+                       foreach( $versions as $key => $value ) {\r
+                               \r
+                               // flag the first matched file in array (which will have latest modification date) as current version\r
+                               if ( $versions[$key]['fileMatch'] ) {\r
+                               \r
+                                       $versions[$key]['cur'] = 1;\r
+                                       break;\r
+                                       \r
+                               }\r
+                       \r
+                       }\r
+                       \r
+                       $versions = array_reverse( $versions );\r
+                       \r
+                       // only show the newest commits\r
+                       if( $count != 0 and ( count( $versions )>$count ) ) {\r
+                       \r
+                               $versions = array_slice( $versions, count( $versions ) - $count );\r
+                               \r
+                       }\r
+       \r
+                       return( $versions );\r
+\r
+\r
+                } else {\r
+                \r
+                       // if versioning isn't enabled then return an empty array\r
+                        return( array() );\r
+                        \r
+                }\r
+                \r
+        }\r
+\r
+        /**\r
+         * @brief Erase a file's versions which exceed the set quota\r
+         */\r
+        public function expire( $filename ) {\r
+                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
+\r
+                       if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
+                               $pos = strpos($source, '/files', 1);\r
+                               $uid = substr($source, 1, $pos - 1);\r
+                               $filename = substr($source, $pos + 6);\r
+                       } else {\r
+                               $uid = \OCP\User::getUser();\r
+                       }\r
+                       $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);\r
+\r
+                       // check for old versions\r
+                       $matches = glob( $versionsFolderName.'/'.$filename.'.v*' );\r
+                       \r
+                       if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {\r
+                       \r
+                               $numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) );\r
+\r
+                               // delete old versions of a file\r
+                               $deleteItems = array_slice( $matches, 0, $numberToDelete );\r
+                               \r
+                               foreach( $deleteItems as $de ) {\r
+                               \r
+                                       $this->view->unlink( $versionsFolderName.'/'.$filename.'.v'.$de );\r
+                                       \r
+                               }\r
+                       }\r
+                }\r
+        }\r
+\r
+        /**\r
+         * @brief Erase all old versions of all user files\r
+         * @return true/false\r
+         */\r
+        public function expireAll() {\r
+               \r
+               $dir = \OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);\r
+               \r
+               return $this->view->deleteAll( $dir, true );\r
+       \r
+        }\r
+\r
+        /**\r
+         * @brief Erase versions of deleted file\r
+         * @param array\r
+         *          \r
+         * This function is connected to the delete signal of OC_Filesystem\r
+         * cleanup the versions directory if the actual file gets deleted\r
+         */\r
+        public static function removeVersions($params) {\r
+               $rel_path =  $params['path'];\r
+               $abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';\r
+               if(Storage::isversioned($rel_path)) {\r
+                       $versions = Storage::getVersions($rel_path);\r
+                       foreach ($versions as $v){\r
+                               $this->view->unlink( $abs_path . $v['version'] );\r
+                       }\r
+               }\r
+        }\r
+        \r
+        /**\r
+         * @brief rename/move versions of renamed/moved files\r
+         * @param array with oldpath and newpath\r
+         * \r
+         * This function is connected to the rename signal of OC_Filesystem and adjust the name and location\r
+         * of the stored versions along the actual file\r
+         */\r
+        public static function renameVersions($params) {\r
+               $rel_oldpath =  $params['oldpath'];\r
+               $abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v';\r
+               $abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v';\r
+               if(Storage::isversioned($rel_oldpath)) {\r
+                       $versions = Storage::getVersions($rel_oldpath);\r
+                       foreach ($versions as $v){\r
+                               rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);\r
+                       }\r
+               }\r
+        }\r
+}\r
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
deleted file mode 100644 (file)
index 7ed5f25..0000000
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Frank Karlitschek <frank@owncloud.org>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * Versions
- *
- * A class to handle the versioning of files.
- */
-
-namespace OCA_Versions;
-
-class Storage {
-
-
-       // config.php configuration:
-       //   - files_versions
-       //   - files_versionsfolder
-       //   - files_versionsblacklist
-       //   - files_versionsmaxfilesize
-       //   - files_versionsinterval 
-       //   - files_versionmaxversions 
-       //
-       // todo:
-       //   - port to oc_filesystem to enable network transparency
-       //   - implement expire all function. And find a place to call it ;-)
-       //   - add transparent compression. first test if it´s worth it.
-
-       const DEFAULTENABLED=true; 
-       const DEFAULTFOLDER='versions'; 
-       const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp'; 
-       const DEFAULTMAXFILESIZE=1048576; // 10MB 
-       const DEFAULTMININTERVAL=1; // 2 min
-       const DEFAULTMAXVERSIONS=50; 
-
-       /**
-        * init the versioning and create the versions folder.
-        */
-       public static function init() {
-               if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-                       // create versions folder
-                       $foldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-                       if(!is_dir($foldername)){
-                               mkdir($foldername);
-                       }
-               }
-       }
-
-
-       /**
-        * listen to write event.
-        */
-       public static function write_hook($params) {
-               if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-                       $path = $params[\OC_Filesystem::signal_param_path];
-                       if($path<>'') Storage::store($path);
-               }
-       }
-
-
-
-       /**
-        * store a new version of a file.
-        */
-       public static function store($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 {
-                               $uid = \OCP\User::getUser();
-                       }
-                       $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-                       $filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
-                       Storage::init();
-
-                       // check if filename is a directory
-                       if(is_dir($filesfoldername.'/'.$filename)){
-                               return false;
-                       }
-
-                       // check filetype blacklist
-                       $blacklist=explode(' ',\OCP\Config::getSystemValue('files_versionsblacklist', Storage::DEFAULTBLACKLIST));
-                       foreach($blacklist as $bl) {
-                               $parts=explode('.', $filename);
-                               $ext=end($parts);
-                               if(strtolower($ext)==$bl) {
-                                       return false;
-                               }
-                       }
-                       
-                       // check filesize
-                       if(filesize($filesfoldername.'/'.$filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){
-                               return false;
-                       }
-
-
-                       // check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
-                       if ($uid == \OCP\User::getUser()) {
-                               $matches=glob($versionsFolderName.'/'.$filename.'.v*');
-                               sort($matches);
-                               $parts=explode('.v',end($matches));
-                               if((end($parts)+Storage::DEFAULTMININTERVAL)>time()){
-                                       return false;
-                               }
-                       }
-
-
-                       // create all parent folders
-                       $info=pathinfo($filename);      
-                       if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);   
-
-                       // store a new version of a file
-                       copy($filesfoldername.'/'.$filename,$versionsFolderName.'/'.$filename.'.v'.time());
-        
-                       // expire old revisions if necessary
-                       Storage::expire($filename);
-               }
-       }
-
-
-       /**
-        * rollback to an old version of a file.
-        */
-       public static function rollback($filename,$revision) {
-       
-               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 {
-                               $uid = \OCP\User::getUser();
-                       }
-                       $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'.$uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-                       
-                       $filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
-                       
-                       // rollback
-                       if ( @copy($versionsFolderName.'/'.$filename.'.v'.$revision,$filesfoldername.'/'.$filename) ) {
-                       
-                               return true;
-                               
-                       }else{
-                       
-                               return false;
-                               
-                       }
-                       
-               }
-               
-       }
-
-       /**
-        * check if old versions of a file exist.
-        */
-       public static function isversioned($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 {
-                               $uid = \OCP\User::getUser();
-                       }
-                       $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-
-                       // check for old versions
-                       $matches=glob($versionsFolderName.'/'.$filename.'.v*');
-                       if(count($matches)>1){
-                               return true;
-                       }else{
-                               return false;
-                       }
-               }else{
-                       return(false);
-               }
-       }
-
-
-        
-        /**
-         * @brief get a list of all available versions of a file in descending chronological order
-         * @param $filename file to find versions of, relative to the user files dir
-         * @param $count number of versions to return
-         * @returns array
-         */
-        public static function getVersions( $filename, $count = 0 ) {
-        
-                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 {
-                               $uid = \OCP\User::getUser();
-                       }
-                       $versionsFolderName = \OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-                       $versions = array();         
-                       
-                       // fetch for old versions
-                       $matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
-                       
-                       sort( $matches );
-                       
-                       $i = 0;
-                       
-                       foreach( $matches as $ma ) {
-                               
-                               $i++;
-                               $versions[$i]['cur'] = 0;
-                               $parts = explode( '.v', $ma );
-                               $versions[$i]['version'] = ( end( $parts ) );
-                               
-                               // if file with modified date exists, flag it in array as currently enabled version
-                               $curFile['fileName'] = basename( $parts[0] );
-                               $curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').\OC_Filesystem::getRoot().'/'.$curFile['fileName'];
-                               
-                               ( \md5_file( $ma ) == \md5_file( $curFile['filePath'] ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
-                               
-                       }
-                       
-                       $versions = array_reverse( $versions );
-                       
-                       foreach( $versions as $key => $value ) {
-                               
-                               // flag the first matched file in array (which will have latest modification date) as current version
-                               if ( $versions[$key]['fileMatch'] ) {
-                               
-                                       $versions[$key]['cur'] = 1;
-                                       break;
-                                       
-                               }
-                       
-                       }
-                       
-                       $versions = array_reverse( $versions );
-                       
-                       // only show the newest commits
-                       if( $count != 0 and ( count( $versions )>$count ) ) {
-                       
-                               $versions = array_slice( $versions, count( $versions ) - $count );
-                               
-                       }
-       
-                       return( $versions );
-
-
-                } else {
-                
-                       // if versioning isn't enabled then return an empty array
-                        return( array() );
-                        
-                }
-                
-        }
-
-        /**
-         * @brief Erase a file's versions which exceed the set quota
-         */
-        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 {
-                               $uid = \OCP\User::getUser();
-                       }
-                       $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-
-                       // check for old versions
-                       $matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
-                       
-                       if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
-                       
-                               $numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) );
-
-                               // delete old versions of a file
-                               $deleteItems = array_slice( $matches, 0, $numberToDelete );
-                               
-                               foreach( $deleteItems as $de ) {
-                               
-                                       unlink( $versionsFolderName.'/'.$filename.'.v'.$de );
-                                       
-                               }
-                       }
-                }
-        }
-
-        /**
-         * @brief Erase all old versions of all user files
-         * @return true/false
-         */
-        public static function expireAll() {
-               
-               $view = new \OC_FilesystemView('');
-               
-               $dir = \OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
-               
-               return $view->deleteAll( $dir, true );
-       
-        }
-
-        /**\r
-         * @brief Erase versions of deleted file
-         * @param array
-         *          
-         * This function is connected to the delete signal of OC_Filesystem
-         * cleanup the versions directory if the actual file gets deleted\r
-         */
-        public static function removeVersions($params) {
-               $rel_path =  $params['path'];\r
-               $abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';\r
-               if(Storage::isversioned($rel_path)) {\r
-                       $versions = Storage::getVersions($rel_path);\r
-                       foreach ($versions as $v){\r
-                               unlink($abs_path . $v['version']);\r
-                       }\r
-               }\r
-        }
-        
-        /**\r
-         * @brief rename/move versions of renamed/moved files
-         * @param array with oldpath and newpath
-         * 
-         * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
-         * of the stored versions along the actual file\r
-         */\r
-        public static function renameVersions($params) {\r
-               $rel_oldpath =  $params['oldpath'];
-               $abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v';
-               $abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v';\r
-               if(Storage::isversioned($rel_oldpath)) {
-                       $versions = Storage::getVersions($rel_oldpath);\r
-                       foreach ($versions as $v){
-                               rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
-                       }
-               }\r
-        }
-}