3c46dcd7dd
Added .ocdata file to check for data folder validity
...
In environments where the data folder is mount from another partition,
it is important to check that the data folder we see is actually the
real one. If the mount failed for some reasons, this fix will make
ownCloud temporarily unavailable instead of causing unpredictable
behavior.
2014-03-14 15:36:35 +01:00
eabeedb306
Merge branch 'master' into cachehooks-first
2014-03-13 15:22:00 +01:00
d55c7223a9
Merge branch 'master' into foldersize-reuse
...
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
c1cb9ee9b0
Merge pull request #7650 from owncloud/quota-totalspace
...
Fixed total space display when data size exceeds quota
2014-03-11 12:40:59 +01:00
010eef95c0
Fixed total space display when data size exceeds quota
...
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
2014-03-10 17:59:14 +01:00
8ab7d18a6a
Move the router classes to a namespace and expose it with a public interface
2014-03-10 14:04:58 +01:00
26513bc17b
Merge pull request #7624 from owncloud/enc-encryptedusedspacefix
...
[master] Fixed used space to be based on unencrypted size
2014-03-10 09:38:24 +01:00
8f6ea900f2
Chainable Response in AppFramework
2014-03-09 23:01:16 +01:00
48d63a6278
Return unencrypted_size of folder when queried
...
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
ada8d4e0c9
Fix unit tests
2014-03-07 02:44:34 +01:00
84cf40ed82
merge master into webdav-injection
2014-03-06 13:35:06 +01:00
c7e204bd36
Added unit tests for serverHost and other related functions
2014-03-06 11:51:17 +01:00
b54b0b2153
Yet another cleanup
2014-03-05 00:26:06 +01:00
5211566205
update test case
2014-03-04 16:36:03 +01:00
bb8a7a2230
Remove assert since the root size of the home storage is no longer calculated
2014-03-03 16:48:06 +01:00
331fc55e2d
Update unit tests to use the new injection
2014-03-03 14:27:24 +01:00
35a8dfb2fa
More PHPDoc fixes, using scrutinizer patches as hints
2014-02-28 13:53:41 +01:00
3116bede68
Add unit tests for getUserGroups with addUser and removeUser
2014-02-27 21:04:44 +01:00
2ba6cd4e2b
initialize etags of temporary storage
2014-02-27 12:44:07 +01:00
131c12ad8d
use assertInternalType for typechecking
2014-02-27 09:51:26 +01:00
39f2f564a9
use assertSame and assertNotSame for etag checks
2014-02-27 09:39:34 +01:00
bc49c6be04
Manually triger the filecache update hooks before any other hook
2014-02-26 14:29:13 +01:00
6bde602c09
Merge pull request #7292 from owncloud/sharing_tests
...
fix sharing unit tests
2014-02-21 14:24:51 +01:00
9f0fc30251
Merge pull request #7337 from owncloud/test_for_6935
...
add unit test for \OC\URLGenerator::getAbsoluteURL
2014-02-21 13:45:49 +01:00
cf7ef0d356
fix sharing unit tests
2014-02-21 13:36:00 +01:00
2293563488
Remove unit tests which causes the filesystem tests to fail
2014-02-21 10:02:03 +01:00
1ae6e9ec21
add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935
2014-02-20 19:06:42 +01:00
ec45a3c0e2
Merge pull request #6962 from owncloud/quota-space-root
...
Allow passing a root folder to get the used space from in the quota wrapper
2014-02-20 16:47:59 +01:00
719f1111b6
Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
...
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
b2b35cd335
Fixed ext storage webdav path encoding
...
- Some WebDAV servers like lighttpd need paths in URLs to be properly
encoded
- Added error log output when curl connection failed
- Added check for 'resourcetype' in case the WebDAV server doesn't
support/return it
- Fixed touch() to return false if the server doesn't implement
PROPPATCH
- Added optional delay in WebDAV unit tests to use when testing against
lighttpd's WebDAV
2014-02-19 18:34:08 +01:00
bcad6e641a
Merge pull request #7274 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
2d5ab1a5c4
Merge pull request #7260 from owncloud/watcher-policy
...
Allow setting the frequency of which the file watcher checks for updates
2014-02-19 11:17:27 +01:00
eea1abae20
add unit tests for watcher policies
2014-02-19 09:52:51 +01:00
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
3cc7228c7c
Merge pull request #7253 from owncloud/preferences-caching
...
Add caching to OC\Preferences
2014-02-18 18:17:58 +01:00
bd71a1b7b6
Added file name check in webdav connector
...
- added file name check for the put, rename and setNames() methods which
throw a "Bad Request" whenever invalid characters are used
- replaced \OC\Filesystem usage with $this->getFS() to be able to write
unit tests
2014-02-18 17:54:32 +01:00
797e0a614c
Added extra checks for invalid file chars in newfile.php and newfolder.php
...
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
check for invalid characters
2014-02-18 17:54:32 +01:00
a573fe7d76
Merge pull request #6650 from owncloud/migration_unit_tests
...
User migration fix, and basic unit test
2014-02-18 17:35:49 +01:00
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
589a7b220b
Fix poor spelling
2014-02-18 16:23:16 +00:00
2166683e3b
Allow setting the frequency of which the file watcher checks for updates
2014-02-18 16:34:25 +01:00
b6f44e9a1d
Add caching to OC\Preferences
2014-02-18 11:21:39 +01:00
a4b6d66703
Merge branch 'master' into migration_unit_tests
2014-02-17 11:03:57 +00:00
049e03c2b9
Finish basic testing of user export
2014-02-17 10:58:27 +00:00
750ffa8231
Merge pull request #7156 from owncloud/backgroundjob-public
...
Add the background job list to the public server container
2014-02-14 23:11:10 +01:00
b35f679483
Fix test cases for group manager
2014-02-14 15:07:08 +01:00
3b1df29318
sort expected result in tests
2014-02-13 13:56:02 +01:00
d6576c640c
Add unit tests for JobList
2014-02-12 13:52:13 +01:00
addd0fba38
number as number
2014-02-12 09:09:45 +01:00
a6399f9cef
Add the background job list to the public server container
2014-02-11 14:00:24 +01:00
a7c50514ac
Merge branch 'master' into convert-oc_appconfig
2014-02-11 13:26:54 +01:00
72f134cfce
intendation
2014-02-11 10:50:10 +01:00
32afdcbefe
Inject logger
2014-02-11 10:49:59 +01:00
9a39cd3b38
test for share dialoge sorter
2014-02-11 10:49:46 +01:00
082abdc620
Merge branch 'master' into migration_unit_tests
2014-02-10 21:32:17 +01:00
8ad3fc89be
Merge branch 'master' into quota-space-root
2014-02-07 23:29:26 +01:00
4cdf83e6d2
Remove the Test_AppConfig_Object tests as they no longer make sense with caching
2014-02-07 14:03:57 +01:00
b537d90e58
use the 'new' server container for appconfig
2014-02-07 13:45:59 +01:00
be47e156a5
Merge pull request #6952 from MartialGeek/add_freebox_support
...
New user agent added for the Freebox.
2014-02-06 18:12:32 +01:00
3afdcd85e7
Add unit test for quote wrapper size root
2014-02-04 16:05:12 +01:00
36838b2837
add test for password remove method
2014-02-04 11:18:04 +01:00
0f1c587e6b
The regexp of the Freebox user agent is now more strict.
...
A new unit test has been added in consequence.
2014-01-29 10:58:34 +01:00
8507efc427
Unit tests added for the new Freebox user agent.
2014-01-28 21:08:27 +01:00
506393090b
Add 'mail_from_address' configuration
...
In environments where there are rules for the email addresses, the "from
address" that owncloud uses has to be configurable.
This patch adds a new configuration variable 'mail_from_address'.
If it is configured, owncloud will use this as the sender of *all*
emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by
default). By using the 'mail_from_address' configuration, only this
email address will be used.
2014-01-24 14:04:37 +01:00
a3ea5aa2ac
fixing comment + adding unit test for checkPasswordProtectedShare
2014-01-21 12:07:08 +01:00
1af7dab535
Fixed quota wrapper to not wrap failed fopen streams
...
When calling fopen() on some storage types, these return false instead
of throwing an exception.
This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.
Also added 'rb' as another case that doesn't need to be wrapped.
Fixes #6832
2014-01-19 18:51:36 +01:00
23e6578601
Fix array access syntax for older PHP
...
There was a syntax error when running tests in PHP 5.3.10.
2014-01-17 12:31:22 +01:00
32e941a2bc
Merge pull request #6644 from ben-denham/unshare-all-fix
...
\OCP\Share::unshareAll() fix
2014-01-16 03:13:26 -08:00
d4519125db
Merge pull request #6744 from owncloud/fix_ocs_response_messages
...
keep response message
2014-01-15 03:17:24 -08:00
34559ef114
Merge pull request #6768 from owncloud/scanner-use-storage-mtime
...
Use storage_mtime when determining if we can reuse cached data while scanning
2014-01-15 01:31:33 -08:00
16b898ddb8
update another test
2014-01-14 20:19:05 +01:00
fc54335aff
extended test to also check the status messages
2014-01-14 17:11:04 +01:00
7e4c80fd60
use different value for mtime and storage_mtime in test
2014-01-14 15:13:21 +01:00
4113042c8f
remove duplicate test class
2014-01-14 15:11:41 +01:00
203d5d01ca
Use storage_mtime when determining if we can reuse cached data while scanning
2014-01-14 13:54:07 +01:00
30f77f53d5
updated the unit test for OCP\Share::unshareAll() to verify that shares by all users are removed for an item.
2014-01-10 14:08:29 +13:00
4faba49f0a
Fix calculated folder size to use unencrypted size
...
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
2014-01-09 17:47:50 +01:00
d8b8abb429
Merge pull request #6681 from owncloud/userreport
...
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
d7cb5ab080
add tests for user counting
2014-01-08 13:26:48 +01:00
f642ad3961
Prevent deleting storage root
...
Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.
Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.
2014-01-08 13:17:36 +01:00
5be4af9f51
Now also preventing to override "files" dir size with -1
...
Fixes #6526
2014-01-07 22:34:01 +01:00
2d5427efa9
Merge pull request #6290 from owncloud/files-androidcontentdisposition
...
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
528ff25ede
Add WIP unit test for migration
2014-01-07 00:38:27 +00:00
6f6c3d1e44
Make OC_Avatar unit tests independent of currently loggedin user
2014-01-02 16:08:08 +01:00
14e0b1b6d1
Merge pull request #6513 from owncloud/user-no-change-displayname
...
Re-add the config options to remove the ability for users to change their displayname
2014-01-02 05:04:27 -08:00
efdeba7416
Merge pull request #6449 from owncloud/core-appsorderfix
...
Fixed apps loading order
2013-12-24 14:26:11 -08:00
4bc2a22317
Remove all uses of numRows().
2013-12-21 19:56:14 +01:00
c6377e9125
Fixed apps loading order
...
On SQLite the app order can be arbitrary and cause strange bugs.
On MySQL, the app order seems to be always alphabetical.
This fix enforces alphabetical order to make sure that all environments
behave the same and to reduce bugs related to app loading order.
Fixes #6442
2013-12-20 17:16:57 +01:00
0ed1b64673
Pass config object in testGetHomeNotSupported
2013-12-20 13:57:22 +01:00
09bd5bd517
Added isUserAgent() method to request
...
- added isUserAgent() method to OC_Request which makes it possible to
test it
- OC_Response::setContentDisposition now uses OC_Request::isUserAgent()
2013-12-19 18:40:22 +01:00
cacb66480b
Add unit tests for decimal type usage
2013-12-18 23:40:11 +01:00
f0962c99dc
Increment number of columns by one
2013-12-18 00:37:09 +01:00
cb9e87eced
Typo fixed
2013-12-17 23:46:36 +01:00
5fcbe5350c
Add decimal(precision,scale) column to unit tests
2013-12-17 23:08:05 +01:00
5a1194520e
Merge pull request #6345 from owncloud/mysql-set-names-utf8-tests
...
DB tests: Test whether we can insert and read UTF8 data.
2013-12-17 01:54:30 -08:00
ab4136f432
add missing quotes + field declarations
2013-12-17 10:05:20 +01:00
c0edb639ed
adjust test
2013-12-13 16:58:23 +01:00
95dd58bfc0
Use old school query style that actually works.
2013-12-12 15:24:35 +01:00
46b72cbff0
remove unneeded ; in comment
2013-12-12 15:14:44 +01:00
30e0b474f8
Add test for having utf8 filenames in the cache
2013-12-12 13:43:55 +01:00
f8d3b7cb6f
DB tests: Test whether we can insert and read UTF8 data.
2013-12-12 13:19:08 +01:00
67310b60f7
Ensure memcached extension is there before attempting to create an instance.
2013-12-09 14:33:26 +01:00
a67c737848
Only run memcached tests if server is available.
2013-12-09 01:02:42 +01:00
6a747106db
Merge pull request #6150 from owncloud/backgroundjob-log-exception
...
Remove background jobs that are giving errors
2013-12-06 11:56:53 -08:00
e888bdda30
get rid of failing test that don't cause additional downloads
2013-12-06 18:26:38 +01:00
cf9b7e343a
extend test case for etag preservation
2013-12-06 13:00:58 +01:00
01ab15a2b0
reuse etags when doing a background scan
2013-12-05 15:23:34 +01:00
2ff1bdaba3
add test case for removing background jobs that are throwing exceptions
2013-12-05 13:29:35 +01:00
3fa11bd426
Dont use exceptions for the backgroundjob test cases
2013-12-04 16:28:27 +01:00
6cf9844e9c
Added unit test for the test() method
...
This is to make sure that method isn't broken
2013-12-03 14:35:53 +01:00
832be7c908
Merge pull request #6052 from owncloud/datetime-doctrine
...
Get rid of date strings for DB. Completely use Doctrine and DateTime.
2013-12-01 01:29:35 -08:00
d69243ee51
Fixed FTP and SMB to use rmdir() when deleting folders
...
Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().
Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)
Note that the extra is_dir() should be fast because it's read from the
stat cache.
2013-11-29 13:01:01 +01:00
43b1cf7988
Redetect mime type whenever extension is renamed
2013-11-27 21:34:51 +01:00
4f15282bc9
Merge pull request #6058 from owncloud/ldap2avatar
...
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
1fef97f6a5
Merge pull request #6060 from owncloud/fix-6050-oc6
...
fixing getRawPathInfo() once more
2013-11-26 10:13:58 -08:00
2653d914d9
Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefix
...
Fixed SMB rename function to overwrite target file
2013-11-26 06:42:36 -08:00
2a93720f3f
fixes #6050
2013-11-26 14:13:33 +01:00
712b47757a
Updated unit tests for SMB
...
- coverage for touch return value
- fixed directory provider to exclude unsupported cases
2013-11-26 12:53:03 +01:00
06df3822a0
Timestamp test is no longer necessary as we rely on Doctrine and DateTime.
2013-11-26 12:22:08 +01:00
c3e34676ba
Improved unit test for "overwrite on move"
...
Now using a different content to make sure the file was overwritten.
2013-11-25 18:54:58 +01:00
af7118aa5d
Added unit test for "overwrite file on rename/move"
...
Also fixed "rename" unit test that was ready the result out of the wrong
file.
2013-11-25 18:52:14 +01:00
b9fed935b4
in case uri and script name don't match we better throw an exception
2013-11-25 14:42:34 +01:00
a0a665ea45
handle duplicate slashes in case of reverse proxy configuration
2013-11-25 14:21:51 +01:00
229630f14c
adding simple unit test to test scriptName() under overwrite condition
2013-11-24 21:19:06 +01:00
8ccac86c98
Enable user backends to provide avatar images
2013-11-22 13:25:20 +01:00
2f73db12bb
Merge pull request #5040 from owncloud/public_api_avatar_master
...
Add public API for \OC\Avatar
2013-11-22 03:42:28 -08:00
00071401d7
Round out Avatar Public API
2013-11-21 23:40:25 +01:00
356eef0739
Quota storage wrapper is now used for all users in sharing mode
...
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.
This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
2013-11-21 12:04:54 +01:00
5b6d1d79d0
Fixed SMB file deletion success detection
...
Since unlink() smb4php doesn't return true on deletion success, we need
to check whether the file was deleted to confirm success.
Fixes #5866
2013-11-19 15:05:11 +01:00
4a0d295e4a
Merge pull request #5927 from owncloud/quota-excludeextstorage
...
External storage space is now not counted in total space
2013-11-18 14:42:40 -08:00
3e2fd9942b
Root size for home storage is now size of "files" subdir
...
Fixes #4593
2013-11-18 18:17:25 +01:00
614e4d485c
External storage space is now not counted in total space
...
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.
Fixes #5924
2013-11-18 18:09:01 +01:00
49e9f771ff
Merge pull request #5813 from owncloud/fix-4736-master
...
Don't set a default value when there isn't a default specified
2013-11-15 01:06:38 -08:00
2bb4c266a6
Merge pull request #5862 from owncloud/files-singledotdirs
...
Files singledotdirs
2013-11-14 11:40:21 -08:00
7e63722534
make use of data providers
2013-11-14 15:37:30 +01:00
d9ab964ff9
Added missing test with leading backslash
2013-11-14 15:36:03 +01:00
c06d8bb007
Fixed normalizePath() to strip out single dot dirs
...
Now removing "/./" and trailing "/." from the paths when normalizing.
2013-11-14 13:15:03 +01:00
5a2d700866
Fix type in unit test
2013-11-14 01:11:22 +00:00
00944a376a
Merge branch 'master' into oc_api_tests
2013-11-14 00:40:57 +00:00
959513fdc8
Add tests for OC_API::mergeResponses()
2013-11-14 00:40:09 +00:00
34c92f6656
Now using HomeStorage for legacy home storage ids
...
Legacy home storage ids with the format "local://path/to/datadir/user1"
are now also wrapped by the HomeStorage.
2013-11-12 18:01:02 +01:00
32a703ab36
Do not use -1 as the size for the root folder of the home storage
2013-11-12 16:15:43 +01:00
9c1c8d57f0
fix DB schema test - no default value
2013-11-12 13:45:28 +01:00
da20fb7922
Merge pull request #5707 from owncloud/fixwrongfilesizeintests
...
Fixed filesize issue in watchr test
2013-11-11 06:26:38 -08:00
7ff6a642b4
Fixed filesize issue in watchr test
...
Added clearstatcache to make sure we get the correct file size after
re-writing into the same file.
This failed on openSUSE 12.3 x86_64
2013-11-05 17:01:02 +01:00
f91fe8d595
Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master
...
Oc6 windows server mssql master
2013-11-05 00:41:11 -08:00
665b7571f4
adding test for binary file to test \OC_Helper::streamCopy()
2013-11-04 17:19:04 +01:00
8872b881cc
Add tests for OCP\Share::unshareAll().
2013-11-03 12:31:53 +01:00
998211f7a3
WIN: fixing unit test for testStreamCopy()
2013-11-02 20:31:29 +01:00
d25c8b43e6
Merge pull request #5652 from owncloud/front-port-5647-master
...
[WIP] extend unit test to directories starting or ending in whitespace
2013-11-01 23:11:33 -07:00
Vincent Petry
Robin Appelman
Thomas Tanghus
Bart Visscher
Jörn Friedrich Dreyer
Björn Schießle
Thomas Müller
Lukas Reschke
Morris Jobke
icewind1991
Scrutinizer Auto-Fixer
Tom Needham
tomneedham
Arthur Schiwon
Martial Saunois
Jens-Christian Fischer
ben-denham
Andreas Fischer
Oliver Gasser
Björn Schießle