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

8515 commits

Author SHA1 Message Date
Morris Jobke
8eb57dd835
Deprecate OCP\Files 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 14:29:35 +01:00
Morris Jobke
3579487798
Remove unused and deprecated methods of OCP\DB 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 12:17:55 +01:00
Morris Jobke
514de5dfa1
Use isInstalled of AppManger instead of reimplement it 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 11:34:18 +01:00
Joas Schilling
ec1e039790
Show EOL warning in the update section 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-20 15:52:30 +01:00
blizzz
7ae42f1f5d
Merge pull request #8822 from nextcloud/fix/8641/undefined-index 
the FN is optional, carrying the displayname if present
 2018-03-19 17:57:12 +01:00
Roeland Jago Douma
431750828e
Store setUserValue as string in cache 
We cache the values we set in the setUserValue function.
However since the values are strings in the database we check if a value
is equal with string comparison

Now if the function was called with a $value of int or float. It would
be stored in the DB (and thus converted to string) and in the cache (not
converted thus as int/float).

Now if another call comes in that sets it to the same value (I'm looking
at you LDAP!). The check would fail since we would be comparing
int/float to string which fails by definition.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 12:57:48 +01:00
Roeland Jago Douma
9834f33d56
Merge pull request #8878 from nextcloud/remove_tmpfile 
Remove deprecated tmpFile/tmpFolder
 2018-03-19 12:29:08 +01:00
Roeland Jago Douma
68871caf3c
Remove unused private function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 11:32:10 +01:00
Roeland Jago Douma
1088068c60
Remove \OCP\Files::tmpFolder 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 10:54:39 +01:00
Roeland Jago Douma
47a3008141
Remove \OCP\Files::tmpFile 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 10:52:35 +01:00
Morris Jobke
63bc633d89
Merge pull request #8857 from nextcloud/swift-verify-cached-token 
verify cached swift token
 2018-03-19 10:10:04 +01:00
Robin Appelman
41954d2903
verify cached swift token 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-16 15:20:16 +01:00
Morris Jobke
ade05f40ec
Remove unused resolveReshare of old sharing code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-16 12:26:38 +01:00
Roeland Jago Douma
fa886ef4eb
Merge pull request #8830 from nextcloud/node_emit_read 
Emit read for nodes
 2018-03-15 14:04:14 +01:00
blizzz
208e38e84e
Merge pull request #8255 from nextcloud/bugfix/noid/group-display-name 
Full implement group display names
 2018-03-15 12:07:30 +01:00
Roeland Jago Douma
d6b326650b
Emit read for nodes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-15 11:18:39 +01:00
Roeland Jago Douma
fde08a9619
Merge pull request #8793 from nextcloud/swift-config 
Swift uses `containter` not `bucket`
 2018-03-15 08:34:58 +01:00
Roeland Jago Douma
f2b93f5246
Merge pull request #8828 from nextcloud/fix-configuration-values-matched-in-user-searches 
Fix configuration values matched in user searches
 2018-03-15 08:34:21 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Joas Schilling
029e8cdc5b
Also allow to specify the cache file name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-28 11:31:33 +01:00
Morris Jobke
640db3d5fe
Merge pull request #8219 from nextcloud/fix-overwrite-url-on-cli-install 
Fix proper overwrite URL on CLI install
 2018-02-27 13:49:39 +01:00
Morris Jobke
7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms 
Let the admin configure the default share permissions
 2018-02-27 13:44:34 +01:00
Roeland Jago Douma
8b5997483c
Hardening of SimpleFile getContent 
if file_get_contents fails remove the file. And traverse up the tree
checking if the other folders are there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 13:35:09 +01:00
Roeland Jago Douma
01f420c7ac
Merge pull request #8051 from nextcloud/public-template 
Public page template response
 2018-02-27 13:33:19 +01:00
Bjoern Schiessle
3285becdc1
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Bjoern Schiessle
1615312bf1
add share permissions to settings page 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Bjoern Schiessle
7d0102bf73
expose capabilities in js 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Julius Härtl
e5df804834
Expose parameters as variables to templates 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:52 +01:00
Julius Härtl
b89827d761
Enable renderAs public page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:52 +01:00
Julius Härtl
0655df09d6
Pass template parameters to parent template 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:52 +01:00
Morris Jobke
7081bdbea6
Merge pull request #8553 from nextcloud/strict_logger 
Make ILogger strict
 2018-02-27 11:20:06 +01:00
Morris Jobke
8d8b22e294
Merge pull request #8552 from nextcloud/strict_session 
Make ISession strict
 2018-02-27 10:52:55 +01:00
