Commit Graph

8739 Commits

Author SHA1 Message Date
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
Robin Appelman fd09c06eb4
actually return stream from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-07 17:10:59 +01:00
Roeland Jago Douma c1ff12e234
CacheJail should apply limit and offset after searching
Else the results might not be correct.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-07 13:41:15 +01:00
Morris Jobke 4ee539fde8
Fix proper overwrite URL on CLI install
* regression from #7835

Steps

* having a my.config.php with a proper `overwrite.cli.url` and `htaccess.RewriteBase` set
* install with this
* before: short URLs where broken and you need to call `occ maintenance:update:htaccess` additionally to fix this
* after: occ install results in a proper htaccess like on stable13

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-07 11:40:35 +01:00
Morris Jobke 8d57d68846
Merge pull request #8217 from nextcloud/fix_8180
Use proper lanugage in langauge code
2018-02-07 11:37:51 +01:00
Roeland Jago Douma 4ee9315a68
Display the proper language strings in setttings
Since this was moved to lib, we have to the lib language files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-07 11:13:55 +01:00
Roeland Jago Douma e5be299101
Use proper lanugage in langauge code
Fixes #8180

The _ is not valid in language codes use - instead.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-07 11:04:37 +01:00
Morris Jobke 27f505667c
Merge pull request #8182 from robert-scheck/pki-validation
Handle SSL certificate verifications for others than Let's Encrypt
2018-02-06 16:43:39 +01:00
Morris Jobke 8fa86bf68b
Merge pull request #8173 from michaelletzgus/fix_for_each
Fix "undefined index" problem
2018-02-06 10:23:52 +01:00
Robert Scheck 7583615bab Handle SSL certificate verifications for others than Let's Encrypt
Do no longer (wrongly) rewrite URLs like

  * http://example.net/.well-known/pki-validation/file.txt (Comodo)
  * http://example.net/.well-known/pki-validation/fileauth.txt (DigiCert, Thawte, GeoTrust)
  * http://example.net/.well-known/pki-validation/gsdv.txt (GlobalSign)
  * http://example.net/.well-known/pki-validation/starfield.htm (Starfield, GoDaddy)
  * http://example.net/.well-known/pki-validation/swisssign-check.txt (SwissSign)

for automated SSL certificate verifications. All (common commercial)
certificate authorities (CA) except Let's Encrypt (via ACME) seem to
use "pki-validation" rather "acme-challenge" for their domain control
validation (DCV).

Signed-off-by: Robert Scheck <robert@fedoraproject.org>
2018-02-05 15:33:42 +01:00
Morris Jobke 847bd0cf74
Merge pull request #8144 from nextcloud/cache-update-occ
Repair step to clear frontend related caches
2018-02-05 12:15:52 +01:00
Morris Jobke 0225ea1b9a
Merge pull request #8155 from nextcloud/use-guest-css
Fix styling issues of guest pages
2018-02-05 12:14:09 +01:00
michaelletzgus 05b8eb140c
using isset()
using isset() instead of array_key_exists()
2018-02-05 10:50:32 +01:00
michaelletzgus cfa694ea73
Fix undefined index problem
Nextcloud 13RC4, error in logfile, triggered by "occ config:list":

Invalid argument supplied for foreach() at lib/private/AppConfig.php#297
PHP	Undefined index: workflowengine at lib/private/AppConfig.php#297

Fix: Check if index exists in array before using it.
2018-02-04 15:59:23 +01:00
Julius Härtl b87e5a0f2e
Move depsCache clearing to SCSSCacher/JSCombiner
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-03 15:21:51 +01:00
Julius Härtl 7381a81d30
Add repair step to clear frontend related caches
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-03 15:21:51 +01:00
Roeland Jago Douma 53a780e31c
Do not try to get the jailed path if we can't find the id
Fixes #8047

If we can't find the file by id there we should just return null instead
of trying to get the jailed path of null.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-03 14:45:28 +01:00
Julius Härtl c29bf24440
Load guest css on any guest and error page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 14:20:13 +01:00
Joas Schilling c314a07e7f
Merge pull request #8134 from coliff/patch-2
Update iOS link to geo-detect & show correct store listing
2018-02-02 12:43:10 +01:00
Christian Oliff 18898383c5
Update defaults.php 2018-02-02 20:37:58 +09:00
Morris Jobke cbbc6187c2
Update doc link version to 14
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-01 13:52:11 +01:00
Roeland Jago Douma 367b5a794d
Merge pull request #8097 from nextcloud/deprecate-static-app
Deprecate static methods from  \OCP\App
2018-01-31 16:23:11 +01:00
Morris Jobke c95f6a1dc9
Merge pull request #8121 from nextcloud/bugfix/8085/migrations-table-has-old-collation
Create the migrations table also with the UTF8mb4 collation
2018-01-31 14:43:40 +01:00
Morris Jobke 3fa92a03e5
Add deprecation checks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-31 14:15:12 +01:00
Julius Härtl efbdad2d0c
Remove OC_App::removeApp
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-31 14:15:12 +01:00
Julius Härtl a68895e334
Remove OC_App::installApp since it is not used anymore
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-31 14:15:10 +01:00
Julius Härtl 19a0a9a4e7
Move getAppInfo and getAppVersion to IAppManager
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-31 14:13:15 +01:00
Joas Schilling 352a48e273
Create the migrations table also with the UTF8mb4 collation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-31 13:15:00 +01:00
Roeland Jago Douma 1429146083
Merge pull request #8096 from nextcloud/feature/6382/do-not-cache-settings-in-db-anymore
Do not cache the settings/sections in the database anymore
2018-01-31 12:49:45 +01:00
Morris Jobke 4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss
SCSS hardening
2018-01-29 16:12:10 +01:00
Joas Schilling d971b104ed
Do not cache the settings/sections in the database anymore
This caused more troubles then it had benefits, especially
when an app got disabled or was removed without being disabled.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-29 15:47:37 +01:00
Morris Jobke 01482b32a1
Merge pull request #8062 from nextcloud/use-class
Use ::class statement instead of string
2018-01-29 15:25:08 +01:00
Roeland Jago Douma c0adfa4375
Don't perform CSRF check on OCS routes with Bearer auth
Fixes #5694

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-29 14:37:18 +01:00
Morris Jobke eb51f06a3b
Use ::class statement instead of string
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-29 12:03:47 +01:00
Morris Jobke a661f043e1
Remove unneeded semicolon and parentheses
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 23:46:40 +01:00
Julius Härtl e4c58fc473
Add typehinting an fix some minor cleanup
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 20:11:37 +01:00
Julius Härtl 6770213649
Do not rewrite absolute URLs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 19:08:45 +01:00
Julius Härtl 68db09ddce
Clear injectect variables when resetting the cache
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 19:07:30 +01:00
Morris Jobke 9be6050cc4
Merge pull request #8072 from nextcloud/type-casting
Use type casting instead of *val() method
2018-01-26 17:34:55 +01:00
Julius Härtl 5eae4819bf
Make sure that injected variables do not break the CSS generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 17:03:22 +01:00
Julius Härtl 92e93704be
SCSS files are only cached if their size is > 0
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 17:02:54 +01:00
Morris Jobke 97c216ea06
Merge pull request #8071 from nextcloud/remove-silly-code
Cleanup unused code
2018-01-26 15:47:06 +01:00
Morris Jobke 4c38d1ed01
Merge pull request #8054 from nextcloud/substr-use-index
Use index based string access for substr with length of 1
2018-01-26 15:40:44 +01:00
Morris Jobke c005fc6755
Cleanup unused code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 15:25:19 +01:00
Morris Jobke 2ad2eb38e8
Use type casting instead of *val() method
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 15:01:27 +01:00
Morris Jobke 9ff51aafc5
Use index based string access for substr with length of 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 13:38:34 +01:00
Morris Jobke 6bbea33133
Simplify ternary operator statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 12:36:25 +01:00
Morris Jobke c1e4f9f305
Use type casting instead of *val() method
It should be up to 6x faster

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 11:35:42 +01:00
Morris Jobke fe7e726ab2
Merge pull request #8064 from nextcloud/background-jobs
Deprecated OCP interface to fetch background job type
2018-01-26 10:43:21 +01:00
Morris Jobke 9ef6148bfa
Deprecated OCP interface to fetch background job type
* was not used by apps and also is not needed
* migrated the documentation to IJobList

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 10:43:01 +01:00
Joas Schilling a7ad7cb08e
Merge pull request #8053 from nextcloud/simplify-substr
Use short for of substr to not need strlen()
2018-01-26 10:25:09 +01:00
Joas Schilling c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value
Return value immediately instead of assigning to a one-time variable
2018-01-26 10:15:39 +01:00
Roeland Jago Douma fab951e4b3
Merge pull request #8057 from nextcloud/unneeded-implements
Implements are not needed because they are already done by base class
2018-01-26 10:00:25 +01:00
Roeland Jago Douma e97165e0b5
Merge pull request #8055 from nextcloud/improve-loop
Improve conditional of loop
2018-01-26 09:59:45 +01:00
Roeland Jago Douma 5a7a5e5352
Merge pull request #8058 from nextcloud/useless-return
Remove useless return statements
2018-01-26 09:51:26 +01:00
Roeland Jago Douma 43ed8b446c
Merge pull request #8060 from nextcloud/proper-codeflow
Use proper code flow instead of not needed else branch
2018-01-26 09:49:30 +01:00
Morris Jobke 0a56d2185e
Return value immediately instead of assigning to a one-time variable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 00:02:03 +01:00
Morris Jobke 16a558871c
Use proper code flow instead of not needed else branch
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 23:01:03 +01:00
Morris Jobke 4dbee99b7b
Remove useless return statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:50:40 +01:00
Morris Jobke 55ef34b23b
Implements are not needed because they are already done by base class
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:42:24 +01:00
Morris Jobke 870fe20acc
Use $var[] = $a instead of array_push - 2x faster
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:36:03 +01:00
Morris Jobke c314eb74a9
Improve conditional of loop
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:33:43 +01:00
Morris Jobke e6efa755c9
Use short for of substr to not need strlen()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:23:48 +01:00
Roeland Jago Douma eddd135f14
Dispatch event on twofactor failure and success
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-25 13:25:09 +01:00
Robin Appelman 3499cbdb76
Use S3Client::upload instead of splitting single/multipart upload ourselves
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-24 17:22:05 +01:00
Morris Jobke 0e9009989f
Merge pull request #8020 from nextcloud/fix-avatar-migration
Make sure we always know for sure if an avatar is generated or not
2018-01-24 15:18:19 +01:00
Morris Jobke 1daddd678e
Merge pull request #8002 from nextcloud/dont_polutelog_dav_emaillogin
Dont polute the log on DAV emaillogin
2018-01-24 14:00:01 +01:00
Julius Härtl ef1265e5f5
Make sure we always know for sure if an avatar is generated or not
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-24 13:10:20 +01:00
Roeland Jago Douma 4537faa5da
Merge pull request #7918 from nextcloud/properly-log-exceptions
Properly log the full exception instead of only the message
2018-01-23 11:56:02 +01:00
Morris Jobke 2a38605545
Properly log the full exception instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-23 10:57:21 +01:00
Morris Jobke 5c360a41e9
Merge pull request #7858 from nextcloud/fix-local-storage
Use fallback path if data dir is not available for Storage/Local.php
2018-01-23 10:52:41 +01:00
Roeland Jago Douma ef127a30ec
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-23 10:35:37 +01:00
Morris Jobke caccf7a2e9
Merge pull request #7989 from nextcloud/cleanup-unused-share-methods
Remove not used methods of legacy share.php
2018-01-23 10:00:24 +01:00
Roeland Jago Douma 0660e57b1f
Don't polute log when loggin into dav with email
* We first try the email as username but this fails
* Then we get the uid from the email and try again

