diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2012-07-25 16:51:48 +0100 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2012-07-25 16:51:48 +0100 |
| commit | e6de086fb66b029d70d1e24db5224f236e43198d (patch) | |
| tree | d5f281671a918ecb44e8ff59a7b07f498cb2d524 /apps/files_encryption/appinfo | |
| parent | 66b461629be6d1585ae0171b9128ad19d2c85bfb (diff) | |
| download | nextcloud-server-e6de086fb66b029d70d1e24db5224f236e43198d.tar.gz nextcloud-server-e6de086fb66b029d70d1e24db5224f236e43198d.zip | |
Fixed various bugs in hooks class
Fixed documentation syntax in keymanager
Diffstat (limited to 'apps/files_encryption/appinfo')
| -rw-r--r-- | apps/files_encryption/appinfo/app.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index 679d0b95edc..969c824cfda 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -1,16 +1,19 @@ <?php -OC::$CLASSPATH['OC_Crypt'] = 'apps/files_encryption/lib/crypt.php'; +OC::$CLASSPATH['OCA_Encryption\Crypt'] = 'apps/files_encryption/lib/crypt.php'; +OC::$CLASSPATH['OCA_Encryption\Hooks'] = 'apps/files_encryption/hooks/hooks.php'; +OC::$CLASSPATH['OCA_Encryption\Util'] = 'apps/files_encryption/lib/util.php'; +OC::$CLASSPATH['OCA_Encryption\Keymanager'] = 'apps/files_encryption/lib/keymanager.php'; OC::$CLASSPATH['OC_CryptStream'] = 'apps/files_encryption/lib/cryptstream.php'; OC::$CLASSPATH['OC_FileProxy_Encryption'] = 'apps/files_encryption/lib/proxy.php'; -OC_FileProxy::register(new OC_FileProxy_Encryption()); +//OC_FileProxy::register(new OC_FileProxy_Encryption()); -OCP\Util::connectHook('OC_User','post_login','OC_Crypt','loginListener'); +OCP\Util::connectHook('OC_User','post_login','OCA_Encryption\Hooks','login'); stream_wrapper_register('crypt','OC_CryptStream'); -if(!isset($_SESSION['enckey']) and OCP\User::isLoggedIn()){//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled) +if( !isset($_SESSION['enckey']) and OCP\User::isLoggedIn() ){//force the user to re-loggin 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.'/'); exit(); |