Roeland Jago Douma
6994bce951
Loglevel is an int 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 10:45:35 +01:00
Roeland Jago Douma
83eb548d23
Typehint Throwable 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 10:43:34 +01:00
Roeland Jago Douma
4077f16aec
Make ILogger strict 
* Make implementations strict
* Add scalar typehints

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 10:41:46 +01:00
Morris Jobke
e2cd33adfe
Fix check if theming defaults instance is available 
The check in URLGenerator.php#169 and Server.php#945 are different and thus the DI container could return a \OC_Defaults object which does not provide the wanted method caising a PHP error.

Fixes #8420

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-27 10:15:31 +01:00
Roeland Jago Douma
8cb6bb3987
Make ISession strict 
* Make all implementations strict
* Add scalar types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 22:20:21 +01:00
Morris Jobke
8867629cf1
Merge pull request #8359 from nextcloud/swift-v3 
Support swift v3 authentication
 2018-02-26 18:30:00 +01:00
Morris Jobke
a60d7a8563
Merge pull request #8541 from nextcloud/translate-permission-error-page 
Provide translated error message for permission error
 2018-02-26 17:50:21 +01:00
Morris Jobke
cf35c4b03a
Provide translated error message for permission error 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-26 17:00:29 +01:00
Roeland Jago Douma
812ea354d0
User proper username + pass 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:18 +01:00
Robin Appelman
31dd6d6aae
add support for v3 swift auth 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-26 14:54:08 +01:00
Roeland Jago Douma
0c4c3676f6
Merge pull request #8504 from nextcloud/bugfix/noid/well-its-not-an-array 
Dont use $info as array when its not an array
 2018-02-26 13:44:57 +01:00
Joas Schilling
226e63695f
Merge pull request #8026 from nextcloud/feature/noid/allow-custom-html-in-html-emails 
Allow custom HTML in HTML Emails
 2018-02-26 13:38:39 +01:00
Joas Schilling
695e32d0a6
Merge pull request #8491 from nextcloud/strict_request 
Make Request strict
 2018-02-26 11:02:30 +01:00
Roeland Jago Douma
043a824e6a
Fix comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-22 15:51:19 +01:00
Roeland Jago Douma
0ee45d3d20
Fix proper types 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-22 15:51:19 +01:00
Roeland Jago Douma
a229095af1
Make Request strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-22 15:51:19 +01:00
Joas Schilling
1aa846107d
Dont use $info as array when its not an array 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-22 14:43:56 +01:00
Roeland Jago Douma
a423860f42
Relax what t accepts so we don't break it all 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-22 12:37:29 +01:00
Roeland Jago Douma
c2c2c06546
Merge pull request #8476 from nextcloud/strict_l10n 
Make OCP\IL10N strict
 2018-02-22 10:03:18 +01:00
Roeland Jago Douma
e1bdeb786e
Merge pull request #8472 from nextcloud/strict_integritycheck 
Make OC\IntegrityCheck strict
 2018-02-22 10:01:50 +01:00
Roeland Jago Douma
a660946ac6
Merge pull request #8490 from nextcloud/strict_systemtags 
Make SystemTag strict
 2018-02-22 10:01:20 +01:00
Roeland Jago Douma
fb41a93a95
Merge pull request #8473 from nextcloud/strict_cmr 
Strict OCP\AppFramework\Utility\IControllerMethodReflector
 2018-02-21 22:56:40 +01:00
Roeland Jago Douma
8e5657014d
Make SystemTag strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 22:08:27 +01:00
Roeland Jago Douma
72e745be26
Handle strict typing in Checker and fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 21:09:08 +01:00
Roeland Jago Douma
4859775893
Don't try to match on false 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 20:38:14 +01:00
Roeland Jago Douma
aa060f5332
Strict OCP\AppFramework\Utility\IControllerMethodReflector 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 19:55:49 +01:00
Roeland Jago Douma
8b17f0d224
Fix other tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 19:53:44 +01:00
Roeland Jago Douma
2b0d640225
Proper closure for function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 19:46:29 +01:00
Roeland Jago Douma
541056f6c2
Make OCP\IL10N strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 14:32:04 +01:00
Joas Schilling
2c840ca278
Log exceptions that happen when writing the app store reply to storage 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-21 14:14:33 +01:00
Roeland Jago Douma
4b50fe7560
Merge pull request #8466 from nextcloud/strict_middlewaredipatcher 
Make the middlewareDispatcher strict
 2018-02-21 13:57:04 +01:00
