size of the trash bin could be incorrect, remove it for all users to enforce a recalc...

diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
index b0bf79cc510f4c5c22a1af8df09cb092df4f9c0a..f4dad7b26bf2dbcdd33d4d7c3f49d5c2dabfcc47 100644 (file)
--- a/apps/files_trashbin/appinfo/update.php
+++ b/apps/files_trashbin/appinfo/update.php
@@ -1,40 +1,10 @@
 <?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');
-               
-       }
+if (version_compare($installedVersion, '0.4', '<')) {
+       //size of the trash bin could be incorrect, remove it for all users to
+       //enforce a recalculation during next usage.
+       $query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trashsize`');
+       $result = $query->execute();
 }
\ No newline at end of file

diff --git a/apps/files_trashbin/appinfo/version b/apps/files_trashbin/appinfo/version
index be586341736ee60d6ca2be0f3762a307e8fe79f9..bd73f47072b1fe4b9914ec14a7f6d47fcc8f816a 100644 (file)
--- a/apps/files_trashbin/appinfo/version
+++ b/apps/files_trashbin/appinfo/version
@@ -1 +1 @@
-0.3
+0.4