wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version

Browse source
This commit is contained in:
Björn Schießle 2013-07-02 13:49:49 +02:00
commit 38ed00398f
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/files_encryption/files/error.php
View file

@ -4,7 +4,7 @@ if (!isset($_)) { //also provide standalone error page
$l = OC_L10N::get('files_encryption');
$errorMsg = $l->t('Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files');
$errorMsg = $l->t('Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files.');
if(isset($_GET['p']) && $_GET['p'] === '1') {
header('HTTP/1.0 404 ' . $errorMsg);
@ -21,4 +21,3 @@ if (!isset($_)) { //also provide standalone error page
exit;
}
?>

6
apps/files_encryption/lib/helper.php
View file

@ -123,7 +123,7 @@ class Helper {
$view->file_put_contents('/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey']);
// Encrypt private key empthy passphrase
// Encrypt private key empty passphrase
$encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $recoveryPassword);
// Save private key
@ -211,7 +211,7 @@ class Helper {
/**
* check requirements for encryptoin app.
* check requirements for encryption app.
* @return bool true if requirements are met
*/
public static function checkRequirements() {
@ -224,4 +224,4 @@ class Helper {
return (bool) $result;
}
}
}