diff options
| author | Andrejs Kozlovs <andrejs.kozlovs@zabbix.com> | 2021-01-14 08:36:24 +0300 |
|---|---|---|
| committer | Andrejs Kozlovs <andrejs.kozlovs@zabbix.com> | 2021-01-14 08:36:24 +0300 |
| commit | 691cffeb5e50ac48d9f1c53cb9021b52c8556d89 (patch) | |
| tree | eb8e6257e3d2e827994e94ba196a98bc140ddb3d /ui/app/controllers | |
| parent | 4dbcd7b71737c62213b19e121cc8cf1edc7eb630 (diff) | |
| parent | 10623996b1c0468b48c56a1ee3abc1cf810b6a87 (diff) | |
A.F....PS. [ZBXNEXT-5518] update from branch 'master' of https://git.zabbix.com/scm/zbx/zabbix into feature/ZBXNEXT-5518-5.3
Diffstat (limited to 'ui/app/controllers')
218 files changed, 287 insertions, 263 deletions
diff --git a/ui/app/controllers/CControllerActionOperationGet.php b/ui/app/controllers/CControllerActionOperationGet.php index badd80336b5..6f7aebd3228 100644 --- a/ui/app/controllers/CControllerActionOperationGet.php +++ b/ui/app/controllers/CControllerActionOperationGet.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerActionOperationValidate.php b/ui/app/controllers/CControllerActionOperationValidate.php index b8ff832a9bf..3635a091c12 100644 --- a/ui/app/controllers/CControllerActionOperationValidate.php +++ b/ui/app/controllers/CControllerActionOperationValidate.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerApplicationCreate.php b/ui/app/controllers/CControllerApplicationCreate.php index e1576acb244..ec3091da141 100644 --- a/ui/app/controllers/CControllerApplicationCreate.php +++ b/ui/app/controllers/CControllerApplicationCreate.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerApplicationDelete.php b/ui/app/controllers/CControllerApplicationDelete.php index 422ac04f067..51c951190c0 100644 --- a/ui/app/controllers/CControllerApplicationDelete.php +++ b/ui/app/controllers/CControllerApplicationDelete.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerApplicationDisable.php b/ui/app/controllers/CControllerApplicationDisable.php index 61ae367bdb5..2860914769d 100644 --- a/ui/app/controllers/CControllerApplicationDisable.php +++ b/ui/app/controllers/CControllerApplicationDisable.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerApplicationEdit.php b/ui/app/controllers/CControllerApplicationEdit.php index e1ce30ac2f0..7c4dab4ee2b 100644 --- a/ui/app/controllers/CControllerApplicationEdit.php +++ b/ui/app/controllers/CControllerApplicationEdit.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerApplicationEnable.php b/ui/app/controllers/CControllerApplicationEnable.php index 39a8948728c..150af1f3c12 100644 --- a/ui/app/controllers/CControllerApplicationEnable.php +++ b/ui/app/controllers/CControllerApplicationEnable.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerApplicationList.php b/ui/app/controllers/CControllerApplicationList.php index 4f37d49b536..e80335483e9 100644 --- a/ui/app/controllers/CControllerApplicationList.php +++ b/ui/app/controllers/CControllerApplicationList.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerApplicationUpdate.php b/ui/app/controllers/CControllerApplicationUpdate.php index eb2f6454587..de6030f1237 100644 --- a/ui/app/controllers/CControllerApplicationUpdate.php +++ b/ui/app/controllers/CControllerApplicationUpdate.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerAuditLogList.php b/ui/app/controllers/CControllerAuditLogList.php index 690ae676927..2f76a71c088 100644 --- a/ui/app/controllers/CControllerAuditLogList.php +++ b/ui/app/controllers/CControllerAuditLogList.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerAuthenticationEdit.php b/ui/app/controllers/CControllerAuthenticationEdit.php index e1f7823b921..a6da4411227 100644 --- a/ui/app/controllers/CControllerAuthenticationEdit.php +++ b/ui/app/controllers/CControllerAuthenticationEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerAuthenticationUpdate.php b/ui/app/controllers/CControllerAuthenticationUpdate.php index b24396a9ee9..5bd561b6923 100644 --- a/ui/app/controllers/CControllerAuthenticationUpdate.php +++ b/ui/app/controllers/CControllerAuthenticationUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -31,8 +31,6 @@ class CControllerAuthenticationUpdate extends CController { ->setArgument('action', 'authentication.edit') ->getUrl() ); - - $this->disableSIDValidation(); } protected function checkInput() { diff --git a/ui/app/controllers/CControllerAutoregEdit.php b/ui/app/controllers/CControllerAutoregEdit.php index 84da10162b9..9f3752a7f62 100644 --- a/ui/app/controllers/CControllerAutoregEdit.php +++ b/ui/app/controllers/CControllerAutoregEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerAutoregUpdate.php b/ui/app/controllers/CControllerAutoregUpdate.php index 7714188fd40..1151334b01a 100644 --- a/ui/app/controllers/CControllerAutoregUpdate.php +++ b/ui/app/controllers/CControllerAutoregUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerCharts.php b/ui/app/controllers/CControllerCharts.php index f92ef9309f3..3ffd9d98f58 100644 --- a/ui/app/controllers/CControllerCharts.php +++ b/ui/app/controllers/CControllerCharts.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerChartsView.php b/ui/app/controllers/CControllerChartsView.php index f09cf736931..0f15cfa0574 100644 --- a/ui/app/controllers/CControllerChartsView.php +++ b/ui/app/controllers/CControllerChartsView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerChartsViewJson.php b/ui/app/controllers/CControllerChartsViewJson.php index edb2b0e6c97..32f15a66eb2 100644 --- a/ui/app/controllers/CControllerChartsViewJson.php +++ b/ui/app/controllers/CControllerChartsViewJson.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerCorrelationConditionAdd.php b/ui/app/controllers/CControllerCorrelationConditionAdd.php index 4930d1c670d..5f0c3f3dc26 100644 --- a/ui/app/controllers/CControllerCorrelationConditionAdd.php +++ b/ui/app/controllers/CControllerCorrelationConditionAdd.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerCorrelationCreate.php b/ui/app/controllers/CControllerCorrelationCreate.php index 1d1836e3a9f..aa7f74218ae 100644 --- a/ui/app/controllers/CControllerCorrelationCreate.php +++ b/ui/app/controllers/CControllerCorrelationCreate.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerCorrelationDelete.php b/ui/app/controllers/CControllerCorrelationDelete.php index cde3e741a90..85bb4fbd56f 100644 --- a/ui/app/controllers/CControllerCorrelationDelete.php +++ b/ui/app/controllers/CControllerCorrelationDelete.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerCorrelationDisable.php b/ui/app/controllers/CControllerCorrelationDisable.php index aa210c95dda..09ea985cb71 100644 --- a/ui/app/controllers/CControllerCorrelationDisable.php +++ b/ui/app/controllers/CControllerCorrelationDisable.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerCorrelationEdit.php b/ui/app/controllers/CControllerCorrelationEdit.php index 75d315b36d4..224d1f37089 100644 --- a/ui/app/controllers/CControllerCorrelationEdit.php +++ b/ui/app/controllers/CControllerCorrelationEdit.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerCorrelationEnable.php b/ui/app/controllers/CControllerCorrelationEnable.php index 7f9e3eeb40d..ab758d7e5e3 100644 --- a/ui/app/controllers/CControllerCorrelationEnable.php +++ b/ui/app/controllers/CControllerCorrelationEnable.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerCorrelationList.php b/ui/app/controllers/CControllerCorrelationList.php index be1b8891955..145e3403a53 100644 --- a/ui/app/controllers/CControllerCorrelationList.php +++ b/ui/app/controllers/CControllerCorrelationList.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerCorrelationUpdate.php b/ui/app/controllers/CControllerCorrelationUpdate.php index 9697753c91d..5ca0672037a 100644 --- a/ui/app/controllers/CControllerCorrelationUpdate.php +++ b/ui/app/controllers/CControllerCorrelationUpdate.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardDelete.php b/ui/app/controllers/CControllerDashboardDelete.php index a1a763f1f5c..4ab3035801c 100644 --- a/ui/app/controllers/CControllerDashboardDelete.php +++ b/ui/app/controllers/CControllerDashboardDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardList.php b/ui/app/controllers/CControllerDashboardList.php index 9e1a8758670..55af0d543dd 100644 --- a/ui/app/controllers/CControllerDashboardList.php +++ b/ui/app/controllers/CControllerDashboardList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardPropertiesCheck.php b/ui/app/controllers/CControllerDashboardPropertiesCheck.php index 55c9e3abb30..7ad5e0c9ced 100644 --- a/ui/app/controllers/CControllerDashboardPropertiesCheck.php +++ b/ui/app/controllers/CControllerDashboardPropertiesCheck.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardPropertiesEdit.php b/ui/app/controllers/CControllerDashboardPropertiesEdit.php index 90c76be26d4..add6f221bca 100644 --- a/ui/app/controllers/CControllerDashboardPropertiesEdit.php +++ b/ui/app/controllers/CControllerDashboardPropertiesEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardShareEdit.php b/ui/app/controllers/CControllerDashboardShareEdit.php index 9a83a8cba44..0a396e9e7cb 100644 --- a/ui/app/controllers/CControllerDashboardShareEdit.php +++ b/ui/app/controllers/CControllerDashboardShareEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardShareUpdate.php b/ui/app/controllers/CControllerDashboardShareUpdate.php index 03dc624dd2a..d848d0a97fb 100644 --- a/ui/app/controllers/CControllerDashboardShareUpdate.php +++ b/ui/app/controllers/CControllerDashboardShareUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardUpdate.php b/ui/app/controllers/CControllerDashboardUpdate.php index 723ac66bf03..650d36ae041 100644 --- a/ui/app/controllers/CControllerDashboardUpdate.php +++ b/ui/app/controllers/CControllerDashboardUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardView.php b/ui/app/controllers/CControllerDashboardView.php index db24b17dbbc..cb79f63884a 100644 --- a/ui/app/controllers/CControllerDashboardView.php +++ b/ui/app/controllers/CControllerDashboardView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardWidgetCheck.php b/ui/app/controllers/CControllerDashboardWidgetCheck.php index 41a02c77a64..e9b5ace678b 100644 --- a/ui/app/controllers/CControllerDashboardWidgetCheck.php +++ b/ui/app/controllers/CControllerDashboardWidgetCheck.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardWidgetConfigure.php b/ui/app/controllers/CControllerDashboardWidgetConfigure.php index 8e84aa588d7..44edcb0ac35 100644 --- a/ui/app/controllers/CControllerDashboardWidgetConfigure.php +++ b/ui/app/controllers/CControllerDashboardWidgetConfigure.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardWidgetEdit.php b/ui/app/controllers/CControllerDashboardWidgetEdit.php index e45d42ddf65..d029b7b9c44 100644 --- a/ui/app/controllers/CControllerDashboardWidgetEdit.php +++ b/ui/app/controllers/CControllerDashboardWidgetEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardWidgetRfRate.php b/ui/app/controllers/CControllerDashboardWidgetRfRate.php index 7a8b30100b6..a7295f4f0ea 100644 --- a/ui/app/controllers/CControllerDashboardWidgetRfRate.php +++ b/ui/app/controllers/CControllerDashboardWidgetRfRate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDashboardWidgetSanitize.php b/ui/app/controllers/CControllerDashboardWidgetSanitize.php index 3b0a3b2a58c..d46abb382c6 100644 --- a/ui/app/controllers/CControllerDashboardWidgetSanitize.php +++ b/ui/app/controllers/CControllerDashboardWidgetSanitize.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDiscoveryCreate.php b/ui/app/controllers/CControllerDiscoveryCreate.php index 8e29380adb5..57c6c0f3c93 100644 --- a/ui/app/controllers/CControllerDiscoveryCreate.php +++ b/ui/app/controllers/CControllerDiscoveryCreate.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDiscoveryDelete.php b/ui/app/controllers/CControllerDiscoveryDelete.php index 66e350dc346..5f5bc1a983c 100644 --- a/ui/app/controllers/CControllerDiscoveryDelete.php +++ b/ui/app/controllers/CControllerDiscoveryDelete.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDiscoveryDisable.php b/ui/app/controllers/CControllerDiscoveryDisable.php index 5aa352fcf99..3de869f8581 100644 --- a/ui/app/controllers/CControllerDiscoveryDisable.php +++ b/ui/app/controllers/CControllerDiscoveryDisable.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDiscoveryEdit.php b/ui/app/controllers/CControllerDiscoveryEdit.php index 27606855aca..3c0340d51a9 100644 --- a/ui/app/controllers/CControllerDiscoveryEdit.php +++ b/ui/app/controllers/CControllerDiscoveryEdit.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDiscoveryEnable.php b/ui/app/controllers/CControllerDiscoveryEnable.php index 7317fa1f916..f0dc6fdb226 100644 --- a/ui/app/controllers/CControllerDiscoveryEnable.php +++ b/ui/app/controllers/CControllerDiscoveryEnable.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDiscoveryList.php b/ui/app/controllers/CControllerDiscoveryList.php index 01f4df3f7ff..a56575eb081 100644 --- a/ui/app/controllers/CControllerDiscoveryList.php +++ b/ui/app/controllers/CControllerDiscoveryList.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDiscoveryUpdate.php b/ui/app/controllers/CControllerDiscoveryUpdate.php index d02a7a7bbd3..18ab27f4416 100644 --- a/ui/app/controllers/CControllerDiscoveryUpdate.php +++ b/ui/app/controllers/CControllerDiscoveryUpdate.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerDiscoveryView.php b/ui/app/controllers/CControllerDiscoveryView.php index ef7556c6d97..ebc8d35cd4b 100644 --- a/ui/app/controllers/CControllerDiscoveryView.php +++ b/ui/app/controllers/CControllerDiscoveryView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerExport.php b/ui/app/controllers/CControllerExport.php index 52f21d61e3d..cd8f7096f92 100644 --- a/ui/app/controllers/CControllerExport.php +++ b/ui/app/controllers/CControllerExport.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerFavouriteCreate.php b/ui/app/controllers/CControllerFavouriteCreate.php index 74009be152e..9b005749b6d 100644 --- a/ui/app/controllers/CControllerFavouriteCreate.php +++ b/ui/app/controllers/CControllerFavouriteCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerFavouriteDelete.php b/ui/app/controllers/CControllerFavouriteDelete.php index 50e8b6afae4..325cf5eda78 100644 --- a/ui/app/controllers/CControllerFavouriteDelete.php +++ b/ui/app/controllers/CControllerFavouriteDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerGuiEdit.php b/ui/app/controllers/CControllerGuiEdit.php index 0ee67a22f5f..c598099f182 100644 --- a/ui/app/controllers/CControllerGuiEdit.php +++ b/ui/app/controllers/CControllerGuiEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerGuiUpdate.php b/ui/app/controllers/CControllerGuiUpdate.php index ad093a75aec..a934665e427 100644 --- a/ui/app/controllers/CControllerGuiUpdate.php +++ b/ui/app/controllers/CControllerGuiUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php index a3b1658a578..95cf06af407 100644 --- a/ui/app/controllers/CControllerHost.php +++ b/ui/app/controllers/CControllerHost.php @@ -2,7 +2,7 @@ /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -154,11 +154,8 @@ abstract class CControllerHost extends CController { // Get additional data to limited host amount. $hosts = API::Host()->get([ - 'output' => ['hostid', 'name', 'status', 'maintenance_status', 'maintenanceid', 'maintenance_type', - 'available', 'snmp_available', 'jmx_available', 'ipmi_available', 'error', 'ipmi_error', 'snmp_error', - 'jmx_error' - ], - 'selectInterfaces' => ['ip', 'dns', 'port', 'main', 'type', 'useip'], + 'output' => ['hostid', 'name', 'status', 'maintenance_status', 'maintenanceid', 'maintenance_type'], + 'selectInterfaces' => ['ip', 'dns', 'port', 'main', 'type', 'useip', 'available', 'error', 'details'], 'selectGraphs' => API_OUTPUT_COUNT, 'selectHttpTests' => API_OUTPUT_COUNT, 'selectTags' => ['tag', 'value'], diff --git a/ui/app/controllers/CControllerHostDashboardView.php b/ui/app/controllers/CControllerHostDashboardView.php index 45f686d9073..348d42c6393 100644 --- a/ui/app/controllers/CControllerHostDashboardView.php +++ b/ui/app/controllers/CControllerHostDashboardView.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerHostMacrosList.php b/ui/app/controllers/CControllerHostMacrosList.php index 93b84f238ef..3633edba498 100644 --- a/ui/app/controllers/CControllerHostMacrosList.php +++ b/ui/app/controllers/CControllerHostMacrosList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerHostView.php b/ui/app/controllers/CControllerHostView.php index 1c5cf2e8b3c..8b6ad6a7985 100644 --- a/ui/app/controllers/CControllerHostView.php +++ b/ui/app/controllers/CControllerHostView.php @@ -2,7 +2,7 @@ /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerHostViewRefresh.php b/ui/app/controllers/CControllerHostViewRefresh.php index 415b7a45fad..6e0d99a8d5c 100644 --- a/ui/app/controllers/CControllerHostViewRefresh.php +++ b/ui/app/controllers/CControllerHostViewRefresh.php @@ -2,7 +2,7 @@ /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerHousekeepingEdit.php b/ui/app/controllers/CControllerHousekeepingEdit.php index 10bea10acec..00dd97c8e14 100644 --- a/ui/app/controllers/CControllerHousekeepingEdit.php +++ b/ui/app/controllers/CControllerHousekeepingEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerHousekeepingUpdate.php b/ui/app/controllers/CControllerHousekeepingUpdate.php index 874b67d81a7..5cdc891e83b 100644 --- a/ui/app/controllers/CControllerHousekeepingUpdate.php +++ b/ui/app/controllers/CControllerHousekeepingUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerIconMapCreate.php b/ui/app/controllers/CControllerIconMapCreate.php index 2dc15f4b365..a9f8b4078a6 100644 --- a/ui/app/controllers/CControllerIconMapCreate.php +++ b/ui/app/controllers/CControllerIconMapCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerIconMapDelete.php b/ui/app/controllers/CControllerIconMapDelete.php index 27ee3e86db3..d87b0302142 100644 --- a/ui/app/controllers/CControllerIconMapDelete.php +++ b/ui/app/controllers/CControllerIconMapDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerIconMapEdit.php b/ui/app/controllers/CControllerIconMapEdit.php index fe553772ad4..14bdcadb553 100644 --- a/ui/app/controllers/CControllerIconMapEdit.php +++ b/ui/app/controllers/CControllerIconMapEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerIconMapList.php b/ui/app/controllers/CControllerIconMapList.php index 997b3cfb0db..15f40c85176 100644 --- a/ui/app/controllers/CControllerIconMapList.php +++ b/ui/app/controllers/CControllerIconMapList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerIconMapUpdate.php b/ui/app/controllers/CControllerIconMapUpdate.php index ab6b7ab7c30..a3fd074d904 100644 --- a/ui/app/controllers/CControllerIconMapUpdate.php +++ b/ui/app/controllers/CControllerIconMapUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerImageCreate.php b/ui/app/controllers/CControllerImageCreate.php index cd6fb54642f..26cc7dbff52 100644 --- a/ui/app/controllers/CControllerImageCreate.php +++ b/ui/app/controllers/CControllerImageCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerImageDelete.php b/ui/app/controllers/CControllerImageDelete.php index 767f5e7835d..ce42dd6ee98 100644 --- a/ui/app/controllers/CControllerImageDelete.php +++ b/ui/app/controllers/CControllerImageDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerImageEdit.php b/ui/app/controllers/CControllerImageEdit.php index fc8b80790df..304a2e6a182 100644 --- a/ui/app/controllers/CControllerImageEdit.php +++ b/ui/app/controllers/CControllerImageEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerImageList.php b/ui/app/controllers/CControllerImageList.php index 4b46d264a9a..53879f3f7e2 100644 --- a/ui/app/controllers/CControllerImageList.php +++ b/ui/app/controllers/CControllerImageList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerImageUpdate.php b/ui/app/controllers/CControllerImageUpdate.php index 98660b14657..23ef7fb4e2d 100644 --- a/ui/app/controllers/CControllerImageUpdate.php +++ b/ui/app/controllers/CControllerImageUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerLatest.php b/ui/app/controllers/CControllerLatest.php index c2831b37dd2..c67c8bd3814 100644 --- a/ui/app/controllers/CControllerLatest.php +++ b/ui/app/controllers/CControllerLatest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerLatestView.php b/ui/app/controllers/CControllerLatestView.php index 01d05c596b4..00c9ed7956c 100644 --- a/ui/app/controllers/CControllerLatestView.php +++ b/ui/app/controllers/CControllerLatestView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerLatestViewRefresh.php b/ui/app/controllers/CControllerLatestViewRefresh.php index b2b4705dc0c..d21c27018a3 100644 --- a/ui/app/controllers/CControllerLatestViewRefresh.php +++ b/ui/app/controllers/CControllerLatestViewRefresh.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMacrosEdit.php b/ui/app/controllers/CControllerMacrosEdit.php index f8e182c0ef7..bfc284ce6a3 100644 --- a/ui/app/controllers/CControllerMacrosEdit.php +++ b/ui/app/controllers/CControllerMacrosEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMacrosUpdate.php b/ui/app/controllers/CControllerMacrosUpdate.php index 88197fc2b31..0c0df308b2c 100644 --- a/ui/app/controllers/CControllerMacrosUpdate.php +++ b/ui/app/controllers/CControllerMacrosUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMapView.php b/ui/app/controllers/CControllerMapView.php index 809a9e87fc1..ed2b8722370 100644 --- a/ui/app/controllers/CControllerMapView.php +++ b/ui/app/controllers/CControllerMapView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMediatypeCreate.php b/ui/app/controllers/CControllerMediatypeCreate.php index 8dcf6aa7fb5..c4b657794fe 100644 --- a/ui/app/controllers/CControllerMediatypeCreate.php +++ b/ui/app/controllers/CControllerMediatypeCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMediatypeDelete.php b/ui/app/controllers/CControllerMediatypeDelete.php index f2f114f894d..1fa0be1a054 100644 --- a/ui/app/controllers/CControllerMediatypeDelete.php +++ b/ui/app/controllers/CControllerMediatypeDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMediatypeDisable.php b/ui/app/controllers/CControllerMediatypeDisable.php index 9c97a69144a..a256e61d504 100644 --- a/ui/app/controllers/CControllerMediatypeDisable.php +++ b/ui/app/controllers/CControllerMediatypeDisable.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMediatypeEdit.php b/ui/app/controllers/CControllerMediatypeEdit.php index 83b3e5bc66e..0ea8758462c 100644 --- a/ui/app/controllers/CControllerMediatypeEdit.php +++ b/ui/app/controllers/CControllerMediatypeEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMediatypeEnable.php b/ui/app/controllers/CControllerMediatypeEnable.php index 4097f5366a0..1f11eb4112d 100644 --- a/ui/app/controllers/CControllerMediatypeEnable.php +++ b/ui/app/controllers/CControllerMediatypeEnable.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMediatypeList.php b/ui/app/controllers/CControllerMediatypeList.php index 98d09ccb317..516ca95922f 100644 --- a/ui/app/controllers/CControllerMediatypeList.php +++ b/ui/app/controllers/CControllerMediatypeList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMediatypeUpdate.php b/ui/app/controllers/CControllerMediatypeUpdate.php index ac3f6cb1a8d..86d1366089a 100644 --- a/ui/app/controllers/CControllerMediatypeUpdate.php +++ b/ui/app/controllers/CControllerMediatypeUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMenuPopup.php b/ui/app/controllers/CControllerMenuPopup.php index a98c5f30da6..c73ad01a224 100644 --- a/ui/app/controllers/CControllerMenuPopup.php +++ b/ui/app/controllers/CControllerMenuPopup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMiscConfigEdit.php b/ui/app/controllers/CControllerMiscConfigEdit.php index a9ebcc68df9..fdecee4ab2a 100644 --- a/ui/app/controllers/CControllerMiscConfigEdit.php +++ b/ui/app/controllers/CControllerMiscConfigEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerMiscConfigUpdate.php b/ui/app/controllers/CControllerMiscConfigUpdate.php index f4467755c97..4fea6cad026 100644 --- a/ui/app/controllers/CControllerMiscConfigUpdate.php +++ b/ui/app/controllers/CControllerMiscConfigUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerModuleEdit.php b/ui/app/controllers/CControllerModuleEdit.php index bf2d722f543..1ffa10001d1 100644 --- a/ui/app/controllers/CControllerModuleEdit.php +++ b/ui/app/controllers/CControllerModuleEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerModuleList.php b/ui/app/controllers/CControllerModuleList.php index 73d32319289..865124a840e 100644 --- a/ui/app/controllers/CControllerModuleList.php +++ b/ui/app/controllers/CControllerModuleList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerModuleScan.php b/ui/app/controllers/CControllerModuleScan.php index b4249e0f19a..732a31b768a 100644 --- a/ui/app/controllers/CControllerModuleScan.php +++ b/ui/app/controllers/CControllerModuleScan.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerModuleUpdate.php b/ui/app/controllers/CControllerModuleUpdate.php index d6241499c1a..4b61b8734ed 100644 --- a/ui/app/controllers/CControllerModuleUpdate.php +++ b/ui/app/controllers/CControllerModuleUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerNotificationsGet.php b/ui/app/controllers/CControllerNotificationsGet.php index cf8f13c7c09..1993762f0e3 100644 --- a/ui/app/controllers/CControllerNotificationsGet.php +++ b/ui/app/controllers/CControllerNotificationsGet.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerNotificationsMute.php b/ui/app/controllers/CControllerNotificationsMute.php index 7e645de2e94..dac2385008d 100644 --- a/ui/app/controllers/CControllerNotificationsMute.php +++ b/ui/app/controllers/CControllerNotificationsMute.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerNotificationsRead.php b/ui/app/controllers/CControllerNotificationsRead.php index b464be33308..fcaa30dcc0b 100644 --- a/ui/app/controllers/CControllerNotificationsRead.php +++ b/ui/app/controllers/CControllerNotificationsRead.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopup.php b/ui/app/controllers/CControllerPopup.php index 4191c81a0a0..3a5b923bdc9 100644 --- a/ui/app/controllers/CControllerPopup.php +++ b/ui/app/controllers/CControllerPopup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupAcknowledgeCreate.php b/ui/app/controllers/CControllerPopupAcknowledgeCreate.php index 46fb6cf7e1e..fb31cc1f9aa 100644 --- a/ui/app/controllers/CControllerPopupAcknowledgeCreate.php +++ b/ui/app/controllers/CControllerPopupAcknowledgeCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupAcknowledgeEdit.php b/ui/app/controllers/CControllerPopupAcknowledgeEdit.php index 0ff72e119ec..f7e2a734ddc 100644 --- a/ui/app/controllers/CControllerPopupAcknowledgeEdit.php +++ b/ui/app/controllers/CControllerPopupAcknowledgeEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupConditionActions.php b/ui/app/controllers/CControllerPopupConditionActions.php index 9df4093dacf..569f2668ed8 100644 --- a/ui/app/controllers/CControllerPopupConditionActions.php +++ b/ui/app/controllers/CControllerPopupConditionActions.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupConditionCommon.php b/ui/app/controllers/CControllerPopupConditionCommon.php index 136fc42e2c0..ad70e0597a8 100644 --- a/ui/app/controllers/CControllerPopupConditionCommon.php +++ b/ui/app/controllers/CControllerPopupConditionCommon.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupConditionEventCorr.php b/ui/app/controllers/CControllerPopupConditionEventCorr.php index 59ba4308f8b..5c775c08f1c 100644 --- a/ui/app/controllers/CControllerPopupConditionEventCorr.php +++ b/ui/app/controllers/CControllerPopupConditionEventCorr.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupConditionOperations.php b/ui/app/controllers/CControllerPopupConditionOperations.php index a55ddf77696..ba14fc341f2 100644 --- a/ui/app/controllers/CControllerPopupConditionOperations.php +++ b/ui/app/controllers/CControllerPopupConditionOperations.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupDiscoveryCheck.php b/ui/app/controllers/CControllerPopupDiscoveryCheck.php index b15c588822e..9c838ec9c2c 100644 --- a/ui/app/controllers/CControllerPopupDiscoveryCheck.php +++ b/ui/app/controllers/CControllerPopupDiscoveryCheck.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupGeneric.php b/ui/app/controllers/CControllerPopupGeneric.php index b2fa6678da7..04c405d1b7c 100644 --- a/ui/app/controllers/CControllerPopupGeneric.php +++ b/ui/app/controllers/CControllerPopupGeneric.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupHttpStep.php b/ui/app/controllers/CControllerPopupHttpStep.php index 8d48b9f88df..26ab2a42d44 100644 --- a/ui/app/controllers/CControllerPopupHttpStep.php +++ b/ui/app/controllers/CControllerPopupHttpStep.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupImport.php b/ui/app/controllers/CControllerPopupImport.php index d1f594f8a71..cd644c77b9d 100644 --- a/ui/app/controllers/CControllerPopupImport.php +++ b/ui/app/controllers/CControllerPopupImport.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupItemTest.php b/ui/app/controllers/CControllerPopupItemTest.php index 237041b556f..f16ac62cfcd 100644 --- a/ui/app/controllers/CControllerPopupItemTest.php +++ b/ui/app/controllers/CControllerPopupItemTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -304,9 +304,8 @@ abstract class CControllerPopupItemTest extends CController { if ($ret && $hostid != 0) { $hosts = API::Host()->get([ - 'output' => ['hostid', 'host', 'name', 'status', 'available', 'proxy_hostid', 'tls_subject', - 'ipmi_available', 'jmx_available', 'snmp_available', 'maintenance_status', 'maintenance_type', - 'ipmi_authtype', 'ipmi_privilege', 'ipmi_username', 'ipmi_password', + 'output' => ['hostid', 'host', 'name', 'status', 'proxy_hostid', 'tls_subject', 'maintenance_status', + 'maintenance_type', 'ipmi_authtype', 'ipmi_privilege', 'ipmi_username', 'ipmi_password', 'tls_issuer', 'tls_connect' ], 'hostids' => [$hostid], @@ -315,7 +314,7 @@ abstract class CControllerPopupItemTest extends CController { if (!$hosts) { $hosts = API::Template()->get([ - 'output' => ['templateid', 'host', 'name', 'status', 'available', 'jmx_available'], + 'output' => ['templateid', 'host', 'name', 'status'], 'templateids' => [$hostid], 'editable' => true ]); @@ -530,17 +529,13 @@ abstract class CControllerPopupItemTest extends CController { $data += [ 'key' => $input['key'], 'host' => [ - 'hostid' => $this->host['hostid'], - 'available' => $this->host['available'], - 'jmx_available' => $this->host['jmx_available'] + 'hostid' => $this->host['hostid'] ] ]; if ($this->host['status'] != HOST_STATUS_TEMPLATE) { $data['host'] += [ 'maintenance_status' => $this->host['maintenance_status'], - 'ipmi_available' => $this->host['ipmi_available'], - 'snmp_available' => $this->host['snmp_available'], 'maintenance_type' => $this->host['maintenance_type'] ]; } diff --git a/ui/app/controllers/CControllerPopupItemTestEdit.php b/ui/app/controllers/CControllerPopupItemTestEdit.php index aff2df22d30..808c77fe8fb 100644 --- a/ui/app/controllers/CControllerPopupItemTestEdit.php +++ b/ui/app/controllers/CControllerPopupItemTestEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -91,6 +91,20 @@ class CControllerPopupItemTestEdit extends CControllerPopupItemTest { error(_s('Incorrect value for field "%1$s": %2$s.', 'key_', $item_key_parser->getError())); $ret = false; } + elseif ($this->item_type == ITEM_TYPE_AGGREGATE) { + $params_num = $item_key_parser->getParamsNum(); + + if (!str_in_array($item_key_parser->getKey(), ['grpmax', 'grpmin', 'grpsum', 'grpavg']) + || $params_num > 4 || $params_num < 3 + || ($params_num == 3 && $item_key_parser->getParam(2) !== 'last') + || !str_in_array($item_key_parser->getParam(2), + ['last', 'min', 'max', 'avg', 'sum', 'count'])) { + error(_s('Key "%1$s" does not match <grpmax|grpmin|grpsum|grpavg>["Host group(s)", "Item key",'. + ' "<last|min|max|avg|sum|count>", "parameter"].', $item_key_parser->getKey() + )); + $ret = false; + } + } } /* @@ -135,7 +149,17 @@ class CControllerPopupItemTestEdit extends CControllerPopupItemTest { $inputs = $this->getItemTestProperties($this->getInputAll()); // Work with preprocessing steps. - $preprocessing_steps = $this->getInput('steps', []); + $preprocessing_steps_inpupt = $this->getInput('steps', []); + $preprocessing_steps = []; + foreach ($preprocessing_steps_inpupt as $preproc) { + if ($preproc['type'] == ZBX_PREPROC_VALIDATE_NOT_SUPPORTED) { + array_unshift($preprocessing_steps, $preproc); + } + else { + $preprocessing_steps[] = $preproc; + } + } + $preprocessing_types = zbx_objectValues($preprocessing_steps, 'type'); $preprocessing_names = get_preprocessing_types(null, false, $preprocessing_types); $support_lldmacros = ($this->preproc_item instanceof CItemPrototype); @@ -333,6 +357,7 @@ class CControllerPopupItemTestEdit extends CControllerPopupItemTest { 'interface_port_enabled' => (array_key_exists($this->item_type, $this->items_require_interface) && $this->items_require_interface[$this->item_type]['port'] ), + 'preproc_item' => $this->preproc_item, 'show_snmp_form' => ($this->item_type == ITEM_TYPE_SNMP), 'show_warning' => $show_warning, 'user' => [ diff --git a/ui/app/controllers/CControllerPopupItemTestGetValue.php b/ui/app/controllers/CControllerPopupItemTestGetValue.php index c2f5c99bef7..5c782b0897a 100644 --- a/ui/app/controllers/CControllerPopupItemTestGetValue.php +++ b/ui/app/controllers/CControllerPopupItemTestGetValue.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupItemTestSend.php b/ui/app/controllers/CControllerPopupItemTestSend.php index 7ea3c23fc20..87568cbc3f6 100644 --- a/ui/app/controllers/CControllerPopupItemTestSend.php +++ b/ui/app/controllers/CControllerPopupItemTestSend.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -104,7 +104,8 @@ class CControllerPopupItemTestSend extends CControllerPopupItemTest { 'value_type' => 'in '.implode(',', [ITEM_VALUE_TYPE_UINT64, ITEM_VALUE_TYPE_FLOAT, ITEM_VALUE_TYPE_STR, ITEM_VALUE_TYPE_LOG, ITEM_VALUE_TYPE_TEXT]), 'valuemapid' => 'int32', 'verify_host' => 'in 0,1', - 'verify_peer' => 'in 0,1' + 'verify_peer' => 'in 0,1', + 'not_supported' => 'in 1' ]; $ret = $this->validateInput($fields); @@ -228,7 +229,8 @@ class CControllerPopupItemTestSend extends CControllerPopupItemTest { $preproc_test_data = [ 'value' => $this->getInput('value', ''), 'steps' => $this->getInput('steps', []), - 'single' => !$this->show_final_result + 'single' => !$this->show_final_result, + 'state' => 0 ]; // Get previous value and time. @@ -319,7 +321,13 @@ class CControllerPopupItemTestSend extends CControllerPopupItemTest { } if (array_key_exists('error', $result) && $result['error'] !== '') { - error($result['error']); + if ($preproc_test_data['steps'] + && $preproc_test_data['steps'][0]['type'] == ZBX_PREPROC_VALIDATE_NOT_SUPPORTED) { + $preproc_test_data['state'] = 1; + } + else { + error($result['error']); + } } } @@ -327,6 +335,9 @@ class CControllerPopupItemTestSend extends CControllerPopupItemTest { $output['messages'] = $messages->toString(); } } + else { + $preproc_test_data['state'] = $this->getInput('not_supported', 0); + } // Test preprocessing steps. $this->eol = parent::getInput('eol', ZBX_EOL_LF); @@ -350,12 +361,6 @@ class CControllerPopupItemTestSend extends CControllerPopupItemTest { $test_failed = false; $test_outcome = null; - $step_types = array_column($preproc_test_data['steps'], 'type'); - $insert_index = array_search(ZBX_PREPROC_VALIDATE_NOT_SUPPORTED, $step_types); - if ($insert_index !== false) { - array_splice($result['steps'], $insert_index, 0, [['result' => ' ']]); - } - foreach ($preproc_test_data['steps'] as $i => &$step) { if ($test_failed) { // If test is failed, proceesing steps are skipped from results. @@ -372,6 +377,9 @@ class CControllerPopupItemTestSend extends CControllerPopupItemTest { $test_failed = true; } } + elseif ($step['type'] == ZBX_PREPROC_VALIDATE_NOT_SUPPORTED) { + $step['result'] = $preproc_test_data['value']; + } } unset($step['type'], $step['params'], $step['error_handler'], $step['error_handler_params']); diff --git a/ui/app/controllers/CControllerPopupLldOperation.php b/ui/app/controllers/CControllerPopupLldOperation.php index b432987432d..e7afa78108f 100644 --- a/ui/app/controllers/CControllerPopupLldOperation.php +++ b/ui/app/controllers/CControllerPopupLldOperation.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupLldOverride.php b/ui/app/controllers/CControllerPopupLldOverride.php index 3ada19510b0..617bd14c7cc 100644 --- a/ui/app/controllers/CControllerPopupLldOverride.php +++ b/ui/app/controllers/CControllerPopupLldOverride.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupMaintenancePeriod.php b/ui/app/controllers/CControllerPopupMaintenancePeriod.php index 548a7fd5c1c..3f427a70cb6 100644 --- a/ui/app/controllers/CControllerPopupMaintenancePeriod.php +++ b/ui/app/controllers/CControllerPopupMaintenancePeriod.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupMassupdateHost.php b/ui/app/controllers/CControllerPopupMassupdateHost.php index e2e1caff87a..4b42810a3dc 100644 --- a/ui/app/controllers/CControllerPopupMassupdateHost.php +++ b/ui/app/controllers/CControllerPopupMassupdateHost.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupMassupdateItem.php b/ui/app/controllers/CControllerPopupMassupdateItem.php index 159b1a2e90c..0701aedcb9c 100644 --- a/ui/app/controllers/CControllerPopupMassupdateItem.php +++ b/ui/app/controllers/CControllerPopupMassupdateItem.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupMassupdateItemPrototype.php b/ui/app/controllers/CControllerPopupMassupdateItemPrototype.php index 8ce0343991b..4fd1d73671d 100644 --- a/ui/app/controllers/CControllerPopupMassupdateItemPrototype.php +++ b/ui/app/controllers/CControllerPopupMassupdateItemPrototype.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupMassupdateTemplate.php b/ui/app/controllers/CControllerPopupMassupdateTemplate.php index 4be2dc2adf4..1c9dd568bd0 100644 --- a/ui/app/controllers/CControllerPopupMassupdateTemplate.php +++ b/ui/app/controllers/CControllerPopupMassupdateTemplate.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupMassupdateTrigger.php b/ui/app/controllers/CControllerPopupMassupdateTrigger.php index 9b4fd7489d9..ed15508fb08 100644 --- a/ui/app/controllers/CControllerPopupMassupdateTrigger.php +++ b/ui/app/controllers/CControllerPopupMassupdateTrigger.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupMedia.php b/ui/app/controllers/CControllerPopupMedia.php index 6d22ce84ed5..a8332910735 100644 --- a/ui/app/controllers/CControllerPopupMedia.php +++ b/ui/app/controllers/CControllerPopupMedia.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupMediatypeMessage.php b/ui/app/controllers/CControllerPopupMediatypeMessage.php index 10c79ced428..e7caf026412 100644 --- a/ui/app/controllers/CControllerPopupMediatypeMessage.php +++ b/ui/app/controllers/CControllerPopupMediatypeMessage.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupMediatypeTestEdit.php b/ui/app/controllers/CControllerPopupMediatypeTestEdit.php index c844191b3db..419bb989e05 100644 --- a/ui/app/controllers/CControllerPopupMediatypeTestEdit.php +++ b/ui/app/controllers/CControllerPopupMediatypeTestEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupMediatypeTestSend.php b/ui/app/controllers/CControllerPopupMediatypeTestSend.php index ff21f64af8c..83ad44e056c 100644 --- a/ui/app/controllers/CControllerPopupMediatypeTestSend.php +++ b/ui/app/controllers/CControllerPopupMediatypeTestSend.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupScriptExec.php b/ui/app/controllers/CControllerPopupScriptExec.php index 0f6cdd72563..1abf588619a 100644 --- a/ui/app/controllers/CControllerPopupScriptExec.php +++ b/ui/app/controllers/CControllerPopupScriptExec.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupServices.php b/ui/app/controllers/CControllerPopupServices.php index 73f5a875e75..eedfdcf7d47 100644 --- a/ui/app/controllers/CControllerPopupServices.php +++ b/ui/app/controllers/CControllerPopupServices.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupTabFilterDelete.php b/ui/app/controllers/CControllerPopupTabFilterDelete.php index 7b7d2ae9ed4..a66c3752cfc 100644 --- a/ui/app/controllers/CControllerPopupTabFilterDelete.php +++ b/ui/app/controllers/CControllerPopupTabFilterDelete.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupTabFilterEdit.php b/ui/app/controllers/CControllerPopupTabFilterEdit.php index 5607b88f314..6893cf0b232 100644 --- a/ui/app/controllers/CControllerPopupTabFilterEdit.php +++ b/ui/app/controllers/CControllerPopupTabFilterEdit.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupTabFilterUpdate.php b/ui/app/controllers/CControllerPopupTabFilterUpdate.php index 8f469a5b630..812c4dc74f8 100644 --- a/ui/app/controllers/CControllerPopupTabFilterUpdate.php +++ b/ui/app/controllers/CControllerPopupTabFilterUpdate.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupTestTriggerExpr.php b/ui/app/controllers/CControllerPopupTestTriggerExpr.php index 6ce3dec0a95..fd3da835597 100644 --- a/ui/app/controllers/CControllerPopupTestTriggerExpr.php +++ b/ui/app/controllers/CControllerPopupTestTriggerExpr.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -107,7 +107,9 @@ class CControllerPopupTestTriggerExpr extends CController { } else { if ($info['values'] !== null) { - $control = new CComboBox($fname, $this->macros_data[$macro], null, $info['values']); + $control = (new CSelect($fname)) + ->addOptions(CSelect::createOptionsFromArray($info['values'])) + ->setValue($this->macros_data[$macro]); } else { $control = (new CTextBox($fname, $this->macros_data[$macro])) diff --git a/ui/app/controllers/CControllerPopupTriggerExpr.php b/ui/app/controllers/CControllerPopupTriggerExpr.php index c808a8586c9..424448d8d29 100644 --- a/ui/app/controllers/CControllerPopupTriggerExpr.php +++ b/ui/app/controllers/CControllerPopupTriggerExpr.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerPopupTriggerWizard.php b/ui/app/controllers/CControllerPopupTriggerWizard.php index 820aa3d59fb..0ef13b5322b 100644 --- a/ui/app/controllers/CControllerPopupTriggerWizard.php +++ b/ui/app/controllers/CControllerPopupTriggerWizard.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProblem.php b/ui/app/controllers/CControllerProblem.php index 73fbedfbbd2..870971f11c2 100644 --- a/ui/app/controllers/CControllerProblem.php +++ b/ui/app/controllers/CControllerProblem.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProblemView.php b/ui/app/controllers/CControllerProblemView.php index 494a6a94e1b..4f12cf74f76 100644 --- a/ui/app/controllers/CControllerProblemView.php +++ b/ui/app/controllers/CControllerProblemView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProblemViewRefresh.php b/ui/app/controllers/CControllerProblemViewRefresh.php index 86b932c846e..3bf91280a3f 100644 --- a/ui/app/controllers/CControllerProblemViewRefresh.php +++ b/ui/app/controllers/CControllerProblemViewRefresh.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProfileUpdate.php b/ui/app/controllers/CControllerProfileUpdate.php index fb93e47349f..3a3ccc87c39 100644 --- a/ui/app/controllers/CControllerProfileUpdate.php +++ b/ui/app/controllers/CControllerProfileUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProxyCreate.php b/ui/app/controllers/CControllerProxyCreate.php index c18d23bf6f5..b93fe105ab0 100644 --- a/ui/app/controllers/CControllerProxyCreate.php +++ b/ui/app/controllers/CControllerProxyCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProxyDelete.php b/ui/app/controllers/CControllerProxyDelete.php index e6f60f7a230..001b684254c 100644 --- a/ui/app/controllers/CControllerProxyDelete.php +++ b/ui/app/controllers/CControllerProxyDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProxyEdit.php b/ui/app/controllers/CControllerProxyEdit.php index ffcd2f1d635..16e38efe2c6 100644 --- a/ui/app/controllers/CControllerProxyEdit.php +++ b/ui/app/controllers/CControllerProxyEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProxyHostDisable.php b/ui/app/controllers/CControllerProxyHostDisable.php index 96bd12be126..0048a636d75 100644 --- a/ui/app/controllers/CControllerProxyHostDisable.php +++ b/ui/app/controllers/CControllerProxyHostDisable.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProxyHostEnable.php b/ui/app/controllers/CControllerProxyHostEnable.php index 7a4971d5fcc..ef255370d24 100644 --- a/ui/app/controllers/CControllerProxyHostEnable.php +++ b/ui/app/controllers/CControllerProxyHostEnable.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProxyList.php b/ui/app/controllers/CControllerProxyList.php index 8d4dc894302..1c091bad768 100644 --- a/ui/app/controllers/CControllerProxyList.php +++ b/ui/app/controllers/CControllerProxyList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerProxyUpdate.php b/ui/app/controllers/CControllerProxyUpdate.php index 9e1303b730f..b25a5482fe5 100644 --- a/ui/app/controllers/CControllerProxyUpdate.php +++ b/ui/app/controllers/CControllerProxyUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerQueueDetails.php b/ui/app/controllers/CControllerQueueDetails.php index 53f4c37166f..f6c82c5dad1 100644 --- a/ui/app/controllers/CControllerQueueDetails.php +++ b/ui/app/controllers/CControllerQueueDetails.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerQueueOverview.php b/ui/app/controllers/CControllerQueueOverview.php index ac7589175dd..d9c031f4ab7 100644 --- a/ui/app/controllers/CControllerQueueOverview.php +++ b/ui/app/controllers/CControllerQueueOverview.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerQueueOverviewProxy.php b/ui/app/controllers/CControllerQueueOverviewProxy.php index fbfb5fa8b49..18be0576a2a 100644 --- a/ui/app/controllers/CControllerQueueOverviewProxy.php +++ b/ui/app/controllers/CControllerQueueOverviewProxy.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerRegExCreate.php b/ui/app/controllers/CControllerRegExCreate.php index ef2e6700288..6705d0b706c 100644 --- a/ui/app/controllers/CControllerRegExCreate.php +++ b/ui/app/controllers/CControllerRegExCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerRegExDelete.php b/ui/app/controllers/CControllerRegExDelete.php index e772d89a492..9d6430f9d1c 100644 --- a/ui/app/controllers/CControllerRegExDelete.php +++ b/ui/app/controllers/CControllerRegExDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerRegExEdit.php b/ui/app/controllers/CControllerRegExEdit.php index f36dc21208c..c4ed94b0192 100644 --- a/ui/app/controllers/CControllerRegExEdit.php +++ b/ui/app/controllers/CControllerRegExEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerRegExList.php b/ui/app/controllers/CControllerRegExList.php index a12a68f2c18..2890bf99b0f 100644 --- a/ui/app/controllers/CControllerRegExList.php +++ b/ui/app/controllers/CControllerRegExList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerRegExTest.php b/ui/app/controllers/CControllerRegExTest.php index 1a8ce9aa76e..7225a000107 100644 --- a/ui/app/controllers/CControllerRegExTest.php +++ b/ui/app/controllers/CControllerRegExTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerRegExUpdate.php b/ui/app/controllers/CControllerRegExUpdate.php index 4b7d5be99f7..dc87ce9e8f7 100644 --- a/ui/app/controllers/CControllerRegExUpdate.php +++ b/ui/app/controllers/CControllerRegExUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerReportServices.php b/ui/app/controllers/CControllerReportServices.php index 01da9e16cc0..0aa260d7971 100644 --- a/ui/app/controllers/CControllerReportServices.php +++ b/ui/app/controllers/CControllerReportServices.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerReportStatus.php b/ui/app/controllers/CControllerReportStatus.php index 7a575fde193..2d6a0b508de 100644 --- a/ui/app/controllers/CControllerReportStatus.php +++ b/ui/app/controllers/CControllerReportStatus.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerScriptCreate.php b/ui/app/controllers/CControllerScriptCreate.php index 77fdb6acb36..7c3d30d6061 100644 --- a/ui/app/controllers/CControllerScriptCreate.php +++ b/ui/app/controllers/CControllerScriptCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerScriptDelete.php b/ui/app/controllers/CControllerScriptDelete.php index 39d8b82d5ef..4d6888e0c09 100644 --- a/ui/app/controllers/CControllerScriptDelete.php +++ b/ui/app/controllers/CControllerScriptDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerScriptEdit.php b/ui/app/controllers/CControllerScriptEdit.php index f8610cdf012..03aade6d000 100644 --- a/ui/app/controllers/CControllerScriptEdit.php +++ b/ui/app/controllers/CControllerScriptEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerScriptList.php b/ui/app/controllers/CControllerScriptList.php index 2b68df773d9..c1bc759b98c 100644 --- a/ui/app/controllers/CControllerScriptList.php +++ b/ui/app/controllers/CControllerScriptList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerScriptUpdate.php b/ui/app/controllers/CControllerScriptUpdate.php index 83a1f23f3c8..96add398f86 100644 --- a/ui/app/controllers/CControllerScriptUpdate.php +++ b/ui/app/controllers/CControllerScriptUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerSearch.php b/ui/app/controllers/CControllerSearch.php index 3bd4a79f86c..c66d031fd18 100644 --- a/ui/app/controllers/CControllerSearch.php +++ b/ui/app/controllers/CControllerSearch.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerSystemWarning.php b/ui/app/controllers/CControllerSystemWarning.php index b9b5a6adeab..cec6cc23349 100644 --- a/ui/app/controllers/CControllerSystemWarning.php +++ b/ui/app/controllers/CControllerSystemWarning.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerTabFilterProfileUpdate.php b/ui/app/controllers/CControllerTabFilterProfileUpdate.php index 1c6a5e9a9a5..45806ef88a0 100644 --- a/ui/app/controllers/CControllerTabFilterProfileUpdate.php +++ b/ui/app/controllers/CControllerTabFilterProfileUpdate.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerTemplateDashboardDelete.php b/ui/app/controllers/CControllerTemplateDashboardDelete.php index bfad4d30ac3..b158a7db06e 100644 --- a/ui/app/controllers/CControllerTemplateDashboardDelete.php +++ b/ui/app/controllers/CControllerTemplateDashboardDelete.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerTemplateDashboardEdit.php b/ui/app/controllers/CControllerTemplateDashboardEdit.php index 72cf0523cff..791d614cd84 100644 --- a/ui/app/controllers/CControllerTemplateDashboardEdit.php +++ b/ui/app/controllers/CControllerTemplateDashboardEdit.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerTemplateDashboardList.php b/ui/app/controllers/CControllerTemplateDashboardList.php index beac5b8add5..eb91625b548 100644 --- a/ui/app/controllers/CControllerTemplateDashboardList.php +++ b/ui/app/controllers/CControllerTemplateDashboardList.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerTemplateDashboardUpdate.php b/ui/app/controllers/CControllerTemplateDashboardUpdate.php index 012b1b4e9b9..b0409411f89 100644 --- a/ui/app/controllers/CControllerTemplateDashboardUpdate.php +++ b/ui/app/controllers/CControllerTemplateDashboardUpdate.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerTimeSelectorUpdate.php b/ui/app/controllers/CControllerTimeSelectorUpdate.php index 32830fdfa11..f147fbc81d6 100644 --- a/ui/app/controllers/CControllerTimeSelectorUpdate.php +++ b/ui/app/controllers/CControllerTimeSelectorUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerTrigDisplayEdit.php b/ui/app/controllers/CControllerTrigDisplayEdit.php index 4260ac9cc12..5891987d72d 100644 --- a/ui/app/controllers/CControllerTrigDisplayEdit.php +++ b/ui/app/controllers/CControllerTrigDisplayEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerTrigDisplayUpdate.php b/ui/app/controllers/CControllerTrigDisplayUpdate.php index 638f8bbbcd0..f06d7e6f86c 100644 --- a/ui/app/controllers/CControllerTrigDisplayUpdate.php +++ b/ui/app/controllers/CControllerTrigDisplayUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserCreate.php b/ui/app/controllers/CControllerUserCreate.php index d52dafa13b4..6e7ee6d8614 100644 --- a/ui/app/controllers/CControllerUserCreate.php +++ b/ui/app/controllers/CControllerUserCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserDelete.php b/ui/app/controllers/CControllerUserDelete.php index 9f27020206d..3a626e69934 100644 --- a/ui/app/controllers/CControllerUserDelete.php +++ b/ui/app/controllers/CControllerUserDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserEdit.php b/ui/app/controllers/CControllerUserEdit.php index 6423959aef1..b6df84d44b5 100644 --- a/ui/app/controllers/CControllerUserEdit.php +++ b/ui/app/controllers/CControllerUserEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserEditGeneral.php b/ui/app/controllers/CControllerUserEditGeneral.php index 77d47bfcfc3..9ff185b640c 100644 --- a/ui/app/controllers/CControllerUserEditGeneral.php +++ b/ui/app/controllers/CControllerUserEditGeneral.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserList.php b/ui/app/controllers/CControllerUserList.php index a94fa123483..16243d9e87e 100644 --- a/ui/app/controllers/CControllerUserList.php +++ b/ui/app/controllers/CControllerUserList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserProfileEdit.php b/ui/app/controllers/CControllerUserProfileEdit.php index 1036cdcfa53..a6a214a9a24 100644 --- a/ui/app/controllers/CControllerUserProfileEdit.php +++ b/ui/app/controllers/CControllerUserProfileEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserProfileUpdate.php b/ui/app/controllers/CControllerUserProfileUpdate.php index 74ab38af511..6d751d072ff 100644 --- a/ui/app/controllers/CControllerUserProfileUpdate.php +++ b/ui/app/controllers/CControllerUserProfileUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserUnblock.php b/ui/app/controllers/CControllerUserUnblock.php index 0c875107680..7fbc0cfcb37 100644 --- a/ui/app/controllers/CControllerUserUnblock.php +++ b/ui/app/controllers/CControllerUserUnblock.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserUpdate.php b/ui/app/controllers/CControllerUserUpdate.php index 9d038613cd5..8b61cee3341 100644 --- a/ui/app/controllers/CControllerUserUpdate.php +++ b/ui/app/controllers/CControllerUserUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserUpdateGeneral.php b/ui/app/controllers/CControllerUserUpdateGeneral.php index 590264fa596..201a1f1a065 100644 --- a/ui/app/controllers/CControllerUserUpdateGeneral.php +++ b/ui/app/controllers/CControllerUserUpdateGeneral.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUsergroupCreate.php b/ui/app/controllers/CControllerUsergroupCreate.php index 987081e6b3b..ef2bac0d500 100644 --- a/ui/app/controllers/CControllerUsergroupCreate.php +++ b/ui/app/controllers/CControllerUsergroupCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUsergroupDelete.php b/ui/app/controllers/CControllerUsergroupDelete.php index 26fbe46d143..a530e34affc 100644 --- a/ui/app/controllers/CControllerUsergroupDelete.php +++ b/ui/app/controllers/CControllerUsergroupDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUsergroupEdit.php b/ui/app/controllers/CControllerUsergroupEdit.php index d137c2f1c9a..21656612e1d 100644 --- a/ui/app/controllers/CControllerUsergroupEdit.php +++ b/ui/app/controllers/CControllerUsergroupEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUsergroupGrouprightAdd.php b/ui/app/controllers/CControllerUsergroupGrouprightAdd.php index 1f4ac492188..ea673215f5c 100644 --- a/ui/app/controllers/CControllerUsergroupGrouprightAdd.php +++ b/ui/app/controllers/CControllerUsergroupGrouprightAdd.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUsergroupList.php b/ui/app/controllers/CControllerUsergroupList.php index 93f5455c51b..e952e1f65f4 100644 --- a/ui/app/controllers/CControllerUsergroupList.php +++ b/ui/app/controllers/CControllerUsergroupList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUsergroupMassUpdate.php b/ui/app/controllers/CControllerUsergroupMassUpdate.php index 492d675c4ee..fc8aff36658 100644 --- a/ui/app/controllers/CControllerUsergroupMassUpdate.php +++ b/ui/app/controllers/CControllerUsergroupMassUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUsergroupTagfilterAdd.php b/ui/app/controllers/CControllerUsergroupTagfilterAdd.php index b338d5138ea..bb1877798e2 100644 --- a/ui/app/controllers/CControllerUsergroupTagfilterAdd.php +++ b/ui/app/controllers/CControllerUsergroupTagfilterAdd.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUsergroupUpdate.php b/ui/app/controllers/CControllerUsergroupUpdate.php index 4bfe58fde90..98cf3b66ed3 100644 --- a/ui/app/controllers/CControllerUsergroupUpdate.php +++ b/ui/app/controllers/CControllerUsergroupUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserroleCreate.php b/ui/app/controllers/CControllerUserroleCreate.php index 7592dbab300..c7fbdeda9ea 100644 --- a/ui/app/controllers/CControllerUserroleCreate.php +++ b/ui/app/controllers/CControllerUserroleCreate.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserroleDelete.php b/ui/app/controllers/CControllerUserroleDelete.php index d0fb4884495..744a8dfde44 100644 --- a/ui/app/controllers/CControllerUserroleDelete.php +++ b/ui/app/controllers/CControllerUserroleDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserroleEdit.php b/ui/app/controllers/CControllerUserroleEdit.php index 2815a489d6e..869049e32d0 100644 --- a/ui/app/controllers/CControllerUserroleEdit.php +++ b/ui/app/controllers/CControllerUserroleEdit.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserroleEditGeneral.php b/ui/app/controllers/CControllerUserroleEditGeneral.php index fd34bff5aa7..1d41a51067d 100644 --- a/ui/app/controllers/CControllerUserroleEditGeneral.php +++ b/ui/app/controllers/CControllerUserroleEditGeneral.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserroleList.php b/ui/app/controllers/CControllerUserroleList.php index d4489494b8b..38d57418631 100644 --- a/ui/app/controllers/CControllerUserroleList.php +++ b/ui/app/controllers/CControllerUserroleList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerUserroleUpdate.php b/ui/app/controllers/CControllerUserroleUpdate.php index 16b5dc7d117..4cc4519f1b1 100644 --- a/ui/app/controllers/CControllerUserroleUpdate.php +++ b/ui/app/controllers/CControllerUserroleUpdate.php @@ -1,7 +1,7 @@ <?php declare(strict_types = 1); /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerValuemapCreate.php b/ui/app/controllers/CControllerValuemapCreate.php index 78f28826c82..bcce1f60c05 100644 --- a/ui/app/controllers/CControllerValuemapCreate.php +++ b/ui/app/controllers/CControllerValuemapCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerValuemapDelete.php b/ui/app/controllers/CControllerValuemapDelete.php index c77efed03d8..449241fe3fc 100644 --- a/ui/app/controllers/CControllerValuemapDelete.php +++ b/ui/app/controllers/CControllerValuemapDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerValuemapEdit.php b/ui/app/controllers/CControllerValuemapEdit.php index b88ef60d4db..4be33dbccfe 100644 --- a/ui/app/controllers/CControllerValuemapEdit.php +++ b/ui/app/controllers/CControllerValuemapEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerValuemapList.php b/ui/app/controllers/CControllerValuemapList.php index e399d434b02..e8b2270e4e2 100644 --- a/ui/app/controllers/CControllerValuemapList.php +++ b/ui/app/controllers/CControllerValuemapList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerValuemapUpdate.php b/ui/app/controllers/CControllerValuemapUpdate.php index 00edd0e722e..cd630141dce 100644 --- a/ui/app/controllers/CControllerValuemapUpdate.php +++ b/ui/app/controllers/CControllerValuemapUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWebView.php b/ui/app/controllers/CControllerWebView.php index 422775b2196..45359f5e274 100644 --- a/ui/app/controllers/CControllerWebView.php +++ b/ui/app/controllers/CControllerWebView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidget.php b/ui/app/controllers/CControllerWidget.php index 9f3ce9ed972..24400879773 100644 --- a/ui/app/controllers/CControllerWidget.php +++ b/ui/app/controllers/CControllerWidget.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetActionLogView.php b/ui/app/controllers/CControllerWidgetActionLogView.php index 962467d3a2f..c07beca3c75 100644 --- a/ui/app/controllers/CControllerWidgetActionLogView.php +++ b/ui/app/controllers/CControllerWidgetActionLogView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetClockView.php b/ui/app/controllers/CControllerWidgetClockView.php index c8b4ac68afa..87017aaef14 100644 --- a/ui/app/controllers/CControllerWidgetClockView.php +++ b/ui/app/controllers/CControllerWidgetClockView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetDataOverView.php b/ui/app/controllers/CControllerWidgetDataOverView.php index 33463e25e08..f494ec62aa8 100644 --- a/ui/app/controllers/CControllerWidgetDataOverView.php +++ b/ui/app/controllers/CControllerWidgetDataOverView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetDiscoveryView.php b/ui/app/controllers/CControllerWidgetDiscoveryView.php index 617f94ceeb7..cf312b3b7cc 100644 --- a/ui/app/controllers/CControllerWidgetDiscoveryView.php +++ b/ui/app/controllers/CControllerWidgetDiscoveryView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetFavGraphsView.php b/ui/app/controllers/CControllerWidgetFavGraphsView.php index a7074263a62..5918bfd3aa7 100644 --- a/ui/app/controllers/CControllerWidgetFavGraphsView.php +++ b/ui/app/controllers/CControllerWidgetFavGraphsView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetFavMapsView.php b/ui/app/controllers/CControllerWidgetFavMapsView.php index d4ab98d85ee..e513a3515a5 100644 --- a/ui/app/controllers/CControllerWidgetFavMapsView.php +++ b/ui/app/controllers/CControllerWidgetFavMapsView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetFavScreensView.php b/ui/app/controllers/CControllerWidgetFavScreensView.php index c9a3a84bee0..43c83bd8ba1 100644 --- a/ui/app/controllers/CControllerWidgetFavScreensView.php +++ b/ui/app/controllers/CControllerWidgetFavScreensView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetGraphView.php b/ui/app/controllers/CControllerWidgetGraphView.php index 291b0a9874a..06bc8205cb9 100644 --- a/ui/app/controllers/CControllerWidgetGraphView.php +++ b/ui/app/controllers/CControllerWidgetGraphView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetHostAvailView.php b/ui/app/controllers/CControllerWidgetHostAvailView.php index 5a5203e5a09..20eb83c765a 100644 --- a/ui/app/controllers/CControllerWidgetHostAvailView.php +++ b/ui/app/controllers/CControllerWidgetHostAvailView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -34,14 +34,7 @@ class CControllerWidgetHostAvailView extends CControllerWidget { protected function doAction() { $fields = $this->getForm()->getFieldsData(); - $type_fields = [ - INTERFACE_TYPE_AGENT => 'available', - INTERFACE_TYPE_SNMP => 'snmp_available', - INTERFACE_TYPE_JMX => 'jmx_available', - INTERFACE_TYPE_IPMI => 'ipmi_available' - ]; - - $interface_types = array_keys($type_fields); + $interface_types = [INTERFACE_TYPE_AGENT, INTERFACE_TYPE_SNMP, INTERFACE_TYPE_JMX, INTERFACE_TYPE_IPMI]; // Sanitize non-existing interface types. $fields['interface_type'] = array_values(array_intersect($interface_types, $fields['interface_type'])); @@ -52,28 +45,34 @@ class CControllerWidgetHostAvailView extends CControllerWidget { $hosts_total = array_fill_keys($interface_types, 0); $hosts_count = array_fill_keys($interface_types, [ - HOST_AVAILABLE_UNKNOWN => 0, - HOST_AVAILABLE_TRUE => 0, - HOST_AVAILABLE_FALSE => 0 + INTERFACE_AVAILABLE_UNKNOWN => 0, + INTERFACE_AVAILABLE_TRUE => 0, + INTERFACE_AVAILABLE_FALSE => 0 ]); $db_hosts = API::Host()->get([ - 'output' => ['available', 'snmp_available', 'jmx_available', 'ipmi_available'], - 'selectInterfaces' => ['interfaceid', 'type'], + 'output' => [], + 'selectInterfaces' => ['type', 'available'], 'groupids' => $groupids, 'filter' => ($fields['maintenance'] == HOST_MAINTENANCE_STATUS_OFF) ? ['status' => HOST_STATUS_MONITORED, 'maintenance_status' => HOST_MAINTENANCE_STATUS_OFF] : ['status' => HOST_STATUS_MONITORED] ]); + $availability_priority = [INTERFACE_AVAILABLE_FALSE, INTERFACE_AVAILABLE_UNKNOWN, INTERFACE_AVAILABLE_TRUE]; foreach ($db_hosts as $host) { - $interfaces = []; - foreach ($host['interfaces'] as $val) { - $interfaces[$val['type']] = true; + $host_interfaces = array_fill_keys($interface_types, []); + + foreach ($host['interfaces'] as $interface) { + $host_interfaces[$interface['type']][] = $interface['available']; } - foreach (array_keys($interfaces) as $type) { - $hosts_count[$type][$host[$type_fields[$type]]]++; + $host_interfaces = array_filter($host_interfaces); + + foreach ($host_interfaces as $type => $interfaces) { + $interfaces_availability = array_intersect($availability_priority, $interfaces); + $available = reset($interfaces_availability); + $hosts_count[$type][$available]++; $hosts_total[$type]++; } } diff --git a/ui/app/controllers/CControllerWidgetIterator.php b/ui/app/controllers/CControllerWidgetIterator.php index 70deb311a3e..bb9735534d0 100644 --- a/ui/app/controllers/CControllerWidgetIterator.php +++ b/ui/app/controllers/CControllerWidgetIterator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php b/ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php index ffddf43e7c7..8382c05a8a9 100644 --- a/ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php +++ b/ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetMapView.php b/ui/app/controllers/CControllerWidgetMapView.php index f0aca7cee5c..64e2edf1cce 100644 --- a/ui/app/controllers/CControllerWidgetMapView.php +++ b/ui/app/controllers/CControllerWidgetMapView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetNavTreeItemEdit.php b/ui/app/controllers/CControllerWidgetNavTreeItemEdit.php index 0e6e8d65fd5..940670f5a3b 100644 --- a/ui/app/controllers/CControllerWidgetNavTreeItemEdit.php +++ b/ui/app/controllers/CControllerWidgetNavTreeItemEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetNavTreeItemUpdate.php b/ui/app/controllers/CControllerWidgetNavTreeItemUpdate.php index c3e32961e4e..afead4d841b 100644 --- a/ui/app/controllers/CControllerWidgetNavTreeItemUpdate.php +++ b/ui/app/controllers/CControllerWidgetNavTreeItemUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetNavTreeView.php b/ui/app/controllers/CControllerWidgetNavTreeView.php index 72e08708cac..2fc8b38abe7 100644 --- a/ui/app/controllers/CControllerWidgetNavTreeView.php +++ b/ui/app/controllers/CControllerWidgetNavTreeView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetPlainTextView.php b/ui/app/controllers/CControllerWidgetPlainTextView.php index 8258304a9d1..1c5fc44de9b 100644 --- a/ui/app/controllers/CControllerWidgetPlainTextView.php +++ b/ui/app/controllers/CControllerWidgetPlainTextView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetProblemHostsView.php b/ui/app/controllers/CControllerWidgetProblemHostsView.php index 7bc28308a37..0d7c1c6ef66 100644 --- a/ui/app/controllers/CControllerWidgetProblemHostsView.php +++ b/ui/app/controllers/CControllerWidgetProblemHostsView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetProblemsBySvView.php b/ui/app/controllers/CControllerWidgetProblemsBySvView.php index b447d3cb257..73124cd5b24 100644 --- a/ui/app/controllers/CControllerWidgetProblemsBySvView.php +++ b/ui/app/controllers/CControllerWidgetProblemsBySvView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetProblemsView.php b/ui/app/controllers/CControllerWidgetProblemsView.php index a2454f0e33d..632baef0194 100644 --- a/ui/app/controllers/CControllerWidgetProblemsView.php +++ b/ui/app/controllers/CControllerWidgetProblemsView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetSvgGraphView.php b/ui/app/controllers/CControllerWidgetSvgGraphView.php index 1979039e41f..61e28d531f8 100644 --- a/ui/app/controllers/CControllerWidgetSvgGraphView.php +++ b/ui/app/controllers/CControllerWidgetSvgGraphView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetSystemInfoView.php b/ui/app/controllers/CControllerWidgetSystemInfoView.php index d559241cbe7..93a8dc74094 100644 --- a/ui/app/controllers/CControllerWidgetSystemInfoView.php +++ b/ui/app/controllers/CControllerWidgetSystemInfoView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetTrigOverView.php b/ui/app/controllers/CControllerWidgetTrigOverView.php index c6e5877dd4e..6139d04aef9 100644 --- a/ui/app/controllers/CControllerWidgetTrigOverView.php +++ b/ui/app/controllers/CControllerWidgetTrigOverView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetUrlView.php b/ui/app/controllers/CControllerWidgetUrlView.php index 39ea8f16f7f..8b076dc1575 100644 --- a/ui/app/controllers/CControllerWidgetUrlView.php +++ b/ui/app/controllers/CControllerWidgetUrlView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/ui/app/controllers/CControllerWidgetWebView.php b/ui/app/controllers/CControllerWidgetWebView.php index 1b68aa611ca..cdc2831aa2f 100644 --- a/ui/app/controllers/CControllerWidgetWebView.php +++ b/ui/app/controllers/CControllerWidgetWebView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by |