Fix namespace of files_encryption classes and autoload them

This commit is contained in:
Joas Schilling 2014-12-03 10:57:16 +01:00
parent c36bac3abd
commit 7f7006643f
13 changed files with 12 additions and 27 deletions

View File

@ -1,20 +1,5 @@
<?php
OC::$CLASSPATH['OCA\Encryption\Crypt'] = 'files_encryption/lib/crypt.php';
OC::$CLASSPATH['OCA\Encryption\Hooks'] = 'files_encryption/hooks/hooks.php';
OC::$CLASSPATH['OCA\Encryption\Util'] = 'files_encryption/lib/util.php';
OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'files_encryption/lib/keymanager.php';
OC::$CLASSPATH['OCA\Encryption\Stream'] = 'files_encryption/lib/stream.php';
OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'files_encryption/lib/proxy.php';
OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
// Exceptions
OC::$CLASSPATH['OCA\Encryption\Exception\MultiKeyEncryptException'] = 'files_encryption/exception/multiKeyEncryptException.php';
OC::$CLASSPATH['OCA\Encryption\Exception\MultiKeyDecryptException'] = 'files_encryption/exception/multiKeyDecryptException.php';
OC::$CLASSPATH['OCA\Encryption\Exception\EncryptionException'] = 'files_encryption/exception/encryptionException.php';
\OCP\Util::addTranslations('files_encryption');
\OCP\Util::addscript('files_encryption', 'encryption');
\OCP\Util::addscript('files_encryption', 'detect-migration');

View File

@ -21,7 +21,7 @@
*
*/
namespace OCA\Encryption\Exception;
namespace OCA\Files_Encryption\Exception;
/**
* Base class for all encryption exception

View File

@ -21,7 +21,7 @@
*
*/
namespace OCA\Encryption\Exception;
namespace OCA\Files_Encryption\Exception;
/**
* Throw this encryption if multi key decryption failed

View File

@ -21,7 +21,7 @@
*
*/
namespace OCA\Encryption\Exception;
namespace OCA\Files_Encryption\Exception;
/**
* Throw this exception if multi key encrytion fails

View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
namespace OCA\Encryption;
namespace OCA\Files_Encryption;
class Capabilities {

View File

@ -25,7 +25,7 @@
*
*/
namespace OCA\Encryption;
namespace OCA\Files_Encryption;
/**
* Class for common cryptography functionality

View File

@ -23,7 +23,7 @@
*
*/
namespace OCA\Encryption;
namespace OCA\Files_Encryption;
/**
* Class to manage registration of hooks an various helper methods

View File

@ -23,7 +23,7 @@
*
*/
namespace OCA\Encryption;
namespace OCA\Files_Encryption;
use OC\Files\Filesystem;

View File

@ -22,7 +22,7 @@
*
*/
namespace OCA\Encryption;
namespace OCA\Files_Encryption;
/**
* Class to manage storage and retrieval of encryption keys

View File

@ -30,7 +30,7 @@
* webui.
*/
namespace OCA\Encryption;
namespace OCA\Files_Encryption;
/**
* Class Proxy

View File

@ -22,7 +22,7 @@
*
*/
namespace OCA\Encryption;
namespace OCA\Files_Encryption;
/**
* Class for handling encryption related session data

View File

@ -30,7 +30,7 @@
* and then fopen('crypt://streams/foo');
*/
namespace OCA\Encryption;
namespace OCA\Files_Encryption;
use OCA\Encryption\Exception\EncryptionException;
/**

View File

@ -23,7 +23,7 @@
*
*/
namespace OCA\Encryption;
namespace OCA\Files_Encryption;
/**
* Class for utilities relating to encrypted file storage system