.......... [ZBX-20638] updated to latest master

16 files changed, 60 insertions, 52 deletions

diff --git a/ui/app/controllers/CControllerPopupGeneric.php b/ui/app/controllers/CControllerPopupGeneric.php
index 04cc5ed6ee1..09afd19ec0b 100644
--- a/ui/app/controllers/CControllerPopupGeneric.php
+++ b/ui/app/controllers/CControllerPopupGeneric.php
@@ -902,7 +902,7 @@ class CControllerPopupGeneric extends CController {
 
 			case 'items':
 				foreach ($records as $itemid => $row) {
-					$records[$row['name']] = ['itemid' => $row['name']] + $row;
+					$records[$row['name']] = ['pattern' => $row['name']] + $row;
 					unset($records[$itemid]);
 				}
 				break;
diff --git a/ui/app/partials/configuration.filter.items.php b/ui/app/partials/configuration.filter.items.php
index f3ce4cbd54c..848abcece3e 100644
--- a/ui/app/partials/configuration.filter.items.php
+++ b/ui/app/partials/configuration.filter.items.php
@@ -52,7 +52,7 @@ zbx_add_post_js("var filterTypeSwitcher".
 
 // First column.
 $filter_column_1
-	->addRow((new CLabel(_('Host groups'), 'filter_groupid_ms')),
+	->addRow((new CLabel(_('Host groups'), 'filter_groupids__ms')),
 		(new CMultiSelect([
 			'name' => 'filter_groupids[]',
 			'object_name' => 'hostGroup',
@@ -69,7 +69,7 @@ $filter_column_1
 			]
 		]))->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH)
 	)
-	->addRow((new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hostid_ms')),
+	->addRow((new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hostids__ms')),
 		(new CMultiSelect([
 			'name' => 'filter_hostids[]',
 			'object_name' => ($data['context'] === 'host') ? 'hosts' : 'templates',
@@ -96,7 +96,7 @@ $filter_column_1
 	);
 
 if ($data['filter_data']['hosts']) {
-	$filter_column_1->addRow(_('Value mapping'),
+	$filter_column_1->addRow(new CLabel(_('Value mapping'), 'filter_valuemapids__ms'),
 		(new CMultiSelect([
 			'name' => 'filter_valuemapids[]',
 			'object_name' => 'valuemap_names',
diff --git a/ui/app/partials/configuration.host.edit.html.php b/ui/app/partials/configuration.host.edit.html.php
index e5b4c511ce6..a1a2f97df3d 100644
--- a/ui/app/partials/configuration.host.edit.html.php
+++ b/ui/app/partials/configuration.host.edit.html.php
@@ -207,7 +207,17 @@ else {
 
 $host_tab
 	->addItem([
-		new CLabel(_('Templates')),
+		new CLabel([
+			_('Templates'),
+			$host_is_discovered
+				? makeHelpIcon([
+				(new CList([
+					_('Templates linked by host discovery cannot be unlinked.'),
+					_('Use host prototype configuration form to remove automatically linked templates on upcoming discovery.')
+				]))
+			])
+				: null
+		], 'add_templates__ms'),
 		(new CFormField(
 			(count($templates_field_items) > 1)
 				? (new CDiv($templates_field_items))->addClass('linked-templates')
@@ -414,7 +424,7 @@ foreach ($data['inventory_fields'] as $inventory_no => $inventory_field) {
 	}
 
 	$inventory_tab->addItem([
-		new CLabel($inventory_field['title']),
+		new CLabel($inventory_field['title'], 'host_inventory['.$field_name.']'),
 		new CFormField([$input_field, $inventory_item])
 	]);
 }
diff --git a/ui/app/partials/js/configuration.host.edit.html.js.php b/ui/app/partials/js/configuration.host.edit.html.js.php
index c102e0334bb..942ac098292 100644
--- a/ui/app/partials/js/configuration.host.edit.html.js.php
+++ b/ui/app/partials/js/configuration.host.edit.html.js.php
@@ -148,7 +148,7 @@
 
 			$groups_ms.on('change', (e) => {
 				$groups_ms.multiSelect('setDisabledEntries',
-					[... document.querySelectorAll('[name^="groups["]')].map((input) => input.value)
+					[... this.form.querySelectorAll('[name^="groups["]')].map((input) => input.value)
 				);
 			});
 		},
diff --git a/ui/app/partials/layout.htmlpage.header.php b/ui/app/partials/layout.htmlpage.header.php
index 621bd06563e..5a343ccc248 100644
--- a/ui/app/partials/layout.htmlpage.header.php
+++ b/ui/app/partials/layout.htmlpage.header.php
@@ -24,7 +24,7 @@
  * @var array    $data
  */
 
-global $DB, $ZBX_SERVER, $ZBX_SERVER_NAME, $ZBX_SERVER_PORT;
+global $DB, $ZBX_SERVER_NAME;
 
 $theme = ZBX_DEFAULT_THEME;
 $scripts = $data['javascript']['files'];
diff --git a/ui/app/partials/monitoring.latest.filter.php b/ui/app/partials/monitoring.latest.filter.php
index 2afa2fda165..3ecfb6399fd 100644
--- a/ui/app/partials/monitoring.latest.filter.php
+++ b/ui/app/partials/monitoring.latest.filter.php
@@ -29,7 +29,7 @@ $filter_view_data = array_key_exists('filter_view_data', $data) ? $data['filter_
 $left_column = (new CFormGrid())
 	->addClass(CFormGrid::ZBX_STYLE_FORM_GRID_LABEL_WIDTH_TRUE)
 	->addItem([
-		new CLabel(_('Host groups'), 'groupids__ms'),
+		new CLabel(_('Host groups'), 'groupids_#{uniqid}_ms'),
 		new CFormField(
 			(new CMultiSelect([
 				'name' => 'groupids[]',
@@ -53,7 +53,7 @@ $left_column = (new CFormGrid())
 		)
 	])
 	->addItem([
-		new CLabel(_('Hosts'), 'hostids__ms'),
+		new CLabel(_('Hosts'), 'hostids_#{uniqid}_ms'),
 		new CFormField(
 			(new CMultiSelect([
 				'name' => 'hostids[]',
@@ -169,7 +169,7 @@ $right_column = (new CFormGrid())
 		new CFormField($tag_format_line)
 	])
 	->addItem([
-		new CLabel(_('Tag display priority')),
+		new CLabel(_('Tag display priority'), 'tag_priority_#{uniqid}'),
 		new CFormField(
 			(new CTextBox('tag_priority', $data['tag_priority']))
 				->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH)
@@ -179,12 +179,11 @@ $right_column = (new CFormGrid())
 		)
 	])
 	->addItem([
-		new CLabel(_('Show details')),
+		new CLabel(_('Show details'), 'show_details'),
 		new CFormField([
 			(new CCheckBox('show_details'))
 				->setChecked($data['show_details'] == 1)
 				->setUncheckedValue(0)
-				->removeId()
 		])
 	]);
 
diff --git a/ui/app/partials/scheduledreport.formgrid.html.php b/ui/app/partials/scheduledreport.formgrid.html.php
index b4f1576085f..04bb1e18606 100644
--- a/ui/app/partials/scheduledreport.formgrid.html.php
+++ b/ui/app/partials/scheduledreport.formgrid.html.php
@@ -104,7 +104,7 @@ $form_grid
 		)
 	])
 	->addItem([
-		new CLabel(_('Start time')),
+		new CLabel(_('Start time'), 'hours'),
 		new CFormField(
 			(new CDiv([
 				(new CNumericBox('hours', $data['hours'], 2))
diff --git a/ui/app/views/administration.token.edit.php b/ui/app/views/administration.token.edit.php
index 5a7605268a9..b7762bd64b9 100644
--- a/ui/app/views/administration.token.edit.php
+++ b/ui/app/views/administration.token.edit.php
@@ -78,7 +78,7 @@ $token_from_list = (new CFormList())
 			->setChecked($data['expires_state'])
 			->setUncheckedValue('0')
 	)
-	->addRow((new CLabel(_('Expires at')))->setAsteriskMark(),
+	->addRow((new CLabel(_('Expires at'), 'expires_at'))->setAsteriskMark(),
 		(new CDateSelector('expires_at', $data['expires_at']))
 			->setDateFormat(ZBX_FULL_DATE_TIME)
 			->setPlaceholder(_('YYYY-MM-DD hh:mm:ss'))
diff --git a/ui/app/views/administration.user.edit.php b/ui/app/views/administration.user.edit.php
index 8ffffe7203d..1e466b8b4e2 100644
--- a/ui/app/views/administration.user.edit.php
+++ b/ui/app/views/administration.user.edit.php
@@ -409,7 +409,7 @@ if ($data['action'] === 'user.edit') {
 		);
 	}
 	else {
-		$permissions_form_list->addRow((new CLabel(_('Role')))->setAsteriskMark(), $role_multiselect);
+		$permissions_form_list->addRow((new CLabel(_('Role'), 'roleid_ms'))->setAsteriskMark(), $role_multiselect);
 	}
 
 	if ($data['roleid']) {
diff --git a/ui/app/views/administration.user.list.php b/ui/app/views/administration.user.list.php
index 4920b58891d..76255e3d866 100644
--- a/ui/app/views/administration.user.list.php
+++ b/ui/app/views/administration.user.list.php
@@ -70,7 +70,7 @@ $widget = (new CWidget())
 			(new CFormList())->addRow(_('Last name'),
 				(new CTextBox('filter_surname', $data['filter']['surname']))->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH)
 			),
-			(new CFormList())->addRow((new CLabel(_('User roles'), 'filter_roles')),
+			(new CFormList())->addRow((new CLabel(_('User roles'), 'filter_roles__ms')),
 				(new CMultiSelect([
 					'name' => 'filter_roles[]',
 					'object_name' => 'roles',
diff --git a/ui/app/views/administration.user.token.edit.php b/ui/app/views/administration.user.token.edit.php
index 85ef8584a9a..51682ff5314 100644
--- a/ui/app/views/administration.user.token.edit.php
+++ b/ui/app/views/administration.user.token.edit.php
@@ -60,12 +60,11 @@ $token_from_list = (new CFormList())
 			->setChecked($data['expires_state'])
 			->setUncheckedValue('0')
 	)
-	->addRow((new CLabel(_('Expires at')))->setAsteriskMark(),
+	->addRow((new CLabel(_('Expires at'), 'expires_at'))->setAsteriskMark(),
 		(new CDateSelector('expires_at', $data['expires_at']))
 			->setDateFormat(ZBX_FULL_DATE_TIME)
 			->setPlaceholder(_('YYYY-MM-DD hh:mm:ss'))
-			->setAriaRequired(),
-		'expires-at-row'
+			->setAriaRequired()
 	)
 	->addRow(_('Enabled'),
 		(new CCheckBox('status', ZBX_AUTH_TOKEN_ENABLED))
diff --git a/ui/app/views/monitoring.widget.item.view.php b/ui/app/views/monitoring.widget.item.view.php
index a172ee2fff4..bab325bb799 100644
--- a/ui/app/views/monitoring.widget.item.view.php
+++ b/ui/app/views/monitoring.widget.item.view.php
@@ -168,6 +168,13 @@ function drawValueCell(array $cell_data): array {
 		$item_content_div->addItem($item_decimals_div);
 	}
 
+	// Units AFTER value.
+	if (array_key_exists('units', $cell_data['parts']) && $cell_data['units_pos'] == WIDGET_ITEM_POS_AFTER) {
+		$item_content_div->addItem($units_div);
+	}
+
+	$item_cell[] = $item_content_div;
+
 	if (array_key_exists('change_indicator', $cell_data['parts'])) {
 		$change_data = $cell_data['parts']['change_indicator'];
 		$item_change_div = (new CDiv())->addClass('change-indicator');
@@ -191,13 +198,6 @@ function drawValueCell(array $cell_data): array {
 		$item_content_div->addItem($item_change_div);
 	}
 
-	// Units AFTER value.
-	if (array_key_exists('units', $cell_data['parts']) && $cell_data['units_pos'] == WIDGET_ITEM_POS_AFTER) {
-		$item_content_div->addItem($units_div);
-	}
-
-	$item_cell[] = $item_content_div;
-
 	// Units BELOW value.
 	if (array_key_exists('units', $cell_data['parts']) && $cell_data['units_pos'] == WIDGET_ITEM_POS_BELOW) {
 		$item_cell[] = $units_div;
diff --git a/ui/app/views/popup.condition.common.php b/ui/app/views/popup.condition.common.php
index 1415ca943af..1366017d2cf 100644
--- a/ui/app/views/popup.condition.common.php
+++ b/ui/app/views/popup.condition.common.php
@@ -69,7 +69,7 @@ switch ($data['type']) {
 
 				$form_list
 					->addRow(_('Operator'), [$operator, new CVar('operator', CONDITION_OPERATOR_EQUAL)])
-					->addRow(_('Tag'), $new_condition_tag);
+					->addRow(new CLabel(_('Tag'), 'tag'), $new_condition_tag);
 				break;
 
 			// New event host group form elements.
@@ -98,7 +98,7 @@ switch ($data['type']) {
 
 				$form_list
 					->addRow(_('Operator'), $operator)
-					->addRow(_('Host groups'), $hostgroup_multiselect);
+					->addRow(new CLabel(_('Host groups'), 'groupids__ms'), $hostgroup_multiselect);
 				break;
 
 			// Event tag pair form elements.
@@ -115,9 +115,9 @@ switch ($data['type']) {
 				$inline_js .= $new_condition_newtag->getPostJS();
 
 				$form_list
-					->addRow(_('Old tag name'), $new_condition_oldtag)
+					->addRow(new CLabel(_('Old tag name'), 'oldtag'), $new_condition_oldtag)
 					->addRow(_('Operator'), [$operator, new CVar('operator', CONDITION_OPERATOR_EQUAL)])
-					->addRow(_('New tag name'), $new_condition_newtag);
+					->addRow(new CLabel(_('New tag name'), 'newtag'), $new_condition_newtag);
 				break;
 
 			// Old|New event tag value form elements.
@@ -135,9 +135,9 @@ switch ($data['type']) {
 				$inline_js .= $new_condition_value->getPostJS();
 
 				$form_list
-					->addRow(_('Tag'), $new_condition_tag)
+					->addRow(new CLabel(_('Tag'), 'tag'), $new_condition_tag)
 					->addRow(_('Operator'), $operator)
-					->addRow(_('Value'), $new_condition_value);
+					->addRow(new CLabel(_('Value'), 'value'), $new_condition_value);
 				break;
 		}
 		break;
@@ -205,7 +205,7 @@ switch ($data['type']) {
 
 				$form_list
 					->addRow(_('Operator'), $operator)
-					->addRow(_('Triggers'), $trigger_multiselect);
+					->addRow(new CLabel(_('Triggers'), 'trigger_new_condition_ms'), $trigger_multiselect);
 				break;
 
 			// Trigger severity form elements.
@@ -248,7 +248,7 @@ switch ($data['type']) {
 
 				$form_list
 					->addRow(_('Operator'), $operator)
-					->addRow(_('Hosts'), $host_multiselect);
+					->addRow(new CLabel(_('Hosts'), 'host_new_condition_ms'), $host_multiselect);
 				break;
 
 			// Host group form elements.
@@ -279,7 +279,7 @@ switch ($data['type']) {
 
 				$form_list
 					->addRow(_('Operator'), $operator)
-					->addRow(_('Host groups'), $hostgroup_multiselect);
+					->addRow(new CLabel(_('Host groups'), 'hostgroup_new_condition_ms'), $hostgroup_multiselect);
 				break;
 
 			// Problem is suppressed form elements.
@@ -304,7 +304,7 @@ switch ($data['type']) {
 
 				$form_list
 					->addRow(_('Operator'), $operator)
-					->addRow((new CLabel(_('Tag')))->setAsteriskMark(), $new_condition_value);
+					->addRow((new CLabel(_('Tag'), 'value'))->setAsteriskMark(), $new_condition_value);
 				break;
 
 			// Tag value form elements.
@@ -320,9 +320,9 @@ switch ($data['type']) {
 				$inline_js .= $new_condition_value->getPostJS();
 
 				$form_list
-					->addRow((new CLabel(_('Tag')))->setAsteriskMark(), $new_condition_value2)
+					->addRow((new CLabel(_('Tag'), 'value2'))->setAsteriskMark(), $new_condition_value2)
 					->addRow(_('Operator'), $operator)
-					->addRow(_('Value'), $new_condition_value);
+					->addRow(new CLabel(_('Value'), 'value'), $new_condition_value);
 				break;
 
 			// Template form elements.
@@ -354,7 +354,7 @@ switch ($data['type']) {
 
 				$form_list
 					->addRow(_('Operator'), $operator)
-					->addRow(_('Templates'), $template_multiselect);
+					->addRow(new CLabel(_('Templates'), 'template_new_condition_ms'), $template_multiselect);
 				break;
 
 			// Time period form elements.
@@ -465,7 +465,7 @@ switch ($data['type']) {
 
 				$form_list
 					->addRow(_('Operator'), $operator)
-					->addRow(_('Discovery rules'), $drule_multiselect);
+					->addRow(new CLabel(_('Discovery rules'), 'drule_new_condition_ms'), $drule_multiselect);
 				break;
 
 			// Discovery status form elements.
@@ -517,7 +517,7 @@ switch ($data['type']) {
 
 				$form_list
 					->addRow(_('Operator'), $operator)
-					->addRow(_('Proxy'), $proxy_multiselect);
+					->addRow(new CLabel(_('Proxy'), 'proxy_new_condition_ms'), $proxy_multiselect);
 				break;
 
 			// Received value form elements.
@@ -532,7 +532,7 @@ switch ($data['type']) {
 						->setFocusableElementId('label-operator')
 						->addOptions(CSelect::createOptionsFromArray($operators_by_condition[CONDITION_TYPE_DVALUE]))
 					)
-					->addRow(_('Value'), $new_condition_value);
+					->addRow(new CLabel(_('Value'), 'value'), $new_condition_value);
 				break;
 
 			// Service port form elements.
@@ -598,7 +598,7 @@ switch ($data['type']) {
 
 				$form_list
 					->addRow(_('Operator'), $operator)
-					->addRow((new CLabel(_('Value')))->setAsteriskMark(), $new_condition_value);
+					->addRow((new CLabel(_('Value'), 'value'))->setAsteriskMark(), $new_condition_value);
 				break;
 
 			// Event type form elements.
diff --git a/ui/app/views/popup.generic.php b/ui/app/views/popup.generic.php
index 017049ba943..76d2a9533af 100644
--- a/ui/app/views/popup.generic.php
+++ b/ui/app/views/popup.generic.php
@@ -455,14 +455,14 @@ switch ($data['popup_type']) {
 
 				$table->addRow([
 					$data['multiselect']
-						? new CCheckBox('item['.$item[$options['srcfld1']].']', $item['itemid'])
+						? new CCheckBox('item['.$item['itemid'].']', $item['pattern'])
 						: null,
 					(new CLink($item['name'], 'javascript:void(0);'))
 						->onClick('javascript: addValue('.
 							json_encode($options['reference']).', '.
-							json_encode($item['itemid']).', '.
+							json_encode($item['pattern']).', '.
 							$options['parentid'].
-							');'.$js_action_onclick),
+						');'.$js_action_onclick),
 					(new CDiv($item['key_']))->addClass(ZBX_STYLE_WORDWRAP),
 					item_type2str($item['type']),
 					itemValueTypeString($item['value_type']),
@@ -473,7 +473,7 @@ switch ($data['popup_type']) {
 				]);
 
 				$item = [
-					'id' => $item['itemid'],
+					'id' => $item['pattern'],
 					'itemid' => $item['itemid'],
 					'name' => $options['patternselect']
 						? $item['name']
diff --git a/ui/app/views/popup.import.compare.php b/ui/app/views/popup.import.compare.php
index fc6af676071..afa8d937708 100644
--- a/ui/app/views/popup.import.compare.php
+++ b/ui/app/views/popup.import.compare.php
@@ -170,8 +170,8 @@ else {
 		'script_inline' => trim($this->readJsFile('popup.import.compare.js.php')),
 		'body' => !$data['diff']
 			? (new CTableInfo())
-					->setNoDataMessage(_('No changes.'))
-					->toString()
+				->setNoDataMessage(_('No changes.'))
+				->toString()
 			: (new CForm())
 				->addClass('import-compare')
 				->addVar('import_overlayid', $data['import_overlayid'])
diff --git a/ui/app/views/slareport.list.php b/ui/app/views/slareport.list.php
index 48562cba159..0dc67498e31 100644
--- a/ui/app/views/slareport.list.php
+++ b/ui/app/views/slareport.list.php
@@ -37,7 +37,7 @@ $filter = (new CFilter())
 		(new CFormGrid())
 			->addClass(CFormGrid::ZBX_STYLE_FORM_GRID_LABEL_WIDTH_TRUE)
 			->addItem([
-				new CLabel(_('SLA'), 'filter_slaid'),
+				new CLabel(_('SLA'), 'filter_slaid_ms'),
 				new CFormField(
 					(new CMultiSelect([
 						'name' => 'filter_slaid',
@@ -57,7 +57,7 @@ $filter = (new CFilter())
 						]
 					]))->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH)
 				),
-				new CLabel(_('Service'), 'filter_serviceid'),
+				new CLabel(_('Service'), 'filter_serviceid_ms'),
 				new CFormField(
 					(new CMultiSelect([
 						'name' => 'filter_serviceid',