composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Validate date/time fields using their regular expression during an import (or synchro) to avoid passing wrong formats as-is (e.g. 01/02/16 can become 01/02/0016 instead of 01/02/2016 if you use the 4 digits format for years and pass only 2 digits !)

Browse Source 
SVN:trunk[4096]
This commit is contained in:
Denis Flaven
2016-05-17 14:51:42 +00:00
parent 6b465688a2
commit 316d1f9b14
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/bulkchange.class.inc.php
View File

@@ -827,6 +827,8 @@ class BulkChange
{
$sFormat = $sDateFormat;
}
$oFormat = new DateTimeFormat($sFormat);
$sRegExp = $oFormat->ToRegExpr();
if (!preg_match('/'.$sRegExp.'/', $this->m_aData[$iRow][$iCol]))
{
$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));

19
synchro/synchro_import.php
View File

@@ -217,15 +217,24 @@ function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter)
function ChangeDateFormat($sProposedDate, $sDateFormat)
{
// Make sure this is a valid MySQL datetime
$oDate = DateTime::createFromFormat($sDateFormat, $sProposedDate);
if ($oDate !== false)
$oFormat = new DateTimeFormat($sDateFormat);
$sRegExpr = $oFormat->ToRegExpr();
if (!preg_match('/'.$sRegExpr.'/', $sProposedDate))
{
$sDate = $oDate->format(AttributeDateTime::GetInternalFormat());
return $sDate;
return false;
}
else
{
return false;
$oDate = DateTime::createFromFormat($sDateFormat, $sProposedDate);
if ($oDate !== false)
{
$sDate = $oDate->format(AttributeDateTime::GetInternalFormat());
return $sDate;
}
else
{
return false;
}
}
}