Merge branch 'master' into update-expire-function

Conflicts:
	apps/files_trashbin/appinfo/version
	apps/files_trashbin/lib/trash.php

diff --cc apps/files_trashbin/lib/trash.php
index 3c9797e671f830a7f4b89dec1d62df4e1f86b84f,5963f9a1b7c8c04f216a8e12a78490e885c57401..032df86a61e35c90bbf5236a1577af351e937e27
--- 1/apps/files_trashbin/lib/trash.php
--- 2/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@@ -36,67 -36,78 +36,78 @@@ class Trashbin 
         */
        public static function move2trash($file_path) {
                $user = \OCP\User::getUser();
-               $view = new \OC_FilesystemView('/'. $user);
-               if (!$view->is_dir('files_trashbin')) {
-                       $view->mkdir('files_trashbin');
-                       $view->mkdir("versions_trashbin");
-               }
- 
-               $path_parts = pathinfo($file_path);
- 
-               $deleted = $path_parts['basename'];
-               $location = $path_parts['dirname'];
-               $timestamp = time();
-               $mime = $view->getMimeType('files'.$file_path);
- 
-               if ( $view->is_dir('files'.$file_path) ) {
-                       $type = 'dir';
-               } else {
-                       $type = 'file';
+               $view = new \OC\Files\View('/'. $user);\r
+               if (!$view->is_dir('files_trashbin')) {\r
+                       $view->mkdir('files_trashbin');\r
+                       $view->mkdir("files_trashbin/files");
+                       $view->mkdir("files_trashbin/versions");
+                       $view->mkdir("files_trashbin/keyfiles");\r
+               }\r
+ \r
+               $path_parts = pathinfo($file_path);\r
+ \r
+               $deleted = $path_parts['basename'];\r
+               $location = $path_parts['dirname'];\r
+               $timestamp = time();\r
+               $mime = $view->getMimeType('files'.$file_path);\r
+ \r
+               if ( $view->is_dir('files'.$file_path) ) {\r
+                       $type = 'dir';\r
+               } else {\r
+                       $type = 'file';\r
                }
                
 -              $trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size');\r
 -              if ( $trashbinSize === null ) {\r
 +              $trashbinSize = self::getTrashbinSize($user);\r
 +              if ( $trashbinSize === false || $trashbinSize < 0 ) {
                        $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
-                       $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin'));
                }
-               $trashbinSize += self::copy_recursive($file_path, 'files_trashbin/'.$deleted.'.d'.$timestamp, $view);
+               $trashbinSize += self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view);
  
-               if ( $view->file_exists('files_trashbin/'.$deleted.'.d'.$timestamp) ) {
-                       $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user)"
-                               ." VALUES (?,?,?,?,?,?)");
+               if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) {\r
+                       $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)");
                        $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user));
                        if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin.
-                               $view->deleteAll('files_trashbin/'.$deleted.'.d'.$timestamp);
+                               $view->deleteAll('files_trashbin/files/'.$deleted.'.d'.$timestamp);
                                \OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR);
                                return;
-                       }
- 
-                       if ( \OCP\App::isEnabled('files_versions') ) {
+                       }\r
+                       
+                       // Take care of file versions\r
+                       if ( \OCP\App::isEnabled('files_versions') ) {\r
                                if ( $view->is_dir('files_versions'.$file_path) ) {
-                                       $trashbinSize += self::calculateSize(
-                                               new \OC_FilesystemView('/'. $user.'/files_versions/'.$file_path)
-                                       );
-                                       $view->rename('files_versions'.$file_path, 'versions_trashbin/'. $deleted.'.d'.$timestamp);
-                               } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($file_path) ) {
+                                       $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_versions/'.$file_path));\r
+                                       $view->rename('files_versions'.$file_path, 'files_trashbin/versions'. $deleted.'.d'.$timestamp);\r
+                               } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($file_path) ) {\r
                                        foreach ($versions as $v) {
-                                               $trashbinSize += $view->filesize('files_versions'.$v['path'].'.v'.$v['version']);
-                                               $view->rename('files_versions'.$v['path'].'.v'.$v['version'],
-                                                       'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp);
-                                       }
+                                               $trashbinSize += $view->filesize('files_versions'.$v['path'].'.v'.$v['version']);\r
+                                               $view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'files_trashbin/versions'. $deleted.'.v'.$v['version'].'.d'.$timestamp);\r
+                                       }\r
                                }
                        }