We should not log the first attempt since it polutes the log with failed
login attempts while the login actually is valid.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-23 09:41:44 +01:00
Roeland Jago Douma eb3fd4bce6
Merge pull request #7988 from nextcloud/cleanup-old-repair-steps
Remove old repair steps that aren't executed anymore
2018-01-22 19:54:46 +01:00
Morris Jobke 71cf31f211
Remove not used methods of legacy share.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-22 14:54:07 +01:00
Morris Jobke d9b1492e03
Remove old repair steps that aren't executed anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-22 14:51:02 +01:00
Roeland Jago Douma 8703df3233
If the preview is size 0 it is invalid
* delete it
* throw a NotFound Exception
  - This should a proper 404 to the user
  - Next time it is then regenerated

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-22 13:57:00 +01:00
Morris Jobke 80a36380fc
Disable vendor detection when upgrading from 11.0.x
Upgrade from 11 to 14 is not supported anyways.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-20 11:14:06 +01:00
Morris Jobke c70927eaa0
Remove not needed 3rdparty app disabling during upgrade for PHP 5.x
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-19 14:00:27 +01:00
Morris Jobke bcba1a97ad
Use fallback path if data dir is not available for Storage/Local.php
Found while testing strict types for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-18 16:38:01 +01:00
Morris Jobke 0d9f73a814
Do not show "Not installed warning" during occ install
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-18 14:55:32 +01:00
Julius Härtl f0b7b2dedf
Merge pull request #7911 from nextcloud/improve-oc_image
Improve OC_Image code to not guess the type of input
2018-01-18 14:39:08 +01:00
Morris Jobke 3d4c698f44
Improve OC_Image code to not guess the type of input, but actually request the specific methods to be called
Followup to #7836

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-18 13:40:55 +01:00
Roeland Jago Douma 1e7b20f615
Remove IAppConfig::setValue
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-17 21:41:57 +01:00
Roeland Jago Douma 09f8a755ec
Remove IAppConfig::getValue
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-17 21:41:56 +01:00
Roeland Jago Douma ee2617d88c
Simple IAppConfig deprecations
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-17 21:03:04 +01:00
Roeland Jago Douma 6e29b8731e
Merge pull request #7914 from nextcloud/fix-7254
format self-mentions, but don't offer them
2018-01-17 14:59:46 +01:00
Arthur Schiwon 39f34603f2
add types to php doc
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-17 13:58:42 +01:00
Arthur Schiwon 6fdd686111
do not offer the handle of the current user for auto completion
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-17 13:49:18 +01:00
Arthur Schiwon 3784fa2074
comments should compile mentions also if done by author
it is used by clients for formatting reasons, there is no reason not format
the author if her handle is included in the comment body.
It is unrelated to sending out notifications.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-17 13:48:43 +01:00
Morris Jobke 24c58d39f4
Merge pull request #7909 from nextcloud/fix-migration-type-hints
Fix the type hints of migrations and correctly inject the wrapped sch…
2018-01-17 13:47:58 +01:00
Roeland Jago Douma f8756d96bc
Merge pull request #7847 from nextcloud/avatarmanager_strict
Fixes for avatarmanager
2018-01-17 13:46:18 +01:00
Roeland Jago Douma 73cc4ac1f6
Merge pull request #7912 from nextcloud/bugfix/noid/correctly-drop-owncloud-migrations-table
Correctly drop the ownCloud migrations table
2018-01-17 13:45:36 +01:00
Joas Schilling 0d37d24b4b
Correctly drop the ownCloud migrations table
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-17 12:17:41 +01:00
Morris Jobke c121610d5a
Merge pull request #7813 from nextcloud/getHeader-should-only-return-string
Request->getHeader() should always return a string
2018-01-17 11:42:31 +01:00
Morris Jobke 9222dcd940
Merge pull request #7836 from nextcloud/image-type-hinting
Fix float/integer handling in image API
2018-01-17 11:40:35 +01:00
Joas Schilling 4a5282ba21
Fix the type hints of migrations and correctly inject the wrapped schema into migrations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-17 11:37:36 +01:00
Roeland Jago Douma 6e95bd7a51
Merge pull request #7899 from nextcloud/strict_discservice
Strict DiscoveryService
2018-01-17 10:01:56 +01:00
Morris Jobke e4b3ee8d8f
Fix float/integer handling in image API
* IImage::crop/preciseResize now have type hinting for integers
* found while testing strict typing for PHP 7+

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-17 10:00:33 +01:00
Morris Jobke 4ef302c0be
Request->getHeader() should always return a string
PHPDoc (of the public API) says that this method returns string but it also returns null, which is not allowed in some method calls. This fixes that behaviour and returns an empty string and fixes all code paths that explicitly checked for null to be still compliant.

