diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2012-08-08 14:15:35 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2012-08-08 14:15:35 +0200 |
| commit | d4974b6d4a9ce06dadbe419b193579eaa83393c4 (patch) | |
| tree | 823e46a0be3f867068baea194ade28f53f81f97a /lib | |
| parent | 5bb3ea97407a251a26272383bfbb073ba2fc3965 (diff) | |
| download | nextcloud-server-d4974b6d4a9ce06dadbe419b193579eaa83393c4.tar.gz nextcloud-server-d4974b6d4a9ce06dadbe419b193579eaa83393c4.zip | |
set default dependencies in keymanager.php
fix calls in ocs.php
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ocs.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/ocs.php b/lib/ocs.php index 97314d71ced..0fc208516ee 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -693,14 +693,14 @@ class OC_OCS { */
private static function publicKeySet($format, $key) { $login=OC_OCS::checkpassword();
- if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode($user) === 'client') {
+ if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode() === 'client') {
if (OCA_Encryption\Keymanager::setPublicKey($key)) {
echo self::generateXml('', 'ok', 100, '');
} else {
echo self::generateXml('', 'fail', 404, 'could not add your public key to the key storage');
}
} else {
- echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled for user ' . $user);
+ echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled');
}
} @@ -711,7 +711,7 @@ class OC_OCS { */ private static function privateKeyGet($format) {
$login=OC_OCS::checkpassword();
- if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode($user) === 'client') { + if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode() === 'client') { if (($key = OCA_Encryption\Keymanager::getPrivateKey())) {
$xml=array();
$xml['key']=$key;
@@ -721,7 +721,7 @@ class OC_OCS { echo self::generateXml('', 'fail', 404, 'private key does not exist');
} } else { - echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled for user ' . $user); + echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled'); }
} @@ -733,14 +733,14 @@ class OC_OCS { */
private static function privateKeySet($format, $key) { $login=OC_OCS::checkpassword();
- if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode($user) === 'client') {
+ if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode() === 'client') {
if (($key = OCA_Encryption\Keymanager::setPrivateKey($key))) {
echo self::generateXml('', 'ok', 100, '');
} else {
echo self::generateXml('', 'fail', 404, 'could not add your private key to the key storage');
}
} else {
- echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled for user ' . $user);
+ echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled');
}
} @@ -752,7 +752,7 @@ class OC_OCS { */
private static function fileKeyGet($format, $file) { $login=OC_OCS::checkpassword();
- if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode($user) === 'client') {
+ if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode() === 'client') {
if (($key = OCA_Encryption\Keymanager::getFileKey($file))) {
$xml=array();
$xml['key']=$key;
@@ -762,7 +762,7 @@ class OC_OCS { echo self::generateXml('', 'fail', 404, 'file key does not exist');
}
} else {
- echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled for user ' . $user);
+ echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled');
} }
@@ -775,14 +775,14 @@ class OC_OCS { */
private static function fileKeySet($format, $file, $key) { $login=OC_OCS::checkpassword();
- if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode($user) === 'client') {
+ if(OC_App::isEnabled('files_encryption') && OCA_Encryption\Crypt::mode() === 'client') {
if (($key = OCA_Encryption\Keymanager::setFileKey($file, $key))) {
echo self::generateXml('', 'ok', 100, '');
} else {
echo self::generateXml('', 'fail', 404, 'could not write key file');
}
} else {
- echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled for user ' . $user);
+ echo self::generateXml('', 'fail', 300, 'Client side encryption not enabled');
}
} |