extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Return errors in timestamp formatting so they can be displayed to user

Browse Source 
- Make sure timestamps returned are timestamps, not DateTimes
This commit is contained in:
Nathan Gray 2012-02-06 16:23:33 +00:00
parent 88cd6de65f
commit 465498b36c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,12 +321,19 @@ class importexport_import_csv implements importexport_iface_import_record { //,
if($format == 1)
{
$formatted = egw_time::createFromFormat(
egw_time::$user_dateformat . ', ' .egw_time::$user_timeformat,
egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat,
$record[$name]
);
if(!$formatted && $errors = egw_time::getLastErrors())
{
foreach($errors['errors'] as $msg)
{
$warnings[] = $name . ': ' . $msg;
}
}
if($errors = egw_time::getLastErrors() && $errors['error_count'] == 0)
{
$record[$name] = $formatted;
$record[$name] = $formatted->getTimestamp();
}
}
@ -346,7 +353,7 @@ class importexport_import_csv implements importexport_iface_import_record { //,
$formatted = egw_time::createFromFormat(egw_time::$user_dateformat, $record[$name]);
if($errors = egw_time::getLastErrors() && $errors['error_count'] == 0)
{
$record[$name] = $formatted;
$record[$name] = $formatted->getTimestamp();
}
}
$record[$name] = egw_time::user2server($record[$name],'ts');