Commit graph

1218 commits

Author SHA1 Message Date
Vincent Petry
67413e3ada Use assertNotSame when checking etags
Sometimes etags contain a "e" character which makes PHP believe it's a
number and make the tests fail
2014-06-11 17:28:18 +02:00
Bernhard Posselt
93169eca1e also handle lowercase headers 2014-06-11 01:20:09 +02:00
Bernhard Posselt
1002281dae handle http accept headers more gracefully 2014-06-11 00:54:25 +02:00
Robin Appelman
21cfd1014a Repair broken parent link in the scanner 2014-06-10 15:26:18 +02:00
Morris Jobke
e769ef9bbb Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix
Added hacky fix for long path cleanup routine
2014-06-08 20:46:00 +02:00
Björn Schießle
3da47db33c Merge pull request #8927 from owncloud/expire_only_link_shares
only expire link shares
2014-06-06 19:24:15 +02:00
Bjoern Schiessle
f15d7dfec0 only expire link shares 2014-06-06 15:47:37 +02:00
Thomas Müller
fe8bae31dc adding PK to table encryption
adding auto increment/PK to table files_trash

adding PK to table ldap_user_mapping and ldap_group_members

adding PK to table ldap_group_mapping

truncate permissions table to allow smooth creation of primary key

adding unit test for creating an auto increment column on a table which already contains data

remove unneeded table files_trashsizes

fix unit test

no need to truncate *PREFIX*permissions

On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
2014-06-06 13:33:56 +02:00
Vincent Petry
6e2358c3a6 Added hacky fix for long path cleanup routine 2014-06-06 10:41:49 +02:00
Thomas Müller
3a7b30795c Merge pull request #8783 from owncloud/remove-serializers
Remove controller serializers
2014-06-06 10:33:16 +02:00
Thomas Müller
ad4ec414c9 use system function to recursive remove the directory used by temporary storage 2014-06-06 09:29:31 +02:00
Georg Ehrke
0fe8f77c17 Merge branch 'master' into update_shipped_apps_from_appstore
Conflicts:
	lib/private/app.php
	settings/templates/apps.php
2014-06-05 22:54:27 +02:00
Thomas Müller
70e0ae0637 Merge pull request #8483 from owncloud/encryption_use_oc_preferences
[encryption] use oc preferences
2014-06-05 18:54:25 +02:00
Bernhard Posselt
587a8df566 remove controller serializers 2014-06-05 18:00:36 +02:00
Vincent Petry
1c59808517 Merge pull request #8865 from owncloud/improve_share_settings
Improve share settings
2014-06-05 17:23:42 +02:00
Bjoern Schiessle
2d83424a29 allow to set pre-condition for setValue 2014-06-05 16:54:03 +02:00
Thomas Müller
4b650a20a4 Merge pull request #8893 from owncloud/feature/get-users-by-preference
Add method to get users by their preference
2014-06-05 16:52:00 +02:00
Thomas Müller
6aab50f8aa fix unit tests 2014-06-05 16:32:12 +02:00
Bjoern Schiessle
6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Joas Schilling
d493c0c9ac Sort the result before comparing 2014-06-05 15:21:53 +02:00
Thomas Müller
e1beb8c6c3 Merge pull request #8889 from owncloud/mtime-reuse
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 13:18:18 +02:00
Joas Schilling
879237f32a Add method to get users by their preference 2014-06-05 11:50:43 +02:00
Robin Appelman
9dab6ec2ec Fix uit tests 2014-06-05 11:31:55 +02:00
icewind1991
bd373d9621 Merge pull request #7878 from owncloud/quota-extstorageswitch
Added switch to count external storage data in quota
2014-06-05 11:23:32 +02:00
Thomas Müller
ff3ded6cb2 Merge pull request #8852 from owncloud/kill-permissions-master
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2 - drop permissions table and related code
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
Thomas Müller
c044ff99ce Merge pull request #8724 from owncloud/update-sabre-2.0
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Georg Ehrke
00b7f365bc remove not needed unlink in installer test 2014-06-04 17:18:20 +02:00
Georg Ehrke
724d027f19 add unit test 2014-06-04 16:29:41 +02:00
Vincent Petry
da889ff029 Added experimental switch to count external storage data in quota
This includes all mountpoints except the Shared one in
the used space calculation.

