wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
40963 commits 157 branches 562 tags 714 MiB
Commit graph

14557 commits

Author SHA1 Message Date
Lukas Reschke
2e4cd44556
Inject \OCP\IURLGenerator to make tests work 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-18 15:32:40 +02:00
Lukas Reschke
a04feff9a7
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL 
Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string.
This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result
in `<a href="foo">`.

This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with
054e161eb5 inside the navigation manager where one cannot simply inject attributes.

Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112,
people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects
you to the IdP and properly logs you out there as well.

Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to
use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout
URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but
I'm not aware of any and there's simply no way to fix this properly otherwise.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-18 12:22:44 +02:00
Nextcloud bot
231cffffb9
[tx-robot] updated from transifex 2017-08-18 00:08:15 +00:00
Lukas Reschke
c016b01bf9
Ensure log message is UTF-8 encoded 
PHP's json_encode only accept proper UTF-8 strings, loop over all
elements to ensure that they are properly UTF-8 compliant or convert
them manually.

Without this somebody passing an invalid User Agent may make json_encode
return false which will get logged as empty newline.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-17 15:01:50 +02:00
Lukas Reschke
ed8a98eaa1
Prevent SQL error message in case of error 
`\OC\User\Database::createUser` can throw a PHP exception in case the UID is longer than
permitted in the database. This is against it's PHPDocs and we should cast this to `false`,
so that the regular error handling triggers in.

The easiest way to reproduce is on MySQL:

1. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel
2. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel again
3. See SQL exception as error message

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-17 12:08:40 +02:00
Lukas Reschke
e37cf2d6f0 Merge pull request #6158 from nextcloud/always-log-cron-execution 
Always log cron execution
 2017-08-17 11:14:12 +02:00
Morris Jobke
1c38a83927 Always log cron execution 
There was a setting to disable the last execution of cron. There is no known
problem with this write access and it was also questioned when this feature
was build in https://github.com/owncloud/core/pull/7689#issuecomment-38264707

