From 55cde0e5aa7118ed916fc76e21c72c5081cc81ae Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 5 Jul 2012 11:35:08 +0200
Subject: [PATCH] moved remove and rename hook to libs/hooks.php

---
 apps/files_versions/appinfo/app.php  |  4 +--
 apps/files_versions/lib/hooks.php    | 37 ++++++++++++++++++++++++++++
 apps/files_versions/lib/versions.php | 37 ----------------------------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index dba612e4b79..9ac7f6d5cde 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -12,5 +12,5 @@ OCP\Util::addscript('files_versions', 'versions');
 // Listen to write signals
 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
+OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Hooks", "remove_hook");
+OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Hooks", "rename_hook");
\ No newline at end of file
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 8a746705329..b43fdb9fd33 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -30,6 +30,43 @@ class Hooks {
 		}
 	}
 	
+	/**
+	 * @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
+	 */
+	public static function remove_hook($params) {
+		$rel_path =  $params['path'];
+		$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';
+		if(Storage::isversioned($rel_path)) {
+			$versions = Storage::getVersions($rel_path);
+			foreach ($versions as $v){
+				unlink($abs_path . $v['version']);
+			}
+		}
+	}
+	
+	/**
+	 * @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
+	 */
+	public static function rename_hook($params) {
+		$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';
+		if(Storage::isversioned($rel_oldpath)) {
+			$versions = Storage::getVersions($rel_oldpath);
+			foreach ($versions as $v){
+				rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
+			}
+		}
+	}
+	
 }
 
 ?>
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index fb78e0a56c0..412044dba7d 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -323,41 +323,4 @@ class Storage {
 		return $this->view->deleteAll( $dir, true );
 	
         }
-
-        /**
-         * @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
-         */
-        public static function removeVersions($params) {
-        	$rel_path =  $params['path'];
-        	$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v';
-        	if(Storage::isversioned($rel_path)) {
-        		$versions = Storage::getVersions($rel_path);
-        		foreach ($versions as $v){
-        			unlink($abs_path . $v['version']);
-        		}
-        	}
-        }
-        
-        /**
-         * @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
-         */
-        public static function renameVersions($params) {
-        	$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';
-        	if(Storage::isversioned($rel_oldpath)) {
-        		$versions = Storage::getVersions($rel_oldpath);
-        		foreach ($versions as $v){
-        			rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
-        		}
-        	}
-        }
 }
-- 
2.39.5