.........T [ZBXNEXT-6316] fixed after QA

1 files changed, 8 insertions, 3 deletions

diff --git a/templates/media/itop/media_itop.yaml b/templates/media/itop/media_itop.yaml
index d3ce5e4d2f6..dcb6a461c62 100644
--- a/templates/media/itop/media_itop.yaml
+++ b/templates/media/itop/media_itop.yaml
@@ -82,7 +82,9 @@ zabbix_export:
                 json_data.operation = 'core/create';
                 json_data.fields.org_id = Itop.params.organization_id;
                 json_data.fields.title = params.alert_subject;
-                json_data.fields.description = params.alert_message.replace(/(?:\r\n|\r|\n)/g, '<br>');
+                json_data.fields.description = params.alert_message.replace('<', '&lt;')
+                    .replace('>', '&gt;')
+                    .replace(/(?:\r\n|\r|\n)/g, '<br>');
             },
         
             setUpdatePayload: function () {
@@ -98,10 +100,10 @@ zabbix_export:
             },
         
             request: function (data) {
-                ['url', 'user', 'password', 'organization_id', 'class', 'api_version'].forEach(function (field) {
+                ['url', 'user', 'password', 'organization_id', 'class', 'api_version', 'id'].forEach(function (field) {
                     if (typeof Itop.params !== 'object' || typeof Itop.params[field] === 'undefined'
                             || Itop.params[field] === '' ) {
-                        throw 'Required Itop param is not set: "' + field + '".';
+                        throw 'Required Itop param is not set: "itop_' + field + '".';
                     }
                 });
         
@@ -225,6 +227,9 @@ zabbix_export:
             }
             // Update created issue for trigger-based event.
             else {
+                if (Itop.params.id === '{EVENT.TAGS.__zbx_itop_id}') {
+                    throw 'Incorrect iTop ticket ID given: ' + Itop.params.id;
+                }
                 Itop.setUpdatePayload();
                 Itop.request(json_data);
             }