A.F....... [ZBXNEXT-6411] updated to latest from master; resolved conflicts in:

- sass/stylesheets/sass/screen.scss
- ui/include/classes/mvc/CRouter.php
- ui/include/classes/validators/CApiInputValidator.php
- ui/include/defines.inc.php
- ui/screenconf.php
- ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php

4 files changed, 144 insertions, 20 deletions

diff --git a/ui/assets/styles/blue-theme.css b/ui/assets/styles/blue-theme.css
index 8bd8c6f31f5..351d6826696 100644
--- a/ui/assets/styles/blue-theme.css
+++ b/ui/assets/styles/blue-theme.css
@@ -632,6 +632,8 @@ footer {
     line-height: 24px;
     text-align: right;
     word-wrap: break-word; }
+  .form-grid.form-grid-offset > label {
+    min-width: 185px; }
   .form-grid .form-actions,
   .form-grid .form-field,
   .form-grid .field-fluid {
@@ -2993,6 +2995,7 @@ form.is-loading {
     text-align: right; }
 
 .radio-list-control {
+  display: inline-block;
   white-space: nowrap; }
   .radio-list-control li {
     position: relative;
@@ -3051,6 +3054,8 @@ form.is-loading {
       transition: none; }
     .radio-list-control input[type="radio"][disabled] + label {
       transition: none; }
+  .radio-list-control + .icon-info {
+    margin-left: 5px; }
 
 label.form-label-asterisk::before {
   color: #e33734;
@@ -3984,8 +3989,8 @@ z-select[disabled] button,
       width: 100%;
       max-height: calc(100vh - 190px);
       max-width: inherit;
-      margin: 0 -10px 10px;
-      padding: 0 10px;
+      margin: 0 -10px 8px;
+      padding: 2px 10px;
       position: relative; }
       .overlay-dialogue.modal .overlay-dialogue-body .table-forms .table-forms-td-right {
         padding-right: 8px; }
@@ -4058,7 +4063,7 @@ z-select[disabled] button,
     .overlay-dialogue .table-forms-td-right td label {
       display: block; }
   .overlay-dialogue .dashboard-widget-head {
-    margin: -10px -10px 6px; }
+    margin: -10px -10px 4px; }
   .overlay-dialogue .maps-container {
     max-height: 128px;
     overflow-y: auto;
@@ -5728,7 +5733,9 @@ svg {
 .icon-actions-number-gray,
 .icon-actions-number-yellow,
 .icon-actions-number-red,
-.icon-description {
+.icon-description,
+.icon-user,
+.icon-user-group {
   display: inline-block;
   position: relative;
   height: 18px;
@@ -5753,7 +5760,9 @@ svg {
   .icon-actions-number-gray::before,
   .icon-actions-number-yellow::before,
   .icon-actions-number-red::before,
-  .icon-description::before {
+  .icon-description::before,
+  .icon-user::before,
+  .icon-user-group::before {
     content: '';
     display: inline-block;
     position: absolute;
@@ -5838,6 +5847,22 @@ svg {
   .icon-description::before {
     background-position: -474px -245px; }
 
+.icon-user,
+.icon-user-group {
+  height: 16px;
+  width: 16px;
+  vertical-align: top; }
+  .icon-user::before,
+  .icon-user-group::before {
+    height: inherit;
+    width: inherit; }
+
+.icon-user::before {
+  background-position: -339px -46px; }
+
+.icon-user-group::before {
+  background-position: -339px -8px; }
+
 #expressions_list .ui-sortable-helper {
   display: table; }
 
@@ -6332,6 +6357,9 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty),
 .overlay-dialogue .valuemap-list-table td {
   vertical-align: top; }
 
+.subscriptions-table th {
+  color: #768d99; }
+
 .import-compare {
   display: flex;
   max-height: calc(100vh - 190px); }
diff --git a/ui/assets/styles/dark-theme.css b/ui/assets/styles/dark-theme.css
index f4cdbadce07..c9f4e5b992e 100644
--- a/ui/assets/styles/dark-theme.css
+++ b/ui/assets/styles/dark-theme.css
@@ -645,6 +645,8 @@ footer {
     line-height: 24px;
     text-align: right;
     word-wrap: break-word; }
+  .form-grid.form-grid-offset > label {
+    min-width: 185px; }
   .form-grid .form-actions,
   .form-grid .form-field,
   .form-grid .field-fluid {
@@ -3004,6 +3006,7 @@ form.is-loading {
     text-align: right; }
 
 .radio-list-control {
+  display: inline-block;
   white-space: nowrap; }
   .radio-list-control li {
     position: relative;
@@ -3062,6 +3065,8 @@ form.is-loading {
       transition: none; }
     .radio-list-control input[type="radio"][disabled] + label {
       transition: none; }
+  .radio-list-control + .icon-info {
+    margin-left: 5px; }
 
 label.form-label-asterisk::before {
   color: #e45959;
@@ -3995,8 +4000,8 @@ z-select[disabled] button,
       width: 100%;
       max-height: calc(100vh - 190px);
       max-width: inherit;
-      margin: 0 -10px 10px;
-      padding: 0 10px;
+      margin: 0 -10px 8px;
+      padding: 2px 10px;
       position: relative; }
       .overlay-dialogue.modal .overlay-dialogue-body .table-forms .table-forms-td-right {
         padding-right: 8px; }
@@ -4069,7 +4074,7 @@ z-select[disabled] button,
     .overlay-dialogue .table-forms-td-right td label {
       display: block; }
   .overlay-dialogue .dashboard-widget-head {
-    margin: -10px -10px 6px; }
+    margin: -10px -10px 4px; }
   .overlay-dialogue .maps-container {
     max-height: 128px;
     overflow-y: auto;
@@ -5739,7 +5744,9 @@ svg {
 .icon-actions-number-gray,
 .icon-actions-number-yellow,
 .icon-actions-number-red,
-.icon-description {
+.icon-description,
+.icon-user,
+.icon-user-group {
   display: inline-block;
   position: relative;
   height: 18px;
@@ -5764,7 +5771,9 @@ svg {
   .icon-actions-number-gray::before,
   .icon-actions-number-yellow::before,
   .icon-actions-number-red::before,
-  .icon-description::before {
+  .icon-description::before,
+  .icon-user::before,
+  .icon-user-group::before {
     content: '';
     display: inline-block;
     position: absolute;
@@ -5849,6 +5858,22 @@ svg {
   .icon-description::before {
     background-position: -474px -245px; }
 
+.icon-user,
+.icon-user-group {
+  height: 16px;
+  width: 16px;
+  vertical-align: top; }
+  .icon-user::before,
+  .icon-user-group::before {
+    height: inherit;
+    width: inherit; }
+
+.icon-user::before {
+  background-position: -339px -46px; }
+
+.icon-user-group::before {
+  background-position: -339px -8px; }
+
 #expressions_list .ui-sortable-helper {
   display: table; }
 
@@ -6343,6 +6368,9 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty),
 .overlay-dialogue .valuemap-list-table td {
   vertical-align: top; }
 
+.subscriptions-table th {
+  color: #737373; }
+
 .import-compare {
   display: flex;
   max-height: calc(100vh - 190px); }
diff --git a/ui/assets/styles/hc-dark.css b/ui/assets/styles/hc-dark.css
index e73d8e183c4..8f6c4c9d0d3 100644
--- a/ui/assets/styles/hc-dark.css
+++ b/ui/assets/styles/hc-dark.css
@@ -632,6 +632,8 @@ footer {
     line-height: 24px;
     text-align: right;
     word-wrap: break-word; }
+  .form-grid.form-grid-offset > label {
+    min-width: 185px; }
   .form-grid .form-actions,
   .form-grid .form-field,
   .form-grid .field-fluid {
@@ -2957,6 +2959,7 @@ form.is-loading {
     text-align: right; }
 
 .radio-list-control {
+  display: inline-block;
   white-space: nowrap; }
   .radio-list-control li {
     position: relative;
@@ -3015,6 +3018,8 @@ form.is-loading {
       transition: none; }
     .radio-list-control input[type="radio"][disabled] + label {
       transition: none; }
+  .radio-list-control + .icon-info {
+    margin-left: 5px; }
 
 label.form-label-asterisk::before {
   color: #ff5050;
@@ -3948,8 +3953,8 @@ z-select[disabled] button,
       width: 100%;
       max-height: calc(100vh - 190px);
       max-width: inherit;
-      margin: 0 -10px 10px;
-      padding: 0 10px;
+      margin: 0 -10px 8px;
+      padding: 2px 10px;
       position: relative; }
       .overlay-dialogue.modal .overlay-dialogue-body .table-forms .table-forms-td-right {
         padding-right: 8px; }
@@ -4022,7 +4027,7 @@ z-select[disabled] button,
     .overlay-dialogue .table-forms-td-right td label {
       display: block; }
   .overlay-dialogue .dashboard-widget-head {
-    margin: -10px -10px 6px; }
+    margin: -10px -10px 4px; }
   .overlay-dialogue .maps-container {
     max-height: 128px;
     overflow-y: auto;
@@ -5683,7 +5688,9 @@ svg {
 .icon-actions-number-gray,
 .icon-actions-number-yellow,
 .icon-actions-number-red,
-.icon-description {
+.icon-description,
+.icon-user,
+.icon-user-group {
   display: inline-block;
   position: relative;
   height: 18px;
@@ -5708,7 +5715,9 @@ svg {
   .icon-actions-number-gray::before,
   .icon-actions-number-yellow::before,
   .icon-actions-number-red::before,
-  .icon-description::before {
+  .icon-description::before,
+  .icon-user::before,
+  .icon-user-group::before {
     content: '';
     display: inline-block;
     position: absolute;
@@ -5793,6 +5802,22 @@ svg {
   .icon-description::before {
     background-position: -474px -245px; }
 
+.icon-user,
+.icon-user-group {
+  height: 16px;
+  width: 16px;
+  vertical-align: top; }
+  .icon-user::before,
+  .icon-user-group::before {
+    height: inherit;
+    width: inherit; }
+
+.icon-user::before {
+  background-position: -339px -46px; }
+
+.icon-user-group::before {
+  background-position: -339px -8px; }
+
 #expressions_list .ui-sortable-helper {
   display: table; }
 
@@ -6287,6 +6312,9 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty),
 .overlay-dialogue .valuemap-list-table td {
   vertical-align: top; }
 
+.subscriptions-table th {
+  color: #cacaca; }
+
 .import-compare {
   display: flex;
   max-height: calc(100vh - 190px); }
@@ -7009,6 +7037,12 @@ td.inactive-bg {
 .icon-actions-number-yellow::before {
   background-position: -549px -325px; }
 
+.icon-user::before {
+  background-position: -379px -46px; }
+
+.icon-user-group::before {
+  background-position: -379px -8px; }
+
 .icon-actions-number-red::before {
   background-position: -524px -325px; }
 
diff --git a/ui/assets/styles/hc-light.css b/ui/assets/styles/hc-light.css
index 1229a3a212a..bc1c4ab79e5 100644
--- a/ui/assets/styles/hc-light.css
+++ b/ui/assets/styles/hc-light.css
@@ -632,6 +632,8 @@ footer {
     line-height: 24px;
     text-align: right;
     word-wrap: break-word; }
+  .form-grid.form-grid-offset > label {
+    min-width: 185px; }
   .form-grid .form-actions,
   .form-grid .form-field,
   .form-grid .field-fluid {
@@ -2957,6 +2959,7 @@ form.is-loading {
     text-align: right; }
 
 .radio-list-control {
+  display: inline-block;
   white-space: nowrap; }
   .radio-list-control li {
     position: relative;
@@ -3015,6 +3018,8 @@ form.is-loading {
       transition: none; }
     .radio-list-control input[type="radio"][disabled] + label {
       transition: none; }
+  .radio-list-control + .icon-info {
+    margin-left: 5px; }
 
 label.form-label-asterisk::before {
   color: #990000;
@@ -3948,8 +3953,8 @@ z-select[disabled] button,
       width: 100%;
       max-height: calc(100vh - 190px);
       max-width: inherit;
-      margin: 0 -10px 10px;
-      padding: 0 10px;
+      margin: 0 -10px 8px;
+      padding: 2px 10px;
       position: relative; }
       .overlay-dialogue.modal .overlay-dialogue-body .table-forms .table-forms-td-right {
         padding-right: 8px; }
@@ -4022,7 +4027,7 @@ z-select[disabled] button,
     .overlay-dialogue .table-forms-td-right td label {
       display: block; }
   .overlay-dialogue .dashboard-widget-head {
-    margin: -10px -10px 6px; }
+    margin: -10px -10px 4px; }
   .overlay-dialogue .maps-container {
     max-height: 128px;
     overflow-y: auto;
@@ -5683,7 +5688,9 @@ svg {
 .icon-actions-number-gray,
 .icon-actions-number-yellow,
 .icon-actions-number-red,
-.icon-description {
+.icon-description,
+.icon-user,
+.icon-user-group {
   display: inline-block;
   position: relative;
   height: 18px;
@@ -5708,7 +5715,9 @@ svg {
   .icon-actions-number-gray::before,
   .icon-actions-number-yellow::before,
   .icon-actions-number-red::before,
-  .icon-description::before {
+  .icon-description::before,
+  .icon-user::before,
+  .icon-user-group::before {
     content: '';
     display: inline-block;
     position: absolute;
@@ -5793,6 +5802,22 @@ svg {
   .icon-description::before {
     background-position: -474px -245px; }
 
+.icon-user,
+.icon-user-group {
+  height: 16px;
+  width: 16px;
+  vertical-align: top; }
+  .icon-user::before,
+  .icon-user-group::before {
+    height: inherit;
+    width: inherit; }
+
+.icon-user::before {
+  background-position: -339px -46px; }
+
+.icon-user-group::before {
+  background-position: -339px -8px; }
+
 #expressions_list .ui-sortable-helper {
   display: table; }
 
@@ -6287,6 +6312,9 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty),
 .overlay-dialogue .valuemap-list-table td {
   vertical-align: top; }
 
+.subscriptions-table th {
+  color: #333333; }
+
 .import-compare {
   display: flex;
   max-height: calc(100vh - 190px); }
@@ -6929,6 +6957,12 @@ td.inactive-bg {
 .icon-actions-number-red::before {
   background-position: -524px -285px; }
 
+.icon-user::before {
+  background-position: -419px -46px; }
+
+.icon-user-group::before {
+  background-position: -419px -8px; }
+
 .problem-icon-list .problem-icon-list-item {
   background: transparent;
   color: #000000;