ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-12-05 04:58:57 +05:30
Code Issues Packages Projects Releases Wiki Activity
1,222 Commits 11 Branches 86 Tags 15 MiB
2108c88dfb
Commit Graph

653 Commits

Author SHA1 Message Date
Alex Bilbie
2545ea7dc1 Added refresh token params and examples 2012-12-23 22:12:44 +00:00
Alex Bilbie
0f30b2a803 Removed lots of unnecessary if/else blocks. 
Removed null value of expires/expiresIn parameter
 2012-12-23 21:21:37 +00:00
Daniel Horrigan
0f6f5e2939 Added the user_credentials and refresh_token grants. Fixed expires_in so it is inline with the spec, but added expires for the old usage of expires_in. Made redirect_uri in oauth_sessions ALLOW NULL since user_credential grants don't have a redirect 2012-12-19 16:12:48 -05:00
Alex Bilbie
aa978d3581 Fix variable name 2012-12-12 11:43:01 +00:00
Alex Bilbie
1be25955d6 Merge branch 'release/0.3.4' 2012-12-11 15:33:05 +00:00
Alex Bilbie
302bf1f70d Clean trailing whitespace 2012-12-11 15:31:42 +00:00
Alex Bilbie
6553fb3f22 Return client details 2012-12-11 12:09:56 +00:00
Alex Bilbie
fdfe80289a Merge branch 'release/0.3.3'. Release version 0.3.3 
Conflicts:
	composer.json
 2012-12-10 21:31:58 +00:00
Alex Bilbie
912cd3fa25 Changed session stage to 'requested' as per enum 2012-12-10 21:19:11 +00:00
Alex Bilbie
a5b83c00bd Version bump 2012-11-20 15:29:43 +00:00
Alex Bilbie
958eab33a7 Lots of small documentation updates and clarifications 2012-11-20 15:27:33 +00:00
Alex Bilbie
fead044830 Spacing fixes and fixed sessionScopes() example query 2012-11-20 15:27:15 +00:00
Alex Bilbie
99f54d1a02 Missing provider class 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-10-14 17:33:22 +01:00
Alex Bilbie
cca5ae6229 Merge branch 'feature/clients' into develop 2012-10-14 17:18:52 +01:00
Alex Bilbie
b1082ecb41 Lots of updates so it all works now 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-10-14 17:18:27 +01:00
Alex Bilbie
af83b1e80e Added urlUserInfo() method 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-10-12 14:42:36 +01:00
Alex Bilbie
92ace5c6e5 Fixed PHP error with missing bracket 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-10-12 13:09:56 +01:00
Alex Bilbie
5ed4a8a2c4 Don't base64 decode the bearer token 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-10-10 09:32:50 +01:00
Alex Bilbie
ddfb355280 Code beautification 2012-10-05 15:24:59 +01:00
Alex Bilbie
ac3743027b Code beautification 2012-10-05 15:22:29 +01:00
Alex Bilbie
a76fbcd23d Epic rewriting to use Guzzle 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-10-05 15:05:27 +01:00
Alex Bilbie
bef7a212e3 Fixes and cleanup 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-10-05 15:03:15 +01:00
Alex Bilbie
ec191cffe1 Cleanup 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-10-05 15:02:56 +01:00
Alex Bilbie
5c13c3ee54 Namespace fixes 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-10-05 15:01:09 +01:00
Alex Bilbie
52bd18a2b4 Fixed namespaces in providers 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-10-05 15:00:51 +01:00
Alex Bilbie
6d1702a15d Merge branch 'develop' into feature/clients 2012-09-19 23:29:40 +01:00
Alex Bilbie
7d50b8e812 Moved SQL files 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-09-19 19:59:00 +01:00
Alex Bilbie
3c2720ece4 Renamed exceptions 
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-09-19 19:52:52 +01:00
Alex Bilbie
ed2cabc5b6 Merge branch 'master' of github.com:lncd/OAuth2 
Conflicts:
	composer.json

Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
 2012-09-19 19:32:31 +01:00
