From bf01be6f19fd6dde888f681567622389a02b5c61 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Tue, 28 Jun 2022 11:30:16 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B04988=20-=20History=20API=20:=20change=20?=
 =?UTF-8?q?consumers=20(iTop=20core)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/csvimport.php                   |  1 -
 webservices/backoffice.dataloader.php | 35 +++++++++------------------
 webservices/import.php                | 11 +++------
 3 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/pages/csvimport.php b/pages/csvimport.php
index 988af9d6d..5c58d66bf 100644
--- a/pages/csvimport.php
+++ b/pages/csvimport.php
@@ -360,7 +360,6 @@ try {
 			CMDBObject::SetCurrentChangeFromParams($sUserString, CMDBChangeOrigin::CSV_INTERACTIVE);
 			$oMyChange = CMDBObject::GetCurrentChange();
 		}
-		CMDBObject::SetTrackOrigin('csv-interactive');
 	
 		$oBulk = new BulkChange(
 			$sClassName,
diff --git a/webservices/backoffice.dataloader.php b/webservices/backoffice.dataloader.php
index 2cb403497..f69318122 100644
--- a/webservices/backoffice.dataloader.php
+++ b/webservices/backoffice.dataloader.php
@@ -90,48 +90,37 @@ try
 	// Note: the data model must be loaded first
 	$oDataLoader = new XMLDataLoader();
 
-	if (empty($sFileName))
-	{
+	if (empty($sFileName)) {
 		throw(new Exception("Missing argument 'file'"));
 	}
-	if (!file_exists($sFileName))
-	{
+	if (!file_exists($sFileName)) {
 		throw(new Exception("File $sFileName does not exist"));
 	}
 
 	SetMemoryLimit($oP);
-	
+
 
 	// The XMLDataLoader constructor has initialized the DB, let's start a transaction 
 	CMDBSource::Query('START TRANSACTION');
-	
-	$oChange = MetaModel::NewObject("CMDBChange");
-	$oChange->Set("date", time());
-	$oChange->Set("userinfo", "Initialization");
-	$iChangeId = $oChange->DBInsert();
-	$oP->p("Starting data load.");		
-	$oDataLoader->StartSession($oChange);
-	
+
+	$oP->p("Starting data load.");
+	CMDBObject::SetCurrentChangeFromParams('Initialization WS');
+	$oDataLoader->StartSession(CMDBObject::GetCurrentChange());
 	$oDataLoader->LoadFile($sFileName);
-	
+
 	$oP->p("Ending data load session");
-	if ($oDataLoader->EndSession(true /* strict */))
-	{
+	if ($oDataLoader->EndSession(true /* strict */)) {
 		$iCountCreated = $oDataLoader->GetCountCreated();
 		CMDBSource::Query('COMMIT');
 
 		$oP->p("Data successfully written into the DB: $iCountCreated objects created");
-	}
-	else
-	{
+	} else {
 		CMDBSource::Query('ROLLBACK');
 		$oP->p("Some issues have been encountered, changes will not be recorded, please review the source data");
 		$aErrors = $oDataLoader->GetErrors();
-		if (count($aErrors) > 0)
-		{
+		if (count($aErrors) > 0) {
 			$oP->p('Errors ('.count($aErrors).')');
-			foreach ($aErrors as $sMsg)
-			{
+			foreach ($aErrors as $sMsg) {
 				$oP->p(' * '.$sMsg);
 			}
 		}
diff --git a/webservices/import.php b/webservices/import.php
index b88da870e..a82707fa2 100644
--- a/webservices/import.php
+++ b/webservices/import.php
@@ -713,17 +713,12 @@ try
 	}
 	else
 	{
-		if (strlen($sComment) > 0)
-		{
+		if (strlen($sComment) > 0) {
 			$sMoreInfo = CMDBChange::GetCurrentUserName().', Web Service (CSV) - '.$sComment;
-		}
-		else
-		{
+		} else {
 			$sMoreInfo = CMDBChange::GetCurrentUserName().', Web Service (CSV)';
 		}
-		CMDBObject::SetTrackInfo($sMoreInfo);
-		CMDBObject::SetTrackOrigin('csv-import.php');
-		
+		CMDBObject::SetCurrentChangeFromParams($sMoreInfo, 'csv-import.php');
 		$oMyChange = CMDBObject::GetCurrentChange();
 	}