From e41a8833e29f470c64dfccadecc950a2bde9b24b Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Fri, 17 Mar 2017 09:14:11 +0000
Subject: [PATCH] N.701 Data Synchro: dates can be reset by the mean of an
 empty string (still, integers and enums cannot be reset)

SVN:trunk[4596]
---
 core/attributedef.class.inc.php         | 25 ++++++++++++++++++++++---
 synchro/synchro_import.php              |  9 +++++++--
 synchro/synchrodatasource.class.inc.php | 13 ++++++++++---
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index fd48cb02a..3007d9575 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2016 Combodo SARL
+// Copyright (C) 2010-2017 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -20,7 +20,7 @@
 /**
  * Typology for the attributes
  *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
  * @license	 http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -3725,6 +3725,15 @@ class AttributeDateTime extends AttributeDBField
 	}	
 	
 	protected function GetSQLCol($bFullSpec = false) {return "DATETIME";}
+
+	public function GetImportColumns()
+	{
+		// Allow an empty string to be a valid value (synonym for "reset")
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'VARCHAR(19)';
+		return $aColumns;
+	}
+
 	public static function GetAsUnixSeconds($value)
 	{
 		$oDeadlineDateTime = new DateTime($value);
@@ -3837,6 +3846,8 @@ class AttributeDateTime extends AttributeDBField
 		elseif (empty($value))
 		{
 			// Make a valid date for MySQL. TO DO: support NULL as a literal value for fields that can be null.
+			// todo: this is NOT valid in strict mode (default setting for MySQL 5.7)
+			// todo: if to be kept, this should be overloaded for AttributeDate (0000-00-00)
 			return '0000-00-00 00:00:00';
 		}
 		return $value;
@@ -4119,7 +4130,15 @@ class AttributeDate extends AttributeDateTime
 
 	public function GetEditClass() {return "Date";}
 	protected function GetSQLCol($bFullSpec = false) {return "DATE";}
-	
+	public function GetImportColumns()
+	{
+		// Allow an empty string to be a valid value (synonym for "reset")
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'VARCHAR(10)';
+		return $aColumns;
+	}
+
+
 	/**
 	 * Override to specify Field class
 	 *
diff --git a/synchro/synchro_import.php b/synchro/synchro_import.php
index f0779d9e8..d4cedc680 100644
--- a/synchro/synchro_import.php
+++ b/synchro/synchro_import.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2011-2012 Combodo SARL
+// Copyright (C) 2011-2017 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,7 +19,7 @@
 /**
  * Data Exchange web service 
  *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -216,6 +216,11 @@ function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter)
 
 function ChangeDateFormat($sProposedDate, $sFormat)
 {
+	if ($sProposedDate == '')
+	{
+		// An empty string means 'reset'
+		return '';
+	}
 	// Convert to a valid MySQL datetime
 	$oFormat = new DateTimeFormat($sFormat);
 	$sRegExpr = $oFormat->ToRegExpr('/');
diff --git a/synchro/synchrodatasource.class.inc.php b/synchro/synchrodatasource.class.inc.php
index b0bf081c2..17b9b63ce 100644
--- a/synchro/synchrodatasource.class.inc.php
+++ b/synchro/synchrodatasource.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2015 Combodo SARL
+// Copyright (C) 2010-2017 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -20,7 +20,7 @@
 /**
  * Data Exchange - synchronization with external applications (incoming data)
  *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -2049,7 +2049,8 @@ class SynchroReplica extends DBObject implements iDisplay
 
 	/**
 	 * Get the value from the 'Extended Data' located in the synchro_data_xxx table for this replica
-	 * Note: sExtAttCode could be a standard attcode, or 'primary_key'	 
+	 * Note: sExtAttCode could be a standard attcode, or 'primary_key'
+	 * @return mixed, or null (leave unchanged), or '' (reset)
 	 */
 	protected function GetValueFromExtData($sExtAttCode, $oSyncAtt, &$oStatLog)
 	{
@@ -2125,7 +2126,13 @@ class SynchroReplica extends DBObject implements iDisplay
 					return null;
 				}
 			}
+			// No null column has been found
 			$retValue = $oAttDef->FromImportToValue($aData, $sExtAttCode);
+			if (is_null($retValue))
+			{
+				// This is a reset
+				$retValue = '';
+			}
 		}
 
 		return $retValue;