"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "ui/include/classes/api/services/CTriggerGeneral.php" between
zabbix-5.4.0.tar.gz and zabbix-5.4.1.tar.gz

About: ZABBIX is an enterprise-class distributed monitoring solution for servers and applications.

CTriggerGeneral.php  (zabbix-5.4.0):CTriggerGeneral.php  (zabbix-5.4.1)
skipping to change at line 1024 skipping to change at line 1024
break; break;
default: default:
self::exception(ZBX_API_ERROR_INTERNAL, _('Intern al error.')); self::exception(ZBX_API_ERROR_INTERNAL, _('Intern al error.'));
} }
$_db_triggers = CMacrosResolverHelper::resolveTriggerExpressions( $this->get($options), $_db_triggers = CMacrosResolverHelper::resolveTriggerExpressions( $this->get($options),
['sources' => ['expression', 'recovery_expression']] ['sources' => ['expression', 'recovery_expression']]
); );
$db_trigger_tags = API::getApiService()->select('trigger_tag', [ $db_trigger_tags = $_db_triggers
'output' => ['triggertagid', 'triggerid', 'tag', 'value'] ? DB::select('trigger_tag', [
, 'output' => ['triggertagid', 'triggerid', 'tag',
'filter' => ['triggerid' => array_keys($_db_triggers)], 'value'],
'preservekeys' => true 'filter' => ['triggerid' => array_keys($_db_trigg
]); ers)],
$_db_triggers = $this->createRelationMap($db_trigger_tags, 'trigg 'preservekeys' => true
erid', 'triggertagid') ])
: [];
$_db_triggers = $this
->createRelationMap($db_trigger_tags, 'triggerid', 'trigg
ertagid')
->mapMany($_db_triggers, $db_trigger_tags, 'tags'); ->mapMany($_db_triggers, $db_trigger_tags, 'tags');
$read_only_fields = ['description', 'expression', 'recovery_mode' , 'recovery_expression', 'correlation_mode', $read_only_fields = ['description', 'expression', 'recovery_mode' , 'recovery_expression', 'correlation_mode',
'correlation_tag', 'manual_close' 'correlation_tag', 'manual_close'
]; ];
$descriptions = []; $descriptions = [];
foreach ($triggers as $key => &$trigger) { foreach ($triggers as $key => &$trigger) {
if (!array_key_exists($trigger['triggerid'], $_db_trigger s)) { if (!array_key_exists($trigger['triggerid'], $_db_trigger s)) {
 End of changes. 1 change blocks. 
8 lines changed or deleted 13 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)