Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
	apps/files_encryption/appinfo/app.php

diff --cc apps/files_encryption/appinfo/app.php
index d2bac218a9f12d54fc0c9411ddf19faeec1cdd80,99bdc2c24702fdea6f15ff29a78d2a225bcf0f67..f69e04b5bbf779403640c8ae7acaeab85f8d429f
--- 1/apps/files_encryption/appinfo/app.php
--- 2/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@@ -10,44 -10,45 +10,50 @@@ OC::$CLASSPATH['OCA\Encryption\Session'
  OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
  OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
  
- if(!OC_Config::getValue('maintenance', false)) {
 -OC_FileProxy::register(new OCA\Encryption\Proxy());
++if (!OC_Config::getValue('maintenance', false)) {
 +      OC_FileProxy::register(new OCA\Encryption\Proxy());
  
 -// User related hooks
 -OCA\Encryption\Helper::registerUserHooks();
 +      // User related hooks
 +      OCA\Encryption\Helper::registerUserHooks();
  
 -// Sharing related hooks
 -OCA\Encryption\Helper::registerShareHooks();
 +      // Sharing related hooks
 +      OCA\Encryption\Helper::registerShareHooks();
  
 -// Filesystem related hooks
 -OCA\Encryption\Helper::registerFilesystemHooks();
 +      // Filesystem related hooks
 +      OCA\Encryption\Helper::registerFilesystemHooks();
  
 -stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
 +      stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
  
 -// check if we are logged in
 -if (OCP\User::isLoggedIn()) {
 +      // check if we are logged in
 +      if (OCP\User::isLoggedIn()) {
+ 
 -      // ensure filesystem is loaded
 -      if(!\OC\Files\Filesystem::$loaded) {
 -              \OC_Util::setupFS();
 -      }
++              // ensure filesystem is loaded
++              if (!\OC\Files\Filesystem::$loaded) {
++                      \OC_Util::setupFS();
++              }
+ 
 -      $view = new OC_FilesystemView('/');
 -      $session = new \OCA\Encryption\Session($view);
 +              $view = new OC_FilesystemView('/');
 +              $session = new \OCA\Encryption\Session($view);
  
 -      // check if user has a private key
 -      if (
 -              !$session->getPrivateKey(\OCP\USER::getUser())
 -              && OCA\Encryption\Crypt::mode() === 'server'
 -      ) {
 +              // check if user has a private key
 +              if (
 +                      !$session->getPrivateKey(\OCP\USER::getUser())
 +                      && OCA\Encryption\Crypt::mode() === 'server'
 +              ) {
  
 -              // Force the user to log-in again if the encryption key isn't unlocked
 -              // (happens when a user is logged in before the encryption app is
 -              // enabled)
 -              OCP\User::logout();
 +                      // Force the user to log-in again if the encryption key isn't unlocked
 +                      // (happens when a user is logged in before the encryption app is
 +                      // enabled)
 +                      OCP\User::logout();
  
 -              header("Location: " . OC::$WEBROOT . '/');
 +                      header("Location: " . OC::$WEBROOT . '/');
  
 -              exit();
 +                      exit();
 +              }
        }
 +} else {
 +      // logout user if we are in maintenance to force re-login
 +      OCP\User::logout();
  }
  
  // Register settings scripts

diff --cc apps/files_encryption/hooks/hooks.php
Simple merge