Morris Jobke
b01c59b224
use old methods and redirect in deprecated methods
2014-12-08 22:29:42 +01:00
Morris Jobke
d6da627eb4
@deprecated messages for \OCP\Config and \OCP\AppConfig
2014-12-08 22:29:42 +01:00
Morris Jobke
50c2a819a0
Extract interaction with config.php into SystemConfig
...
* introduce SystemConfig to avoid DI circle (used by database connection which is itself needed by AllConfig that itself contains the methods to access the config.php which then would need the database connection - did you get it? ;))
* use DI container and use that method in legacy code paths (for easier refactoring later)
* create and use getSystemConfig instead of query() in DI container
2014-12-08 22:29:42 +01:00
Vincent Petry
cae600722e
Add getTagsForObjects in ITags
...
Returns the list of tags that are set on the given object ids.
2014-12-08 22:02:00 +01:00
Morris Jobke
1362c0b67a
Merge pull request #12452 from owncloud/server2server-ng-ocs
...
OCS API for server-to-server sharing
2014-12-08 14:12:03 +01:00
Robin Appelman
f4701d7721
Add public api for mount configurations
2014-12-04 16:47:27 +01:00
Lukas Reschke
db9765b4d5
Merge headers
...
Otherwise the headers from `JSONResponse` are gone and the Content-Type of the response would be `text/html` instead of `application/json; charset=utf-8`. This leads to broken scripts since we set the `nosniff` tag, furthermore this is very bad from a security PoV.
2014-12-04 14:45:15 +01:00
Bjoern Schiessle
698ecbf308
OCS API for server-to-server sharing
2014-12-04 13:18:13 +01:00
Morris Jobke
5b3dbb4ef8
add missing public interface for iOS client app id
2014-12-02 16:10:07 +01:00
Lukas Reschke
ffd1fc42e7
Merge pull request #12427 from owncloud/issue/6101-deprecate-namespaced-functions
...
Depcrate namespaced functions, since they can not be autoloaded
2014-12-01 09:38:15 +01:00
Bjoern Schiessle
00ad7d48c7
add activity priorities to core so that other apps can reuse it
2014-11-28 10:37:16 +01:00
Morris Jobke
b188710af3
Merge pull request #12472 from owncloud/modifyCookies
...
Add functions to modify cookies to response class
2014-11-28 10:16:22 +01:00
Joas Schilling
7b8824a4e3
Move iHomeStorage to own file
2014-11-27 17:47:20 +01:00
Joas Schilling
dfde04291e
Move share interfaces to own files so they can be autoloaded
2014-11-27 17:47:19 +01:00
Lukas Reschke
d197f43475
Use server container
2014-11-27 14:36:11 +01:00
Lukas Reschke
048139074d
Add functions to modify cookies to response class
...
Currently there is no AppFramework way to modify cookies, which makes it unusable for quite some use-cases or results in untestable code.
This PR adds some basic functionalities to add and invalidate cookies.
Usage:
```php
$response = new TemplateResponse(...);
$response->addCookie('foo', 'bar');
$response->invalidateCookie('foo');
$response->addCookie('bar', 'foo', new \DateTime('2015-01-01 00:00'));
```
Existing cookies can be accessed with the AppFramework using `$this->request->getCookie($name)`.
2014-11-27 14:19:00 +01:00
Joas Schilling
a109f94fee
Depcrate namespaced functions, since they can not be autoloaded
2014-11-26 11:01:24 +01:00
Morris Jobke
c5fa8f1bdc
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
...
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
Joas Schilling
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
Joas Schilling
711912a7b3
Move namespaced constants to namespaced class
2014-11-25 16:27:27 +01:00
Thomas Müller
c503ecd544
Introduce app info xml parser including basic unit test - necessary for #10777
2014-11-25 11:53:28 +01:00
Morris Jobke
1b17429c1d
Merge pull request #12142 from owncloud/DeprecateOldIAPICalls
...
Deprecate older API wrappers and calls
2014-11-24 14:01:49 +01:00
Bjoern Schiessle
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
Lukas Reschke
4302a78b27
Deprecate older API wrappers and calls
...
Those old classes have now non-static pendants and can be deprecated IMHO.
2014-11-12 17:39:25 +01:00
Robin Appelman
43eb375ace
Add \OC\App\Manager to handle enabling/disabling apps
2014-11-10 13:52:52 +01:00
Lukas Reschke
8f1fa32e1f
Merge pull request #11998 from owncloud/add-get-logger-to-interface
...
Add getLogger() to IServerContainer
2014-11-06 16:04:54 +01:00
Lukas Reschke
24ca2d858f
Add OCP\Security\IHasher
...
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.
Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
2014-11-06 15:16:14 +01:00
Lukas Reschke
0e3e1e3563
Add getLogger() to IServerContainer
...
Makes my IDE complaining less ;-)
2014-11-06 13:36:36 +01:00
Thomas Müller
e624e9064c
Merge pull request #11965 from owncloud/fix-jsonresponse
...
fix typo in content type for JSONResponse
2014-11-05 14:03:12 +01:00
Bernhard Posselt
91a23bfa9c
fix typo in content type
2014-11-05 12:04:56 +01:00
Lukas Reschke
be5ae6c44f
Support HTML in logo claim
2014-11-03 21:14:27 +01:00
Vincent Petry
bed81ea854
Merge pull request #11080 from owncloud/addheader-text-2
...
Fix the addHeader tag attributes text methods to not ignore the text parameter
2014-10-30 18:13:46 +01:00
Morris Jobke
e2001c6d31
Merge pull request #11821 from owncloud/generic-response
...
Add a generic data response
2014-10-30 14:05:25 +01:00
Vincent Petry
ec1a73fab9
Added OC.L10N namespace with translation functions
...
Added addTranslations and fixed de.js file
Fixed de.js to use OC.L10N.register() and use to correct expected
format.
Added JS unit tests for OC.L10N class
Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
Bernhard Posselt
0696099bad
add dataresponse
...
fix docstrings
adjust copyright date
another copyright date update
another header update
implement third headers argument, fix indention, fix docstrings
fix docstrings
2014-10-29 09:43:47 +01:00
Lukas Reschke
510d0b2cf3
Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter
...
Also support closing tags with no text content given
Conflicts:
lib/private/template.php
2014-10-28 11:15:58 +01:00
Morris Jobke
290e9cd5b2
Merge pull request #11787 from owncloud/fix-php-docs
...
Fix PHPDoc
2014-10-27 14:46:41 +01:00
Lukas Reschke
f7c393fa9f
Fix PHPDoc
...
Stop my IDE and Scrutinizer from complaining.
2014-10-27 13:38:40 +01:00
Morris Jobke
63f2b1f460
Merge pull request #11767 from danbartram/add_db_rollback
...
Add missing DB rollback functionality
2014-10-24 19:52:56 +02:00
Dan Bartram
9c1015b790
Add missing DB rollback functionality
2014-10-24 17:44:06 +01:00
Robin Appelman
83c74b80ad
Add \OC\TempManager to handle creating and cleaning temporary files
2014-10-24 12:18:46 +02:00
Robin Appelman
e6f6cdd19f
Bit more cleanup
2014-10-22 12:29:53 +02:00
Robin Appelman
97a6f5c46b
Extend \OCP\IDBConnection to cover more use cases
2014-10-22 12:26:43 +02:00
Robin Appelman
beb1c6ad74
Allow adding events that hapend before the event logger was loaded
2014-10-20 13:38:38 +02:00
Robin Appelman
6e08014781
Rename namespace to Diagnostics
2014-10-20 13:38:38 +02:00
Robin Appelman
b71d1d3616
Add QueryLogger interface to allow apps to get a list of used queries
2014-10-20 13:38:37 +02:00
Robin Appelman
d38050cf52
Add an EventLogger interface to allow apps to get a log of the request timeline
2014-10-20 13:38:37 +02:00
Bernhard Reiter
b416f7d8ac
PHPDoc fixes as suggested by @MorrisJobke.
2014-10-14 00:06:33 +02:00
Bernhard Reiter
1770179648
Add getTag() function for accessing of a single tag.
2014-10-14 00:06:33 +02:00
Bernhard Reiter
7e9baafc53
Add option to include tags for shared items.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
b33cb0e342
Fix a comment.
2014-10-14 00:06:07 +02:00
Robin Appelman
12ac3a800d
Expose getAppKeys trough \OCP\IConfig
2014-10-08 14:22:17 +02:00
Lukas Reschke
8c8e5c168e
Merge pull request #10107 from owncloud/sharing_group_shares
...
[sharing] group shares
2014-09-29 20:26:41 +02:00
Thomas Müller
e5a111b80e
Merge pull request #11285 from owncloud/dav-permissions-create
...
Fix dav permissions for folders
2014-09-26 09:21:32 +02:00
Vincent Petry
9fc23e1967
Merge pull request #10934 from owncloud/datadir-write-setup
...
Don't complain about non-writable datadirs before we're installed
2014-09-25 14:32:32 +02:00
Robin Appelman
ccb4475a8d
Expose creatable permissions trough fileinfo
2014-09-25 14:00:13 +02:00
Bjoern Schiessle
d5fc011c90
some small fixes
2014-09-25 11:29:57 +02:00
Bjoern Schiessle
a6cc810349
mark exclude list as deprecated. It neither used by the files app nor by the
...
calendar or contacts app. It doesn't make sense to build a exclude list by the
share API, the apps knows best which are valid targets.
2014-09-24 14:02:02 +02:00
Lukas Reschke
75e45ac786
Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser
...
Do not show exception to the end-user - use a proper error page instead
2014-09-23 18:36:40 +02:00
Thomas Müller
c587a4aaa2
Merge pull request #11222 from owncloud/store-users-timezone-master
...
send browsers timezone back tp the server on login
2014-09-23 13:45:21 +02:00
Lukas Reschke
6eeb905871
Do only follow HTTP and HTTPS redirects
...
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)
Get final redirect manually using get_headers()
Migrate to HTTPHelper class and add unit tests
2014-09-22 20:02:32 +02:00
Thomas Müller
814114ab8e
enhance formatDate function to accept an optional argument containing the time zone
2014-09-22 15:03:28 +02:00
Robin Appelman
6fa3280c2a
Inject config into checkserver and cleanup tests
2014-09-18 13:33:13 +02:00
Lukas Reschke
d07d5915c9
Remove unused and overflowing function
...
Resolves https://github.com/owncloud/core/issues/10991 failure 4
2014-09-18 10:21:28 +02:00
Lukas Reschke
6d3757f864
Do not show exception to the end-user
...
Log the error instead of potentially leaking sensitive information
2014-09-17 13:17:52 +02:00
Morris Jobke
b644e8a5e7
Merge pull request #10932 from owncloud/issue/10926
...
Add a method to get the absolute url for a route
2014-09-17 13:05:26 +02:00
Lukas Reschke
d2743e6ad6
Merge pull request #7254 from owncloud/core-sortalgo
...
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Lukas Reschke
70abce0482
Merge pull request #10739 from owncloud/eventsource-public
...
Add EventSource to the public API
2014-09-08 18:46:27 +02:00
Joas Schilling
c5b5378558
Add a method to get the absolute url for a route
...
Fix #10926
2014-09-08 14:43:14 +02:00
Robin Appelman
fa3393674c
Better phpdoc and method naming
2014-09-04 13:26:51 +02:00
Lukas Reschke
373d1c5e9f
Merge pull request #10642 from owncloud/securityutils
...
Add some security utilities
2014-09-03 15:28:42 +02:00
Lukas Reschke
dcea6de26a
Fix quoting
2014-09-03 14:16:55 +02:00
Lukas Reschke
a54af89d8a
Add test for the second argument
2014-09-03 14:13:12 +02:00
Robin Appelman
dad53180bc
Add event source to the public api
2014-09-03 13:36:15 +02:00
Lukas Reschke
20a7fb0334
Fix CHAR_SYMBOLS
2014-09-03 12:22:21 +02:00
Lukas Reschke
77c0adb520
Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils
2014-09-03 11:04:49 +02:00
Lukas Reschke
50b430ee7c
Add char consts, hash the specified password for the HMAC
2014-09-03 11:03:27 +02:00
Morris Jobke
4024960a0e
Merge pull request #10780 from owncloud/config-public
...
Extend public config interface
2014-08-31 15:54:35 +02:00
Lukas Reschke
8009df0b60
Merge pull request #10420 from owncloud/external-share-self-signed
...
Make external shares work with imported self signed certificates
2014-08-31 15:50:30 +02:00
Robin Appelman
0a1e5aebf1
Extend public config interface
2014-08-31 15:27:36 +02:00
Lukas Reschke
ae3425d2da
Merge branch 'master' into securityutils
...
Conflicts:
lib/private/util.php
2014-08-31 15:21:09 +02:00
Morris Jobke
73685892ed
Merge pull request #10770 from owncloud/getUserFolder
...
update public interface for getUserFolder
2014-08-31 13:26:32 +02:00
Morris Jobke
ac6324a5d0
update public interface for getUserFolder
2014-08-31 11:16:40 +02:00
Robin Appelman
c158db7200
Add certificate class
2014-08-31 10:47:50 +02:00
Robin Appelman
c1b11571ea
Move certificate management interface from files_external to core
2014-08-31 10:47:50 +02:00
Robin Appelman
ecdbf00628
Move certificate management code to core
2014-08-31 10:45:10 +02:00
Robin Appelman
a58e670ae5
Also extend public server interface
2014-08-31 10:20:00 +02:00
Robin Appelman
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00
Clark Tomlinson
cb0da1178b
Merge pull request #10653 from owncloud/x-forwarded-for
...
Add support for getting the real client IP behind proxies
2014-08-27 10:32:34 -04:00
Björn Schießle
c35d60f6d8
Merge pull request #9915 from suraia/unsharefromself-source
...
Allow specifying the item source in unshareFromSelf().
2014-08-27 10:31:35 +02:00
Lukas Reschke
d26a9c3c58
Add some security utilities
...
This adds some security utilities to core including:
- A library for basic crypto operations (e.g. to encrypt passwords)
- A better library for cryptographic actions which allows you to specify the charset
- A library for secure string comparisions
Remove .htaccess
Remove .htaccess
Fix typo
Add public API
Use timing constant comparision
Remove CBC constant
Adjust code
Remove confusing $this
2014-08-27 00:18:04 +02:00
Lukas Reschke
7acdd018a1
Add support for getting the real client IP behind proxies
...
Fixes https://github.com/owncloud/core/issues/10624
Fix copy paste fail
Add unittest for comma separated headers
Revert 3rdparty
2014-08-27 00:05:04 +02:00
Lukas Reschke
88c3a4a31a
Expose setSystemValue
2014-08-22 15:53:23 +02:00
Morris Jobke
ab6ee6a600
Add doc for \OCP\Files\FileInfo space constants
2014-08-19 16:49:51 +02:00
Morris Jobke
b3b3354809
move to public namespace
2014-08-19 14:05:08 +02:00
Thomas Müller
c08a1e6455
according to PHPDoc this function shall return the entity
2014-08-17 22:27:55 +02:00
Thomas Müller
c1102b1671
Merge pull request #10417 from owncloud/update_deprecation_doc
...
update deprecation docs
2014-08-14 17:54:23 +02:00
Jörn Friedrich Dreyer
fd798fd982
update deprecation docs
2014-08-14 12:22:34 +02:00
Bjoern Schiessle
d9f35d8c15
we need the recipient as a additional parameter to know for which share the notification was send
2014-08-13 17:02:51 +02:00
Vincent Petry
173059f6d0
Fixed file list sorting
...
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)
- added OC.Util.naturalSortComparator that uses the same algo that was
used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
2014-08-11 13:28:53 +02:00
Björn Schießle
d35bfc9a4c
Merge pull request #9520 from owncloud/theme_urls
...
Add ability to theme iOS and Android client URLs just like desktop URLs.
2014-08-05 17:53:18 +02:00
scolebrook
2e127d2c5e
Add ability to theme iOS and Android client URLs just like desktop URLs.
2014-08-05 13:16:51 +02:00
Bjoern Schiessle
41cca70a63
don't display share permission if resharing was disabled by the admin
2014-08-05 10:57:51 +02:00
Thomas Müller
4eb2b4e1b0
Merge pull request #10051 from owncloud/preview-empty-text
...
Use svg mimeicons for empty text files
2014-07-31 11:38:29 +02:00
Robin Appelman
4a9b0d5465
Use svg mimeicons for empty text files
2014-07-30 16:31:37 +02:00
Morris Jobke
889088f72d
Fix template rendering for 'blank' templates
2014-07-29 16:49:50 +02:00
Björn Schießle
c53b56e313
Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
...
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
Michael Kuhn
ecdd04374a
Allow specifying the item source in unshareFromSelf().
2014-07-26 02:00:49 +02:00
Robin Appelman
acafb4a426
Merge pull request #9669 from owncloud/group-public
...
Add group management to the public api
2014-07-25 17:55:12 +02:00
Bjoern Schiessle
ecc1f92bb6
add OCS api call to set expire date for link shares
2014-07-25 13:38:18 +02:00
Thomas Müller
a8b6cc6a07
- adding default value for $recoveryPassword
...
- set password correctly in lost password
2014-07-24 12:50:39 +02:00
Joas Schilling
01878153e0
Add language parameter to public API for getL10N()
...
Fix #9756
2014-07-21 14:50:34 +02:00
Robin Appelman
94fa21d146
Add group management to the public api
2014-07-16 14:25:31 +02:00
Jörn Friedrich Dreyer
b3106c321c
use correct IUser in interface
2014-07-15 17:41:44 +02:00
Robin Appelman
51d0bdc90c
Expose the user manager in the public server container
2014-07-14 15:10:56 +02:00
Robin Appelman
20c1ce7f47
Add public interfaces for User, UserManager and UserSession
2014-07-14 15:10:51 +02:00
Thomas Müller
8363f3c635
Adding new interface \OCP\Activity\IExtentsion
...
Adding method getNotificationTypes()
Adding method filterNotificationTypes()
Adding method getDefaultTypes()
Adding method translate() and getTypeIcon()
Adding method getGroupParameter()
Adding method getNavigation()
Adding method getNavigation()
Adding method isFilterValid() and getQueryForFilter()
Adding unit tests for \OC\ActivityManager
2014-07-08 09:04:37 +02:00
Thomas Müller
2327d41b11
Merge pull request #9269 from owncloud/fix_versions_preview
...
change order of registering api and capabilities to fix file version previews
2014-07-04 15:25:24 +02:00
Vincent Petry
ed29e7d160
Merge pull request #9329 from owncloud/sharing_check_target
...
don't move a share mount point into a different mount point
2014-07-02 21:01:03 +02:00
Bjoern Schiessle
735eac6c9d
add a explicit interface for the home storage
2014-07-01 17:31:33 +02:00
Jörn Friedrich Dreyer
5a588333b2
introduce and use getCurrentConnection()
2014-07-01 16:45:00 +02:00
Robin Appelman
1c43081d38
Detect removed public shares
2014-07-01 14:36:06 +02:00
Robin Appelman
d78a2a9f78
Add StorageNotAvailableException
2014-06-30 15:46:37 +02:00
Vincent Petry
fd8b5680dd
Merge pull request #8383 from owncloud/object_storage
...
Object storage
2014-06-27 16:53:03 +02:00
Jörn Friedrich Dreyer
c112a1d323
move to stream based IObjectStore interface, rearrange & reformat code
2014-06-20 12:27:47 +02:00
Jörn Friedrich Dreyer
f2fe00e972
fix rebase, use 'object::user:<username>' or 'object::store:<storageid> as storage id, by default use container/bucket name for storageid, make storageid configurable, store user only for HomeObjectStoreStorage, change updateObject() to writeObject()
2014-06-18 15:20:26 +02:00
Jörn Friedrich Dreyer
5cae863408
change architecture from inheritance to composition
2014-06-18 12:53:20 +02:00
Vincent Petry
799205488c
Prevent loadApps on upgrade
...
Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.
2014-06-18 11:10:07 +02:00
Bernhard Posselt
93169eca1e
also handle lowercase headers
2014-06-11 01:20:09 +02:00
Bernhard Posselt
1002281dae
handle http accept headers more gracefully
2014-06-11 00:54:25 +02:00
Vincent Petry
5cebb6fb9b
Merge pull request #4553 from owncloud/update_search_classes
...
Update search classes
2014-06-06 13:24:16 +02:00
Jörn Friedrich Dreyer
aaf0d13171
make search non-static, add ISearch to server container, make legacy a static wrapper for it, move provider and result to public api
2014-06-06 01:17:02 +02:00
Bernhard Posselt
587a8df566
remove controller serializers
2014-06-05 18:00:36 +02:00
Thomas Müller
ec7225da66
remove file locking - code will continue to live in it's own app
2014-06-04 20:11:54 +02:00
ringmaster
54865815f5
Move Lock to private namespace, add interface. Update PHPDoc.
2014-06-04 07:55:45 +02:00
ringmaster
392a1b6662
Removed unused vars/declarations, update PHPDoc.
2014-06-04 07:55:45 +02:00
ringmaster
f9dbdb7c5c
Add actual locking and log changes necessary for debugging.
2014-06-04 07:55:44 +02:00
ringmaster
dc1e3620d2
Continued flock work.
2014-06-04 07:55:44 +02:00
ringmaster
5365ae416e
flock changes. Work in progress.
2014-06-04 07:55:44 +02:00
Morris Jobke
9a67986473
add OCP\Config:deleteSystemValue
2014-06-02 18:31:43 +02:00
Lukas Reschke
c8b5ae675c
Fix PHPDoc
...
- Remove not anymore existing parameters
- Fix typo
2014-06-01 21:46:05 +02:00
Robin Appelman
8c5521fdfc
Add $storage->instanceOfStorage to handle instanceof for storage wrappers
2014-05-29 13:45:50 +02:00
Bart Visscher
a51e9a5cfe
Merge pull request #8136 from owncloud/contactsmanager-register
...
Implement the register function of OC\ContactsManager
2014-05-27 22:35:50 +02:00
Bjoern Schiessle
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
Thomas Müller
8749442fec
no return on register and unregister
2014-05-19 21:39:19 +02:00
Thomas Müller
bb6fac1102
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-05-19 21:35:13 +02:00
Morris Jobke
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Thomas Müller
95741f3936
Merge pull request #8435 from owncloud/fix-8322-master
...
Expose permission via WebDAV
2014-05-19 16:52:03 +02:00
Joas Schilling
ab7ae004f7
Automatically copy the share expiration date when new shares are created
...
Fix #4823
2014-05-19 01:38:47 +02:00
Björn Schießle
b52cb8f557
Merge pull request #8604 from owncloud/sharing_encforce_password
...
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
Bernhard Posselt
9e36c33104
use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability
2014-05-14 01:09:48 +02:00
Bernhard Posselt
512373fadf
provide a way to detect the language that is being used (e.g. for clientside javascript language selection
2014-05-14 01:09:48 +02:00
Robin McCorkell
f7e777f7d2
Fix various code errors detected by Scrutinizer
...
Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
2014-05-13 19:09:14 +01:00
Robin McCorkell
87b548ed91
Fix all PHPDoc types and variable names, in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
a7ae2e874a
Squash 'a | b' into 'a|b', in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
b5bc37d2e4
Fix @return array PHPDocs, in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
b653ad164b
Replace @returns with @return, in /lib
2014-05-13 19:08:14 +01:00
Thomas Müller
1d18fd4e6d
Merge pull request #8482 from owncloud/public-logger
...
Make logger available in the container
2014-05-12 16:40:58 +02:00
Morris Jobke
6499995474
Merge pull request #8477 from owncloud/better-controllers
...
Better appframework controllers
2014-05-12 01:07:49 +02:00
Morris Jobke
7a6ff56b13
Merge pull request #8274 from owncloud/appframework-db
...
Port database layer from appframework to core
2014-05-12 00:12:19 +02:00
Bernhard Posselt
1d45239c65
adjust license headers to new mail address
2014-05-11 17:54:08 +02:00
Bernhard Posselt
cb666c18d6
rename formatter to responder, formatResponse to buildResponse
2014-05-11 17:54:08 +02:00
Bernhard Posselt
80648da431
implement most of the basic stuff that was suggested in #8290
2014-05-11 17:54:08 +02:00
Bernhard Posselt
3af30625ab
Make db connection protected
2014-05-11 12:54:44 +02:00
Bernhard Posselt
9a4d204b55
add cors middleware
...
remove methodannotationreader namespace
fix namespace for server container
fix tests
fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request
remove uneeded local in cors middleware registratio
dont uppercase cors to easily use it from routes
fix indention
comment fixes
explicitely set allow credentials header to false
dont depend on better controllers PR, fix that stuff later
split cors methods to be in a seperate controller for exposing apis
remove protected definitions from apicontroller since controller has it
2014-05-09 23:34:41 +02:00
Bernhard Posselt
b4298c68ca
- make logger available in the container
...
- inject logger class into log
- adding PHPDoc comments and fixing typos
2014-05-09 23:26:20 +02:00
Vincent Petry
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
Vincent Petry
4a493c8835
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 11:43:50 +02:00
Thomas Müller
c92c577b5e
- Introduce isShared() and isMounted() on FileInfo class
...
- Reuse these methods on determineIcon()
- Generate permission string for the desktop client
- expose {http://owncloud.org/ns }permissions as additional WebDAV property containing the permission string
2014-05-02 17:37:16 +02:00
Bart Visscher
614cc67f88
Correct return type for getFilePath
2014-05-01 18:12:17 +02:00
Bart Visscher
c34659dd89
Better documentation for isValidSource function
2014-05-01 18:11:55 +02:00
Bart Visscher
66b1ad0a9b
Merge branch 'master' into type-hinting-sharing
...
Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
2014-04-28 17:59:41 +02:00
Bart Visscher
fc9371ae10
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-04-26 10:55:25 +02:00
Bernhard Posselt
5199e4508a
dont update entity and dont run an update query if an entity wasnt changed at all
2014-04-23 13:43:17 +02:00
Bjoern Schiessle
c4e0fb75a4
add api to get shares from a specific user
2014-04-23 12:54:24 +02:00
Joas Schilling
704b9e6a0d
Merge pull request #8009 from owncloud/feature/add-sharing-target
...
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-23 12:49:06 +02:00
Morris Jobke
0ebb4662ec
Merge pull request #8281 from owncloud/public-responses
...
make download and redirectresponse public
2014-04-22 00:08:04 +02:00
Lukas Reschke
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
Bernhard Posselt
7e447f4f42
make download and redirectresponse public
2014-04-20 16:12:46 +02:00
Lukas Reschke
886c5177e7
Fix typo & add type
2014-04-20 01:09:25 +02:00
Bernhard Posselt
4a7e0561ca
move db into iservercontainer
2014-04-19 19:30:12 +02:00
Bernhard Posselt
95a83233a9
fix doc strings for db facade
2014-04-19 15:32:17 +02:00
Bernhard Posselt
93237d87ec
fix scrutinizer issues
2014-04-19 15:25:36 +02:00
Bernhard Posselt
f260951825
port database layer from appframework to core
2014-04-19 14:56:16 +02:00
Morris Jobke
a2a0eb370b
Merge pull request #8222 from owncloud/type-hinting
...
Type hinting fixes
2014-04-17 16:08:15 +02:00
Bart Visscher
cc8a4511fe
Fix PHPdoc in lib/public
...
using scrutinizer patch
2014-04-15 22:55:47 +02:00
Bart Visscher
a9bf3df82d
Fix PHPdoc in OC\Share\Share and OCP\Share
2014-04-15 21:05:44 +02:00
Lukas Reschke
b04d95b116
Remove uneeded usages of nosniff
2014-04-13 12:48:16 +02:00
Bart Visscher
5c412f480c
$key is not needed for registering contactsmanager callbacks
2014-04-10 18:06:31 +02:00
Bernhard Posselt
f06ef8aa4b
register middleware as string to not force request to be instantiated too early and thus not having url parameters
2014-04-09 23:59:57 +02:00
Joas Schilling
015b9b1dac
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-09 15:02:05 +02:00
Thomas Müller
73ac3d0fcd
Merge pull request #7643 from owncloud/chainable_response
...
Chainable Response in AppFramework
2014-04-08 22:42:43 +02:00
Thomas Müller
85e7921b14
fixing undefined exception classes
2014-04-07 20:57:08 +02:00
blizzz
0c444fb2fb
Merge pull request #8017 from Raydiation/master
...
Remove dependency on container, removing service locator antipattern
2014-04-07 10:19:18 +02:00
Thomas Müller
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
Bernhard Posselt
5f3b8c45d7
Remove dependency on container, removing service locator antipattern
2014-04-02 17:54:33 +02:00
Bart Visscher
6b061c236d
Merge branch 'master' into type-hinting
...
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Bjoern Schiessle
8e34812393
always encrypt files to owner
2014-03-31 18:19:48 +02:00
Vincent Petry
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
Thomas Müller
1816f43722
Merge pull request #7864 from owncloud/routing-performance
...
Routing performance
2014-03-25 23:00:36 +01:00
Bjoern Schiessle
6afd496d9b
remove prepFileTarget() seems that it is no longer in use
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
b602662578
add a "helper" and a "hooks" class. Move constants needed by multiple classes
...
to a "constants" class
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
8b6d1d3bf2
added private share api
2014-03-25 17:47:24 +01:00
Robin Appelman
f17674fef2
Only load routes from the apps we need
2014-03-24 15:41:46 +01:00
Thomas Müller
3eb5898f7b
use \OC_Mail::validateAddress() to validate the email address - fixes #7862
2014-03-24 15:35:07 +01:00
Robin Appelman
0d0aac6fff
Load the routes when matching or generating a route instead of when creating the router
2014-03-24 14:55:03 +01:00
Lukas Reschke
2c561c9c50
Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords
...
Obfuscate passwords in ext storage config
2014-03-20 16:31:12 +01:00
Morris Jobke
970878b581
Merge pull request #7818 from owncloud/logException_undefined_variable
...
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 11:14:30 +01:00
Thomas Tanghus
51fe3b8ccd
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 10:23:40 +01:00
Vincent Petry
80180bea32
Added IV for ext storage password encryption
2014-03-19 11:42:22 +01:00
Thomas Müller
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
Thomas Müller
756bbe8786
Merge pull request #7649 from owncloud/routing-public
...
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
Bjoern Schiessle
9d32475260
finally fix the paths for the OCS Share API
2014-03-13 15:16:59 +01:00
Bjoern Schiessle
36885dc64c
fix path creation for re-shares, issue #7662
2014-03-11 12:58:46 +01:00
Robin Appelman
4a2b16d76d
update copyright header
2014-03-10 14:40:05 +01:00
Thomas Müller
73a1ece753
adding an explicit close method to class session - write operations (set and remove) being called after close() will throw an exception
2014-03-10 14:21:12 +01:00
Robin Appelman
8ab7d18a6a
Move the router classes to a namespace and expose it with a public interface
2014-03-10 14:04:58 +01:00
Thomas Tanghus
a1aacc18df
Add @return PHPDocs
2014-03-10 09:31:30 +01:00
Thomas Tanghus
8f6ea900f2
Chainable Response in AppFramework
2014-03-09 23:01:16 +01:00
Robin Appelman
65f52fee4f
Fix FileInfo->getType errors
2014-03-07 14:52:44 +01:00
Bart Visscher
8951328a87
More PHPDoc updates
2014-02-28 21:03:43 +01:00
Bart Visscher
e2286c6598
Type is with a small letter
2014-02-28 14:37:20 +01:00
Bart Visscher
35a8dfb2fa
More PHPDoc fixes, using scrutinizer patches as hints
2014-02-28 13:53:41 +01:00
Bart Visscher
89e0763d3d
Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10N
2014-02-28 13:37:41 +01:00
Bjoern Schiessle
e3f676e009
fix path in sharing results if it is a file in the Shared folder
2014-02-25 17:27:23 +01:00
Lukas Reschke
719f1111b6
Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
...
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
Thomas Müller
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
Vincent Petry
797e0a614c
Added extra checks for invalid file chars in newfile.php and newfolder.php
...
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
check for invalid characters
2014-02-18 17:54:32 +01:00
Lukas Reschke
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
Thomas Müller
750ffa8231
Merge pull request #7156 from owncloud/backgroundjob-public
...
Add the background job list to the public server container
2014-02-14 23:11:10 +01:00
Thomas Müller
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
icewind1991
2a7509ee50
Merge pull request #6748 from owncloud/fileinfo
...
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
Thomas Müller
4b84e3a7e8
Merge pull request #4624 from owncloud/convert-oc_appconfig
...
Convert OC_Appconfig to object interface
2014-02-13 15:51:40 +01:00
Bart Visscher
2c6411b897
$default of OC_Config::[gs]etValue can have more then string as type
2014-02-12 17:38:32 +01:00
icewind1991
7af456730e
Merge pull request #6964 from owncloud/storagestatistics-reuse
...
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
Robin Appelman
62288971ca
Additional phpdoc
2014-02-12 13:32:16 +01:00
Robin Appelman
3aafa837b8
Remove internal methods from the public interface
2014-02-12 13:25:50 +01:00
Robin Appelman
60bd9d512d
Merge branch 'master' into backgroundjob-public
2014-02-12 13:21:47 +01:00
Vincent Petry
c442a03d3a
Merge pull request #7075 from owncloud/quota-storagexsendfile
...
Added isLocal() method to storage, used for xsendfile
2014-02-11 14:49:39 +01:00
Robin Appelman
a6399f9cef
Add the background job list to the public server container
2014-02-11 14:00:24 +01:00
Robin Appelman
a7c50514ac
Merge branch 'master' into convert-oc_appconfig
2014-02-11 13:26:54 +01:00
Robin Appelman
753af3a3ff
Merge branch 'master' into storagestatistics-reuse
2014-02-10 14:01:32 +01:00
Joas Schilling
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
Robin Appelman
b537d90e58
use the 'new' server container for appconfig
2014-02-07 13:45:59 +01:00
Bjoern Schiessle
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
Jörn Friedrich Dreyer
81031984a6
remove duplicate param lines for OCP\User::getUsers()
2014-02-07 12:12:16 +01:00
Vincent Petry
788c8540aa
Added isLocal() method to storage, used for xsendfile
...
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
2014-02-06 20:53:15 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
Robin Appelman
1e79369338
merge master into storagestatistics-reuse
2014-02-05 13:36:55 +01:00
Jan-Christoph Borchardt
0609f30d1c
Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
...
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
icewind1991
a27529709b
Merge pull request #6647 from owncloud/memcache-public
...
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Pellaeon Lin
099b71c712
Merge branch 'master' into pr-exceed_upload_limit_msg
...
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
Robin Appelman
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
Thomas Müller
ab9ddda8f2
Merge pull request #6907 from owncloud/webdav-logexceptions
...
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
Robin Appelman
3c1ab66eda
Reuse the calculated free_space in buildFileStorageStatistics
2014-01-27 15:56:57 +01:00
Vincent Petry
11ef12a106
Added exception logger plugin for sabre connector
...
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.
This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.
This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Robin Appelman
1ab7ca0a19
Fix some phpdoc errors and rename interface
2014-01-24 16:01:19 +01:00
Robin Appelman
fc5f20112e
Add isReadable, isUpdateable, isDeletable, isShareable
2014-01-24 15:54:40 +01:00
Jens-Christian Fischer
0f6c607171
added function documentation
2014-01-24 14:22:42 +01:00
Jens-Christian Fischer
506393090b
Add 'mail_from_address' configuration
...
In environments where there are rules for the email addresses, the "from
address" that owncloud uses has to be configurable.
This patch adds a new configuration variable 'mail_from_address'.
If it is configured, owncloud will use this as the sender of *all*
emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by
default). By using the 'mail_from_address' configuration, only this
email address will be used.
2014-01-24 14:04:37 +01:00
Robin Appelman
02aa44d055
Merge branch 'master' into memcache-public
2014-01-22 13:19:49 +01:00
Thomas Müller
9bab05fd45
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 19:36:20 +01:00
Thomas Müller
a3ea5aa2ac
fixing comment + adding unit test for checkPasswordProtectedShare
2014-01-21 12:07:08 +01:00
Thomas Müller
23a4d0d44e
OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
2014-01-21 11:32:30 +01:00
Thomas Müller
6746ad0a73
in case no share is found for the given token we can return right away
2014-01-21 10:55:10 +01:00
Thomas Müller
9fd4cb1b66
adding password protection check to getShareByToken()
2014-01-21 10:42:47 +01:00
Robin Appelman
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
Björn Schießle
32e941a2bc
Merge pull request #6644 from ben-denham/unshare-all-fix
...
\OCP\Share::unshareAll() fix
2014-01-16 03:13:26 -08:00
Robin Appelman
82762bb462
remove ArrayAccess, JsonSerializable from the public part of FileInfo
2014-01-13 15:13:45 +01:00
Robin Appelman
39d2c18793
Extends phpdoc for \OCP\File\FileInfo
2014-01-13 14:42:14 +01:00
Robin Appelman
617acbd6f9
Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search
2014-01-13 14:28:49 +01:00
Robin Appelman
5d456c7cc2
Merge branch 'master' into memcache-public
2014-01-09 13:54:58 +01:00
Robin Appelman
d50c7391d8
Use $server->getMemCacheFactory() in ldap connection
2014-01-09 13:54:50 +01:00
Robin Appelman
5a2a0426a6
Also update the OCP\IServerContainer
2014-01-08 15:51:40 +01:00
Robin Appelman
be7837402d
get the memorycache factory from OCP\Server instead of a cache instance
...
this allows apps to specify a prefix to use
2014-01-08 15:18:12 +01:00
Thomas Müller
2d5427efa9
Merge pull request #6290 from owncloud/files-androidcontentdisposition
...
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
Robin Appelman
4d65a80892
Remove the static dependency on OC_Util from Memcache
2014-01-06 13:11:38 +01:00
ben-denham
baccc8f584
Unshare all will now delete all shares for the item, instead of only for a single owner.
2014-01-06 11:14:43 +13:00
Thomas Müller
aa17a896ac
fix return statement
2013-12-19 00:33:29 +01:00
Thomas Müller
5eae75eeca
kill MDB2 in PHPDoc
2013-12-19 00:32:46 +01:00
Thomas Müller
277ae28171
Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
...
Fixed download file from URL error messages
2013-12-18 06:03:50 -08:00
Frank Karlitschek
1d0af242b9
Merge pull request #6436 from owncloud/allconfig-defaults
...
Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
2013-12-17 05:09:58 -08:00
Vincent Petry
2a1d6d3106
Do not use L10n when logging exceptions
...
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.
This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
2013-12-16 15:11:13 +01:00
Robin Appelman
e2efad6ae7
Also add default to the \OCP\IConfig interface
2013-12-16 14:33:03 +01:00
Robin Appelman
4c45c6f418
dont try to register background jobs if we haven't upgraded yet
2013-12-13 17:15:18 +01:00
Jörn Friedrich Dreyer
6408125edc
rely only on php DateTime to parse the db datetime string
2013-12-13 16:38:05 +01:00
Vincent Petry
335b2f40a6
Fixed download file from URL error messages
...
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
OC_L10N_String values
2013-12-12 10:38:12 +01:00
Vincent Petry
409b510889
Moved content disposition code+workarounds to OCP\Response
...
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.
Refactored download code to use the new API.
Removed unused trashbin download file.
2013-12-10 12:42:26 +01:00
Pellaeon Lin
fc607e6bce
Separate PHP upload limit and free space
2013-12-08 22:59:46 +08:00
Bjoern Schiessle
3f7aac1a79
add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
2013-12-05 17:29:15 +01:00
Thomas Müller
832be7c908
Merge pull request #6052 from owncloud/datetime-doctrine
...
Get rid of date strings for DB. Completely use Doctrine and DateTime.
2013-12-01 01:29:35 -08:00
Frank Karlitschek
a03ba06dcd
Merge pull request #6077 from owncloud/fix-api-documentation
...
API doc for contacts manager, server container and share
2013-11-29 03:24:19 -08:00
Morris Jobke
a81909097c
Merge pull request #6027 from owncloud/public-api-restful-routing-oc6
...
fix appframework routing
2013-11-27 01:55:52 -08:00
Morris Jobke
b910524acb
add comment from @DeepDiver
2013-11-27 10:32:48 +01:00
Morris Jobke
7c88736292
API doc for contacts manager, server container and share
2013-11-27 00:35:36 +01:00
Andreas Fischer
3bbaba1eca
Use the Doctrine to convert date string to DateTime object.
2013-11-26 12:21:31 +01:00
Andreas Fischer
a330b2ef9b
Use DateTime object instead of fixed format date string.
...
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
2013-11-26 12:00:31 +01:00
Andreas Fischer
9fb1da2811
Use bindValue() instead of passing parameters in execute().
2013-11-26 11:50:14 +01:00