summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* MySQL 8.0+ and MariaDB 10.3+ are large prefix and barracuda by defaultJoas Schilling2018-08-231-4/+23
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #10762 from ↵blizzz2018-08-201-1/+1
|\ | | | | | | | | nextcloud/backport/10260/improved-sql-for-fetching-quota [stable13] Use the path_hash instead of the path to query the filecache
| * Use the path_hash instead of the path to query the filecacheMorris Jobke2018-08-201-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Make sure error_log() always receives a stringJoas Schilling2018-08-201-0/+3
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Update the scope of the lockdownmanagerRoeland Jago Douma2018-08-141-0/+3
| | | | | | We have the token anyway. So better the scope as well. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #10620 from nextcloud/mimetype-insert-if-not-exists-13blizzz2018-08-131-14/+7
|\ | | | | [13] use insertIfNotExists to store new mimetypes.
| * use insertIfNotExists to store new mimetypes.Robin Appelman2018-08-091-14/+7
| | | | | | | | | | | | Also throw an error if we can't find the mimetype after insert Signed-off-by: Robin Appelman <robin@icewind.nl>
* | make file cache updates more robustBjoern Schiessle2018-08-081-2/+17
|/ | | | | | only update the encrypted version after the write operation is finished and the stream is closed Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Do scan the root storage in background scanRobin Appelman2018-07-241-5/+0
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Sanitize parameters in createSessionToken() while loggingMorris Jobke2018-07-111-0/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #10170 from nextcloud/backport/9823/stable13Morris Jobke2018-07-114-4/+38
|\ | | | | [stable13] Allow updating the token on session regeneration
| * Allow updating the token on session regenerationRoeland Jago Douma2018-07-094-4/+38
| | | | | | | | | | | | | | Sometimes when we force a session regeneration we want to update the current token for this session. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10169 from nextcloud/backport/9955/stable13John Molakvoæ2018-07-111-1/+1
|\ \ | | | | | | [stable13] Request a valid property for DAV opendir
| * | Request a valid property for DAV opendirRoeland Jago Douma2018-07-091-1/+1
| |/ | | | | | | | | | | | | | | Apperently Sabre and Onedrive are not friends when requesting a single 404 property. I need to dig deeper on why this is. Anyways requesting a valid property makes it work like a charm. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10180 from nextcloud/lock-negative-13Morris Jobke2018-07-111-2/+8
|\ \ | |/ |/| [13] prevent lock values from going negative with memcache backend
| * prevent lock values from going negative with memcache backendRobin Appelman2018-07-101-2/+8
| | | | | | | | | | | | | | | | This can be caused by the code releasing more locks then it acquires, once the lock value becomes negative it's likely that it will never be able to change into an exclusive lock again. Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #10121 from nextcloud/stable13-allow-disable-encryptionMorris Jobke2018-07-091-2/+6
|\ \ | |/ |/| [stable13] allow to disable encryption
| * allow to disable encryptionBjoern Schiessle2018-07-051-2/+6
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Make the token expiration also work for autocasting 0Roeland Jago Douma2018-06-081-1/+1
| | | | | | | | | | | | | | Some bad databases don't respect the default null apprently. Now even if they cast it to 0 it should work just fine. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Fix syntax for php5.6Christoph Wurst2018-06-041-1/+1
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Fix local users check in contacts menuChristoph Wurst2018-06-041-1/+2
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Make sure the log doesn't try to read from PUT if it can'tRoeland Jago Douma2018-05-301-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a PUT request comes in that is not JSON or from encoded. Then we can only read it (exactly) once. If that is the case we must assume no shared secret is set. If we don't then we either are the first to read it, thus causing the real read of the data to fail. Or we are later and then it throws an exception (also failing the request). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Make sure the file is readable before attempting to create a previewRoeland Jago Douma2018-05-291-0/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9651 from nextcloud/backport/9271/stable13Morris Jobke2018-05-292-4/+2
|\ \ | | | | | | [stable13] Fix undefined variables
| * | Remove a check for an unused variableMorris Jobke2018-05-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Left over from a refactoring https://github.com/nextcloud/server/pull/1940 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Fix undefined variable - found by PhanMorris Jobke2018-05-291-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Make LargeFileHelper.php faster by avoiding execs as much as possiblemarco442018-05-291-6/+14
|/ / | | | | | | Signed-off-by: Marc Cousin <cousinmarc@gmail.com>
* | Delete the previews when a version is restoredRoeland Jago Douma2018-05-262-0/+12
| | | | | | | | | | | | | | | | | | Fixes #9469 When a version of a file is restored the previews are no longer valid. Thus we should remove them so they are regenerated. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Always set the request language to the force languageRoeland Jago Douma2018-05-241-6/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | make sure force language is reflected in html lang attributeGeorg Ehrke2018-05-241-0/+6
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | cleanup locks in scanner on errorRobin Appelman2018-05-231-9/+12
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #9540 from nextcloud/backport/9517/stable13Morris Jobke2018-05-236-7/+139
|\ \ | | | | | | [stable13] Improve OAuth
| * | Certain tokens can expireRoeland Jago Douma2018-05-226-5/+85
| | | | | | | | | | | | | | | | | | | | | | | | However due to the nature of what we store in the token (encrypted passwords etc). We can't just delete the tokens because that would make the oauth refresh useless. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Allow the rotation of tokensRoeland Jago Douma2018-05-224-2/+54
| | | | | | | | | | | | | | | | | | This for example will allow rotating the apptoken for oauth Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Dont use $info as array when its not an arrayJoas Schilling2018-05-181-1/+1
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #9432 from nextcloud/backport/9225/ipv6-database-hostMorris Jobke2018-05-141-10/+24
|\ \ | | | | | | [stable13] Allow IPv6 database host
| * | php 5.6 compatibilityJoas Schilling2018-05-091-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Move regex to a function and add testsJoas Schilling2018-05-091-11/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow IPv6 database hostsJoas Schilling2018-05-091-6/+7
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Get correct version of an appRoeland Jago Douma2018-05-091-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | Related to #8929 We should get the version of the app. Not of the appfolder. Else there is no way to properly compare the versions. Now note that installing in 1 go will still fail. But at least on the next page load the new version will be properly detected. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13Morris Jobke2018-05-072-7/+16
|\ \ | | | | | | [13] Log lock state on conflict
| * | always log locking errorsRobin Appelman2018-05-041-3/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Log more info about locking conflicts for memcache locking backendsRobin Appelman2018-05-041-4/+15
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* / remove unneeded locks in getCacheEntryRobin Appelman2018-05-041-3/+1
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Issue #9318: catch exceptions in SCSSCacher::resetCache()Roland Tapken2018-05-031-1/+5
| | | | Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
* Merge pull request #9231 from nextcloud/13-9205Morris Jobke2018-04-182-8/+15
|\ | | | | [stable13] Provide an option to disable HTML emails
| * Provide an option to disable HTML emailsMorris Jobke2018-04-182-8/+15
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9233 from nextcloud/13-9159Roeland Jago Douma2018-04-181-0/+5
|\ \ | | | | | | [stable13] fix appinfo parsing when a single localized option is provided
| * | fix appinfo parsing when a single localized option is providedRobin Appelman2018-04-181-0/+5
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* / Show EOL warning in the update sectionJoas Schilling2018-04-181-0/+1
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>