]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoMerge pull request #12415 from owncloud/port-12262
Morris Jobke [Tue, 25 Nov 2014 14:45:27 +0000 (15:45 +0100)]
Merge pull request #12415 from owncloud/port-12262

Backport #12262

10 years agoTry to read the file only instead of trying to touch
Lukas Reschke [Wed, 12 Nov 2014 14:56:02 +0000 (15:56 +0100)]
Try to read the file only instead of trying to touch

The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.

Fixes https://github.com/owncloud/core/issues/12135

Conflicts:
lib/private/config.php

10 years agouse login name to verify password
Bjoern Schiessle [Mon, 24 Nov 2014 14:44:43 +0000 (15:44 +0100)]
use login name to verify password

10 years agoThe "dir" key is used within the public sharing template to indicate in which directo...
Lukas Reschke [Tue, 25 Nov 2014 12:52:44 +0000 (13:52 +0100)]
The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.

However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)

This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.

Port of https://github.com/owncloud/core/pull/12262, approved with https://github.com/owncloud/core/pull/12262#issuecomment-64394040

10 years agoMerge pull request #12373 from owncloud/backport_preview_fixes_stable7
Morris Jobke [Mon, 24 Nov 2014 12:28:00 +0000 (13:28 +0100)]
Merge pull request #12373 from owncloud/backport_preview_fixes_stable7

Backport preview fixes stable7

10 years agoUse `/` as redirect location if webroot is set to an empty value
Lukas Reschke [Fri, 21 Nov 2014 14:35:14 +0000 (15:35 +0100)]
Use `/` as redirect location if webroot is set to an empty value

If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.

This means that while the password is getting resetted the user is not redirected to the login page.

I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.

Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)

Reported by @cdamken

10 years agodelete all children's previews when deleting a folder
Georg Ehrke [Tue, 26 Aug 2014 10:41:03 +0000 (12:41 +0200)]
delete all children's previews when deleting a folder

add phpdoc

Conflicts:
lib/private/preview.php

10 years agoadd y to with-aspect naming schema
Georg Ehrke [Tue, 26 Aug 2014 14:43:08 +0000 (16:43 +0200)]
add y to with-aspect naming schema

10 years agoMerge pull request #12131 from owncloud/stable7-enc-recoverykeywithextstoragefix
Vincent Petry [Thu, 20 Nov 2014 15:43:20 +0000 (16:43 +0100)]
Merge pull request #12131 from owncloud/stable7-enc-recoverykeywithextstoragefix

[stable7] Fix file upload to ext storage when recovery key is enabled

10 years agoShow warning when invalid user was passed
Vincent Petry [Fri, 14 Nov 2014 11:45:36 +0000 (12:45 +0100)]
Show warning when invalid user was passed

Sometimes there are bugs that cause setupFS() to be called for
non-existing users. Instead of failing hard and breaking the instance,
this fix simply logs a warning.

Backport c941c3fa5139ba4f122d4f40d9c9db5e50f8bcb7 from master

10 years agoadjust autocomplete behavior for sharing menu
Craig Morrissey [Fri, 17 Oct 2014 15:55:32 +0000 (11:55 -0400)]
adjust autocomplete behavior for sharing menu

10 years agoMerge pull request #12288 from owncloud/backport-mapper-fixes
Joas Schilling [Wed, 19 Nov 2014 15:29:30 +0000 (16:29 +0100)]
Merge pull request #12288 from owncloud/backport-mapper-fixes

Backport mapper fixes

10 years agoMerge pull request #12291 from owncloud/issue/10991-stable7-backport
Joas Schilling [Wed, 19 Nov 2014 15:19:06 +0000 (16:19 +0100)]
Merge pull request #12291 from owncloud/issue/10991-stable7-backport

Issue/10991 stable7 backport

10 years agofixing cache routes
Clark Tomlinson [Mon, 22 Sep 2014 17:38:46 +0000 (13:38 -0400)]
fixing cache routes

Conflicts:
tests/lib/cache/file.php
tests/lib/cache/usercache.php

10 years agoFix mapping of relative paths
Lukas Reschke [Wed, 17 Sep 2014 09:36:08 +0000 (11:36 +0200)]
Fix mapping of relative paths

