mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Fixes #509 - Date (month) conversion issue on Windows machines.

Browse Source
This commit is contained in:
Cameron
2014-02-18 05:41:58 -08:00
parent 2c748e885a
commit 6a8e57bb05
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
e107_handlers/date_handler.php
View File

@@ -250,11 +250,17 @@ class convert
return null; return null;
} }
if(STRPTIME_COMPAT !== TRUE) // returns months from 0 - 11 on Unix so we need to +1
{
$tdata['tm_mon'] = $tdata['tm_mon'] +1;
}
$unxTimestamp = mktime( $unxTimestamp = mktime(
$tdata['tm_hour'], $tdata['tm_hour'],
$tdata['tm_min'], $tdata['tm_min'],
$tdata['tm_sec'], $tdata['tm_sec'],
$tdata['tm_mon'] + 1, // returns months from 0 - 11 so we need to +1 $tdata['tm_mon'] ,
$tdata['tm_mday'], $tdata['tm_mday'],
($tdata['tm_year'] + 1900) ($tdata['tm_year'] + 1900)
); );
@@ -531,11 +537,11 @@ class convert
*/ */
public function strptime($str, $format) public function strptime($str, $format)
{ {
if(STRPTIME_COMPAT !== TRUE && function_exists('strptime')) if(STRPTIME_COMPAT !== TRUE && function_exists('strptime')) // Unix Only.
{ {
$vals = strptime($str,$format); // PHP5 is more accurate than below. $vals = strptime($str,$format); // PHP5 is more accurate than below.
$vals['tm_amon'] = strftime('%b', mktime(0,0,0, $vals['mon']) ); $vals['tm_amon'] = strftime('%b', mktime(0,0,0, $vals['tm_mon'] +1) );
$vals['tm_fmon'] = strftime('%B', mktime(0,0,0, $vals['mon']) ); $vals['tm_fmon'] = strftime('%B', mktime(0,0,0, $vals['tm_mon'] +1) );
return $vals; return $vals;
} }
@@ -651,9 +657,16 @@ class convert
//$vals['tm_sec'] -= 1; always increasing tm_sec + 1 ?????? //$vals['tm_sec'] -= 1; always increasing tm_sec + 1 ??????
#-- calculate wday/yday #-- calculate wday/yday
//$vals['tm_mon'] = $vals['tm_mon'] + 1; // returns months from 0 - 11 so we need to +1
$unxTimestamp = mktime($vals['tm_hour'], $vals['tm_min'], $vals['tm_sec'], ($vals['tm_mon'] + 1), $vals['tm_mday'], ($vals['tm_year'] + 1900)); $unxTimestamp = mktime($vals['tm_hour'], $vals['tm_min'], $vals['tm_sec'], ($vals['tm_mon'] + 1), $vals['tm_mday'], ($vals['tm_year'] + 1900));
$vals['tm_fmon'] = strftime('%B', mktime($vals['tm_hour'], $vals['tm_min'], $vals['tm_sec'], $vals['tm_mon']));
$vals['tm_wday'] = (int) strftime('%w', $unxTimestamp); // Days since Sunday (0-6) $vals['tm_wday'] = (int) strftime('%w', $unxTimestamp); // Days since Sunday (0-6)
$vals['tm_yday'] = (strftime('%j', $unxTimestamp) - 1); // Days since January 1 (0-365) $vals['tm_yday'] = (strftime('%j', $unxTimestamp) - 1); // Days since January 1 (0-365)
//var_dump($vals, $str, strftime($format, $unxTimestamp), $unxTimestamp); //var_dump($vals, $str, strftime($format, $unxTimestamp), $unxTimestamp);
} }