Alex Bilbie
3f3b987fb1 Check responses from the database are valid 2012-09-19 19:27:04 +01:00
Alex Bilbie
c993a0cdc0 Use namespace, use PSR, get rid of Pyro settings 2012-09-04 14:50:20 +01:00
Alex Bilbie
9dfa485bcb PSR fixes 2012-09-04 14:49:56 +01:00
Alex Bilbie
c760667448 PSR style class braces 2012-09-04 12:43:18 +01:00
Alex Bilbie
0298f6fb7d Include IDP.php 2012-09-04 12:42:33 +01:00
Alex Bilbie
17b7bf7d1d Test if provider config exists 2012-09-04 12:40:32 +01:00
Alex Bilbie
ed6301a497 Renamed provider.php to IDP.php 2012-09-04 12:40:02 +01:00
Alex Bilbie
c423ef810f Require instead of include 2012-09-04 12:33:17 +01:00
Alex Bilbie
485a3772b6 Changed function to __construct 2012-09-04 12:32:59 +01:00
Alex Bilbie
6f03eec814 Class rename 2012-09-04 12:32:44 +01:00
Alex Bilbie
0a5455642f PSR style if/else block 2012-09-04 12:31:04 +01:00
Alex Bilbie
8fdcb02740 Exception class rename 2012-09-04 12:30:49 +01:00
Alex Bilbie
153bb962c5 PSR variable rename 2012-09-04 12:30:38 +01:00
Alex Bilbie
3ee5f22a55 Class rename 2012-09-04 12:30:15 +01:00
Alex Bilbie
c09663f2b8 Class rename 2012-09-04 12:30:06 +01:00
Alex Bilbie
6a41ae5254 PSR style if block 2012-09-04 12:29:52 +01:00
Alex Bilbie
dd5fc7dc24 PSR variable rename 2012-09-04 12:29:10 +01:00
Alex Bilbie
11415bea0b PSR style if/else block 2012-09-04 12:28:28 +01:00
Alex Bilbie
eb5010a3f8 PSR variable rename 2012-09-04 12:28:06 +01:00
Alex Bilbie
da329b6b37 Merge branch 'refs/heads/develop' into feature/clients 
Conflicts:
	src/Oauth2/Authentication/Server.php
 2012-09-04 12:09:13 +01:00