10 years agoUse md5() of the original name instead of uniqid() for slugifying
Joas Schilling [Mon, 25 Aug 2014 12:29:07 +0000 (14:29 +0200)]
Use md5() of the original name instead of uniqid() for slugifying

Previously we used uniqid() here.
However this means that the behaviour is not reproducable, so
when uploading files into a "empty" folder, the folders name is
different.

If there would be a md5() hash collition, the deduplicate check
will spot this and append an index later, so this should not be
a problem.

Fix #6722

10 years agoFix code layout before fixing the function
Joas Schilling [Mon, 25 Aug 2014 10:48:26 +0000 (12:48 +0200)]
Fix code layout before fixing the function

10 years agouse the new base class for share/share.php tests
Bjoern Schiessle [Tue, 18 Nov 2014 10:08:01 +0000 (11:08 +0100)]
use the new base class for share/share.php tests

10 years agoSimple fix for the wrong Mapper reset
Joas Schilling [Tue, 18 Nov 2014 11:35:44 +0000 (12:35 +0100)]
Simple fix for the wrong Mapper reset

10 years agoBack to OC_Util::generateRandomBytes()
Joas Schilling [Mon, 17 Nov 2014 16:37:37 +0000 (17:37 +0100)]
Back to OC_Util::generateRandomBytes()

10 years agoCorrectly restore previous root mount point after testing
Joas Schilling [Wed, 12 Nov 2014 14:54:41 +0000 (15:54 +0100)]
Correctly restore previous root mount point after testing

Conflicts:
tests/lib/cache/file.php
tests/lib/cache/usercache.php

10 years agoCorrectly refresh the apps list after removing the mock
Joas Schilling [Fri, 14 Nov 2014 11:51:59 +0000 (12:51 +0100)]
Correctly refresh the apps list after removing the mock

10 years agoFix Files\Storage\Home::testRoot()
Joas Schilling [Mon, 10 Nov 2014 10:38:14 +0000 (11:38 +0100)]
Fix Files\Storage\Home::testRoot()

10 years agoMake it possible to cleanPath() absolute Windows paths
Joas Schilling [Fri, 7 Nov 2014 09:52:37 +0000 (10:52 +0100)]
Make it possible to cleanPath() absolute Windows paths

10 years agoFix single run of encryption tests and usages of uniqid() and fopen()
Joas Schilling [Thu, 6 Nov 2014 15:53:35 +0000 (16:53 +0100)]
Fix single run of encryption tests and usages of uniqid() and fopen()

Conflicts:
apps/files_encryption/tests/crypt.php
apps/files_encryption/tests/helper.php
apps/files_encryption/tests/hooks.php
apps/files_encryption/tests/keymanager.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/share.php
apps/files_encryption/tests/stream.php
apps/files_encryption/tests/trashbin.php
apps/files_encryption/tests/webdav.php

10 years agoSkip some more tests on Windows which just can not work at all
Joas Schilling [Mon, 10 Nov 2014 10:01:43 +0000 (11:01 +0100)]
Skip some more tests on Windows which just can not work at all

Conflicts:
tests/lib/archive/tar.php
tests/lib/files/storage/local.php
tests/lib/files/view.php

10 years agoWindows does not support CHMOD, therefor we can not test not writable folders
Joas Schilling [Wed, 5 Nov 2014 15:47:27 +0000 (16:47 +0100)]
Windows does not support CHMOD, therefor we can not test not writable folders

Conflicts:
tests/lib/tempmanager.php

10 years agoTest LargeFileHelperGetFileSize also with ascii only characters
Joas Schilling [Wed, 5 Nov 2014 15:42:19 +0000 (16:42 +0100)]
Test LargeFileHelperGetFileSize also with ascii only characters

And skip the UTF8 names on Windows as they are not supported

10 years agoDo not use uniqid in Group and User tests as it is not unique on windows
Joas Schilling [Wed, 5 Nov 2014 11:21:02 +0000 (12:21 +0100)]
Do not use uniqid in Group and User tests as it is not unique on windows

10 years agoTestcase base class
Joas Schilling [Wed, 5 Nov 2014 12:20:43 +0000 (13:20 +0100)]
Testcase base class

