extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 15:59:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

More robust handling of importing date-times:

Browse Source 
1.  Check against user's preference
2.  Try any other possibilities, by egw_time
3.  Error, unless app plugin takes special measures
This commit is contained in:
Nathan Gray 2012-02-07 15:37:16 +00:00
parent 34502fc66f
commit 6fa67b2e28
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
importexport/inc/class.importexport_import_csv.inc.php
View File

@ -321,14 +321,23 @@ class importexport_import_csv implements importexport_iface_import_record { //,
if($format == 1) if($format == 1)
{ {
$formatted = egw_time::createFromFormat( $formatted = egw_time::createFromFormat(
egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat, '!'.egw_time::$user_dateformat . '*' .egw_time::$user_timeformat,
$record[$name] $record[$name]
); );
if(!$formatted && $errors = egw_time::getLastErrors()) if(!$formatted && $errors = egw_time::getLastErrors())
{ {
foreach($errors['errors'] as $msg) // Try again, more options
try {
$formatted = new egw_time($record[$name]);
} catch (Exception $e) {
$warnings[] = $name.': ' . $e->getMessage();
continue;
}
$errors = egw_time::getLastErrors();
foreach($errors['errors'] as $char => $msg)
{ {
$warnings[] = $name . ': ' . $msg; $warnings[] = "$name: [$char] $msg";
} }
} }
if($errors = egw_time::getLastErrors() && $errors['error_count'] == 0) if($errors = egw_time::getLastErrors() && $errors['error_count'] == 0)