From 228152d4c831366176d0babb0fcb90381709ba01 Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Wed, 1 Feb 2023 07:36:10 -0800 Subject: [PATCH 1/2] fix login update --- compass/app/Http/Controllers/IndieAuth.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compass/app/Http/Controllers/IndieAuth.php b/compass/app/Http/Controllers/IndieAuth.php index 58536b8..a107fad 100644 --- a/compass/app/Http/Controllers/IndieAuth.php +++ b/compass/app/Http/Controllers/IndieAuth.php @@ -164,7 +164,9 @@ class IndieAuth extends BaseController // Create the user record if it doesn't exist yet $user = DB::table('users')->where('url','=',$url)->first(); if($user) { - DB::update('UPDATE users SET last_login = ?', [date('Y-m-d H:i:s')]); + DB::table('users')->where('id', $user->id)->update([ + 'last_login' => date('Y-m-d H:i:s') + ]); session(['user_id' => $user->id]); } else { $user_id = DB::table('users')->insertGetId([ From da26affe26fda8d3be758c27b0b95e43b922acb2 Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Wed, 1 Feb 2023 07:37:47 -0800 Subject: [PATCH 2/2] catch errors with invalid timezones closes #50 --- compass/resources/views/map.blade.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/compass/resources/views/map.blade.php b/compass/resources/views/map.blade.php index d60d624..3afd093 100644 --- a/compass/resources/views/map.blade.php +++ b/compass/resources/views/map.blade.php @@ -33,9 +33,18 @@
timezone); + } catch(Exception $e) { + $tz = new DateTimeZone('UTC'); + } + + $start = new DateTime($database->created_at); $end = new DateTime(); - $end->setTimeZone(new DateTimeZone($database->timezone)); + $start->setTimeZone($tz); + $end->setTimeZone($tz); + $i = clone $start; while((int)$i->format('Y') <= (int)$end->format('Y') && (int)$i->format('M') <= (int)$end->format('M')) { ?>