Found while enabling the strict_typing for lib/private for the PHP7+ migration.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-17 09:51:31 +01:00
Morris Jobke 22b3280ac2
Merge pull request #7897 from nextcloud/strict_lockingproviders
Made locking providers strict
2018-01-17 09:33:52 +01:00
Morris Jobke cb0dbfa987
Merge pull request #7900 from nextcloud/strict_security
Make OCP\Security stricter
2018-01-17 09:29:32 +01:00
Roeland Jago Douma d1420ef481
Merge pull request #7901 from nextcloud/strict_cache_factory
Made the cache factory strict
2018-01-17 06:51:04 +01:00
Morris Jobke 0b464e5274
Merge pull request #7884 from nextcloud/cleanup-oc_user
Cleanup OC_User and OCP\User
2018-01-17 05:33:07 +01:00
Roeland Jago Douma 569b8413d4
Add extra check so we don't error out on type
json_decode can return false if we have invalid data.
In that case just assume there was nothing cached

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-16 22:06:57 +01:00
Roeland Jago Douma 0e0db37658
Make OCP\Security stricter
* Add typehints
* Add return types
* Opcode opts from phpstorm
* Made strict
* Fixed tests: No need to test bogus values anymore strict typing fixes
this

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-16 22:01:19 +01:00
Roeland Jago Douma c5fcfb0709
Made the cache factory strict
* Return types
* Typehints
* made strict
* fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-16 21:58:20 +01:00
Roeland Jago Douma 8edbfdb291
Made locking providers strict
* Added typehints
* Added return types
* Made strict

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-16 21:54:20 +01:00
Morris Jobke 117c1c90df
Merge pull request #7894 from nextcloud/strict_http_client
Make OCP\Http strict
2018-01-16 21:49:18 +01:00
Julius Härtl e7605d9adc
Merge pull request #7892 from nextcloud/cloudid_strict
Make OCP\Federation strict
2018-01-16 21:10:53 +01:00
Roeland Jago Douma cdfffe7bda
Strict DiscoveryService
* Made strict
* Type hints
* Return types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-16 20:01:38 +01:00
Roeland Jago Douma 2b70c708ab
Merge pull request #7882 from nextcloud/search-and
Support arbitrary number of arguments for d:or and d:and in search queries
2018-01-16 19:53:01 +01:00
Roeland Jago Douma 50acde36b7
Make OCP\Federation strict
* Also internal classes
* Added scalar typehints
* Added return type
* Made strict

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-16 19:25:08 +01:00
Roeland Jago Douma a345605ec1
Make OCP\Http strict
* Handle private files
* Add return types
* Add scalar typehints
* Made strict
* Fixed requiring proper guzzle message interface that is passed around

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-16 19:19:58 +01:00
Morris Jobke 55532f19d9
Cleanup OC_User and OCP\User
* mainly removes deprecated methods and old static code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-16 18:39:11 +01:00
Joas Schilling 13a787e2f5
Merge pull request #7885 from nextcloud/ocp-user-app-code-check
Add OCP\User deprecations to app code checker
2018-01-16 14:17:07 +01:00
Morris Jobke e13fe076d2
Add OCP\User deprecations to app code checker
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-16 13:32:37 +01:00
Robin Appelman 326d55db81
Support arbitrary number of arguments for d:or and d:and in search queries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-16 13:22:28 +01:00
Joas Schilling c95890f9b0
Keep all shipped apps enabled because they should be okay
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-16 11:39:48 +01:00
Morris Jobke 2997bb9c69
Merge pull request #7870 from nextcloud/remove-core-api
Remove deprecated core API
2018-01-15 18:47:34 +01:00
Morris Jobke fc9f5fdfc4
Merge pull request #7835 from nextcloud/fix-empty-overwrite-url-in-setup
Fix case when overwrite URL is empty during setup
2018-01-15 17:55:23 +01:00
Joas Schilling 7bc9a69c3f
Remove deprecated core API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-15 17:54:50 +01:00
Morris Jobke 82869b6d81
Fix case when overwrite URL is empty during setup
Found while testing strict typing for PHP 7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-15 11:15:38 +01:00
Roeland Jago Douma 0023cb12fd
Merge pull request #7853 from nextcloud/strict_urlgenerator
Make the URLGenerator strict
2018-01-15 09:32:29 +01:00
Roeland Jago Douma d44de92c31
Merge pull request #7838 from nextcloud/timefactory_strict
Make the ITimeFactory strict + return types
2018-01-15 09:27:37 +01:00
Morris Jobke bf680adaa8
Merge pull request #7856 from nextcloud/fix-strict-type
Move strict type declare statement below PHP tag
2018-01-14 23:38:55 +01:00
Christoph Wurst bdd99b096f
Merge pull request #7833 from nextcloud/fix-code-checker
Fix casting in app code checker
2018-01-14 22:36:59 +01:00
Roeland Jago Douma 419de27b6d
Merge pull request #7840 from nextcloud/dep_config
Remove deprecated \OCP\Config
2018-01-14 22:21:37 +01:00
Roeland Jago Douma 7ffd62bf95
Make the ITimeFactory strict + return types
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 21:55:40 +01:00
Roeland Jago Douma 48ea7251d7
Use \OC\User\Manager internally in the avatarmanager
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 21:32:54 +01:00
Roeland Jago Douma 4c56acffd1
Made AvatarManager string and add return types
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 21:32:54 +01:00
Roeland Jago Douma a3b33bea03
Make the URLGenerator strict
* Add scalar argument types
* Add return types
* Make strict
* General phpstorm cleanup

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 21:18:48 +01:00
Morris Jobke c0c4263546
Merge pull request #7850 from nextcloud/strict_ipaddress
Make IPAddress typed and strict
2018-01-14 21:16:06 +01:00
Roeland Jago Douma bb2938a47d
Make IPAddress typed and strict
* Added scalar typehints
* Added return statements
* Added strict declaration

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 21:15:44 +01:00
Morris Jobke 2ed4bea18f
Merge pull request #7852 from nextcloud/strict_ratelimiting
Make OC\Security\RateLimiting strict
2018-01-14 21:08:45 +01:00
Roeland Jago Douma cf0a339997
Make OC\Security\RateLimiting strict
* Add return types
* Add scalar argument types
* Made strict
* Cleaned up phpstorm inspections

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 21:08:23 +01:00
Morris Jobke fcea6e1564
Merge pull request #7849 from nextcloud/strict_securerandom
Strict ISecure random
2018-01-14 21:05:19 +01:00
Roeland Jago Douma 6e1ee1e7a7
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 21:04:52 +01:00
Morris Jobke fc94d1b573
Move strict type declare statement below PHP tag
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-14 20:59:17 +01:00
Morris Jobke 3f2007025a
Merge pull request #7845 from nextcloud/capabilties_manager_strict
Make the capabilities manager strict
2018-01-14 20:53:17 +01:00
Morris Jobke 3ade5ccb27
Merge pull request #7839 from nextcloud/dep_dicontainer
Remove deprecated functions from DI Container
2018-01-14 20:51:21 +01:00
Christoph Wurst 9e7fce7213
Merge pull request #7834 from nextcloud/database-schema-checker-casts
Add casts to XML parser in DatabaseSchemaChecker
2018-01-14 18:58:15 +01:00
Morris Jobke a2678d56aa
Merge pull request #7842 from nextcloud/dep_isearch
Removed deprecated search function from ISearch
2018-01-14 14:47:23 +01:00
Roeland Jago Douma de5d7aa331
Strict ISecure random
* Declare strict
* Scalar arguments
* Return type
* Use fully qualified name for strlen

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-13 21:39:34 +01:00
Roeland Jago Douma 758cb4d008
Make the capabilities manager strict
* Add return types
* Add scalar type hints
* Use [] instead of array_push (PHPStromg inspection recommendation)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-13 19:53:31 +01:00
Roeland Jago Douma 704133d732
Remove deprecated functions from DI Container
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-13 19:29:52 +01:00
Roeland Jago Douma 21a720e026
Removed deprecated search function from ISearch
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-13 19:27:25 +01:00
Roeland Jago Douma 8a41d05761
Remove deprecated \OCP\Config
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-13 14:25:04 +01:00
Morris Jobke ca28df6fcc
Adds type hinting for scalar types in ICrypto->decrypt
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-13 00:06:03 +01:00
Morris Jobke 16f4d71efd
Merge pull request #7824 from nextcloud/fix-type-in-CryptoSessionData
Fix type in CryptoSessionData
2018-01-13 00:01:52 +01:00
Morris Jobke 24bc8c44da
Add casts to XML parser in DatabaseSchemaChecker
Preparation for strict_typing for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 23:38:10 +01:00
Morris Jobke c739ca3c50
Fix casting in app code checker
Found while adding strict typing for PHP7+. This adds type hinting to all methods in CodeChecker.php and fixes one implicit cast.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 23:24:11 +01:00
Morris Jobke fe0dbe7fb7
Fix type in CryptoSessionData
Found while adding strict typing for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 22:41:03 +01:00
Morris Jobke 1efde41333
Check if realpath() returns false
realpath() returns false in case the directory does not exist. Found it while preparing strict_typing for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 19:40:25 +01:00
Morris Jobke e4e39910f3
Merge pull request #7819 from nextcloud/fix-explode-in-legacy-helper.php
Fix explode() call in legacy/helper.php to have correct types
2018-01-12 17:59:15 +01:00
Roeland Jago Douma 15bbf08774
Merge pull request #7816 from nextcloud/fix-strpos-for-current-app
Fix strpos if needle is not found
2018-01-12 16:55:27 +01:00
Morris Jobke b356d0dfc4
Fix explode() call in legacy/helper.php to have correct types
Found while enabling strict_typing for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 15:26:49 +01:00
Morris Jobke e3c0fd6882
Fix strpos if needle is not found
Found while testing strict_typing for PHP 7+. If `$script` does not contain a `/` then it should extract a string of the length 0.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 15:01:45 +01:00
Morris Jobke 01040daf02
Fix call to clearstatcache to actually use the file path
* found while adding the strict_typing for PHP 7+ migration
* first argument is a boolean - second one is the path
* see http://php.net/manual/en/function.clearstatcache.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 13:59:58 +01:00
Robin Appelman 42b3aa3a0a
reuse query builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-12 13:57:55 +01:00
Roeland Jago Douma 03a7d9bbfa
Merge pull request #7635 from Abijeet/bug-7106
Fixes password input being prompted every time.
2018-01-10 20:10:40 +01:00
Morris Jobke 4823ac969a
Merge pull request #7763 from nextcloud/pos_fix_7751
Do not instantiate node when not needed
2018-01-10 15:40:10 +01:00
Roeland Jago Douma f6d84bdb23
Log a missing setting as INFO not as WARNING
It can happen for all kinds of reasons that a setting is not available.
(A user removes a folder, a setting got deleted). So don't polute the
log on default settings.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-10 09:02:01 +01:00
Roeland Jago Douma 4596423b14
Do not instantiate node when not needed
Use the lazy functions is possible. This avoids getting the node if not
required.

