Merge pull request #1810 from owncloud/trashbin_encryption

Trashbin file encryption support

2 files changed, 41 insertions, 1 deletions

diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
new file mode 100644
index 00000000000..b0bf79cc510
--- /dev/null
+++ b/apps/files_trashbin/appinfo/update.php
@@ -0,0 +1,40 @@
+<?php
+
+$installedVersion=OCP\Config::getAppValue('files_trashbin', 'installed_version');
+// move versions to new directory
+
+if (version_compare($installedVersion, '0.2', '<')) {
+	$datadir = \OCP\Config::getSystemValue('datadirectory').'/';
+
+	$users = \OCP\User::getUsers();
+	foreach ($users as $user) {
+		
+		//create new folders
+		@mkdir($datadir.$user.'/files_trashbin/files');
+		@mkdir($datadir.$user.'/files_trashbin/versions');
+		@mkdir($datadir.$user.'/files_trashbin/keyfiles');
+			
+		// move files to the new folders
+		if ($handle = opendir($datadir.$user.'/files_trashbin')) {
+			while (false !== ($file = readdir($handle))) {
+				if ($file != "." && $file != ".." && $file != 'files' && $file != 'versions' && $file != 'keyfiles') {
+					rename($datadir.$user.'/files_trashbin/'.$file,
+							$datadir.$user.'/files_trashbin/files/'.$file);
+				}
+			}
+			closedir($handle);
+		}
+				
+		// move versions to the new folder
+		if ($handle = opendir($datadir.$user.'/versions_trashbin')) {
+			while (false !== ($file = readdir($handle))) {
+				rename($datadir.$user.'/versions_trashbin/'.$file,
+						$datadir.$user.'/files_trashbin/versions/'.$file);
+			}
+			closedir($handle);
+		}
+		
+		@rmdir($datadir.$user.'/versions_trashbin');
+		
+	}
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/appinfo/version b/apps/files_trashbin/appinfo/version
index 49d59571fbf..3b04cfb60da 100644
--- a/apps/files_trashbin/appinfo/version
+++ b/apps/files_trashbin/appinfo/version
@@ -1 +1 @@
-0.1
+0.2