1
1
Fork 0
Commit graph

5198 commits

Author SHA1 Message Date
Roland Häder 85d5592180
added curly braces + spaces (CR)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:43:38 +02:00
Roland Häder 3051d30c88
added spaces (CR)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:40:19 +02:00
Roland Häder 215cae204d
again develop and this branch differs ... (no blame on cherry-picking though)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:38:40 +02:00
Roland Häder d94e878714
opps, was somehow missed to cherry-pick/merge ?
+ converted multiple single-line comments into one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:36:38 +02:00
Roland Häder 61cfa9e42d
Opps!
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:31:54 +02:00
Roland Häder a69f3017fb
Cleanups:
- made SQL keywords all uper-case
- put all SQL columns in back-ticks
- added curly braces
- added/removed spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:31:09 +02:00
Roland Häder f6c667ef45
more spaces + curly braces ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:22:33 +02:00
Roland Häder 8ba461db0a
removed spaces ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:17:20 +02:00
Roland Häder 78b9cf97e0
huh? was in develop branch but not here?
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:12:31 +02:00
Roland Häder 3d386daf53
no spaces here ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:11:51 +02:00
Roland Häder 3220234693
more spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:10:50 +02:00
Roland Häder a0e5f7a59a
added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please
note that PHP5 allows 'array' as type-hint already (+ interface/class name).

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 19:05:50 +02:00
Roland Häder 8191bcc402
more spaces + curly braces + converted multiple single-line comments to one mult-line comment
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 18:52:15 +02:00
Roland Häder a4d60b65f1
fixed spacing + intending
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-08 18:49:01 +02:00
Roland Häder 3d1626781d Merge branch 'develop' into rewrites/coding-convention-split2-1-2 2017-04-08 18:45:59 +02:00
Michael c94525938d Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed 2017-04-08 10:05:01 +00:00
Michael 8786bcdf0a Avoid duplicates with feeds and "remote self" 2017-04-08 08:12:14 +00:00
Michael Vogel 56c0675fba Merge pull request #3295 from Hypolite/issue/#3274
Friendica code blocks aren't rendered in Diaspora
2017-04-07 22:59:44 +02:00
Tobias Diekershoff 6060f311e9 small fix for #3254 2017-04-07 11:26:11 +02:00
Hypolite Petovan b0accf4d4c Fix code blocks to Diaspora
- Extracts code blocks before BBCode conversion to prevent code
highlighting and whitespace meddling
- Use the improved HTLM To Markdown library
- Use <code>  instead of <key> for Diaspora inline code blocks
2017-04-06 23:49:56 -04:00
Hypolite Petovan 8149e21add Enforce standards 2017-04-06 23:43:55 -04:00
Roland Häder 20f8b63fca
unspaced ... ;-)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:45:43 +02:00
Roland Häder 32ffe4a711
more spaces/curly braces added
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:40:09 +02:00
Roland Häder a4773a1ac0
added more spaces + fixed tpzo: occurence
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:34:35 +02:00
Roland Häder 28c08467fd
Continued a bit:
- added spaces/curly braces
- used x($foo, 'bar') instead of isset($foo['bar'])
- let's wrap html_entity_encode() somehow

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:31:33 +02:00
Roland Häder ddd875bba0
added more spaces (CR)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:23:57 +02:00
Roland Häder 5a28eae59d
Opps, fixed parser error ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:20:19 +02:00
Roland Häder 737a6670af
Continued a bit:
- more spaces added
- more curly braces added
- let's use x($_FOO, 'bar') and not isset($_FOOT['bar'])

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:18:03 +02:00
Roland Häder 2a2e55e53d
overworked api.php:
- added 'new' keyword because 'throw Exception' won't work
- removed self-advertisement
- added tons of spaces
- added tons of curly braces
- removed parentheses from require/include
- more usage of dbm::is_result()
- still there is a lot todo

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 22:11:09 +02:00
Roland Häder 33e938a837
added spaces + used x() the proper way
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 19:36:01 +02:00
Roland Häder 57b6e4c636
added spaces (CR)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 19:34:38 +02:00
Roland Häder 849e56e3a5
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 19:27:44 +02:00
Roland Häder 64cf909ca2
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 19:26:37 +02:00
Hypolite Petovan 1ab28bbe03 Add Text_Highlighter to Composer
- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments

Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.
2017-04-05 00:31:49 -04:00
Roland Häder 03571f6e74
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-04 19:46:56 +02:00
Hypolite Petovan 9237b2611a Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-03 06:35:27 -04:00
Michael c574c317ef Removed unneeded comment 2017-04-02 20:43:54 +00:00
Michael 884c75a350 Issue 3278: Attachments in Reshares should now work 2017-04-02 19:18:11 +00:00
Michael Vogel d9451ef969 Merge pull request #3279 from Hypolite/improvement/add-composer
Add Composer
2017-04-02 14:57:37 +02:00
Michael 94f3f0887b Issue 2957: The avatar problem with mastodon should now finally be solved 2017-04-02 12:37:22 +00:00
Michael 54f49169d4 Show real platform names 2017-04-02 07:53:55 +00:00
Michael 07fd61b912 Mastodon: plink for reshares, missing hostnames for avatars 2017-04-01 23:39:19 +00:00
Roland Häder 49527b70d3 Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-01 22:16:08 +02:00
Michael 16d4392573 Documentation added 2017-04-01 09:05:56 +00:00
Michael f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) 2017-04-01 08:28:42 +00:00
Hypolite Petovan 799e60aa62 Replace existing autoloader with Composer-supplied
- Move Friendica namespace to `src`
- Move required `ezyang/htmlpurifier` to vendor
- Remove existing static autoloader
- Change boot.php reference to the autoloader
2017-03-31 23:02:38 -04:00
Roland Häder 8bdc906013
Continued a bit:
- added 'array' type-hint which is valid for many versions back
- added spaces as requested by CR
- removed $a = get_app(); call, $a was no longer needed here

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:42:20 +02:00
Michael 3796a141c6 We don't need this include anymore 2017-03-31 06:25:48 +00:00
Michael 1560534621 Now it's openssl - and no copy&paste failure anymore 2017-03-31 06:22:43 +00:00
Michael 973fcd3624 Test with OpenSSL 2017-03-30 23:21:52 +00:00
Roland Häder d091759888
space to the rescue ... ;-) CR request
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:34:14 +02:00
Michael 54c8fb2bb8 Replaces mcrypt with phpsec. 2017-03-30 18:29:12 +00:00
Michael 4fc1ebd4ea Doing some Hypolyzation 2017-03-27 21:02:56 +00:00
Michael c85331d8ac Reestablish the communication with Mastodon 2017-03-27 20:58:15 +00:00
Tobias Diekershoff 8580cd87a6 Merge pull request #3271 from Hypolite/issue/#3189
Fix Diaspora code blocks being mangled
2017-03-27 09:26:39 +02:00
Michael fa7721c735 Prevent Hypolite from doing comments about standards ;-) 2017-03-27 06:11:45 +00:00
Michael 364d88fa70 Only import new OStatus posts if they are from our followers 2017-03-27 05:33:43 +00:00
Hypolite Petovan 3e285a690a Fix Diaspora code blocks being mangled
- Remove whitespace removal code from `diaspora2bb()`
- Add code block skipping the HTML transforms removing whitespace in
`htm2bbcode()`
2017-03-26 19:00:04 -04:00
Hypolite Petovan f1a75a57fe Merge pull request #3257 from annando/1703-gcontact
Improved gcontact handling
2017-03-25 15:35:41 -04:00
Michael 585c2119d7 Remove the "call by reference" 2017-03-25 18:00:56 +00:00
Roland Häder 9ddb032bf2
strange that this curly brace didn't make it in. now it is, thanks to @annando
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 18:32:33 +01:00
Roland Häder 33fa1e79af
some spaces ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 18:32:21 +01:00
Michael 444de52859 Use of exceptions 2017-03-25 16:56:04 +00:00
Tobias Diekershoff 6e35c49cb9 Merge pull request #3263 from annando/1601-api-statuses-lookup
More GNU Social compatibility for the API
2017-03-25 16:26:21 +01:00
Michael adf9ed64bb Avoid API error when calling "/api/friendica/profile/show" 2017-03-25 14:16:21 +00:00
Roland Häder 0e6b009425
fixed another parser error, opps
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 15:04:07 +01:00
Roland Häder fccdc63964
Opps, fixed parser error. indending was confusing here
+ added much more curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 14:56:23 +01:00
Roland Häder a391ab9a99
was a bit confusing for me or I was not sleeping to much ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:46:51 +01:00
Roland Häder 89bd080e7e
don't kill when no result is found, this may break communication, thanks to @annando explaining it
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:42:09 +01:00
Roland Häder 6d5826e188
PHP5 does not support native type-hints, except array + used dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:38:11 +01:00
Roland Häder fd468f20fd
merged 2 if() into one, closes internal TODO
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:08:56 +01:00
Roland Häder 47ae5a9a47
removed parentheses, added curly ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:07:33 +01:00
Roland Häder 2f5c796886
removed TODO, one day this all needs refacturizing ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:02:09 +01:00
Michael a9dfd1fcb7 One more API call added 2017-03-25 11:31:31 +00:00
Michael 4665cda00e Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2017-03-25 11:25:47 +00:00
Michael 0d49143a63 "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
Michael a419bbe7c7 Hypolite is right (not always, but in this case) 2017-03-25 10:11:02 +00:00
Michael 5060300138 Reset the static variable $baseurl 2017-03-25 10:07:45 +00:00
Hypolite Petovan 29fb28de43 Remove Embedly integration
- Remove admin setting input
2017-03-25 01:57:19 -04:00
Hypolite Petovan b9f4a6e4f0 Code cleanup + standards 2017-03-25 01:54:16 -04:00
Roland Häder d45e79dfe9
Continued:
- converted multiple single-line comments into one multi-line comment (please
  stop abusing programming languages!)
