wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
43097 commits 157 branches 562 tags 714 MiB
Commit graph

15288 commits

Author SHA1 Message Date
Daniel Calviño Sánchez
0b96a71a68 Fix configuration values matched in user searches 
Due to a misplaced closing parenthesis the condition of the left join
clause was just "userid = uid"; the other conditions were passed as
additional parameters to "leftJoin", and thus they were ignored.
Therefore, the result set contained every preference of each user
instead of only the email, so the "WHERE configvalue LIKE XXX" matched
any configuration value of the user.

Besides the closing parenthesis this commit also fixes the literal
values. Although "Literal" objects represent literal values they must be
created through "IExpressionBuilder::literal()" to be properly quoted;
otherwise it is just a plain string, which is treated as a column name.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-14 23:31:42 +01:00
Arthur Schiwon
f42c29ebac
the FN is optional, carrying the displayname if present 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-03-14 14:30:45 +01:00
Roeland Jago Douma
d3e7996e80
Fix bucket and container usage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-14 13:57:14 +01:00
Morris Jobke
8d4b76c0e2
Remove deprecated OCP\Contacts 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-14 10:47:09 +01:00
Roeland Jago Douma
2d5febd0b9
Merge pull request #8811 from nextcloud/remove_dep_util_link 
Remove deprecated URL functions for OCP\Util
 2018-03-14 09:49:51 +01:00
Roeland Jago Douma
0e48afafed
Merge pull request #8804 from nextcloud/remove_httphelper 
Remove deprecated HTTPHelper
 2018-03-14 09:49:24 +01:00
Roeland Jago Douma
83873e3da1
Remove deprecated URL functions for OCP\Util 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 22:04:08 +01:00
Roeland Jago Douma
7785c3752f
Remove deprecated HTTPHelper 
* Remove the HTTP Helper
* Remove from Server Containter
* Removed legacy share tests that use it

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 21:54:56 +01:00
blizzz
76d23a1600
Merge pull request #8806 from nextcloud/add-local-memcache-check 
Properly provide local memcache check to ICacheFactory
 2018-03-13 21:27:24 +01:00
Morris Jobke
dde5353f98
Properly provide local memcache check to ICacheFactory 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-13 18:18:04 +01:00
Morris Jobke
ede723f1b1
Merge pull request #8796 from nextcloud/varadic_qb 
Make QueryBuilder varadic
 2018-03-13 14:11:19 +01:00
Morris Jobke
45895de531
Merge pull request #8794 from nextcloud/swift-v3-cache-token 
Properly cache swift v3 token
 2018-03-13 11:35:38 +01:00
Morris Jobke
7488218535
Merge pull request #8792 from nextcloud/cleanup-oc_response 
Remove unused methods of OC_Response
 2018-03-13 09:47:29 +01:00
Roeland Jago Douma
46c195b58b
Made IExpressionBuilder varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:35:09 +01:00
Roeland Jago Douma
0009358c17
Made orHaving varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:32:31 +01:00
Roeland Jago Douma
408c2103db
Made addHaving varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:31:33 +01:00
Roeland Jago Douma
2c585afea1
Make having varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:31:04 +01:00
Roeland Jago Douma
c6eba3c925
Made addGroupBy varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:30:14 +01:00
Roeland Jago Douma
afbad7e15e
Made groupBy varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:29:36 +01:00
Roeland Jago Douma
d6b93e6620
Made orWhere varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:28:27 +01:00
Roeland Jago Douma
07cb6aaeff
Made andWhere varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:27:43 +01:00
Roeland Jago Douma
222dbb7bc9
Made where varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:27:11 +01:00
Roeland Jago Douma
2976b39102
Made AddSelect varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:25:32 +01:00
Morris Jobke
53a899a1f5
Fix the HTTP 1.0 status code and properly detect 1.0 vs 1.1&2.0 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-13 09:22:26 +01:00
Morris Jobke
57eaa48e3d
Merge pull request #8788 from nextcloud/cleanup-oc_api 
Remove unused methods and constants from legacy OC_API
 2018-03-13 08:52:24 +01:00
Roeland Jago Douma
c8aee70a0b
Made select varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 08:07:08 +01:00
Nextcloud bot
3cae276149
[tx-robot] updated from transifex 2018-03-13 01:12:01 +00:00
Roeland Jago Douma
66173e9b52
Merge pull request #8789 from nextcloud/proper-exception-logging 
Use proper method to log exceptions
 2018-03-12 22:01:10 +01:00