10 years agoonly users can have a display name different from the id
Bjoern Schiessle [Tue, 18 Nov 2014 10:41:45 +0000 (11:41 +0100)]
only users can have a display name different from the id

10 years agomake sure that we only find the shares from the correct share type if users and group...
Bjoern Schiessle [Mon, 17 Nov 2014 17:05:12 +0000 (18:05 +0100)]
make sure that we only find the shares from the correct share type if users and groups with the same ID exists

10 years agomake sure that we don't find the wrong shares if a user and a group have the same ID
Bjoern Schiessle [Mon, 17 Nov 2014 12:09:13 +0000 (13:09 +0100)]
make sure that we don't find the wrong shares if a user and a group have the same ID

10 years agoMerge pull request #12154 from owncloud/ignore-port-for-trusted-domain
Morris Jobke [Tue, 18 Nov 2014 09:53:22 +0000 (10:53 +0100)]
Merge pull request #12154 from owncloud/ignore-port-for-trusted-domain

Ignore port for trusted domains

10 years agoadd newline
Morris Jobke [Tue, 18 Nov 2014 09:48:38 +0000 (10:48 +0100)]
add newline

10 years agoMerge pull request #12223 from owncloud/fix-unit-tests-s7
Lukas Reschke [Mon, 17 Nov 2014 12:48:56 +0000 (13:48 +0100)]
Merge pull request #12223 from owncloud/fix-unit-tests-s7

Backport #12181

10 years agofile size on non-(Linux/BSD/Windows)-installations
Michael Roitzsch [Thu, 7 Aug 2014 13:41:58 +0000 (15:41 +0200)]
file size on non-(Linux/BSD/Windows)-installations

Determining the file size using the exec() method is implemented for Linux, BSD, and Windows. However, on systems matching neither platform name (like SunOS), the fall-through path will return a file size result constituting a zero size instead of an invalid null return value.

10 years agoBackport #12181
Lukas Reschke [Mon, 17 Nov 2014 11:48:13 +0000 (12:48 +0100)]
Backport #12181

This should fix the stable7 unit tests again since the last CI update.

10 years agoFix file upload to ext storage when recovery key is enabled
Vincent Petry [Wed, 12 Nov 2014 12:33:41 +0000 (13:33 +0100)]
Fix file upload to ext storage when recovery key is enabled

Fixes an issue when uploading files to external storage when recovery
keys are enabled

The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.

10 years agoCheck if app is enabled for user
Lukas Reschke [Fri, 14 Nov 2014 16:20:51 +0000 (17:20 +0100)]
Check if app is enabled for user

Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps

10 years agoHiding add to your own cloud if server2server sharing is not enabled
Clark Tomlinson [Wed, 3 Sep 2014 14:00:01 +0000 (10:00 -0400)]
Hiding add to your own cloud if server2server sharing is not enabled

10 years agocleanup group admin(s) on deleteGroup
michag86 [Wed, 8 Oct 2014 12:05:06 +0000 (14:05 +0200)]
cleanup group admin(s) on deleteGroup

10 years agoremoval of wrong/double implemented check
michag86 [Tue, 4 Nov 2014 20:18:50 +0000 (21:18 +0100)]
removal of wrong/double implemented check

Check already implemented in core/settings/ajax/changedisplayname.php

10 years agofix for issue #10880
michag86 [Tue, 7 Oct 2014 14:07:48 +0000 (16:07 +0200)]
fix for issue #10880

10 years agoAdd repair steps for legacy config files
Lukas Reschke [Thu, 13 Nov 2014 12:34:11 +0000 (13:34 +0100)]
Add repair steps for legacy config files

Remove all ports from the trusted domains

10 years agoMerge pull request #12109 from owncloud/add-preupdate-before-upgrade
Lukas Reschke [Thu, 13 Nov 2014 11:07:10 +0000 (12:07 +0100)]
Merge pull request #12109 from owncloud/add-preupdate-before-upgrade

Run preupdate before an update

10 years agoIgnore port for trusted domains
Lukas Reschke [Thu, 13 Nov 2014 10:15:47 +0000 (11:15 +0100)]
Ignore port for trusted domains

This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)

Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.

