mirror of
https://github.com/e107inc/e107.git
synced 2025-08-01 12:20:44 +02:00
strftime() added to php_compatibility_handler.php and all references updated. README updated. dateAlternativeTest updated to pass on Windows. (TBD)
This commit is contained in:
@@ -37,17 +37,17 @@ class e_date
|
||||
|
||||
for ($i=1; $i < 8; $i++)
|
||||
{
|
||||
$day = e_date::strftime('%A', mktime(1, 1, 1, 1, $i, 2012));
|
||||
$day = strftime('%A', mktime(1, 1, 1, 1, $i, 2012));
|
||||
$dates['days'][] = $day;
|
||||
$dates['daysShort'][] = e_date::strftime('%a', mktime(1, 1, 1, 1, $i, 2012));
|
||||
$dates['daysShort'][] = strftime('%a', mktime(1, 1, 1, 1, $i, 2012));
|
||||
$dates['daysMin'][] = substr($day, 0, 2);
|
||||
}
|
||||
|
||||
|
||||
for ($i=1; $i < 13; $i++)
|
||||
{
|
||||
$dates['months'][] = e_date::strftime('%B', mktime(1, 1, 1, $i, 2, 2013));
|
||||
$dates['monthsShort'][] = e_date::strftime('%h', mktime(1, 1, 1, $i, 2, 2013));
|
||||
$dates['months'][] = strftime('%B', mktime(1, 1, 1, $i, 2, 2013));
|
||||
$dates['monthsShort'][] = strftime('%h', mktime(1, 1, 1, $i, 2, 2013));
|
||||
}
|
||||
|
||||
|
||||
@@ -88,7 +88,7 @@ class e_date
|
||||
$marray = array();
|
||||
for ($i = 1; $i < 13; $i++)
|
||||
{
|
||||
$marray[$i] = e_date::strftime($val, mktime(1, 1, 1, $i, 1, 2000));
|
||||
$marray[$i] = strftime($val, mktime(1, 1, 1, $i, 1, 2000));
|
||||
}
|
||||
|
||||
return $marray;
|
||||
@@ -102,15 +102,15 @@ class e_date
|
||||
switch ($type)
|
||||
{
|
||||
case 'day-shortest': // eg. 'Tu'
|
||||
$days[] = substr(e_date::strftime('%a', mktime(1, 1, 1, 6, $i, 2014)), 0, 2);
|
||||
$days[] = substr(strftime('%a', mktime(1, 1, 1, 6, $i, 2014)), 0, 2);
|
||||
break;
|
||||
|
||||
case 'day-short': // eg. 'Tue'
|
||||
$days[] = e_date::strftime('%a', mktime(1, 1, 1, 6, $i, 2014));
|
||||
$days[] = strftime('%a', mktime(1, 1, 1, 6, $i, 2014));
|
||||
break;
|
||||
|
||||
default: // eg. 'Tuesday'
|
||||
$days[] = e_date::strftime('%A', mktime(1, 1, 1, 6, $i, 2014));
|
||||
$days[] = strftime('%A', mktime(1, 1, 1, 6, $i, 2014));
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -196,7 +196,7 @@ class e_date
|
||||
break;
|
||||
}
|
||||
|
||||
$dateString = e_date::strftime($mask, $datestamp);
|
||||
$dateString = strftime($mask, $datestamp);
|
||||
|
||||
if (!e107::getParser()->isUTF8($dateString))
|
||||
{
|
||||
@@ -206,19 +206,6 @@ class e_date
|
||||
return $dateString;
|
||||
}
|
||||
|
||||
/**
|
||||
* Alias of {@see eShims::strftime()}
|
||||
*
|
||||
* See {@see eShims::strftime()} for more information.
|
||||
*
|
||||
* @param string $format The old {@see strftime()} format string
|
||||
* @param int|null $timestamp A Unix epoch timestamp. If null, defaults to the value of {@see time()}.
|
||||
* @return string Datetime formatted according to the provided arguments
|
||||
*/
|
||||
public static function strftime($format, $timestamp = null)
|
||||
{
|
||||
return eShims::strftime($format, $timestamp);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated - for internal use only.
|
||||
@@ -801,8 +788,8 @@ class e_date
|
||||
trigger_error('<b>' . __METHOD__ . ' is deprecated.</b> Use eShims::strptime() instead', E_USER_DEPRECATED); // NO LAN
|
||||
|
||||
$vals = eShims::strptime($str, $format); // PHP5 is more accurate than below.
|
||||
$vals['tm_amon'] = e_date::strftime('%b', mktime(0, 0, 0, $vals['tm_mon'] + 1));
|
||||
$vals['tm_fmon'] = e_date::strftime('%B', mktime(0, 0, 0, $vals['tm_mon'] + 1));
|
||||
$vals['tm_amon'] = strftime('%b', mktime(0, 0, 0, $vals['tm_mon'] + 1));
|
||||
$vals['tm_fmon'] = strftime('%B', mktime(0, 0, 0, $vals['tm_mon'] + 1));
|
||||
|
||||
return $vals;
|
||||
}
|
||||
@@ -882,7 +869,7 @@ class e_date
|
||||
// Evaluate the formats whilst suppressing any errors.
|
||||
foreach($strftimeFormats as $format => $description)
|
||||
{
|
||||
$strftimeValues[$format] = e_date::strftime("%{$format}");
|
||||
$strftimeValues[$format] = strftime("%{$format}");
|
||||
}
|
||||
|
||||
// Find the longest value.
|
||||
|
Reference in New Issue
Block a user