1
0
Fork 0
Commit graph

279 commits

Author SHA1 Message Date
61e2c7d20d Added AP to many network conditions / enabling inbox processing 2018-09-14 16:51:32 +00:00
1d4a5402ff Picture posts do work again - everything else should work as well 2018-09-06 20:30:16 +00:00
04fb885857 Fix: Posts with pictures will now look good again on connector networks 2018-09-06 04:24:34 +00:00
Hypolite Petovan
69e7c7feca Fix photo attachment display
- Remove double image display
- Add domain link display to all attachments
2018-09-02 17:26:05 -04:00
Jeroen De Meerleer
9ddb6abe08 Added widget class to invitationsbox (#5675) 2018-08-27 13:36:44 -04:00
927e0ee0a2 Isse 4726: Fixes the condition for showing hidden contacts 2018-08-25 16:38:26 +00:00
Michael Vogel
060e887a31 And still there are notices that have to be removed ... (#5629)
* And still there are notices that have to be removed ...

* Notice removed in ACL part

* Fix missing fields for notifications

* Fixes issue 5630
2018-08-18 08:20:50 +02:00
Michael Vogel
880b7177c8 And again, and again, and again, ... some more notices removed (#5601)
* And again, and again, and again, ... some more notices removed

* And some more notices ...

* Some more place
2018-08-11 23:05:42 +02:00
Roland Häder
e06fc2aa69 Stopped using deprecated constants NETWORK_* (#5537)
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...

* Removed deprecated NETWORK_* constants as per code reviewer's request.
2018-08-11 22:40:44 +02:00
170dd2a705 Some more removed notices 2018-08-10 19:39:43 +00:00
77e3e011e3 Hide deprecated networks 2018-08-10 04:59:26 +00:00
Michael Vogel
8c2efa6df4 Facebook and App.net is removed from nearly all places (#5581)
* Facebook is removed from nearly all places

* Remove app.net as well - it's dead for some time now
2018-08-07 17:06:51 +02:00
Michael Vogel
c72c64a6d8 Notices again (#5543)
* And again notices

* Notices in the directory

* Much more places

* Fix some double $

* Notice in ping

* Missing field

* Fix: We now remove deleted users from the directory

* Some more stuff

* Notices when removing users

* Added logging

* More logging

* Two more
2018-08-02 07:21:01 +02:00
Roland Häder
4d39164c1e [WIP] Rewrite to Proxy class: (#5507)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
  functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
  will do this for us
- renamed those proxy_*() functions to better names:
  + proxy_init()           -> Proxy::init()         (public)
  + proxy_url()            -> Proxy::proxifyUrl()   (public)
  + proxy_parse_html()     -> Proxy::proxifyHtml()  (public)
  + proxy_is_local_image() -> Proxy::isLocalImage() (private)
  + proxy_parse_query()    -> Proxy::parseQuery()   (private)
  + proxy_img_cb()         -> Proxy::replaceUrl()   (private)

* Ops, need to set $a here ...

* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule

* Ops, no need for own instance of $a when self::getApp() is around.

* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
  methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module

* No instances from utility classes

* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`

* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.

* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.

* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
2018-07-30 22:06:22 -04:00
Michael Vogel
a2cea16954 Some more notices (#5526)
* Some more notices

* Fixed nasty to find notice in DFRN and OStatus

* And more notices ...

* Yeah, some removed notices ... again ...
2018-07-30 06:41:20 +02:00
bc38420801 Some more notices removed 2018-07-29 04:04:23 +00:00
Roland Häder
4a22710b3b Moved global PAGE_* to Profile class (#5500)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class

* Fixed more rewrites from plain (global namespace) PAGE_* to Friendica\Models\Profile class

* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes

* CR request:
- moved ACCOUNT_TYPE_* constants from boot.php to Contact::ACCOUNT_TYPE_*

* Just copy-pasted this code from boot.php, needs to be changed to `const ACCOUNT_TYPE_FOO = x;`

* Ops, melting brain cells here ... :-/
2018-07-27 19:25:57 -04:00
6771522167 Reduce cache time for OEmbed error 2018-07-24 11:05:09 -04:00
Hypolite Petovan
df917251ff Fix undefined oembed properties
- Add Object\OEmbed class
2018-07-24 07:56:27 -04:00
Hypolite Petovan
ecea7425f8 Rename DBA::is_result to DBA::isResult 2018-07-23 11:04:14 -04:00
Hypolite Petovan
0ec44f3e8a Rename DBM method calls to DBA method calls 2018-07-23 11:02:24 -04:00
Hypolite Petovan
4db98eb43d Rename DBA::inArray to DBA::toArray 2018-07-22 19:27:35 -04:00
Hypolite Petovan
f051ae1698 Rename DBA::fetch_first to DBA::fetchFirst 2018-07-22 19:27:34 -04:00
Hypolite Petovan
af6dbc654f Rename Friendica\Database\dba to Friendica\Database\DBA 2018-07-20 08:19:26 -04:00
Hypolite Petovan
daa1177e3a Update use statement lists with new Friendica\Database\dba class
- Remove unused use statement
- Remove superfluous use statements (classes in the same namespace)
- Add missing use statements
2018-07-19 22:15:21 -04:00
Michael Vogel
66a103e36a
Merge pull request #5295 from MrPetovan/task/4889-move-config-to-config
Move configuration to config/
2018-07-18 11:04:35 +02:00
Roland Häder
fd8897851f Fixes for OEmbed class (#5392)
* Fixes:
- stdClass is clearly an object of `\stdClass`, so let's import it and set it
  as type-hint here
- if $o->type is not found, don't continue

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fix for a fix due to 02:51 a.m. (!) edits ...

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-17 16:28:20 -04:00
Roland Häder
04b513ba95 Fixed E_NOTICE when 'title' is absent (uninitialized array key) (#5390)
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-17 01:13:22 -04:00
Hypolite Petovan
67dc08d120 Enforce systen.register_policy value type 2018-07-16 19:38:19 -04:00
Hypolite Petovan
d0780ccf7d Replace global $lang with system.language 2018-07-16 19:38:17 -04:00
Hypolite Petovan
762a786611 Replace direct accesses to App->config by Config::get/set calls 2018-07-16 19:38:16 -04:00
Michael Vogel
d3a2ed85fe Next item structure works (#5380)
* Use "LEFT JOIN" to always fetch the item. Needed for update routines.

* New conversion routine that now covers every item

* Post update is now activated

* We now use a hash based upon RIPEMD-320 for content and activity

* The hash doesn't contain the plink anymore

* Legacy item fields are now "null"able

* New hash function for a server unique item hash

* Introduction of the legacy mode (usage of old item fields)

* Code simplification

* We don't need the "uri" fields anymore in item-activity and item-content

* Use the "created" and not the "received" date for the hash

* Avoiding several notices

* Some more warnings removed

* Improved uri-hash / Likes on Diaspora are now getting a creation date

* Corrected the post update version

* Ensure an unique uri-hash

* Don't delete orhaned item data at the moment

* Partly reworked, due to strange behaviour

* Some more parts reworked

* Using the uri currently seems to be more reliable

* Using the uri here as well

* Use the hash values again

* Grouped item fields in different categories

* Notices again

* use the gravity (we always should)

* Added hint for disabled post updates

* Notices ...

* Issue #5337: Personal notes are displayed again

* Use the gravity again
2018-07-15 14:36:20 -04:00
Hypolite Petovan
ffc8b2a79a Rework smilies class and module
- Add new replaceFromArray function to enable smilies replacement with
an arbitrary array
- Moved $sample logic from class to module
2018-07-15 08:03:12 -04:00
Michael Vogel
0360f7197a Several more warnings ... (#5340)
* Some more warnings removed

* Even more warnings ...

* Will it ever end? ;-)

* Avoid warning in dbstructure

* Origin and OStatus ...

* There are more warnings solved ... yeah!

* And again ...

* We are not done yet

* And more ...

* And some new places ...

* And more in the feeds

* Avoid some more

* And some backend stuff

* Notifications cleared

* Some more stuff

* and again ...

* It's getting fewer ...

* Some warnings had been hidden in the notifications

* Fix the fix

* And another missing one ...

* We need the owner here, not the user

* Forgotten user

* And more ...

* And some more warnings disappeared ...

* Some more frontend warnings

* Some backend warnings removed

* Fixed sidebar for "vier"

* And more ...

* Some more ...

* And something for "remote self"

* Am I stuck in an endless loop?

* Fix: Clear tag and file field on update

* Preset page content
2018-07-10 08:27:56 -04:00
3e797547a3 Warnings fixed 2018-07-08 09:37:05 +00:00
1905242a16 Added support for internal Diaspora links to accounts 2018-06-30 22:37:44 +00:00
Hypolite Petovan
6191fab4d7
Merge pull request #5216 from abanink/2337
solves 2337 Smiley Pack 1.04: some smiley keywords aren't replaced correctly
2018-06-14 15:36:21 -04:00
Pascal Deklerck
ce4b793acf solves 2337 Smiley Pack 1.04: some smiley keywords aren't replaced correctly 2018-06-14 21:09:55 +02:00
5bfd424fd2 Clean up tag claud (remove "item_condition()" call) 2018-06-10 15:19:52 +00:00
Hypolite Petovan
0eafea86ed
Merge pull request #5163 from annando/bugfix-user-item
Fix SQL error in tagcloud
2018-06-02 13:49:58 -04:00
41423e578a Fix SQL error in tagcloud 2018-06-02 17:07:28 +00:00
8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
df531cd400 Don't proxy pictures when they are sent to other networks 2018-05-21 10:15:50 +00:00
eec0826750 added link to the TOS page if it is activated 2018-05-16 11:57:06 +02:00
7f7ccc3f51 the widget is not needed here 2018-05-09 12:49:29 +02:00
21f9f74ad0 use Archives for the additional feature setting like it is used in the network sidebar 2018-05-09 12:32:47 +02:00
c33df7a05e Fix video display problems with videos with parameters 2018-05-06 16:57:46 +00:00
7230cc0bed Merge remote-tracking branch 'upstream/develop' into item-distribution 2018-04-24 04:23:38 +00:00
e51a017d92
Merge pull request #4917 from annando/show-private-forums
Show private forums in the sidebar
2018-04-23 18:47:21 +02:00
c3ee596ff4 Show private forums in the sidebar 2018-04-23 16:41:00 +00:00
Hypolite Petovan
a66e9b81ba
Merge pull request #4873 from astifter/develop
Remove pagination when empty, move new Member Tips and use common widget to find people.
2018-04-23 10:23:21 -04:00
ba35b19af6 Public federated items now always are having an entry with "uid=0" 2018-04-23 11:14:25 +00:00
Michael Vogel
37e5272f92
Merge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext
Guess language from plaintext
2018-04-23 00:26:05 +02:00
Friendica
390983a331 Haromonize Find People Widget.
In the right_aside on the /contacts page in the left aside there are
almost identical widgets to search for contacts. Drop one and use common
widget in both places.
2018-04-22 20:44:22 +00:00
16beab4652 Better working with private forums 2018-04-21 21:59:02 +00:00
Hypolite Petovan
1e67c32142 Fix BBCode::getAbstract scope 2018-04-21 04:38:27 -04:00
Hypolite Petovan
ec9baef968 Add new Content\BBCode::toPlaintext() 2018-04-21 04:10:25 -04:00
Hypolite Petovan
5476da53aa Move Content\BBCode::toPlaintext() to Model\Item::getPlaintextPost() 2018-04-21 04:09:45 -04:00
Hypolite Petovan
369518e7b6 [BBCode] Improve support for strikethrough 2018-04-10 06:23:40 -04:00
Hypolite Petovan
37505f8f28 Fix variable name typo in ContactSelector::profileAssign 2018-04-06 21:54:53 -04:00
Hypolite Petovan
7413dc62f0 Remove trailing whitespaces in Content\ContactSelector 2018-04-06 21:54:22 -04:00
8d68e865c1 Fixes warning "missing terminating ] for character class" 2018-04-06 09:11:10 +00:00
4a909fcfcf Bugfix: The rendering with images with width and height was broken 2018-04-05 06:01:36 +00:00
08c85c425b Added support of alt texts in images 2018-04-04 22:23:17 +00:00
Hypolite Petovan
80b6dc5787 Add fallback to regular code if language doesn't exist 2018-03-29 19:29:36 -04:00
Hypolite Petovan
586b0b6e57 Add bash to text_highlight language list 2018-03-29 19:29:09 -04:00
Hypolite Petovan
09f04c1985 Add Image::getInfoFromURL return check 2018-03-24 20:03:55 -04:00
Hypolite Petovan
c5cd569447 Restore previous permission comment in Widget\CalendarExport 2018-03-23 06:34:21 -04:00
Hypolite Petovan
d36bc29ce9 Finally fix the permissions for Widget\CalendarExport 2018-03-23 06:34:21 -04:00
Hypolite Petovan
72b552895e Restore missing permission check in Widget\CalendarExport 2018-03-23 06:34:21 -04:00
Hypolite Petovan
6e7c6ab0fa Remove references to include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan
f7e2071117 Replace include/event function with method calls
- Updated scope of Model\Event methods
- Updated use list
2018-03-23 06:32:34 -04:00
Hypolite Petovan
8c956ac0c8 Add new classes
- Add Model\Event class
- Add Content\Widget\CalendarExport class
2018-03-23 06:32:08 -04:00
Hypolite Petovan
27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
dccfc83a2d No display improvements for regular posts 2018-03-22 20:47:31 +00:00
318de2f590 Merge remote-tracking branch 'upstream/3.6-rc' into url-shorten-ostatus 2018-03-22 20:42:29 +00:00
f4ba5d9799 Fix: Events on Diaspora now should look fine 2018-03-20 06:32:17 +00:00
e1a72b8f5a Visible URL are shortened when transmitting to OStatus 2018-03-16 20:50:53 +00:00
4ba3ba391a The attachment text had already been in HTML and mustn't be converted again 2018-03-14 22:51:14 +00:00
8c42e2e62e Avoid double encoding of the attachment content 2018-03-14 21:47:24 +00:00
052ad155a2 Issue 4115: Events are now formatted better for Diaspora 2018-03-11 21:10:36 +00:00
fbb38837b0 Shortener deactivated, due to Diaspora problems 2018-03-11 12:16:17 +00:00
229fb0439e Links to Diaspora had sometimes been cut 2018-03-11 10:54:02 +00:00
7706616640 Bugfix: Reshare with added content to Diaspora looked ugly 2018-03-09 20:04:31 +00:00
c438e47827 Bugfix: Avoid "Class not found" error 2018-03-08 19:58:35 +00:00
Hypolite Petovan
789561c7a2 Remove/Update references to include/html2*.php 2018-03-07 16:34:17 -05:00
Hypolite Petovan
5e806ff598 Replace html2plain calls by HTML::toPlaintext 2018-03-07 16:29:44 -05:00
Hypolite Petovan
b5666bd27f Replace html2bbcode calls by HTML::toBBCode 2018-03-07 16:24:13 -05:00
Hypolite Petovan
1df4bb6db8 Create Content\Text\HTML class
- Move BBCode::cleanCss to HTML::sanitizeCSS
2018-03-07 16:20:04 -05:00
Hypolite Petovan
fe5ce67ef8 Move bb2diaspora() content to Content\Text\BBCode::toMarkdown
- Use self where appropriate
- Add BaseObject extension
2018-03-04 17:34:59 -05:00
Hypolite Petovan
a233ce1658 Create Markdown::toBBCode() method
- Create private callback Markdown::diasporaMention2BBCodeCallback
2018-03-04 08:31:05 -05:00
Hypolite Petovan
41678ec3cd Add no_update flag to speed up Contact::getIdForURL instances 2018-03-01 19:54:45 -05:00
Hypolite Petovan
9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan
0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
Hypolite Petovan
29f5270313 Remove unused parameter preserve_nl in BBCode::convert 2018-02-14 21:31:28 -05:00
Hypolite Petovan
ee380c3149 Fix undeclared variable in Content\Text\BBCode 2018-02-14 20:25:23 -05:00
Hypolite Petovan
4bc1672921 Add paragraph to BBCode conversion of [quote] 2018-02-12 22:37:30 -05:00
rabuzarus
342b9af734 fix undeclared variables or wrong variable names (/src) 2018-02-12 16:08:28 +01:00
rabuzarus
9a4d19e284 move membersince addon to core 2018-02-09 20:44:45 +01:00
15a857e411 Line endings are converted to unix style 2018-02-09 03:49:49 +00:00
87280ebf57 Bugfix: a forgotten "use" in bbcode.php 2018-02-08 06:08:07 +00:00
85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src
Move include/bbcode to src/ part 1 : Everything but bbcode()
2018-02-07 07:18:39 +01:00
rabuzarus
91a346960a fix tagcloud 2018-02-05 21:05:11 +01:00
Hypolite Petovan
a0cdd9c674 Rename Core\Network to Core\Protocol 2018-02-05 12:57:41 -05:00
Hypolite Petovan
157027a6f5 Improve BBCode documentation/comment 2018-02-05 11:42:06 -05:00
Hypolite Petovan
d75bb8e970 Rename BBCode::removeAbstract() to BBCode::stripAbstract() 2018-02-04 23:38:40 -05:00
Hypolite Petovan
6e53c615c4 Add missing requires in Text\BBCode 2018-02-04 19:33:39 -05:00
Hypolite Petovan
010cf3b1e8 Update references to BBCode methods
- Resolve name conflicts with Util\Network
2018-02-04 19:26:22 -05:00
Hypolite Petovan
f91ad28319 Copy include/bbcode functions to src methods
- Add Core\Network class
2018-02-04 19:25:22 -05:00
Hypolite Petovan
507bea0e9f Copy functions from include/tags to src
- Create Content\Widget\TagCloud
- Populate Worker\TagUpdate::execute
- Add Content\Widget::tagCloud
- Add Model\Term::insertFromItemId and Model\Term::insertFromItemUri
2018-02-03 23:51:40 -05:00
Hypolite Petovan
5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00
Hypolite Petovan
8aff8a76eb Add Temporal::utcNow() 2018-02-03 08:56:52 -05:00
Hypolite Petovan
dc366bf1f7 Refactor datetime_convert into Temporal::convert
- Changed parameter order to save space
- Refactor select_timezone into Temporal::getTimezoneSelect
- Refactor field_timezone into Temporal::getTimezoneField
2018-02-03 08:56:51 -05:00
6871481a78 Moved "limitBodySize" 2018-01-28 17:36:37 +00:00
d6af08fb36 FetchUrl is not FetchURL ... 2018-01-27 23:53:56 +00:00
c2a9036145 OEmbed function was called with the wrong class name 2018-01-27 23:17:37 +00:00
Adam Magness
6c80a35953 type
friendica typo
2018-01-27 12:15:42 -05:00
Adam Magness
f04d40a37e Review update
Rename function, move others
2018-01-27 11:13:41 -05:00
Adam Magness
0f1be37279 Remove old file
remove network.php and all require_once statements
2018-01-27 08:28:20 -05:00
Adam Magness
1eb7c19c1e Move multiple functions
move multiple smaller functions
2018-01-26 23:51:41 -05:00
Adam Magness
c67452f72e Move fetch_url
move fetch_url function
2018-01-26 23:09:48 -05:00
Adam Magness
fb05570c1d Create Plaintext class
create class and move shorten method
2018-01-26 20:26:49 -05:00
Adam Magness
177edd2b6e Rename class to BBCode
Rename Plaintext class to BBCode
2018-01-26 20:01:32 -05:00
Adam Magness
21881f2885 Update function calls
update to new function calls
2018-01-26 19:14:47 -05:00
Adam Magness
792f069c6e Create Plaintext class
create Plaintext class with functions from include/plaintext
2018-01-26 19:04:04 -05:00
Hypolite Petovan
9cd3b17743 Fix translation strings for use with util/extract.php
- Change parentheses to “\x28” and “\x29”
- Remove leading commas
- Remove quotes before commas
2018-01-24 16:51:32 -05:00
Adam Magness
b4d0df18c5 Remove old file and requires
Remove pgettext.php and remove require_once calls
2018-01-22 18:03:26 -05:00
Adam Magness
07d306aa37 Finish t() for src
Update t() calls in src folder
2018-01-22 18:03:26 -05:00
Adam Magness
3b0f69599e Updat tt() calls
update function calls for tt()
2018-01-22 18:03:26 -05:00
Adam Magness
6c4c567319 Remove require
remove require_once for plugins.php
2018-01-20 07:48:22 -05:00
Adam Magness
11cf36105c Update Addon functions and calls
Update function names and calls for Addon class.
2018-01-20 07:48:22 -05:00
Adam Magness
246e673659 Review updates 2018-01-15 17:42:12 -05:00
Adam Magness
bb08f87bba Remove old file
remove include/nav.php
2018-01-15 17:12:39 -05:00
Adam Magness
bd63a36269 use dba
add use dba
2018-01-15 17:09:06 -05:00
Adam Magness
0f546f7f0f Update functions and calls
Update function names and scope. update calls.
2018-01-15 17:09:06 -05:00
Adam Magness
ac317060fb Create Nav class
create nav class and function from include/nav.php
2018-01-15 17:09:06 -05:00
Hypolite Petovan
e36f2bb1fb Use short form array syntax everywhere
- Add short form array syntax to po2php.php generation
2018-01-15 14:07:17 -05:00
Hypolite Petovan
46bf82eeb7
Merge pull request #4247 from zeroadam/ProfileSel-#3878
Move profile_selector to src
2018-01-15 11:34:35 -05:00
Adam Magness
309ea7e7a4 Review updates
update array to short form syntax
2018-01-15 11:33:02 -05:00
Hypolite Petovan
145dc37a53 Add use dba to Content\Widget 2018-01-15 10:39:27 -05:00
Adam Magness
f53e54c705 Update functions and calls
Update function name and calls.
2018-01-15 10:15:00 -05:00
Adam Magness
700eca70a9 Functions to ContactSelector
put function in ContactSelector class
2018-01-15 10:08:47 -05:00
Adam Magness
6cf6029ff5 Rename functions and calls
Rename functions and update calls
2018-01-15 09:50:06 -05:00
Adam Magness
0409aae719 Create Widget class
create widget class in Friendica/Content.
2018-01-15 09:22:01 -05:00
Hypolite Petovan
fabbf810b0 Move library/markdown.php to src 2018-01-14 19:01:09 -05:00
Michael Vogel
70942202c0
Merge pull request #4216 from MrPetovan/bug/4173-fix-oembed-iframe-url
Fix link attachment display
2018-01-13 00:45:32 +01:00
2c90c5be94 Better treatment of Oembed detection with no OEmbed data and not title 2018-01-12 23:32:58 +00:00
Hypolite Petovan
77c1251d03 Fallback to regular attachment display on oembed error 2018-01-11 22:34:02 -05:00
c0eecfc55f Unbalanced html fixed 2018-01-11 22:34:56 +00:00
e18e081b47 bookmark elements weren't always parsed correctly 2018-01-11 22:28:46 +00:00