From 7fba61ff357a687c81946afedcd83e0da6a3ab2d Mon Sep 17 00:00:00 2001 From: jf-cbd Date: Fri, 19 Apr 2024 11:16:42 +0200 Subject: [PATCH] =?UTF-8?q?=20N=C2=B07445=20-=20Invalid=20Unicode=20escape?= =?UTF-8?q?=20sequence=20on=20dashlet=20Header=20with=20statistics?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ajax.render.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 2d81e7825..45ae07348 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -1107,18 +1107,15 @@ EOF if ($oDashlet->IsRedrawNeeded()) { $oBlock = $oDashlet->DoRender($oPage, true, false, $aExtraParams); $sHtml = ConsoleBlockRenderer::RenderBlockTemplateInPage($oPage, $oBlock); - $sHtml = str_replace("\n", '', $sHtml); - $sHtml = str_replace("\r", '', $sHtml); - $sHtml = str_replace("'", "\'", $sHtml); - $oPage->add_script("$('#dashlet_$sDashletId').html('$sHtml');"); + $sHtml= json_encode($sHtml); + $oPage->add_script("$('#dashlet_$sDashletId').html({$sHtml});"); } if ($oDashlet->IsFormRedrawNeeded()) { $oForm = $oDashlet->GetForm(); // Rebuild the form since the values/content changed $oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams)); $sHtml = addslashes($oForm->RenderAsPropertySheet($oPage, true, '.itop-dashboard')); - $sHtml = str_replace("\n", '', $sHtml); - $sHtml = str_replace("\r", '', $sHtml); - $oPage->add_script("$('#dashlet_properties_$sDashletId').html('$sHtml')"); + $sHtml= json_encode($sHtml); + $oPage->add_script("$('#dashlet_$sDashletId').html({$sHtml});"); } } break;