10 years agouser_ldap: Reimplement convertSID2Str() without BCMath dependency.
Andreas Fischer [Thu, 18 Sep 2014 22:01:57 +0000 (00:01 +0200)]
user_ldap: Reimplement convertSID2Str() without BCMath dependency.

Also explicitly format sub-id integers as unsigned, which is required for
32-bit systems.

10 years agoFix root path handling for WebDAV ext storage
Vincent Petry [Tue, 11 Nov 2014 14:20:36 +0000 (15:20 +0100)]
Fix root path handling for WebDAV ext storage

Added missing cleanPath() call that converts "/" to "" when calling
SabreDAV. This is needed because SabreDAV will discard its base URL when
passing "/".

10 years agoRun preupdate before an update
Lukas Reschke [Tue, 11 Nov 2014 16:26:08 +0000 (17:26 +0100)]
Run preupdate before an update

The update routine tries to test the database migration before actually performing the update.

However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails.

This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.

10 years agoFix infinite loop if count and limit is 0
Morris Jobke [Tue, 11 Nov 2014 11:15:30 +0000 (12:15 +0100)]
Fix infinite loop if count and limit is 0

* otherwise it will always think it hits the limit and need another round to fetch additional results

10 years agodont fail with 500 if configured display name attribute is not set
Arthur Schiwon [Mon, 27 Oct 2014 14:58:23 +0000 (15:58 +0100)]
dont fail with 500 if configured display name attribute is not set

10 years agoupdating 7.0.3
Frank Karlitschek [Mon, 10 Nov 2014 16:09:50 +0000 (17:09 +0100)]
updating 7.0.3

10 years agoMerge pull request #12083 from owncloud/fix-occ-upgrade
Thomas Müller [Mon, 10 Nov 2014 16:01:53 +0000 (17:01 +0100)]
Merge pull request #12083 from owncloud/fix-occ-upgrade

Ensure there is a connection object within \OC_DB::enableCaching()

10 years agoEnsure there is a connection object within \OC_DB::enableCaching()
Thomas Müller [Mon, 10 Nov 2014 15:17:08 +0000 (16:17 +0100)]
Ensure there is a connection object within \OC_DB::enableCaching()

10 years agoLogin Name -> Username in user management
Morris Jobke [Mon, 10 Nov 2014 09:52:47 +0000 (10:52 +0100)]
Login Name -> Username in user management

10 years agoUse proper array key
Lukas Reschke [Sat, 8 Nov 2014 13:27:20 +0000 (14:27 +0100)]
Use proper array key

Fixes https://github.com/owncloud/core/issues/12047

10 years ago7.0.3 v7.0.3
Frank Karlitschek [Fri, 7 Nov 2014 19:26:18 +0000 (20:26 +0100)]
7.0.3

10 years agologging changes
Craig Morrissey [Fri, 7 Nov 2014 17:44:18 +0000 (12:44 -0500)]
logging changes

10 years agoMerge pull request #11994 from owncloud/stable7-sabre-convertstoragenotavailableexception
Vincent Petry [Fri, 7 Nov 2014 15:25:27 +0000 (16:25 +0100)]
Merge pull request #11994 from owncloud/stable7-sabre-convertstoragenotavailableexception

[stable7] Convert StorageNotAvailableException to SabreDAV exception

10 years agoJS unit tests fix - use toBeUndefined() instead of toEqual(null)
Morris Jobke [Tue, 4 Nov 2014 09:37:16 +0000 (10:37 +0100)]
JS unit tests fix - use toBeUndefined() instead of toEqual(null)

10 years ago7.0.3 RC3 v7.0.3RC3
Frank Karlitschek [Thu, 6 Nov 2014 13:45:41 +0000 (14:45 +0100)]
7.0.3 RC3

10 years agocheck if the provided password is really the current log-in password
Bjoern Schiessle [Thu, 6 Nov 2014 10:11:46 +0000 (11:11 +0100)]
check if the provided password is really the current log-in password

10 years agoConvert StorageNotAvailableException to SabreDAV exception
Vincent Petry [Thu, 6 Nov 2014 09:59:36 +0000 (10:59 +0100)]
Convert StorageNotAvailableException to SabreDAV exception

Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.

This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.