+                       
+                       // Take care of encryption keys
+                       $keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path);\r
+                       if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile.'.key') ) {
+                               if ( $view->is_dir('files'.$file_path) ) {
+                                       $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile));
+                                       $view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp);
+                               } else {\r
+                                       $trashbinSize += $view->filesize($keyfile.'.key');
+                                       $view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.key.d'.$timestamp);
+                               }\r
+                       }
+ 
                } else {
                        \OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR);
                }
 -
 -              // get available disk space for user
 -              $quota = \OCP\Util::computerFileSize(\OC_Preferences::getValue($user, 'files', 'quota'));
 -              if ( $quota === null ) {
 -                      $quota = \OCP\Util::computerFileSize(\OC_Appconfig::getValue('files', 'default_quota'));
 -              }
 -              if ( $quota === null ) {
 -                      $quota = \OC\Files\Filesystem::free_space('/');
 +              
 +              // get available disk space for user\r
 +              $quota = \OCP\Util::computerFileSize(\OC_Preferences::getValue($user, 'files', 'quota'));\r
-               if ( $quota == null ) {\r
++              if ( $quota === null ) {\r
 +                      $quota = \OCP\Util::computerFileSize(\OC_Appconfig::getValue('files', 'default_quota'));\r
 +              }\r
-               if ( $quota == null ) {\r
++              if ( $quota === null ) {\r
 +                      $quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
                }
  
                // calculate available space for trash bin
@@@ -125,10 -134,9 +136,9 @@@
                $user = \OCP\User::getUser();
                $view = new \OC_FilesystemView('/'.$user);
                
 -              $trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size');
 -              if ( $trashbinSize === null ) {\r
 +              $trashbinSize = self::getTrashbinSize($user);
-               if ( $trashbinSize === false || $trashbinSize < 0 ) {\r
-                       $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));\r
-                       $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin'));
++              if ( $trashbinSize === false || $trashbinSize < 0 ) {
+                       $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
                }
                if ( $timestamp ) {
                        $query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash'
@@@ -222,10 -244,9 +247,9 @@@
                $view = new \OC_FilesystemView('/'.$user);
                $size = 0;\r
        
 -              $trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size');
 -              if ( $trashbinSize === null ) {\r
 +              $trashbinSize = self::getTrashbinSize($user);
-               if ( $trashbinSize === false || $trashbinSize < 0 ) {\r
-                       $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));\r
-                       $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin'));
++              if ( $trashbinSize === false || $trashbinSize < 0 ) {
+                       $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
                }
  
                if ( $timestamp ) {
@@@ -252,16 -273,35 +276,35 @@@
                                }
                        }
                }
- 
-               if ($view->is_dir('/files_trashbin/'.$file)) {
-                       $size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/files_trashbin/'.$file));
+               
+               // Take care of encryption keys
+               $parts = pathinfo($file);\r
+               if ( $view->is_dir('/files_trashbin/files/'.$file) ) {\r
+                       $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename);\r
+               } else {\r
+                       $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename.'.key');\r
+               }\r
+               if ($timestamp) {\r
+                       $keyfile .= '.d'.$timestamp;\r
+               }\r
+               if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {\r
+                       if ( $view->is_dir($keyfile) ) {\r
+                               $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile));\r
+                       } else {\r
+                               $size += $view->filesize($keyfile);\r
+                       }\r
+                       $view->unlink($keyfile);\r
+               }\r
+       
+               if ($view->is_dir('/files_trashbin/files/'.$file)) {
+                       $size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/files_trashbin/files/'.$file));
                } else {
-                       $size += $view->filesize('/files_trashbin/'.$file);
+                       $size += $view->filesize('/files_trashbin/files/'.$file);
                }
-               $view->unlink('/files_trashbin/'.$file);
+               $view->unlink('/files_trashbin/files/'.$file);
                $trashbinSize -= $size;
 -              \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize);
 -
 +              self::setTrashbinSize($user, $trashbinSize);
 +              \r
                return $size;
        }
  
@@@ -455,35 -474,4 +477,35 @@@
                return $size;
        }
  
- }
 +      /**\r
 +       * get current size of trash bin from a given user\r
 +       *\r
 +       * @param $user user who owns the trash bin\r
 +       * @return mixed trash bin size or false if no trash bin size is stored\r
 +       */\r
 +      private static function getTrashbinSize($user) {\r
 +              $query = \OC_DB::prepare('SELECT size FROM *PREFIX*files_trashsize WHERE user=?');\r
 +              $result = $query->execute(array($user))->fetchAll();\r
 +\r
 +              if ($result) {\r
 +                      return $result[0]['size'];\r
 +              }\r
 +              return false;\r
 +      }\r
 +      \r
 +      /**\r
 +       * write to the database how much space is in use for the trash bin\r
 +       *\r
 +       * @param $user owner of the trash bin\r
 +       * @param $size size of the trash bin\r
 +       */\r
 +      private static function setTrashbinSize($user, $size) {\r
 +              if ( self::getTrashbinSize($user) === false) {\r
 +                      $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_trashsize (size, user) VALUES (?, ?)');\r
 +              }else {\r
 +                      $query = \OC_DB::prepare('UPDATE *PREFIX*files_trashsize SET size=? WHERE user=?');\r
 +              }\r
 +              $query->execute(array($size, $user));\r
 +      }
 +      
+ }

diff --cc apps/files_versions/lib/versions.php
Simple merge