FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add show_datetime_format(); optional default timezone parameter #741 (#746)

Browse Source
This commit is contained in:
Nabeel S
2020-06-04 08:34:30 -07:00
committed by GitHub
parent 3d211535f7
commit 04b8be1649
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/helpers.php
View File

@@ -4,6 +4,7 @@ use App\Exceptions\SettingNotFound;
use App\Repositories\SettingRepository;
use Carbon\Carbon;
use Illuminate\Contracts\View\Factory;
use Illuminate\Support\Facades\Auth;
/*
* array_key_first only exists in PHP 7.3+
@@ -266,12 +267,13 @@ if (!function_exists('show_date')) {
* but convert it into the user's timezone
*
* @param \Carbon\Carbon $date
* @param string $default_timezone Default timezone to use, defaults to UTC
*
* @return string
*/
function show_date(Carbon $date)
function show_date(Carbon $date, $default_timezone = 'UTC')
{
$timezone = 'UTC';
$timezone = $default_timezone;
if (Auth::check()) {
$timezone = Auth::user()->timezone ?: $timezone;
}
@@ -280,6 +282,31 @@ if (!function_exists('show_date')) {
}
}
/*
* Show a date/time in the proper timezone for a user
*/
if (!function_exists('show_datetime_format')) {
/**
* Format the a Carbon date into the datetime string
* but convert it into the user's timezone
*
* @param \Carbon\Carbon $date
* @param string $format
* @param string $default_timezone A default timezone to use (UTC by default)
*
* @return string
*/
function show_datetime_format(Carbon $date, $format, $default_timezone = 'UTC')
{
$timezone = $default_timezone;
if (Auth::check()) {
$timezone = Auth::user()->timezone ?: $timezone;
}
return $date->timezone($timezone)->format($format);
}
}
if (!function_exists('_fmt')) {
/**
* Replace strings