Conflicts:
lib/private/connector/sabre/directory.php
lib/private/connector/sabre/file.php

10 years agoMerge pull request #11964 from canepan/patch-1
Morris Jobke [Thu, 6 Nov 2014 08:49:30 +0000 (09:49 +0100)]
Merge pull request #11964 from canepan/patch-1

Fixed a typo in translation

10 years agofix typo in content type
Bernhard Posselt [Wed, 5 Nov 2014 11:04:56 +0000 (12:04 +0100)]
fix typo in content type

10 years agoSupport HTML in logo claim
Lukas Reschke [Mon, 3 Nov 2014 20:13:07 +0000 (21:13 +0100)]
Support HTML in logo claim

10 years agoMerge pull request #11944 from owncloud/stable7backportl10n
Thomas Müller [Wed, 5 Nov 2014 12:50:19 +0000 (13:50 +0100)]
Merge pull request #11944 from owncloud/stable7backportl10n

backport some strings to stable7

10 years agoadjust strings - fixed #11930
Thomas Müller [Wed, 5 Nov 2014 10:08:17 +0000 (11:08 +0100)]
adjust strings - fixed #11930

10 years agoFixed a typo in translation
canepan [Wed, 5 Nov 2014 10:51:37 +0000 (11:51 +0100)]
Fixed a typo in translation

10 years agoMerge pull request #11950 from owncloud/stable7-s2s-fixcertcheckwhennocertfile
Vincent Petry [Tue, 4 Nov 2014 19:52:41 +0000 (20:52 +0100)]
Merge pull request #11950 from owncloud/stable7-s2s-fixcertcheckwhennocertfile

[stable7] Check for cert bundle existence before using it

10 years agoStore curl error message directly
Vincent Petry [Tue, 4 Nov 2014 16:37:15 +0000 (17:37 +0100)]
Store curl error message directly

10 years agoCheck for cert bundle existence before using it
Vincent Petry [Tue, 4 Nov 2014 15:49:25 +0000 (16:49 +0100)]
Check for cert bundle existence before using it

10 years agobackport some strings to stable7
Volkan Gezer [Tue, 4 Nov 2014 13:36:44 +0000 (14:36 +0100)]
backport some strings to stable7

10 years agoOnly rescan trash folder when checking deleted versions
Vincent Petry [Tue, 4 Nov 2014 11:29:42 +0000 (12:29 +0100)]
Only rescan trash folder when checking deleted versions

This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.

Backport of 97a51c46eddf4c1e8c691eea96dd762425ce17ca from master

10 years agofix config.sample.php linebreak
Morris Jobke [Tue, 4 Nov 2014 08:23:38 +0000 (09:23 +0100)]
fix config.sample.php linebreak

10 years agoCapitalize Checks in admin page
Vincent Petry [Mon, 3 Nov 2014 14:41:40 +0000 (15:41 +0100)]
Capitalize Checks in admin page

10 years agoadd driver options to config samples
Jörn Friedrich Dreyer [Mon, 27 Oct 2014 13:43:31 +0000 (14:43 +0100)]
add driver options to config samples

10 years agoallow passing driver options, fixes #11718
Jörn Friedrich Dreyer [Mon, 27 Oct 2014 11:30:29 +0000 (12:30 +0100)]
allow passing driver options, fixes #11718

10 years agodon't move versions if only the mount point was renamed
Bjoern Schiessle [Fri, 31 Oct 2014 15:42:54 +0000 (16:42 +0100)]
don't move versions if only the mount point was renamed

10 years agoFix typo
Lukas Reschke [Tue, 28 Oct 2014 22:32:57 +0000 (23:32 +0100)]
Fix typo

10 years agoget the source path and owner in a pre hook and the target path and owner in a
Bjoern Schiessle [Tue, 28 Oct 2014 14:57:08 +0000 (15:57 +0100)]
get the source path and owner in a pre hook and the target path and owner in a
post hook

10 years agoMerge pull request #11614 from owncloud/fix_files_external_s3_storage_id_migration
Lukas Reschke [Fri, 31 Oct 2014 09:22:20 +0000 (10:22 +0100)]
Merge pull request #11614 from owncloud/fix_files_external_s3_storage_id_migration

