From 3695475e9f0d2107cc2adde63a149de85945bf6f Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Thu, 2 Sep 2010 05:56:14 +0000 Subject: [PATCH] Fixed bug: CSV import (interactive or web service) reporting change "on behalf of" SVN:trunk[742] --- pages/csvimport.php | 4 ++-- webservices/import.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/csvimport.php b/pages/csvimport.php index 36106081a..08ef30528 100644 --- a/pages/csvimport.php +++ b/pages/csvimport.php @@ -314,9 +314,9 @@ function ProcessCSVData(WebPage $oPage, $bSimulate = true) // We're doing it for real, let's create a change $oMyChange = MetaModel::NewObject("CMDBChange"); $oMyChange->Set("date", time()); - if (UserRights::GetUser() != UserRights::GetRealUser()) + if (UserRights::IsImpersonated()) { - $sUserString = UserRights::GetRealUser()." on behalf of ".UserRights::GetUser(); + $sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUser(), UserRights::GetUser()); } else { diff --git a/webservices/import.php b/webservices/import.php index a151a424e..ff531be18 100644 --- a/webservices/import.php +++ b/webservices/import.php @@ -112,9 +112,9 @@ try $oMyChange = MetaModel::NewObject("CMDBChange"); $oMyChange->Set("date", time()); - if (UserRights::GetUser() != UserRights::GetRealUser()) + if (UserRights::IsImpersonated()) { - $sUserString = UserRights::GetRealUser()." on behalf of ".UserRights::GetUser(); + $sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUser(), UserRights::GetUser()); } else {