Commit Graph

802 Commits

Author SHA1 Message Date
Bjoern Schiessle 96c27ead92 check if encryption app is enabled 2013-09-20 11:21:34 +02:00
Jenkins for ownCloud fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
ringmaster 39f4538e0f This function doesn't cache anymore. Adjusted PHPDoc to suit. 2013-09-02 09:59:01 -04:00
ringmaster df7bfa4bf0 Don't cache the pkey, skip generation if the keyfile exists 2013-09-02 09:59:00 -04:00
Owen Winkler 9a263a500a Employ config option for OpenSSL config file, if provided.
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
2013-09-02 09:59:00 -04:00
Owen Winkler fb34f49913 Start a branch for easier OpenSSL configuration. 2013-09-02 09:58:19 -04:00
Jenkins for ownCloud dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
Thomas Müller c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Thomas Müller 582b33bdf1 Merge pull request #4537 from owncloud/no-realpath
Do not use realpath() on includes.
2013-08-22 01:50:31 -07:00
Andreas Fischer 83afb46205 Use __DIR__ instead of dirname(__FILE__).
This is possible because we require PHP 5.3 or higher.
2013-08-21 11:01:24 +02:00
Andreas Fischer 85ac9572ce Also remove other unnecessary realpath() calls. 2013-08-21 10:53:18 +02:00
Andreas Fischer 9753e44ac2 Do not use realpath() on includes.
If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.

'include' works just fine with symlinks, "./" and "../".
2013-08-21 10:52:22 +02:00
Jenkins for ownCloud e9644c2f52 [tx-robot] updated from transifex 2013-08-19 15:14:38 -04:00
Björn Schießle 9be836814c Merge pull request #4239 from owncloud/decrypt_files_again
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
Kondou c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Bart Visscher eb97818519 Merge pull request #4483 from owncloud/compare-true-false
Compare result are already true/false
2013-08-18 03:26:35 -07:00
Bjoern Schiessle 1be11bb03d don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again 2013-08-18 11:21:01 +02:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again
Conflicts:
	apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Björn Schießle d3e2f31ada Merge pull request #4352 from owncloud/encryption_clean_up
crypt.php clean up
2013-08-17 04:10:15 -07:00
Bart Visscher 29b6dd53a0 Compare result are already true/false 2013-08-17 12:58:10 +02:00
Thomas Müller de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Jenkins for ownCloud 6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Bjoern Schiessle 7adfc27caf remove whitespaces and some leftover code from testing 2013-08-15 13:13:16 +02:00
Jenkins for ownCloud 680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Andreas Fischer 75e9015b54 Merge pull request #4393 from owncloud/fix_4326
provide correct path for require_once

* owncloud/fix_4326:
  use __DIR__ instead of realpath
  provide correct path for require_once
2013-08-14 21:20:53 +02:00
Bjoern Schiessle 7d0e9cc685 use __DIR__ instead of realpath 2013-08-14 17:15:01 +02:00
Jenkins for ownCloud 9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
Bjoern Schiessle eb0fdc8380 provide correct path for require_once 2013-08-12 17:38:57 +02:00
Bjoern Schiessle 7b1067c2a0 change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal 2013-08-12 16:19:08 +02:00
Bjoern Schiessle 0bab8935c9 preserve mtime if file gets encrypted/decrypted 2013-08-12 14:30:43 +02:00
Bjoern Schiessle b982868c14 fix array declaration 2013-08-12 13:59:49 +02:00
Jenkins for ownCloud 5ebff8cfc4 [tx-robot] updated from transifex 2013-08-11 08:11:03 -04:00
Bjoern Schiessle 44d201a526 Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up 2013-08-09 15:57:07 +02:00
Bjoern Schiessle 5ba8d38b7f remove old comments, TODos, etc. 2013-08-09 15:55:17 +02:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Thomas Müller c458e785a1 fixing typos and PHPDoc 2013-08-08 15:08:58 +02:00
Bjoern Schiessle 512f98cac9 remove todo item 2013-08-08 13:38:15 +02:00
Bjoern Schiessle 023121aed0 adapt tests to the changes in crypt.php 2013-08-08 13:35:01 +02:00
Bjoern Schiessle b39d2d1938 more error messages which might be useful for the user to debug his server config 2013-08-08 08:39:11 +02:00
Bjoern Schiessle 7ce03ba37c improved error message to refect openSSL PHP extension and stock openSSL configuration issues 2013-08-08 08:39:01 +02:00
Bjoern Schiessle 7aeb0068be also write error message to the log 2013-08-08 08:38:52 +02:00
Bjoern Schiessle cfbdad9cdb catch broken server config and disable encryption app. 2013-08-08 08:38:37 +02:00
Bjoern Schiessle 97e910e087 make methods private which are not used from outside 2013-08-08 08:37:39 +02:00
Jenkins for ownCloud 0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Jenkins for ownCloud 0fce89308e [tx-robot] updated from transifex 2013-08-05 07:54:38 -04:00
Jenkins for ownCloud 9923fe655b [tx-robot] updated from transifex 2013-08-04 02:01:28 -04:00
Jenkins for ownCloud 17fe748abc [tx-robot] updated from transifex 2013-08-03 01:56:46 -04:00
Bjoern Schiessle 69173c2a6b fix test and make warning translatable 2013-08-01 14:19:33 +02:00
Bjoern Schiessle 9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00