Roeland Jago Douma
4e8d5504d2
Properly cache swift v3 token 
The V3 token has an export function. Without this the token is
effectively never cached.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-12 20:53:50 +01:00
Morris Jobke
e758cfcdc8
Remove unused methods of OC_Response 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:42:30 +01:00
Morris Jobke
044d01d0e1
Use proper method to log exceptions 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:10:59 +01:00
Morris Jobke
a1232f46ca
Remove unused methods and constants from legacy OC_API 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:03:25 +01:00
Morris Jobke
2b335fd607
Use insertIfNotExist of the new interface 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 17:45:49 +01:00
Morris Jobke
3655951dd7
Merge pull request #8787 from nextcloud/remove-deprecated-and-unused-methods-of-db 
Remove deprecated and unsused methods of OCP\DB
 2018-03-12 16:34:37 +01:00
Morris Jobke
432e529827
Merge pull request #8784 from nextcloud/remove-unused-deprecated-apphelper 
Remove unused and deprecated class and interface AppHelper
 2018-03-12 16:33:46 +01:00
Morris Jobke
324ce5a993
Merge pull request #8783 from nextcloud/remove-unused-deprecated-methods 
Remove unused and deprecated methods from OCP\Util
 2018-03-12 16:33:14 +01:00
Morris Jobke
f5c5c5181f
Remove unused and deprecated class and interface AppHelper 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:27:10 +01:00
Morris Jobke
44289ff134
Use proper method to format absolute timestamp 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:16:52 +01:00
Morris Jobke
8195b17ed7
Remove deprecated and unsused methods of OCP\DB 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:13:37 +01:00
Morris Jobke
e1d95974bf
Remove unused and deprecated methods from OCP\Util 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 14:37:02 +01:00
Morris Jobke
f35c447525
Merge pull request #8757 from nextcloud/search_controller 
Move search to proper Controller
 2018-03-09 16:15:55 +01:00
Roeland Jago Douma
f7eee0b173
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-09 15:25:01 +01:00
blizzz
054a45c079
Merge pull request #8710 from nextcloud/followup/8596/tests-for-user-pagination 
Tests for email collaborators pagination
 2018-03-09 11:21:21 +01:00
Joas Schilling
528ffaf250
Merge pull request #8742 from nextcloud/strict_app 
OCP\AppFramework\App strict
 2018-03-09 10:13:08 +01:00
Roeland Jago Douma
129a608ebe
OCP\AppFramework\App strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-09 08:42:03 +01:00
Roeland Jago Douma
f17627c1c1
Fix autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-09 07:58:42 +01:00
Nextcloud bot
a20e9d7891
[tx-robot] updated from transifex 2018-03-09 01:12:12 +00:00
Roeland Jago Douma
7a7c350a2d
Merge pull request #8716 from nextcloud/fix-cache-prefixing 
Remove base url from global cache prefix
 2018-03-08 21:12:54 +01:00
Roeland Jago Douma
d05469959e
Merge pull request #8715 from nextcloud/objectstore-no-part-files 
disable part files for object stores
 2018-03-08 20:52:16 +01:00
John Molakvoæ (skjnldsv)
00122fa027
Use group displayNames in users list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-08 17:13:49 +01:00
Joas Schilling
82137f443d
Correctly return the group name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 17:13:48 +01:00
Joas Schilling
aef86a5f5a
Show the displayname in the users group list 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 17:13:48 +01:00
Joas Schilling
882096653e
Fix calculation if there are more results 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 16:22:16 +01:00
Morris Jobke
a2db959f5c
Merge pull request #8593 from eneiluj/master 
Allow public page access to apps with group restrictions
 2018-03-08 11:27:52 +01:00
Roeland Jago Douma
3ad7daeda5
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-08 11:05:18 +01:00
Roeland Jago Douma
340e8ef16c
Make SecurityMiddleware strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-08 10:11:47 +01:00
Morris Jobke
069e3f50a7
Merge pull request #8711 from nextcloud/objectstore-write-only-fopen 
don't read existing file when overwriting using object store
 2018-03-08 09:32:39 +01:00
Roeland Jago Douma
af55b03386
Merge pull request #8662 from nextcloud/better-debugging-unit-tests 
Better debugging for "Your test case is not allowed to access the dat…
 2018-03-07 21:53:34 +01:00
Joas Schilling
1dd40b1f45
Single quotes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-07 16:50:18 +01:00
Joas Schilling
559978c50e
Suppress phan error 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-07 16:43:16 +01:00
Julius Härtl
63e261b444
Actually clear cache values for all base urls 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Julius Härtl
f652c28b21
Use JSCombiner from server container when searching for JS files 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Julius Härtl
50a9beb4bb
Move base url from global cache prefix to frontend related ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Morris Jobke
8d865483f4
Merge pull request #8714 from nextcloud/8705 
Check if the cached js file exists
 2018-03-07 14:45:43 +01:00
Robin Appelman
fc35352122
disable part files for object stores 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-07 13:33:35 +01:00
Roeland Jago Douma
34b86edc34
Check if the cached js file exists 
Fixes #8705

