From 9f26b7aa9c6e3ba50de5a0780c917cabad7367f6 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 17 Mar 2021 17:49:13 +0100 Subject: air: convert utc to local in browser (we do not have a client timezone othervise at this point) - issue #1544 --- Zotlabs/Module/Regate.php | 4 ++-- Zotlabs/Module/Register.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Regate.php b/Zotlabs/Module/Regate.php index 2b46d7452..7379a6662 100644 --- a/Zotlabs/Module/Regate.php +++ b/Zotlabs/Module/Regate.php @@ -232,8 +232,8 @@ class Regate extends \Zotlabs\Web\Controller { $ip = $_SERVER['REMOTE_ADDR']; $isduty = zar_register_dutystate(); - $nowfmt = $isduty['nowfmt']; - $atform = $isduty['atform']; + $nowfmt = $isduty['nowfmt']; + $atform = $isduty['atform']; $title = t('Register Verification'); diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 38bfd1619..c8cb78e74 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -320,7 +320,7 @@ class Register extends Controller { $reonar['from'] = get_config('system', 'from_email'); $reonar['to'] = $email; $reonar['subject'] = sprintf( t('Registration confirmation for %s'), get_config('system','sitename')); - $reonar['txtpersonal']= t('Valid from') . ' ' . $regdelay . ' ' . t('and expire') . ' ' . $regexpire; + $reonar['txtpersonal']= t('Valid from') . ' ' . $regdelay . ' ' . t('and expire') . ' ' . $regexpire . ''; $reonar['txttemplate']= replace_macros(get_intltext_template('register_verify_member.tpl'), [ '$sitename' => get_config('system','sitename'), @@ -387,11 +387,11 @@ class Register extends Controller { zar_log( 'ZAR0239A ' . t('New register request') . ' d' . $didnew . ', ' . $regdelay . ' - ' . $regexpire); - // notice( 'ZAR0239I,' . t( 'Your didital id is' ) . EOL . 'd' . $didnew . EOL - $_SESSION['zar']['msg'] = ( 'ZAR0239I,' . t( 'Your didital id is' ) . EOL . 'd' . $didnew . EOL + // notice( 'ZAR0239I,' . t( 'Your digital id is' ) . EOL . 'd' . $didnew . EOL + $_SESSION['zar']['msg'] = ( 'ZAR0239I,' . t( 'Your digital id is' ) . EOL . 'd' . $didnew . EOL . t('and your pin for is') . ' ' . $pass2 . EOL . t('Keep these infos and your entered password safe') . EOL - . t('Valid from') . ' ' . $regdelay . ' ' . t('and expire') . ' ' . $regexpire . EOL ); + . t('Valid from') . ' ' . datetime_convert('UTC', 'UTC', $regdelay, 'c') . ' ' . t('and expire') . ' ' . datetime_convert('UTC', 'UTC', $regexpire, 'c') . '' . EOL ); // acpin verify // goaway(z_root() . '/regate/' . bin2hex('d' . $didnew) . 'a' ); -- cgit v1.2.3