Roeland Jago Douma
8b44c16ddc
Merge pull request #8471 from nextcloud/fix_upgrade 
getIncompatibleApps needs a string not an array
 2018-02-21 13:28:10 +01:00
Roeland Jago Douma
4d5f2e64a5
Make OC\IntegrityCheck strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 13:27:29 +01:00
Roeland Jago Douma
4a41e0cc42
getIncompatibleApps needs a string not an array 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 13:00:41 +01:00
Roeland Jago Douma
7c6cc013eb
Merge pull request #8468 from nextcloud/fix-unicode-avatars 
Use mb_* string methods to extract first character for generated avatars
 2018-02-21 11:08:33 +01:00
Roeland Jago Douma
ca9f364fd4
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 10:55:52 +01:00
Roeland Jago Douma
a773b055fc
Make the middlewareDispatcher strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 10:55:24 +01:00
Morris Jobke
3bea8e05ad
Use mb_* string methods to extract first character for generated avatars 
This fixes #8451 where the first character is a non-ASCII character. The `$string[0]` notation only extracted one byte and thus resulting in an invalid code. The `mb_strtoupper` method also allows to convert characters independently from the current locale on the server.

See also http://php.net/manual/en/function.mb-strtoupper.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-21 10:32:46 +01:00
Roeland Jago Douma
bb0c7b2943
Make AppFramework/Http/Dispatcher strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 08:51:46 +01:00
blizzz
8e5120ce66
Merge pull request #8206 from nextcloud/bugfix/noid/fix-collaboration-result-size 
Better result handling of email search
 2018-02-20 23:02:53 +01:00
Joas Schilling
b30e035e25
Better result handling of email search 
1. Local users should not be returned when searching for empty string
2. The limit of the response should be respected

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-20 17:38:32 +01:00
Roeland Jago Douma
cf83eb5e77
Merge pull request #8336 from nextcloud/cleanup-unused-parameter 
Cleanup unused parameter
 2018-02-20 10:16:59 +01:00
Roeland Jago Douma
980c78048b
Merge pull request #8314 from nextcloud/openstack 
update openstack sdk
 2018-02-19 22:22:55 +01:00
Roeland Jago Douma
26a741fd36
Merge pull request #8428 from nextcloud/fix_8189 
Use TTF fonts for avatar generation
 2018-02-19 22:12:05 +01:00
Robin Appelman
817f2f8f49
adjust swift external storage to new openstack sdk 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-19 19:41:16 +01:00
Robin Appelman
3192efc415
adjust swift object storage to new openstack sdk 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-19 19:41:16 +01:00
Roeland Jago Douma
4e6d98ea8c
Merge pull request #8424 from nextcloud/fix/update-app 
Fix updating an app
 2018-02-19 15:54:49 +01:00
Roeland Jago Douma
0f57bce06c
Avatar generation use ttf (for ancient compatibility) 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-19 12:35:35 +01:00
Christoph Wurst
1a8916af59
Fix updating an up 
OC_App has been made strict recently and the updater code was not
compatible to this. This adds the array to string conversion of the
Nextcloud version and fixes a typo in OC_App (sstring -> string)

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-02-19 10:28:41 +01:00
Morris Jobke
70b1f510f2
Use normal header() calls instead of private method calls 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-19 09:40:25 +01:00
Morris Jobke
ac63c207a9
Merge pull request #8411 from nextcloud/add-strict-types-to-oc_app 
Add strict types to OC_App
 2018-02-17 21:34:20 +01:00
Morris Jobke
9b68f80c4b
Add remaining type hints, that were already okay 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
9fcf185c7d
Always return a string in OC_App::getCurrentApp and no boolean 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
e4077672e1
Use empty array as group list in OC_App::enable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
2e15c0d871
Refactor dependencies in setAppTypes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
9dc3b04802
Fix app version to be always string and neither array nor null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:13 +01:00
Morris Jobke
edee243b27
OC_App::loadApps now only accepts an array as type list 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 15:27:43 +01:00
Morris Jobke
2a2833e30f
Migrate to short array syntax 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 15:18:34 +01:00
Morris Jobke
57e0881a9e
Merge pull request #8232 from nextcloud/bugfix/8007/validate-appinfo-against-appstore-schema 
Validate appinfo against appstore schema
 2018-02-16 22:56:10 +01:00
Morris Jobke
45e7bb7f40
Merge pull request #8391 from coder-hugo/feature/mysql_ansi_quotes 
Don't use double quotes in MySQL queries
 2018-02-16 22:55:23 +01:00