Possible fix for #7751

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-09 19:51:50 +01:00
Jan-Christoph Borchardt 9386b07ed8
Merge pull request #7731 from nextcloud/preview_size_inc
Max preview size to 4096x4096
2018-01-09 11:07:02 +01:00
Abijeet de5467811a Fixes password input being prompted every time.
Fixes #7106

- Echoing the current server time via a JS variable and storing the current time on page load in JS.
- Calculating the diff and taking it into account when deciding whether to show the password confirmation.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-01-08 23:47:52 +05:30
Roeland Jago Douma e2352cc06f
Max preview size to 4096x4096
With HiDPI screens. And even normal HD screens you want more detail from
your pictures. Or the ability to somewhat zoom on you previews. For this
we need somewhat larger previews.

Moving the default to 4096x4096 is a step up. Users that want the old
behavior can still set the values in config.php

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-08 15:35:55 +01:00
Roeland Jago Douma faa68b28cb
Only return 1 type
Throw proper exception if we can't get the mimetype for a preview. Catch
it later on so we can just return a not found for the preview.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-07 14:36:37 +01:00
Roeland Jago Douma 5b21650097
Don't lie about the preview mimetype
For legacy reasons we stored all the previews with a png extention.
However we did not put png data in them all the time.

This caused the preview endpoints to always report that a preview is a
png file. Which was a lie.

Since we abstract away from the storage etc in the previewmanager. There
is no need anymore to store them as .png files and instead we can use
the actual file extention.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-07 11:41:54 +01:00
Morris Jobke 68e205e827
Merge pull request #7712 from nextcloud/jsconfig_l10n
Use correct L10N files for jsconfig
2018-01-05 15:22:10 +01:00
Roeland Jago Douma 30ac28f950
Use correct L10N files for jsconfig
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-05 14:33:03 +01:00
Morris Jobke e7aebcfd6b
Merge pull request #7699 from nextcloud/bugfix/7528/drop-owncloud-migrations-table-and-recreate-it
Drop the ownCloud migration table instead of reusing it
2018-01-04 16:52:52 +01:00
Joas Schilling 7154050201
Drop the ownCloud migration table instead of reusing it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-04 14:58:01 +01:00
Morris Jobke e655732458
Merge pull request #7570 from nextcloud/s3-legacy-auth
add option to use legacy v2 auth with s3
2018-01-04 13:17:58 +01:00
Morris Jobke 19280adc0d
Merge pull request #7611 from nextcloud/fix-7445
Don't attempt to translate login names to uids when uids are provided
2018-01-03 23:45:31 +01:00
Julius Härtl 8a226811dc
Invert app icons on IE11 as well
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 14:42:07 +01:00
Arthur Schiwon 4f3d52a364
never translate login names when requiring with a user id
where appropriate, the preLoginNameUsedAsUserName hook should be thrown.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 13:25:00 +01:00
Roeland Jago Douma 57050146f6
Move passwordconfirmation to its own midleware
Add tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-02 21:58:14 +01:00
Bjoern Schiessle 1bcbeb24bc
disable password confirmation with SSO
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-01-02 20:30:37 +01:00
Morris Jobke d97341d986
Merge pull request #7660 from nextcloud/fix-7646
Also log exception for failed appstore request
2018-01-02 15:05:33 +01:00
Morris Jobke aac9a1c41a
Merge pull request #7631 from nextcloud/fix-scss-webroot-and-url-rewrite
Fix scss webroot and url rewrite
2018-01-02 15:03:07 +01:00
Morris Jobke c5f852d90c
Also log exception for failed appstore request
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-02 09:40:03 +01:00
John Molakvoæ (skjnldsv) c0c4443ffc
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv) 02bfc867ef
Added tests for various installations types
- With root installation
 - Core css
 - App inside server root
 - Secondary apps directory outside server root
- With an installation in a sub directory
 - Core css
 - App inside server root
 - Secondary apps directory outside server root

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv) 88b72fd027
Fixup! getWebdir return
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv) dc938628f7
Use OC_Util function for app web path
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv) ad20af619f
getWebDir function
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv) 89ca9cb35c
Fixed webroot for scss files
Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv) fb6c5cc416
Fixed scss url rewriting
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:43 +01:00
Roeland Jago Douma 752055220f
Don't spam the log when we could not properly connect to the appstore
If we can't connect to the appstore for some reason we don't have to log
the exception just an info entry is enough.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-29 15:55:05 +01:00
Roeland Jago Douma 735b9fb81a
Fixup code
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-22 13:08:00 +01:00
Robin Appelman aad01894e3
refactor user searching
add additional user searching tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-20 15:51:37 +01:00
Julius Härtl 4c3eb80a91
Hide delete button if the avatar is a generated one
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-19 18:49:26 +01:00
Roeland Jago Douma a4ca92f29a
Remove generated avatar on displayname change
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
Robin Appelman 34ced4dd97
add option to use legacy v2 auth with s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-19 11:54:55 +01:00
Roeland Jago Douma e550a3ddd8
Merge pull request #7562 from nextcloud/fix-wrongly-cached-result
Cache final result of update check
2017-12-19 10:12:33 +01:00
Roeland Jago Douma a84d11de7b
Merge pull request #7531 from nextcloud/ldap/createdistributed
don't use deprecated method for requesting memcache
2017-12-18 22:08:32 +01:00
Morris Jobke 1beffa058a
Cache final result of update check
If the parsed data is not a valid response we should not cache it and only cache the preprocessed result set.

Fixes #7442

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 21:48:58 +01:00
Morris Jobke d2d73f1ce8
Also replace all other occurences
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 20:57:11 +01:00
Roeland Jago Douma 0b7136940e
Let DI handle the background job
Fixes #7548

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 20:42:06 +01:00
Morris Jobke 913cb2b9c6
Merge pull request #7554 from nextcloud/fix-7546
Fix default parameter of OC_DB::executeAudited()
2017-12-18 15:24:11 +01:00
Robin Appelman bdf4111013
Merge pull request #7555 from nextcloud/smb-copy-rename-log
additional debug logging on smb copy/rename failures
2017-12-18 15:02:18 +01:00
Morris Jobke 3da92a9a78
Merge pull request #7490 from nextcloud/fix_7428
Respect sharing options when searching using MailPlugin #7428
2017-12-18 14:08:52 +01:00
Robin Appelman 4f0d03e172
additional debug logging on smb copy/rename failures
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-18 13:59:58 +01:00
Morris Jobke d19dcfd0eb
Fix default parameter of OC_DB::executeAudited()
* fixes #7546

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 13:58:54 +01:00
Morris Jobke 97f80f5581
Merge pull request #7505 from nextcloud/do-not-update-if-app-comes-from-git
Do not update apps if it comes from git
2017-12-18 13:43:58 +01:00
Abijeet ec28c54dbc Adds search by email function on the users screen.
Fixes #7175.

