mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-21 13:11:52 +02:00
Code Issues Releases Wiki Activity

Fix for string to unix datestamp conversion on Linux machines. Tested with English and French.

Browse Source
This commit is contained in:
Cameron 2013-11-22 01:30:06 -08:00
parent 6b1cc665ee
commit 39786cb670
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
e107_handlers/date_handler.php
View File

@ -240,11 +240,13 @@ class convert
// also in php compat handler for plugins that might use it.
$tdata = $this->strptime($date_string, $mask);
// print_a($tdata);
if(empty($tdata))
{
if(!empty($date_string) && ADMIN)
{
e107::getMessage()->addDebug( "PROBLEM WITH CONVERSION from ".$date_string." to unix timestamp");
}
return null;
}
@ -252,7 +254,7 @@ class convert
$tdata['tm_hour'],
$tdata['tm_min'],
$tdata['tm_sec'],
$tdata['tm_mon'] , // Not sure why there was a +1 here, it was increasing the dates by one month.
$tdata['tm_mon'] + 1, // returns months from 0 - 11 so we need to +1
$tdata['tm_mday'],
($tdata['tm_year'] + 1900)
);
@ -529,6 +531,15 @@ class convert
*/
public function strptime($str, $format)
{
if(STRPTIME_COMPAT !== TRUE && function_exists('strptime'))
{
$vals = strptime($str,$format); // PHP5 is more accurate than below.
$vals['tm_amon'] = strftime('%b', mktime(0,0,0, $vals['mon']) );
$vals['tm_fmon'] = strftime('%B', mktime(0,0,0, $vals['mon']) );
return $vals;
}
// Below is for Windows machines. (XXX TODO - Currently not as accurate as Linux PHP5 strptime() function above. )
static $expand = array('%D'=>'%m/%d/%y', '%T'=>'%H:%M:%S', );