Robin Appelman
282c1cb24f
remove unused Storage->search
2016-02-05 17:52:37 +01:00
Robin Appelman
559189cf47
additional phpdoc for search
2016-02-05 17:52:19 +01:00
Robin Appelman
615f0f5499
add deprecation notice to search methods
2016-02-05 17:46:43 +01:00
Robin Appelman
fb76d7de69
remove unused Storage->getLocalFolder
2016-02-05 16:48:08 +01:00
Thomas Müller
e15a120f83
Merge pull request #22152 from owncloud/activities-for-comments
...
Activities for comments
2016-02-05 13:50:38 +01:00
Joas Schilling
97b907335a
Dispatch an event when a console command is run
2016-02-05 12:24:54 +01:00
Joas Schilling
e86dcdacc8
Dispatch events when adding, updating and deleting comments
2016-02-05 11:30:53 +01:00
Roeland Jago Douma
0f22a8db1d
Also add type (file/folder) to IShare object
...
We need this for the hooks :(
2016-02-04 14:28:09 +01:00
Roeland Jago Douma
fc215d0980
Make the share object lazy
...
Share providers can now just pass in a fileId. And the node will only be
created once needed.
2016-02-04 12:51:23 +01:00
Thomas Müller
b594aa18ee
Merge pull request #22110 from owncloud/comment-types-always-plural
...
types shall always be plural
2016-02-04 10:55:49 +01:00
Arthur Schiwon
9370491822
types shall always be plural
2016-02-03 19:28:15 +01:00
Roeland Jago Douma
96662c4d0d
[Share 2.0] Fix shareManager
2016-02-03 19:25:29 +01:00
Roeland Jago Douma
eb904c7aa9
[Share 2.0] Fix defaultshare provider
2016-02-03 19:25:29 +01:00
Roeland Jago Douma
78be766cf5
[Share 2.0] Use strings for ids
...
* sharedWith
* sharedBy
* shareOwner
Now all set/get strings with the id. (userId, groupId,
federatedsharerId).
This to avoid a huge amount of if statements
2016-02-03 19:25:29 +01:00
Thomas Müller
ab1c79827e
Merge pull request #22071 from owncloud/cache-split-insert
...
split cache->insert from cache->put
2016-02-03 14:32:28 +01:00
Thomas Müller
aaf7299d28
Merge pull request #22070 from owncloud/share2_exceptions
...
Add sharing exceptions to OCP
2016-02-03 13:36:14 +01:00
Robin Appelman
f2bba59b79
split cache->insert from cache->put
2016-02-03 12:55:36 +01:00
Roeland Jago Douma
2035a179bc
Add store/retrieve checksums
...
* Add extra db column to filecache
* Bump version
* Update filecache code to actually handle checksum
* Webdav code to store/retrieve checksums
2016-02-03 09:03:51 +01:00
Roeland Jago Douma
4d7130ad31
[Share 2.0] Add exceptions to OCP
2016-02-02 14:07:11 +01:00
Thomas Müller
ce053b9808
Merge pull request #22013 from owncloud/share2_moveshare
...
[Share 2.0] Allow moving of shares
2016-02-02 13:34:50 +01:00
Thomas Müller
2d1d89ee29
Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtags
...
Issue 22041 activities for systemtags
2016-02-02 13:08:01 +01:00
Roeland Jago Douma
2316cb1f8b
[Share 2.0] Allow moving of shares
...
* Only recipient can move a share
* Unit tests
2016-02-02 11:34:52 +01:00
Roeland Jago Douma
403547f0ea
[Share 2.0] Allow recipient to be passed in to getShareById
...
* This allows us to retrieve usergroup shares for a given id.
If the user deleted a share or moved it this will be a different share
2016-02-02 10:41:57 +01:00
Joas Schilling
d5126b1ad4
Dispatch events when tags are added/updated/deleted
2016-02-02 09:57:42 +01:00
Joas Schilling
591613fce2
Dispatch some events when tags are un-/assigned
2016-02-02 09:57:42 +01:00
Thomas Müller
b4853f3fce
Merge pull request #21967 from owncloud/comments-webdav
...
Comments WebDAV adjustements
2016-02-01 16:17:45 +01:00
Thomas Müller
32067ac49b
Merge pull request #21989 from owncloud/make-csp-modifiable
...
Add public API to give developers the possibility to adjust the global CSP defaults
2016-02-01 10:10:40 +01:00
Thomas Müller
a025b2865f
Merge pull request #22022 from owncloud/share_ocs_filter_path_sharedwithme
...
Add path filter to OCS Share API shared_with_me=true
2016-02-01 09:00:31 +01:00
Thomas Müller
5f4b204a49
Merge pull request #22012 from owncloud/storagenotavailableexception-code
...
Default to STATUS_ERROR in StorageNotAvailableException
2016-02-01 09:00:14 +01:00
Thomas Müller
67bf225fbe
Merge pull request #21956 from owncloud/cross-cache-move
...
Add fallback moveFromCache implementation
2016-01-29 17:03:16 +01:00
Roeland Jago Douma
a24e7f6558
Add path filter to OCS Share API ?shared_with_me=true
...
This allows all clients to quickly get the share info for a given path.
Instead of returning everything and filtering it then manually on the
client side.
2016-01-29 15:36:23 +01:00
Arthur Schiwon
01cdc70f9c
introduce comments read marke tables, comes with user cleanup after deletion
2016-01-29 13:08:02 +01:00
Arthur Schiwon
d2882b9021
Comments WebDAV adjustements
2016-01-29 13:08:02 +01:00
Robin Appelman
ec3f6549f6
Add fallback moveFromCache implementation
2016-01-29 13:06:59 +01:00
Robin McCorkell
2abb173599
Default to STATUS_ERROR in StorageNotAvailableException
2016-01-29 11:57:25 +00:00
Joas Schilling
c83b3d6a26
Remove other broken usages in deprecated methods
2016-01-29 08:50:29 +01:00
Lukas Reschke
809ff5ac95
Add public API to give developers the possibility to adjust the global CSP defaults
...
Allows to inject something into the default content policy. This is for
example useful when you're injecting Javascript code into a view belonging
to another controller and cannot modify its Content-Security-Policy itself.
Note that the adjustment is only applied to applications that use AppFramework
controllers.
To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`,
$policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`.
To test this add something like the following into an `app.php` of any enabled app:
```
$manager = \OC::$server->getContentSecurityPolicyManager();
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFrameDomain('asdf');
$policy->addAllowedScriptDomain('yolo.com');
$policy->allowInlineScript(false);
$manager->addDefaultPolicy($policy);
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFontDomain('yolo.com');
$manager->addDefaultPolicy($policy);
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFrameDomain('banana.com');
$manager->addDefaultPolicy($policy);
```
If you now open the files app the policy should be:
```
Content-Security-Policy:default-src 'none';script-src yolo.com 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src yolo.com 'self';connect-src 'self';media-src 'self';frame-src asdf banana.com 'self'
```
2016-01-28 18:36:46 +01:00
Joas Schilling
ef73aedd7e
Deprecate the method and warn against using it
2016-01-28 15:40:23 +01:00
Thomas Müller
b7710ab6d7
Merge pull request #21858 from owncloud/getMountsForFileId
...
add IUserMountCache->getMountsForFileId
2016-01-28 11:20:42 +01:00
Roeland Jago Douma
8d44e537ac
[Share 2.0] Remove setId and setProviderId from the interface
...
Those should only ever be set by the providers
2016-01-28 07:54:16 +01:00
Roeland Jago Douma
34e912ab6b
[Share 2.0] Fix interfaces and comments
...
* Made comments more clear
* Removed unneeded methods
* IShares shareTime is now a proper DateTime object
* IShares getPath -> getNode & setPath -> setNode
* Fix unit tests
2016-01-28 07:54:09 +01:00
Roeland Jago Douma
f2e70441e4
[Share 2.0] Add getShareManager to OCP\IServerContainer
2016-01-27 22:04:37 +01:00
Roeland Jago Douma
357b271cb4
[Share 2.0] Create IManger interface for share manager
2016-01-27 22:04:37 +01:00
Roeland Jago Douma
185b9c6edd
[Share 2.0] Move IShare to OCP
2016-01-27 22:04:37 +01:00
Robin Appelman
6682f31074
clean cache interface
2016-01-27 15:51:39 +01:00
Robin Appelman
644a8ab797
add IUserMountCache->getMountsForFileId
2016-01-27 12:53:44 +01:00
Thomas Müller
1594371c8c
Merge pull request #21741 from owncloud/l10n-improvements
...
Move methods to the factory that are not related to translating, but to guessing/finding the language
2016-01-27 09:37:00 +01:00
Joas Schilling
7514695399
Fix Oracle comparisons
2016-01-26 14:56:07 +01:00
Joas Schilling
90ce876378
Adjust comments to the new constants
2016-01-26 14:56:07 +01:00
Joas Schilling
6652a0fb6c
Move finding the language files and creating the function out of the object
2016-01-26 14:02:31 +01:00
Joas Schilling
043625ee52
Move findLanguage() and setLanguageFromRequest() to factory
2016-01-26 14:02:31 +01:00
Joas Schilling
29a9306429
Move languageExists() to the factory
2016-01-26 14:02:31 +01:00
Joas Schilling
6aec550d6e
Move findAvailableLanguages() to the factory
2016-01-26 14:02:30 +01:00
Thomas Müller
2bafb1c649
Merge pull request #21894 from owncloud/refactor-csrf
...
Add new CSRF manager for unit testing purposes
2016-01-26 11:36:56 +01:00
Thomas Müller
4c9e328211
Merge pull request #21892 from owncloud/issue-21890-parameters
...
Add parameters types to IQueryBuilder
2016-01-25 21:13:41 +01:00
Lukas Reschke
a977465af5
Add new CSRF manager for unit testing purposes
...
This adds a new CSRF manager for unit testing purposes, it's interface is based upon https://github.com/symfony/security-csrf . Due to some of our required custom changes it is however not possible to use the Symfony component directly.
2016-01-25 20:03:40 +01:00
Joas Schilling
c5046fb2a9
Add parameters to public interface
2016-01-25 17:17:20 +01:00
Thomas Müller
728caf13f8
Adding support of -1 as size to be passed into get and getFile
2016-01-25 16:54:40 +01:00
Morris Jobke
75e6734ef4
Remove OC_Helper::imagePath and use the proper public interface
2016-01-24 18:04:20 +01:00
Thomas Müller
7731b29136
Merge pull request #21719 from owncloud/move-notification-api-to-ocp
...
Move the notification API to public namespace
2016-01-22 16:20:26 +01:00
Thomas Müller
9b4c9a0357
Merge pull request #18531 from owncloud/ext-user-credentials
...
External storage 'Login credentials' auth mechanism
2016-01-22 13:14:14 +01:00
Joas Schilling
31c5848e51
Allow automatic injection of the Manager
2016-01-22 11:02:40 +01:00
Thomas Müller
1410120758
Merge pull request #20768 from owncloud/mount-cache
...
cache mountpoints in the db
2016-01-22 11:01:54 +01:00
Joas Schilling
9ea7ae6f87
Adjust the since on the interface
2016-01-22 10:51:36 +01:00
Joas Schilling
ee02165005
Move the notification API to public namespace
2016-01-22 10:32:42 +01:00
Morris Jobke
75ee5a9e9a
Fix PHPDoc - @changed is no official tag -> use @since
2016-01-22 08:43:05 +01:00
Thomas Müller
7c7467fe42
Merge pull request #21792 from owncloud/systemtags-managerfactory
...
Allow custom implementation of system tag managers
2016-01-21 12:13:01 +01:00
Vincent Petry
899f9bd113
Allow custom implementation of system tag managers
...
Added config.php option to replace the default implementation of system
tag manager and system tag object mapper.
Also adjusted the comments manager factory to inject the server container
2016-01-20 16:36:10 +01:00
Robin Appelman
483c6b68e2
clear mount cache when removing applicables
2016-01-20 16:32:56 +01:00
Robin Appelman
be380accb9
clear mount cache when deleting user
2016-01-20 16:32:56 +01:00
Robin Appelman
99415a9f7f
multiple minor fies
2016-01-20 16:32:52 +01:00
Robin Appelman
cf6ee1c866
cache mountpoints in the db
2016-01-20 16:30:22 +01:00
Thomas Müller
aeb89947a2
Introduce IUser::setEMailAddress and add hook mechanism
2016-01-20 14:57:20 +01:00
Robin Appelman
58afddfaa5
allow comparing clob using expressionbuilder->eq if you explicitly say you're comparing strings
2016-01-18 16:03:41 +01:00
Robin McCorkell
da4127d23b
Introduce CredentialsManager for storage of credentials in DB
...
CredentialsManager performs a simple role, of storing and retrieving
encrypted credentials from the database. Credentials are stored by user
ID (which may be null) and credentials identifier. Credentials
themselves may be of any type that can be JSON encoded.
The rationale behind this is to avoid further (mis)use of
oc_preferences, which was being used for all manner of data not related
to user preferences.
2016-01-18 11:10:41 +01:00
Robin McCorkell
88cd615214
Introduce IDBConnection::setValues()
...
setValues() attempts to insert a new row, or failing that, update an
existing row. The ability to set preconditions is also available.
2016-01-18 11:10:41 +01:00
Thomas Müller
807cf750b3
Merge pull request #21705 from owncloud/improve-background-job-message
...
Improve background job error message
2016-01-15 20:12:26 +01:00
Thomas Müller
f6c4b10189
Add message key to context of logException
2016-01-15 14:55:30 +01:00
Thomas Müller
416fb65605
Merge pull request #21717 from owncloud/addpublicgroupinterface
...
allow apps to add an OCP GroupInterface backend
2016-01-15 12:38:18 +01:00
Thomas Müller
52040a3f23
Merge pull request #20898 from owncloud/cache-interfaces
...
Public Cache interfaces
2016-01-15 12:02:31 +01:00
Jörn Friedrich Dreyer
2ebb5726d7
add TODOs with the actual interface name
2016-01-14 14:34:35 +01:00
Jörn Friedrich Dreyer
64043e9bcc
move methods to correct interface, deprecate private interface
2016-01-14 14:28:03 +01:00
Jörn Friedrich Dreyer
bd77cd98c9
allow apps to add an OCP GroupInterface backend
2016-01-14 13:58:45 +01:00
Robin Appelman
7530f66f52
remove unneeded public cache methods
2016-01-14 13:01:46 +01:00
Robin Appelman
0724ac1e5e
split locking related methods to their own interface
2016-01-14 12:54:42 +01:00
Robin Appelman
3deb3bd163
Add IStorage interface for consistent naming
...
minor phpdoc fixed
2016-01-14 12:54:42 +01:00
Robin Appelman
dcbeeced3b
add since tags
2016-01-14 12:54:42 +01:00
Robin Appelman
989995a852
fix phpdoc
2016-01-14 12:54:42 +01:00
Robin Appelman
a3d50ef49a
add watcher interface
2016-01-14 12:54:42 +01:00
Robin Appelman
c27894791e
Add updater interface and expose cache interfaces from storage
2016-01-14 12:54:42 +01:00
Robin Appelman
5fae07f422
add scanner interface
2016-01-14 12:54:42 +01:00
Robin Appelman
6d321f5f6b
Return a class from cache operations instead of an array
2016-01-14 12:54:42 +01:00
Robin Appelman
3ab0ccd4a2
add cache entry interface
2016-01-14 12:54:42 +01:00
Robin Appelman
2dcdc81477
propagator interface
2016-01-14 12:54:42 +01:00
Robin Appelman
cdc8c40d60
Add public cache interface
2016-01-14 12:54:42 +01:00
Thomas Müller
c5a200c419
Merge pull request #21653 from owncloud/update-license-headers-2016
...
Update license headers 2016
2016-01-13 08:29:42 +01:00
Thomas Müller
59e9b93be6
Merge pull request #20948 from owncloud/fed-sync-contacts
...
Syncing system addressbooks across federated ownClouds
2016-01-13 08:27:51 +01:00
Thomas Müller
682821c71e
Happy new year!
2016-01-12 15:02:18 +01:00
Thomas Müller
dbddbb634b
Use EventDispatcher to allow additional setup of auth backends - move federation auth to federation app
2016-01-12 14:24:01 +01:00
Robin Appelman
c15cab7ed6
Allow admins to add system wide root certificates
2016-01-12 12:50:59 +01:00
Morris Jobke
078cf8ae36
fix identation in public/irequest.php
2016-01-12 08:48:51 +01:00
Roeland Jago Douma
e01a488b31
Remove generateRandomBytes from OC_Util
2016-01-10 22:07:33 +01:00
Thomas Müller
0f5132552c
Merge pull request #21292 from owncloud/checkAppEnabled-not-needed-anymore
...
core will handle invalid URLs and redirects properly
2016-01-08 13:36:11 +01:00
Roeland Jago Douma
34c8249799
Deprecate remaining function and entire class
2016-01-07 21:29:51 +01:00
Lukas Reschke
9bf01283e7
Cleanup router code
...
- Some functions are entirely broken
- PHPDoc etc...
2016-01-07 21:29:51 +01:00
Lukas Reschke
fec41e7539
Move regeneration of session ID into session classes
...
There were code paths that nowadays call ISession::login directly thus bypassing the desired regeneration of the session ID. This moves the session regeneration deeper into the session handling and thus ensures that it is always called. Furthermore, I also added the session regeneration to the remember me cookie plus added some test case expectations for this.
2016-01-04 15:09:01 +01:00
Morris Jobke
6f00729124
Refactor OC_Util::callCheck
2015-12-22 09:32:14 +01:00
Thomas Müller
95a255b0d4
Merge pull request #21281 from owncloud/allow-di-for-background-jobs
...
Allow background jobs to be service names for DI
2015-12-18 16:34:42 +01:00
Morris Jobke
2f98f64241
core will handle invalid URLs and redirects properly
2015-12-18 15:51:03 +01:00
Thomas Müller
50e8773307
Merge pull request #21280 from owncloud/drop-unused-methods
...
OC_Helper::makeURLAbsolute is not used anymore
2015-12-18 14:49:55 +01:00
Joas Schilling
a9935bd490
Add methods to interface which have always been required
2015-12-18 14:25:04 +01:00
Morris Jobke
450e2f3bd3
Move OC_Helper code to OCP\Util for linkToRemote
2015-12-18 12:00:18 +01:00
Morris Jobke
e42f262d85
properly use OCP\Util instead of OC_Helper
2015-12-18 11:46:21 +01:00
Joas Schilling
0f836cfe9e
Make sure the interface and the implementation match
2015-12-18 10:04:30 +01:00
Roeland Jago Douma
9fe3d2f1f8
OC_Helper::linkToRoute is deprecated
...
Replaced all calls to OC_Helper::linkToRoute with
OC::$server->getURLGenerator()->linkToRoute
2015-12-17 18:46:42 +01:00
Thomas Müller
e3ed42135d
Merge pull request #21240 from owncloud/avatar_speedup
...
Avatar speedup
2015-12-17 14:43:21 +01:00
Roeland Jago Douma
19eeb23b91
OC_Helper::linkTo is deprecated
...
Replaced with suggested (and calling body of)
2015-12-17 10:53:21 +01:00
Roeland Jago Douma
d796c43841
[Avatars] Add function to get the Node of the avatar
...
Since we usually just get the avatar and stream the content to the users
there is no need to first create an image in memory.
2015-12-16 20:29:02 +01:00
Thomas Müller
6317ba8cb4
Merge pull request #21135 from owncloud/add-polyfill
...
Add polyfills for PHP55, PHP56 and PHP70 functionalities
2015-12-11 11:40:51 +01:00
Lukas Reschke
f3360d51c6
Use PHP polyfills
2015-12-11 08:47:36 +01:00
Morris Jobke
4569d88879
IMemcacheTTL was backported to 8.2.2
...
see #21113
2015-12-10 19:00:07 +01:00
Thomas Müller
744ef6141b
Merge pull request #21073 from owncloud/memcache-lock-ttl
...
Add ttl for redis based locking
2015-12-10 13:51:01 +01:00
Robin Appelman
e41f7b005d
add since
2015-12-09 14:45:08 +01:00
Robin Appelman
0a80bf5573
Add interface for memcache backends that support setting ttl on exisiting keys
2015-12-09 14:39:12 +01:00
Arthur Schiwon
249dc4490f
improve PHP doc and remove superflous by reference indicator
2015-12-09 14:34:23 +01:00
Arthur Schiwon
dec1f1d24a
anounce CommentsManager getter in public server interface
2015-12-09 14:34:23 +01:00
Arthur Schiwon
f9081303b1
fix phpdoc
2015-12-09 14:34:23 +01:00
Arthur Schiwon
b44a33f68f
fix php doc
2015-12-09 14:34:23 +01:00
Arthur Schiwon
2ce2de0ae5
add icommentsmanger and icomment implementation
...
register CommentsManager service, allow override, document in config.sample.php
don't insert autoincrement ids in tests, because of dislikes from oracle and pgsql
specify timezone in null date
only accepts strings for ID parameter that can be converted to int
replace forgotten hardcoded IDs in tests
react on deleted users
react on file deletion
Postgresql compatibility
lastInsertId needs *PREFIX* with the table name
do not listen for file deletion, because it is not reliable (trashbin, external storages)
add runtime cache for comments
2015-12-09 14:34:23 +01:00
Thomas Müller
45fe8271ab
Merge pull request #21030 from owncloud/querybuilder-new-features
...
Querybuilder new features
2015-12-08 13:51:45 +01:00
Thomas Müller
85409b6701
Merge pull request #20786 from owncloud/systemtags-dav
...
DAV endpoint for system tags
2015-12-08 13:51:25 +01:00
Joas Schilling
9f98849306
Add a method to the get "to use" table and column name
2015-12-08 11:04:28 +01:00
Joas Schilling
a3391248e4
Add select distinct to the query builder
2015-12-08 09:49:21 +01:00
Joas Schilling
f2c7acb3c0
Allow getting the last insert id without much hassle
2015-12-08 09:40:20 +01:00
Lukas Reschke
4b293dffe5
Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTML
2015-12-08 08:56:47 +01:00
Vincent Petry
316b907a13
Fixed system tags DAV and API and docs
2015-12-04 17:30:50 +01:00
Morris Jobke
e6d4496fc2
Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
2015-12-04 17:23:51 +01:00
Thomas Müller
2ceae43989
Merge pull request #20545 from owncloud/scan-storage-in-background-job
...
Move files/ajax/scan.php to background job
2015-12-03 16:53:46 +01:00
Jesús Macias
9dd11091d4
Fix code from comments
2015-12-03 10:00:11 +01:00
Jesús Macias
98f5c50aa4
Migrate storate status code to storagenotavailablexception
2015-12-03 09:59:45 +01:00
Jesús Macias
4ead2bc861
Fix code from PR comments
2015-12-03 09:58:55 +01:00
Jesús Macias
7cd13f462a
Add new external storage exceptions for different errors
2015-12-03 09:57:59 +01:00
Thomas Müller
e7239b6553
Merge pull request #20872 from owncloud/systemtags-better-not-found-exception
...
Systemtags better not found exception
2015-12-03 09:26:05 +01:00
Thomas Müller
dcc7ff09ba
Adding unit test for MailNotifications::sendInternalShareMail()
2015-12-02 21:42:14 +01:00
Thomas Müller
df5872ec50
Merge pull request #20719 from owncloud/adding-system-addressbook-of-users
...
Adding system addressbook for users of this instance - a occ command …
2015-12-02 16:17:58 +01:00
Morris Jobke
baecfc4080
Reduce OC_Config usage in lib/
...
* replaced by proper public interfaces
2015-12-02 14:49:40 +01:00
Thomas Müller
6abc02cb88
Proposal: add enumeration function to IUserManager which simply calls a callbask for each user in all backends
2015-12-02 09:14:41 +01:00
Thomas Müller
df6fc6cc70
Add the user's cloud id to the vCard
2015-12-02 09:14:41 +01:00
Thomas Müller
dad6470baa
Add IUser::getAvatarImage() for easy access
2015-12-02 09:14:41 +01:00
Joas Schilling
1d0c041ac8
Add a method to get the list of tags from the TagNotFound Exception
2015-12-01 14:54:34 +01:00
Joas Schilling
1761fdd9ee
Fix the docs of the exceptions and remove hardcoded language from the message
2015-12-01 12:32:50 +01:00
Thomas Müller
08248f66ba
Merge pull request #20650 from owncloud/systemtags-core
...
Implement systemtag managers and mapper
2015-11-30 15:38:43 +01:00
Lukas Reschke
391bc49dab
Move files/ajax/scan.php to background job
...
The background job will now be executed in chunks of 500 users all 10 minutes.
2015-11-28 13:06:53 +01:00
Vincent Petry
b666367a79
Added system tags data structure and PHP side managers
...
Added SystemTagManager and SystemTagObjectMapper
2015-11-27 17:54:29 +01:00
Thomas Müller
80c43ffc6c
Merge pull request #20702 from owncloud/move-user-principal-into-subfolder
...
Users are available under it's own principal resource named 'principa…
2015-11-26 16:49:49 +01:00
Thomas Müller
19d5059109
Merge pull request #20393 from owncloud/querybuilder-select-with-alias
...
Add a method to select a field or value with alias
2015-11-26 16:19:20 +01:00
Thomas Müller
4d22c75d49
Merge pull request #20562 from owncloud/comments-interfaces
...
public interfaces for Comments
2015-11-26 15:06:35 +01:00
Thomas Müller
3882cc8ef3
Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanup
...
Remove last occurences of OC_Helper::getMimeType()
2015-11-26 12:37:25 +01:00
Arthur Schiwon
d660c6162f
proper description for IllegalIDChangeException
2015-11-26 12:15:00 +01:00
Morris Jobke
4fcab98694
Remove unused internal methods
...
* removes OC_Helper::mb_substr_replace and OC_Helper::mb_str_replace
* keeps public interface wrapper working as expected
2015-11-26 10:25:43 +01:00
Morris Jobke
9318606faf
Remove last occurences of OC_Helper::getMimeType()
...
* ref #4774
2015-11-26 10:18:32 +01:00
Thomas Müller
b799e42b4e
Introduce \OCP\IUser::getEMailAddress()
2015-11-25 22:23:34 +01:00
Arthur Schiwon
ab8937ba6a
missing setters for setChildrenCount and setLatestChildDateTime (formerly …Timestamp)
2015-11-23 23:58:22 +01:00
Roeland Jago Douma
5873821b8d
Consistent interface declaration
2015-11-23 22:03:19 +01:00
Arthur Schiwon
4005c0337b
give creation datetime setter and getter a more meaningful and less misleading name
2015-11-23 17:32:22 +01:00
Arthur Schiwon
d43abd0b8f
public interfaces for Comments
2015-11-23 17:21:11 +01:00
Joas Schilling
1c7d7288c4
Add a method to select a field or value with alias
2015-11-23 13:28:31 +01:00
Thomas Müller
427d107b9f
Merge pull request #20614 from owncloud/use-mocks-when-testing-isSharingDisabledForUser
...
Use mocks when testing isSharingDisabledForUser
2015-11-20 15:22:52 +01:00
Thomas Müller
c86483f3ed
Adjust PHPDoc as suggested
2015-11-20 14:38:29 +01:00
Joas Schilling
ea2bf49be0
Adjust the method name to reflect it's behaviour
2015-11-19 16:08:21 +01:00
Thomas Müller
30dd610a2a
Merge pull request #20563 from owncloud/systemtags-interface
...
Core interfaces for system tags and its manager
2015-11-19 15:47:47 +01:00
Thomas Müller
9ec2850c78
Use mocks when testing isSharingDisabledForUser
2015-11-19 15:36:16 +01:00
Vincent Petry
ea6341df29
Core interfaces for system tags and its manager
2015-11-19 11:31:25 +01:00
Thomas Müller
aba119951e
Merge pull request #20494 from owncloud/storage-forbidden-exception
...
Allow storage wrappers to through a forbidden exception with retry information for clients
2015-11-18 09:13:45 +01:00
Joas Schilling
e2cfcd992c
Allow storage wrappers to through a forbidden exception with retry information
2015-11-17 10:39:52 +01:00
Vincent Petry
84e5b76d3c
Add getOwner() method to FileInfo and Node API
2015-11-13 10:41:33 +01:00
Robin Appelman
bbe2f5c2d5
Merge pull request #20224 from owncloud/fileinfo-owner
...
Add getOwner to FileInfo
2015-11-10 14:36:15 +01:00
Thomas Müller
480bf14698
Merge pull request #20389 from owncloud/storage_not_available
...
use a HintException to have some useful user output in case of an error
2015-11-10 11:53:47 +01:00
Robin Appelman
331ef0e3c0
Add getOwner to FileInfo
2015-11-10 10:55:29 +01:00
Björn Schießle
2960a208cd
use a HintException to have some useful user output in case of an error
2015-11-10 10:54:17 +01:00
Thomas Müller
422d29ae48
Merge pull request #20373 from owncloud/use-random-int-if-it-exists
...
Use native CSPRNG if available
2015-11-10 10:10:23 +01:00
Lukas Reschke
045ea4eb2b
Use native CSPRNG if available
...
Unfortunately only PHP 7…
2015-11-09 15:04:22 +01:00
Robin Appelman
d514200b56
Add escapeLikeParameter to IDBConnection
2015-11-05 16:41:30 +01:00
Björn Schießle
d1a090e3e2
adjust comment, this parameter was added for 9.0
2015-11-04 15:12:22 +01:00
Bjoern Schiessle
4719305e3b
cache result from parent folders
2015-11-04 09:27:29 +01:00
Thomas Müller
40ba8d267f
Merge pull request #19837 from owncloud/always-enabled-apps
...
Store list of apps which cannot be disabled in shipped.json
2015-10-26 17:14:29 +01:00
Lukas Reschke
8f09d5b67c
Update license headers
2015-10-26 14:04:01 +01:00
Thomas Müller
5a5bcccd0d
Don't show apps which are always enabled in the app manager
2015-10-26 09:53:04 +01:00
Thomas Müller
6fc59f85b6
Store list of apps which cannot be disabled in shipped.json
2015-10-26 09:53:04 +01:00
Roeland Jago Douma
9071e756a1
Fix for broken ajax/share.php endpoint
...
Even more code mess :(
All tests pass again. But I'm really not happy with this endpoint.
2015-10-23 09:24:03 +02:00
Morris Jobke
bf579a153f
fix IE8 user agent detection
2015-10-09 11:19:06 +02:00
Vincent Petry
c7aef6c368
Fix uploading avatar and root certs in IE8
2015-10-09 11:19:05 +02:00
Jörn Friedrich Dreyer
89a63ec74b
make mkdir recursive, add phpdoc to api
2015-10-08 14:54:21 +02:00
Thomas Müller
8d2c8cf2a2
Merge pull request #19607 from owncloud/use-url
...
Use `/` if installed in main folder
2015-10-08 13:01:41 +02:00
Lukas Reschke
6a4f22c61f
Use `/` if installed in main folder
...
Otherwise an empty string is used indicating the cookie is only valid for those resources. This can lead to eunexpected behaviour.
Fixes https://github.com/owncloud/core/issues/19196
2015-10-06 15:24:19 +02:00
Lukas Reschke
80a232da6a
Add \OCP\IRequest::getHttpProtocol
...
Only allow valid HTTP protocols.
Ref https://github.com/owncloud/core/pull/19537#discussion_r41252333 + https://github.com/owncloud/security-tracker/issues/119
2015-10-06 14:18:46 +02:00
Morris Jobke
8366ce2767
deduplicate @xenopathic
2015-10-06 09:52:19 +02:00
Morris Jobke
b945d71384
update licence headers via script
2015-10-05 21:15:52 +02:00
Joas Schilling
7707bbe648
Allow identifying whether the current item is the filtered one
2015-10-02 09:53:39 +02:00
Individual IT Services
fbe43e6a26
cache result of \OCP\Util::needUpgrade()
...
reduce calls of \OCP\Util::needUpgrade()
where \OCP\Util::needUpgrade() is called we can call as well
self::checkUpgrade and use the cached result
In line 877 the call way unnecessary anyway because of the first part of
the if statement
move caching to \OCP\Util::needUpgrade
renaming variable
fixing testNeedUpgradeCore()
cache result of checkUpgrade() in self::$needUpgrade
reduce calls of \OCP\Util::needUpgrade()
where \OCP\Util::needUpgrade() is called we can call as well
self::checkUpgrade and use the cached result
In line 877 the call way unnecessary anyway because of the first part of
the if statement
move caching to \OCP\Util::needUpgrade
renaming variable
fixing testNeedUpgradeCore()
fix typo in variable name
deleting tabs
2015-09-29 15:34:42 +02:00
Lukas Reschke
e735a9915c
Add blob: scheme to default CSP policy
...
Fixes https://github.com/owncloud/core/issues/19438
2015-09-29 14:27:35 +02:00
Thomas Müller
0aaece7de7
Merge pull request #19346 from owncloud/drop-passwords-from-exception-log
...
Remove passwords from logged exception stack traces
2015-09-25 20:04:01 +02:00
Thomas Müller
787c668b39
Merge pull request #19360 from owncloud/move-filter-method-into-config-object
...
Move the filtering of sensitive data to the config class
2015-09-25 14:05:04 +02:00
Joas Schilling
faba02564a
Move the filtering of sensitive data to the config class
2015-09-25 11:08:33 +02:00
Joas Schilling
e91e36f8df
Add the L10N Factory to the container interface
2015-09-25 09:05:12 +02:00
Morris Jobke
db8e7ce8b9
Remove passwords from logged exception stack traces
...
* fixed #16318
* create logException in ILogger
* add unit tests
2015-09-24 20:01:30 +02:00
Joas Schilling
2c00587b5d
Add since-tag
2015-09-23 16:16:57 +02:00
Joas Schilling
1493e86dea
Allow listeners to set status code and message
2015-09-23 15:15:07 +02:00
Joas Schilling
ee75f9f594
Fix type hint errors in the container and the interface
2015-09-23 10:13:41 +02:00
Bjoern Schiessle
9bd4f2d41e
occ script to disable encryption and to decrypt all files again
2015-09-15 22:39:44 +02:00
Lukas Reschke
7953cc9494
Function does return void
...
This function does return void and not a bool.
2015-09-15 14:02:10 +02:00
Bernhard Posselt
fd74522804
make resolve public to avoid boiler plate code
...
add resolve to public interface
2015-09-13 17:44:24 +02:00
Frank Karlitschek
7562e4959b
Merge pull request #18658 from owncloud/configurable-temp
...
Configurable temporary directory
2015-09-12 22:04:41 +02:00
Lukas Reschke
1924dd348a
Merge pull request #18653 from owncloud/dav-stream-guzzle
...
stream webdav downloads using http client
2015-09-11 17:10:10 +02:00
Robin McCorkell
188d0e09b8
Add reset method to mimetype loader
...
Used to solve concurrency issues
2015-09-11 12:44:53 +01:00
Joas Schilling
38001d824b
Move interfaces to private until they are no longer experimental
2015-09-08 09:01:02 +02:00
Joas Schilling
acf8149f17
Add tests for Action
2015-09-08 09:01:01 +02:00
Joas Schilling
21b83dc730
Allow getting the request type
2015-09-08 09:01:01 +02:00
Joas Schilling
913e2e9ae6
Use an INotification to getCount() and markProcessed()
2015-09-08 09:01:01 +02:00
Joas Schilling
3bdfef9107
Add the request type to the action
2015-09-08 09:01:01 +02:00
Joas Schilling
f0ecfa6e6c
Add the app id to the markProcessed method
2015-09-08 09:01:01 +02:00
Joas Schilling
f16c5a38a8
Add language to the preparation method
2015-09-08 09:01:01 +02:00
Joas Schilling
5437aeeaa2
Nothing is set in stone here yet
2015-09-08 09:01:01 +02:00
Joas Schilling
4e347170ac
Notification API
2015-09-08 09:00:57 +02:00
Morris Jobke
c57595bcb4
Merge pull request #18839 from owncloud/autoloader-supersecure
...
Restrict autoloaded paths to loaded apps (and other enhancements)
2015-09-07 00:09:00 +02:00
Roeland Douma
24f5f50b20
Merge pull request #18742 from owncloud/mimetype-updatedb
...
Introduce mimetype DB update occ command
2015-09-06 16:56:35 +02:00
Robin McCorkell
0fac2e3f3a
Unique exception for invalid autoload paths, better handling
...
Background jobs are tolerant of stale entries left by disabled apps,
which will cause an autoload exception.
2015-09-05 16:50:02 +01:00
Robin McCorkell
cdf01f0419
Split mimetype handling to new class
2015-09-04 17:28:20 +01:00
Lukas Reschke
f9e90e92d4
Encode HTML tags in JSON
...
While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time.
2015-09-03 00:44:46 +02:00
Robin McCorkell
a0dfaf9be3
Clean up TempManager to follow code guidelines
...
tmpBaseDir can be overridden for unit testing purposes
2015-08-30 23:30:56 +01:00
Vincent Petry
723f8c8f1b
Merge pull request #18620 from owncloud/add-public-interface-for-factory
...
Add a public interface for the language factory so apps can use it
2015-08-29 16:44:08 +02:00
Robin Appelman
b67d395089
allow streamed responses in http client
2015-08-29 14:56:08 +02:00
Björn Schießle
6e210d960c
Merge pull request #18423 from owncloud/occ_encrypt_all
...
occ command line tool to encrypt all files
2015-08-28 20:44:55 +02:00
Joas Schilling
37b00b7443
Add since tag
2015-08-28 15:46:55 +02:00
Joas Schilling
a12d354762
Deprecate OC_L10N::get()
2015-08-28 12:04:52 +02:00
Joas Schilling
c3c7689b67
Add a public interface for the language factory so apps can use it
2015-08-27 13:14:50 +02:00
Bjoern Schiessle
8c08dd0ac2
occ tool to encrypt all files
2015-08-26 14:58:22 +02:00
Thomas Müller
534b2e407a
Merge pull request #17662 from owncloud/locking-db
...
Database backend for locking
2015-08-26 03:56:37 +02:00
Lukas Reschke
0a1d551090
Use IClientService to check for remote ownCloud instances
...
1. Allows to set a timeout (though still not perfect but way better than before)
2. Allows to have unit tests
3. I also added unit tests for the existing controller code
4. Corrected PHPDoc on IClient
2015-08-22 14:39:43 +02:00
Joas Schilling
c58316b1ae
Expand the doc blocks on the new methods
2015-08-20 15:35:24 +02:00
Joas Schilling
4314c8fc6f
Use an IEvent object instead of a huge parameter list
2015-08-19 17:44:57 +02:00
Joas Schilling
bc2aa14849
Extend the interfaces IManager and IConsumer to allow passing in the object
2015-08-19 17:44:57 +02:00
Bernhard Posselt
66d8476e9e
Merge pull request #14314 from owncloud/clean-up-ocs-code
...
Cleanup OCS code
2015-08-18 16:47:53 +02:00
Thomas Müller
0b64268910
Adding EventDispatcher to IServerContainer
2015-08-14 15:40:15 +02:00
Lukas Reschke
a7e4785be9
Cleanup OCS code
...
This removes unused code from `OC_OCS` which nobody understood what it really was for anyways.
2015-08-14 13:42:56 +02:00
Thomas Müller
1d219cf799
With V2 we should ensure that the status codes are kept in sync
2015-08-13 10:45:25 +02:00
Joas Schilling
acd54fbeda
Merge pull request #16528 from owncloud/activity-302-improve-settings
...
Activity 302 improve settings
2015-08-11 11:24:27 +02:00
Morris Jobke
d56e03bb94
Merge pull request #18096 from sualko/patch-1
...
add data: to allowed image domains
2015-08-10 23:05:07 +02:00
Thomas Müller
bfb9a8e58e
Merge pull request #18175 from owncloud/automatic-db-prefix-query-builder
...
Automatic db prefix query builder
2015-08-10 21:41:32 +02:00
Joas Schilling
5fea6f753e
Automatically prefix table names with *PREFIX* unless specified
2015-08-10 16:20:42 +02:00
Robin Appelman
58e96e53b0
add method to check if we're inside a transaction
2015-08-10 14:15:44 +02:00
Roeland Jago Douma
f0b617b508
Use DI
...
* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP
2015-08-10 10:45:16 +02:00
Roeland Jago Douma
7e6a2b71fd
Added Capabilities Manager
...
* This should allow the capabilities to be intergrated into the
appframework
* Unit tests
* Throw exception if closure does not return ICapability instance
2015-08-10 10:45:08 +02:00
Vincent Petry
b3a1aef934
Merge pull request #13641 from owncloud/cache-storage-status
...
Store storage availability in database
2015-08-07 17:31:03 +02:00
sualko
ead25de628
add data: to allowed image domains
2015-08-05 11:41:25 +02:00
Thomas Müller
3ecf7fce79
Fix unit test within OCSController
2015-08-03 22:19:04 +02:00
Thomas Müller
649cc2fa89
Remove duplicate and unused code
2015-08-03 21:03:11 +02:00
Morris Jobke
c34e63bb1f
Merge pull request #15543 from rullzer/mimetypedetector
...
Mimetypedetector
2015-07-28 13:35:26 +02:00
Roeland Jago Douma
6db6689740
Added mimetype detector
...
* Copied unit tests from old functions
2015-07-27 14:58:45 +02:00
Morris Jobke
c9e22f70c8
Add PHPDoc for classes and interfaces
2015-07-27 10:49:26 +02:00
Thomas Müller
11244736ae
Merge pull request #17838 from owncloud/sharing-password-policy-master
...
Use a hook to integrate sharing password verification
2015-07-24 16:47:18 +02:00
Thomas Müller
1f8ee61006
Merge pull request #17755 from owncloud/alias-container-alive
...
Add registerAlias method to shortcut interface registration #17714
2015-07-24 13:11:32 +02:00
Thomas Müller
632e39a750
Fix PHPDoc on setPassword
2015-07-23 16:11:06 +02:00
Joas Schilling
8d47260144
Allow types to be method specific
2015-07-22 15:10:34 +02:00
Joas Schilling
20cd0ae55b
Add a log message when the Doctrine Query Builder is retrieved
2015-07-21 15:53:28 +02:00
Joas Schilling
516f7e8299
Add unit tests and automatic quoting
2015-07-21 15:25:47 +02:00
Joas Schilling
1bfb944d51
Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappers
2015-07-21 15:25:47 +02:00
Robin McCorkell
df19cabb44
Store storage availability in database
...
Storage status is saved in the database. Failed storages are rechecked every
10 minutes, while working storages are rechecked every request.
Using the files_external app will recheck all external storages when the
settings page is viewed, or whenever an external storage is saved.
2015-07-20 16:27:26 +01:00
Bernhard Posselt
a4e3939204
add registerAlias method to shorcut interface registration
...
remove unused import
add since tag
fix typo
2015-07-18 13:43:54 +02:00
blizzz
bfb90d10ed
Merge pull request #17046 from nicolas-grekas/fix-16654
...
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:35:25 +02:00
Nicolas Grekas
472d48f6e3
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:00:04 +02:00
Morris Jobke
d52e197b0d
Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolder
...
Add getUserFolder to IRootFolder
2015-07-09 14:29:47 +02:00
Vincent Petry
073e654692
Merge pull request #17304 from owncloud/fix-17265
...
Check if response could get generated
2015-07-06 12:29:07 +02:00
Thomas Müller
403deb2a33
Fixing unit test execution
2015-07-03 18:00:16 +02:00
Thomas Müller
d3ac73c0c9
Remove OC_Log
2015-07-03 18:00:16 +02:00
Thomas Müller
7644c631e4
Merge pull request #15663 from owncloud/remove-ocp-app-register
...
Remove \OCP\App::register()
2015-07-03 13:44:58 +02:00
Morris Jobke
3e97ca3b96
Add getUserFolder to IRootFolder
...
* untangle DI of user specific folders
* allows to autodetect the dependency
2015-07-03 11:11:58 +02:00
Vincent Petry
f70791653c
Merge pull request #17291 from owncloud/mount-manager-public
...
expose the mount manager in the public api
2015-07-03 07:57:31 +02:00
Lukas Reschke
62e3de1bdb
Check if response could get generated
...
`json_encode` fails hard on PHP >= 5.5 if a non UTF-8 value is specified by returning false. Older PHP versions just nullify the value which makes it at least somewhat usable.
This leads to very confusing errors which are very hard to debug since developers are usually not aware of this. In this case I'd consider throwing a fatal exception – since it arguably is an error situation – is a fair solution since this makes developers and administrators aware of any occurence of the problem so that these bugs can get fixed.
Fixes https://github.com/owncloud/core/issues/17265
2015-07-02 11:42:51 +02:00
Robin Appelman
207ce35ee9
phpdoc
2015-07-01 16:07:57 +02:00
Robin Appelman
faf642c31d
expose the mount manager in the public api
2015-07-01 15:57:04 +02:00
Michael Roth
78e02045c1
Changed broken links to php manual
2015-07-01 14:13:18 +02:00
Lukas Reschke
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
Morris Jobke
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
Joas Schilling
738b78f1b0
Use \OC\HintException and translate the hint
2015-06-22 15:34:06 +02:00
Lukas Reschke
1ead0b6f95
Use proper type
...
This is a string
2015-06-19 21:00:42 +02:00
Morris Jobke
eddbdb8f21
Fix missing @since tags in OCP
2015-06-19 10:51:36 +02:00
Joas Schilling
6adddb3095
Merge pull request #16889 from owncloud/group-sorting-fixes
...
Only sort by group name when LDAP is involved
2015-06-19 08:29:25 +02:00
Morris Jobke
6856316122
Fix return value for OCP PHPDoc
2015-06-17 15:47:45 +02:00
Morris Jobke
9e506abec3
Fix OCP PHPDoc
...
* was always a string instead of \OCP\IUser
2015-06-17 11:10:55 +02:00
Vincent Petry
e5d34a2733
Merge pull request #16892 from owncloud/lock-returnfullpath
...
Rethrow LockedException with full path
2015-06-16 16:47:10 +02:00
Joas Schilling
497fe93b6c
Do not return backends but add a method to check for one
2015-06-16 11:31:04 +02:00
Joas Schilling
171f86ca2e
Only sort by group name when LDAP is involved
2015-06-16 11:10:00 +02:00
Vincent Petry
0e3a3dd5d7
Rethrow LockedException with full path
...
Because the path is converted to md5 from the original exception,
rethrow the exception with the correct full path
2015-06-16 10:48:31 +02:00
Lukas Reschke
34f5541088
Add `no-store` to AppFramework
2015-06-15 18:35:41 +02:00
Robin Appelman
ac9f998abd
add compare-and-delete to the memcache interface
2015-06-12 17:28:09 +02:00
Olivier Paroz
71d65cb713
Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
...
* introduces a method in OC_Image which doesn't stretch images when trying to make them fit in a box
* adds the method to all key providers so that they can do their job, as expected by the Preview class
* improves the caching mechanism of Preview in order to reduce I/O and to avoid filling the available disk space
* fixes some long standing issues
* **contains mostly tests**
2015-06-06 16:25:04 +02:00
Morris Jobke
0c9604e3b2
[OCP] update PHPdoc to contain correct @since tags
2015-06-05 17:30:45 +02:00
Morris Jobke
ab5ecb3d22
Fix typo in PHPDoc
2015-06-04 15:19:04 +02:00
Robin Appelman
661c9e2444
add changeLock to the storage api
2015-06-01 13:24:02 +02:00
Robin Appelman
a1372b2fb5
add method to atomically change between shared and exclusive lock
2015-06-01 13:24:02 +02:00
Robin Appelman
e08423f956
release all locks on shutdown
2015-06-01 13:22:56 +02:00
Robin Appelman
35c377f7a9
phpdoc and minor issues
2015-06-01 13:22:56 +02:00
Robin Appelman
536e187e51
add locking to the storage api
2015-06-01 13:22:56 +02:00
Robin Appelman
cdf7f91259
expose locking provider in the server container
2015-06-01 13:22:55 +02:00
Bjoern Schiessle
5549641f1f
improve error messages displayed to the user
2015-05-27 21:00:02 +02:00
Vincent Petry
f1fc7b155c
Merge pull request #16515 from owncloud/deprecate-useless-helper-class
...
Deprecate useless helper class
2015-05-26 12:22:05 +02:00
Thomas Müller
3babcd0344
Merge pull request #16339 from owncloud/master-override-channel
...
Allow change update channel via public API
2015-05-26 11:42:41 +02:00
Lukas Reschke
c1f8829590
Deprecate useless helper class
...
The helper class has no real reason anymore with 8.1.0 as we now have better public APIs. No need for an `IHelper` class like that from my opinion.
2015-05-21 23:35:37 +02:00
Lukas Reschke
a62190a72d
Add support for disallowing domains to the ContentSecurityPolicy
...
For enhanced security it is important that there is also a way to disallow domains, including the default ones.
With this commit every method gets added a new "disallow" function.
2015-05-20 11:44:37 +02:00
Joas Schilling
85f500f070
Merge pull request #16398 from owncloud/fix-php-doc
...
Fix PHPDoc of public interface ILockingProvider
2015-05-18 12:43:07 +02:00
Morris Jobke
fc2c9e8f5f
Fix PHPDoc of public interface ILockingProvider
2015-05-18 11:37:16 +02:00
Bjoern Schiessle
887be709f5
a new approach to display the error message
2015-05-18 10:15:17 +02:00
Victor Dubiniuk
af814ba270
Allow change update channel via public API
2015-05-13 20:29:33 +03:00
Bjoern Schiessle
ccbefb6e75
delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories
2015-05-13 19:06:23 +02:00
Robin Appelman
e0d151505f
improve phpdoc of cache classes
2015-05-05 16:06:28 +02:00
Thomas Müller
4de45b5e61
Merge pull request #15958 from owncloud/usage-of-public-log-interface
...
Use internally \OCP\ILogger instead of \OC\Log
2015-05-04 09:13:26 +02:00
Robin Appelman
ba7d221cff
allow getting the path from the lockedexception
2015-04-30 14:48:42 +02:00
Robin Appelman
96f9573a4b
add memcache based shared/exclusive locking
2015-04-30 14:48:39 +02:00
Robin Appelman
acf30ede95
add compare and swap to memcache
2015-04-30 14:48:39 +02:00
Robin Appelman
29213b6136
extends memcache with add, inc and dec
2015-04-30 14:48:36 +02:00
Morris Jobke
fbba7a61cb
Use internally \OCP\ILogger instead of \OC\Log
...
* this is the preparation for some upcoming logger related changes
* also fixes an issue in the public interface where we request
an internal class as parameter
2015-04-30 11:52:30 +02:00
Morris Jobke
b4a15db046
Merge pull request #15901 from owncloud/fix-share-docs
...
fix several issues with doc blocks on share.php
2015-04-28 10:41:04 +02:00
Joas Schilling
7c65448377
Fix return type of the getRootFolder() method
2015-04-28 09:36:29 +02:00
Joas Schilling
46083006e1
fix several issues with doc blocks on share.php
2015-04-28 08:40:47 +02:00
Thomas Müller
678b7d7e4d
Merge pull request #15860 from owncloud/enc_fallback_old_encryption
...
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
2015-04-27 14:32:19 +02:00
Morris Jobke
93c25a1f4a
Merge pull request #15882 from owncloud/fix-type-annotation
...
Fix type annotation
2015-04-27 14:17:59 +02:00
Lukas Reschke
d0363fe396
Fix type annotation
...
Obviously should be an int
2015-04-27 13:31:18 +02:00
Bjoern Schiessle
27683f9442
fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header
2015-04-27 13:01:18 +02:00
Joas Schilling
5855d23ff9
Make methods explicit public
2015-04-27 11:03:51 +02:00
Joas Schilling
d600955a51
Make getDefaultModuleId public and get module protected
2015-04-27 11:03:51 +02:00
Joas Schilling
1592be117a
Use public interfaces for type hinting
2015-04-24 13:06:03 +02:00
Bjoern Schiessle
24128d1384
only update share keys if the file was encrypted
2015-04-24 10:19:09 +02:00
Morris Jobke
801d715907
Remove \OCP\App::register()
...
This method can be removed. This isn't used anymore since 4.5.0.
It's deprecated since mid 2012 e4679770c4
It doesn't do anything since mid 2012 8a92cd21d6
2015-04-21 11:51:29 +02:00
Morris Jobke
ce2c8533d9
Merge pull request #15735 from owncloud/fix-visibility
...
Fix visibility of interfaces in \OCP
2015-04-20 14:39:15 +02:00
Lukas Reschke
3959f8ac4e
Merge pull request #15637 from owncloud/migrate-certificate-stuff
...
Migrate personal certificate handling to AppFramework controllers
2015-04-20 13:56:35 +02:00
Lukas Reschke
e9d6807c5c
Merge pull request #15733 from owncloud/remove-oc_backgroundjob
...
Removed OC_BackgroundJob - reduce class overhead
2015-04-20 13:17:58 +02:00
Lukas Reschke
1cc2aefa46
Proper return types
2015-04-20 13:00:02 +02:00
Lukas Reschke
a98b819366
Add version to deprecation notice
...
As requested by @MorrisJobke
2015-04-20 10:30:16 +02:00
Lukas Reschke
f672e120fc
Deprecate unused `\OCP\Response::sendFile`
...
This function is unused in our own code and can be better achieved using the AppFramework. Also very easy to do grave mistaked using this function.
2015-04-20 10:02:34 +02:00
Morris Jobke
9cb260d310
Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-usage
...
Fixing OCS API namespace usage
2015-04-20 09:43:19 +02:00
Roeland Douma
d877c1f1e1
Merge pull request #15736 from owncloud/remove-dependency-on-legacy-code-in-ocp
...
Reduce call of legacy wrapper by call the OCP directly
2015-04-19 15:42:07 +02:00
Roeland Douma
3cb5dd68e6
Merge pull request #15737 from owncloud/add-deprecated-version
...
Add version to @deprecated tags
2015-04-19 15:40:53 +02:00
Robin McCorkell
80b892e7ed
Merge pull request #15729 from owncloud/remove-unused-variables
...
Remove unused variables
2015-04-19 12:38:29 +01:00
Morris Jobke
c056c52010
Add version to @deprecated tags
2015-04-19 01:04:59 +02:00
Morris Jobke
9b8ebdadf7
Reduce call of legacy wrapper by call the OCP directly
...
* ref #15734
* reduces the call depth, because the private methods just call OCP stuff
2015-04-19 00:29:09 +02:00
Morris Jobke
96a5b65484
Fix visibility of interfaces in \OCP
2015-04-19 00:26:17 +02:00
Morris Jobke
60b8aa2a83
Removed OC_BackgroundJob - reduce class overhead
...
* method code is now in the static public namespace (5 sloc)
2015-04-18 23:37:32 +02:00
Morris Jobke
f6807337a8
Add @since tag to public namespace constants
2015-04-18 23:19:35 +02:00
Thomas Müller
b7a4972218
Merge pull request #15728 from owncloud/update-iurlgenerator-doc
...
IUrlGenerator - document linkTo properly
2015-04-18 22:48:09 +02:00
Thomas Müller
d2a31bcd93
Merge pull request #15727 from owncloud/cleanup-db-interface
...
DB: remove unused parameter - was forgotten during the migration to doct...
2015-04-18 22:47:40 +02:00
Thomas Müller
c922b09f26
Merge pull request #15725 from owncloud/l10n-public-interface
...
IL10n - add PHPDoc for $options
2015-04-18 22:46:50 +02:00
Morris Jobke
ccf47f40aa
Remove unused variables
...
* should make scrutinizer a lot more happy
* reduces maybe memory footprint
2015-04-18 16:35:19 +02:00
Morris Jobke
eb62e7cc27
IUrlGenerator - document linkTo properly
...
* parameter $args was there since 6.0.0
* see 61a9098b7d
2015-04-18 16:03:37 +02:00
Morris Jobke
47ecfd98a3
DB: remove unused parameter - was forgotten during the migration to doctrine
...
* 377e9a8677
<- doctrine merge
2015-04-18 15:57:13 +02:00
Morris Jobke
9ffac12986
IL10n - add PHPDoc for $options
...
* added in #11549
* undocumented in the public interface
2015-04-18 15:50:17 +02:00
Morris Jobke
f72dabb4eb
fix wrong variable names in PHPDoc
2015-04-18 14:31:28 +02:00
Morris Jobke
11f29f6d95
add visibility of methods in server container and interface
2015-04-18 14:19:22 +02:00
Joas Schilling
4e58f4892a
Move constants to OCP\API so apps can use them
2015-04-18 09:29:51 +02:00
Joas Schilling
5acda185bd
Correctly prefix OC_API with \ since its not in the namespace
2015-04-18 09:12:42 +02:00
Thomas Müller
d671f13f26
Write the type of exception to the log - really helpful for exceptions which hold no message
2015-04-17 13:10:10 +02:00
Bjoern Schiessle
7d4b1b52d0
always create a new instance of the encryption module
2015-04-17 10:31:33 +02:00
Thomas Müller
f32d97750c
Merge pull request #15679 from owncloud/fix-private-member-access
...
Fix private member access of parent class in ocsresponse
2015-04-17 09:13:54 +02:00
Morris Jobke
7644950b48
Add @since tags to all methods in public namespace
...
* enhance the app development experience - you can look up the
method introduction right inside the code without searching
via git blame
* easier to write apps for multiple versions
2015-04-16 17:00:08 +02:00
Morris Jobke
1d30efdd73
Fix private member access of parent class in ocsresponse
...
* noticed while checking PHPDoc
2015-04-16 16:54:01 +02:00
Thomas Müller
fc4127dd62
add $encryptionModuleId to methods of Keys/IStorage
2015-04-22 11:53:05 +02:00
Thomas Müller
40fcc7480c
Merge pull request #15734 from owncloud/add-deprecate-tags
...
Add @deprecated to all methods with a proper method in \OCP
2015-04-21 23:57:49 +02:00
Morris Jobke
0a594cd3a5
Add @deprecated to all methods with a proper method in \OCP
2015-04-20 13:15:45 +02:00
Björn Schießle
4f0437fbde
Merge pull request #15598 from owncloud/fix-enc-file-size-master
...
Fix file size of encrypted files
2015-04-14 16:48:04 +02:00
Thomas Müller
cbe30f740e
remove calculateUnencryptedSize() - not needed
2015-04-14 13:08:59 +02:00
Robin Appelman
8575bb2cb9
Move cross storage copy logic to the storage
2015-04-13 15:13:02 +02:00
Lukas Reschke
0bad8f644a
Merge pull request #15511 from owncloud/fix-typos
...
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
Thomas Müller
1d9bd3d31e
Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
...
Check if the key exists, before trying to delete it
2015-04-09 14:45:40 +02:00
Lukas Reschke
ec69f2838c
Fix typos and some other adjustments
2015-04-09 14:09:09 +02:00
Joas Schilling
45575d0135
Check if the key exists, before trying to delete it
2015-04-09 10:28:02 +02:00
Lukas Reschke
ba52f6f8fc
Merge pull request #15314 from owncloud/app-categories-15274
...
Add different trust levels to AppStore interface
2015-04-09 10:07:32 +02:00
Morris Jobke
9c76d068c3
Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
...
Limit file activities to favorites
2015-04-09 00:18:31 +02:00
Morris Jobke
103d451459
Merge pull request #14987 from rullzer/ocs_password_fix2
...
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Thomas Müller
a4483243ac
fixing license headers - encryption code related
2015-04-07 17:02:49 +02:00
Thomas Müller
111fbabfb4
PHPDoc cleanup - clean code \o/
2015-04-07 13:30:31 +02:00
Bjoern Schiessle
fe74a0cb4f
implement webdav copy
2015-04-07 13:30:31 +02:00
Thomas Müller
664b2bb7af
cleaning up exception mess
2015-04-07 13:30:30 +02:00
Thomas Müller
f20844ac89
PHPDoc
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
e4895bda01
add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files
2015-04-07 13:30:29 +02:00
Thomas Müller
35b97ed672
Adding renameKeys to IStorage
2015-04-07 13:30:29 +02:00
Thomas Müller
bf809ac85a
Removing left overs from old encryption app
2015-04-07 13:30:29 +02:00
Thomas Müller
6ccd3ffa23
adding function getSecureRandom(); to IServerContainer
2015-04-07 13:30:29 +02:00
Bjoern Schiessle
a85e2e0bfd
make recovery settings work
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
2244ea998d
core: documentation fixes
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
506222567e
add deleteKey methods to key storage
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
5bc9ababeb
fix keystorage and add unit tests
2015-04-07 13:30:27 +02:00
Clark Tomlinson
39733c8da1
Initial commit
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
63e7fe608a
create basic interfaces and wrapper to make encryption more modular
2015-04-07 13:30:27 +02:00
Joas Schilling
3bde7c2f67
When guessing the timezone, the offset might only be valid on a given timestamp
2015-04-07 10:13:06 +02:00
Thomas Müller
3bf269e565
Merge pull request #15229 from owncloud/response-setContentLengthHeader
...
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...
2015-04-03 22:51:36 +02:00
Lukas Reschke
0816cf9142
Add experimental applications switch
...
Allows administrators to disable or enabled experimental applications as well as show the trust level.
2015-04-03 13:21:24 +02:00
Roeland Jago Douma
288da619b1
Deprecate functions that only call the urlgenerator anyway
2015-04-01 14:32:49 +02:00
Joas Schilling
730efe25a4
Make scrutinizer happy
2015-04-01 12:13:49 +02:00
Joas Schilling
b95d12700c
Add logic for getting the user from the rss token to the Manager
2015-03-30 15:23:09 +02:00
Roeland Jago Douma
b0aa17b13f
OCS Fixes to allow setting of password without removing additional settings
...
- Added setPassword to share.php
- Fixed OCS API call
- Added unit tests
2015-03-30 14:00:50 +02:00
Vincent Petry
a32c71d25e
Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"
...
This reverts commit 012016d331
.
2015-03-27 18:50:11 +01:00
Thomas Müller
4d12c4a38b
Merge pull request #13938 from owncloud/deprecate-iappconfig
...
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
Bjoern Schiessle
b5fad75e57
add deleteAllFileKeys to public interface and add "uid" as parameter for the
...
update call
2015-03-27 11:51:53 +01:00
Thomas Müller
232518ac54
Merge pull request #15234 from owncloud/encryption2_core
...
core part of encryption 2.0
2015-03-26 21:14:59 +01:00
Bjoern Schiessle
ff9c85ce60
implement basic encryption functionallity in core to enable multiple encryption modules
2015-03-26 20:56:51 +01:00
Andreas Fischer
0f58315543
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.
...
Do not send Content-Length headers with a value larger than PHP_INT_MAX
(2147483647) on Apache PHP SAPI 32-bit. PHP will eat them and send 2147483647
instead.
When X-Sendfile is enabled, Apache will send a correct Content-Length header,
even for files larger than 2147483647 bytes. When X-Sendfile is not enabled,
ownCloud will not send a Content-Length header. This prevents progress bars
from working, but allows the actual transfer to work properly.
2015-03-26 16:37:38 +01:00
Jenkins for ownCloud
b585d87d9d
Update license headers
2015-03-26 11:44:36 +01:00
Lukas Reschke
5f044ebf1b
Add wrapper for Guzzle
2015-03-25 16:04:41 +01:00
Lukas Reschke
5a9c9b86f8
Merge pull request #15153 from owncloud/uniquename-node
...
Add `getNonExistingName()` to the node api
2015-03-24 15:51:12 +01:00
Robin Appelman
d11f01fa0f
Add `getNonExistingName()` to the node api
2015-03-24 15:00:36 +01:00
Lukas Reschke
e2453d78c0
Properly catch whether a share is `null`
...
Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory.
To test this perform the following steps:
* Share file in owncloud 7 (7.0.4.2)
* Delete the parent folder of the shared file
* The share stays is in the DB and the share via the sharelink is inaccessible. (which is good)
* Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones)
* Optional Step: Logout, Reset Browser Session, etc.
* Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL.
* Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file)
* No exception is thrown and no error is logged.
This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8.
Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so.
Fixes https://github.com/owncloud/core/issues/15097
2015-03-24 11:21:58 +01:00
Thomas Müller
afa8872955
Merge pull request #14857 from owncloud/preview-provider-registration-in-manager
...
Preview provider registration in manager
2015-03-20 16:34:22 +01:00
Bernhard Posselt
df24a014b8
If the execute method on the mapper receives an assoc array, it binds by value instead of index
2015-03-19 17:08:46 +01:00
Thomas Müller
3765af4edf
Merge pull request #14986 from owncloud/fixmapperbackw
...
Fix backwards compatibility for mapper execute method
2015-03-19 17:04:01 +01:00
Robin Appelman
73874ca27f
Merge pull request #14704 from owncloud/storage-wrapper-mount
...
pass mountpoint to storage wrapper callback
2015-03-19 16:20:38 +01:00
Bernhard Posselt
f77ae37f23
also use backwards compatible method for mapper
2015-03-18 22:20:23 +01:00
Bernhard Posselt
c52bd10361
fix backwards compatibility for mapper execute method
2015-03-18 09:25:22 +01:00
Morris Jobke
012016d331
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-17 17:19:33 +01:00
Joas Schilling
9c45ab49a1
Use a closure for the files app entry and deprecate old methods
2015-03-17 12:17:09 +01:00
Lukas Reschke
e4c6b0abf5
Merge pull request #14931 from owncloud/issue/14881-closures-for-navigation-entries
...
Issue/14881 closures for navigation entries
2015-03-17 11:28:27 +01:00
Lukas Reschke
b1c19f74a1
Merge pull request #12085 from owncloud/add-swift-mailer
...
Migrate OC_Mail to SwiftMailer
2015-03-17 11:15:39 +01:00
Joas Schilling
970846624f
Allow registering closures for navigation entries
...
This speeds up all pages that don't use the navigation by 0.04sec per app,
because we don't need to create the routing anymore, unless we really need to.
2015-03-16 16:17:43 +01:00
Joas Schilling
c2a5bd6a01
Also add a note that clob does not work in the compare array
2015-03-16 15:41:00 +01:00
Lukas Reschke
7a70fffa6c
Don't fallback to Plaintext per default for legacy class
2015-03-16 14:10:03 +01:00
Joas Schilling
8f06353882
Remove load*() methods from public interface
...
We shall add a factory for that in the future
2015-03-16 12:57:15 +01:00
Lukas Reschke
f92f3a1a6e
Incorporate review changes
2015-03-16 12:47:05 +01:00
Lukas Reschke
13486a5ada
Migrate to SwiftMail
...
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.
Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014
Conflicts:
3rdparty
lib/private/server.php
lib/public/iservercontainer.php
tests/lib/mail.php
tests/settings/controller/mailsettingscontrollertest.php
Conflicts:
3rdparty
lib/private/mail.php
lib/private/server.php
lib/public/iservercontainer.php
settings/ajax/lostpassword.php
settings/application.php
2015-03-16 12:47:05 +01:00
Joas Schilling
8ed27d2ce0
Create an interface for OC_Image and OCP\Image for the public API
2015-03-16 12:45:15 +01:00
Joas Schilling
e518eacba6
Add more type hinting
2015-03-16 12:44:11 +01:00
Joas Schilling
c1f266db88
Add an interface for the preview providers
2015-03-16 12:44:11 +01:00
Joas Schilling
227ff0a9e3
Clean up some docs
2015-03-16 12:44:11 +01:00
Joas Schilling
0b37d5aea3
Move default provider registration to preview manager
2015-03-16 12:44:11 +01:00
Joas Schilling
cae8529359
Register preview providers on the preview manager instead of OC\Preview
2015-03-16 12:44:11 +01:00
Morris Jobke
997a7a2668
Merge pull request #14766 from owncloud/fix-insertifnotexists-poc
...
Allow specifying the compare-array for insertIfNotExists()
2015-03-16 10:31:36 +01:00
Thomas Müller
6927773648
Merge pull request #14776 from owncloud/fix-14629-master
...
verify the file name length not to exceed 255 characters + verify path d...
2015-03-16 09:58:41 +01:00
Lukas Reschke
38fec9b095
Can also be null
...
If the user does not exist this returns null and can lead to nasty bugs since the IDE is not indicating this...
2015-03-13 14:01:24 +01:00
Thomas Müller
80ef53eff0
verify the file name length not to exceed 255 characters + verify path during rename
2015-03-12 10:47:47 +01:00
Roeland Jago Douma
1a0f9c375b
Avatar controller moved to AppFrameWork
...
* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller
2015-03-11 16:37:42 +01:00
Robin Appelman
4f0f175f8b
Allow getting all mount options as array
2015-03-11 15:06:12 +01:00
Robin Appelman
e5c8fd37df
pass mountpoint to storage wrapper callback
2015-03-11 15:06:12 +01:00
Joas Schilling
d1511cdbee
Fix doc blocks of insertIfNotExists() method
2015-03-11 09:05:30 +01:00
Lukas Reschke
6dc59019af
Merge pull request #14346 from owncloud/storage-based-path-validation
...
adding storage specific filename verification
2015-03-10 11:02:47 +01:00
Thomas Müller
214fa44400
Merge pull request #14534 from owncloud/add-child-src
...
Add support for 'child-src' directive
2015-03-10 10:30:44 +01:00
Thomas Müller
89be55a672
let insertIfNotExist() throw the native DBALException - no need to hide the real exception
2015-03-09 22:37:49 +01:00
Joas Schilling
8fa692388b
Allow specifying the compare-array for insertIfNotExists()
2015-03-09 22:37:49 +01:00
Thomas Müller
3623f14e73
no translation service in common storage class
2015-03-09 10:38:38 +01:00
Thomas Müller
e28d314b53
deprecate isValidFileName()
2015-03-09 10:38:38 +01:00
Thomas Müller
4bac595068
adding storage specific filename verification - refs #13640
2015-03-09 10:38:37 +01:00
Lukas Reschke
cdced56f2b
Fix PHPDoc
...
That apparently went lost when changing the signature.
2015-03-04 15:35:41 +01:00
Joas Schilling
b669bf26d6
Fix the behaviour of getLanguageCode() to match the expectation of the name
2015-03-03 16:47:31 +01:00