- Updated the query to fetch the users in users > everyone tab.
- Updated the query to fetch the users in users > admin tab.
- Tested to ensure that the disabled users are also being fetched.
- Added test cases.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2017-12-16 17:18:05 +05:30
Tobia De Koninck 9d60f7fc64 Don't show users which e-mail address match if they belong to a group we may share with
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-15 19:09:46 +01:00
Roeland Jago Douma ca70694502
Also check for empty content lenth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 21:48:59 +01:00
John Molakvoæ (skjnldsv) f2d5927ea3
Reduce length of md5 in scss caching
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 11:11:54 +01:00
John Molakvoæ (skjnldsv) 2dbd5052ff
Up check
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 10:00:34 +01:00
Morris Jobke 54c227b6c4
Use cached app list
Followup to #7264

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-14 09:56:53 +01:00
John Molakvoæ (skjnldsv) cca8744350
Do not update apps if it comes from git
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 09:50:31 +01:00
Roeland Jago Douma ce12763ab7
Merge pull request #7485 from nextcloud/fix_7001
Also cache invalid DiscoveryService response
2017-12-14 07:47:13 +01:00
Roeland Jago Douma 3b343e287f
Also cache invalid DiscoveryService response
* Cache it for a day so we will retry eventually
* Cache the status.php response as well so we will try it once a day as
well

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-13 15:50:53 +01:00
Arthur Schiwon 099a340bf5
The user displayNameResolver is specific to users, not the comments app
Other apps like spreed rely on it, and only can resolver per type can
be registered anyhow.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-12 17:36:31 +01:00
Roeland Jago Douma 53400a1972
Properly detect if fopen fails for txt previews
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 20:37:18 +01:00
Tobia De Koninck cecfc28ebd
Register ContactsStore using alias + run autoloaderchecker.sh
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-11 18:19:24 +01:00
Tobia De Koninck f6ef779f97
Make ContactsStore a public API
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-11 18:18:58 +01:00
Morris Jobke 45971879f5
Merge pull request #6668 from nextcloud/fix_6621
Remove avatar on user deletion
2017-12-11 18:16:14 +01:00
Robin Appelman 05d2f61a59
handle not found mounts when cleaning avatars
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-11 16:56:10 +01:00
Roeland Jago Douma 10aa287463
Remove avatar on user deletion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 16:07:06 +01:00
Roeland Jago Douma 949fc50cc5
Dispatch event on User predelete
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 16:05:38 +01:00
Morris Jobke 07e6387b31
Merge pull request #7449 from nextcloud/fix-setup
Fix 500 on setup page
2017-12-11 16:00:11 +01:00
Roeland Jago Douma e8acf448eb
Merge pull request #6651 from nextcloud/remote-cloud-client
Add api clients for talking to remote clouds
2017-12-11 15:28:39 +01:00
Roeland Jago Douma e47137c7d4
Merge pull request #6682 from nextcloud/dav-mimetype-fallback
Fallback to filename based detection if the remote dav server doesn't…
2017-12-11 15:28:05 +01:00
Morris Jobke 7c39711798
Merge pull request #7427 from nextcloud/fix-white-color-in-emails
Fix email buttons for white theme
2017-12-11 15:16:28 +01:00
Morris Jobke ce69d9ec71
Fix 500 on setup page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 15:03:55 +01:00
Morris Jobke cce4c285db
Fix email buttons for white theme
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:33:54 +01:00
Morris Jobke 52e7d05163
Fix syntax error
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv) 1ac31260ac
Fixed phpdoc and function type
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv) f018bfc7de
Fixed md5 generation and added fallback for scss requests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv) 820e7b5aba
Use apps versions to generate suffix when possible
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
Morris Jobke ed7beb929e
Merge pull request #6876 from nextcloud/always_img_avatar
Always generate avatar
2017-12-08 23:58:17 +01:00
blizzz 83509b0fd3
Merge pull request #7334 from nextcloud/feature/noid/language-depending-skeleton-directory
Allow `{lang}` as a placeholder in the skeleton directory
2017-12-08 18:19:01 +01:00
Robin Appelman 5ce69e7c42
Add some more tests for ocs remote api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
Robin Appelman f1eb55fad7
refuse to use http if we know a remote has https
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
Robin Appelman 78a24e3b81
validate user response
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
Robin Appelman 8b01176f60
add more typehints
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
Robin Appelman 5133a31d3c
Add public api for remote api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
Robin Appelman 74b5ce8fd4
Some tests for the remote cloud api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:34:33 +01:00
Robin Appelman ac2c26ffcb
Add api clients for talking to remote clouds
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:34:33 +01:00
Morris Jobke 66f523e13f
Better center the letter and use semibold font type
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-08 16:24:31 +01:00
Morris Jobke 8ffd4428bb
Fallback to "default" and check if directory exists
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-08 12:28:41 +01:00
Morris Jobke c32cb6b4b7
Merge pull request #7385 from nextcloud/shared-delay-root
delay calculating the shared cache root until it's used
2017-12-06 15:14:48 +01:00
Roeland Jago Douma 6e45034745
Merge pull request #7351 from nextcloud/change-default-german-language
use formal version of German by default
2017-12-06 08:30:14 +01:00
Robin Appelman 046eb0c635
add retry wrapper when reading files from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 16:34:53 +01:00
Robin Appelman c87d689253
delay calculating the shared cache root until it's used
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:16:39 +01:00
Morris Jobke 72bb7c3074
Fix PHP doc for API docs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-03 12:02:29 +01:00
Bjoern Schiessle 2c3d97cc8f
check if $defaultLanguage is a valid string before we move on
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-01 16:14:51 +01:00
Bjoern Schiessle 8b734347b1
use formal version of German if default_language is set to 'de_DE'
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-30 17:29:08 +01:00
Arthur Schiwon 1b7dfd73af
Allow to skip data dir permission checks by config
Enables installation on services that don't allow/support permission
changes.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-30 11:16:00 +01:00
Roeland Jago Douma d5496dc435
Since we update the avatar in the sync service remove the generated file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 14:23:15 +01:00
Roeland Jago Douma 03d9e7e963
Sinc we use AppData the regex is not needed anymore
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 14:23:15 +01:00
Roeland Jago Douma ba648eecdf
Move avatar code to Avatar Class
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 14:23:15 +01:00
Joas Schilling 8e684f76e5
Allow `{lang}` as a placeholder in the skeleton directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-29 10:04:53 +01:00
Joas Schilling 80b34f5f7d
Only in case of $currentAccess the array uses the id as index
Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.

