diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index d8cbbf7cb..8fb078fce 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -669,6 +669,7 @@ class Conversation 'folders' => $folders, 'text' => strip_tags($body_html), 'localtime' => DateTimeFormat::local($item['created'], 'r'), + 'utc' => DateTimeFormat::utc($item['created'], 'c'), 'ago' => (($item['app']) ? $this->l10n->t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created'])), 'location_html' => $location_html, 'indent' => '', diff --git a/src/Module/Settings/TwoFactor/Trusted.php b/src/Module/Settings/TwoFactor/Trusted.php index e38d64ac0..844cd4dff 100644 --- a/src/Module/Settings/TwoFactor/Trusted.php +++ b/src/Module/Settings/TwoFactor/Trusted.php @@ -8,6 +8,7 @@ use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; use Friendica\Core\Renderer; use Friendica\Module\BaseSettings; use Friendica\Security\TwoFactor; +use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; use UAParser\Parser; @@ -88,7 +89,11 @@ class Trusted extends BaseSettings $trustedBrowserDisplay = array_map(function (TwoFactor\Model\TrustedBrowser $trustedBrowser) use ($parser) { $dates = [ 'created_ago' => Temporal::getRelativeDate($trustedBrowser->created), + 'created_utc' => DateTimeFormat::utc($trustedBrowser->created, 'c'), + 'created_local' => DateTimeFormat::local($trustedBrowser->created, 'r'), 'last_used_ago' => Temporal::getRelativeDate($trustedBrowser->last_used), + 'last_used_utc' => DateTimeFormat::utc($trustedBrowser->last_used, 'c'), + 'last_used_local' => DateTimeFormat::local($trustedBrowser->last_used, 'r'), ]; $result = $parser->parse($trustedBrowser->user_agent); diff --git a/src/Security/TwoFactor/Model/AppSpecificPassword.php b/src/Security/TwoFactor/Model/AppSpecificPassword.php index cab160483..0c47ed556 100644 --- a/src/Security/TwoFactor/Model/AppSpecificPassword.php +++ b/src/Security/TwoFactor/Model/AppSpecificPassword.php @@ -87,6 +87,8 @@ class AppSpecificPassword array_walk($appSpecificPasswords, function (&$value) { $value['ago'] = Temporal::getRelativeDate($value['last_used']); + $value['utc'] = DateTimeFormat::utc($value['last_used'], 'c'); + $value['local'] = DateTimeFormat::local($value['last_used'], 'r'); }); return $appSpecificPasswords; diff --git a/view/templates/settings/twofactor/app_specific.tpl b/view/templates/settings/twofactor/app_specific.tpl index 1f5826744..965caffc8 100644 --- a/view/templates/settings/twofactor/app_specific.tpl +++ b/view/templates/settings/twofactor/app_specific.tpl @@ -30,9 +30,7 @@ {{$app_specific_password.description}} </td> <td> - <span class="time" title="{{$app_specific_password.last_used}}" data-toggle="tooltip"> - <time datetime="{{$app_specific_password.last_used}}">{{$app_specific_password.ago}}</time> - </span> + <time class="time" title="{{$app_specific_password.local}}" data-toggle="tooltip" datetime="{{$app_specific_password.utc}}">{{$app_specific_password.ago}}</time> </td> <td> <button type="submit" name="revoke_id" class="btn btn-default btn-small" value="{{$app_specific_password.id}}">{{$revoke_label}}</button> diff --git a/view/templates/settings/twofactor/trusted_browsers.tpl b/view/templates/settings/twofactor/trusted_browsers.tpl index e6d434b4f..29d2ab29c 100644 --- a/view/templates/settings/twofactor/trusted_browsers.tpl +++ b/view/templates/settings/twofactor/trusted_browsers.tpl @@ -28,14 +28,10 @@ {{$trusted_browser.browser}} </td> <td> - <span class="time" title="{{$trusted_browser.created}}" data-toggle="tooltip"> - <time datetime="{{$trusted_browser.created}}">{{$trusted_browser.created_ago}}</time> - </span> + <time class="time" title="{{$trusted_browser.created_local}}" data-toggle="tooltip" datetime="{{$trusted_browser.created_utc}}">{{$trusted_browser.created_ago}}</time> </td> <td> - <span class="time" title="{{$trusted_browser.last_used}}" data-toggle="tooltip"> - <time datetime="{{$trusted_browser.last_used}}">{{$trusted_browser.last_used_ago}}</time> - </span> + <time class="time" title="{{$trusted_browser.last_used_local}}" data-toggle="tooltip" datetime="{{$trusted_browser.last_used_utc}}">{{$trusted_browser.last_used_ago}}</time> </td> <td> <button type="submit" name="remove_id" class="btn btn-default btn-small" value="{{$trusted_browser.cookie_hash}}">{{$remove_label}}</button> diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl index c7da59a0d..d0e3b51ea 100644 --- a/view/templates/wall_thread.tpl +++ b/view/templates/wall_thread.tpl @@ -53,7 +53,7 @@ </div> <div class="wall-item-author"> <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}">{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br /> - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time><span class="pinned">{{$item.pinned}}</span></div> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"><time class="dt-published" title="{{$item.localtime}}" datetime="{{$item.utc}}">{{$item.ago}}</time><span class="pinned">{{$item.pinned}}</span></div> </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}" dir="auto">{{$item.title}}</div> diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl index e31537b15..c6f19eb16 100644 --- a/view/theme/frio/templates/search_item.tpl +++ b/view/theme/frio/templates/search_item.tpl @@ -67,7 +67,11 @@ <div class="additional-info text-muted"> <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago"> - <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span></a></small> + <small> + <a href="{{$item.plink.orig}}"> + <time class="time" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time> + </a> + </small> </div> {{if $item.location_html}} diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index bbacdfc5b..d6790b3e8 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -168,9 +168,7 @@ as the value of $top_child_total (this is done at the end of this file) <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago"> <small> <a href="{{$item.plink.orig}}"> - <span class="time" title="{{$item.localtime}}" data-toggle="tooltip"> - <time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time> - </span> + <time class="time dt-published" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time> </a> {{if $item.owner_self}} {{include file="sub/delivery_count.tpl" delivery=$item.delivery}} @@ -201,7 +199,9 @@ as the value of $top_child_total (this is done at the end of this file) <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span>{{$item.name}}</span></a> <p class="text-muted"> <small> - <a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a> + <a href="{{$item.plink.orig}}"> + <time class="time" class="wall-item-ago" datetime="{{$item.utc}}">{{$item.ago}}</time> + </a> {{if $item.location_html}} — ({{$item.location_html nofilter}}){{/if}} {{if $item.owner_self}} {{include file="sub/delivery_count.tpl" delivery=$item.delivery}} @@ -220,7 +220,9 @@ as the value of $top_child_total (this is done at the end of this file) <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span class="fakelink">{{$item.name}}</span></a> <span class="text-muted"> <small> - <a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a> + <a href="{{$item.plink.orig}}"> + <time class="time" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time> + </a> {{if $item.location_html}} — ({{$item.location_html nofilter}}){{/if}} {{if $item.owner_self}} {{include file="sub/delivery_count.tpl" delivery=$item.delivery}} diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl index 3eab3f569..29dae72b4 100644 --- a/view/theme/quattro/templates/wall_thread.tpl +++ b/view/theme/quattro/templates/wall_thread.tpl @@ -90,7 +90,7 @@ title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> - <span class="wall-item-ago" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span> + <span class="wall-item-ago"><time class="dt-published" title="{{$item.localtime}}" datetime="{{$item.utc}}">{{$item.ago}}</time></span> <span class="pinned">{{$item.pinned}}</span> {{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}} {{/if}} diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl index 37bff2154..773938f3c 100644 --- a/view/theme/smoothly/templates/wall_thread.tpl +++ b/view/theme/smoothly/templates/wall_thread.tpl @@ -54,7 +54,7 @@ <span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}">{{$item.name}}</span> </a> <div class="wall-item-ago">•</div> - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time><span class="pinned">{{$item.pinned}}</span></div> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"><time class="dt-published" title="{{$item.localtime}}" datetime="{{$item.utc}}">{{$item.ago}}</time><span class="pinned">{{$item.pinned}}</span></div> </div> <div> diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl index 1d13b9e52..f2bd02e7e 100644 --- a/view/theme/vier/templates/wall_thread.tpl +++ b/view/theme/vier/templates/wall_thread.tpl @@ -56,7 +56,7 @@ <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}} <span class="wall-item-ago"> - {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}} + {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.utc}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.utc}}">{{$item.created}}</time> {{/if}} {{if $item.owner_self}} {{include file="sub/delivery_count.tpl" delivery=$item.delivery}} {{/if}}