Alex Bilbie
a1e5fdddda Bug fix 2012-08-28 12:30:51 +01:00
Alex Bilbie
4d4db99c06 Underscored private variables and methods and updated references 2012-08-27 16:02:54 +01:00
Alex Bilbie
7a4aece507 Stylistic fix 2012-08-27 15:25:28 +01:00
Alex Bilbie
b7d73accdc Removed old die statement 2012-08-27 15:25:14 +01:00
Alex Bilbie
3642b8432e PHPCS fixes 2012-08-27 14:25:24 +01:00
Alex Bilbie
e191566260 Fixed errors with handling database calls 2012-08-27 14:25:18 +01:00
Alex Bilbie
95931abd6b Spelling fix 2012-08-27 14:24:43 +01:00
Alex Bilbie
465c1c6ab2 Wrapped getallheaders() method in function_exists (function isn't available on command line) 2012-08-24 12:25:31 +01:00
Alex Bilbie
326e96cc17 Bug fix in dbcall 2012-08-20 15:49:57 +01:00
Alex Bilbie
6fdb6177bc Lots of fixes 2012-08-20 15:09:33 +01:00
Alex Bilbie
ed3238b862 Fixed constance letter casing 2012-08-20 14:19:33 +01:00
Alex Bilbie
519d20f0a5 Changed indent to spaces 2012-08-14 16:34:43 +01:00
Alex Bilbie
e859f435a1 Added docblocks for the database interface 2012-08-14 16:28:40 +01:00
Alex Bilbie
77ce18df56 Added the resource server database interface 2012-08-14 15:46:58 +01:00
Alex Bilbie
8720de48de Initial update with some PSR-* changes 2012-08-14 15:44:25 +01:00
Alex Bilbie
a9b6cd3e12 Mini fixes 2012-08-14 15:43:11 +01:00
Alex Bilbie
44666402dd Renamed variable 2012-08-14 14:20:14 +01:00
Alex Bilbie
4c82648a9a First commit of Phil's code with some namespace and class name tweaks 2012-08-13 16:36:45 +01:00
Alex Bilbie
95068c5176 Lots of fixes following errors found from unit tests 2012-08-06 14:42:58 +01:00
Alex Bilbie
a5f019ad19 Call database methods via the dbcall() method 2012-08-06 10:59:20 +01:00
Alex Bilbie
c17cd7b1cc Fixed variable reference bug 2012-08-04 09:12:12 +01:00
Alex Bilbie
bfab30061e Spacing fix 2012-08-04 09:11:39 +01:00
Alex Bilbie
5c463a69b8 Little fixes 2012-08-01 14:50:31 +01:00
Alex Bilbie
f049997f59 Various spacing fixes 2012-07-31 16:16:38 +01:00
Alex Bilbie
3f2f25a6a7 PSR2 wants a blank line at the end of the file 2012-07-31 16:00:55 +01:00
Alex Bilbie
18ad2067a1 SQL clarrification 2012-07-31 15:52:02 +01:00
Alex Bilbie
2b9d1c0e67 Variable reference fixes 2012-07-30 14:06:46 +01:00
Alex Bilbie
4abe7e7dda Spelling fix 2012-07-30 12:10:22 +01:00
Alex Bilbie
ef928b19cf Fixed HTTP method for getting code parameter 2012-07-30 12:10:13 +01:00
Alex Bilbie
8c991b0c61 Line length fix 2012-07-30 12:08:53 +01:00
Alex Bilbie
f8941a9209 Removed hard line limit of 80 characters 2012-07-26 17:02:01 +01:00
Alex Bilbie
8946e0172b Added resource server database 2012-07-26 12:54:29 +01:00
Alex Bilbie
9df1c8e20d Fixed incorrect parameter name 2012-07-26 12:53:07 +01:00
Alex Bilbie
c2ac787f09 Fixed placement of grant comments to stop PHPCS bitching 2012-07-25 16:15:14 +01:00
Alex Bilbie
10898ed8d4 Changed indentation to spaces 2012-07-25 16:14:16 +01:00
Alex Bilbie
7027eab507 Fixed errors relating to response types and grant type variables being moved into their own variables 2012-07-25 16:08:41 +01:00
Alex Bilbie
26751ef6b9 Broke up the issueAccessToken method to support additional grant types 2012-07-25 16:06:37 +01:00
Alex Bilbie
8286724d56 Removed typecasting 2012-07-25 16:05:55 +01:00
Alex Bilbie
df9c762b2e Class variable docblocks 2012-07-25 16:05:45 +01:00
Alex Bilbie
4f343cbe42 Broke the supported response types and authorisation grants out into their own variables 2012-07-25 16:04:52 +01:00
Alex Bilbie
0d060d6560 Added empty resource server file 2012-07-25 15:18:58 +01:00
Alex Bilbie
3ca2abc0ae Updated namespaces 2012-07-25 15:18:49 +01:00
Alex Bilbie
def2f4822c Moved the files into a new folder ready for Client libraries and Resource server libraries 2012-07-25 15:16:56 +01:00
Alex Bilbie
7ba0f4ee1a Fixed line lengths 2012-07-25 14:40:17 +01:00
Alex Bilbie
fdf71b758b Clarified return type of validateAuthCode method 2012-07-25 14:34:19 +01:00
Alex Bilbie
b15a2c09b3 Changed default stage parameter value to 'requested' from 'request' 2012-07-25 14:34:03 +01:00
Alex Bilbie
817a93a909 Added new accessTokenExpire parameter 2012-07-25 14:33:32 +01:00
Alex Bilbie
fb1eb183ea Added new accessTokenExpire parameter 2012-07-25 14:33:02 +01:00
Alex Bilbie
79ff22f48c Added new completeAuthCodeGrant method 2012-07-25 14:32:27 +01:00
Alex Bilbie
ee7308c0c9 Included extra default parameter for access token expiry 2012-07-25 14:31:52 +01:00
Alex Bilbie
d9953ef1ed Changed scope of newAuthCode method to private 2012-07-25 14:31:32 +01:00
Alex Bilbie
3c599e5454 Changed the error thrown if the client credentials are invalid to invalid_client 2012-07-25 14:31:09 +01:00
Alex Bilbie
fd1fe96c07 Removed typehinting 2012-07-25 14:30:39 +01:00
Alex Bilbie
a23bb301c0 Added more error messages and codes 2012-07-25 14:30:24 +01:00
Alex Bilbie
b0bd812da2 Changed $config['access_token_expire'] to $config['access_token_ttl']. Default value is now null 2012-07-25 14:29:58 +01:00
Alex Bilbie
5d012c6cf4 Added access_token_expires column to oauth_sessions table 2012-07-25 14:29:04 +01:00
Alex Bilbie
d25ef6bb89 Fixed adding scope to a session 2012-07-25 12:22:51 +01:00
Alex Bilbie
bb4ca4eb37 Fixed relationships between oauth_session_scope table and oauth_sessions 2012-07-25 12:22:31 +01:00
Alex Bilbie
03fd7aa501 Removed typecasting 2012-07-25 12:18:12 +01:00
Alex Bilbie
854ea81ed8 Fixing hasSession 2012-07-25 12:07:08 +01:00
Alex Bilbie
e860ca0d0a Reworked update session 2012-07-25 12:06:33 +01:00
Alex Bilbie
1d129e4af8 Reworked query of hasSession 2012-07-25 12:06:15 +01:00
Alex Bilbie
d5c8983293 Removed typecasting of parameters and tidied up appearance 2012-07-25 12:03:50 +01:00
Alex Bilbie
411cab1734 Reworked newAuthoriseRequest method so that is always creates a new session (and removes any existing sessions) 2012-07-25 12:03:25 +01:00
Alex Bilbie
17ce8b97d8 Removed typecasting 2012-07-25 12:02:41 +01:00
Alex Bilbie
d4026677e4 Added access_token_expire option (for refresh token support) 2012-07-25 12:02:23 +01:00
Alex Bilbie
7201d3ad88 Fixed folder name 2012-07-23 14:42:36 +01:00
Alex Bilbie
e15e606d0b Temp fix for folder name 2012-07-23 14:42:15 +01:00
Alex Bilbie
2b17c1f7af Fixed namespaces 2012-07-23 14:41:32 +01:00
Alex Bilbie
d7cde41fb1 Changed the namespace to "OAuth2" 2012-07-20 17:49:59 +01:00
Alex Bilbie
2e653ca351 Renamed folder 2012-07-20 17:49:06 +01:00
Alex Bilbie
2b6db69a5a Added comment to explain code that removes invalid scopes 2012-07-20 15:57:56 +01:00
Alex Bilbie
a292c4fe86 Fixed for loop parameter order. FOOL. 2012-07-20 15:56:56 +01:00
Alex Bilbie
4cc2a890b0 Fixed line lengths 2012-07-20 15:44:07 +01:00
Alex Bilbie
0638bc39d9 Missing $type in fund call 2012-07-20 15:43:08 +01:00
Alex Bilbie
386b5794e7 Updated exceptions to use exception codes and sprintf to state which parameters or scopes are wrong 2012-07-20 15:41:04 +01:00
Alex Bilbie
e3b2c4a95c Renamed interface file 2012-07-20 11:25:58 +01:00
Alex Bilbie
971f7bf402 Renamed inteface to Database 2012-07-20 11:25:29 +01:00
Alex Bilbie
f154708031 Renamed class 2012-07-20 11:22:31 +01:00
Alex Bilbie
63435154f4 Rename back to Server.php 2012-07-20 11:22:04 +01:00
Alex Bilbie
7f6d2db0a2 renamed class as test 2012-07-20 11:20:58 +01:00
Alex Bilbie
eb0756e7e0 Fixed line length 2012-07-20 11:06:20 +01:00
Alex Bilbie
5c32269ad4 Renamed the file to AuthServer.php 2012-07-20 11:05:26 +01:00
Alex Bilbie
b1a55806a8 Changed the class to AuthServer 2012-07-20 11:04:23 +01:00
Alex Bilbie
727cdb54e7 Lots of docblock updates 2012-07-20 11:04:08 +01:00
Alex Bilbie
e8db4ee20e Fixed line lengths of comments 2012-07-19 15:34:19 +01:00
Alex Bilbie
0b0ab19ccb Finished final docblock SQL statements and descriptions. 
TODO: finish return types
 2012-07-19 15:30:52 +01:00
Alex Bilbie
3ab685f8e3 Updated docblocks for almost all of the methods 2012-07-16 18:11:50 +01:00
Alex Bilbie
78551b0859 Added parameter doc blocks 2012-07-16 16:47:54 +01:00
Alex Bilbie
d5f0ac479b Added NULL default back to $clientSecret and $redirectUri 2012-07-16 15:46:02 +01:00
Alex Bilbie
d0a40f208c Moved license into it's own file 2012-07-16 15:28:29 +01:00
Alex Bilbie
f98c705fff Renamed interface file 2012-07-16 15:27:46 +01:00
Alex Bilbie
36c2513a7f Removed type hints and changed the name of the class 2012-07-16 15:27:24 +01:00
Alex Bilbie
ad562ce270 Removed the abstract class 2012-07-16 15:27:11 +01:00
Alex Bilbie
ad26632a71 Created an abstract class 2012-07-12 15:11:29 +01:00
Alex Bilbie
96435463bc Added use statement to hopefully pull in the OAuth2ServerDatabase interface 2012-07-12 15:07:34 +01:00
Alex Bilbie
ec706fc950 Added namespace to the interface 2012-07-12 15:00:30 +01:00
Alex Bilbie
3c6ad24f22 Changed the namespace to oauth2server 2012-07-12 14:57:29 +01:00
Alex Bilbie
813b19cb7a Removed the type hinting otherwise it tries to extend OAuth2\object which doesn't exist 2012-07-11 17:04:00 +01:00
Alex Bilbie
8b7b70f432 Extend the default PHP Exception class 2012-07-11 17:03:14 +01:00
Alex Bilbie
9844652efb Fixed line length of license 2012-07-11 14:01:13 +01:00
Alex Bilbie
ff4e78e575 Changed namespace 2012-07-09 16:48:14 +01:00
Alex Bilbie
f8417f2a4a Added MIT license 2012-07-09 16:41:46 +01:00
Alex Bilbie
c8944419fa Added initial DB structure 2012-07-09 16:40:03 +01:00
Alex Bilbie
22f397efc3 Added SQL folder with index.html 2012-07-09 16:39:53 +01:00
Alex Bilbie
938c54888f Fixed variable name 2012-07-06 19:32:27 +01:00
Alex Bilbie
2ba9a1d279 Comment changes 2012-07-06 19:31:36 +01:00
Alex Bilbie
45bfcffdc2 Fix 2012-07-06 19:30:11 +01:00
Alex Bilbie
c29c9d1d93 Spacing 2012-07-06 19:29:46 +01:00
Alex Bilbie
92be306d04 Fixed variable name 2012-07-06 19:29:39 +01:00
Alex Bilbie
f0e36e6c94 Fixed invalid variable name 2012-07-06 19:29:20 +01:00
Alex Bilbie
1c5d239087 Fixed brace placement 2012-07-06 19:28:09 +01:00
Alex Bilbie
e3ee9e84d2 Clarified comment 2012-07-06 19:26:49 +01:00
Alex Bilbie
9ea0d8f0e9 Added scope to newAuthoriseRequst function 2012-07-06 19:25:40 +01:00
Alex Bilbie
b4eeb7ca10 Moved comment to silent PHPCS 2012-07-06 19:24:51 +01:00
Alex Bilbie
818ca8dd7f Brace should be on a new line 2012-07-06 19:24:06 +01:00
Alex Bilbie
0eb0d68464 Docblock updates 2012-07-06 19:22:57 +01:00
Alex Bilbie
26d3d7789d Renamed checkAuthoriseParams function to checkClientAuthoriseParams 2012-07-06 19:22:48 +01:00
Alex Bilbie
5fbdccde40 Added newAuthoriseRequest function 2012-07-06 19:22:10 +01:00
Alex Bilbie
927d1dc838 Added generateCode function 2012-07-06 19:21:50 +01:00
Alex Bilbie
1c447e4a8e Added newAuthCode function 2012-07-06 19:21:11 +01:00
Alex Bilbie
fd90e76c91 Added redirectUri function 2012-07-06 19:20:53 +01:00
Alex Bilbie
11995764ba Added hasAccessToken query 2012-07-06 19:20:21 +01:00
Alex Bilbie
54a7a5b893 Set a type for deleteSession() 2012-07-06 19:20:04 +01:00
Alex Bilbie
f9dc4cba79 Added some docblocks 2012-07-06 18:15:53 +01:00
Alex Bilbie
13f2964944 Optional $options 2012-07-06 18:15:43 +01:00
Alex Bilbie
00fe3d3501 $options is null by default (makes it optional) 2012-07-06 18:15:28 +01:00
Alex Bilbie
a823096b44 If $options is not equal to null then overwrite default options 2012-07-06 18:15:03 +01:00
Alex Bilbie
f7d200faec Removed validateUser function 2012-07-06 18:14:32 +01:00
Alex Bilbie
2b44f0fd81 Removed unnecessary files 2012-07-06 17:56:15 +01:00
Alex Bilbie
d01720bcc2 Fixing line lengths 2012-07-06 17:52:47 +01:00
Alex Bilbie
e8be38cbfc Fixed for, if and foreach opening brace position 2012-07-06 17:48:42 +01:00
Alex Bilbie
41d8e01482 NULL should be null 2012-07-06 17:48:20 +01:00
Alex Bilbie
213f2a4ad8 Added checkAuthoriseParams method 2012-07-06 17:44:12 +01:00
Alex Bilbie
9eacbdc77e Config options 2012-07-06 17:43:55 +01:00
Alex Bilbie
e1c375f617 Database object (and register method) 2012-07-06 17:43:33 +01:00
Alex Bilbie
df0838c321 Spelling fix 2012-07-06 17:42:50 +01:00
Alex Bilbie
cc23522b49 Fixed line size errors 2012-07-06 16:47:11 +01:00
Alex Bilbie
11c0a45bfb Added error codes and descriptions 2012-07-06 16:44:24 +01:00
Alex Bilbie
4eb0f8b596 Added exceptions classes 2012-07-06 16:44:07 +01:00
Alex Bilbie
6cab31d7e8 Fixing PHP errors 2012-07-06 14:05:21 +01:00
Alex Bilbie
8ac1600063 Default null values (and string type hinting) for various parameters 2012-07-06 13:51:05 +01:00
Alex Bilbie
ab6db8fe67 Undo 48a068b999 2012-07-06 13:42:39 +01:00
Alex Bilbie
48a068b999 $queryDelimeter should be a string 2012-07-06 13:40:59 +01:00
Alex Bilbie
3eb408bf6f Split functions so line lengths aren't so long 2012-07-06 13:38:05 +01:00
Alex Bilbie
7874c7df15 Split line to less than 80 chars so PHPCS stops bitching 2012-07-06 13:32:50 +01:00
Alex Bilbie
93f9727f19 Added scope to __construct method 2012-07-06 13:32:36 +01:00
Alex Bilbie
01e13d167b Converted spaces to tabs 2012-07-06 13:31:33 +01:00
Alex Bilbie
dfaa99eb26 Converted tabs to spaces 2012-07-06 13:31:26 +01:00
Alex Bilbie
6d7aa9726d Coverted tabs to spaces 2012-07-06 13:30:10 +01:00
Alex Bilbie
70dd803025 Missing semicolon 2012-07-06 12:39:43 +01:00
Alex Bilbie
eae6dc471d Comment about the purpose of details function 2012-07-06 08:20:45 +01:00
Alex Bilbie
fdbd99c5c6 Set the DB interface 2012-07-06 08:20:19 +01:00
Alex Bilbie
7bca63a18f First commit 2012-07-05 17:38:58 +01:00