Regression from 3820d6883d

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:17:51 +01:00
Morris Jobke 3e1860e3d6
Merge pull request #7305 from nextcloud/log-level-for-log-extending
Pass log level to log reporters
2017-11-27 17:49:46 +01:00
Morris Jobke 132764bff5
Pass log level to log reporters
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:46:47 +01:00
Morris Jobke 4a63727ed9
Merge pull request #7210 from nextcloud/pg10
add postgresql 10 compatibility to dbal
2017-11-27 16:40:58 +01:00
Lukas Reschke fb1a92b07d
Merge pull request #7295 from nextcloud/remove-unused-method
Remove unused mimetype detection method in OC_Image
2017-11-27 11:55:20 +01:00
Lukas Reschke 8ccb486876
Merge pull request #7264 from nextcloud/cache-fetched-apps
Cache fetched apps in update check
2017-11-27 11:48:59 +01:00
Morris Jobke 4b73ddc9ce
Merge pull request #6437 from nextcloud/support-mail-send-in-share
Add support for `\OCP\Share\IShare::getMailSend` back
2017-11-27 11:29:38 +01:00
Lukas Reschke 1c25919cf1
Proper handle null cases and default to true
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 09:38:39 +01:00
Lukas Reschke 56a2512581
Add support for `\OCP\Share\IShare::getMailSend` back
This adds back the support for `\OCP\Share\IShare::getMailSend`, one example is creating bulk shares via API which where previously blocking due to the share notification emails.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 09:38:39 +01:00
Flávio Gomes da Silva Lisboa 5ca9a7d6bc
Loss of performance on Login after upgrade from NC10 + LDAP to NC 12 + LDAP #6732
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 09:22:44 +01:00
Morris Jobke dbb034f903
Remove unused mimetype detection method in OC_Image
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 07:46:32 +01:00
Morris Jobke df61d43529
Make isUpdateAvailable non-static
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-25 12:01:02 +01:00
Morris Jobke 0e2f00ec59
Get the Installer via DI
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-25 12:00:57 +01:00
Morris Jobke a97a290fd5
Cache fetched apps in update check
The code tried to find the apps with updates and thus was called for every available app. This caused to get the full appstore content as often as apps are available. The appstore request itself was cached nevertheless in an appdata dir, but with an object storage this is still a lot of round trips to read this cached result. Thus the instantiated list is now cached in a static variable (because it's a static method call).

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-25 12:00:56 +01:00
Lukas Reschke ee4262f567
Merge pull request #7263 from nextcloud/clean-bruteforce-attempt-on-success
Reset bruteforce attempt table on successful login
2017-11-24 15:53:08 +01:00
Morris Jobke 5a270c2715
Reset bruteforce attempt table on successful login
* only clear the entries that come from the same subnet, same action and same metadata

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-24 14:58:57 +01:00
Morris Jobke 05abb9ea66
Remove unused checkCode method
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-24 10:50:50 +01:00
Morris Jobke be4e921306
Use basename() instead of self implementation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 12:35:47 +01:00
blizzz 98cdd9885f
Merge pull request #7168 from nextcloud/fix-user-list
Fix accesslist when a user has an ID only containting 0-9
2017-11-23 12:17:11 +01:00
Morris Jobke 106d932e8f
Merge pull request #7137 from nextcloud/shared-jailed-source-root
Use the correct root for shared jail when the source storage is also a jail
2017-11-23 12:03:36 +01:00
Robin Appelman da3004b8f5
add postgresql10 compatibility to dbal
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-22 17:57:17 +01:00
Morris Jobke 6fd51426bf
Remove wrong entry in admin_settings that causes 500
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-20 20:49:03 +01:00
Roeland Jago Douma 2eb2b6e437
If there is no internet connection don't try to contact appstore
Fixes #7119

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-17 20:35:04 +01:00
Bjoern Schiessle 1ade6b0817
only create the file cache entry after the empty file was created successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-17 12:45:46 +01:00
Morris Jobke f32fbbca2e
Merge pull request #6840 from nextcloud/feature/5282/calendar_api
Calendar API for apps
2017-11-16 21:10:35 +01:00
Morris Jobke 82502b10db
Merge pull request #7169 from nextcloud/fix-user-search
Fix search in user managent when no group is selected
2017-11-14 23:30:02 +01:00
Morris Jobke 80e527d21e
Merge pull request #7172 from nextcloud/improve-error-handling-on-preview-cleanup
check if the user still exists before we try to cleanup the previews
2017-11-14 23:29:28 +01:00
Björn Schießle c225bbd021
Merge pull request #7113 from nextcloud/s3-download-stream-fix
Fix s3 download and touch
2017-11-14 20:38:50 +01:00
Bjoern Schiessle a923e755e6
check if the user still exists before we try to cleanup the previews
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-14 20:26:18 +01:00
Morris Jobke eb0f3ebf75
Fix search in user managent when no group is selected
* also allows to search by displayname

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-14 17:32:03 +01:00
Joas Schilling 3820d6883d
Fix accesslist when a user has an ID only containting 0-9
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-14 17:21:16 +01:00
Morris Jobke 16549ae5fb
Merge pull request #7166 from nextcloud/enhancement/crash-report-context
Pass the exception context to the crash reporter
2017-11-14 15:07:33 +01:00
Morris Jobke f6ef3b6464
add proper type hinting
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-14 14:49:24 +01:00
Christoph Wurst ad757805ca Pass the exception context to the crash reporter
This should allow better reports as often the app id is passed
as context. While this is not used right now, I'd like to have this
for NC13 as adding it later will break the interface for existing apps

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-11-14 14:28:04 +01:00
Morris Jobke ab0a3fbbbc
Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpath
{J,CS}SResourceLocator: account for symlinks in app path
2017-11-14 13:58:02 +01:00
Christoph Wurst 4c5593998a Add a mechanism to register crach reporters
This adds a crash reporter registry, which is meant for third party apps
to hook into the error logging/reporting chain. This way, external tools
like Sentry can be used to track and aggregate system crashes.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-11-14 12:20:05 +01:00
Kyle Fazzari d2a2793073
JSResourceLocator: re-use $app_path
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-12 08:08:38 -08:00
Robin Appelman 56fd462718
Use the correct root for shared jail when the source storage is also a jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-10 17:03:27 +01:00
Georg Ehrke 556b2a2b6f
implement CalendarManager
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:50 +01:00
Morris Jobke 5d8421135e
Merge pull request #7014 from nextcloud/rename-locks
Unlock files even if an exception occurs while renaming
2017-11-09 09:47:36 +01:00
Morris Jobke eab2b3b7ae
Merge pull request #7027 from nextcloud/Rello-patch-1
Rello patch 1
2017-11-09 09:41:01 +01:00
Lukas Reschke 989a8a3668
Merge pull request #6220 from nextcloud/cached-mount-info-filepath
Allow getting the filepath when getting cached mounts by fileid
2017-11-09 00:04:25 +01:00
Morris Jobke e0784c66ed
Merge pull request #7109 from nextcloud/fix_6898
If for some reason the json can't be decoded it is not cached
2017-11-08 23:33:02 +01:00
Lukas Reschke 8c915baa34
Merge pull request #6788 from staabm/master
Prevent XSS in links which open a new browser window
2017-11-08 18:55:35 +01:00
Robin Appelman c566b2854b
Use non empty files for object store touch
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-08 17:51:02 +01:00
Robin Appelman 70a4860ccb
Fix contructing headers for s3 download
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-08 17:50:46 +01:00
Roeland Jago Douma 448fa4f59e
If for some reason the json can't be decoded it is not cached
Should fix #6898

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-08 12:37:35 +01:00
Morris Jobke 732c951ae1
Revert "Only allow colons in db host for IPv6 addresses"
This reverts commit 1287d6ddb3.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-08 10:47:35 +01:00
Kyle Fazzari 06ba1a8a02
JSResourceLocator: account for symlinks in app path
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-07 14:54:21 -08:00
Morris Jobke 19069f2b9c
Merge pull request #6988 from starypatyk/stable12-mount-cache-performance
Improve performance of UserMountCache with external storage folders
2017-11-07 17:32:06 +01:00
Roeland Jago Douma f55732a18f
Merge pull request #7075 from nextcloud/remove-unused-variables
Remove unused variables
2017-11-07 16:18:40 +01:00
Morris Jobke 4866314ce0
Run updated license header updater
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-07 13:47:42 +01:00
Morris Jobke f9e70c2ab6
Merge pull request #7020 from Fiech/master
Extended list of sensitive configuration values (2)
2017-11-07 10:27:53 +01:00
Morris Jobke 31c5c2a592
Change @georgehrke's email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 20:38:59 +01:00
Morris Jobke da6c2c9da1
Merge pull request #7083 from nextcloud/update-license-headers
Update license headers
2017-11-06 18:48:04 +01:00
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Morris Jobke 5ed05219d7
Merge pull request #7076 from nextcloud/s3-valid-bucket-name
Better error message for invalid bucket names
2017-11-06 16:16:28 +01:00
Morris Jobke 5411d60b24
Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure
Implement plugins infrastructure in User_LDAP
2017-11-06 16:07:31 +01:00
Morris Jobke 6c29ce4e02
Merge pull request #6402 from nextcloud/dav-email-customization
Enhance calendar invitation emails
2017-11-06 15:14:49 +01:00
Morris Jobke 8b763ea0f7
Better error message for invalid bucket names
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:48:41 +01:00
Morris Jobke 5445b1ff17
Remove unused variables
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:43:45 +01:00
Kyle Fazzari b0d296639c
CSSResourceLocator: account for symlinks in app path
Currently, if the app path includes a symlink, the calculated webDir
will be incorrect when generating CSS and URLs will be pointing to the
wrong place, breaking CSS.

Use realpath when retrieving app path, and these issues go away.

Fix #6028

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-03 23:52:09 -07:00
korelstar c7482402b8 Unlock files even if an exception occurs
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
2017-11-03 18:29:04 +01:00
Vinicius Cubas Brand 10ca793452 Plugins infrastructure in User_LDAP
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-11-03 11:41:40 -02:00
Georg Ehrke e111da777a
Make L10N->l provide weekdayName
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:20:04 +01:00
Roeland Jago Douma 687c92bfd3
Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorage
Fix seeking on object storage
2017-11-02 14:56:51 +01:00
Dariusz Olszewski 07016a1e5b Improve performance of UserMountCache with external storage folders 2017-11-01 21:11:39 +01:00
Arthur Schiwon e2805f02aa
Merge branch 'master' into autocomplete-gui 2017-11-01 15:37:29 +01:00
Joas Schilling 3e0789aa94
Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-object-storage
Improve mimetype detection for object storages
2017-11-01 11:04:15 +01:00
Joas Schilling defc4bf6a8
Merge pull request #6975 from nextcloud/s3-read-object-fopen
use fopen directly when reading objects from s3
2017-11-01 10:57:56 +01:00
Joas Schilling 6ddda3d7d4
Merge pull request #6952 from nextcloud/correctly-search-for-results
Correctly search for existing collaboration results
2017-10-31 14:49:01 +01:00
Joas Schilling ba6e5bcc05
Add the return which is being used
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-31 14:06:21 +01:00
Rello c5f76785ba
Mapping of m3u, m3u8, pls to audio streams
Signed-Off-By: Rello <Rello@users.noreply.github.com>
2017-10-31 14:05:24 +01:00
Joas Schilling a0dab90fd5
Merge pull request #7021 from nextcloud/fix-oracle-indexes
Fix oracle indexes
2017-10-31 13:55:14 +01:00
Arthur Schiwon bcfac75b06
simplify registration of manager in server container
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 13:55:03 +01:00
Johannes S 936486413d
Merge branch 'master' into master 2017-10-31 01:34:46 +01:00
Johannes Schlichenmaier 84cc13f57b Extended list of sensitive configuration values
In accordance with the issuetemplate app issue:
https://github.com/nextcloud/issuetemplate/issues/27

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2017-10-31 01:30:50 +01:00
Roeland Jago Douma 5672f14fd1
Merge pull request #7004 from Fiech/master
Extended list of sensitive configuration values
2017-10-30 20:01:42 +01:00
Victor Dubiniuk 9f16468789
Die NoCheckMigrator 2017-10-30 18:59:24 +01:00
Piotr Mrowczynski 6a51c1bc4f
Add foreign key support to OC 2017-10-30 18:57:19 +01:00
Jörn Friedrich Dreyer d081a1a5ad
quote index columns on oracle, handle all index changes, minor phpdoc cleanup 2017-10-30 18:54:31 +01:00
Georg Ehrke c8323f822d
Merge pull request #6867 from nextcloud/imessage-attachments
Add attachment support to emails
2017-10-30 18:33:50 +01:00
Arthur Schiwon d5f1cef642
fix comment sorter
background: we have a flat hierarchy of comments, not a tree. therefore we
can also remove again the unnecessary additions.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-30 15:59:43 +01:00
Johannes Schlichenmaier bde78decc2 Extended list of sensitive configuration values
In accordance with the issuetemplate app issue:
https://github.com/nextcloud/issuetemplate/issues/27

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2017-10-29 23:46:59 +01:00
Joas Schilling 94f3fc63bc
Use ::class and fix missing doc
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-28 11:49:36 +02:00
Robin Appelman 3f0cb13042
Allow getting the filepath when getting cached mounts by fileid
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-27 14:35:34 +02:00
Robin Appelman f9a7294807
use fopen directly when reading objects from s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-27 12:58:19 +02:00
Morris Jobke de912385e0
Fix seeking on object storage
Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-27 12:16:28 +02:00
Joas Schilling 7a4c0c668b Merge pull request #6977 from Fiech/master
Added additional methods for removal of sensitive info
2017-10-27 11:46:31 +02:00
Johannes Schlichenmaier 4ae7275aeb Added additional methods for removal of sensitive info
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2017-10-27 10:36:58 +02:00
Morris Jobke 405bbc1c61
Improve mimetype detection for object storages
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 16:31:59 +02:00
Arthur Schiwon 7f58c41015
fix sorting
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-26 16:23:41 +02:00
Roeland Jago Douma 88cba6d882
Use local cache for the CachingRouter
There is no need to cache routes distributed. It even has the downside
that the router might return different routes then the ones in the local
routes.php files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-25 19:23:46 +02:00
Joas Schilling 43b92b8e06
Add unit tests for SearchResult
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 11:21:05 +02:00
Joas Schilling 42c84b6309
Correctly search for existing collaboration results
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 10:38:26 +02:00
Joas Schilling 6a035bd0a0
Move attachment creators to mailer class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 09:26:57 +02:00
Roeland Jago Douma a82b56b1c7 Merge pull request #6918 from nextcloud/rotate_job_by_default
Add logrote as a default background job
2017-10-24 20:38:40 +02:00
Roeland Jago Douma b88db3a389 Merge pull request #6921 from nextcloud/appmanager-securitymiddleware
Use proper DI for security middleware for app enabled check
2017-10-24 19:58:24 +02:00
Morris Jobke f368481c23 Merge pull request #6928 from nextcloud/remove-unneeded-method
Remove unused method of OC_App
2017-10-24 17:50:43 +02:00
Morris Jobke ce0c45a4ea
Use proper DI for security middleware for app enabled check
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 15:36:28 +02:00
Morris Jobke 7b7bf73670
Deprecate OC_App:isEnabled
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 14:05:46 +02:00
Morris Jobke df85b13296
Remove unused method of OC_App
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 14:04:09 +02:00
Morris Jobke 3eaf23f29f Merge pull request #6920 from nextcloud/appmanager-usage
Use appmanager instead of OC_App for check for enabled app
2017-10-24 13:53:17 +02:00
Roeland Jago Douma e2139d4b56
Add logrote as a default background job
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 08:28:06 +02:00
Morris Jobke f884e762bc
Use appmanager instead of OC_App for check for enabled app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 23:31:17 +02:00
Julius Härtl b3c025fd08
Revert copyright changes
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-23 23:23:56 +02:00
Julius Härtl 4cfa1c66b8
Doc: Fix phpDoc issues
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-23 23:23:56 +02:00
Arthur Schiwon 8f0a9ae51f
split walking the tree from operating on it
so walking it is reusable

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon fd6daf8d19
AutoCompletion backend
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:32 +02:00
Markus Staab db34b59238 Prevent XSS in links which open a new browser window 2017-10-19 12:16:04 +02:00
Joas Schilling 65e938c4fd
Fix docs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-19 11:18:21 +02:00
Joas Schilling dcb322a6b3
Extend the API with teh parameters from Swift
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-19 11:05:47 +02:00
Lukas Reschke f6f7b50cf0 Merge pull request #6853 from nextcloud/apps_autoloader
Allow apps to have their own autoloader
2017-10-19 11:05:23 +02:00
Joas Schilling ce27e8cf34
Add attachment support to emails
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:44:19 +02:00
Joas Schilling 3119fd41ce
Set the data from the template
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling c9af36a9ab
Introduce a public interface for Message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling 8b37fe7f65
Set the subject with the email template to allow theming
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling f109c1a10c
Allow templating of email subjects
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:00 +02:00
Roeland Jago Douma 3a9c24c04f
Allow apps to have their own autoloader
This will allow apps to also have a proper classmap and authorative
autoloader.

Currently if a file: <appdir>/composer/autoload.php exists we will use
it. Else we keep the current behavior.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-17 21:35:49 +02:00
Robin Appelman 91b3536f45
propagate multipart upload exception when aborting upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-17 15:10:58 +02:00
blizzz c25be8d83c Merge pull request #6837 from nextcloud/timespan-check-3
Fix future time spans
2017-10-16 13:35:53 +02:00
Roeland Jago Douma a5912cbe33 Merge pull request #6812 from nextcloud/upload-cache-path
also use configured 'cache_path' for new chunking
2017-10-15 21:42:41 +02:00
dartcafe ac2a6e0f2f
Fix future time spans
Signed-off-by: dartcafe <github@dartcafe.de>
2017-10-15 08:31:11 +02:00
Robin Appelman 1a99e0dab4 Merge pull request #6602 from nextcloud/s3-multipart-upload
Add multipart upload for s3
2017-10-11 16:10:58 +02:00
Robin Appelman e393b3553e
set s3 part size to 500mb
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 15:59:53 +02:00
Robin Appelman d27b0b07bc
also use configured 'cache_path' for new chunking
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 14:18:45 +02:00
Julius Härtl ec0091d499
Do not return app names multiple times
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-10 12:34:38 +02:00
Joas Schilling 6292f665d7
Allow multiple settings and sections per app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-05 11:34:03 +02:00
blizzz 2d62f97f1b Merge pull request #6328 from nextcloud/split-sharees-api-logic
Splits off the logic from sharees endpoint thus making it available from within Nc/via PHP.
2017-10-04 15:43:44 +02:00
Robin Appelman 7525c387ce
dont run invalid path repair step when upgrading from 11.0.5.2 and later
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 16:27:26 +02:00
Morris Jobke 870d71689a Merge pull request #6563 from nextcloud/bigint-ids
Migrate ID columns to bigint
2017-09-29 12:23:41 +02:00
Joas Schilling a3bdb318e9
Fix bigint handling on postgres
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:57 +02:00
Morris Jobke e9aa11a1b0
Use full percentages in quota bar percentages
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-28 17:58:49 +02:00
Robin Appelman b36dd8b71f
Fallback to filename based detection if the remote dav server doesn't know the mimetype
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-28 14:22:42 +02:00
Morris Jobke 5f25dd7095 Merge pull request #6599 from nextcloud/fix_2523
Add direct preview link
2017-09-27 23:27:54 +02:00
Arthur Schiwon a579f8aa37
adapt attribute name (changed letter case style)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-27 13:22:59 +02:00
Roeland Jago Douma 90d7e8f6f4 Merge pull request #6586 from nextcloud/fix/app-install-extract-check
Check whether an app archive can be extracted
2017-09-27 10:41:21 +02:00
Morris Jobke b87914be9c Merge pull request #6645 from nextcloud/fix-6642-only-colons-for-ipv6
Only allow colons in db host for IPv6 addresses
2017-09-27 10:17:36 +02:00
Arthur Schiwon 937a80c941
reduce nesting of the required app XML
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-27 01:22:17 +02:00
Arthur Schiwon 3db3e65121
add tests for Lookup Plugin
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:25 +02:00
Arthur Schiwon a28b1d91f9
split off former searchSharee unit test
also moves registering default plugins to Server for proper unit testing

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon 3d1d03a511
split off getEmail tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon c92f7ee767
split off getRemote unit tests
adds two small fixes → they actually work \o/

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon dd9e191d37
split off getUsers unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon f446ec83dd
minor fixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon 9db3b04f1b
finetune the appinfo parser
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon c55583d1b4
allow more than one plugin per share type
however it does not dedupe (appears too complex/expensive while we don't
havve the issue currently)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon f7713e5f3f
make it possible to register plugins and kick out the circle one
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon 4a96e22258
don't keep result types hard coded
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon ea3ac4e656
Splits off the logic from sharees endpoint thus making it available from
within Nc/via PHP.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:17 +02:00
John Molakvoæ fc46e98fc6 Merge pull request #6647 from nextcloud/scss-no-take-only-throw
Do not stop on scss compilation failure
2017-09-26 16:26:43 +02:00
John Molakvoæ (skjnldsv) dec713fc92
Do not stop on scss compilation failure
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-26 15:29:37 +02:00
Joas Schilling fe3b2385ab
Code clean up
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-26 14:27:42 +02:00
Joas Schilling 1287d6ddb3
Only allow colons in db host for IPv6 addresses
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-26 14:20:04 +02:00
Morris Jobke 11c31e94fe
Improve exception handling
If there is an exception in the template handling then a white page is shown.
This improves the handling of this and shows text only about the internal
error.

To test this just setup redis as cache and then disable the php-redis module.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-26 13:54:51 +02:00
Morris Jobke 292a704648 Merge pull request #6544 from nextcloud/fix/duplicate-session-token
Fix duplicate session token after remembered login
2017-09-25 17:39:02 +02:00
Roeland Jago Douma 3bd4e7e541 Merge pull request #6632 from nextcloud/do_not_show_hyphen
Do not show hyphen
2017-09-25 16:34:50 +02:00
Roeland Jago Douma 29fb315ffc
Allow requesting the max preview
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:48 +02:00
Stephan Müller 86265320b8
do not show hyphen after instance name in emails if slogan does not exist
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 09:20:46 +02:00
Roeland Jago Douma c257cd57d4
Handle SameSiteCookie check for index.php in AppFramework Middleware
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-24 21:07:16 +02:00
John Molakvoæ (skjnldsv) 4a5eeb2ce7
Fixed webroot detection
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-22 07:20:31 +02:00
Morris Jobke 38568c362b Merge pull request #6605 from nextcloud/oc_ocs_response_is_dep
OC_OCS_Response is deprecated
2017-09-21 20:38:18 +02:00
Roeland Jago Douma 2207fdcd8c
Remove private legacy OC_OCS_Response
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-21 17:56:56 +02:00
Roeland Jago Douma 87e10f9e6a
OC_OCS_Response is deprecated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-21 17:56:00 +02:00
Robin Appelman 385d6f098c
Add tests for multipart upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-21 14:47:34 +02:00
Robin Appelman 4ae46d8876
only do multipart upload for large files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-21 14:06:59 +02:00
John Molakvoæ (skjnldsv) 0e17b65bcf
Avoid error undefined index classes in log
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:39 +02:00
Christoph Wurst 38bb6e1477
Fix duplicate session token after remembered login
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-09-20 21:39:31 +02:00
Roeland Jago Douma 8358c63f53 Merge pull request #6573 from nextcloud/nonfound-webroot-empty-string
Fix "webroot not found" when installed to the root of the webserver
2017-09-20 20:04:27 +02:00
Robin Appelman e4e5e735db
multipart upload for s3 object storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-20 17:51:58 +02:00
Robin Appelman 5430d73a0e
Fix "webroot not found" when installed to the root of the webserver
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-20 14:19:15 +02:00
Christoph Wurst 2e19c42bc5
Check whether an app archive can be extracted
If extraction fails we should not continue the installation/update
process as the info.xml cannot be loaded and an unrelated error
occurs.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-09-20 14:07:17 +02:00
Roeland Jago Douma 6d7ca1092d
Read appinfo from a local cache
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-19 14:34:11 +02:00
Robin Appelman d526969a68
fix path style
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:28 +02:00
Robin Appelman d70607104e
reuse object read/write/delete logic in s3 implementations
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman dad18baec8
update aws sdk and move it to 3rdparty
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Roeland Jago Douma ca5c3f839a Merge pull request #6490 from nextcloud/share_pagination_query
Improve sharing pagination
2017-09-18 14:34:15 +02:00
Morris Jobke a0132a49a6 Merge pull request #6549 from nextcloud/fix-6534
don't pass User object when uid string is expected
2017-09-18 14:28:14 +02:00
Lukas Reschke 53057f2bd0 Merge pull request #5462 from nextcloud/add-frameancestor-support
Add CSP frame-ancestors support
2017-09-18 14:25:44 +02:00
Arthur Schiwon 0837745477
don't pass User object when uid string is expected
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-18 13:19:47 +02:00
Roeland Jago Douma ae1fdf73c2
Improve sharing pagination
Basically we did in almost all cases did a query to much.
This resulted in an extra query for each share type.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-15 19:44:19 +02:00
Lukas Reschke 705432ca6f
Add filter for `shareapi_allow_share_dialog_user_enumeration`
This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc.

Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-15 15:58:04 +02:00
Thomas Citharel ecf347bd1a Add CSP frame-ancestors support
Didn't set the @since annotation yet.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 15:23:10 +02:00
Tobia De Koninck 5896176d69
Fix issue when disabling the shareapi_only_share_with_group_members option + fix findOne
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:41 +02:00
Tobia De Koninck 7dfa527da2
Improve code style
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:40 +02:00
Tobia De Koninck f0370c0244
Some code improvements
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:40 +02:00
Tobia De Koninck fa402c74d2
Add tests
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:40 +02:00
Tobia De Koninck 473a1ecad1
Fix tests
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:39 +02:00
Tobia De Koninck 92c238e0f0
Privacy enhancements for contacts menu
- Groups, which are excluded from sharing should not see local users at all
 - If sharing is restricted to users own groups, he should only see contacts from his groups:

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:39 +02:00
John Molakvoæ (skjnldsv) 1a0ac912b2
Fix webroot throw
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-14 08:41:10 +02:00
Morris Jobke 883574974d Merge pull request #6458 from nextcloud/rethrow-correct-exception
Rethrow the correct exception when there was an error in an app conta…
2017-09-14 00:32:13 +02:00
Lukas Reschke 8ef4fcb4b7 Merge pull request #6452 from lukanetconsult/hotfix/issue-6415-undefined-variable
Fix undefined variable $tmpRoot
2017-09-13 22:42:42 +02:00
Roeland Jago Douma 9163cf9241
Fix AppPassword 2FA auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-12 22:28:43 +02:00
Axel Helmert 01d4967130 Fix undefined variable $tmpRoot
Refactoring of webroot detection left an unused variable.

Fixes: #6415
Signed-off-by: Axel Helmert <info@luka.de>
2017-09-12 12:14:27 +02:00
Joas Schilling c4b3198ac2
Rethrow the correct exception when there was an error in an app container
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-12 11:54:13 +02:00
Julius Härtl 8391ca8792
Use IAppManager instead of private API
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 09:28:22 +02:00
Julius Härtl b49ab065b7
Move theming related imagePath logic to ThemingDefaults
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 09:22:57 +02:00
William Pain 9a63ded43b
Fix uninitialized variable $this->params
Signed-off-by: William Pain <pain.william@gmail.com>
2017-09-11 10:01:12 +02:00
Morris Jobke 8a79d0cc70 Merge pull request #6414 from nextcloud/share-notification-wrong-language
Use the language of the recipient for the share notification
2017-09-08 19:15:05 +02:00
Joas Schilling 29e1aa57e1
Ask the schema whether the table and column exist
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 11:45:16 +02:00
Joas Schilling 7e625a8d22
Use the language of the recipient for the share notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 10:48:16 +02:00
Lukas Reschke bab313da5d Merge pull request #6360 from nextcloud/fix/session-timeout-refresh-csrf-token
Fix failing csp/nonce check due to timed out session
2017-09-07 19:51:59 +02:00
Lukas Reschke 11c7a98a2a Merge pull request #6380 from nextcloud/cleanup-oci-setup
cleanup oci setup code
2017-09-07 14:11:55 +02:00
Morris Jobke 485e22acde Merge pull request #6329 from nextcloud/ldap-password
Don't log LDAP password when server is not available
2017-09-07 09:25:56 +02:00
tux-rampage 7a33b9273e Refactor webroot detection in resource locator
The current implementation breaks installations with symlinks to
directories inside the webroot (i.E. apps).

With this change both variants, directory and symlinks, will be detected
correctly.

Fixes: #6028
Signed-off-by: Axel Helmert <axel.helmert@luka.de>
2017-09-06 21:32:48 +02:00
Morris Jobke a10c4517cb Merge pull request #5571 from Luzifer/5570_backend_admin
Allow group backend to declare users as admins
2017-09-06 19:50:52 +02:00
Morris Jobke 5d4540f179 Merge pull request #6364 from nextcloud/fix_login_loop
Fix login with basic auth
2017-09-06 17:04:00 +02:00
Joas Schilling b68609d0cf
Don't log LDAP password when server is not available
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-06 16:38:55 +02:00
Robin Appelman 2c0efae30f
cleanup oci setup code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-06 15:55:05 +02:00
Morris Jobke 15cd21d252 Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name
Set the meta data before everything
2017-09-05 16:08:57 +02:00
Roeland Jago Douma b96485b6bd
Fix login with basic auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-05 12:24:41 +02:00
Christoph Wurst 87aeae21e3
Fix failing csp/nonce check due to timed out session
The CSP nonce is based on the CSRF token. This token does not change,
unless you log in (or out). In case of the session data being lost,
e.g. because php gets rid of old sessions, a new CSRF token is gen-
erated. While this is fine in theory, it actually caused some annoying
problems where the browser restored a tab and Nextcloud js was blocked
due to an outdated nonce.
The main problem here is that, while processing the request, we write
out security headers relatively early. At that point the CSRF token
is known/generated and transformed into a CSP nonce. During this request,
however, we also log the user in because the session information was
lost. At that point we also refresh the CSRF token, which eventually
causes the browser to block any scripts as the nonce in the header
does not match the one which is used to include scripts.
This patch adds a flag to indicate whether the CSRF token should be
refreshed or not. It is assumed that refreshing is only necessary
if we want to re-generate the session id too. To my knowledge, this
case only happens on fresh logins, not when we recover from a deleted
session file.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-09-04 17:29:26 +02:00
Joas Schilling 6dbb64c4a2
Merge setMetaData into constructor
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-04 15:07:41 +02:00
Morris Jobke 4fd3240b5f Merge pull request #6254 from nextcloud/async-bus-split
Allow configuring different command bus backends
2017-09-04 14:22:06 +02:00
Morris Jobke 1ebf91ec16
Add proper EOL
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 14:21:44 +02:00
Morris Jobke c04a494ea7 Merge pull request #6064 from nextcloud/fix-5219-absolute-path-must-be-relative-to-files-on-theming-update
Still throw a locked exception when the path is not relative to $user/files/
2017-09-04 14:05:34 +02:00
Roeland Jago Douma c4f175d079 Merge pull request #6326 from nextcloud/fix_4654_3375
Pass new value to triggerChange
2017-09-04 12:03:19 +02:00
Morris Jobke 139f9bd3ca Merge pull request #6331 from nextcloud/update-repair-step
Generate system wide key pair (update repair step after backport)
2017-09-04 11:59:34 +02:00
Morris Jobke e33aa460f1 Merge pull request #6297 from te-online/add-mimetype-internet-shortcut
Add mimetype application/internet-shortcut for .url files
2017-09-04 11:55:05 +02:00
Julius Härtl b09ce70117
Rebuild SCSS files if frontend controller value changes
fixes #6271
2017-09-03 17:32:41 +02:00