fix files_external storage id migration

10 years agoon xp'ed mode and switching configurations: save raw mode instead of toggling filter...
Arthur Schiwon [Wed, 29 Oct 2014 17:52:55 +0000 (18:52 +0100)]
on xp'ed mode and switching configurations: save raw mode instead of toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848

Backport of 8a48b088ed22f23f961da3c0eb9591989f8cc98a from master

10 years agoFix stupid copy paste fail
Lukas Reschke [Thu, 30 Oct 2014 09:37:59 +0000 (10:37 +0100)]
Fix stupid copy paste fail

...

10 years agoupdate 3rdparty to match it's stable7 branch
Morris Jobke [Thu, 30 Oct 2014 12:44:43 +0000 (13:44 +0100)]
update 3rdparty to match it's stable7 branch

10 years agoMerge pull request #11865 from owncloud/stable7-fix-enc-sharingtests
Morris Jobke [Thu, 30 Oct 2014 12:39:45 +0000 (13:39 +0100)]
Merge pull request #11865 from owncloud/stable7-fix-enc-sharingtests

Properly register sharing hooks and proxies

10 years agoProperly register sharing hooks and proxies
Vincent Petry [Thu, 30 Oct 2014 11:05:15 +0000 (12:05 +0100)]
Properly register sharing hooks and proxies

This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.

Added login for user1 in setUp().

10 years agofix style of generated documentation
Morris Jobke [Wed, 29 Oct 2014 19:38:46 +0000 (20:38 +0100)]
fix style of generated documentation

10 years agotest files external amazon s3 storage id migration
Jörn Friedrich Dreyer [Mon, 27 Oct 2014 12:00:31 +0000 (13:00 +0100)]
test files external amazon s3 storage id migration

10 years agofix files_external storage id migration
Jörn Friedrich Dreyer [Thu, 16 Oct 2014 12:50:39 +0000 (14:50 +0200)]
fix files_external storage id migration

10 years ago7.0.3RC1 v7.0.3RC2
Frank Karlitschek [Thu, 23 Oct 2014 19:26:04 +0000 (21:26 +0200)]
7.0.3RC1

10 years agoAdded encryption test when moving file as non-owner
Vincent Petry [Wed, 29 Oct 2014 11:57:12 +0000 (12:57 +0100)]
Added encryption test when moving file as non-owner

10 years agoFix warning with unset extension check
Vincent Petry [Wed, 29 Oct 2014 11:56:49 +0000 (12:56 +0100)]
Fix warning with unset extension check

10 years agoFix moving share keys as non-owner to subdir
Vincent Petry [Wed, 29 Oct 2014 11:22:50 +0000 (12:22 +0100)]
Fix moving share keys as non-owner to subdir

This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.

After the move/copy operation the keys are moved/copied to the target
dir.

Also: refactored preRename and preCopy into a single function to avoid
duplicate code.

10 years agoClose session for search
Lukas Reschke [Wed, 29 Oct 2014 09:28:09 +0000 (10:28 +0100)]
Close session for search

Make search non-blocking.

10 years agoClose session for avatar get
Lukas Reschke [Wed, 22 Oct 2014 16:12:21 +0000 (18:12 +0200)]
Close session for avatar get

This somehow blocked the "Users" UI for me when having a lot of users. - Shouldn't hurt here.

10 years agoShow login again instead of JSON if CSRF check fails
Lukas Reschke [Mon, 22 Sep 2014 13:36:39 +0000 (15:36 +0200)]
Show login again instead of JSON if CSRF check fails

Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login.

With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often.

This can be tested by opening the login page, then clearing the cookies, and trying to login.

10 years agoMerge pull request #11802 from owncloud/backport-10958
Lukas Reschke [Tue, 28 Oct 2014 13:23:58 +0000 (14:23 +0100)]
Merge pull request #11802 from owncloud/backport-10958

Backport #10958

10 years agoMerge pull request #11800 from owncloud/backport-MakeSupportedDBsConfigurable
Thomas Müller [Tue, 28 Oct 2014 09:05:32 +0000 (10:05 +0100)]
Merge pull request #11800 from owncloud/backport-MakeSupportedDBsConfigurable

Make supported DBs configurable within config.php