Robin Müller
6aa816915a
Don't use double quotes in MySQL queries 
MySQL databases with the ANSI_QUOTES mode enabled treat " as an identifier
quote (see https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi_quotes).
So for such databases the 'occ upgrade' fails with an error message like this:
... unknown column 'oc_*' in where clause.

This fix replaces the doulbe quotes with single quotes that should be always
used in MySQL queries to quote literal strings.

Signed-off-by: Robin Müller <robin.mueller@1und1.de>
 2018-02-16 15:03:12 +01:00
Joas Schilling
17a26dfcc1
Validate the info.xml against the appstore schema file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:23:51 +01:00
Morris Jobke
14bc9b1714
Merge pull request #8095 from nextcloud/webapps-capabilities 
Expose navigation entries as API endpoint
 2018-02-15 16:55:12 +01:00
Julius Härtl
f36e8313ff
Add throws annotation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-15 12:23:49 +01:00
Joas Schilling
339e320064
Fix existing usages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-15 12:18:51 +01:00
Joas Schilling
350e38396f
Allow custom HTML in HTML Emails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-15 12:09:19 +01:00
Julius Härtl
04053311ee
Properly encapsulate require_once for app.php 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-15 11:20:22 +01:00
Julius Härtl
e694b30a4f
Update phpDoc comments and add more type hinting 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-15 10:38:25 +01:00
Morris Jobke
24f96513fd
Merge pull request #8259 from nextcloud/guzzle6 
update guzzlehttp/guzzle to 6.3.0
 2018-02-14 22:26:19 +01:00
Morris Jobke
236086c457
Merge pull request #8335 from nextcloud/remove-unused-import 
Remove unused import statements
 2018-02-14 22:23:07 +01:00
Morris Jobke
d3d045dd5c
Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Joas Schilling
a966d5256c
Merge pull request #8328 from nextcloud/bugfix/noid/filter-out-the-current-user-by-email-too 
Filter out the current user when searching for emails too
 2018-02-14 11:53:48 +01:00
Joas Schilling
c32a94b78d
Merge pull request #8337 from nextcloud/use-non-alias-method 
Use non aliased method instead
 2018-02-14 10:09:09 +01:00
Morris Jobke
e2974f1133
Simplify return statement 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:55:24 +01:00
Morris Jobke
954da26e26
Use non aliased method instead 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:48:24 +01:00
Morris Jobke
d18d323f21
Remove fromMailAddress from MailSettingsController 
Was removed in https://github.com/nextcloud/server/pull/4379 (0a54d5a) and https://github.com/nextcloud/server/pull/4380 (bae64e8)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:40:38 +01:00
Joas Schilling
cf216ecff2
Filter out the current user when searching for emails too 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-13 17:32:58 +01:00
Julius Härtl
ada5aed35e
Deprecate static methods and use Navigation manager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:33 +01:00
Julius Härtl
b6da8c5279
Add getAll to public INavigationManager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:32 +01:00
Julius Härtl
864474b858
Move navigation processing to the NavigationManager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:32 +01:00
Roland Tapken
dc99442bc1 External storage test: log exceptions 
If an external storage test fails the exception's message is now written
into the logfile (level INFO). Additionally, the stack trace is printed
as DEBUG. This helps to resolve the reason for a failing connection.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-02-11 16:45:32 +01:00
Robin Appelman
fe23bb5916
adjust post body for new guzzle 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-09 17:13:33 +01:00
Robin Appelman
97b44605f4
Adjust dav client to new guzzle 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-09 17:13:24 +01:00
Robin Appelman
9b25ff9fcb
adjust httpclient to guzzle6 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-09 17:13:21 +01:00
Roeland Jago Douma
3e0ef7e3f2
Try to silence phan 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-08 15:18:26 +01:00
Robin Appelman
e34c20af7d
don't swallow exception from touch 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-08 15:18:26 +01:00
Robin Appelman
85d23dd6fc
better error message on catalog error 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-08 15:18:26 +01:00
Morris Jobke
26e0c14c6d
Merge pull request #8033 from nextcloud/s3-uploader 
Use S3Client::upload instead of splitting single/multipart upload ourselves
 2018-02-08 14:30:02 +01:00
Morris Jobke
d767d01a0c
Merge pull request #8218 from nextcloud/display_proper_lang_string 
Display the proper language strings in setttings
 2018-02-08 11:13:10 +01:00
Morris Jobke
e5c08621af
Merge pull request #8023 from nextcloud/webdavsearch_limit_order_fixing 
Respect limit and order in webdav search
 2018-02-08 09:11:39 +01:00