Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 03:50:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add Temporal::utc() shorthand to Temporal::convert()

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-26 07:29:32 -05:00
parent ca8209a2ce
commit 35d06bd9eb
22 changed files with 173 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Util/Temporal.php
View file

@ -113,7 +113,7 @@ class Temporal
*/
public static function getTimezoneField($name = 'timezone', $label = '', $current = 'America/Los_Angeles', $help = '')
{
$options = Temporal::getTimezoneSelect($current);
$options = self::getTimezoneSelect($current);
$options = str_replace('<select id="timezone_select" name="timezone">', '', $options);
$options = str_replace('</select>', '', $options);
@ -123,6 +123,18 @@ class Temporal
]);
}
/**
* convert() shorthand for UTC.
*
* @param string $time A date/time string
* @param string $format DateTime format string or Temporal constant
* @return string
*/
public static function utc($time, $format = self::MYSQL)
{
return self::convert($time, 'UTC', 'UTC', $format);
}
/**
* convert() shorthand for UTC now.
*
@ -209,7 +221,7 @@ class Temporal
if ($dob < '0000-01-01') {
$value = '';
} else {
$value = Temporal::convert(($year > 1000) ? $dob : '1000-' . $month . '-' . $day, 'UTC', 'UTC', 'Y-m-d');
$value = self::utc(($year > 1000) ? $dob : '1000-' . $month . '-' . $day, 'Y-m-d');
}
$age = (intval($value) ? age($value, $a->user["timezone"], $a->user["timezone"]) : "");
@ -445,11 +457,11 @@ class Temporal
$viewer_tz = date_default_timezone_get();
}
$birthdate = Temporal::convert($dob . ' 00:00:00+00:00', $owner_tz, 'UTC', 'Y-m-d');
$birthdate = self::convert($dob . ' 00:00:00+00:00', $owner_tz, 'UTC', 'Y-m-d');
list($year, $month, $day) = explode("-", $birthdate);
$year_diff = Temporal::convert('now', $viewer_tz, 'UTC', 'Y') - $year;
$curr_month = Temporal::convert('now', $viewer_tz, 'UTC', 'm');
$curr_day = Temporal::convert('now', $viewer_tz, 'UTC', 'd');
$year_diff = self::convert('now', $viewer_tz, 'UTC', 'Y') - $year;
$curr_month = self::convert('now', $viewer_tz, 'UTC', 'm');
$curr_day = self::convert('now', $viewer_tz, 'UTC', 'd');
if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) {
$year_diff--;
@ -489,7 +501,7 @@ class Temporal
{
$d = sprintf('%04d-%02d-01 00:00', intval($y), intval($m));
return Temporal::convert($d, 'UTC', 'UTC', 'w');
return self::utc($d, 'w');
}
/**
@ -519,8 +531,8 @@ class Temporal
'October', 'November', 'December'
];
$thisyear = Temporal::convert('now', date_default_timezone_get(), 'UTC', 'Y');
$thismonth = Temporal::convert('now', date_default_timezone_get(), 'UTC', 'm');
$thisyear = self::convert('now', date_default_timezone_get(), 'UTC', 'Y');
$thismonth = self::convert('now', date_default_timezone_get(), 'UTC', 'm');
if (!$y) {
$y = $thisyear;
}
@ -537,7 +549,7 @@ class Temporal
$started = false;
if (($y == $thisyear) && ($m == $thismonth)) {
$tddate = intval(Temporal::convert('now', date_default_timezone_get(), 'UTC', 'j'));
$tddate = intval(self::convert('now', date_default_timezone_get(), 'UTC', 'j'));
}
$str_month = day_translate($mtab[$m]);