If the file does not exist (for whatever reason). It is never cached. No
matter what the depscache etc tell you.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-07 12:55:05 +01:00
Robin Appelman
9764e70494
don't read existing file when overwriting using object store 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-07 12:05:57 +01:00
blizzz
076b49b9fe
Merge pull request #8696 from nextcloud/fix-public-api-doc 
Fix PHPDoc for public API
 2018-03-07 10:53:31 +01:00
Morris Jobke
65cc155a11
Merge pull request #8596 from nextcloud/bugfix/8454/sharee-email-matches-not-limited 
Also array_slice wide email matches of local users
 2018-03-06 22:21:03 +01:00
Morris Jobke
aea8b30cf7
Fix PHPDoc for public API 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-06 21:55:04 +01:00
Morris Jobke
de56915605
Merge pull request #7419 from Abijeet/feature-7175 
Fixes #7175 - Allow to search for email address in user management
 2018-03-06 21:53:37 +01:00
Morris Jobke
c88112bb41
Merge pull request #8579 from nextcloud/feature/2692/merge-can-i-update 
Display a list of unavailable apps for updates (aka. merge "Can I update?")
 2018-03-06 21:31:06 +01:00
Morris Jobke
846b0d6a42
Merge pull request #5833 from nextcloud/fix_uninstall_rep_step 
Run repair steps on uninstall in all cases
 2018-03-06 17:57:10 +01:00
Morris Jobke
b2a9ea08a3
Remove unused and outdated hook 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-06 17:56:44 +01:00
Morris Jobke
d0de8e4905
Merge pull request #8666 from nextcloud/strict_idproof 
Make \OC\Security\IdentityProof strict
 2018-03-06 17:53:09 +01:00
Joas Schilling
09d8387b00
Try without autoloading 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-06 13:56:44 +01:00
Tobia De Koninck
96a5752340
Remove unused $enableAppsCache in OC_App 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:47:16 +01:00
Tobia De Koninck
55b9a5d886
Remove OC_App::disable method 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:45:20 +01:00
Tobia De Koninck
539fdaea1e
Run repair steps on uninstall in all cases 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:41:55 +01:00
Nextcloud bot
3867a74f0d
[tx-robot] updated from transifex 2018-03-06 01:12:16 +00:00
Roeland Jago Douma
d8332d43f8
Make \OC\Security\IdentityProof strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 19:33:16 +01:00
Roeland Jago Douma
5457373407
Merge pull request #8659 from nextcloud/csrf_token_strict 
Make \OC\Security\CSRF strict
 2018-03-05 19:28:10 +01:00
Joas Schilling
97c4c00e3f
Better debugging for "Your test case is not allowed to access the database." 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-05 16:06:29 +01:00
Roeland Jago Douma
4ed9b74a6b
Make OC\Security\CSP strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 15:27:05 +01:00
Roeland Jago Douma
2c8402aa17
Make \OC\Security\CSRF strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 15:01:02 +01:00
Morris Jobke
a8f56ac8c7
Merge pull request #8603 from nextcloud/enc-cleanup 
kill old encryption migration steps
 2018-03-05 11:16:27 +01:00
Roeland Jago Douma
f6fe04f3d7
Fix comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Roeland Jago Douma
0c500e460f
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Roeland Jago Douma
0cef938299
Make \OCP\Mail strict 
* Fix typehints
* Made strict

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Nextcloud bot
6c49cc0294
[tx-robot] updated from transifex 2018-03-05 01:12:12 +00:00
Nextcloud bot
6975cef00b
[tx-robot] updated from transifex 2018-03-04 01:12:42 +00:00
Joas Schilling
e05f338ff1
Add the users result only when non empty so tests stay the same 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-02 11:42:57 +01:00
Joas Schilling
158aac00a0
Merge pull request #8289 from nextcloud/appdata_hardening 
AppData hardening
 2018-03-02 11:26:36 +01:00
Bjoern Schiessle
8042e6b8fb
this was a migration step to ownCloud 8.0 to restructure the encryption folder which is no longer needed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-03-02 10:09:52 +01:00
Nextcloud bot
777313db42
[tx-robot] updated from transifex 2018-03-02 01:12:16 +00:00
Roeland Jago Douma
7f736923d9
Merge pull request #8284 from nextcloud/lib_log-storage-test-failed 
External storage test: log exceptions
 2018-03-01 20:32:09 +01:00
Joas Schilling
12420aef42
Also array_slice wide email matches of local users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-01 12:18:44 +01:00
Nextcloud bot
a7fb9ff8da
[tx-robot] updated from transifex 2018-03-01 01:12:11 +00:00
Julien Veyssier
7da0812186 Do not throw AppNotEnabledException for app public pages - refs #6962, refs #5309 
It allows non-logged user to access public pages of applications restricted to a group

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
 2018-02-28 20:35:53 +01:00
Dan Callahan
8797590099
Correct mistaken regex wildcard in .htaccess 
Fixes #8578

Signed-off-by: Dan Callahan <dan.callahan@gmail.com>
 2018-02-28 13:50:54 +00:00