diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-07-02 13:49:49 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-07-02 13:49:49 +0200 |
| commit | 38ed00398f4df27967ae771c54a6a8f6bed07dbd (patch) | |
| tree | e83849ec48369d26250bf3a906fa13283ccaec0d /apps/files_encryption | |
| parent | 40e6ede6a274f65b8ad29bfc5413baf5fbfe8eb4 (diff) | |
| parent | 3b1018ec00ed6f7fd4dc217c264351e69d5ea9d8 (diff) | |
| download | nextcloud-server-38ed00398f4df27967ae771c54a6a8f6bed07dbd.tar.gz nextcloud-server-38ed00398f4df27967ae771c54a6a8f6bed07dbd.zip | |
Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/files/error.php | 3 | ||||
| -rwxr-xr-x | apps/files_encryption/lib/helper.php | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php index 63c74e4e797..85128fa4aea 100644 --- a/apps/files_encryption/files/error.php +++ b/apps/files_encryption/files/error.php @@ -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; } -?> diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php index c12d6f7887a..e8495f88a1e 100755 --- a/apps/files_encryption/lib/helper.php +++ b/apps/files_encryption/lib/helper.php @@ -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; } -}
\ No newline at end of file +} |