- added more TODO tags for type-hints (upcoming rewrite)
- opps, one space was only fixed in develop branch, not in this PR branch

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 20:39:00 +01:00
Michael b7242c3fa0 poco_last_updated is optimized 2017-03-23 22:56:22 +00:00
Roland Häder db1c2e4041
fixed comment and explained one
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 23:37:58 +01:00
Roland Häder e4ad359f5a
added curely braces + TODO for maybe avoiding multi-lined if() blocks as it confuses #3254
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:53:03 +01:00
Roland Häder f94a10bf00
old behaviour restored
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:49:34 +01:00
Roland Häder 66366b2804
added more spaces and curely braces
killed ?> as it is discouraged

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:46:25 +01:00
Roland Häder d8eee2be55
added curely branches + reverted back to old behaviour (may come back one day)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:33:57 +01:00
Roland Häder 09ab141404
better comment added by @Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:29:26 +01:00
Roland Häder dad6a61be4
it is space-season ... ;-) #3254
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:19:25 +01:00
Michael 2ce5ab1467 removed commented out line 2017-03-23 07:36:22 +00:00
Michael 5b6215d7bd Better server_url handling 2017-03-23 07:34:45 +00:00
Michael c25af197c9 baseurl should now be set correctly at all the time. 2017-03-23 07:10:22 +00:00
Michael 26ec56dfa5 server_url was forgotten 2017-03-23 06:45:00 +00:00
Michael 9e5bec1bc8 "poco_check" is now replaced and removed 2017-03-23 06:23:23 +00:00
Michael 8e240a1e8c New function to validate gcontact array data 2017-03-22 23:13:32 +00:00
Michael 1d6910277d Remove more deprecated "poco_check" calls 2017-03-22 07:11:58 +00:00
Michael bc517ef3d2 Remove reduncancies 2017-03-22 05:26:44 +00:00
Michael a376f55c1f Linefeed added 2017-03-21 22:06:57 +00:00
Roland Häder ddb5a8ea78
Continued:
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-21 21:51:22 +01:00
Roland Häder 830af774d3
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-21 21:50:45 +01:00
Michael Vogel 4ebebe96fe Merge branch 'develop' into 1703-worker-splitting 2017-03-21 17:08:07 +01:00
Hypolite Petovan 7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Michael Vogel 5a6da8b447 Merge branch 'develop' into 1703-worker-splitting 2017-03-21 16:38:59 +01:00
Michael f7b0c2082b Some standards 2017-03-21 15:24:49 +00:00
Michael 9c16b47f55 Strange comment removed 2017-03-21 15:15:58 +00:00
Hypolite Petovan 9c2c483996 Merge pull request #3112 from Quix0r/rewrites/coding-convention
Coding convention applied - part 1
2017-03-21 10:19:53 -04:00
Michael 19825eddf7 Changed probing call. Removed dupolicated code. 2017-03-21 13:43:53 +00:00
Michael be9db7f060 Merge remote-tracking branch 'upstream/develop' into 1703-worker-splitting 2017-03-21 07:59:14 +00:00
Michael 74cc5ade0c Worker processes are split into many more separate tasks 2017-03-21 07:57:09 +00:00
Tobias Diekershoff 0fd874a683 Merge pull request #3246 from annando/1701-poco
Split poco discovery in smaller function calls
2017-03-21 07:27:10 +01:00
Roland Häder 09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-20 20:51:32 +01:00
rabuzarus 0879b46125 add NULL_DATE & coding standard work 2017-03-20 16:59:21 +01:00
rabuzarus 0060e2449e Merge develop into 20170316_-_fix_event_edit
Conflicts:
	mod/events.php
