diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 5dcf5dce7..b6ebaecbf 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -2099,28 +2099,33 @@ EOF $aEventsList[] = 'validate'; $aEventsList[] = 'change'; $oDocument = $value; // Value is an ormDocument object + $sFileName = ''; if (is_object($oDocument)) { $sFileName = $oDocument->GetFileName(); } - $iMaxFileSize = utils::ConvertToBytes(ini_get('upload_max_filesize')); - $sHTMLValue = "
\n"; - $sHTMLValue .= "\n"; - $sHTMLValue .= "\n"; + $sFileNameForHtml = utils::EscapeHtml($sFileName); + + $iMaxFileSize = utils::ConvertToBytes(ini_get('upload_max_filesize')); + $sRemoveBtnLabelForHtml = utils::EscapeHtml(Dict::S('UI:Button:RemoveDocument')); + + $sHTMLValue = << + + + + {$sFileNameForHtml}   + +
+
+ +{$sValidationSpan}{$sReloadSpan} +HTML; - $sHTMLValue .= "\n"; - $sHTMLValue .= "".htmlentities($sFileName, ENT_QUOTES, - 'UTF-8')."  "; - $sHTMLValue .= "
"; - $sHTMLValue .= "
"; - $sHTMLValue .= ""; - $sHTMLValue .= "
\n"; - $sHTMLValue .= "\n"; - $sHTMLValue .= "\n"; - $sHTMLValue .= "{$sValidationSpan}{$sReloadSpan}\n"; if ($sFileName == '') { - $oPage->add_ready_script("$('#remove_attr_{$iId}').hide();"); + $oPage->add_ready_script("$('#remove_attr_{$iId}').addClass('ibo-is-hidden');"); } break; diff --git a/js/utils.js b/js/utils.js index c2e09a605..e0fde3fcb 100644 --- a/js/utils.js +++ b/js/utils.js @@ -134,10 +134,10 @@ function UpdateFileName(id, sNewFileName) { $('#name_'+id).text(sNewFileName); if(sNewFileName=='') { $('#do_remove_'+id).val('1'); - $('#remove_attr_' + id).hide(); + $('#remove_attr_'+id).addClass('ibo-is-hidden'); } else { $('#do_remove_'+id).val('0'); - $('#remove_attr_' + id).show(); + $('#remove_attr_'+id).removeClass('ibo-is-hidden'); } return true;