Recently there was also a bug report about a non-visible last cron execution
(#6088) - let's better remove this.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-17 09:45:11 +02:00
Nextcloud bot
0ceb06fde5
[tx-robot] updated from transifex 2017-08-17 00:08:14 +00:00
Morris Jobke
4c558c99f3 Merge pull request #6130 from nextcloud/cleanup-unused-methods 
Cleanup unused methods
 2017-08-16 08:55:06 +02:00
Nextcloud bot
d7406e5159
[tx-robot] updated from transifex 2017-08-16 00:08:33 +00:00
Lukas Reschke
422c3e302a Merge pull request #6099 from nextcloud/issue-3457-no-exception-on-sharee-error 
Catch exceptions on error of cloud id resolution
 2017-08-15 17:04:42 +02:00
Morris Jobke
a55e794bfd Cleanup unused methods 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 14:29:26 +02:00
Morris Jobke
cf7c4a4439 Merge pull request #6123 from nextcloud/cleanup-shareItem 
Cleanup usage of shareItem in internal code base
 2017-08-15 13:57:00 +02:00
Morris Jobke
c5f14ac884 Merge pull request #6121 from nextcloud/cleanup-registerBackend 
Use proper methods for registerBackend
 2017-08-15 13:52:49 +02:00
Morris Jobke
8366dfa50b Cleanup usage of shareItem in internal code base 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 11:57:18 +02:00
Morris Jobke
895b9c2309 Use proper methods for registerBackend 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 11:29:15 +02:00
Morris Jobke
3e13e94254 Use proper methods for checkPasswordProtectedShare 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 11:28:05 +02:00
Morris Jobke
c5c23b30b9 Merge pull request #6116 from nextcloud/cleanup-unused-methods 
Cleanup unused methods
 2017-08-15 11:26:26 +02:00
Morris Jobke
f640b56bfa Cleanup unused methods 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 10:09:47 +02:00
Nextcloud bot
cc40f02684
[tx-robot] updated from transifex 2017-08-15 00:08:15 +00:00
Joas Schilling
bd6524455b Document that it throws 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-14 22:20:57 +02:00
Morris Jobke
95b7fa306e Merge pull request #6097 from nextcloud/issue-6078-accounts-table-missing 
Make sure the accounts table exists
 2017-08-14 12:14:09 +02:00
Morris Jobke
228baa45fd Update autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-14 11:11:18 +02:00
Nextcloud bot
a2e3c8ede5
[tx-robot] updated from transifex 2017-08-12 00:08:18 +00:00
Roeland Jago Douma
8ea434d2d0 Merge pull request #6004 from nextcloud/forward-5902-repair-drop-account-terms-on-oc-migration 
[13] Repair step: drop account terms on oc migration
 2017-08-10 21:18:06 +02:00
Roeland Jago Douma
31af5cc321
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-10 14:27:35 +02:00
Bjoern Schiessle
bae5be3dc1
add prefix to user and system keys to avoid name collisions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-10 14:27:35 +02:00
Bjoern Schiessle
9524badccc
extend the identity proof manager to allow system wide key pairs 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-10 14:27:35 +02:00
Joas Schilling
b9b88aa666
Don't lock in the appdata_ directory 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-10 12:35:33 +02:00
Joas Schilling
5515c7b2c0
Still throw a locked exception when the path is not relative to $user/files/ 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-10 11:58:01 +02:00
Morris Jobke
3dc1bcd4c1 Merge pull request #6052 from nextcloud/fix_jail_copy 
Fix copy from jailed storage
 2017-08-10 10:21:56 +02:00
Morris Jobke
5aa25fcdd5 Fix require once for actionInclude 
* regression from #5791

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-09 23:51:49 +02:00
Roeland Jago Douma
9717cdfb9e
If there is no content don't error 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 15:51:13 +02:00
Roeland Jago Douma
459ae6d94a
User proper anonymous function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 15:51:12 +02:00
Lukas Reschke
70d42afb93
Use non-deprecated INTL_IDNA_VARIANT_UTS46 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-09 15:12:02 +02:00
Lukas Reschke
c78e999b21
Make definition compatible 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-09 15:12:02 +02:00
Lukas Reschke
e9dc4f107a
Make declaration compatible 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-09 15:12:01 +02:00
Morris Jobke
e08768ee04 Merge pull request #6047 from nextcloud/fix-6017-select-indexed-columns 
Use indexed column path_hash to find the parent
 2017-08-09 13:53:23 +02:00
Morris Jobke
576f370ddc Merge pull request #6009 from nextcloud/symfony_translations 
Use symfony/translation for L10N plurals
 2017-08-09 13:41:10 +02:00
Roeland Jago Douma
ace7b69aa7
Fix copy from jailed storage 
If we have a jailed storage we must also fix the internal path on copy.
Else we pass in the wrong path.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 11:56:31 +02:00
Joas Schilling
66b61eb67d
Use indexed column path_hash to find the parent 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-09 10:56:16 +02:00
Nextcloud bot
8549fcf6e4
[tx-robot] updated from transifex 2017-08-09 00:08:20 +00:00
Roeland Jago Douma
ed3b391e47
Use symfony/translation for L10N plurals 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-07 19:53:36 +02:00
Joas Schilling
43a6ba899e
Use the existing array of OC versions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-07 12:09:05 +02:00
Joas Schilling
40b47f13df
Add a repair step to drop the account_terms table on oc migration 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-07 12:08:36 +02:00
Nextcloud bot
eb2442b871
[tx-robot] updated from transifex 2017-08-06 00:08:24 +00:00
Nextcloud bot
21f2fe5cb9
[tx-robot] updated from transifex 2017-08-05 00:08:08 +00:00
Roeland Jago Douma
4633717f04
Move pre_shared and post_shared events to EventDispatcher 
* Now listeners for those events get proper share objects.
* Legacy hooks still fired
* Updated tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-03 15:14:29 +02:00
Morris Jobke
8fecc336ac Merge pull request #5959 from nextcloud/drop-logo-claim 
Logo claim is not used anymore
 2017-08-03 08:20:56 +02:00
Nextcloud bot
21dd85678f
[tx-robot] updated from transifex 2017-08-03 00:08:06 +00:00
Morris Jobke
585e5c6ea5
Logo claim is not used anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-02 23:08:45 +02:00
Morris Jobke
c40352c030 Merge pull request #5816 from nextcloud/fix-oracle 
Fix oracle
 2017-08-02 20:54:58 +02:00
Morris Jobke
d7d2d7c803 Merge pull request #5952 from nextcloud/appmanager-isshipped 
Use public methods for OC_App::isShipped
 2017-08-02 16:15:02 +02:00
Lukas Reschke
bc9eb59384
Use IUser 
This is broken and will never work as the phan CI step pointed out.

Pro-tip of the day: Check why CI fails before merging 🙈

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-02 13:25:22 +02:00
Joas Schilling
78412fda9c
Add a method to compare empty strings with an expression 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:50:41 +02:00
Joas Schilling
100fe07f5d
Fix repair step for oracle... 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling
2f8756754f
Fix last failures with oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling
bb58667511
Fix ILIKE regex for oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling
fc22a2cb07
Fix auth provider 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling
a5b0308713
Use selectAlias() 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling
20f8d1094a
Can not insert auto increment on oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling
a76d4ef04e
Fix clob comparison 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:15 +02:00
Joas Schilling
8ec6c1f259
Quote aliases as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:15 +02:00
Joas Schilling
b29baababd
Oracle does not support PDO::FETCH_KEY_PAIR 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:12 +02:00
Nextcloud bot
2800e017de
[tx-robot] updated from transifex 2017-08-02 00:08:10 +00:00
Morris Jobke
cd02b2205e Use public methods for OC_App::isShipped 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-01 18:57:00 +02:00
Lukas Reschke
f93a82b8b0
Remove explicit type hints for Controller 
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 17:32:03 +02:00
Morris Jobke
84c22fdeef Merge pull request #5907 from nextcloud/add-metadata-to-throttle-call 
Add metadata to \OCP\AppFramework\Http\Response::throttle
 2017-08-01 14:43:47 +02:00
Morris Jobke
6010c4f267 Merge pull request #5877 from nextcloud/typehint_middleware 
Prop argument type for Middleware
 2017-08-01 14:28:16 +02:00
Morris Jobke
050fa63380 Merge pull request #5939 from nextcloud/dont-have-set-uid-as-displayname 
Remove setUidAsDisplayName
 2017-08-01 13:28:27 +02:00
Roeland Jago Douma
c8452803ef Merge pull request #5897 from nextcloud/add-share-mail-for-user-share 
Send an email once a file/folder is shared with a user
 2017-08-01 13:27:15 +02:00
Roeland Jago Douma
a5feb51a6a
Fix OCS Exception 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
ede15f0988
Fix L10N::t 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Lukas Reschke
0fa49db770
Some more invalid PHPDocs in legacy classes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
66b8208791
Function also accepts ints 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
fd059a25d3
Properly name variable 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
6fb84ebb71
null is a valid parameter 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
dfd8125aeb
Replace wrong PHPDocs 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
10414d2e7d
Properly suppress 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
4166d61ce6
Fix MigrationSchemaChecker and CryptoWrapper 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
b53c4c0db9
Fix template functions 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
a4ffbc09ec
Fix lib/public/User.php 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Roeland Jago Douma
e1da8a769b
AppData is no longer internal 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
d321e9792e
Add |null to PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
28098a7602
Fix \OCP\Util 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
80b649c471
Suppress deprecated function in \OCP\JSON 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
5424d6a40d
Add proper PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
b4d4db0e39
Take IUser instead of User 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
e1f52fc901
Stricter phan config fixes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:13 +02:00
Nextcloud bot
456392e627
[tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Roeland Jago Douma
fa2f122e09 Merge pull request #5890 from nextcloud/fix-403-and-404-redirect 
Fix 403 and 404 redirect
 2017-07-31 22:14:52 +02:00
Roeland Jago Douma
3548603a88
Fix middleware implementations signatures 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Roeland Jago Douma
72eb610b3d
Prop argument type for Middleware 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Lukas Reschke
bef4f015ee
Remove setUidAsDisplayName 
This code is a leftover from the old Shibboleth implementation from ownCloud days, nowadays it causes more issues than it does good (such as https://github.com/nextcloud/user_saml/pull/137). Let's remove it for the future thus.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-31 15:52:53 +02:00
Morris Jobke
7b2c08a31a Merge pull request #5905 from nextcloud/ocp-config 
Use IConfig instead of static OCP\Config
 2017-07-31 10:54:40 +02:00
Roeland Jago Douma
13469ec49c Merge pull request #5922 from nextcloud/master-add-brackets-on-concat-method 
[master]Add brackets around concat statements so comparing the result works as intended
 2017-07-31 08:49:59 +02:00
Nextcloud bot
97d06a7698
[tx-robot] updated from transifex 2017-07-31 00:08:02 +00:00
Nextcloud bot
98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot
b43abf7512
[tx-robot] updated from transifex 2017-07-29 00:08:31 +00:00
Joas Schilling
50912fb94f
Add brackets around concat statements so comparing the result works as intended 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-28 15:36:26 +02:00
Morris Jobke
c43abe43b0 Send an email once a file/folder is shared with a user 
* only if user has set an email address
* only for user shares (no group shares for now)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-28 08:36:11 +02:00
Nextcloud bot
baa6db3539
[tx-robot] updated from transifex 2017-07-28 00:08:05 +00:00
Morris Jobke
c7757b07f8 Merge pull request #5644 from nextcloud/add-occ-app-install 
add occ app:install command
 2017-07-27 15:36:30 +02:00
Lukas Reschke
f22ab3e665
Add metadata to \OCP\AppFramework\Http\Response::throttle 
Fixes https://github.com/nextcloud/server/issues/5891

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-27 14:17:45 +02:00
Morris Jobke
c27498db71 Use IConfig instead of static OCP\Config 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-27 13:43:18 +02:00
Nextcloud bot
65ade4b6d5
[tx-robot] updated from transifex 2017-07-27 00:08:03 +00:00
Morris Jobke
0de90cfc67 Fix 403 and 404 redirect 
* Nextcloud is not properly loaded in the standalone version (especially the theming)
* it is already not listed anymore in the Nginx config (see nextcloud/documentation#392)
* the index.php-free version doesn't support this

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-26 16:30:09 +02:00
sualko
4868e191d7 update autoloader 
Signed-off-by: sualko <klaus@jsxc.org>
 2017-07-26 15:25:02 +02:00
Lukas Reschke
013d7483bf Add new bundle 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-26 11:49:03 +02:00
Nextcloud bot
da31a30edb
[tx-robot] updated from transifex 2017-07-26 00:08:06 +00:00
Lukas Reschke
3faef644a1 Merge pull request #5864 from nextcloud/legacy_user 
Remove legacy OC_User_Backend and OC_User_Interface
 2017-07-25 17:15:11 +02:00
Lukas Reschke
63676d3b24 Merge pull request #5836 from nextcloud/preview_update 
Empty search no longer works
 2017-07-25 17:08:31 +02:00
Joas Schilling
41fca6c852
"Only variables must be passed by reference" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-25 12:49:16 +02:00
Joas Schilling
10d7cbb71f
Use order by to avoid problems when chunking finds a same item again... 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-25 12:49:12 +02:00
Joas Schilling
0a0dbbdf15
Remove generate change script which doesnt work with migrations anymore 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-25 12:47:39 +02:00
Morris Jobke
5308bd3378
Fix autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-25 12:47:39 +02:00
Joas Schilling
5e04254d40
Install from migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-25 12:47:37 +02:00
Lukas Reschke
8521e79e76 Merge pull request #5863 from nextcloud/pimp_l10n_string 
Move \OC_L10N_String to proper namespace
 2017-07-25 10:29:08 +02:00
Morris Jobke
89a7b007f2 Fix comments 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-25 08:57:58 +02:00
Nextcloud bot
11e182fff2
[tx-robot] updated from transifex 2017-07-25 00:08:02 +00:00
Roeland Jago Douma
b930f32e89
Remove legacy OC_User_Backend and OC_User_Interface 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 20:42:55 +02:00
Roeland Jago Douma
52b8542364
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 20:18:16 +02:00
Roeland Jago Douma
a907720817
Move \OC_L10N_String to proper \OC\L10N\L10NString 
* Proper namespacing
* Fixed phpdocs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 20:17:20 +02:00
Morris Jobke
5dc480a38c Merge pull request #5857 from nextcloud/database-exception-cleanup 
Remove unneeded parameter in DatabaseException
 2017-07-24 16:14:53 +02:00
Morris Jobke
e785b849c7 Merge pull request #5835 from nextcloud/cleanup_testing_app 
Cleanup testing app
 2017-07-24 15:03:15 +02:00
Morris Jobke
c43d479372 Merge pull request #5855 from nextcloud/cleanup-legacy-user-class 
Cleanup legacy user class from unused methods
 2017-07-24 14:39:18 +02:00
Morris Jobke
184f25c0d6 Merge pull request #5854 from nextcloud/improve-personal-page-code 
Cleanup code of personal page to use public interfaces
 2017-07-24 14:38:05 +02:00
Morris Jobke
5bc0edbd29 Merge pull request #5844 from nextcloud/phpstorm_inspect2 
More phpstorm inspection fixes
 2017-07-24 13:54:30 +02:00
Morris Jobke
b8ed028870 Remove unneeded parameter in DatabaseException 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-24 13:44:12 +02:00
Roeland Jago Douma
25c36be901
Proper DI for ILockingProvider 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 13:44:09 +02:00
Morris Jobke
188b87e03b Cleanup legacy user class from unused methods 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-24 12:17:53 +02:00
Morris Jobke
7790017a14 Cleanup code of personal page to use public interfaces 
* public interfaces instead of static code calls
* drop static private namespace methods

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-24 12:11:24 +02:00
Roeland Jago Douma
5f227bd93b
More phpstorm inspection fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 11:39:29 +02:00
Morris Jobke
ae13d011d1 Remove unneeded styles 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-24 11:09:14 +02:00
Roeland Jago Douma
8bee9cf8d3
Empty search no longer works 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 10:56:21 +02:00
Lukas Reschke
bb6fe6afba
Adjust to height=120 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-24 10:18:16 +02:00
Lukas Reschke
ba1e16ea2e Revert "Set max-width of image to 100px in Outlook as well" 2017-07-24 10:14:47 +02:00
Roeland Jago Douma
989614f9d5 Merge pull request #5783 from nextcloud/outlook-max-width 
Set max-width of image to 100px in Outlook as well
 2017-07-24 07:15:41 +02:00
Nextcloud bot
d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Morris Jobke
a98f57ebd0 Set max-width of image to 100px in Outlook as well 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-23 23:15:21 +02:00
Marius Blüm
05d979c665 Merge pull request #5713 from nextcloud/datepicker-redesign 
Redesign jQuery UI datepicker
 2017-07-23 22:06:18 +02:00
Morris Jobke
2e7e03b2f7 Merge pull request #5840 from nextcloud/phpstorm_inspect 
Some phpstorm inspection fixes
 2017-07-23 18:28:41 +02:00
Marin Treselj
586eb3ed0a
Redesign jQuery UI datepicker 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-23 14:06:04 +02:00
Nextcloud bot
46332b0d8e
[tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Roeland Jago Douma
361d2badd8
Some phpstorm inspection fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-22 21:10:16 +02:00
Morris Jobke
9a151056d0 Merge pull request #5812 from MrJeos/master 
Fix for mb strlen
 2017-07-22 11:04:24 +02:00
Morris Jobke
655c26224b Merge pull request #5596 from nextcloud/mount-rename 
Fix renaming of non-renamble mounts
 2017-07-21 23:10:50 +02:00
Morris Jobke
13dd0b0ebe Merge pull request #5785 from nextcloud/path-repair-steps-storage 
Also repair storage id's when repairing invalid entries
 2017-07-21 16:58:31 +02:00
Lukas Reschke
4c637a428e Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domain 
Fix error message on untrusted domain error page
 2017-07-21 14:50:31 +02:00
Robin Appelman
06a4d6b5b9 Also repair storage id's when repairing invalid entries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-21 14:06:13 +02:00
Roeland Jago Douma
a33b6cdd21 Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixes 
Minor documentation fixes
 2017-07-21 13:32:10 +02:00
Morris Jobke
1a4a68dbc6 Fix error message on untrusted domain error page 
Fixes #5347

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-21 11:46:37 +02:00
Lukas Reschke
1c1ff82c06 Merge pull request #5802 from nextcloud/rm_dep_controller_functions 
Remove deprecated Controller Functions
 2017-07-21 10:12:20 +02:00
Marcel Waldvogel
4e42f059ed Minor typos 
Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
 2017-07-21 09:50:44 +02:00
Roeland Jago Douma
e5bedd8947 Merge pull request #5818 from nextcloud/ocs_privatedata 
PrivateData to app
 2017-07-21 09:47:49 +02:00
Morris Jobke
b1954bed97 Merge pull request #5797 from paulijar/share20-postUnshareFromSelf 
Dispatch event postUnshareFromSelf when the recipient of a share unshares it
 2017-07-21 09:32:49 +02:00
Roeland Jago Douma
7753b93aa6
PrivateData to app 
* PrivateData is an app now: https://github.com/nextcloud/privatedata
* No need to load the OCS routes.php (as there is none!)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-21 08:51:14 +02:00
Lukas Reschke
3d2600b039
Add Phan plugin to check for SQL injections 
This adds a phan plugin which checks for SQL injections on code using our QueryBuilder, while it isn't perfect it should already catch most potential issues.

As always, static analysis will sometimes have false positives and this is also here the case. So in some cases the analyzer just doesn't know if something is potential user input or not, thus I had to add some `@suppress SqlInjectionChecker` in front of those potential injections.

The Phan plugin hasn't the most awesome code but it works and I also added a file with test cases.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-20 22:48:13 +02:00
Artem Kochnev
5abeb9519e Fix for mb strlen 
Error with moving files with long names in UTF-8
 2017-07-20 17:29:50 +03:00
Pauli Järvinen
7c4a15f215 Emit hook postUnshareFromSelf when the recipient of a share unshares it 
- This kind of hook signal used to be emitted in the old Share library but it was missing from Share 2.0

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
 2017-07-20 14:45:46 +03:00
Roeland Jago Douma
0b495ceff8
Remove deprecated Controller Functions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-20 11:03:12 +02:00
Joas Schilling
3ff3c338c9 Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens 
Only use readable chars in Share Tokens
 2017-07-19 16:40:18 +02:00
Morris Jobke
49c622fcba Merge pull request #5719 from nextcloud/improve-jscombiner 
Properly handle if the deps file if for some reason empty
 2017-07-19 16:31:29 +02:00
Lukas Reschke
591aaa4154
Add workaround for https://github.com/etsy/phan/issues/1033 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 11:08:43 +02:00
Lukas Reschke
030d85bc9c
Remove unused functions 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:12 +02:00
Lukas Reschke
d8ec399454
Run phan over code base 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:11 +02:00
Morris Jobke
2ebafb06fd Properly handle if the deps file if for some reason empty 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-19 00:10:46 +02:00
Morris Jobke
5accbf5568 Merge pull request #5744 from 1manprojects/patch-1 
Removed cast to integer in getSize
 2017-07-18 23:43:09 +02:00
Roeland Jago Douma
f0f1e2c501 Merge pull request #5770 from nextcloud/path-repair-steps-loop 
Fix invalid path repair step not getting all invalid entries
 2017-07-18 22:22:51 +02:00
Joas Schilling
e71b9fb3d6 Merge pull request #5709 from nextcloud/null-user-exist 
null users dont exist
 2017-07-18 18:24:42 +02:00
Joas Schilling
984933e586
Only use readable chars in Share Tokens 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-18 15:44:34 +02:00
Robin Appelman
8b58b4c2a7
Fix invalid path repair step not getting all invalid entries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-18 14:01:49 +02:00
1 Man Projects
3e5d590f1e changed direct cast to integer to numerical value 2017-07-17 15:19:04 +02:00
Robin Appelman
0e107bc63c
non movable mounts can not be moved 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-17 15:09:08 +02:00
Pauli Järvinen
8dce97a3e1 Fix emitting of legacy hook post_unshare 
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
 2017-07-16 13:13:15 +03:00
1 Man Projects
56c0384044 Removed cast to integer in getSize 
Fixes - Wrong or no sizes of files/folders #5031
 2017-07-15 20:18:45 +02:00
Nextcloud bot
a23cdd04bb
[tx-robot] updated from transifex 2017-07-15 00:08:54 +00:00
Lukas Reschke
a79447c6fd Merge pull request #5699 from nextcloud/bruteforce_capability 
Add bruteforce capabilities
 2017-07-14 15:20:31 +02:00
Nextcloud bot
3865c77279
[tx-robot] updated from transifex 2017-07-14 00:08:37 +00:00
Morris Jobke
1f1504e071 Merge pull request #5708 from nextcloud/nested-permissions-mask 
Fix scan permissions with nested permissions masks
 2017-07-13 23:27:01 +02:00
Morris Jobke
01466ab840 Merge pull request #5715 from nextcloud/master-5655 
Fixed repair step
 2017-07-13 19:30:05 +02:00
Robin Appelman
350e036c56 chunk getting invalid paths and reuse queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 16:37:38 +02:00
Robin Appelman
4a727a578c use a generator instead of fetching all rows at once 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 16:37:34 +02:00
Robin Appelman
5185a3c0c9
null users dont exist 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 15:53:14 +02:00
Robin Appelman
03f27b4c2c
Fix scan permissions with nested permissions masks 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 14:29:04 +02:00
Joas Schilling
e335121d5e Merge pull request #5070 from nextcloud/theming-vs-themes 
Prefer custom theme over the theming app
 2017-07-13 13:41:31 +02:00
Roeland Jago Douma
f71457782b Merge pull request #5695 from nextcloud/dont-error-when-the-table-doesnt-exist 
Don't throw an error when the table doesn't exist
 2017-07-13 13:28:52 +02:00
Roeland Jago Douma
23129aa555
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-13 11:23:10 +02:00
Roeland Jago Douma
6a1f2ac076
Add bruteforce capabilities 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-13 11:23:08 +02:00
Morris Jobke
598835b06f Merge pull request #5703 from nextcloud/autoloader_fix 
Fix autoloader
 2017-07-13 10:40:16 +02:00
Roeland Jago Douma
31d5f946af
Fix autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-13 09:10:59 +02:00
Nextcloud bot
261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Roeland Jago Douma
04f2090698
Write cert bundle to tmp file first 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-12 19:24:20 +02:00
Joas Schilling
c6b7204fcb
Don't throw an error when the table doesn't exist 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-12 15:35:24 +02:00
Roeland Jago Douma
86a496d94a Merge pull request #5567 from nextcloud/public-capabilities 
Public capabilities API
 2017-07-12 13:04:54 +02:00
Roeland Jago Douma
08d3cb9107 Merge pull request #5685 from nextcloud/jail-propagator 
Fix propagating changes within jail wrapper
 2017-07-12 12:14:51 +02:00
Julius Härtl
ce5ad7e7f4
Prefer custom theme over theming app 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-12 11:42:15 +02:00
Nextcloud bot
13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Robin Appelman
dfe662ad42
Fix propagating changes within jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-11 17:55:04 +02:00
Maxence Lange
6e7be6acfd upstream 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-07-11 13:21:24 +02:00
Nextcloud bot
4f7fafb5c5
[tx-robot] updated from transifex 2017-07-10 00:08:41 +00:00
Lukas Reschke
a1c14a747c Merge pull request #5645 from nextcloud/try-to-prevent-spam-collecting-of-emails 
Don't show mail domain and from in config report
 2017-07-07 18:38:50 +02:00
Morris Jobke
e76b867c2c Merge pull request #5628 from nextcloud/only-create-the-migration-dir-when-necessary 
Only create the migration directory when necessary
 2017-07-07 14:10:32 +02:00
Joas Schilling
79d7c26b8a
Register autoloading before running migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 12:01:11 +02:00
Morris Jobke
c2ba5e2884 Merge pull request #5529 from michaelletzgus/optimize_js_order 
Optimize performance / Load CSS and JS in parallel on firefox
 2017-07-07 11:16:31 +02:00
Morris Jobke
b4deba2078 Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails 
Use PNGs for icons in activity emails
 2017-07-07 11:05:00 +02:00
Morris Jobke
172b4bb6d2 Merge pull request #5615 from nextcloud/issue-5286-fix-navigation-entries-for-group-restricted-apps 
Don't load navigation entries of restricted apps
 2017-07-07 10:46:45 +02:00
Joas Schilling
e6e79c34b1
Don't show mail domain and from in config report 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 09:53:55 +02:00
Nextcloud bot
d23bc9a99a
[tx-robot] updated from transifex 2017-07-07 00:08:24 +00:00
Morris Jobke
b4a221f9be Merge pull request #5424 from nextcloud/moveFromCache-from-shared 
fix moving folders out of a cache jail
 2017-07-06 18:31:18 +02:00
Bjoern Schiessle
da51ec38f4
only collect detailed access list if it is really needed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:33:08 +02:00
Joas Schilling
0f275b1550
Only create the migration directory when necessary 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-06 09:58:39 +02:00
Nextcloud bot
984953ef4a
[tx-robot] updated from transifex 2017-07-06 00:08:44 +00:00
Morris Jobke
60398b919b Merge pull request #5231 from nextcloud/migrations 
Migrations
 2017-07-05 17:32:40 +02:00
Morris Jobke
163e8774a4 Fix autoloader and namespace test 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-05 15:46:25 +02:00
Morris Jobke
7d58bb7db5 Merge pull request #5342 from nextcloud/userlist-used-space 
show used space in user list
 2017-07-05 15:15:25 +02:00
Joas Schilling
bbfc044ac5
Add migration for personal settings stuff 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 14:58:20 +02:00
Joas Schilling
6abbe4e962
Don't load navigation entries of restricted apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:52:51 +02:00
Joas Schilling
0bff4f3f07 Fix the installer tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
4e5cd1efea Fix tests of CodeChecker and MigrationService 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
7a3d83d630 Register autoloading before running migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
6a0da09734 Update autoloading 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
3b267b165f Check the migration files for table, column and index length errors 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
fe6e8c2710 Fix dropping tables and handle the prefix automatically 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
5d9d1b1cb5 Allow to check the schema in pre and post as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling
817783e4c7 Add a version to migrations, so parallel legacy branches can also have migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling
df6b839b23 Add author and copyright 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling
2875b79c61 Fix code issues 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling
3969a6b1eb Use autoloading instead of require_once from a different dir 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling
194ef1a171 Adjust the code to use our interface and abstract 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling
183b1dbde3 Use migrations when there is no database.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling
15eec7b83c Start migrations 
Fixme:
- Install and update of apps
- No revert on live systems (debug only)
- Service adjustment to our interface
- Loading via autoloader

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Morris Jobke
efa52ec111 Merge pull request #5441 from nextcloud/custom-theme-update 
Add command to apply updates to custom themes
 2017-07-05 12:44:43 +02:00
Julius Härtl
2e47210d6f Add command to apply updates to custom themes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-05 12:38:07 +02:00
blizzz
d8af9d4c9b Merge pull request #5557 from nextcloud/dont-log-passwords-on-dav-exceptions-either 
Don't log passwords on dav exceptions
 2017-07-05 11:58:32 +02:00
Nextcloud bot
1cbb7a18d8
[tx-robot] updated from transifex 2017-07-05 00:08:26 +00:00
Morris Jobke
8e160c6638 Merge pull request #5591 from nextcloud/move-client-info-to-firstrunwizard 
Move sync client to the firstrunwizard app
 2017-07-04 11:39:21 +02:00
Morris Jobke
44d39d87c0 Update autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-04 11:31:10 +02:00
Joas Schilling
da6dd4898a Move sync client to the firstrunwizard app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-04 10:54:13 +02:00
Nextcloud bot
d772edaff2
[tx-robot] updated from transifex 2017-07-04 00:08:24 +00:00
Nextcloud bot
c94dbddd12
[tx-robot] updated from transifex 2017-07-03 00:08:21 +00:00
Nextcloud bot
cc4373c901
[tx-robot] updated from transifex 2017-07-02 00:08:14 +00:00
Nextcloud bot
d49276082e
[tx-robot] updated from transifex 2017-07-01 00:08:28 +00:00
Knut Ahlers
92d2fb8771
Allow group backend to declare users as admins 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
 2017-06-30 14:28:16 +02:00
Julius Härtl
b82164e602
Simplify if condition for public capabilities 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-30 14:18:16 +02:00
Julius Härtl
51a0741005
Add public capabilities API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-30 11:08:04 +02:00
Nextcloud bot
2afb4857cc
[tx-robot] updated from transifex 2017-06-30 00:08:23 +00:00
blizzz
72d3bfcf56 Merge pull request #4890 from nextcloud/unify-settings 
Unify settings
 2017-06-29 20:02:09 +02:00
Joas Schilling
b27819785e
Don't log passwords on dav exceptions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-29 17:20:10 +02:00
Robin Appelman
601362e164
adjust to moved repair step 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-29 14:45:08 +02:00