sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 4.1.19

Browse Source
This commit is contained in:
Neo committed 2025-12-19 05:38:56 -08:00
1 parent 28bd025b35
commit 2bd5025018
2674 files changed
+233518 -77766
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

system/DateTime/DateTime.php
+196 -64
View File
@@ -2,9 +2,9 @@
/**
* @brief Date/Time Class
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
* @copyright (c) 2001 - SVN_YYYY Invision Power Services, Inc.
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
* @license http://www.invisionpower.com/legal/standards/
* @package IPS Social Suite
* @package IPS Community Suite
* @since 8 Mar 2013
* @version SVN_VERSION_NUMBER
*/
@@ -36,15 +36,33 @@ class _DateTime extends \DateTime
$obj->setTimestamp( $timestamp );
if ( !$bypassTimezone AND \IPS\Dispatcher::hasInstance() and \IPS\Member::loggedIn()->timezone )
{
try
$validTimezone = TRUE;
if( in_array( \IPS\Member::loggedIn()->timezone, \DateTimeZone::listIdentifiers() ) )
{
$obj->setTimezone( new \DateTimeZone( \IPS\Member::loggedIn()->timezone ) );
try
{
$obj->setTimezone( new \DateTimeZone( \IPS\Member::loggedIn()->timezone ) );
}
catch ( \Exception $e )
{
$validTimezone = FALSE;
}
}
catch ( \Exception $e )
else
{
\IPS\Member::loggedIn()->timezone = null;
\IPS\Member::loggedIn()->save();
$validTimezone = FALSE;
}
if( ! $validTimezone )
{
\IPS\Member::loggedIn()->timezone = null;
if ( \IPS\Member::loggedIn()->member_id )
{
\IPS\Member::loggedIn()->save();
}
}
}
return $obj;
}
@@ -64,36 +82,39 @@ class _DateTime extends \DateTime
*
* @param \DateInterval $diff The interval
* @param int $restrictParts The maximum number of "pieces" to return. Restricts "1 year, 1 month, 1 day, 1 hour, 1 minute, 1 second" to just "1 year, 1 month". Pass 0 to not reduce.
* @return string
* @param \IPS\Lang|\IPS\Member|NULL $memberOrLanguage The language or member to use, or NULL for currently logged in member
* @return string
*/
public static function formatInterval( \DateInterval $diff, $restrictParts=2 )
public static function formatInterval( \DateInterval $diff, $restrictParts=2, $memberOrLanguage=NULL )
{
$language = static::determineLanguage( $memberOrLanguage );
/* Figure out what pieces we have. Note that we are letting the language manager perform the formatting to implement better pluralization. */
$format = array();
if( $diff->y !== 0 )
{
$format[] = \IPS\Member::loggedIn()->language()->addToStack( 'f_years', FALSE, array( 'pluralize' => array( $diff->y ) ) );
$format[] = $language->addToStack( 'f_years', FALSE, array( 'pluralize' => array( $diff->y ) ) );
}
if( $diff->m !== 0 )
{
$format[] = \IPS\Member::loggedIn()->language()->addToStack( 'f_months', FALSE, array( 'pluralize' => array( $diff->m ) ) );
$format[] = $language->addToStack( 'f_months', FALSE, array( 'pluralize' => array( $diff->m ) ) );
}
if( $diff->d !== 0 )
{
$format[] = \IPS\Member::loggedIn()->language()->addToStack( 'f_days', FALSE, array( 'pluralize' => array( $diff->d ) ) );
$format[] = $language->addToStack( 'f_days', FALSE, array( 'pluralize' => array( $diff->d ) ) );
}
if( $diff->h !== 0 )
{
$format[] = \IPS\Member::loggedIn()->language()->addToStack( 'f_hours', FALSE, array( 'pluralize' => array( $diff->h ) ) );
$format[] = $language->addToStack( 'f_hours', FALSE, array( 'pluralize' => array( $diff->h ) ) );
}
if( $diff->i !== 0 )
{
$format[] = \IPS\Member::loggedIn()->language()->addToStack( 'f_minutes', FALSE, array( 'pluralize' => array( $diff->i ) ) );
$format[] = $language->addToStack( 'f_minutes', FALSE, array( 'pluralize' => array( $diff->i ) ) );
}
/* If we don't have anything but seconds, return "less than a minute ago" */
@@ -101,12 +122,12 @@ class _DateTime extends \DateTime
{
if( $diff->s !== 0 )
{
return \IPS\Member::loggedIn()->language()->addToStack('less_than_a_minute');
return $language->addToStack('less_than_a_minute');
}
}
else if( $diff->s !== 0 )
{
$format[] = \IPS\Member::loggedIn()->language()->addToStack( 'f_seconds', FALSE, array( 'pluralize' => array( $diff->s ) ) );
$format[] = $language->addToStack( 'f_seconds', FALSE, array( 'pluralize' => array( $diff->s ) ) );
}
/* If we are still here, reduce the number of items in the $format array as appropriate */
@@ -129,7 +150,7 @@ class _DateTime extends \DateTime
$format = $useOnly;
}
return \IPS\Member::loggedIn()->language()->formatList( $format );
return $language->formatList( $format );
}
/**
@@ -145,45 +166,55 @@ class _DateTime extends \DateTime
/**
* Get HTML output
*
* @param bool $capialize TRUE if by itself, FALSE if in the middle of a sentence
* @param bool $capitalize TRUE if by itself, FALSE if in the middle of a sentence
* @param \IPS\Lang|\IPS\Member|NULL $memberOrLanguage The language or member to use, or NULL for currently logged in member
* @return string
*/
public function html( $capialize=TRUE, $short=FALSE )
public function html( $capitalize=TRUE, $short=FALSE, $memberOrLanguage=NULL )
{
$format = $short ? 1 : ( $capialize ? static::RELATIVE_FORMAT_NORMAL : static::RELATIVE_FORMAT_LOWER );
$format = $short ? 1 : ( $capitalize ? static::RELATIVE_FORMAT_NORMAL : static::RELATIVE_FORMAT_LOWER );
return "<time datetime='{$this->rfc3339()}' title='{$this}' data-short='" . trim( $this->relative(1) ) . "'>" . trim( $this->relative( $format ) ) . "</time>";
return "<time datetime='{$this->rfc3339()}' title='{$this}' data-short='" . trim( $this->relative( 1, $memberOrLanguage ) ) . "'>" . trim( $this->relative( $format, $memberOrLanguage ) ) . "</time>";
}
/**
* Format the date according to the user's locale (without the time)
*
* @param \IPS\Member $member
* @return string
* @param \IPS\Lang|\IPS\Member|NULL $memberOrLanguage The language or member to use, or NULL for currently logged in member
* @return string
*/
public function localeDate( \IPS\Member $member = NULL )
public function localeDate( $memberOrLanguage=NULL )
{
$member = ( $member === NULL ) ? \IPS\Member::loggedIn() : $member;
return $member->language()->convertString( strftime( '%x', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ) );
return static::determineLanguage( $memberOrLanguage )->convertString( strftime( '%x', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ) );
}
/**
* Format the date to return month and day without a year
*
* @note You can adjust this by changing MONTH_DAY_FORMAT constant which defaults to %B %d
* @param \IPS\Lang|\IPS\Member|NULL $memberOrLanguage The language or member to use, or NULL for currently logged in member
* @return string
*/
public function dayAndMonth()
public function dayAndMonth( $memberOrLanguage=NULL )
{
return \IPS\Member::loggedIn()->language()->convertString( strftime( \IPS\MONTH_DAY_FORMAT, $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ) );
return static::determineLanguage( $memberOrLanguage )->addToStack(
'_date_day_and_month',
FALSE,
array(
'pluralize' => array(
strftime( ( strftime( '%d' ) !== FALSE ) ? '%d' : '%e', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ),
strftime( '%m', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ),
)
)
);
}
/**
* Get locale date, forced to 4-digit year format
*
* @param \IPS\Lang|\IPS\Member|NULL $memberOrLanguage The language or member to use, or NULL for currently logged in member
* @return string
*/
public function fullYearLocaleDate()
public function fullYearLocaleDate( $memberOrLanguage=NULL )
{
$timeStamp = $this->getTimestamp() + $this->getTimezone()->getOffset( $this );
$dateString = strftime( '%x', $timeStamp );
@@ -192,7 +223,7 @@ class _DateTime extends \DateTime
$dateString = preg_replace_callback( "/(\s|\/|,|-){$twoDigitYear}$/", function( $matches ) use ( $fourDigitYear ) {
return $matches[1] . $fourDigitYear;
}, $dateString );
return \IPS\Member::loggedIn()->language()->convertString( $dateString );
return static::determineLanguage( $memberOrLanguage )->convertString( $dateString );
}
/**
@@ -202,13 +233,14 @@ class _DateTime extends \DateTime
* countries prefer 12-hour format, so we override
* specifically for them
*
* @param bool $seconds If TRUE, will include seconds
* @param bool $minutes If TRUE, will include minutes
* @param bool $seconds If TRUE, will include seconds
* @param bool $minutes If TRUE, will include minutes
* @param \IPS\Lang|\IPS\Member|NULL $memberOrLanguage The language or member to use, or NULL for currently logged in member
* @return string
*/
public function localeTimeFormat( $seconds=FALSE, $minutes=TRUE )
public function localeTimeFormat( $seconds=FALSE, $minutes=TRUE, $memberOrLanguage=NULL )
{
if ( in_array( preg_replace( '/\.UTF-?8$/', '', \IPS\Member::loggedIn()->language()->short ), array(
if ( in_array( preg_replace( '/\.UTF-?8$/', '', static::determineLanguage( $memberOrLanguage )->short ), array(
'sq_AL', // Albanian - Albania
'zh_SG', 'sgp', 'singapore', // Chinese - Singapore
'zh_TW', 'twn', 'taiwan', // Chinese - Taiwan
@@ -225,7 +257,7 @@ class _DateTime extends \DateTime
'es_MX', 'mex', 'mexico', 'esm', 'spanish-mexican', // Spanish - Mexico
) ) )
{
if( mb_strtoupper( mb_substr( PHP_OS, 0, 3 ) ) === 'WIN' )
if( strftime( '%I' ) !== FALSE )
{
return '%I' . ( $minutes ? ':%M' : '' ) . ( $seconds ? ':%S ' : ' ' ) . ' %p';
}
@@ -241,13 +273,14 @@ class _DateTime extends \DateTime
/**
* Format the time according to the user's locale (without the date)
*
* @param bool $seconds If TRUE, will include seconds
* @param bool $minutes If TRUE, will include minutes
* @param bool $seconds If TRUE, will include seconds
* @param bool $minutes If TRUE, will include minutes
* @param \IPS\Lang|\IPS\Member|NULL $memberOrLanguage The language or member to use, or NULL for currently logged in member
* @return string
*/
public function localeTime( $seconds=TRUE, $minutes=TRUE )
public function localeTime( $seconds=TRUE, $minutes=TRUE, $memberOrLanguage=NULL )
{
return \IPS\Member::loggedIn()->language()->convertString( strftime( $this->localeTimeFormat( $seconds, $minutes ), $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ) );
return static::determineLanguage( $memberOrLanguage )->convertString( strftime( $this->localeTimeFormat( $seconds, $minutes, $memberOrLanguage ), $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ) );
}
const RELATIVE_FORMAT_NORMAL = 0; // Yesterday at 2pm
@@ -258,96 +291,170 @@ class _DateTime extends \DateTime
* Format the date relative to the current date/time
* e.g. "30 minutes ago"
*
* @param int $format The format (see RELATIVE_FORMAT_* constants)
* @param int $format The format (see RELATIVE_FORMAT_* constants)
* @param \IPS\Lang|\IPS\Member|NULL $memberOrLanguage The language or member to use, or NULL for currently logged in member
* @return string
*/
public function relative( $format=0 )
public function relative( $format=0, $memberOrLanguage=NULL )
{
$language = static::determineLanguage( $memberOrLanguage );
$now = static::create();
$difference = $this->diff( $now );
$capitalKey = ( $format == static::RELATIVE_FORMAT_LOWER ) ? '' : '_c';
if ( !$difference->invert and $now->format('Y') == $this->format('Y') )
/* More than a year ago...1y is good enough for short dates */
if( $format == static::RELATIVE_FORMAT_SHORT AND !$difference->invert and $now->format( 'Y', $language ) != $this->format( 'Y', $language ) )
{
if( $difference->y )
{
return $language->addToStack( 'f_years_short', FALSE, array( 'sprintf' => array( $difference->y ) ) );
}
else
{
return $language->addToStack(
'_date_this_year_short',
FALSE,
array(
'pluralize' => array(
strftime( ( strftime( '%d' ) !== FALSE ) ? '%d' : '%e', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ),
strftime( '%m', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) )
)
)
);
}
}
/* In the past and from this year */
if ( !$difference->invert and $now->format( 'Y', $language ) == $this->format( 'Y', $language ) )
{
/* More than a week ago: "March 4" */
if ( $difference->m or $difference->d >= 6 )
{
return \IPS\Member::loggedIn()->language()->convertString( strftime( ( ( mb_strtoupper( mb_substr( PHP_OS, 0, 3 ) ) === 'WIN' ) ? '%d' : '%e' ) . ( $format == static::RELATIVE_FORMAT_SHORT ? ' %b' : ' %B' ), $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ) );
return $language->addToStack(
$format == static::RELATIVE_FORMAT_SHORT ? '_date_this_year_short' : '_date_this_year_long',
FALSE,
array(
'pluralize' => array(
strftime( ( strftime( '%d' ) !== FALSE ) ? '%d' : '%e', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ),
strftime( '%m', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) )
)
)
);
}
/* Less than a week but more than a day ago */
elseif ( $difference->d )
{
$compare = clone $this;
/* Short format: "1 dy" */
if ( $format === static::RELATIVE_FORMAT_SHORT )
{
return \IPS\Member::loggedIn()->language()->addToStack( 'f_days_short', FALSE, array( 'sprintf' => array( $difference->d ) ) );
return $language->addToStack( 'f_days_short', FALSE, array( 'sprintf' => array( $difference->d ) ) );
}
elseif ( $difference->d == 1 && ( $compare->add( new \DateInterval( 'P1D' ) )->format('Y-m-d') == $now->format('Y-m-d') ) )
/* Yesterday: "Yesterday at 23:56" */
elseif ( $difference->d == 1 && ( $compare->add( new \DateInterval( 'P1D' ) )->format( 'Y-m-d', $language ) == $now->format( 'Y-m-d', $language ) ) )
{
return \IPS\Member::loggedIn()->language()->addToStack( "_date_yesterday{$capitalKey}", FALSE, array( 'sprintf' => array( $this->localeTime( FALSE ) ) ) );
return $language->addToStack( "_date_yesterday{$capitalKey}", FALSE, array( 'sprintf' => array( $this->localeTime( FALSE, TRUE, $language ) ) ) );
}
/* Other: "Wednesday at 23:56" */
else
{
return \IPS\Member::loggedIn()->language()->addToStack( "_date_this_week{$capitalKey}", FALSE, array( 'sprintf' => array( $this->strFormat('%A'), $this->localeTime( FALSE ) ) ) );
return $language->addToStack( "_date_this_week{$capitalKey}", FALSE, array( 'sprintf' => array( $this->strFormat( '%A', $language ), $this->localeTime( FALSE, TRUE, $language ) ) ) );
}
}
/* Less than a day but more than an hour ago */
elseif ( $difference->h )
{
/* Short format: "1 hr" */
if ( $format == static::RELATIVE_FORMAT_SHORT )
{
return \IPS\Member::loggedIn()->language()->addToStack( 'f_hours_short', FALSE, array( 'sprintf' => array( $difference->h ) ) );
return $language->addToStack( 'f_hours_short', FALSE, array( 'sprintf' => array( $difference->h ) ) );
}
/* Long format: "1 hour ago" */
else
{
return \IPS\Member::loggedIn()->language()->addToStack( "_date_ago{$capitalKey}", FALSE, array( 'sprintf' => array( \IPS\Member::loggedIn()->language()->addToStack( 'f_hours', FALSE, array( 'pluralize' => array( $difference->h ) ) ) ) ) );
return $language->addToStack( "_date_ago{$capitalKey}", FALSE, array( 'sprintf' => array( $language->addToStack( 'f_hours', FALSE, array( 'pluralize' => array( $difference->h ) ) ) ) ) );
}
}
/* Less than an hour but more than a minute ago */
elseif ( $difference->i )
{
/* Short format: "4 min" */
if ( $format == static::RELATIVE_FORMAT_SHORT )
{
return \IPS\Member::loggedIn()->language()->addToStack( 'f_minutes_short', FALSE, array( 'sprintf' => array( $difference->i ) ) );
return $language->addToStack( 'f_minutes_short', FALSE, array( 'sprintf' => array( $difference->i ) ) );
}
/* Short format: "4 minutes ago" */
else
{
return \IPS\Member::loggedIn()->language()->addToStack( "_date_ago{$capitalKey}", FALSE, array( 'sprintf' => array( \IPS\Member::loggedIn()->language()->addToStack( 'f_minutes', FALSE, array( 'pluralize' => array( $difference->i ) ) ) ) ) );
return $language->addToStack( "_date_ago{$capitalKey}", FALSE, array( 'sprintf' => array( $language->addToStack( 'f_minutes', FALSE, array( 'pluralize' => array( $difference->i ) ) ) ) ) );
}
}
/* Less than a minute ago */
else
{
if ( $format == static::RELATIVE_FORMAT_SHORT )
{
return \IPS\Member::loggedIn()->language()->addToStack( 'f_minutes_short', FALSE, array( 'sprintf' => array( 1 ) ) );
return $language->addToStack( 'f_minutes_short', FALSE, array( 'sprintf' => array( 1 ) ) );
}
else
{
return \IPS\Member::loggedIn()->language()->addToStack( "_date_just_now{$capitalKey}" );
return $language->addToStack( "_date_just_now{$capitalKey}" );
}
}
}
return \IPS\Member::loggedIn()->language()->convertString( strftime( $format == static::RELATIVE_FORMAT_SHORT ? '%b %y': ( ( mb_strtoupper( mb_substr( PHP_OS, 0, 3 ) ) === 'WIN' ) ? '%d %b %Y' : '%e %b %Y' ), $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ) );
/* Anything else - "March 4, 1992" */
return $language->addToStack(
$format == static::RELATIVE_FORMAT_SHORT ? '_date_last_year_short' : '_date_last_year_long',
FALSE,
array(
'sprintf' => array(
strftime( '%Y', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) )
),
'pluralize' => array(
strftime( ( strftime( '%d' ) !== FALSE ) ? '%d' : '%e', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ),
strftime( '%m', $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ),
)
)
);
}
/**
* Format times based on strftime() calls instead of date() calls, and convert to UTF-8 if necessary
*
* @param string $format Format accepted by strftime()
* @param string $format Format accepted by strftime()
* @param \IPS\Lang|\IPS\Member|NULL $memberOrLanguage The language or member to use, or NULL for currently logged in member
* @return string
*/
public function strFormat( $format )
public function strFormat( $format, $memberOrLanguage=NULL )
{
return \IPS\Member::loggedIn()->language()->convertString( strftime( $format, $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ) );
/* We only do this on Windows - Windows does not support the %e formatter */
if( mb_strtoupper( mb_substr( PHP_OS, 0, 3 ) ) === 'WIN' )
{
$format = preg_replace( '#(?<!%)((?:%%)*)%e#', '\1%#d', $format );
}
return static::determineLanguage( $memberOrLanguage )->convertString( strftime( $format, $this->getTimestamp() + $this->getTimezone()->getOffset( $this ) ) );
}
/**
* Wrapper for format() so we can convert to UTF-8 if needed
*
* @param string $format Format accepted by date()
* @param string $format Format accepted by date()
* @param \IPS\Lang|\IPS\Member|NULL $memberOrLanguage The language or member to use, or NULL for currently logged in member
* @return string
*/
public function format( $format )
public function format( $format, $memberOrLanguage=NULL )
{
return \IPS\Member::loggedIn()->language()->convertString( parent::format( $format ) );
/* If this is just the year, which we do periodically, then we can skip UTF-8 conversion stuff since the result is always an integer -
saves resources, especially from the relative() method which can be called 25+ times per page load and can call this method 4 times each*/
if( $format == 'Y' )
{
return parent::format( $format );
}
return static::determineLanguage( $memberOrLanguage )->convertString( parent::format( $format ) );
}
/**
@@ -371,4 +478,29 @@ class _DateTime extends \DateTime
{
return gmdate( "D, d M Y H:i:s", $this->getTimestamp() ) . ' GMT';
}
/**
* Determine the language object to use based on the passed in parameter, which could be NULL, \IPS\Member or \IPS\Lang
*
* @param \IPS\Lang|\IPS\Member|NULL $formatter Value we are using to determine how to format the result
* @return \IPS\Lang
*/
protected static function determineLanguage( $formatter=NULL )
{
/* If nothing is passed in (the norm) we want the current viewing user's language selection */
if( $formatter === NULL )
{
return \IPS\Member::loggedIn()->language();
}
elseif( $formatter instanceof \IPS\Member )
{
return $formatter->language();
}
elseif( $formatter instanceof \IPS\Lang )
{
return $formatter;
}
throw new \UnexpectedValueException;
}
}