extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 10:51:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

support (ignoring) for used ! (exclamation mark) in format

Browse Source
This commit is contained in:
Ralf Becker 2012-08-28 10:28:27 +00:00
parent b62a3f502b
commit 8eff610872
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.egw_time.inc.php
View File

@ -573,6 +573,7 @@ class egw_time extends DateTime
return is_null($timezone) ? parent::createFromFormat($format, $time) : parent::createFromFormat($format, $time, $timezone); return is_null($timezone) ? parent::createFromFormat($format, $time) : parent::createFromFormat($format, $time, $timezone);
} }
// simple implementation for php 5.2, far from complete, but definitly better then fatal erros // simple implementation for php 5.2, far from complete, but definitly better then fatal erros
if ($format[0] == '!') $format = substr($format, 1); // ignore leading ! (reset all fields to 0, as we do anyway)
$parsed = array_combine(split('[./: T-]', $format), split('[./: T-]', $time)); $parsed = array_combine(split('[./: T-]', $format), split('[./: T-]', $time));
if (!isset($parsed['Y']) && isset($parsed['y'])) $parsed['Y'] = ($parsed['y'] > 30 ? 1900 : 2000) + $parsed['y']; if (!isset($parsed['Y']) && isset($parsed['y'])) $parsed['Y'] = ($parsed['y'] > 30 ? 1900 : 2000) + $parsed['y'];
if (!isset($parsed['s'])) $parsed['s'] = '00'; if (!isset($parsed['s'])) $parsed['s'] = '00';
@ -620,6 +621,7 @@ if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE_
// createFromFormat tests // createFromFormat tests
foreach(array( foreach(array(
'22.03.1966' => 'd.m.Y', '22.03.1966' => 'd.m.Y',
'22.03.1966' => '!d.m.Y',
'22.03.66' => 'd.m.y', '22.03.66' => 'd.m.y',
'03/22/66' => 'm/d/y', '03/22/66' => 'm/d/y',
'2000-01-01 12:00:00' => 'Y-m-d H:i:s', '2000-01-01 12:00:00' => 'Y-m-d H:i:s',