2017-03-20 16:46:36 +01:00
Michael b42a977894 Bugfix for issue 3242 - forgotten "use" 2017-03-19 22:58:35 +00:00
Michael 41ee4ec60a Standards and just some more poco slitting 2017-03-19 21:32:11 +00:00
Michael e684fff477 Added documention 2017-03-19 18:24:49 +00:00
Michael 2615d40d6b Split the POCO discovery process in several small processes 2017-03-19 17:43:59 +00:00
Michael 7f61b2ee15 Merge remote-tracking branch 'upstream/develop' into 1701-poco
Conflicts:
	include/socgraph.php
2017-03-19 15:36:41 +00:00
Hypolite Petovan 65f809f5cb Merge pull request #3245 from annando/issue-3242
Issue 3242: Define a maintenance reason
2017-03-19 11:06:25 -04:00
Michael e93825b9f0 Some more standards 2017-03-19 14:43:24 +00:00
Michael 8dd732a896 Issue 3242: Define a maintenance reason 2017-03-19 13:24:07 +00:00
Michael b06d787130 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 2017-03-19 08:06:02 +00:00
Michael 132688d663 Standards, what else? 2017-03-19 08:04:04 +00:00
Michael e9b083d13d
You shoudln't use a text variable like an array. 2017-03-19 01:23:34 +01:00
Roland Häder 5e1c303c08
added spaces according to coding-convention
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 01:04:30 +01:00
Roland Häder 1946cf143d
added logger ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 01:00:35 +01:00
Roland Häder 621a77b275
added spaces around + curly braces ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 00:58:46 +01:00
Roland Häder 6ca6c6813a
better log here ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 00:56:58 +01:00
Roland Häder aeaafb5d71 Continued:
- added curly braces
- added TODO
- removed TODO (no change needed, is fine)

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
Roland Häder 4fe5cdf3fd don't quit silently, at least a TODO is now around
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
Roland Häder e8e51d8535 Missed a 't', thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
Roland Häder fbd559a823
more spaces + some curly spaces added
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
Roland Häder ed0d858f98
added spaces + some curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
Roland Häder 4c72cb3584
Continued:
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder bf0a07b7ae
Continued:
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder 015561fec6
Opps ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder 4a96c280d0
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder d9c22c7f3e
Continued a bit:
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder 951006dd10
more spaces + some curly spaces added
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:51:54 +01:00
Roland Häder 41a36606c6
added spaces + some curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:50:19 +01:00
Roland Häder cc83e9d72a
fixed curly brace (opps)
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder 6a3dc8b286
added more curly braces + fixed one
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder 3ad0fd442e
Continued:
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder c6ef84a964
Continued:
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder 6a171a96aa
Opps ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:47 +01:00
Roland Häder 3849e7c9ff
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:47 +01:00
Roland Häder 92901d8626
more curly braces added + dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Michael fb5f1f61fc You shoudln't use a text variable like an array. 2017-03-18 23:32:59 +00:00
Michael 1a436264cd Some standards 2017-03-18 12:13:43 +00:00
Michael 222550e784 From now on we are using 0001-01-01 as lowest date 2017-03-18 11:42:54 +00:00