Added unit tests for ext storage inclusion in quota calculation
2014-06-04 16:08:59 +02:00
Vincent Petry
b5f0a17918 Merge pull request #8822 from owncloud/cache-change-propagator
[WIP] Improved propagation of cache changes
2014-06-04 13:03:14 +02:00
Thomas Müller
76e04027bc Upgrade SabreDAV to 1.8.10
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Robin Appelman
3bcdad62fb Fix unit tests 2014-06-04 10:01:50 +02:00
ringmaster
0e85618c42 Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead. 2014-06-04 07:55:46 +02:00
Bjoern Schiessle
2b30fb4862 fix unit test after adding the additional parameter to addStorageWrapper() 2014-06-04 07:55:46 +02:00
Robin Appelman
f297bf14f9 Fix unit tests 2014-06-03 11:55:18 +02:00
Robin Appelman
4d7045e701 Fix unit tests 2014-06-03 11:18:17 +02:00
Robin Appelman
b4cee3d4e9 skip tests for oracle 2014-06-03 11:18:17 +02:00
Robin Appelman
adeac7aa39 Check sqlite migration on a copy of the database file 2014-06-03 11:17:21 +02:00
Robin Appelman
35550e8d9a Fix migrator for postgres 2014-06-03 11:17:21 +02:00
Robin Appelman
5243562f45 skip migration tests for sqlite 2014-06-03 11:17:21 +02:00
Robin Appelman
0035147be9 Create unique names for temporary indexes 2014-06-03 11:17:21 +02:00
Robin Appelman
9c6a93a87c Add a mechanism to try the database migration on a copy of the tables before running it on the "real" data 2014-06-03 11:17:21 +02:00
Robin Appelman
e002ff6065 propagate changes in the scanner 2014-06-02 15:24:08 +02:00
Robin Appelman
a31f089266 Add a change propagator class to handle propagating etag and mtime changes 2014-06-02 14:39:12 +02:00
Thomas Müller
999f6216dc - fix dropTable() and introduce tableExists()
- kill replaceDB() - this function is unused and it's implementation obviously wrong
- add method annotation OC_DB_StatementWrapper::fetchAll
- remove duplicate code in Test_DBSchema and reuse OC_DB::tableExists
- remove unused variables
2014-05-30 23:34:42 +02:00
Thomas Müller
31ad1cbdd8 Merge pull request #5365 from owncloud/filesize-improvements-32bit
Add LargeFileHelper / Add CURL filesize workaround / Fix some 32-bit filesize issues
2014-05-30 16:13:48 +02:00
icewind1991
2ba5701b1a Merge pull request #8778 from owncloud/storage-instanceof
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
Lukas Reschke
45d93cc6ec Merge pull request #8759 from owncloud/fix-phpunit
fix 8757, get rid of service locator antipattern
2014-05-29 21:35:47 +02:00
Andreas Fischer
129d8099b9 Typo: getFileSizeViaDOM -> getFileSizeViaCOM 2014-05-29 16:26:02 +02:00
Andreas Fischer
ea246d058e Use "file size" instead of "filesize", then also apply camel case. 2014-05-29 16:26:02 +02:00
Andreas Fischer
0417e52134 Increase file size limit from 2 GiB to 4 GiB when workarounds are unavailable. 2014-05-29 16:26:02 +02:00
Andreas Fischer
2c36a4b07a Add helper method for turning int|float into base-10 unsigned integer string. 2014-05-29 16:26:01 +02:00
Andreas Fischer
82e17155bf Rename: LargeFileHelper -> LargeFileHelperGetFilesize 2014-05-29 16:26:01 +02:00
Andreas Fischer
68cc0ba2e1 Unit Tests for LargeFileHelper. 2014-05-29 16:26:01 +02:00
Robin Appelman
8c5521fdfc Add $storage->instanceOfStorage to handle instanceof for storage wrappers 2014-05-29 13:45:50 +02:00
icewind1991
c0f02be50a Merge pull request #3908 from owncloud/storage-folder-copy-rename
Recursive copy and remove for local storage backends
2014-05-29 13:29:24 +02:00
Thomas Müller
3ef9570d02 Merge pull request #8547 from owncloud/path-length-master
Handling long paths properly in \OC\Files\View
2014-05-29 00:08:29 +02:00
Lukas Reschke
1af293dc13 Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer
upgraded phpmailer into v5.2.8 via composer
2014-05-28 22:42:45 +02:00
Lukas Reschke
ce9d5df6df Merge pull request #8681 from owncloud/logintimestamp
Record login timestamp per user. Required for new user managament.
2014-05-28 19:06:47 +02:00
Robin Appelman
1302602173 fix illegal usage of unlink in test case 2014-05-28 18:16:23 +02:00
Robin Appelman
03ba497a8c add recursive copy to local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman
38c1da0976 fix recursive rename for local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman
c99e254178 aditional test cases for copy and rename 2014-05-28 18:16:23 +02:00
Thomas Müller
a2e4bc8d33 # This is a combination of 2 commits.
# The first commit's message is:

adding tests for long paths
increment path field in database up to 4000 (maximum for Oracle - otherwise we could use php's 4096)
increment version to trigger database migration
adding unit test for too long path

# This is the 2nd commit message:

fix too long path
2014-05-28 15:30:44 +02:00
Bernhard Posselt
d5e48a4806 fix assertions 2014-05-28 15:23:57 +02:00
Thomas Müller
ed8e0f0a92 updating unit test expectations 2014-05-28 13:47:27 +02:00
Bernhard Posselt
5e9ea2b365 fix 8757, get rid of service locator antipattern 2014-05-28 02:15:16 +02:00
Vincent Petry
d43a7c5f6e Added requiremin/requiremax fields for apps
Apps can now specify a minimum and maximum version of ownCloud in which
they are supported.
2014-05-27 11:54:12 +02:00
Arthur Schiwon
2e85d5a852 increase scrutinizer happyiness by removing minor/informational issues 2014-05-23 11:20:46 +02:00
Arthur Schiwon
86880acee9 clean up here is superflous, will already be removed by user session 2014-05-23 10:16:18 +02:00
Arthur Schiwon
60274d1729 test hooks also on login 2014-05-23 00:59:26 +02:00
Arthur Schiwon
bf1f5f2af3 also test whether hooks work 2014-05-23 00:54:17 +02:00
Arthur Schiwon
c46fada6b3 unit tests for loginWithCookie() 2014-05-23 00:18:07 +02:00
Björn Schießle
050df76830 Merge pull request #8599 from owncloud/sharing_disable_for_groups
allow admin to disable sharing for specific groups of users
2014-05-22 08:19:27 -04:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Joas Schilling
d621a6fe5e Clean the database after the test 2014-05-21 16:00:21 +02:00
Joas Schilling
66f94273c6 Add a lot of users for testing 2014-05-21 13:17:29 +02:00
Joas Schilling
457a4aa425 Add test case for getValueForUsers() 2014-05-21 11:36:01 +02:00
Morris Jobke
dc36d30953 Remove all occurences of @brief and @returns from PHPDoc
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Morris Jobke
804020bb6d Merge pull request #7363 from owncloud/optimize-startup-queries
Optimize some queries that are always executed when loading base.php
2014-05-19 01:21:37 +02:00
Bernhard Posselt
9e36c33104 use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability 2014-05-14 01:09:48 +02:00
Thomas Müller
5fb94bf76f Merge pull request #8542 from owncloud/phpdoc-improvements
PHPDoc Improvements
2014-05-13 23:23:11 +02:00
Lukas Reschke
b0381cfe12 Add tests for other types that PHP might cast
Addition to https://github.com/owncloud/core/pull/8572
2014-05-13 22:01:11 +02:00
Robin McCorkell
875a8acedf Fix Scrutinizer errors about missing user backend 2014-05-13 19:08:14 +01:00
Thomas Müller
f5bc680f9c Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
Fixed getAbsolutePath case when path is "0"
2014-05-13 17:41:18 +02:00
Vincent Petry
bab8c1f8e5 Fixed getAbsolutePath case when path is "0"
Make sure to correctly check for string emptiness when the passed path
is "0".
2014-05-13 17:38:46 +02:00
Bernhard Posselt
a152e320f6 make it possible to omit parameters and use the default parameters from the controller method 2014-05-13 10:40:49 +02:00
Thomas Müller
1d18fd4e6d Merge pull request #8482 from owncloud/public-logger
Make logger available in the container
2014-05-12 16:40:58 +02:00
Thomas Müller
93dbb39e77 adding unit test for message interpolation 2014-05-12 14:17:36 +02:00
Morris Jobke
2054837d01 Merge pull request #8541 from owncloud/hardenIsSubDirectory
Harden issubdirectory()
2014-05-12 01:42:25 +02:00
Morris Jobke
6499995474 Merge pull request #8477 from owncloud/better-controllers
Better appframework controllers
2014-05-12 01:07:49 +02:00
Morris Jobke
7a6ff56b13 Merge pull request #8274 from owncloud/appframework-db
Port database layer from appframework to core
2014-05-12 00:12:19 +02:00
Bernhard Posselt
63f2f16b85 use new controllermethodreflector for corsmiddleware 2014-05-11 17:55:59 +02:00
Bernhard Posselt
1d45239c65 adjust license headers to new mail address 2014-05-11 17:54:08 +02:00
Bernhard Posselt
cb666c18d6 rename formatter to responder, formatResponse to buildResponse 2014-05-11 17:54:08 +02:00
Bernhard Posselt
d8da79cab0 add test for not failing when adding more comments after type parameters, do not limit x-www-form-urlencoded to POST 2014-05-11 17:54:08 +02:00
Bernhard Posselt
80648da431 implement most of the basic stuff that was suggested in #8290 2014-05-11 17:54:08 +02:00
Bernhard Posselt
a252f59cd4 Merge pull request #8504 from owncloud/cors-middleware
Add cors middleware
2014-05-11 16:54:34 +02:00
Lukas Reschke
fd5b2d11d6 Rename issubdirectory to isSubDirectory 2014-05-11 15:50:59 +02:00
Bernhard Posselt
9a4d204b55 add cors middleware
remove methodannotationreader namespace

fix namespace for server container

fix tests

fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request

remove uneeded  local in cors middleware registratio

dont uppercase cors to easily use it from routes

fix indention

comment fixes

explicitely set allow credentials header to false

dont depend on better controllers PR, fix that stuff later

split cors methods to be in a seperate controller for exposing apis

remove protected definitions from apicontroller since controller has it
2014-05-09 23:34:41 +02:00
Lukas Reschke
1083085e6e Merge pull request #7546 from owncloud/no_freaking_tag_dupes
Tags cleanup
2014-05-09 22:10:45 +02:00
Bart Visscher
f569c721a6 Merge branch 'master' into optimize-startup-queries
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
	tests/lib/group/manager.php

removed hasFilesSharedWith from lib/public/share.php and
sharedstorage.php to fix merge
2014-05-07 17:54:38 +02:00
Vincent Petry
75d81eefc1 Merge pull request #8223 from owncloud/fix_linkToPublic
Fix linkToPublic and linkToAbsolute.
2014-05-07 14:40:59 +02:00
Vincent Petry
1a454f61ed Merge pull request #8386 from owncloud/fix_6946_master
Fix 6946 master
2014-05-05 14:08:45 +02:00
Morris Jobke
623161b9a9 Merge pull request #8023 from flyser/master
Fix setting the max-upload-size for really large values.
2014-05-03 11:49:38 +02:00
Joas Schilling
ced2a4fcf2 Remove unneccessary statement from test 2014-04-29 10:42:49 +02:00
Joas Schilling
39bf700790 Update tests to test for create and update aswell 2014-04-29 10:34:28 +02:00
Arthur Schiwon
837a02184b the group manager calls exists check less often, adjust test accordingly 2014-04-28 19:19:37 +02:00
Arthur Schiwon
45e42c25de Group Database backend must not gather user details itself but ask user
backends. This is a port to master from PR #7745

remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends

Conflicts:
	lib/private/group/backend.php

LDAP: getDisplayNamesInGroup is not an option for group backends anymore

Conflicts:
	apps/user_ldap/group_ldap.php
	apps/user_ldap/group_proxy.php

clean up group backends

Conflicts:
	lib/private/group/database.php

remove now unnecessary test

implement getDisplayNames in group manager

adjust user manager tests

test for group manager's displayNamesInGroup

trim must not be used in empty in PHP < 5.5

keep the constant to not provoke PHP warnings

Conflicts:
	lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
Lukas Reschke
96c06c14d8 Merge pull request #8341 from owncloud/template-tests-output-buffering
Improve Template Tests by Removing Manual Output Buffering
2014-04-26 12:29:36 +02:00
Robin Appelman
4109521cce remove outdated test 2014-04-25 12:24:18 +02:00
Robin Appelman
6c20a014ea merge master into webdav-injection 2014-04-25 11:47:06 +02:00
Andreas Fischer
f45080e811 Use PHPUnit's expectOutputString() instead of performing output buffering. 2014-04-24 15:45:07 +02:00
Andreas Fischer
88778b569e Split testP() tests into multiple methods. 2014-04-24 15:36:02 +02:00
Andreas Fischer
0d3ddd9e11 Remove redundant test case for non-HTML string. 2014-04-24 15:34:09 +02:00
Andreas Fischer
f9091a8584 Merge pull request #8304 from owncloud/add-xss-tests
Add unit tests for arrays and quotationmark

* owncloud/add-xss-tests:
  Remove uneeded newline
  Fix indentation
  Add unit tests for arrays and "
2014-04-24 15:09:36 +02:00
Bjoern Schiessle
6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Bernhard Posselt
5199e4508a dont update entity and dont run an update query if an entity wasnt changed at all 2014-04-23 13:43:17 +02:00
Lukas Reschke
9d3b639ce6 Remove uneeded newline 2014-04-22 20:11:34 +02:00
Lukas Reschke
589c74e176 Fix indentation 2014-04-22 20:10:46 +02:00
Lukas Reschke
f07180639c Add unit tests for arrays and "
OC_Util::sanitizeHTML() also supports array but we actually had no unit test for it. Additionally this commit introduces a test for escaping " into &quot;
2014-04-22 20:09:55 +02:00
Robin Appelman
3821a09689 merge master into webdav-injection 2014-04-22 12:25:49 +02:00
Bernhard Posselt
7e447f4f42 make download and redirectresponse public 2014-04-20 16:12:46 +02:00
Bernhard Posselt
309aa3bcd2 fix phpdoc for entities 2014-04-20 02:55:59 +02:00
Bernhard Posselt
4a7e0561ca move db into iservercontainer 2014-04-19 19:30:12 +02:00
Bernhard Posselt
0fe4db0992 remove unusued variable 2014-04-19 16:02:15 +02:00
Bernhard Posselt
f4bc5ee863 remove unusued variable 2014-04-19 16:00:19 +02:00
Bernhard Posselt
93237d87ec fix scrutinizer issues 2014-04-19 15:25:36 +02:00
Bernhard Posselt
f260951825 port database layer from appframework to core 2014-04-19 14:56:16 +02:00
Morris Jobke
5a1a056c6d Merge pull request #8183 from owncloud/move-security-headers
Move security headers
2014-04-16 23:46:20 +02:00
Thomas Tanghus
df9d9ac958 Remove unused var 2014-04-16 14:34:13 +02:00
Thomas Tanghus
dd36d4b894 Add tests for linkTo, linkToPublic, linkToRemote, linkToRemoteBase 2014-04-16 14:32:08 +02:00
Robin Appelman
295b75cca9 merge master into webdav-injection 2014-04-15 20:05:43 +02:00
Robin Appelman
c82adb8c5d merge master into webdav-injection 2014-04-15 20:03:00 +02:00
Lukas Reschke
ffab31e3ee Merge pull request #8197 from owncloud/secure_mimetypes
White-list known secure mime types. Refs. #8184
2014-04-15 19:50:33 +02:00
Arthur Schiwon
450de0091a adjust tests accordingly 2014-04-15 17:53:57 +02:00
Lukas Reschke
340089f270 Merge pull request #8059 from owncloud/countUsersInGroup
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
Lukas Reschke
9046f7b2f8 Merge pull request #8178 from owncloud/fix-request-parameters
Correctly process request parameters other than GET or POST, dont use gl...
2014-04-14 20:42:26 +02:00
Thomas Tanghus
51e47319ef White-list known secure mime types. Refs. #8184 2014-04-14 17:17:50 +02:00
Thomas Müller
8df19c4379 Merge pull request #8019 from owncloud/thumbnail_fixes
Thumbnail fixes
2014-04-14 16:23:03 +02:00
Lukas Reschke
b04d95b116 Remove uneeded usages of nosniff 2014-04-13 12:48:16 +02:00
Bernhard Posselt
62cce982bb default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute 2014-04-12 16:17:49 +02:00
Thomas Müller
26a89e369e Merge pull request #8137 from owncloud/routeing-requirements
add requirements to routing
2014-04-10 16:23:01 +02:00
Vincent Petry
6cc578d1a7 Merge pull request #8018 from owncloud/ocs_result_success_is_100
OC_OCS_Result Class, Only accept 100 code as success
2014-04-10 13:03:10 +02:00
Bernhard Posselt
70c88027db add requirements to routing 2014-04-09 21:57:32 +02:00
Thomas Müller
73ac3d0fcd Merge pull request #7643 from owncloud/chainable_response
Chainable Response in AppFramework
2014-04-08 22:42:43 +02:00
Thomas Müller
a4fc92b05b class Test_Config is already declared 2014-04-08 14:15:33 +02:00
Arthur Schiwon
9597f41904 add group tests 2014-04-08 12:32:30 +02:00
Thomas Müller
240d1ae6b9 unit test testSetAppValueIfSetToNull() added 2014-04-07 20:56:43 +02:00
Fabian Henze
1245ff8f31 Add unit tests for OC_Helper::phpFileSize function 2014-04-07 15:31:34 +02:00
Thomas Müller
ccf1287fbf adding unit test for cache mechanism 2014-04-04 16:21:50 +02:00
Thomas Müller
f029312e5b fixing typos/spellings 2014-04-04 11:37:47 +02:00
Thomas Müller
20f26068e7 Merge pull request #7476 from owncloud/type-hinting
Type hinting
2014-04-03 20:02:27 +02:00
tomneedham
b00592ade5 Fix test case for api response code 2014-04-03 14:47:55 +00:00
Thomas Müller
a2efdb8722 Merge pull request #7970 from owncloud/webdav-upload-hash
Fix uploading files containing a # in the path for webdav
2014-04-03 16:09:44 +02:00
Vincent Petry
4cc70ec39d Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop
Correctly read the full stream in file_get_contents
2014-04-02 10:55:50 +02:00
Thomas Müller
82d1ea240e Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
idn_to_ascii is only used if available
2014-04-01 22:51:23 +02:00
Vincent Petry
d6ce45fe61 Correctly read the full stream in file_get_contents
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.

This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.

Added unit test with a bigger test file to cover this case.
2014-04-01 10:07:16 +02:00
Bart Visscher
6b061c236d Merge branch 'master' into type-hinting
Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Robin Appelman
76c63a5760 Fix uploading files containing a # in the path for webdav 2014-03-31 17:00:32 +02:00
Thomas Müller
70db348475 Merge pull request #7824 from owncloud/hash-parameter-order
Fix parameter order for Storage\Local::hash
2014-03-28 13:06:07 +01:00
Vincent Petry
d0012e729a Merge pull request #7879 from owncloud/sharing_cleanup_public_api
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
Vincent Petry
5068c57845 Merge pull request #7613 from owncloud/fix_urlGenerator2
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
2014-03-28 12:12:49 +01:00
Vincent Petry
040f430f0c Merge pull request #7829 from owncloud/cachefolderlocation
Cache folder is now configurable
2014-03-28 12:08:38 +01:00
Robin Appelman
371a924c92 merge master into webdav-injection 2014-03-26 14:26:07 +01:00
Thomas Müller
83b4bcfdbf idn_to_ascii is only used if available 2014-03-26 11:17:23 +01:00
Thomas Müller
1ae10b9da3 Merge pull request #7420 from owncloud/cachehooks-first
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
Thomas Müller
bbc2e37259 Merge pull request #7477 from owncloud/foldersize-reuse
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
Bjoern Schiessle
bc0292c16d always return an array 2014-03-25 17:47:24 +01:00
Vincent Petry
1e39719926 Added unit tests for external cache folder 2014-03-24 14:32:04 +01:00
Thomas Müller
fb7f3008d3 idn have to be converted before being used 2014-03-24 13:46:31 +01:00
Robin Appelman
fffe330bbc Fix parameter order for Storage\Local::hash 2014-03-20 15:32:12 +01:00
Vincent Petry
316a22b463 Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown
Still return quota value when free space is unknown
2014-03-20 15:29:14 +01:00
Vincent Petry
36c0f08ec0 Merge pull request #7732 from owncloud/datafolderexistence
Added .ocdata file to check for data folder validity
2014-03-20 11:31:28 +01:00
Vincent Petry
66bc0f0848 Still return quota value when free space is unknown
Fixed the quota storage wrapper to correctly return the quota value when
the free space is not known (which usually happens when the disk_free_space
function is disabled)
2014-03-19 19:07:11 +01:00
Thomas Müller
756bbe8786 Merge pull request #7649 from owncloud/routing-public
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
icewind1991
5c72b526a3 Merge pull request #7760 from owncloud/core-roundbytes
Correctly round bytes when converted from human readable format
2014-03-17 15:21:57 +01:00
Vincent Petry
145db370d1 Correctly round bytes when converted from human readable format
Instead of leave two decimal places which is confusing, round the byte
values correctly to the closest byte.
2014-03-17 12:15:12 +01:00
Thomas Müller
cd038604d3 unit tests for specific image type output added 2014-03-17 08:40:59 +01:00
Vincent Petry
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
Robin Appelman
eabeedb306 Merge branch 'master' into cachehooks-first 2014-03-13 15:22:00 +01:00
Robin Appelman
d55c7223a9 Merge branch 'master' into foldersize-reuse
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
Vincent Petry
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
Vincent Petry
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
Robin Appelman
8ab7d18a6a Move the router classes to a namespace and expose it with a public interface 2014-03-10 14:04:58 +01:00
Vincent Petry
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
Thomas Tanghus
8f6ea900f2 Chainable Response in AppFramework 2014-03-09 23:01:16 +01:00
Vincent Petry
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
Thomas Tanghus
ada8d4e0c9 Fix unit tests 2014-03-07 02:44:34 +01:00
Robin Appelman
84cf40ed82 merge master into webdav-injection 2014-03-06 13:35:06 +01:00
Vincent Petry
c7e204bd36 Added unit tests for serverHost and other related functions 2014-03-06 11:51:17 +01:00
Thomas Tanghus
b54b0b2153 Yet another cleanup 2014-03-05 00:26:06 +01:00
Robin Appelman
5211566205 update test case 2014-03-04 16:36:03 +01:00
Robin Appelman
bb8a7a2230 Remove assert since the root size of the home storage is no longer calculated 2014-03-03 16:48:06 +01:00
Robin Appelman
331fc55e2d Update unit tests to use the new injection 2014-03-03 14:27:24 +01:00
Bart Visscher
35a8dfb2fa More PHPDoc fixes, using scrutinizer patches as hints 2014-02-28 13:53:41 +01:00
Bart Visscher
3116bede68 Add unit tests for getUserGroups with addUser and removeUser 2014-02-27 21:04:44 +01:00
Jörn Friedrich Dreyer
2ba6cd4e2b initialize etags of temporary storage 2014-02-27 12:44:07 +01:00
Jörn Friedrich Dreyer
131c12ad8d use assertInternalType for typechecking 2014-02-27 09:51:26 +01:00
Jörn Friedrich Dreyer
39f2f564a9 use assertSame and assertNotSame for etag checks 2014-02-27 09:39:34 +01:00
Robin Appelman
bc49c6be04 Manually triger the filecache update hooks before any other hook 2014-02-26 14:29:13 +01:00
Björn Schießle
6bde602c09 Merge pull request #7292 from owncloud/sharing_tests
fix sharing unit tests
2014-02-21 14:24:51 +01:00
Björn Schießle
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
Bjoern Schiessle
cf7ef0d356 fix sharing unit tests 2014-02-21 13:36:00 +01:00
Robin Appelman
2293563488 Remove unit tests which causes the filesystem tests to fail 2014-02-21 10:02:03 +01:00
Bjoern Schiessle
1ae6e9ec21 add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935 2014-02-20 19:06:42 +01:00
Thomas Müller
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
Lukas Reschke
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
Vincent Petry
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
Morris Jobke
bcad6e641a Merge pull request #7274 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
icewind1991
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
Robin Appelman
eea1abae20 add unit tests for watcher policies 2014-02-19 09:52:51 +01:00
Scrutinizer Auto-Fixer
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
icewind1991
3cc7228c7c Merge pull request #7253 from owncloud/preferences-caching
Add caching to OC\Preferences
2014-02-18 18:17:58 +01:00
Vincent Petry
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
Vincent Petry
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
Tom Needham
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
Lukas Reschke
3b1083f46e Merge pull request #7176 from owncloud/style
Some style fixes
2014-02-18 17:30:26 +01:00
tomneedham
589a7b220b Fix poor spelling 2014-02-18 16:23:16 +00:00
Robin Appelman
2166683e3b Allow setting the frequency of which the file watcher checks for updates 2014-02-18 16:34:25 +01:00
Robin Appelman
b6f44e9a1d Add caching to OC\Preferences 2014-02-18 11:21:39 +01:00
tomneedham
a4b6d66703 Merge branch 'master' into migration_unit_tests 2014-02-17 11:03:57 +00:00
tomneedham
049e03c2b9 Finish basic testing of user export 2014-02-17 10:58:27 +00:00
Thomas Müller
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
Robin Appelman
b35f679483 Fix test cases for group manager 2014-02-14 15:07:08 +01:00
Robin Appelman
3b1df29318 sort expected result in tests 2014-02-13 13:56:02 +01:00
Robin Appelman
d6576c640c Add unit tests for JobList 2014-02-12 13:52:13 +01:00
Bart Visscher
addd0fba38 number as number 2014-02-12 09:09:45 +01:00
Robin Appelman
a6399f9cef Add the background job list to the public server container 2014-02-11 14:00:24 +01:00
Robin Appelman
a7c50514ac Merge branch 'master' into convert-oc_appconfig 2014-02-11 13:26:54 +01:00
Arthur Schiwon
72f134cfce intendation 2014-02-11 10:50:10 +01:00
Arthur Schiwon
32afdcbefe Inject logger 2014-02-11 10:49:59 +01:00
Arthur Schiwon
9a39cd3b38 test for share dialoge sorter 2014-02-11 10:49:46 +01:00
Bart Visscher
082abdc620 Merge branch 'master' into migration_unit_tests 2014-02-10 21:32:17 +01:00
Robin Appelman
8ad3fc89be Merge branch 'master' into quota-space-root 2014-02-07 23:29:26 +01:00
Robin Appelman
4cdf83e6d2 Remove the Test_AppConfig_Object tests as they no longer make sense with caching 2014-02-07 14:03:57 +01:00
Robin Appelman
b537d90e58 use the 'new' server container for appconfig 2014-02-07 13:45:59 +01:00
Vincent Petry
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
Robin Appelman
3afdcd85e7 Add unit test for quote wrapper size root 2014-02-04 16:05:12 +01:00
Bjoern Schiessle
36838b2837 add test for password remove method 2014-02-04 11:18:04 +01:00
Martial Saunois
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
Martial Saunois
8507efc427 Unit tests added for the new Freebox user agent. 2014-01-28 21:08:27 +01:00
Jens-Christian Fischer
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
Thomas Müller
a3ea5aa2ac fixing comment + adding unit test for checkPasswordProtectedShare 2014-01-21 12:07:08 +01:00
Vincent Petry
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
Vincent Petry
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
Björn Schießle
32e941a2bc Merge pull request #6644 from ben-denham/unshare-all-fix
\OCP\Share::unshareAll() fix
2014-01-16 03:13:26 -08:00
Thomas Müller
d4519125db Merge pull request #6744 from owncloud/fix_ocs_response_messages
keep response message
2014-01-15 03:17:24 -08:00
Vincent Petry
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
Robin Appelman
16b898ddb8 update another test 2014-01-14 20:19:05 +01:00
Bjoern Schiessle
fc54335aff extended test to also check the status messages 2014-01-14 17:11:04 +01:00
Robin Appelman
7e4c80fd60 use different value for mtime and storage_mtime in test 2014-01-14 15:13:21 +01:00
Robin Appelman
4113042c8f remove duplicate test class 2014-01-14 15:11:41 +01:00
Robin Appelman
203d5d01ca Use storage_mtime when determining if we can reuse cached data while scanning 2014-01-14 13:54:07 +01:00
ben-denham
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
Vincent Petry
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
blizzz
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
Arthur Schiwon
d7cb5ab080 add tests for user counting 2014-01-08 13:26:48 +01:00
Vincent Petry
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
Vincent Petry
5be4af9f51 Now also preventing to override "files" dir size with -1
Fixes #6526
2014-01-07 22:34:01 +01:00
Thomas Müller
2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
tomneedham
528ff25ede Add WIP unit test for migration 2014-01-07 00:38:27 +00:00
Robin Appelman
6f6c3d1e44 Make OC_Avatar unit tests independent of currently loggedin user 2014-01-02 16:08:08 +01:00
icewind1991
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
Thomas Müller
efdeba7416 Merge pull request #6449 from owncloud/core-appsorderfix
Fixed apps loading order
2013-12-24 14:26:11 -08:00
Andreas Fischer
4bc2a22317 Remove all uses of numRows(). 2013-12-21 19:56:14 +01:00
Vincent Petry
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
Robin Appelman
0ed1b64673 Pass config object in testGetHomeNotSupported 2013-12-20 13:57:22 +01:00
Vincent Petry
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
Oliver Gasser
cacb66480b Add unit tests for decimal type usage 2013-12-18 23:40:11 +01:00
Oliver Gasser
f0962c99dc Increment number of columns by one 2013-12-18 00:37:09 +01:00
Oliver Gasser
cb9e87eced Typo fixed 2013-12-17 23:46:36 +01:00
Oliver Gasser
5fcbe5350c Add decimal(precision,scale) column to unit tests 2013-12-17 23:08:05 +01:00
Thomas Müller
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
Thomas Müller
ab4136f432 add missing quotes + field declarations 2013-12-17 10:05:20 +01:00
Arthur Schiwon
c0edb639ed adjust test 2013-12-13 16:58:23 +01:00
Andreas Fischer
95dd58bfc0 Use old school query style that actually works. 2013-12-12 15:24:35 +01:00
Robin Appelman
46b72cbff0 remove unneeded ; in comment 2013-12-12 15:14:44 +01:00
Robin Appelman
30e0b474f8 Add test for having utf8 filenames in the cache 2013-12-12 13:43:55 +01:00
Andreas Fischer
f8d3b7cb6f DB tests: Test whether we can insert and read UTF8 data. 2013-12-12 13:19:08 +01:00
Andreas Fischer
67310b60f7 Ensure memcached extension is there before attempting to create an instance. 2013-12-09 14:33:26 +01:00
Andreas Fischer
a67c737848 Only run memcached tests if server is available. 2013-12-09 01:02:42 +01:00
blizzz
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
Robin Appelman
e888bdda30 get rid of failing test that don't cause additional downloads 2013-12-06 18:26:38 +01:00
Robin Appelman
cf9b7e343a extend test case for etag preservation 2013-12-06 13:00:58 +01:00
Robin Appelman
01ab15a2b0 reuse etags when doing a background scan 2013-12-05 15:23:34 +01:00
Robin Appelman
2ff1bdaba3 add test case for removing background jobs that are throwing exceptions 2013-12-05 13:29:35 +01:00
Robin Appelman
3fa11bd426 Dont use exceptions for the backgroundjob test cases 2013-12-04 16:28:27 +01:00
Vincent Petry
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
Thomas Müller
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
Vincent Petry
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
Vincent Petry
43b1cf7988 Redetect mime type whenever extension is renamed 2013-11-27 21:34:51 +01:00
blizzz
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
Björn Schießle
1fef97f6a5 Merge pull request #6060 from owncloud/fix-6050-oc6
fixing getRawPathInfo() once more
2013-11-26 10:13:58 -08:00
Vincent Petry
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
Thomas Müller
2a93720f3f fixes #6050 2013-11-26 14:13:33 +01:00
Vincent Petry
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
Andreas Fischer
06df3822a0 Timestamp test is no longer necessary as we rely on Doctrine and DateTime. 2013-11-26 12:22:08 +01:00
Vincent Petry
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