mirror of
https://we.phorge.it/source/phorge.git
synced 2024-09-21 17:58:47 +02:00
b12f13efd8
Summary: Fixes T8601. To reproduce the problem: - Set your time preference to `""` (the empty string). This isn't possible from the modern UI, but can be done with "Right Click > Inspect Element", or users may have carried it forward from an older setting (this is the case with me and @hach-que on this install). - Load Calendar with some events. - This parses an epoch, which sets `valueTime` to `""` (since there are no format characters in the preference) and then `getEpoch()` fails because `strlen($time)` is 0. - Since `getEpoch()` failed, `getDateTime()` also fails. To fix this: - Only permit the date and time preferences to have valid values. Test Plan: - Loaded page before patch, saw fatal. - Applied patch. - No more fatal. - Viewed tooltips, dates/times, dates/times in other apps. - Changed my preferences, saw them respected. Reviewers: lpriestley Reviewed By: lpriestley Subscribers: epriestley, hach-que Maniphest Tasks: T8601 Differential Revision: https://secure.phabricator.com/D13346
94 lines
2.7 KiB
PHP
94 lines
2.7 KiB
PHP
<?php
|
|
|
|
function phabricator_date($epoch, PhabricatorUser $user) {
|
|
return phabricator_format_local_time(
|
|
$epoch,
|
|
$user,
|
|
phutil_date_format($epoch));
|
|
}
|
|
|
|
function phabricator_relative_date($epoch, $user, $on = false) {
|
|
static $today;
|
|
static $yesterday;
|
|
|
|
if (!$today || !$yesterday) {
|
|
$now = time();
|
|
$today = phabricator_date($now, $user);
|
|
$yesterday = phabricator_date($now - 86400, $user);
|
|
}
|
|
|
|
$date = phabricator_date($epoch, $user);
|
|
|
|
if ($date === $today) {
|
|
return 'today';
|
|
}
|
|
|
|
if ($date === $yesterday) {
|
|
return 'yesterday';
|
|
}
|
|
|
|
return (($on ? 'on ' : '').$date);
|
|
}
|
|
|
|
function phabricator_time($epoch, $user) {
|
|
$time_key = PhabricatorUserPreferences::PREFERENCE_TIME_FORMAT;
|
|
return phabricator_format_local_time(
|
|
$epoch,
|
|
$user,
|
|
$user->getPreference($time_key));
|
|
}
|
|
|
|
function phabricator_datetime($epoch, $user) {
|
|
$time_key = PhabricatorUserPreferences::PREFERENCE_TIME_FORMAT;
|
|
return phabricator_format_local_time(
|
|
$epoch,
|
|
$user,
|
|
pht('%s, %s',
|
|
phutil_date_format($epoch),
|
|
$user->getPreference($time_key)));
|
|
}
|
|
|
|
/**
|
|
* This function does not usually need to be called directly. Instead, call
|
|
* @{function:phabricator_date}, @{function:phabricator_time}, or
|
|
* @{function:phabricator_datetime}.
|
|
*
|
|
* @param int Unix epoch timestamp.
|
|
* @param PhabricatorUser User viewing the timestamp.
|
|
* @param string Date format, as per DateTime class.
|
|
* @return string Formatted, local date/time.
|
|
*/
|
|
function phabricator_format_local_time($epoch, $user, $format) {
|
|
if (!$epoch) {
|
|
// If we're missing date information for something, the DateTime class will
|
|
// throw an exception when we try to construct an object. Since this is a
|
|
// display function, just return an empty string.
|
|
return '';
|
|
}
|
|
|
|
$user_zone = $user->getTimezoneIdentifier();
|
|
|
|
static $zones = array();
|
|
if (empty($zones[$user_zone])) {
|
|
$zones[$user_zone] = new DateTimeZone($user_zone);
|
|
}
|
|
$zone = $zones[$user_zone];
|
|
|
|
// NOTE: Although DateTime takes a second DateTimeZone parameter to its
|
|
// constructor, it ignores it if the date string includes timezone
|
|
// information. Further, it treats epoch timestamps ("@946684800") as having
|
|
// a UTC timezone. Set the timezone explicitly after constructing the object.
|
|
try {
|
|
$date = new DateTime('@'.$epoch);
|
|
} catch (Exception $ex) {
|
|
// NOTE: DateTime throws an empty exception if the format is invalid,
|
|
// just replace it with a useful one.
|
|
throw new Exception(
|
|
pht("Construction of a DateTime() with epoch '%s' ".
|
|
"raised an exception.", $epoch));
|
|
}
|
|
|
|
$date->setTimeZone($zone);
|
|
|
|
return PhutilTranslator::getInstance()->translateDate($format, $date);
|
|
}
|