summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Use setConfigs() instead of calling setConfig() multiple timesJoas Schilling2015-01-236-54/+54
|
* Add a method to set/unset multiple config values in one callJoas Schilling2015-01-235-22/+105
| | | | | This reduces the number of file writes we do for config.php and therefor hopefully helps lowering the chances for empty config.php files
* Merge pull request #13593 from owncloud/add-check-for-raw-post-dataMorris Jobke2015-01-221-2/+17
|\ | | | | Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6
| * translate error messagesMorris Jobke2015-01-221-4/+4
| |
| * Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6Lukas Reschke2015-01-221-0/+15
| | | | | | | | | | | | PHP 5.6 otherwise throws notices for perfectly valid code which results in broken endpoints. Fixes https://github.com/owncloud/core/issues/13592
* | Merge pull request #13314 from owncloud/login-hook-logoutMorris Jobke2015-01-224-12/+36
|\ \ | | | | | | Return false if the login is canceled in a hook
| * | Throw an exception when login is canceled by an appRobin Appelman2015-01-223-11/+33
| | |
| * | Allow custom error messages for the login pageRobin Appelman2015-01-221-1/+3
| | |
| * | Return false if the login is canceled in a hookRobin Appelman2015-01-131-1/+1
| | |
* | | Merge pull request #13449 from owncloud/image_preview_limitThomas Müller2015-01-221-0/+7
|\ \ \ | | | | | | | | add config-option for an image's maximum filesize when generating previews
| * | | add config-option for an image's maximum filesize when generating previewsGeorg Ehrke2015-01-221-0/+7
| | | |
* | | | remove insane debug-log from OC_ImageGeorg Ehrke2015-01-221-1/+0
| | | |
* | | | Merge pull request #13598 from owncloud/fix-undefined-offsetThomas Müller2015-01-221-0/+3
|\ \ \ \ | | | | | | | | | | Fix undefined offset 1 for wrong user mail address
| * | | | Fix undefined offset 1 for wrong user mail addressMorris Jobke2015-01-221-0/+3
| | |_|/ | |/| | | | | | | | | | * fixes Undefined offset: 1 at lib/private/mail.php#143
* | | | Merge pull request #13600 from owncloud/server-warningThomas Müller2015-01-221-39/+36
|\ \ \ \ | |/ / / |/| | | Get rid of log warning when using servercontainer
| * | | get rid of log warning when using servercontainerBernhard Posselt2015-01-221-39/+36
| | | |
* | | | Merge pull request #13509 from owncloud/share-deletechildrenwhenunsharefromgroupMorris Jobke2015-01-222-9/+21
|\ \ \ \ | | | | | | | | | | Fix reshare permission change to not impair other deletion code
| * | | | Fix reshare permission change to not impair other deletion codeVincent Petry2015-01-222-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change that prevents reshare permission changes to delete group share children had the side-effect of also preventing group share children deletion when it needed to be done. This fix adds an extra flag to isolate the "reshare permission change" deletion case and keep the other ones as they were before, not only to fix the regression but also fix other potential regressions in code that uses this method. Also updated the comment because now Helper::delete() is no longer limited to reshares but also applies to group share children.
* | | | | Merge pull request #13552 from owncloud/request-uri-double-slashThomas Müller2015-01-211-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Remove duplicated slashes from the requested url
| * | | | | Remove duplicated slashes from the requested urlRobin Appelman2015-01-211-0/+2
| | | | | |
* | | | | | Set the debugoutput channel to error_log instead of echoing itJoas Schilling2015-01-211-0/+1
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-214-12/+14
| | | | |
* | | | | Merge pull request #13499 from owncloud/issue/13451-redis-json-encodeThomas Müller2015-01-201-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Issue/13451 redis json encode
| * | | | | Json_(en|de)code values on redis to be able to cache arraysJoas Schilling2015-01-201-4/+4
| | |/ / / | |/| | |
* / | | | Fix WebDAV auth for session authentication onlyLukas Reschke2015-01-202-3/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \Sabre\DAV\Auth\Backend\AbstractBasic::authenticate was only calling \OC_Connector_Sabre_Auth::validateUserPass when the response of \Sabre\HTTP\BasicAuth::getUserPass was not null. However, there is a case where the value can be null and the user could be authenticated anyways: The authentication via ownCloud web-interface and then accessing WebDAV resources. This was not possible anymore with this patch because it never reached the code path in this scenario. This patchs allows authenticating with a session without isDavAuthenticated value stored (this is for ugly WebDAV clients that send the cookie in any case) and thus the functionality should work again. To test this go to the admin settings and test if the WebDAV check works fine. Furthermore all the usual stuff (WebDAV / Shibboleth / etc...) needs testing as well.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-202-0/+20
| | | |
* | | | Merge pull request #13416 from ↵Morris Jobke2015-01-191-11/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/reauthenticate-if-session-differs-from-basic-auth Prioritise Basic Auth header over Cookie
| * | | | Close session properlyLukas Reschke2015-01-191-0/+1
| | | | |
| * | | | Prioritise Basic Auth header over CookieLukas Reschke2015-01-171-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header. This patch adds a workaround the following way: 1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF) 2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well. This requires proper testing also considering LDAP / Shibboleth and whatever instances.
* | | | | Merge pull request #13480 from owncloud/mysql-autocommitLukas Reschke2015-01-191-4/+9
|\ \ \ \ \ | | | | | | | | | | | | set MySQL autocommit on connection setup
| * | | | | set MySQL autocommit on connection setupThomas Müller2015-01-191-4/+9
| | |/ / / | |/| | |
* / | | | Fix chunked query for tags + unit testVincent Petry2015-01-191-1/+1
|/ / / /
* | | | check is mimetype is set - fixed #13452Thomas Müller2015-01-191-1/+1
| | | |
* | | | Merge pull request #13423 from ↵Thomas Müller2015-01-191-9/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/share-fixfindshareforuserwithmultiplegroups Fix getItemSharedWithUser for groups
| * | | | Fix getItemSharedWithUser for groupsVincent Petry2015-01-161-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed SQL query for whenever a user has more than one group. Added missing $owner where clause for group lookup. Added unit tests for the group cases.
* | | | | Merge pull request #13438 from owncloud/cache-the-arrayThomas Müller2015-01-191-70/+71
|\ \ \ \ \ | |_|_|/ / |/| | | | Reuse the array key of mimetypes
| * | | | Reuse the array key of mimetypesLukas Reschke2015-01-181-70/+71
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This function is called a lot of times and was really slow before due to not reusing the same array. Previously when it was called 500'000 times it took about 2seconds, now we're down to 0.2 seconds on my local machine. Ref https://github.com/owncloud/core/issues/13434
* / | | Fix exif orientation for flipped imagesMorris Jobke2015-01-181-5/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | fixes #13363 Links: * http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/ * Example data: https://github.com/recurser/exif-orientation-examples
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-172-38/+168
| | |
* | | Merge pull request #13319 from owncloud/replace-line-breaks-in-app-descriptionLukas Reschke2015-01-171-1/+38
|\ \ \ | | | | | | | | replace line breaks in the app description by spaces - fixes #13315
| * | | OC_App::parseAppInfoMorris Jobke2015-01-141-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | * replace line breaks (on non empty lines) in the app description by spaces * fixes #13315 * includes unit tests
* | | | Merge pull request #13160 from owncloud/extstorage-ocbackendnopartfileMorris Jobke2015-01-161-27/+59
|\ \ \ \ | |_|/ / |/| | | Disable part files for OC ext storage backend + s2s backend
| * | | remove unused variable and fix undefined variableThomas Müller2015-01-081-5/+4
| | | |
| * | | Disable part files for OC ext storage backend + s2s backendVincent Petry2015-01-071-28/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading files to an OC ext storage backend or when using server to server sharing storage, part files aren't needed because the backend already has its own part files and takes care of the final atomic rename operation. This also fixes issues when using two encrypted ownCloud instances where one mounts the other either as external storage (ownCloud backend) or through server to server sharing.
* | | | Merge pull request #13406 from owncloud/fix-php-docFrank Karlitschek2015-01-151-0/+1
|\ \ \ \ | | | | | | | | | | Fix PHPDoc
| * | | | Fix PHPDocLukas Reschke2015-01-151-0/+1
| | | | |
* | | | | Merge pull request #13389 from owncloud/issue/13372-failing-oracle-tests-jenkinsThomas Müller2015-01-151-11/+29
|\ \ \ \ \ | |/ / / / |/| | | | Mask table and column names with backticks and add lastInsertID() workar...
| * | | | Mask table and column names with backticks and add lastInsertID() workaroundJoas Schilling2015-01-151-11/+29
| | | | |
* | | | | Remove children from the cache in one queryRobin Appelman2015-01-151-24/+36
| | | | |
* | | | | Merge pull request #13388 from owncloud/type-hint-url-paramsMorris Jobke2015-01-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Add PHPDoc for `urlParams`