diff options
| author | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2018-01-12 15:13:59 +0300 |
|---|---|---|
| committer | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2018-01-12 15:13:59 +0300 |
| commit | 4745cb950c1cbe471ca34af8fcbc2a632a59634f (patch) | |
| tree | d63124cc8b0eebc7b950c1a7bd50e995ca7f4823 | |
| parent | bdb97fce93c077bb43ec419765b6ceef4a7c8415 (diff) | |
| parent | 830d8f0ac0bc39b50446d543a308ff32bdb38e44 (diff) | |
.......... [ZBX-11422] updated to the latest trunk
1523 files changed, 6239 insertions, 3373 deletions
diff --git a/.gitattributes b/.gitattributes index 92bedca6e9d..0dfb030fe60 100644 --- a/.gitattributes +++ b/.gitattributes @@ -351,14 +351,6 @@ src/zabbix_server/taskmanager/Makefile.am -text src/zabbix_server/taskmanager/proxy_tasks.c -text src/zabbix_server/taskmanager/taskmanager.c -text src/zabbix_server/taskmanager/taskmanager.h -text -tests/libs/zbxconf/parse_cfg_file.yaml -text -tests/libs/zbxdbhigh/DBselect_uint64.yaml -text -tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.yaml -text -tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.yaml -text -tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.yaml -text -tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.yaml -text -tests/libs/zbxsysinfo/parse_item_key.yaml -text -tests/libs/zbxsysinfo/process.yaml -text upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Hub.png -text svneol=unset#image/png upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Hub_small.png -text svneol=unset#image/png upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Network.png -text svneol=unset#image/png diff --git a/.gitignore b/.gitignore index 17c292cdd29..861a9069af5 100644 --- a/.gitignore +++ b/.gitignore @@ -383,15 +383,27 @@ tests/libs/zbxdbhigh/.deps tests/libs/zbxdbhigh/DBselect_uint64 tests/libs/zbxdbhigh/Makefile tests/libs/zbxdbhigh/Makefile.in +tests/libs/zbxjson/.deps +tests/libs/zbxjson/Makefile +tests/libs/zbxjson/Makefile.in +tests/libs/zbxjson/zbx_json_path_open +tests/libs/zbxjson/zbx_jsonpath_next tests/libs/zbxsysinfo/.deps tests/libs/zbxsysinfo/Makefile tests/libs/zbxsysinfo/Makefile.in +tests/libs/zbxsysinfo/common/.deps +tests/libs/zbxsysinfo/common/Makefile +tests/libs/zbxsysinfo/common/Makefile.in +tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME tests/libs/zbxsysinfo/linux/.deps tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC tests/libs/zbxsysinfo/linux/Makefile tests/libs/zbxsysinfo/linux/Makefile.in tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY +tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME +tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR +tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY tests/libs/zbxsysinfo/parse_item_key tests/libs/zbxsysinfo/process diff --git a/ChangeLog b/ChangeLog index 2d7dfed0ba8..731feebe3ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,20 +1,44 @@ +Changes for 4.0.0alpha3 + +New features: + +Bug fixes: +...G...... [ZBX-11422] fixed compilation warnings under OS X 64bit (MVekslers) + +-------------------------------------------------------------------------------- Changes for 4.0.0alpha2 New features: +..F....... [ZBXNEXT-4144] added asterisk mark and aria-label property to all forms required fields (gcalenko, Ivo) ..F.....S. [ZBXNEXT-768] added item unit blacklisting with character "!" in order to disable metric prefixes (Alexei) ..F....... [ZBXNEXT-4295] added selection of the create images tickbox by default on "Maps import" page (Sasha) ..F....... [ZBXNEXT-1456] added filter by item discovery status for item configuration view; thanks to Volker Fröhlich for the original patch (Alexei) ...G...... [ZBXNEXT-3991] added additional params to net.if.* key output for linux base agent (MVekslers) Bug fixes: +..F....... [ZBX-13276] fixed compatibility issue with Elasticsearch versions starting from 6.0 (vjaceslavs) +.......PS. [ZBX-13196] fixed setting of transaction error flag in commit operation (vjaceslavs) +..F....... [ZBX-13221] fixed trimming of values in overlay dialogues (Ivo) +..F....... [ZBX-13221] added "Timeout" validation in web scenario step overlay dialogue (Ivo) +..F....... [ZBX-12389] fixed latest data host group filter (Oleg) +..F....... [ZBX-13119] removed 'empty' button in trigger selection window for map constructor item modal form (gcalenko, Ivo) +........S. [ZBX-12661] fixed Low-level discovery of dependent items not working after being edited and resulting in undefined offset error or foreign key constraint violation (vso) +...G...... [ZBX-13254] fixed 'skip' parameter behaviour for log[], log.count[], logrt[], logrt.count[] items in case log files initially do not exist (Andris) +...G...... [ZBX-13253] fixed losing the 1st record by log[] and logrt[] items if 'skip' parameter is used and log file initially is empty (Andris) +........S. [ZBX-13275] fixed slow housekeeping of events on MySQL (vso) +...G...... [ZBX-13264] fixed Zabbix agent compilation on OS/X (vso) +.......PS. [ZBX-13245] fixed IP fragmentation handling in Zabbix server response to Zabbix proxy (vso) +..F....... [ZBX-13258] fixed misaligned user group permission controls (Ivo) +....I..... [ZBX-13031] fixed Java gateway compilation without libpcre (Sergejs) +.......PS. [ZBX-12963] fixed passing argument to external check item that contain literal $ (Sergejs) A......... [ZBX-12991] removed default values for "active_since" and "active_till" fields in maintenance.create API method (Ivo) -..F....... [ZBX-13270] fixed default selection of the required host permissions radio in the global gcripts form (sasha) +..F....... [ZBX-13270] fixed default selection of the required host permissions radio in the global gcripts form (Sasha) .......PS. [ZBX-12758] fixed slow housekeeping of events due to missing index on foreign key (vso) ..F....... [ZBX-11305] fixed color and label for event status on event details page (gcalenko) ..F.....S. [ZBX-13238] fixed spelling of Elasticsearch (abs, vjaceslavs) ..F....... [ZBX-13056] fixed incorrect positioning of context menu when it is opened using keyboard (gcalenko) ........S. [ZBX-13241] fixed memory leak on Zabbix server when executing remote commands through proxy (vso) -..F....... [ZBXNEXT-4139] fixed displaying of the eventlog severitites and severities in trigger map element (andzs) +..F....... [ZBXNEXT-4139] fixed displaying of the eventlog severitites and severities in trigger map element (Andzs) .......PS. [ZBX-13178] fixed ipc_path value in error message (MVekslers) -------------------------------------------------------------------------------- @@ -22,14 +46,14 @@ Changes for 4.0.0alpha1 New features: ........S. [ZBXNEXT-3480] added support of inventory macros in event tags (abs, vso) -A.F.I...S. [ZBXNEXT-4175] implemented ability to send email to several email addresses specified as user media (Sergejs, miks) -..F.I..... [ZBXNEXT-4139] added high contrast light and high contrast dark themes (andzs) +A.F.I...S. [ZBXNEXT-4175] implemented ability to send email to several email addresses specified as user media (miks, Sergejs) +..F.I..... [ZBXNEXT-4139] added high contrast light and high contrast dark themes (Andzs) A......... [ZBXNEXT-4247] removed deprecated API methods: user.updareProfile, user.addMedia, user.updateMedia, user.deleteMedia, usergroup.massAdd, usergroup.massUpdate and usermedia.get (Sasha) ........S. [ZBXNEXT-970] added more detailed error information to notification message when DB is unavailable (viktors) ..F....... [ZBXNEXT-4137] removed green background from cells (Oleg) ..F....... [ZBXNEXT-4157] added map status summary to be readable by screen reader software (gcalenko) ..F....... [ZBXNEXT-4127] implemented popup displaying in overlay dialogues (miks) -...GI..PS. [ZBXNEXT-1520] increased the maximum Hosts/DNS name character length from 63 to 255 (greg, Sergejs) +...GI..PS. [ZBXNEXT-1520] increased the maximum Hosts/DNS name character length from 63 to 255 (gcalenko, Sergejs) ..F.....S. [ZBXNEXT-4108] implemented search of problems by trigger name (abs, miks) ..F....... [ZBXNEXT-4143] implemented keybord interaction in top navigation (miks) ...G...... [ZBXNEXT-1567] added item "vfs.dir.count" for counting directory entries (valdis) @@ -57,16 +81,23 @@ Bug fixes: ...G...PS. [ZBX-12983] fixed compilation warnings under Windows (valdis) ........S. [ZBX-10578] fixed redundant init_result() calls; thanks to MATSUDA Daiki for the patch (abs) ....I..... [ZBX-12793] fixed system compiler checks during source configuration (abs) -...G...... [ZBX-11970] fixed style for some enumerators and structure type declarations (abs, andris) +...G...... [ZBX-11970] fixed style for some enumerators and structure type declarations (abs, Andris) -------------------------------------------------------------------------------- Changes for 3.4.6rc1 -New features: - Bug fixes: +..F....... [ZBX-13276] fixed compatibility issue with Elasticsearch versions starting from 6.0 (vjaceslavs) +..F....... [ZBX-12389] fixed latest data host group filter (Oleg) +..F....... [ZBX-13119] removed 'empty' button in trigger selection window for map constructor item modal form (gcalenko, Ivo) +........S. [ZBX-12661] fixed Low-level discovery of dependent items not working after being edited and resulting in undefined offset error or foreign key constraint violation (vso) +...G...... [ZBX-13254] fixed 'skip' parameter behaviour for log[], log.count[], logrt[], logrt.count[] items in case log files initially do not exist (Andris) +...G...... [ZBX-13253] fixed losing the 1st record by log[] and logrt[] items if 'skip' parameter is used and log file initially is empty (Andris) +........S. [ZBX-13275] fixed slow housekeeping of events on MySQL (vso) +.......PS. [ZBX-13245] fixed IP fragmentation handling in Zabbix server response to Zabbix proxy (vso) +....I..... [ZBX-13031] fixed Java gateway compilation without libpcre (Sergejs) A......... [ZBX-12991] removed default values for "active_since" and "active_till" fields in maintenance.create API method (Ivo) -..F....... [ZBX-13270] fixed default selection of the required host permissions radio in the global gcripts form (sasha) +..F....... [ZBX-13270] fixed default selection of the required host permissions radio in the global gcripts form (Sasha) .......PS. [ZBX-12758] fixed slow housekeeping of events due to missing index on foreign key (vso) ..F....... [ZBX-11305] fixed color and label for event status on event details page (gcalenko) ..F.....S. [ZBX-13238] fixed spelling of Elasticsearch (abs, vjaceslavs) @@ -165,7 +196,7 @@ Changes for 3.4.4rc1 New features: ..F....... [ZBXNEXT-1421] added service sorting by name if multiple services has same 'sortorder' value (miks) -...G...... [ZBXNEXT-3493] added Windows service configuration check to determine if service can be trigger started (andris, viktors) +...G...... [ZBXNEXT-3493] added Windows service configuration check to determine if service can be trigger started (Andris, viktors) ..F....... [ZBXNEXT-4019] implemented default widget refresh interval (Ivo) ..F....... [ZBXNEXT-4081] improved error message for case when none of supported database modules exists (gcalenko) @@ -257,8 +288,8 @@ Changes for 3.4.2rc1 New features: A.F....... [ZBXNEXT-4091] improved permission schema of the dashboards for normal administrators (Sasha) -.........T [ZBXNEXT-4099] removed starting point from all OIDs; shortened old IOS Cisco templates names (vso, vitaly) -.........T [ZBXNEXT-4067] added preprocessing_queue item/graph/screen widget in Template App Zabbix Server (vso, vitaly) +.........T [ZBXNEXT-4099] removed starting point from all OIDs; shortened old IOS Cisco templates names (vitaly, vso) +.........T [ZBXNEXT-4067] added preprocessing_queue item/graph/screen widget in Template App Zabbix Server (vitaly, vso) A.F....... [ZBXNEXT-4084] renamed action acknowledgment operation 'Notify all who left acknowledgement and comments' to 'Notify all involved' (gcalenko) ........S. [ZBXNEXT-4084] added users who received notifications regarding the problem to 'Notify all involved' acknowledgment operation recipient list (wiper) A.F....... [ZBX-1357] enabled Turkish translation to be displayed by default (zalex_ua) @@ -271,7 +302,7 @@ Bug fixes: ...G...PS. [ZBX-12718] fixed crash when using item of log value type as master item for dependent items (wiper) .......P.. [ZBX-12720] fixed processing of log keys with non log value types for items monitored by proxies (wiper) ..F....... [ZBX-12530] fixed non well formed numeric value encaunteration in slideshow; implemented getBBox workaround for Firefox (miks) -.........T [ZBX-12688] fixed false positives on 'High bandwidth usage' trigger in Template_Module_Interfaces_* templates (vso, vitaly) +.........T [ZBX-12688] fixed false positives on 'High bandwidth usage' trigger in Template_Module_Interfaces_* templates (vitaly, vso) .......PS. [ZBX-11675] fixed crash that could occur during connection failures to MySQL (Sergejs, vso) ..F....... [ZBX-12617] fixed sorting by host name for items on availability report page (gcalenko) A......... [ZBX-12699] added support of strings in "sortfield" and "sortorder" parameters, and added sorting by "name" for dashboard.get() (Sasha) @@ -345,9 +376,9 @@ Bug fixes: ........S. [ZBX-12581] fixed crash when syncing actions without operations (wiper) ..F....... [ZBX-12531] removed usage of SVG viewBox attribute in IE and disabled map scaling in screens (miks) ..F....... [ZBXNEXT-3987] fixed wrong response and error message when invalid or unavailable dashboardid has been requested (miks) -..F....... [ZBX-12593] fixed overlay window displaying on different browsers and removed horizontal scrollbar from widget configuration dialogue (Andžs, Ivo) +..F....... [ZBX-12593] fixed overlay window displaying on different browsers and removed horizontal scrollbar from widget configuration dialogue (Andzs, Ivo) A.F....... [ZBX-12430] fixed error when linking one template to another in template edit form (gcalenko) -.........T [ZBXNEXT-3920] fixed extra new lines in Templates (vso, vitaly) +.........T [ZBXNEXT-3920] fixed extra new lines in Templates (vitaly, vso) ..F....... [ZBX-12588] fixed clock and map widget scaling on Safari (Ivo) .......PS. [ZBX-12574] fixed crash when linking templates with web scenarios during auto registration (vso) ..F....... [ZBX-12433] fixed XML import of web scenarios (vjaceslavs) @@ -375,7 +406,7 @@ Changes for 3.4.0rc1 New features: A......... [ZBXNEXT-2102] improved performance of event.get() and problem.get() methods with "selectTags" option (Sasha) -....I....T [ZBXNEXT-3920] added Templates for some of the most common applications and devices (vso, vitaly) +....I....T [ZBXNEXT-3920] added Templates for some of the most common applications and devices (vitaly, vso) ..F....... [ZBXNEXT-2102] implemented dashboard widget linking in both directions (miks) ..F....... [ZBXNEXT-2102] implemented option 'Show unavailable maps' in navigation tree widget (miks) @@ -453,7 +484,7 @@ A.F....... [ZBX-12384] fixed JMX endpoint related bugs in item mass update form Changes for 3.4.0alpha1 New features: -A.F.I..... [ZBXNEXT-2102] added support of multiple dashboards; implemented API for dashboards (pavels, maximt, miks, Sasha, vmurzins) +A.F.I..... [ZBXNEXT-2102] added support of multiple dashboards; implemented API for dashboards (maximt, miks, pavels, Sasha, vmurzins) ..F..J.... [ZBXNEXT-1223] implemented jmx discovery item (vjaceslavs) A.F.....S. [ZBXNEXT-2442] implemented parallel alert processing, removed database watchdog process, moved its tasks to alerter process (gcalenko, wiper) A.F.....S. [ZBXNEXT-3863] added jsonpath based item pre-processing option (Ivo, wiper) @@ -767,7 +798,7 @@ A......... [ZBX-11893] fixed permission issue, when importing hosts that are mon .......PS. [ZBX-11864] fixed formatting of URLs if an IPv6 is used in simple HTTPS checks (abs) ........S. [ZBX-11738] fixed performing actions for problems that have started and resolved while another problem escalation is executed (viktors) ..F....... [ZBX-6851] fixed zero number display in Event ID column in windows eventlog history (vmurzins) -........S. [ZBX-11829] fixed generation of problems in multiple event mode (Sergejs, abs) +........S. [ZBX-11829] fixed generation of problems in multiple event mode (abs, Sergejs) ..F....... [ZBX-11624] fixed undefined index error for regular expressions form (vmurzins) .......PS. [ZBX-11855] fixed data truncation when escaping strings that contain carriage return (vso) ........S. [ZBX-11444] fixed incorrect check for time functions in recovery expressions (abs) @@ -1079,7 +1110,7 @@ A.F....... [ZBX-11060] fixed copying correlation_mode, correlation_tag, tags of Changes for 3.2.0alpha1 New features: -........S. [ZBXNEXT-3195] implemented independent escalations for each problem event (wiper, Sandis) +........S. [ZBXNEXT-3195] implemented independent escalations for each problem event (Sandis, wiper) A.F.I...S. [ZBXNEXT-3277] added global event correlation (Ivo, wiper) A.F.I...S. [ZBXNEXT-3274] added event correlation on trigger level (Oleg, wiper) A.F.I...S. [ZBXNEXT-3201] added high-performance view of current problems, implemented problem.get() method (Sasha) @@ -1092,11 +1123,11 @@ A.F....... [ZBXNEXT-821] added possibility to view, copy, mass update and delete A.F.....S. [ZBXNEXT-3196] added action option to pause escalations during maintenance (Gunars, wiper) A.F....... [ZBXNEXT-178] implemented web scenarios import/export (Sasha) A.F.....S. [ZBXNEXT-2087] added trigger and event tags (Gunars, wiper) -A.F.....S. [ZBXNEXT-1638] added macro functions to allow substring extraction from item value macros in triggers and notifications (wiper, Sasha) +A.F.....S. [ZBXNEXT-1638] added macro functions to allow substring extraction from item value macros in triggers and notifications (Sasha, wiper) A.F.....S. [ZBXNEXT-2118] added support of trigger option "OK event generation" and recovery expression (Ivo, Oleg, Sasha, wiper) A.......S. [ZBXNEXT-1250] added two new options "regexp" and "iregexp" to the third parameter <operator> of trigger function count(); thanks to Michael Kolomiets for patch (asaveljevs, gleb, Ivo) A.F....... [ZBX-1357] updated Chinese (China), Chinese (Taiwan), Czech, English (United States), French, Georgian, Greek, Italian, Japanese, Korean, Polish, Romanian, Russian, Slovak, Turkish, Ukrainian, Vietnamese translations; thanks to Zabbix translators (zalex_ua) -A.F.....S. [ZBXNEXT-3135] removed id field from history text and log tables (wiper, Sasha) +A.F.....S. [ZBXNEXT-3135] removed id field from history text and log tables (Sasha, wiper) Bug fixes: ...G...... [ZBX-10768] fixed compilation warning on FreeBSD (viktors) @@ -1114,6 +1145,8 @@ Changes for 3.0.15rc1 New features: Bug fixes: +...G...... [ZBX-13254] fixed 'skip' parameter behaviour for log[], log.count[], logrt[], logrt.count[] items in case log files initially do not exist (Andris) +...G...... [ZBX-13253] fixed losing the 1st record by log[] and logrt[] items if 'skip' parameter is used and log file initially is empty (Andris) A......... [ZBX-12991] removed default values for "active_since" and "active_till" fields in maintenance.create API method (Ivo) ..F....... [ZBX-11305] fixed color and label for event status on event details page (gcalenko) ..F....... [ZBX-13085] fixed trigger mass update form redirect to trigger list on attempt to attach dependent trigger if there was errors in previous submit attempts (gcalenko) @@ -1992,7 +2025,7 @@ A......... [ZBX-9975] fixed undefined index when updating trigger prototype (Gun ........S. [ZBX-9959] fixed JSON validation: produce an error on invalid escape sequences in a string value (dimir) A.F....... [ZBX-7202] fixed action disabling when deleting user or user group (Gunars) ..F....... [ZBX-9970] removed service label from configuration popup menu (Gunars) -..F....... [ZBX-9945] fixed updating of "Device uniqueness criterias" while editing discovery checks (Sasha, Cemeris) +..F....... [ZBX-9945] fixed updating of "Device uniqueness criterias" while editing discovery checks (Cemeris, Sasha) ...G...... [ZBX-9967] fixed agent compilation error on NetBSD 7 (dimir) .D........ [ZBX-9347] added information about zabbix_sender input file format to the man page (dimir, Richlv) @@ -2001,7 +2034,7 @@ Changes for 3.0.0alpha3 New features: A.FGI..PS. [ZBXNEXT-1263] added encryption support for communications between Zabbix components (Alexei, Andris, asaveljevs, dimir, gleb, Ivo, Oleg, wiper) -..F....... [ZBXNEXT-2662] implemented on-click navigation for sub menus (Alex) +..F....... [ZBXNEXT-2662] implemented on-click navigation for sub menus (Alexei) ........S. [ZBXNEXT-2844] added multiple escalator support (wiper) .......PS. [ZBXNEXT-2988] reduced the number of poller configuration cache locks by 1/3 (wiper) A.F.I...S. [ZBXNEXT-2163] implemented argument support for script media type (Ivo, wiper) @@ -2023,9 +2056,9 @@ Bug fixes: ........S. [ZBX-7006] implemented trend cache cleanup procedure which forces hourly flush of deleted, disabled or rarely updated item trends (dimir, gleb) ........S. [ZBX-9889] fixed vmware.eventlog item values to have unique timestamps in history table (dimir) ..F....... [ZBX-9919] fixed y scale calculation for linear graphs (Cemeris) -..F....... [ZBX-9898] improved database exception messages (Sasha, Cemeris) +..F....... [ZBX-9898] improved database exception messages (Cemeris, Sasha) ..F....... [ZBX-9900] marked first parameter for proc_info item as mandatory (Cemeris) -..F....... [ZBX-9902] fixed undefined variables "mediatype" and "users" in mediatype properties (Sasha, Cemeris) +..F....... [ZBX-9902] fixed undefined variables "mediatype" and "users" in mediatype properties (Cemeris, Sasha) ...G...PS. [ZBX-9864] fixed compilation warnings regarding SIZE_T_MAX under NetBSD (Sasha) ..F....... [ZBX-9862] added meta tag "msapplication-config" to prevent MSIE11 requesting browserconfig.xml (Gunars) A......... [ZBX-9340] fixed "data" property not being returned by API when error is generated on DB level (Gunars) @@ -2037,7 +2070,7 @@ A......... [ZBX-9866] fixed error field being needlessly copied for LLD rule whe ...G...... [ZBX-8899] fixed retrieval of sensor readings on Linux 2.6 and higher (gleb, wiper) ...G...... [ZBX-9917] fixed log message when opening windows eventlog (wiper) .......PS. [ZBX-9855] fixed SNMP dynamic index cache refresh when SNMP OID changes (dimir) -..F....... [ZBX-8820] fixed trimming of new acknowledge messages (Sasha, Cemeris) +..F....... [ZBX-8820] fixed trimming of new acknowledge messages (Cemeris, Sasha) ...G...... [ZBX-9740] improved proc.num for protected Windows processes (gleb) .......PS. [ZBX-9793] fixed handling of opaque types in SNMP (asaveljevs) ...G...... [ZBX-9847] fixed possible Zabbix agent crash when executing system.cpu.discovery (dimir) @@ -2332,7 +2365,7 @@ A.F....... [ZBX-1357] updated Brazilian Portuguese, Chinese (Taiwan), Czech, Dut Bug fixes: ..F....... [ZBX-9375] fixed "Group" and "Host" dropdowns not setting values in "Events" page when navigating from trigger menu pop-up link and fixed availability reports filter dropdowns mistakenly using "Dropdown first entry" config (Ivo) ........S. [ZBX-9703] fixed a memory leak in SSH checks when configured public and/or private key is not a regular file (Sandis) -...G...... [ZBX-9605] fixed an issue with start lines and end lines in vfs.file.regexp[] and vfs.file.regmatch[] (Gleb) +...G...... [ZBX-9605] fixed an issue with start lines and end lines in vfs.file.regexp[] and vfs.file.regmatch[] (gleb) ..F....... [ZBX-9332] fixed correct display of green circle in maps and showing more unacknowledged problems than total number of problems (Ivo) ..F....... [ZBX-9381] removed 'groupid' parameter from global search URLs sometimes causing inaccessible forms due to insufficient permissions (Ivo) ........S. [ZBX-9623] fixed possible SQL error when network discovery rule and LLD rule are processed at the same time (dimir) @@ -2403,7 +2436,7 @@ New features: .......PS. [ZBXNEXT-2354] separated VMware performance collector based statistic retrieval from VMware data retrieval and added items to monitor custom performance counters (wiper) A.F....... [ZBX-1357] enabled Chinese (China) locale to be displayed by default (Richlv) A.F....... [ZBX-1357] updated Brazilian Portuguese, Chinese (China), Japanese, Korean, Polish, Russian and Slovak translations; thanks to Zabbix translators (Richlv) -A.F....PS. [ZBXNEXT-2160] added support for extended IP ranges in network discovery and action conditions (Ivo, Sasha, Wiper) +A.F....PS. [ZBXNEXT-2160] added support for extended IP ranges in network discovery and action conditions (Ivo, Sasha, wiper) Bug fixes: ...G...PS. [ZBX-9284] added Zabbix log file locking to avoid incomplete logging on log file rotation (igors) @@ -2415,7 +2448,7 @@ Bug fixes: ..F....... [ZBX-9257] changed displaying host list from vertical to horizontal if trigger belongs to multiple hosts in Monitoring->Trigger status page (Ivo) ........S. [ZBX-9285] fixed memory leak when processing host prototypes (Sasha) .......PS. [ZBX-9279] optimized VMware requests to reduce amount of transferred data (wiper) -..F....... [ZBX-9087] fixed DB_ID validation expression to properly validate upper bound of received value and fixed various front-end forms not properly validating IDs (Krists, Ivo) +..F....... [ZBX-9087] fixed DB_ID validation expression to properly validate upper bound of received value and fixed various front-end forms not properly validating IDs (Ivo, Krists) .......PS. [ZBX-7719] added configurable timeout for VMware data gathering requests (wiper) ...G...... [ZBX-9241] fixed possible vfs.fs.discovery item crash on AIX systems (wiper) .......PS. [ZBX-9104] fixed repeated error messaging if SSH channel failed to close (igors) @@ -2746,7 +2779,7 @@ A.F.I..... [ZBX-8406] fixed typos "overriden" to "overridden", "occurence" to "o A.F....... [ZBX-8397] removed outdated queue related code from frontend and API (Krists) ........S. [ZBX-8359] changed servers timer processes title line to display amount of hosts that have changed maintenance status; active maintenance period count is no longer displayed (Juris) ..F....... [ZBX-8375] fixed multiple issues in various forms: removed duplicate hidden fields, added missing field translations, added JS confirmation message encoding and fixed displaying submitted values on failure (Ivo) -..F....... [ZBX-8240] fixed multiselect input placeholder behaviour on IE8, input cursor issue and removed "clear field" button for multiselect in IE10+ (Oleg, Krists) +..F....... [ZBX-8240] fixed multiselect input placeholder behaviour on IE8, input cursor issue and removed "clear field" button for multiselect in IE10+ (Krists, Oleg) ..F....... [ZBXNEXT-1782] fixed testing of trigger expressions that contain nested parentheses (Pavels) ...G...... [ZBX-8270] fixed disk space reporting for large AIX file systems (>= 16 TB) (Andris) .......PS. [ZBX-8422] removed PHP mutex locking from server code because of not being used and incompatible licensing issues (wiper) @@ -2890,7 +2923,7 @@ Bug fixes: ..F....... [ZBX-8212] it is not possible to add triggers from templates to maps anymore (Andrejs) A......... [ZBX-8227] fixed the "applicationids" parameter in trigger.get overriding the "groupids" parameter (Pavels) A......... [ZBX-8169] fixed SLA period calculation to account for DST changes (Krists) -...G...PS. [ZBX-8172] fixed numeric value extraction from json data to ensure compatibility with third party tools that sends data as numeric values instead of strings (wiper). +...G...PS. [ZBX-8172] fixed numeric value extraction from json data to ensure compatibility with third party tools that sends data as numeric values instead of strings (wiper) .......P.. [ZBX-8048] fixed bug where proxy would truncate execute scripts of telnet, SSH and database monitoring items to 2kB (Juris) A......... [ZBX-8193] changed web scenario default timeout to 15 (Nikolaj) ........S. [ZBX-6190] added a more informative message to return when an item does not have enough information to perform nodata() calculations (Juris) @@ -3329,7 +3362,7 @@ A.F....... [ZBX-1357] updated Brazilian Portuguese, Czech, French, Japanese, Pol .....J.... [ZBX-8839] added timeout configuration option to Java gateway (asaveljevs) Bug fixes: -...G...... [ZBX-9605] fixed an issue with start lines and end lines in vfs.file.regexp[] and vfs.file.regmatch[] (Gleb) +...G...... [ZBX-9605] fixed an issue with start lines and end lines in vfs.file.regexp[] and vfs.file.regmatch[] (gleb) ..F....... [ZBX-9332] fixed correct display of green circle in maps and showing more unacknowledged problems than total number of problems (Ivo) ..F....... [ZBX-8895] improved trigger count calculation and removed unnecessary query, thanks to Alexey Pustovalov (Krists) ..F....... [ZBX-9381] removed 'groupid' parameter from global search URLs sometimes causing inaccessible forms due to insufficient permissions (Ivo) @@ -3381,7 +3414,7 @@ Bug fixes: ...G...... [ZBX-9232] fixed processing of eventlog messages to avoid incomplete messaging for events which description could not be found (igors) ........S. [ZBX-9285] fixed memory leak when processing host prototypes (Sasha) .......PS. [ZBX-9279] optimized VMware requests to reduce amount of transferred data (wiper) -..F....... [ZBX-9087] fixed DB_ID validation expression to properly validate upper bound of received value and fixed various front-end forms not properly validating IDs (Krists, Ivo) +..F....... [ZBX-9087] fixed DB_ID validation expression to properly validate upper bound of received value and fixed various front-end forms not properly validating IDs (Ivo, Krists) .......PS. [ZBX-7719] added configurable timeout for VMware data gathering requests (wiper) ...G...... [ZBX-9241] fixed possible vfs.fs.discovery item crash on AIX systems (wiper) .......PS. [ZBX-9104] fixed repeated error messaging if SSH channel failed to close (igors) @@ -3522,7 +3555,7 @@ A.......S. [ZBX-8473] improved performance of deleting triggers by API and serve A.F....... [ZBX-1357] updated Brazilian Portuguese, Japanese, Polish, Slovak and Spanish translations; thanks to Zabbix translators (Richlv) Bug fixes: -........S. [ZBX-7721] added support for discovering more than 100 hypervisors on large vcenter installations to vmware collector (wiper, dimir) +........S. [ZBX-7721] added support for discovering more than 100 hypervisors on large vcenter installations to vmware collector (dimir, wiper) ...G...PS. [ZBX-8629] fixed crash in get_string() function when checking "Database monitor" items (asaveljevs) ....IJ.... [ZBX-4800] replaced JSON.org library with Android JSON library; thanks to Volker Fröhlich for legal research (asaveljevs) .........T [ZBX-4800] fixed typo in item name in "Template JMX Generic": "mpTenured" -> "mp Tenured" (asaveljevs) @@ -3740,7 +3773,7 @@ A.F....... [ZBX-7832] fixed screen item row- and colspans not being adjusted whe ........S. [ZBX-7897] fixed memory leak in trapper for log file items (Juris) ..F.....S. [ZBX-7872] removed discovery item prototype from calculation of required performace (NVPS) (igors) ........S. [ZBX-5778] removed counting items in queue if host is in maintenance with no data collection (igors) -..F.....I. [ZBX-7849] fixed not being able to save actions with a "Maintenance status" condition after upgrading from 2.0 (Pavels) +..F....... [ZBX-7849] fixed not being able to save actions with a "Maintenance status" condition after upgrading from 2.0 (Pavels) A......... [ZBX-6151] fixed graph prototype and trigger prototype validation so item prototypes are no longer allowed from multiple discovery rules and fixed graph and graph prototype update validation allowing to pass only 'gitemid' parameter without 'itemid' (Ivo) ........S. [ZBX-7737] fixed host inventory item update order to prevent database deadlocks (Juris) ........S. [ZBX-5804] added overflow/wrapping detection to calculated items (Juris) @@ -3809,7 +3842,7 @@ Changes for 2.2.2rc1 New features: .......PS. [ZBX-7649] synchronize ICMP checks based on item interface. This should reduce the number of fping invocations in most cases (wiper) -..F.....S. [ZBXNEXT-2069] added HOST.PORT macro support to internal/trigger based notifications and also to trigger names/descriptions (wiper, Oleg) +..F.....S. [ZBXNEXT-2069] added HOST.PORT macro support to internal/trigger based notifications and also to trigger names/descriptions (Oleg, wiper) A.F....... [ZBX-1357] updated American English, Czech, French, Greek, Hungarian, Italian, Japanese, Russian, Slovak, Turkish and Ukrainian translations; thanks to Zabbix translators (Richlv) Bug fixes: @@ -4021,7 +4054,7 @@ New features: Bug fixes: ...G...PS. [ZBX-7125] fixed improper reading of configuration files in case there were problems with included files; we now exit with failure (asaveljevs) ..F....... [ZBX-7257] improved config file validation (Eduard) -..F....... [ZBX-7249] changed setup pre-requisites values "yes" to "on" and "no" to "off", fixed numeric value validation and port text alignment (Pavels, Ivo) +..F....... [ZBX-7249] changed setup pre-requisites values "yes" to "on" and "no" to "off", fixed numeric value validation and port text alignment (Ivo, Pavels) ..F....... [ZBX-7267] implement menu popup in trigger top 100 page for hosts and triggers columns (Eduard) ..F....... [ZBX-7260] fixed "Wrong RPC call to JS RPC" error when acknowledging trigger and changing group or host in screen element (Ivo) ..F....... [ZBX-6129] fixed changing the status of triggers and trigger prototype working incorrectly if they no longer exist (Pavels) @@ -4066,7 +4099,7 @@ Changes for 2.1.8 New features: .....J.... [ZBX-6404] added support for values of type java.lang.Double when toString() returns them in scientific format (asaveljevs) .......PS. [ZBXNEXT-78] added support for scientific notation for received values and item multipliers for items of type "Numeric (float)" (asaveljevs) -...G...PS. [ZBXNEXT-1855] dynamic display of process current activity and statistics in "ps" and "top" (igors, Andris, wiper) +...G...PS. [ZBXNEXT-1855] dynamic display of process current activity and statistics in "ps" and "top" (Andris, igors, wiper) ..F.....S. [ZBXNEXT-1806] changed the way nth day and nth week are calculated in maintenances (asaveljevs, Pavels) ..F....... [ZBX-7097] changed dashboard drag'n'drop widget placeholder color in the dark orange and dark blue themes (Pavels) A.F....... [ZBX-1357] updated Dutch, Finnish, Indonesian, Italian, Lithuanian, Persian, Portuguese (Portugal), Russian and Slovak translations; thanks to Zabbix translators (Richlv) @@ -4227,7 +4260,7 @@ Bug fixes: ..F....... [ZBX-6903] fixed template name trim (Eduard, Sasha) A.F....... [ZBX-6899] specified source parameter in SQL from events table (Vitalij) ..F....... [ZBX-6893] fixed prototype name error ($1 -> {#FSNAME}) on adding new prototype in the graph prototype form in the item prototype selection template (Vitalij) -..F....... [ZBX-6816] improved permission validation on multiple pages (Ivo, Guntis) +..F....... [ZBX-6816] improved permission validation on multiple pages (Guntis, Ivo) ...G...... [ZBXNEXT-1056] improved active check error messages to proclaim active checks working again before complaining about a missing host (wiper) .......P.. [ZBX-6249] fixed data loss in proxy "Data sender" process caused by unfinished transactions; thanks to MATSUDA Daiki for patch (Andris) ..F....... [ZBX-6838] fixed not being able to select all host groups in the filter (Pavels) @@ -4247,7 +4280,7 @@ New features: ...G...... [ZBXNEXT-1528] added net.if.in, net.if.out and net.if.total item support on HP-UX platform (igors) Bug fixes: -..F....... [ZBX-6888] fixed javascript error in popups with "select all" checkbox +..F....... [ZBX-6888] fixed javascript error in popups with "select all" checkbox (Vitalij) .......P.. [ZBX-6897] fixed synchronization of the "httptest" configuration table (Sasha) ........S. [ZBX-6898] fixed processing of queue request; items that are not checked will be included in the queue (Sasha) ........S. [ZBX-6889] fixed processing of availability data by the server (Sasha) @@ -4341,13 +4374,13 @@ A.F.....S. [ZBXNEXT-1] added support of {host:key.last/min/avg/max()} macros in ..F....... [ZBXNEXT-1712] improved create button for applications, items, triggers and web scenarios (Eduard) ..F....... [ZBXNEXT-1712] removed useless host name field in applications, items and web scenarios (Eduard) ........S. [ZBXNEXT-384] added support of new notification macros {ACTION.*} and {EVENT.RECOVERY.*}; {EVENT.*} macros now return information of the event which triggered an action (Sasha) -...G...PS. [ZBXNEXT-1105] added logging of used configuration file name for agentd, server and proxy daemons (Aleksej) +...G...PS. [ZBXNEXT-1105] added logging of used configuration file name for agentd, server and proxy daemons (aleksej) A.F.....S. [ZBXNEXT-1575] implemented internal event and notification support (Pavels, Sasha) ..F....... [ZBXNEXT-1575] the error icon in the item, LLD rule and trigger lists will no longer be displayed for disabled objects (Pavels) A.F.....S. [ZBXNEXT-1575] new triggers will now be created in OK state (Pavels, Sasha) ..F....... [ZBXNEXT-1575] the status indicator in the trigger list will also display the "Unknown" status (Pavels) ........S. [ZBXNEXT-1575] implemented new notification macros: {ITEM.STATE<1-9>}, {LLDRULE.ID}, {LLDRULE.NAME}, {LLDRULE.DESCRIPTION}, {LLDRULE.KEY}, {LLDRULE.STATE} and {TRIGGER.STATE} (Sasha) -...G...... [ZBXNEXT-579] added support of net.if.discovery for FreeBSD, NetBSD and OpenBSD (Aleksej) +...G...... [ZBXNEXT-579] added support of net.if.discovery for FreeBSD, NetBSD and OpenBSD (aleksej) ..F....PS. [ZBXNEXT-300] added support of IPMI discrete sensors (Andris, Sasha, Toms) ..F....... [ZBXNEXT-1659] added support of anti-aliased normal and bold lines for graphs and map connectors (Alexei) ..F....... [ZBXNEXT-1399] implemented multiselect in dashboard configuration (Eduard) @@ -4457,8 +4490,8 @@ A......... [ZBX-6530] formatted some exception messages in CImage.php which wher ...G...... [ZBX-4590] added support for multibyte path to logrt items on Windows (dimir) ..F....... [ZBX-6460] fixed HTML entity encoding in condition names in action configuration page (Eduard) .......PS. [ZBX-6435] fixed compiler warnings (Andris) -..F.....S. [ZBX-6305] fixed display name support in email sender (wiper, Andris) -..F....... [ZBX-6480] fixed default timeout being shown instead of the stored one in web scenario step properties(Toms) +..F.....S. [ZBX-6305] fixed display name support in email sender (Andris, wiper) +..F....... [ZBX-6480] fixed default timeout being shown instead of the stored one in web scenario step properties (Toms) ....I..... [ZBX-5532] updated 1.8 time format to 2.0 for "services_times" table (Sasha) ..F....... [ZBX-1511] fixed division by zero in graphs (Oleg) ..F....... [ZBX-1950] fixed no values in graphs (Oleg) @@ -4723,7 +4756,7 @@ A......... [ZBX-5656] fixed maintenance.create and maintenance.update methods "t ..F....... [ZBX-9281] fixed undefined offset in template screens when resource is URL (Ivo) ..F....... [ZBX-4633] fixed host inventories not displaying all filtered results when record count exceeds global limit (Ivo) ...G...PS. [ZBX-9284] added Zabbix log file locking to avoid incomplete logging on log file rotation (igors) -..F....... [ZBX-9087] fixed DB_ID validation expression to properly validate upper bound of received value and fixed various front-end forms not properly validating IDs (Krists, Ivo) +..F....... [ZBX-9087] fixed DB_ID validation expression to properly validate upper bound of received value and fixed various front-end forms not properly validating IDs (Ivo, Krists) ...G...... [ZBX-9241] fixed possible vfs.fs.discovery item crash on AIX systems (wiper) .......PS. [ZBX-9104] fixed repeated error messaging if SSH channel failed to close (igors) ........S. [ZBX-8993] added check for a valid reference of a global regular expression in LLD rules (igors) @@ -5237,7 +5270,7 @@ A.F....... [ZBX-4247] fixed processing of trigger expression if item key contain ..F....... [ZBX-5759] fixed Oracle ORA-01002 SQL error on items bulk actions (Toms) ..F....... [ZBX-5639] fixed global options "dropdown first entry" and "remember selected" in availability reports (Oleg) ..F....... [ZBX-5639] improved sdii() debugging function (Toms) -A.F.....S. [ZBX-5816] fixed undefined index in Monitoring > Events, when favorite trigger has been deleted (Toms, Sasha) +A.F.....S. [ZBX-5816] fixed undefined index in Monitoring > Events, when favorite trigger has been deleted (Sasha, Toms) ..F....... [ZBX-5771] fixed acknowledge tick mark lost on "overview" page (Oleg) ..F....... [ZBX-5821] fixed 2.0 xml format template import (Oleg) ........S. [ZBX-5791] fixed possible SQL errors when linking groups to a host (Sasha) @@ -5784,7 +5817,7 @@ A.F....... [ZBX-4890] fixed creating hosts by administrators (Pavels) ..F....... [ZBX-4862] fixed Error when trying to remove additional templates in the host mass update form (Toms) ....I..... [ZBX-3929] removed deprecated Switch module from gen_schema.pl and get_data.pl scripts (Sasha) ..F....... [ZBX-4738] fixed several checkboxes state not being saved after an unsuccessful item mass update (Pavels) -..F....... [ZBX-4865] fixed error bar in case of error with words longer than screen (Toms, Pavels) +..F....... [ZBX-4865] fixed error bar in case of error with words longer than screen (Pavels, Toms) ........S. [ZBX-4840] improved slow SQL queries in processing of {ITEM.VALUE} and {ITEM.LOG.*} macros (Sasha) ..F....... [ZBX-4572] fixed incorrect value input in GUI configuration form raising critical error (Vedmak) ..F....... [ZBX-4841] fixed inability to select other but the first of the discovery checks for a discovery rule in popup.php (Toms) @@ -5881,7 +5914,7 @@ Bug fixes: A.F....... [ZBX-4333] fixed trigger inheritance when calling trigger.update whithout a trigger expression (Pavels) ..F....... [ZBX-4333] fixed host trigger mass update (Pavels) ..F....... [ZBX-4333] fixed trigger dependency copying (Pavels) -.......S.. [ZBX-4629] fixed processing Y axis min/max values for graph prototypes (Sasha) +........S. [ZBX-4629] fixed processing Y axis min/max values for graph prototypes (Sasha) ..F....... [ZBX-4641] fixed errors in a "Discovery checks" popup (Sasha) A.F....... [ZBX-4202] fixed SQL performance in tr_status.php - combined similar queries, user data SQL access only once, triggerids retrieval optimization (Toms) A.F....... [ZBX-4647] fixed trigger and item prototype inheritance (Pavels) @@ -5992,7 +6025,7 @@ A......... [ZBX-4448] fixed proxy interface validation (Pavels) ..F....... [ZBX-4455] fixed the 'sortorder' field validation in the IT services form (Pavels) ..F....... [ZBX-4427] fixed map element host group highlighting (Pavels) ..F....... [ZBX-4446] fixed event duration calculation (Pavels) -........S. [ZBX-2806] fixed possible double notification messages (dimir,Sasha) +........S. [ZBX-2806] fixed possible double notification messages (dimir, Sasha) A......... [ZBX-4425] fixed unsetting interface when performing Item::udpate requests (Pavels) ..F....... [ZBX-4436] fixed wrong sql query in discovery popup (Slava) ....I..... [ZBX-4429] fixed problem with wrong mysql comment tag and warning in mysql function when update to 1.9.8 (Slava) @@ -6127,7 +6160,7 @@ Bug fixes: - [ZBX-3493] fixed warnings when removing and clearing a template (Alexei) - [ZBX-4143] fixed cases with upgrade patch sometimes attempting to reference tables that were not created yet (Richlv, Sasha) - [ZBX-3618] extended allowed syntax for host interface DNS names (Vedmak) - - [ZBX-3999] fixed map border (Alex, Sasha, Eduard) + - [ZBX-3999] fixed map border (Alexei, Sasha, Eduard) - [ZBX-3946] fixed errors when create trigger with dependencies (Vedmak) - [ZBX-3921] fixed change link shown for maps in slide show (Vedmak) - [ZBX-4082] fixed error in Monitoring->Triggers when acknowledges are disabled (Vedmak) @@ -6427,7 +6460,7 @@ A......... [ZBX-6582] fixed that {ITEM.VALUE} and {ITEM.LASTVALUE} macro was not ..F....... [ZBX-6484] fixed bar report calculation (Oleg) ..F....... [ZBX-1236] added right side y axis support in bar reports (Oleg) ..F....... [ZBX-6474] fixed {ITEM.VALUE} macro expanding in trigger names (Oleg) -...G...PS. [ZBX-6342] fixed LDAP check that caused server crash when LDAP is running but no DIT has been defined (Aleksej) +...G...PS. [ZBX-6342] fixed LDAP check that caused server crash when LDAP is running but no DIT has been defined (aleksej) ..F....... [ZBX-6329] fixed form with "0" in trigger expression parser (Eduard) ..F....... [ZBX-6306] fixed frontend layout for latest Google Chrome 25 (Eduard) ..F....... [ZBX-6258] updated Japanese translation; thanks to Kodai Terashima (Richlv) @@ -6655,7 +6688,7 @@ A.F....... [ZBX-2859] fixed possibility to successfully delete zero regular expr ..F....... [ZBX-2843] made dashboard and slideshow popup menus have dynamic width (sanja) A.F....... [ZBX-4279] added an error message when trying to delete an item, that's being used as a min/max Y axis value for graphs (Pavels) ..F....... [ZBX-4375] updated Russian translation; thanks to Alexey Pustovalov (Richlv) -........S. [ZBX-4360] fixed trapper compilation error on FreeBSD 7.3 (asaveljevs,dimir) +........S. [ZBX-4360] fixed trapper compilation error on FreeBSD 7.3 (asaveljevs, dimir) A.F....... [ZBX-4249] fixed trigger wizard when inserting macro multiple times (Vedmak) ..F....... [ZBX-4351] updated French translation; thanks to Joseph Bueno (Richlv) ..F....... [ZBX-4353] updated Japanese translation; thanks to Kodai Terashima (Richlv) diff --git a/bin/win32/dev/zabbix_sender.dll b/bin/win32/dev/zabbix_sender.dll Binary files differindex 41adb0a40ea..c2be11e4928 100644 --- a/bin/win32/dev/zabbix_sender.dll +++ b/bin/win32/dev/zabbix_sender.dll diff --git a/bin/win32/dev/zabbix_sender.h b/bin/win32/dev/zabbix_sender.h index 2ff99847448..1c583400d22 100644 --- a/bin/win32/dev/zabbix_sender.h +++ b/bin/win32/dev/zabbix_sender.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/bin/win32/dev/zabbix_sender.lib b/bin/win32/dev/zabbix_sender.lib Binary files differindex 05c1eae57e7..381fa5c7ce4 100644 --- a/bin/win32/dev/zabbix_sender.lib +++ b/bin/win32/dev/zabbix_sender.lib diff --git a/bin/win32/zabbix_agentd.exe b/bin/win32/zabbix_agentd.exe Binary files differindex 38130c91089..c79925db708 100755 --- a/bin/win32/zabbix_agentd.exe +++ b/bin/win32/zabbix_agentd.exe diff --git a/bin/win32/zabbix_get.exe b/bin/win32/zabbix_get.exe Binary files differindex 60738050221..247c0f9b9b1 100755 --- a/bin/win32/zabbix_get.exe +++ b/bin/win32/zabbix_get.exe diff --git a/bin/win32/zabbix_sender.exe b/bin/win32/zabbix_sender.exe Binary files differindex f76af6c8128..23142b9c734 100755 --- a/bin/win32/zabbix_sender.exe +++ b/bin/win32/zabbix_sender.exe diff --git a/bin/win64/dev/zabbix_sender.dll b/bin/win64/dev/zabbix_sender.dll Binary files differindex f3afc16bf95..bde088c725b 100644 --- a/bin/win64/dev/zabbix_sender.dll +++ b/bin/win64/dev/zabbix_sender.dll diff --git a/bin/win64/dev/zabbix_sender.h b/bin/win64/dev/zabbix_sender.h index 2ff99847448..1c583400d22 100644 --- a/bin/win64/dev/zabbix_sender.h +++ b/bin/win64/dev/zabbix_sender.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/bin/win64/dev/zabbix_sender.lib b/bin/win64/dev/zabbix_sender.lib Binary files differindex ce0f3139389..d898a93c622 100644 --- a/bin/win64/dev/zabbix_sender.lib +++ b/bin/win64/dev/zabbix_sender.lib diff --git a/bin/win64/zabbix_agentd.exe b/bin/win64/zabbix_agentd.exe Binary files differindex 3b4bddb4565..cce1c75cd08 100755 --- a/bin/win64/zabbix_agentd.exe +++ b/bin/win64/zabbix_agentd.exe diff --git a/bin/win64/zabbix_get.exe b/bin/win64/zabbix_get.exe Binary files differindex a31123f96b1..ecd80cf0155 100755 --- a/bin/win64/zabbix_get.exe +++ b/bin/win64/zabbix_get.exe diff --git a/bin/win64/zabbix_sender.exe b/bin/win64/zabbix_sender.exe Binary files differindex 63363054386..1e0700151bf 100755 --- a/bin/win64/zabbix_sender.exe +++ b/bin/win64/zabbix_sender.exe diff --git a/build-backend.xml b/build-backend.xml index f0f1afccdfb..e1bfa63e371 100644 --- a/build-backend.xml +++ b/build-backend.xml @@ -63,10 +63,12 @@ <exec executable="./bootstrap.sh" failonerror="on"></exec> <propertyselector property="conf.list" delimiter="," match="conf(\d+)"/> <sortlist property="conf.list" delimiter="," value="${conf.list}" override="true"/> +<!-- section of script temporary commented out for testing--> <!-- <for list="${conf.list}" param="name" delimiter=","> <sequential>--> <exec executable="scan-build" failonerror="on"> <arg line="./configure"/> +<!-- section of script temporary commented out for testing--> <!-- <arg line="${@{name}}"/>--> <arg line="--enable-agent"/> </exec> @@ -88,6 +90,7 @@ </exec> </finally> </trycatch> +<!-- section of script temporary commented out for testing--> <!-- </sequential> </for>--> </target> diff --git a/build/win32/examples/zabbix_sender/sender.c b/build/win32/examples/zabbix_sender/sender.c index f7f7d4e5dc6..5a65c9f0686 100644 --- a/build/win32/examples/zabbix_sender/sender.c +++ b/build/win32/examples/zabbix_sender/sender.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/build/win32/project/Makefile_agent b/build/win32/project/Makefile_agent index fc7f37f32e1..6ecc589ffdf 100644 --- a/build/win32/project/Makefile_agent +++ b/build/win32/project/Makefile_agent @@ -83,7 +83,6 @@ OBJS = \ ..\..\..\src\libs\zbxsysinfo\win32\hostname.o \ ..\..\..\src\libs\zbxwin32\perfmon.o \ ..\..\..\src\libs\zbxwin32\service.o \ - ..\..\..\src\libs\zbxself\selfmon.o \ ..\..\..\src\zabbix_agent\active.o \ ..\..\..\src\zabbix_agent\cpustat.o \ ..\..\..\src\zabbix_agent\eventlog.o \ diff --git a/build/win32/project/Makefile_targets.inc b/build/win32/project/Makefile_targets.inc index 1fce46752b9..37be32ba81a 100644 --- a/build/win32/project/Makefile_targets.inc +++ b/build/win32/project/Makefile_targets.inc @@ -67,8 +67,5 @@ $(RESOURCE_RES): $(RESOURCE_RC) $(RESOURCE_H) $(DESC_H) {..\..\..\src\libs\zbxwin32}.c{..\..\..\src\libs\zbxwin32}.o: $(CC) $? /Fo"$@" $(CFLAGS) -{..\..\..\src\libs\zbxself}.c{..\..\..\src\libs\zbxself}.o: - $(CC) $? /Fo"$@" $(CFLAGS) - {$(PROJECTDIR)}.c{$(PROJECTDIR)}.o: $(CC) $? /Fo"$@" $(CFLAGS) diff --git a/build/win32/project/resource.h b/build/win32/project/resource.h index 8bb3ba99e20..fd63510a5cb 100644 --- a/build/win32/project/resource.h +++ b/build/win32/project/resource.h @@ -22,7 +22,7 @@ #define VER_PRODUCTVERSION_STR ZBX_STR(ZABBIX_VERSION_MAJOR) "." ZBX_STR(ZABBIX_VERSION_MINOR) "." \ ZBX_STR(ZABBIX_VERSION_PATCH) ZABBIX_VERSION_RC "\0" #define VER_COMPANYNAME_STR "Zabbix SIA\0" -#define VER_LEGALCOPYRIGHT_STR "Copyright (C) 2001-2017 " VER_COMPANYNAME_STR +#define VER_LEGALCOPYRIGHT_STR "Copyright (C) 2001-2018 " VER_COMPANYNAME_STR #define VER_PRODUCTNAME_STR "Zabbix\0" // Next default values for new objects diff --git a/configure.ac b/configure.ac index 1f1cdd259f4..1fcccd32565 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl dnl Zabbix -dnl Copyright (C) 2001-2017 Zabbix SIA +dnl Copyright (C) 2001-2018 Zabbix SIA dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT([Zabbix],[4.0.0alpha2]) +AC_INIT([Zabbix],[4.0.0alpha3]) AC_CONFIG_SRCDIR(src/zabbix_server/server.c) AM_INIT_AUTOMAKE([subdir-objects]) @@ -1377,7 +1377,7 @@ if test "x$have_ipcservice" = "xyes"; then if test "x$found_libevent" != "xyes"; then AC_MSG_ERROR([Unable to use libevent (libevent check failed)]) fi - + SERVER_LDFLAGS="$SERVER_LDFLAGS $LIBEVENT_LDFLAGS" SERVER_LIBS="$SERVER_LIBS $LIBEVENT_LIBS" @@ -1387,11 +1387,14 @@ if test "x$have_ipcservice" = "xyes"; then fi fi -dnl Check for libpcre, used by Zabbix for regular expressions -LIBPCRE_CHECK_CONFIG([no]) -if test "x$found_libpcre" != "xyes"; then - AC_MSG_ERROR([Unable to use libpcre (libpcre check failed)]) +if test "x$server" = "xyes" || test "x$proxy" = "xyes" || test "x$agent" = "xyes"; then + dnl Check for libpcre, used by Zabbix for regular expressions + LIBPCRE_CHECK_CONFIG([no]) + if test "x$found_libpcre" != "xyes"; then + AC_MSG_ERROR([Unable to use libpcre (libpcre check failed)]) + fi fi + CFLAGS="$CFLAGS $LIBPCRE_CFLAGS" LDFLAGS="$LDFLAGS $LIBPCRE_LDFLAGS" LIBS="$LIBS $LIBPCRE_LIBS" @@ -1588,8 +1591,10 @@ AC_CHECK_FILE(tests, [AC_CONFIG_FILES( tests/libs/Makefile tests/libs/zbxconf/Makefile tests/libs/zbxdbhigh/Makefile + tests/libs/zbxjson/Makefile tests/libs/zbxsysinfo/Makefile tests/libs/zbxsysinfo/linux/Makefile + tests/libs/zbxsysinfo/common/Makefile )]) AC_OUTPUT([ diff --git a/create/bin/export_data.sh b/create/bin/export_data.sh index fc4b542d723..7e541f167f5 100755 --- a/create/bin/export_data.sh +++ b/create/bin/export_data.sh @@ -12,7 +12,7 @@ schema=$basedir/../src/schema.tmpl echo "-- -- Zabbix --- Copyright (C) 2001-2017 Zabbix SIA +-- Copyright (C) 2001-2018 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/create/bin/gen_data.pl b/create/bin/gen_data.pl index 2ef1791c8ca..e9e0d2834b7 100755 --- a/create/bin/gen_data.pl +++ b/create/bin/gen_data.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # # Zabbix -# Copyright (C) 2001-2017 Zabbix SIA +# Copyright (C) 2001-2018 Zabbix SIA # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/create/bin/gen_schema.pl b/create/bin/gen_schema.pl index e583c8dfc2d..1970cd5290e 100755 --- a/create/bin/gen_schema.pl +++ b/create/bin/gen_schema.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # # Zabbix -# Copyright (C) 2001-2017 Zabbix SIA +# Copyright (C) 2001-2018 Zabbix SIA # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -46,7 +46,7 @@ my %c = ( $c{"before"} = "/* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/create/src/data.tmpl b/create/src/data.tmpl index 2e727a598ba..fbf8951354c 100644 --- a/create/src/data.tmpl +++ b/create/src/data.tmpl @@ -1,6 +1,6 @@ -- -- Zabbix --- Copyright (C) 2001-2017 Zabbix SIA +-- Copyright (C) 2001-2018 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/create/src/schema.tmpl b/create/src/schema.tmpl index 5c7850ff737..4d4a5619526 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -1,6 +1,6 @@ -- -- Zabbix --- Copyright (C) 2001-2017 Zabbix SIA +-- Copyright (C) 2001-2018 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/create/src/templates.tmpl b/create/src/templates.tmpl index 5e8fceba085..551fdc4a200 100644 --- a/create/src/templates.tmpl +++ b/create/src/templates.tmpl @@ -1,6 +1,6 @@ -- -- Zabbix --- Copyright (C) 2001-2017 Zabbix SIA +-- Copyright (C) 2001-2018 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/frontends/php/actionconf.php b/frontends/php/actionconf.php index 9b356db6bd0..561e4981653 100644 --- a/frontends/php/actionconf.php +++ b/frontends/php/actionconf.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/adm.gui.php b/frontends/php/adm.gui.php index 75d773cdd4d..ab74cac15d0 100644 --- a/frontends/php/adm.gui.php +++ b/frontends/php/adm.gui.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/adm.housekeeper.php b/frontends/php/adm.housekeeper.php index 27d7765c143..5b5ebc9f955 100644 --- a/frontends/php/adm.housekeeper.php +++ b/frontends/php/adm.housekeeper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/adm.iconmapping.php b/frontends/php/adm.iconmapping.php index f44e9134a26..b84b8d58953 100644 --- a/frontends/php/adm.iconmapping.php +++ b/frontends/php/adm.iconmapping.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -109,6 +109,9 @@ foreach ($iconList as $icon) { $data['iconList'][$icon['imageid']] = $icon['name']; } +reset($iconList); +$data['default_imageid'] = key($iconList); + $inventoryFields = getHostInventories(); foreach ($inventoryFields as $field) { $data['inventoryList'][$field['nr']] = $field['title']; diff --git a/frontends/php/adm.images.php b/frontends/php/adm.images.php index 835b1ef690d..b7615a171e1 100644 --- a/frontends/php/adm.images.php +++ b/frontends/php/adm.images.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/adm.macros.php b/frontends/php/adm.macros.php index add27d0ac9c..c61e4481921 100644 --- a/frontends/php/adm.macros.php +++ b/frontends/php/adm.macros.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/adm.other.php b/frontends/php/adm.other.php index 87018056502..43409af125c 100644 --- a/frontends/php/adm.other.php +++ b/frontends/php/adm.other.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/adm.regexps.php b/frontends/php/adm.regexps.php index a57ce880a61..8d954083dc2 100644 --- a/frontends/php/adm.regexps.php +++ b/frontends/php/adm.regexps.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/adm.triggerdisplayoptions.php b/frontends/php/adm.triggerdisplayoptions.php index b25d41bdee5..daaf288e4a4 100644 --- a/frontends/php/adm.triggerdisplayoptions.php +++ b/frontends/php/adm.triggerdisplayoptions.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/adm.triggerseverities.php b/frontends/php/adm.triggerseverities.php index 737231b76d9..2d705b721ec 100644 --- a/frontends/php/adm.triggerseverities.php +++ b/frontends/php/adm.triggerseverities.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/adm.valuemapping.php b/frontends/php/adm.valuemapping.php index 53f0387f4eb..d3cd766c441 100644 --- a/frontends/php/adm.valuemapping.php +++ b/frontends/php/adm.valuemapping.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/adm.workingtime.php b/frontends/php/adm.workingtime.php index 547c47b8e7a..44a3e6fee6d 100644 --- a/frontends/php/adm.workingtime.php +++ b/frontends/php/adm.workingtime.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/api_jsonrpc.php b/frontends/php/api_jsonrpc.php index 9e70bb9420a..c49bfdb9508 100644 --- a/frontends/php/api_jsonrpc.php +++ b/frontends/php/api_jsonrpc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerAcknowledgeCreate.php b/frontends/php/app/controllers/CControllerAcknowledgeCreate.php index a220265f4d1..5d05eeaf28c 100644 --- a/frontends/php/app/controllers/CControllerAcknowledgeCreate.php +++ b/frontends/php/app/controllers/CControllerAcknowledgeCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerAcknowledgeEdit.php b/frontends/php/app/controllers/CControllerAcknowledgeEdit.php index 12bd9f474e6..37459f95433 100644 --- a/frontends/php/app/controllers/CControllerAcknowledgeEdit.php +++ b/frontends/php/app/controllers/CControllerAcknowledgeEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDashboardAbstract.php b/frontends/php/app/controllers/CControllerDashboardAbstract.php index f22aab88ff5..4b4fabb6aa8 100644 --- a/frontends/php/app/controllers/CControllerDashboardAbstract.php +++ b/frontends/php/app/controllers/CControllerDashboardAbstract.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDashboardDelete.php b/frontends/php/app/controllers/CControllerDashboardDelete.php index 18a1ea67f14..4f7b155eb78 100644 --- a/frontends/php/app/controllers/CControllerDashboardDelete.php +++ b/frontends/php/app/controllers/CControllerDashboardDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDashboardGet.php b/frontends/php/app/controllers/CControllerDashboardGet.php index 639c16897ff..1a6f4e52f8f 100644 --- a/frontends/php/app/controllers/CControllerDashboardGet.php +++ b/frontends/php/app/controllers/CControllerDashboardGet.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDashboardList.php b/frontends/php/app/controllers/CControllerDashboardList.php index 1c3511ebf19..2380c4bc79f 100644 --- a/frontends/php/app/controllers/CControllerDashboardList.php +++ b/frontends/php/app/controllers/CControllerDashboardList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDashboardUpdate.php b/frontends/php/app/controllers/CControllerDashboardUpdate.php index b0d1a36b6c7..d11cddf9a57 100644 --- a/frontends/php/app/controllers/CControllerDashboardUpdate.php +++ b/frontends/php/app/controllers/CControllerDashboardUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDashboardView.php b/frontends/php/app/controllers/CControllerDashboardView.php index 9ae653bae1c..57736d306c0 100644 --- a/frontends/php/app/controllers/CControllerDashboardView.php +++ b/frontends/php/app/controllers/CControllerDashboardView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDashbrdWidgetCheck.php b/frontends/php/app/controllers/CControllerDashbrdWidgetCheck.php index 4574752eb51..5ce1b125721 100644 --- a/frontends/php/app/controllers/CControllerDashbrdWidgetCheck.php +++ b/frontends/php/app/controllers/CControllerDashbrdWidgetCheck.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDashbrdWidgetConfig.php b/frontends/php/app/controllers/CControllerDashbrdWidgetConfig.php index c70f99ccf00..76f5b63bfc2 100644 --- a/frontends/php/app/controllers/CControllerDashbrdWidgetConfig.php +++ b/frontends/php/app/controllers/CControllerDashbrdWidgetConfig.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDashbrdWidgetRfRate.php b/frontends/php/app/controllers/CControllerDashbrdWidgetRfRate.php index c0711cf22e4..4c9c62db524 100644 --- a/frontends/php/app/controllers/CControllerDashbrdWidgetRfRate.php +++ b/frontends/php/app/controllers/CControllerDashbrdWidgetRfRate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDashbrdWidgetUpdate.php b/frontends/php/app/controllers/CControllerDashbrdWidgetUpdate.php index 4b678553682..f501e26864e 100644 --- a/frontends/php/app/controllers/CControllerDashbrdWidgetUpdate.php +++ b/frontends/php/app/controllers/CControllerDashbrdWidgetUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerDiscoveryView.php b/frontends/php/app/controllers/CControllerDiscoveryView.php index 0207649a1d9..e7c19957843 100644 --- a/frontends/php/app/controllers/CControllerDiscoveryView.php +++ b/frontends/php/app/controllers/CControllerDiscoveryView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerFavouriteCreate.php b/frontends/php/app/controllers/CControllerFavouriteCreate.php index b3ebca4249b..112039799a4 100644 --- a/frontends/php/app/controllers/CControllerFavouriteCreate.php +++ b/frontends/php/app/controllers/CControllerFavouriteCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerFavouriteDelete.php b/frontends/php/app/controllers/CControllerFavouriteDelete.php index ff7816e70c7..c2ebf8a6ee6 100644 --- a/frontends/php/app/controllers/CControllerFavouriteDelete.php +++ b/frontends/php/app/controllers/CControllerFavouriteDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerMapView.php b/frontends/php/app/controllers/CControllerMapView.php index d62fb431cc6..8b5c592f3e9 100644 --- a/frontends/php/app/controllers/CControllerMapView.php +++ b/frontends/php/app/controllers/CControllerMapView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerMediatypeCreate.php b/frontends/php/app/controllers/CControllerMediatypeCreate.php index bd969ebc86e..0aaccc35500 100644 --- a/frontends/php/app/controllers/CControllerMediatypeCreate.php +++ b/frontends/php/app/controllers/CControllerMediatypeCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerMediatypeDelete.php b/frontends/php/app/controllers/CControllerMediatypeDelete.php index fb21c076f4c..a52f1cbb38e 100644 --- a/frontends/php/app/controllers/CControllerMediatypeDelete.php +++ b/frontends/php/app/controllers/CControllerMediatypeDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerMediatypeDisable.php b/frontends/php/app/controllers/CControllerMediatypeDisable.php index 7826bf1dd8b..f76009bdbd1 100644 --- a/frontends/php/app/controllers/CControllerMediatypeDisable.php +++ b/frontends/php/app/controllers/CControllerMediatypeDisable.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerMediatypeEdit.php b/frontends/php/app/controllers/CControllerMediatypeEdit.php index b4449bd16cf..13095b48fad 100644 --- a/frontends/php/app/controllers/CControllerMediatypeEdit.php +++ b/frontends/php/app/controllers/CControllerMediatypeEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerMediatypeEnable.php b/frontends/php/app/controllers/CControllerMediatypeEnable.php index 2de7bd04b9f..f55801c5652 100644 --- a/frontends/php/app/controllers/CControllerMediatypeEnable.php +++ b/frontends/php/app/controllers/CControllerMediatypeEnable.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerMediatypeList.php b/frontends/php/app/controllers/CControllerMediatypeList.php index 89f06264a25..a070ce47f33 100644 --- a/frontends/php/app/controllers/CControllerMediatypeList.php +++ b/frontends/php/app/controllers/CControllerMediatypeList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerMediatypeUpdate.php b/frontends/php/app/controllers/CControllerMediatypeUpdate.php index bc4c367113f..8edd483cefb 100644 --- a/frontends/php/app/controllers/CControllerMediatypeUpdate.php +++ b/frontends/php/app/controllers/CControllerMediatypeUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerPopupGeneric.php b/frontends/php/app/controllers/CControllerPopupGeneric.php index 97a5bb6988f..062031e662a 100644 --- a/frontends/php/app/controllers/CControllerPopupGeneric.php +++ b/frontends/php/app/controllers/CControllerPopupGeneric.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerPopupHttpStep.php b/frontends/php/app/controllers/CControllerPopupHttpStep.php index 094b59a9d23..a55ad65ebba 100644 --- a/frontends/php/app/controllers/CControllerPopupHttpStep.php +++ b/frontends/php/app/controllers/CControllerPopupHttpStep.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -37,7 +37,7 @@ class CControllerPopupHttpStep extends CController { 'pairs' => 'array', 'retrieve_mode' => 'in '.implode(',', [HTTPTEST_STEP_RETRIEVE_MODE_CONTENT, HTTPTEST_STEP_RETRIEVE_MODE_HEADERS]), 'follow_redirects' => 'in '.implode(',', [HTTPTEST_STEP_FOLLOW_REDIRECTS_ON, HTTPTEST_STEP_FOLLOW_REDIRECTS_OFF]), - 'timeout' => 'string', + 'timeout' => 'string|not_empty', 'required' => 'string', 'status_codes' => 'string', 'templated' => 'in 0,1', @@ -96,6 +96,21 @@ class CControllerPopupHttpStep extends CController { if ($this->hasInput('validate')) { $output = []; + // Validate "Timeout" field manually, since it cannot be properly added into MVC validation rules. + $simple_interval_parser = new CSimpleIntervalParser(['usermacros' => true]); + $timeout = $this->getInput('timeout'); + + if ($simple_interval_parser->parse($timeout) != CParser::PARSE_SUCCESS) { + error(_s('Incorrect value for field "%1$s": %2$s.', 'timeout', _('a time unit is expected'))); + } + elseif ($timeout[0] !== '{') { + $seconds = timeUnitToSeconds($timeout); + + if (bccomp($seconds, SEC_PER_HOUR) > 0) { + error(_s('Incorrect value for field "%1$s": %2$s.', 'timeout', _('a number is too large'))); + } + } + // Validate if step names are unique. if (($page_options['stepid'] >= 0 && $page_options['name'] !== $page_options['old_name']) || $page_options['stepid'] < 0) { diff --git a/frontends/php/app/controllers/CControllerPopupMedia.php b/frontends/php/app/controllers/CControllerPopupMedia.php index af8f84b26ef..1a02cdd6950 100644 --- a/frontends/php/app/controllers/CControllerPopupMedia.php +++ b/frontends/php/app/controllers/CControllerPopupMedia.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerPopupScriptExec.php b/frontends/php/app/controllers/CControllerPopupScriptExec.php index f98b138d0c8..b6f667fc6fa 100644 --- a/frontends/php/app/controllers/CControllerPopupScriptExec.php +++ b/frontends/php/app/controllers/CControllerPopupScriptExec.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerPopupServices.php b/frontends/php/app/controllers/CControllerPopupServices.php index 03bf7d129f4..75714eac7ba 100644 --- a/frontends/php/app/controllers/CControllerPopupServices.php +++ b/frontends/php/app/controllers/CControllerPopupServices.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerPopupTestTriggerExpr.php b/frontends/php/app/controllers/CControllerPopupTestTriggerExpr.php index 5b84c8bfaa4..c2e3130d336 100644 --- a/frontends/php/app/controllers/CControllerPopupTestTriggerExpr.php +++ b/frontends/php/app/controllers/CControllerPopupTestTriggerExpr.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerPopupTriggerExpr.php b/frontends/php/app/controllers/CControllerPopupTriggerExpr.php index e3163da84f0..af93065225b 100644 --- a/frontends/php/app/controllers/CControllerPopupTriggerExpr.php +++ b/frontends/php/app/controllers/CControllerPopupTriggerExpr.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerPopupTriggerWizard.php b/frontends/php/app/controllers/CControllerPopupTriggerWizard.php index c6377f757e7..709d4d96f67 100644 --- a/frontends/php/app/controllers/CControllerPopupTriggerWizard.php +++ b/frontends/php/app/controllers/CControllerPopupTriggerWizard.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerProblemView.php b/frontends/php/app/controllers/CControllerProblemView.php index 1d6d9fac2d5..2632d319eb2 100644 --- a/frontends/php/app/controllers/CControllerProblemView.php +++ b/frontends/php/app/controllers/CControllerProblemView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerProfileUpdate.php b/frontends/php/app/controllers/CControllerProfileUpdate.php index 7fe13a55618..ae136ab29a8 100644 --- a/frontends/php/app/controllers/CControllerProfileUpdate.php +++ b/frontends/php/app/controllers/CControllerProfileUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerProxyCreate.php b/frontends/php/app/controllers/CControllerProxyCreate.php index e04b1fa3063..8d8ba0a1626 100644 --- a/frontends/php/app/controllers/CControllerProxyCreate.php +++ b/frontends/php/app/controllers/CControllerProxyCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerProxyDelete.php b/frontends/php/app/controllers/CControllerProxyDelete.php index 8b388bc121f..d137afd181b 100644 --- a/frontends/php/app/controllers/CControllerProxyDelete.php +++ b/frontends/php/app/controllers/CControllerProxyDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerProxyEdit.php b/frontends/php/app/controllers/CControllerProxyEdit.php index 843837fadd6..ab6eb108af1 100644 --- a/frontends/php/app/controllers/CControllerProxyEdit.php +++ b/frontends/php/app/controllers/CControllerProxyEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerProxyHostDisable.php b/frontends/php/app/controllers/CControllerProxyHostDisable.php index 9a00772626c..526c399ad9e 100644 --- a/frontends/php/app/controllers/CControllerProxyHostDisable.php +++ b/frontends/php/app/controllers/CControllerProxyHostDisable.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerProxyHostEnable.php b/frontends/php/app/controllers/CControllerProxyHostEnable.php index ba828eb92a8..4aa5fbf1b23 100644 --- a/frontends/php/app/controllers/CControllerProxyHostEnable.php +++ b/frontends/php/app/controllers/CControllerProxyHostEnable.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerProxyList.php b/frontends/php/app/controllers/CControllerProxyList.php index 713c9716b20..41b8fad5ca5 100644 --- a/frontends/php/app/controllers/CControllerProxyList.php +++ b/frontends/php/app/controllers/CControllerProxyList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerProxyUpdate.php b/frontends/php/app/controllers/CControllerProxyUpdate.php index 8425605111b..c2c2f4b6799 100644 --- a/frontends/php/app/controllers/CControllerProxyUpdate.php +++ b/frontends/php/app/controllers/CControllerProxyUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerReportServices.php b/frontends/php/app/controllers/CControllerReportServices.php index 3a1ff98b72c..1c9186eb1c4 100644 --- a/frontends/php/app/controllers/CControllerReportServices.php +++ b/frontends/php/app/controllers/CControllerReportServices.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerReportStatus.php b/frontends/php/app/controllers/CControllerReportStatus.php index 1d0a15d73cd..9100142db81 100644 --- a/frontends/php/app/controllers/CControllerReportStatus.php +++ b/frontends/php/app/controllers/CControllerReportStatus.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerScriptCreate.php b/frontends/php/app/controllers/CControllerScriptCreate.php index a759dadb363..e05f3e8e3e4 100644 --- a/frontends/php/app/controllers/CControllerScriptCreate.php +++ b/frontends/php/app/controllers/CControllerScriptCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerScriptDelete.php b/frontends/php/app/controllers/CControllerScriptDelete.php index 11744778248..7716dfffbee 100644 --- a/frontends/php/app/controllers/CControllerScriptDelete.php +++ b/frontends/php/app/controllers/CControllerScriptDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerScriptEdit.php b/frontends/php/app/controllers/CControllerScriptEdit.php index 59470ba0f1f..1fc43f816c4 100644 --- a/frontends/php/app/controllers/CControllerScriptEdit.php +++ b/frontends/php/app/controllers/CControllerScriptEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerScriptList.php b/frontends/php/app/controllers/CControllerScriptList.php index 70cdf4d7974..622823fea8f 100644 --- a/frontends/php/app/controllers/CControllerScriptList.php +++ b/frontends/php/app/controllers/CControllerScriptList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerScriptUpdate.php b/frontends/php/app/controllers/CControllerScriptUpdate.php index ad75d49a75b..61c954a00d9 100644 --- a/frontends/php/app/controllers/CControllerScriptUpdate.php +++ b/frontends/php/app/controllers/CControllerScriptUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerSystemWarning.php b/frontends/php/app/controllers/CControllerSystemWarning.php index ff80075da7d..8490591f793 100644 --- a/frontends/php/app/controllers/CControllerSystemWarning.php +++ b/frontends/php/app/controllers/CControllerSystemWarning.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerTimelineUpdate.php b/frontends/php/app/controllers/CControllerTimelineUpdate.php index 8c89c0ac9f9..a60714779e0 100644 --- a/frontends/php/app/controllers/CControllerTimelineUpdate.php +++ b/frontends/php/app/controllers/CControllerTimelineUpdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWebView.php b/frontends/php/app/controllers/CControllerWebView.php index cd05933df35..f5f1ff34d98 100644 --- a/frontends/php/app/controllers/CControllerWebView.php +++ b/frontends/php/app/controllers/CControllerWebView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidget.php b/frontends/php/app/controllers/CControllerWidget.php index 0fb26ac02e7..daf5c39b71f 100644 --- a/frontends/php/app/controllers/CControllerWidget.php +++ b/frontends/php/app/controllers/CControllerWidget.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetActionLogView.php b/frontends/php/app/controllers/CControllerWidgetActionLogView.php index 08488f3b084..0791a8eae1a 100644 --- a/frontends/php/app/controllers/CControllerWidgetActionLogView.php +++ b/frontends/php/app/controllers/CControllerWidgetActionLogView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetClockView.php b/frontends/php/app/controllers/CControllerWidgetClockView.php index eb22ec8e5ba..af9fea09adf 100644 --- a/frontends/php/app/controllers/CControllerWidgetClockView.php +++ b/frontends/php/app/controllers/CControllerWidgetClockView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetDataOverView.php b/frontends/php/app/controllers/CControllerWidgetDataOverView.php index 096738c4a49..3135b7cdc92 100644 --- a/frontends/php/app/controllers/CControllerWidgetDataOverView.php +++ b/frontends/php/app/controllers/CControllerWidgetDataOverView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetDiscoveryView.php b/frontends/php/app/controllers/CControllerWidgetDiscoveryView.php index a6d2ee4889a..ca784373519 100644 --- a/frontends/php/app/controllers/CControllerWidgetDiscoveryView.php +++ b/frontends/php/app/controllers/CControllerWidgetDiscoveryView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetFavGraphsView.php b/frontends/php/app/controllers/CControllerWidgetFavGraphsView.php index 5049c61dd15..448296a50c6 100644 --- a/frontends/php/app/controllers/CControllerWidgetFavGraphsView.php +++ b/frontends/php/app/controllers/CControllerWidgetFavGraphsView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetFavMapsView.php b/frontends/php/app/controllers/CControllerWidgetFavMapsView.php index e48294bfaa9..5dc15e8d0d0 100644 --- a/frontends/php/app/controllers/CControllerWidgetFavMapsView.php +++ b/frontends/php/app/controllers/CControllerWidgetFavMapsView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetFavScreensView.php b/frontends/php/app/controllers/CControllerWidgetFavScreensView.php index b450f878648..866c1aacddb 100644 --- a/frontends/php/app/controllers/CControllerWidgetFavScreensView.php +++ b/frontends/php/app/controllers/CControllerWidgetFavScreensView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetGraphView.php b/frontends/php/app/controllers/CControllerWidgetGraphView.php index 02e41fe8880..49c02dbf7cd 100644 --- a/frontends/php/app/controllers/CControllerWidgetGraphView.php +++ b/frontends/php/app/controllers/CControllerWidgetGraphView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetHostsView.php b/frontends/php/app/controllers/CControllerWidgetHostsView.php index 55ad4f6a68d..f56ae327a96 100644 --- a/frontends/php/app/controllers/CControllerWidgetHostsView.php +++ b/frontends/php/app/controllers/CControllerWidgetHostsView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetNavigationtreeItemEdit.php b/frontends/php/app/controllers/CControllerWidgetNavigationtreeItemEdit.php index c3eb7841d4e..43b7917558e 100644 --- a/frontends/php/app/controllers/CControllerWidgetNavigationtreeItemEdit.php +++ b/frontends/php/app/controllers/CControllerWidgetNavigationtreeItemEdit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetNavigationtreeItemEditDialog.php b/frontends/php/app/controllers/CControllerWidgetNavigationtreeItemEditDialog.php index a9e112c26cf..2e99896ff80 100644 --- a/frontends/php/app/controllers/CControllerWidgetNavigationtreeItemEditDialog.php +++ b/frontends/php/app/controllers/CControllerWidgetNavigationtreeItemEditDialog.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetNavigationtreeView.php b/frontends/php/app/controllers/CControllerWidgetNavigationtreeView.php index 850956244b5..de1ffc18eb0 100644 --- a/frontends/php/app/controllers/CControllerWidgetNavigationtreeView.php +++ b/frontends/php/app/controllers/CControllerWidgetNavigationtreeView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetPlainTextView.php b/frontends/php/app/controllers/CControllerWidgetPlainTextView.php index 550c0b964c5..7bfaa0fb462 100644 --- a/frontends/php/app/controllers/CControllerWidgetPlainTextView.php +++ b/frontends/php/app/controllers/CControllerWidgetPlainTextView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetProblemsView.php b/frontends/php/app/controllers/CControllerWidgetProblemsView.php index 9d71b781e33..6650cf66d9d 100644 --- a/frontends/php/app/controllers/CControllerWidgetProblemsView.php +++ b/frontends/php/app/controllers/CControllerWidgetProblemsView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetStatusView.php b/frontends/php/app/controllers/CControllerWidgetStatusView.php index bc8fa8bf743..170a7f6759d 100644 --- a/frontends/php/app/controllers/CControllerWidgetStatusView.php +++ b/frontends/php/app/controllers/CControllerWidgetStatusView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetSysmapView.php b/frontends/php/app/controllers/CControllerWidgetSysmapView.php index 2749a1d9247..2f22cce0ad8 100644 --- a/frontends/php/app/controllers/CControllerWidgetSysmapView.php +++ b/frontends/php/app/controllers/CControllerWidgetSysmapView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetSystemView.php b/frontends/php/app/controllers/CControllerWidgetSystemView.php index e7efc81c452..721ef353014 100644 --- a/frontends/php/app/controllers/CControllerWidgetSystemView.php +++ b/frontends/php/app/controllers/CControllerWidgetSystemView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetTrigOverView.php b/frontends/php/app/controllers/CControllerWidgetTrigOverView.php index 8f78cc510bc..b564ce3ce5b 100644 --- a/frontends/php/app/controllers/CControllerWidgetTrigOverView.php +++ b/frontends/php/app/controllers/CControllerWidgetTrigOverView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetUrlView.php b/frontends/php/app/controllers/CControllerWidgetUrlView.php index d2906c46e48..ea7a727adb0 100644 --- a/frontends/php/app/controllers/CControllerWidgetUrlView.php +++ b/frontends/php/app/controllers/CControllerWidgetUrlView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/controllers/CControllerWidgetWebView.php b/frontends/php/app/controllers/CControllerWidgetWebView.php index d1ecc40b6f6..d6945f2c68b 100644 --- a/frontends/php/app/controllers/CControllerWidgetWebView.php +++ b/frontends/php/app/controllers/CControllerWidgetWebView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/administration.mediatype.edit.php b/frontends/php/app/views/administration.mediatype.edit.php index 8423468ef93..6149c193c69 100644 --- a/frontends/php/app/views/administration.mediatype.edit.php +++ b/frontends/php/app/views/administration.mediatype.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -35,38 +35,45 @@ $mediaTypeForm = (new CForm()) ->addVar('form', 1) ->addVar('mediatypeid', $data['mediatypeid']); -// create form list -$nameTextBox = (new CTextBox('description', $data['description'], false, 100)) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) - ->setAttribute('autofocus', 'autofocus'); -$mediaTypeFormList = (new CFormList()) - ->addRow(_('Name'), $nameTextBox); - -// append type to form list -$cmbType = new CComboBox('type', $data['type'], null, [ - MEDIA_TYPE_EMAIL => _('Email'), - MEDIA_TYPE_EXEC => _('Script'), - MEDIA_TYPE_SMS => _('SMS'), - MEDIA_TYPE_JABBER => _('Jabber') -]); -$cmbType->addItemsInGroup(_('Commercial'), [MEDIA_TYPE_EZ_TEXTING => _('Ez Texting')]); -$cmbTypeRow = [$cmbType]; -$ez_texting_link = (new CLink('https://app.eztexting.com', 'https://app.eztexting.com/')) - ->setId('eztext_link') - ->setTarget('_blank'); -$cmbTypeRow[] = $ez_texting_link; - -$mediaTypeFormList - ->addRow(_('Type'), $cmbTypeRow) - ->addRow(_('SMTP server'), - (new CTextBox('smtp_server', $data['smtp_server']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) +// Create form list. +$mediatype_formlist = (new CFormList()) + ->addRow((new CLabel(_('Name'), 'description'))->setAsteriskMark(), + (new CTextBox('description', $data['description'], false, 100)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ->setAttribute('autofocus', 'autofocus') + ) + ->addRow((new CLabel(_('Type'), 'type')), [ + (new CComboBox('type', $data['type'], null, [ + MEDIA_TYPE_EMAIL => _('Email'), + MEDIA_TYPE_EXEC => _('Script'), + MEDIA_TYPE_SMS => _('SMS'), + MEDIA_TYPE_JABBER => _('Jabber') + ])) + ->addItemsInGroup(_('Commercial'), [MEDIA_TYPE_EZ_TEXTING => _('Ez Texting')]), + (new CLink('https://app.eztexting.com', 'https://app.eztexting.com/')) + ->setId('eztext_link') + ->setTarget('_blank') + ]) + ->addRow((new CLabel(_('SMTP server'), 'smtp_server'))->setAsteriskMark(), + (new CTextBox('smtp_server', $data['smtp_server'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ) ->addRow(_('SMTP server port'), (new CNumericBox('smtp_port', $data['smtp_port'], 5, false, false, false))->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ) - ->addRow(_('SMTP helo'), (new CTextBox('smtp_helo', $data['smtp_helo']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)) - ->addRow(_('SMTP email'), (new CTextBox('smtp_email', $data['smtp_email']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)) - ->addRow(_('Connection security'), + ->addRow((new CLabel(_('SMTP helo'), 'smtp_helo'))->setAsteriskMark(), + (new CTextBox('smtp_helo', $data['smtp_helo'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ) + ->addRow((new CLabel(_('SMTP email'), 'smtp_email'))->setAsteriskMark(), + (new CTextBox('smtp_email', $data['smtp_email'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ) + ->addRow((new CLabel(_('Connection security'), 'smtp_security')), (new CRadioButtonList('smtp_security', (int) $data['smtp_security'])) ->addValue(_('None'), SMTP_CONNECTION_SECURITY_NONE) ->addValue(_('STARTTLS'), SMTP_CONNECTION_SECURITY_STARTTLS) @@ -75,14 +82,18 @@ $mediaTypeFormList ) ->addRow(_('SSL verify peer'), (new CCheckBox('smtp_verify_peer'))->setChecked($data['smtp_verify_peer'])) ->addRow(_('SSL verify host'), (new CCheckBox('smtp_verify_host'))->setChecked($data['smtp_verify_host'])) - ->addRow(_('Authentication'), + ->addRow((new CLabel(_('Authentication'), 'smtp_authentication')), (new CRadioButtonList('smtp_authentication', (int) $data['smtp_authentication'])) ->addValue(_('None'), SMTP_AUTHENTICATION_NONE) ->addValue(_('Username and password'), SMTP_AUTHENTICATION_NORMAL) ->setModern(true) ) ->addRow(_('Username'), (new CTextBox('smtp_username', $data['smtp_username']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)) - ->addRow(_('Script name'), (new CTextBox('exec_path', $data['exec_path']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)); + ->addRow((new CLabel(_('Script name'), 'exec_path'))->setAsteriskMark(), + (new CTextBox('exec_path', $data['exec_path'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ); $exec_params_table = (new CTable()) ->setId('exec_params_table') @@ -105,40 +116,49 @@ $exec_params_table->addRow([(new CButton('exec_param_add', _('Add'))) ->addClass(ZBX_STYLE_BTN_LINK) ->addClass('element-table-add')]); -$mediaTypeFormList->addRow(_('Script parameters'), +$mediatype_formlist->addRow(_('Script parameters'), (new CDiv($exec_params_table)) ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px;'), 'row_exec_params' ); -$mediaTypeFormList->addRow(_('GSM modem'), - (new CTextBox('gsm_modem', $data['gsm_modem']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) +$mediatype_formlist->addRow((new CLabel(_('GSM modem'), 'gsm_modem'))->setAsteriskMark(), + (new CTextBox('gsm_modem', $data['gsm_modem'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ); -// create password field -if ($data['passwd'] != '') { - $passwdField = [ +// Create password field. +if ($data['passwd'] !== '') { + $passwd_field = [ (new CButton('chPass_btn', _('Change password'))) ->onClick('this.style.display="none"; $("passwd").show().focus();'), (new CPassBox('passwd', $data['passwd'])) ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ->addStyle('display: none;') ]; } else { - $passwdField = (new CPassBox('passwd'))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH); + $passwd_field = (new CPassBox('passwd'))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH); } // append password field to form list -$mediaTypeFormList - ->addRow(_('Jabber identifier'), - (new CTextBox('jabber_username', $data['jabber_username']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) +$mediatype_formlist + ->addRow((new CLabel(_('Jabber identifier'), 'jabber_username'))->setAsteriskMark(), + (new CTextBox('jabber_username', $data['jabber_username'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() + ) + ->addRow((new CLabel(_('Username'), 'eztext_username'))->setAsteriskMark(), + (new CTextBox('eztext_username', $data['eztext_username'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Username'), - (new CTextBox('eztext_username', $data['eztext_username']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->addRow((new CLabel(_('Password'), 'passwd'))->setAsteriskMark($data['passwd'] !== ''), + $passwd_field ) - ->addRow(_('Password'), $passwdField) ->addRow(_('Message text limit'), new CComboBox('eztext_limit', $data['eztext_limit'], null, [ EZ_TEXTING_LIMIT_USA => _('USA (160 characters)'), EZ_TEXTING_LIMIT_CANADA => _('Canada (136 characters)') @@ -146,7 +166,7 @@ $mediaTypeFormList ->addRow(_('Enabled'), (new CCheckBox('status', MEDIA_TYPE_STATUS_ACTIVE))->setChecked(MEDIA_TYPE_STATUS_ACTIVE == $data['status']) ); -$tabs->addTab('mediaTab', _('Media type'), $mediaTypeFormList); +$tabs->addTab('mediaTab', _('Media type'), $mediatype_formlist); // media options tab $max_sessions = ($data['maxsessions'] > 1) ? $data['maxsessions'] : 0; @@ -166,7 +186,7 @@ switch ($data['maxsessions']) { } $mediaOptionsForm = (new CFormList('options')) - ->addRow(_('Concurrent sessions'), + ->addRow((new CLabel(_('Concurrent sessions'), 'maxsessions_type')), (new CDiv()) ->addClass(ZBX_STYLE_NOWRAP) ->addItem([ @@ -178,16 +198,19 @@ $mediaOptionsForm = (new CFormList('options')) ->setModern(true) ))->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CNumericBox('maxsessions', $max_sessions, 3, false, false, false)) + ->setAriaRequired() ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ]) ) - ->addRow(_('Attempts'), + ->addRow((new CLabel(_('Attempts'), 'maxattempts'))->setAsteriskMark(), (new CNumericBox('maxattempts', $data['maxattempts'], 3, false, false, false)) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Attempt interval'), + ->addRow((new CLabel(_('Attempt interval'), 'attempt_interval'))->setAsteriskMark(), (new CTextBox('attempt_interval', $data['attempt_interval'], false, 12)) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->setAriaRequired() ); $tabs->addTab('optionsTab', _('Options'), $mediaOptionsForm); diff --git a/frontends/php/app/views/administration.mediatype.list.php b/frontends/php/app/views/administration.mediatype.list.php index c4315181f38..5b9effd83f1 100644 --- a/frontends/php/app/views/administration.mediatype.list.php +++ b/frontends/php/app/views/administration.mediatype.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/administration.proxy.edit.js.php b/frontends/php/app/views/administration.proxy.edit.js.php index 55093344e60..069dd904125 100644 --- a/frontends/php/app/views/administration.proxy.edit.js.php +++ b/frontends/php/app/views/administration.proxy.edit.js.php @@ -10,6 +10,13 @@ toggleEncryptionFields(); }); + $(':radio[name=useip]').change(function() { + $(':text[name=ip],:text[name=dns]') + .removeAttr('aria-required') + .filter(($(this).val() == <?= INTERFACE_USE_IP ?>) ? '[name=ip]' : '[name=dns]') + .attr('aria-required', 'true'); + }); + // clone button, special processing because of list of hosts $('#clone').click(function() { var url = new Curl('zabbix.php?action=proxy.edit'); @@ -54,7 +61,7 @@ }); // Refresh field visibility on document load. - $('#status').trigger('change'); + $('#status,[name=useip]:checked').trigger('change'); $('#tls_connect, #tls_in_psk, #tls_in_cert').change(function() { displayAdditionalEncryptionFields(); diff --git a/frontends/php/app/views/administration.proxy.edit.php b/frontends/php/app/views/administration.proxy.edit.php index 668454a4afd..0b359485867 100644 --- a/frontends/php/app/views/administration.proxy.edit.php +++ b/frontends/php/app/views/administration.proxy.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -48,7 +48,9 @@ $interfaceTable = (new CTable()) ->addValue(_('IP'), INTERFACE_USE_IP) ->addValue(_('DNS'), INTERFACE_USE_DNS) ->setModern(true), - (new CTextBox('port', $data['port'], false, 64))->setWidth(ZBX_TEXTAREA_INTERFACE_PORT_WIDTH) + (new CTextBox('port', $data['port'], false, 64)) + ->setWidth(ZBX_TEXTAREA_INTERFACE_PORT_WIDTH) + ->setAriaRequired() ]); // append hosts to form list @@ -70,18 +72,23 @@ foreach ($data['all_hosts'] as $host) { } $proxy_form_list = (new CFormList('proxyFormList')) - ->addRow(_('Proxy name'), + ->addRow((new CLabel(_('Proxy name'), 'host'))->setAsteriskMark(), (new CTextBox('host', $data['host'], false, 128)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setAttribute('autofocus', 'autofocus') + ->setAriaRequired() ) - ->addRow(_('Proxy mode'), + ->addRow((new CLabel(_('Proxy mode'), 'status')), (new CRadioButtonList('status', (int) $data['status'])) ->addValue(_('Active'), HOST_STATUS_PROXY_ACTIVE) ->addValue(_('Passive'), HOST_STATUS_PROXY_PASSIVE) ->setModern(true) ) - ->addRow(_('Interface'), (new CDiv($interfaceTable))->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)) + ->addRow((new CLabel(_('Interface'), 'proxy_interface'))->setAsteriskMark(), + (new CDiv($interfaceTable)) + ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) + ->setId('proxy_interface') + ) ->addRow(_('Proxy address'), (new CTextBox('proxy_address', $data['proxy_address'], false, 255))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ) @@ -109,11 +116,15 @@ $encryption_form_list = (new CFormList('encryption')) ->addItem((new CCheckBox('tls_in_psk'))->setLabel(_('PSK'))) ->addItem((new CCheckBox('tls_in_cert'))->setLabel(_('Certificate'))) ) - ->addRow(_('PSK identity'), - (new CTextBox('tls_psk_identity', $data['tls_psk_identity'], false, 128))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->addRow((new CLabel(_('PSK identity'), 'tls_psk_identity'))->setAsteriskMark(), + (new CTextBox('tls_psk_identity', $data['tls_psk_identity'], false, 128)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ) - ->addRow(_('PSK'), - (new CTextBox('tls_psk', $data['tls_psk'], false, 512))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->addRow((new CLabel(_('PSK'), 'tls_psk'))->setAsteriskMark(), + (new CTextBox('tls_psk', $data['tls_psk'], false, 512)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ) ->addRow(_('Issuer'), (new CTextBox('tls_issuer', $data['tls_issuer'], false, 1024))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) diff --git a/frontends/php/app/views/administration.proxy.list.php b/frontends/php/app/views/administration.proxy.list.php index c8d798feb6a..9f9b5e12c42 100644 --- a/frontends/php/app/views/administration.proxy.list.php +++ b/frontends/php/app/views/administration.proxy.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/administration.script.edit.php b/frontends/php/app/views/administration.script.edit.php index 4ec44523663..97d50c87b62 100644 --- a/frontends/php/app/views/administration.script.edit.php +++ b/frontends/php/app/views/administration.script.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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,32 +31,36 @@ $scriptForm = (new CForm()) ->addVar('scriptid', $data['scriptid']); $scriptFormList = (new CFormList()) - ->addRow(_('Name'), + ->addRow((new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $data['name'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setAttribute('autofocus', 'autofocus') ->setAttribute('placeholder', _('<Sub-menu/Sub-menu.../>Script')) + ->setAriaRequired() ) - ->addRow(_('Type'), + ->addRow((new CLabel(_('Type'), 'type')), (new CRadioButtonList('type', (int) $data['type'])) ->addValue(_('IPMI'), ZBX_SCRIPT_TYPE_IPMI) ->addValue(_('Script'), ZBX_SCRIPT_TYPE_CUSTOM_SCRIPT) ->setModern(true) ) - ->addRow(_('Execute on'), + ->addRow((new CLabel(_('Execute on'), 'execute_on')), (new CRadioButtonList('execute_on', (int) $data['execute_on'])) ->addValue(_('Zabbix agent'), ZBX_SCRIPT_EXECUTE_ON_AGENT) ->addValue(_('Zabbix server (proxy)'), ZBX_SCRIPT_EXECUTE_ON_PROXY) ->addValue(_('Zabbix server'), ZBX_SCRIPT_EXECUTE_ON_SERVER) ->setModern(true) ) - ->addRow(_('Commands'), + ->addRow((new CLabel(_('Commands'), 'command'))->setAsteriskMark(), (new CTextArea('command', $data['command'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setMaxLength(255) + ->setAriaRequired() ) - ->addRow(_('Command'), - (new CTextBox('commandipmi', $data['commandipmi']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->addRow((new CLabel(_('Command'), 'commandipmi'))->setAsteriskMark(), + (new CTextBox('commandipmi', $data['commandipmi'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ) ->addRow(_('Description'), (new CTextArea('description', $data['description']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) @@ -89,7 +93,7 @@ $scriptFormList ] ]])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), 'hostGroupSelection') - ->addRow(_('Required host permissions'), + ->addRow((new CLabel(_('Required host permissions'), 'host_access')), (new CRadioButtonList('host_access', (int) $data['host_access'])) ->addValue(_('Read'), PERM_READ) ->addValue(_('Write'), PERM_READ_WRITE) @@ -99,8 +103,7 @@ $scriptFormList (new CCheckBox('enable_confirmation'))->setChecked($data['enable_confirmation'] == 1) ); -$confirmationLabel = new CLabel(_('Confirmation text'), 'confirmation'); -$scriptFormList->addRow($confirmationLabel, [ +$scriptFormList->addRow(new CLabel(_('Confirmation text'), 'confirmation'), [ (new CTextBox('confirmation', $data['confirmation']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), SPACE, (new CButton('testConfirmation', _('Test confirmation')))->addClass(ZBX_STYLE_BTN_GREY) diff --git a/frontends/php/app/views/administration.script.list.php b/frontends/php/app/views/administration.script.list.php index c8040d433a8..ca7befd5f64 100644 --- a/frontends/php/app/views/administration.script.list.php +++ b/frontends/php/app/views/administration.script.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/layout.csv.php b/frontends/php/app/views/layout.csv.php index ddfc2f55695..3011144b5ad 100644 --- a/frontends/php/app/views/layout.csv.php +++ b/frontends/php/app/views/layout.csv.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/layout.htmlpage.footer.php b/frontends/php/app/views/layout.htmlpage.footer.php index b3ea7e068e6..bb441b4f55d 100644 --- a/frontends/php/app/views/layout.htmlpage.footer.php +++ b/frontends/php/app/views/layout.htmlpage.footer.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/layout.htmlpage.header.php b/frontends/php/app/views/layout.htmlpage.header.php index 44ce24576d8..3316ae50391 100644 --- a/frontends/php/app/views/layout.htmlpage.header.php +++ b/frontends/php/app/views/layout.htmlpage.header.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/layout.htmlpage.menu.php b/frontends/php/app/views/layout.htmlpage.menu.php index f900bb29b0e..d7b80de2ea5 100644 --- a/frontends/php/app/views/layout.htmlpage.menu.php +++ b/frontends/php/app/views/layout.htmlpage.menu.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -36,7 +36,7 @@ $icons = (new CList()) ->setTitle(_('Zabbix Share')) ) ->addItem( - (new CLink(SPACE, 'http://www.zabbix.com/documentation/3.4/')) + (new CLink(SPACE, 'http://www.zabbix.com/documentation/4.0/')) ->addClass(ZBX_STYLE_TOP_NAV_HELP) ->setAttribute('target', '_blank') ->setTitle(_('Help')) diff --git a/frontends/php/app/views/layout.htmlpage.php b/frontends/php/app/views/layout.htmlpage.php index e59e6fa8340..45a307eac13 100644 --- a/frontends/php/app/views/layout.htmlpage.php +++ b/frontends/php/app/views/layout.htmlpage.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/layout.javascript.php b/frontends/php/app/views/layout.javascript.php index 0f2f5256702..203af054081 100644 --- a/frontends/php/app/views/layout.javascript.php +++ b/frontends/php/app/views/layout.javascript.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/layout.json.php b/frontends/php/app/views/layout.json.php index 3a0dd87b898..efd98f059c3 100644 --- a/frontends/php/app/views/layout.json.php +++ b/frontends/php/app/views/layout.json.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/layout.warning.php b/frontends/php/app/views/layout.warning.php index d0666d14a70..1096d17d3d7 100644 --- a/frontends/php/app/views/layout.warning.php +++ b/frontends/php/app/views/layout.warning.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/layout.widget.php b/frontends/php/app/views/layout.widget.php index 3a0dd87b898..efd98f059c3 100644 --- a/frontends/php/app/views/layout.widget.php +++ b/frontends/php/app/views/layout.widget.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.acknowledge.edit.php b/frontends/php/app/views/monitoring.acknowledge.edit.php index 3fff866684f..da71957b59f 100644 --- a/frontends/php/app/views/monitoring.acknowledge.edit.php +++ b/frontends/php/app/views/monitoring.acknowledge.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -22,8 +22,10 @@ $this->includeJSfile('app/views/monitoring.acknowledge.edit.js.php'); $form_list = (new CFormList()) - ->addRow(_('Message'), + ->addRow( + (new CLabel(_('Message'), 'message'))->setAsteriskMark(), (new CTextArea('message')) + ->setAriaRequired() ->setWidth(ZBX_TEXTAREA_BIG_WIDTH) ->setMaxLength(255) ->setAttribute('autofocus', 'autofocus') diff --git a/frontends/php/app/views/monitoring.dashboard.breadcrumbs.php b/frontends/php/app/views/monitoring.dashboard.breadcrumbs.php index 75fa9e80493..79219689d0c 100644 --- a/frontends/php/app/views/monitoring.dashboard.breadcrumbs.php +++ b/frontends/php/app/views/monitoring.dashboard.breadcrumbs.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.dashboard.config.php b/frontends/php/app/views/monitoring.dashboard.config.php index 710082b138c..8b7387609c8 100644 --- a/frontends/php/app/views/monitoring.dashboard.config.php +++ b/frontends/php/app/views/monitoring.dashboard.config.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -29,8 +29,8 @@ $js_scripts = []; $form_list = new CFormList(); // common fields -$form_list->addRow(_('Type'), - new CComboBox('type', $data['dialogue']['type'], 'updateWidgetConfigDialogue()', $data['known_widget_types']) +$form_list->addRow((new CLabel(_('Type'), 'type')), + (new CComboBox('type', $data['dialogue']['type'], 'updateWidgetConfigDialogue()', $data['known_widget_types'])) ); $form_list->addRow(_('Name'), @@ -46,19 +46,22 @@ foreach ($data['dialogue']['fields'] as $field) { $form->addVar($field->getName(), $field->getValue()); continue; } + $aria_required = ($field->getFlags() & CWidgetField::FLAG_LABEL_ASTERISK); if ($field instanceof CWidgetFieldComboBox) { - $form_list->addRow($field->getLabel(), - new CComboBox($field->getName(), $field->getValue(), $field->getAction(), $field->getValues()) + $form_list->addRow((new CLabel($field->getLabel(), $field->getName()))->setAsteriskMark($aria_required), + (new CComboBox($field->getName(), $field->getValue(), $field->getAction(), $field->getValues())) + ->setAriaRequired($aria_required) ); } elseif ($field instanceof CWidgetFieldTextBox || $field instanceof CWidgetFieldUrl) { - $form_list->addRow($field->getLabel(), + $form_list->addRow((new CLabel($field->getLabel(), $field->getName()))->setAsteriskMark($aria_required), (new CTextBox($field->getName(), $field->getValue()))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired($aria_required) ); } elseif ($field instanceof CWidgetFieldCheckBox) { - $form_list->addRow($field->getLabel(), [ + $form_list->addRow((new CLabel($field->getLabel(), $field->getName()))->setAsteriskMark($aria_required), [ new CVar($field->getName(), '0'), (new CCheckBox($field->getName()))->setChecked((bool) $field->getValue()) ]); @@ -80,9 +83,13 @@ foreach ($data['dialogue']['fields'] as $field) { ] ], 'add_post_js' => false - ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); + ])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired($aria_required); - $form_list->addRow($field->getLabel(), $field_groupids); + $form_list->addRow((new CLabel($field->getLabel(), $field->getName().'[]'))->setAsteriskMark($aria_required), + $field_groupids + ); $js_scripts[] = $field_groupids->getPostJS(); } @@ -104,9 +111,12 @@ foreach ($data['dialogue']['fields'] as $field) { ], 'add_post_js' => false ])) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired($aria_required); - $form_list->addRow($field->getLabel(), $field_hostids); + $form_list->addRow((new CLabel($field->getLabel(), $field->getName().'[]'))->setAsteriskMark($aria_required), + $field_hostids + ); $js_scripts[] = $field_hostids->getPostJS(); } @@ -128,8 +138,10 @@ foreach ($data['dialogue']['fields'] as $field) { // Needed for popup script. $form->addVar($field->getName(), $field->getValue()); - $form_list->addRow($field->getLabel(), [ - (new CTextBox($field->getName().'_caption', $caption, true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + $form_list->addRow((new CLabel($field->getLabel(), $field->getName()))->setAsteriskMark($aria_required), [ + (new CTextBox($field->getName().'_caption', $caption, true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired($aria_required), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('select', _('Select'))) ->addClass(ZBX_STYLE_BTN_GREY) @@ -138,29 +150,38 @@ foreach ($data['dialogue']['fields'] as $field) { ]); } elseif ($field instanceof CWidgetFieldWidgetListComboBox) { - $form_list->addRow($field->getLabel(), + $form_list->addRow((new CLabel($field->getLabel(), $field->getName()))->setAsteriskMark($aria_required), (new CComboBox($field->getName(), [], $field->getAction(), [])) - ->setAttribute('style', 'width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px') + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired($aria_required) ); $form->addItem(new CJsScript(get_js($field->getJavascript(), true))); } elseif ($field instanceof CWidgetFieldNumericBox) { - $form_list->addRow($field->getLabel(), + $form_list->addRow((new CLabel($field->getLabel(), $field->getName()))->setAsteriskMark($aria_required), (new CNumericBox($field->getName(), $field->getValue(), $field->getMaxLength())) ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired($aria_required) ); } elseif ($field instanceof CWidgetFieldRadioButtonList) { $radio_button_list = (new CRadioButtonList($field->getName(), $field->getValue())) - ->setModern($field->getModern()); + ->setModern($field->getModern()) + ->setAriaRequired($aria_required); + foreach ($field->getValues() as $key => $value) { $radio_button_list->addValue($value, $key, null, $field->getAction()); } - $form_list->addRow($field->getLabel(), $radio_button_list); + + $form_list->addRow( + (new CLabel($field->getLabel(), $field->getName()))->setAsteriskMark($aria_required), + $radio_button_list + ); } elseif ($field instanceof CWidgetFieldSeverities) { - $severities = (new CList())->addClass(ZBX_STYLE_LIST_CHECK_RADIO); + $severities = (new CList()) + ->addClass(ZBX_STYLE_LIST_CHECK_RADIO); for ($severity = TRIGGER_SEVERITY_NOT_CLASSIFIED; $severity < TRIGGER_SEVERITY_COUNT; $severity++) { $severities->addItem( @@ -171,7 +192,9 @@ foreach ($data['dialogue']['fields'] as $field) { ); } - $form_list->addRow($field->getLabel(), $severities); + $form_list->addRow((new CLabel($field->getLabel(), $field->getName()))->setAsteriskMark($aria_required), + $severities + ); } elseif ($field instanceof CWidgetFieldTags) { $tags = $field->getValue(); @@ -187,14 +210,16 @@ foreach ($data['dialogue']['fields'] as $field) { $tags_table->addRow([ (new CTextBox($field->getName().'['.$i.'][tag]', $tag['tag'])) ->setAttribute('placeholder', _('tag')) - ->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH), + ->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH) + ->setAriaRequired($aria_required), (new CRadioButtonList($field->getName().'['.$i.'][operator]', (int) $tag['operator'])) ->addValue(_('Like'), TAG_OPERATOR_LIKE) ->addValue(_('Equal'), TAG_OPERATOR_EQUAL) ->setModern(true), (new CTextBox($field->getName().'['.$i.'][value]', $tag['value'])) ->setAttribute('placeholder', _('value')) - ->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH), + ->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH) + ->setAriaRequired($aria_required), (new CCol( (new CButton($field->getName().'['.$i.'][remove]', _('Remove'))) ->addClass(ZBX_STYLE_BTN_LINK) @@ -213,19 +238,23 @@ foreach ($data['dialogue']['fields'] as $field) { ))->setColSpan(3) ); - $form_list->addRow($field->getLabel(), $tags_table); + $form_list->addRow((new CLabel($field->getLabel(), $field->getName()))->setAsteriskMark($aria_required), + $tags_table + ); $jq_templates['tag-row'] = (new CRow([ (new CTextBox($field->getName().'[#{rowNum}][tag]')) ->setAttribute('placeholder', _('tag')) - ->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH), + ->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH) + ->setAriaRequired($aria_required), (new CRadioButtonList($field->getName().'[#{rowNum}][operator]', TAG_OPERATOR_LIKE)) ->addValue(_('Like'), TAG_OPERATOR_LIKE) ->addValue(_('Equal'), TAG_OPERATOR_EQUAL) ->setModern(true), (new CTextBox($field->getName().'[#{rowNum}][value]')) ->setAttribute('placeholder', _('value')) - ->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH), + ->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH) + ->setAriaRequired($aria_required), (new CCol( (new CButton($field->getName().'[#{rowNum}][remove]', _('Remove'))) ->addClass(ZBX_STYLE_BTN_LINK) diff --git a/frontends/php/app/views/monitoring.dashboard.edit_form.php b/frontends/php/app/views/monitoring.dashboard.edit_form.php index d93ce1fd655..8e6f3369d20 100644 --- a/frontends/php/app/views/monitoring.dashboard.edit_form.php +++ b/frontends/php/app/views/monitoring.dashboard.edit_form.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -43,13 +43,15 @@ $multiselect = (new CMultiSelect([ 'callPostEvent' => true ])) ->setAttribute('data-default-owner', CJs::encodeJson($data['dashboard']['owner'])) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(); $form->addItem((new CFormList()) - ->addRow(_('Owner'), $multiselect) - ->addRow(_('Name'), + ->addRow((new CLabel(_('Owner'), 'userid'))->setAsteriskMark(), $multiselect) + ->addRow((new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $data['dashboard']['name'], false, DB::getFieldLength('dashboard', 'name'))) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ) ); diff --git a/frontends/php/app/views/monitoring.dashboard.list.php b/frontends/php/app/views/monitoring.dashboard.list.php index 52be8cd0010..7858972a96d 100644 --- a/frontends/php/app/views/monitoring.dashboard.list.php +++ b/frontends/php/app/views/monitoring.dashboard.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.dashboard.sharing_form.php b/frontends/php/app/views/monitoring.dashboard.sharing_form.php index 21f894fb00f..28f67aa1933 100644 --- a/frontends/php/app/views/monitoring.dashboard.sharing_form.php +++ b/frontends/php/app/views/monitoring.dashboard.sharing_form.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.dashboard.view.php b/frontends/php/app/views/monitoring.dashboard.view.php index fd6a2af6ce9..8cde7fa9508 100644 --- a/frontends/php/app/views/monitoring.dashboard.view.php +++ b/frontends/php/app/views/monitoring.dashboard.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.discovery.view.php b/frontends/php/app/views/monitoring.discovery.view.php index efb5537995e..793d3706062 100644 --- a/frontends/php/app/views/monitoring.discovery.view.php +++ b/frontends/php/app/views/monitoring.discovery.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.map.view.php b/frontends/php/app/views/monitoring.map.view.php index 9c5bc61e4ff..2fce56716ba 100644 --- a/frontends/php/app/views/monitoring.map.view.php +++ b/frontends/php/app/views/monitoring.map.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.problem.view.php b/frontends/php/app/views/monitoring.problem.view.php index 1eb3ee84067..b6e5d4ee927 100644 --- a/frontends/php/app/views/monitoring.problem.view.php +++ b/frontends/php/app/views/monitoring.problem.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.web.view.php b/frontends/php/app/views/monitoring.web.view.php index ac93cec734d..05b19a2ca8b 100644 --- a/frontends/php/app/views/monitoring.web.view.php +++ b/frontends/php/app/views/monitoring.web.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.actionlog.view.php b/frontends/php/app/views/monitoring.widget.actionlog.view.php index 9c3b41ed60a..d66bd2005c0 100644 --- a/frontends/php/app/views/monitoring.widget.actionlog.view.php +++ b/frontends/php/app/views/monitoring.widget.actionlog.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.clock.view.php b/frontends/php/app/views/monitoring.widget.clock.view.php index 8da9bb64c29..fa5633cb746 100644 --- a/frontends/php/app/views/monitoring.widget.clock.view.php +++ b/frontends/php/app/views/monitoring.widget.clock.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.dataover.view.php b/frontends/php/app/views/monitoring.widget.dataover.view.php index aaa4326e5b6..1af8ab9407f 100644 --- a/frontends/php/app/views/monitoring.widget.dataover.view.php +++ b/frontends/php/app/views/monitoring.widget.dataover.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.discovery.view.php b/frontends/php/app/views/monitoring.widget.discovery.view.php index ecfeb6633a2..aeae921b7bc 100644 --- a/frontends/php/app/views/monitoring.widget.discovery.view.php +++ b/frontends/php/app/views/monitoring.widget.discovery.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.favgraphs.view.php b/frontends/php/app/views/monitoring.widget.favgraphs.view.php index d4ae4b7e673..2179d02aad4 100644 --- a/frontends/php/app/views/monitoring.widget.favgraphs.view.php +++ b/frontends/php/app/views/monitoring.widget.favgraphs.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.favmaps.view.php b/frontends/php/app/views/monitoring.widget.favmaps.view.php index c243f9c4568..c3b04be9d4d 100644 --- a/frontends/php/app/views/monitoring.widget.favmaps.view.php +++ b/frontends/php/app/views/monitoring.widget.favmaps.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.favscreens.view.php b/frontends/php/app/views/monitoring.widget.favscreens.view.php index c396340f75d..4505f68e078 100644 --- a/frontends/php/app/views/monitoring.widget.favscreens.view.php +++ b/frontends/php/app/views/monitoring.widget.favscreens.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.graph.view.php b/frontends/php/app/views/monitoring.widget.graph.view.php index 1fc53e6dc73..0247216837c 100644 --- a/frontends/php/app/views/monitoring.widget.graph.view.php +++ b/frontends/php/app/views/monitoring.widget.graph.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.hosts.view.php b/frontends/php/app/views/monitoring.widget.hosts.view.php index c660faf9fdc..58d823bf0ff 100644 --- a/frontends/php/app/views/monitoring.widget.hosts.view.php +++ b/frontends/php/app/views/monitoring.widget.hosts.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.navigationtree.view.php b/frontends/php/app/views/monitoring.widget.navigationtree.view.php index b3535880c23..48fd5bd40df 100644 --- a/frontends/php/app/views/monitoring.widget.navigationtree.view.php +++ b/frontends/php/app/views/monitoring.widget.navigationtree.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.plaintext.view.php b/frontends/php/app/views/monitoring.widget.plaintext.view.php index 54c3b44602f..d7b97e27175 100644 --- a/frontends/php/app/views/monitoring.widget.plaintext.view.php +++ b/frontends/php/app/views/monitoring.widget.plaintext.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.problems.view.php b/frontends/php/app/views/monitoring.widget.problems.view.php index f3c5297fd5a..1dfacfce753 100644 --- a/frontends/php/app/views/monitoring.widget.problems.view.php +++ b/frontends/php/app/views/monitoring.widget.problems.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.status.view.php b/frontends/php/app/views/monitoring.widget.status.view.php index a4bb70cdb31..37039b91969 100644 --- a/frontends/php/app/views/monitoring.widget.status.view.php +++ b/frontends/php/app/views/monitoring.widget.status.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.sysmap.view.php b/frontends/php/app/views/monitoring.widget.sysmap.view.php index 7e36859cb54..73128bf5f01 100644 --- a/frontends/php/app/views/monitoring.widget.sysmap.view.php +++ b/frontends/php/app/views/monitoring.widget.sysmap.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.system.view.php b/frontends/php/app/views/monitoring.widget.system.view.php index 5ddc7c910b0..37865a886e2 100644 --- a/frontends/php/app/views/monitoring.widget.system.view.php +++ b/frontends/php/app/views/monitoring.widget.system.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.trigover.view.php b/frontends/php/app/views/monitoring.widget.trigover.view.php index 868e65f927d..baf8c58f270 100644 --- a/frontends/php/app/views/monitoring.widget.trigover.view.php +++ b/frontends/php/app/views/monitoring.widget.trigover.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.url.view.php b/frontends/php/app/views/monitoring.widget.url.view.php index fd48e37831b..ccebdad9715 100644 --- a/frontends/php/app/views/monitoring.widget.url.view.php +++ b/frontends/php/app/views/monitoring.widget.url.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/monitoring.widget.web.view.php b/frontends/php/app/views/monitoring.widget.web.view.php index 26d505fc8f0..6023412db0d 100644 --- a/frontends/php/app/views/monitoring.widget.web.view.php +++ b/frontends/php/app/views/monitoring.widget.web.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/popup.generic.php b/frontends/php/app/views/popup.generic.php index 50e0cad8484..e38e0ee4148 100644 --- a/frontends/php/app/views/popup.generic.php +++ b/frontends/php/app/views/popup.generic.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/popup.httpstep.js.php b/frontends/php/app/views/popup.httpstep.js.php new file mode 100644 index 00000000000..cd7115d805e --- /dev/null +++ b/frontends/php/app/views/popup.httpstep.js.php @@ -0,0 +1,64 @@ +<?php +/* +** Zabbix +** Copyright (C) 2001-2018 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 +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ + + +ob_start(); ?> +/** + * Send HTTP test step form data to server for validation before adding it to web scenario tab. + * + * @param {string} formname form name that is sent to server for validation + * @param {string} dialogueid (optional) id of overlay dialogue. + */ +function validateHttpStep(formname, dialogueid) { + var form = window.document.forms[formname], + url = new Curl(jQuery(form).attr('action')), + dialogueid = dialogueid || null; + + jQuery(form).trimValues(['#name', '#url', '#timeout', '#required', '#status_codes']); + + url.setArgument('validate', 1); + + jQuery.ajax({ + url: url.getUrl(), + data: jQuery(form).serialize(), + success: function(ret) { + jQuery(form).parent().find('.msg-bad, .msg-good').remove(); + + if (typeof ret.errors !== 'undefined') { + jQuery(ret.errors).insertBefore(jQuery(form)); + } + else { + if (typeof ret.params.stepid !== 'undefined') { + update_httpstep(ret.dstfrm, ret.list_name, ret.params); + } + else { + add_httpstep(ret.dstfrm, ret.params); + } + + if (dialogueid) { + overlayDialogueDestroy(dialogueid); + } + } + }, + dataType: 'json', + type: 'post' + }); +} +<?php return ob_get_clean(); ?> diff --git a/frontends/php/app/views/popup.httpstep.php b/frontends/php/app/views/popup.httpstep.php index 6fc3f49349e..0db4ca4d0e4 100644 --- a/frontends/php/app/views/popup.httpstep.php +++ b/frontends/php/app/views/popup.httpstep.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -21,7 +21,7 @@ $output = [ 'header' => $data['title'], - 'script_inline' => '' + 'script_inline' => require 'app/views/popup.httpstep.js.php' ]; $options = $data['options']; @@ -37,13 +37,17 @@ $http_popup_form = (new CForm()) ->addVar('action', 'popup.httpstep'); $http_popup_form_list = (new CFormList()) - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $options['name'], (bool) $options['templated'], 64)) + ->setAriaRequired() ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ) - ->addRow(_('URL'), + ->addRow( + (new CLabel(_('URL'), 'url'))->setAsteriskMark(), new CDiv([ (new CTextBox('url', $options['url'], false, null)) + ->setAriaRequired() ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('parse', _('Parse'))) @@ -133,8 +137,9 @@ $http_popup_form_list (new CCheckBox('retrieve_mode')) ->setChecked($options['retrieve_mode'] == HTTPTEST_STEP_RETRIEVE_MODE_HEADERS) ) - ->addRow(_('Timeout'), + ->addRow((new CLabel(_('Timeout'), 'timeout'))->setAsteriskMark(), (new CTextBox('timeout', $options['timeout'])) + ->setAriaRequired() ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) ) ->addRow(_('Required string'), @@ -153,7 +158,7 @@ $output['buttons'] = [ 'title' => ($options['stepid'] == -1) ? _('Add') : _('Update'), 'class' => '', 'keepOpen' => true, - 'action' => 'return validate_httpstep("'.$http_popup_form->getId().'", '. + 'action' => 'return validateHttpStep("'.$http_popup_form->getId().'", '. 'jQuery(window.document.forms["'.$http_popup_form->getId().'"])' . '.closest("[data-dialogueid]").attr("data-dialogueid"));' ] diff --git a/frontends/php/app/views/popup.media.js.php b/frontends/php/app/views/popup.media.js.php new file mode 100644 index 00000000000..d7cb1b22a86 --- /dev/null +++ b/frontends/php/app/views/popup.media.js.php @@ -0,0 +1,75 @@ +<?php +/* +** Zabbix +** Copyright (C) 2001-2018 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 +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ + + +ob_start(); ?> +jQuery(document).ready(function($) { + $('#email_send_to').dynamicRows({ + template: '#email_send_to_table_row' + }); + + // Show/hide multiple "Send to" inputs and single "Send to" input and populate hidden "type" field. + $('#mediatypeid') + .on('change', function() { + var mediatypes_by_type = <?= (new CJson())->encode($data['mediatypes']) ?>, + mediatypeid = $(this).val(); + + $('#type').val(mediatypes_by_type[mediatypeid]); + + if (mediatypes_by_type[mediatypeid] == <?= MEDIA_TYPE_EMAIL ?>) { + $('#mediatype_send_to').hide(); + $('#mediatype_email_send_to').show(); + } + else { + $('#mediatype_send_to').show(); + $('#mediatype_email_send_to').hide(); + } + }) + .trigger("change"); +}); + +/** + * Send media form data to server for validation before adding them to user media tab. + * + * @param {string} formname form name that is sent to server for validation + */ +function validateMedia(formname) { + var form = window.document.forms[formname]; + + jQuery(form).trimValues(['#period', '#sendto', 'input[name^="sendto_emails"]']); + + jQuery.ajax({ + url: jQuery(form).attr('action'), + data: jQuery(form).serialize(), + success: function(ret) { + jQuery(form).parent().find('.msg-bad, .msg-good').remove(); + + if (typeof ret.errors !== 'undefined') { + jQuery(ret.errors).insertBefore(jQuery(form)); + } + else { + add_media(ret.dstfrm, ret.media, ret.mediatypeid, ret.sendto, ret.period, ret.active, ret.severity); + } + }, + dataType: 'json', + type: 'post' + }); +} +<?php return ob_get_clean(); ?> diff --git a/frontends/php/app/views/popup.media.php b/frontends/php/app/views/popup.media.php index 1eea6083219..47bc89596ca 100644 --- a/frontends/php/app/views/popup.media.php +++ b/frontends/php/app/views/popup.media.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -35,7 +35,9 @@ $email_send_to_table = (new CTable())->setId('email_send_to'); foreach ($options['sendto_emails'] as $i => $email) { $email_send_to_table->addRow([ - (new CTextBox('sendto_emails['.$i.']', $email))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + (new CTextBox('sendto_emails['.$i.']', $email)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), (new CButton('sendto_emails['.$i.'][remove]', _('Remove'))) ->addClass(ZBX_STYLE_BTN_LINK) ->addClass('element-table-remove') @@ -51,82 +53,66 @@ $email_send_to_table->setFooter(new CCol( // Create media form. $media_form = (new CFormList(_('Media'))) ->addRow(_('Type'), new CComboBox('mediatypeid', $options['mediatypeid'], null, $data['db_mediatypes'])) - ->addRow(_('Send to'), - (new CTextBox('sendto', $options['sendto'], false, 100))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ->addRow( + (new CLabel(_('Send to'), 'sendto'))->setAsteriskMark(), + (new CTextBox('sendto', $options['sendto'], false, 100)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), 'mediatype_send_to' ) - ->addRow(_('Send to'), $email_send_to_table, 'mediatype_email_send_to') - ->addRow(_('When active'), - (new CTextBox('period', $options['period'], false, 1024))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->addRow( + (new CLabel(_('Send to'), 'mediatype_email_send_to'))->setAsteriskMark(), + $email_send_to_table, + 'mediatype_email_send_to' + ) + ->addRow((new CLabel(_('When active'), 'period'))->setAsteriskMark(), + (new CTextBox('period', $options['period'], false, 1024)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ) ->addRow(_('Use if severity'), $severity_row) ->addRow(_('Enabled'), (new CCheckBox('active', MEDIA_STATUS_ACTIVE))->setChecked($options['active'] == MEDIA_STATUS_ACTIVE) ); -$body_html = (new CForm()) - ->addVar('action', 'popup.media') - ->addVar('add', '1') - ->addVar('media', $options['media']) - ->addVar('type', $options['type']) - ->addVar('dstfrm', $options['dstfrm']) - ->addItem( - (new CTabView())->addTab('mediaTab', _('Media'), $media_form) - ) - ->setId('media_form') - ->toString(); - -$body_html .= (new CTag('script')) - ->addItem((new CRow([ - (new CCol((new CTextBox('sendto_emails[#{rowNum}]', ''))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH))), - (new CCol((new CButton('sendto_emails[#{rowNum}][remove]', _('Remove'))) - ->addClass(ZBX_STYLE_BTN_LINK) - ->addClass('element-table-remove') - )), - ])) - ->addClass('form_row')) - ->setAttribute('type', 'text/x-jquery-tmpl') - ->setAttribute('id', 'email_send_to_table_row') - ->toString(); +$form = (new CForm()) + ->setName('media_form') + ->addVar('action', 'popup.media') + ->addVar('add', '1') + ->addVar('media', $options['media']) + ->addVar('type', $options['type']) + ->addVar('dstfrm', $options['dstfrm']) + ->setId('media_form') + ->addItem((new CTabView())->addTab('mediaTab', _('Media'), $media_form)) + ->addItem( + (new CTag('script')) + ->addItem((new CRow([ + (new CCol((new CTextBox('sendto_emails[#{rowNum}]', '')) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + )), + (new CCol((new CButton('sendto_emails[#{rowNum}][remove]', _('Remove'))) + ->addClass(ZBX_STYLE_BTN_LINK) + ->addClass('element-table-remove') + )), + ])) + ->addClass('form_row')) + ->setAttribute('type', 'text/x-jquery-tmpl') + ->setAttribute('id', 'email_send_to_table_row') +); $output = [ 'header' => $data['title'], - 'body' => $body_html, + 'script_inline' => require 'app/views/popup.media.js.php', + 'body' => $form->toString(), 'buttons' => [ [ 'title' => ($options['media'] !== -1) ? _('Update') : _('Add'), 'class' => '', 'keepOpen' => true, - 'action' => 'return validate_media("media_form");' + 'action' => 'return validateMedia("'.$form->getName().'");' ] - ], - 'script_inline' => - 'jQuery(document).ready(function($) {'. - '\'use strict\';'. - ''. - '$("#email_send_to").dynamicRows({'. - 'template: "#email_send_to_table_row"'. - '});'. - - // Show/hide multiple "Send to" inputs and single "Send to" input and populate hidden "type" field. - '$("#mediatypeid")'. - '.on("change", function() {'. - 'var mediatypes_by_type = '.(new CJson())->encode($data['mediatypes']).','. - 'mediatypeid = $(this).val();'. - - '$("#type").val(mediatypes_by_type[mediatypeid]);'. - - 'if (mediatypes_by_type[mediatypeid] == '.MEDIA_TYPE_EMAIL.') {'. - '$("#mediatype_send_to").hide();'. - '$("#mediatype_email_send_to").show();'. - '}'. - 'else {'. - '$("#mediatype_send_to").show();'. - '$("#mediatype_email_send_to").hide();'. - '}'. - '})'. - '.trigger("change");'. - '});' + ] ]; echo (new CJson())->encode($output); diff --git a/frontends/php/app/views/popup.scriptexec.php b/frontends/php/app/views/popup.scriptexec.php index 074c66f7b9f..35e4d99297f 100644 --- a/frontends/php/app/views/popup.scriptexec.php +++ b/frontends/php/app/views/popup.scriptexec.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/popup.services.php b/frontends/php/app/views/popup.services.php index 550389a7d14..b56b679749d 100644 --- a/frontends/php/app/views/popup.services.php +++ b/frontends/php/app/views/popup.services.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/popup.testtriggerexpr.php b/frontends/php/app/views/popup.testtriggerexpr.php index ebf4af32cdf..3fcb1140b86 100644 --- a/frontends/php/app/views/popup.testtriggerexpr.php +++ b/frontends/php/app/views/popup.testtriggerexpr.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/popup.triggerexpr.php b/frontends/php/app/views/popup.triggerexpr.php index cd6648c6be3..d30ca5dcdea 100644 --- a/frontends/php/app/views/popup.triggerexpr.php +++ b/frontends/php/app/views/popup.triggerexpr.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -55,7 +55,9 @@ if ($data['parent_discoveryid'] !== '') { } $item = [ - (new CTextBox('description', $data['description'], true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + (new CTextBox('description', $data['description'], true)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('select', _('Select'))) ->addClass(ZBX_STYLE_BTN_GREY) @@ -79,7 +81,7 @@ if ($data['parent_discoveryid'] !== '') { ); } -$expression_form_list->addRow(_('Item'), $item); +$expression_form_list->addRow((new CLabel(_('Item'), 'description'))->setAsteriskMark(), $item); $function_combo_box = new CComboBox('expr_type', $data['expr_type'], 'reloadPopup(this.form, "popup.triggerexpr")'); foreach ($data['functions'] as $id => $f) { @@ -140,7 +142,12 @@ else { $expression_form->addVar('paramtype', PARAM_TYPE_TIME); } -$expression_form_list->addRow('N', (new CTextBox('value', $data['value']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)); +$expression_form_list->addRow( + (new CLabel(_('N'), 'value'))->setAsteriskMark(), + (new CTextBox('value', $data['value'])) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) +); $expression_form->addItem( (new CTabView())->addTab('expressionTab', _('Trigger expression condition'), $expression_form_list) diff --git a/frontends/php/app/views/popup.triggerwizard.js.php b/frontends/php/app/views/popup.triggerwizard.js.php index 46d1b1629fa..fd35dc268d3 100644 --- a/frontends/php/app/views/popup.triggerwizard.js.php +++ b/frontends/php/app/views/popup.triggerwizard.js.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -408,6 +408,8 @@ function validateTriggerWizard(formname, dialogueid) { url = new Curl(jQuery(form).attr('action')), dialogueid = dialogueid || null; + jQuery(form).trimValues(['#description', '#logexpr']); + url.setArgument('save', 1); jQuery.ajax({ diff --git a/frontends/php/app/views/popup.triggerwizard.php b/frontends/php/app/views/popup.triggerwizard.php index e9509a86254..08ae5c8ab0d 100644 --- a/frontends/php/app/views/popup.triggerwizard.php +++ b/frontends/php/app/views/popup.triggerwizard.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -116,8 +116,11 @@ $form->addItem( (new CTabView()) ->addTab('trigger_tab', null, (new CFormList()) - ->addRow(_('Name'), - (new CTextBox('description', $options['description']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->addRow( + (new CLabel(_('Name'), 'description'))->setAsteriskMark(), + (new CTextBox('description', $options['description'])) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ) ->addRow(_('Item'), [ (new CTextBox('item', $options['item_name'])) @@ -142,7 +145,7 @@ $form->addItem( 'name' => 'priority', 'value' => (int) $options['priority'] ])) - ->addRow(_('Expression'), + ->addRow((new CLabel(_('Expression'), $expression_table->getId()))->setAsteriskMark(), (new CTextBox('expression')) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setId('logexpr') @@ -188,15 +191,15 @@ $form->addItem( ); $output['body'] = $form->toString(); -$output['buttons'] = [ - [ - 'title' => array_key_exists('triggerid', $options) ? _('Update') : _('Add'), - 'class' => '', - 'keepOpen' => true, - 'action' => 'return validateTriggerWizard("'.$form->getName().'", '. - 'jQuery(window.document.forms["'.$form->getName().'"]).closest("[data-dialogueid]")'. - '.attr("data-dialogueid"));' - ] -]; +$output['buttons'] = [[ + 'title' => array_key_exists('triggerid', $options) ? _('Update') : _('Add'), + 'class' => '', + 'keepOpen' => true, + 'action' => 'return validateTriggerWizard("'.$form->getName().'", '. + 'jQuery(window.document.forms["'.$form->getName().'"])'. + '.closest("[data-dialogueid]")'. + '.attr("data-dialogueid")'. + ');' +]]; echo (new CJson())->encode($output); diff --git a/frontends/php/app/views/report.services.php b/frontends/php/app/views/report.services.php index 2211c8aab3f..41b002641c2 100644 --- a/frontends/php/app/views/report.services.php +++ b/frontends/php/app/views/report.services.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/report.status.php b/frontends/php/app/views/report.status.php index f5145fc797c..eee62434475 100644 --- a/frontends/php/app/views/report.status.php +++ b/frontends/php/app/views/report.status.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/app/views/system.warning.php b/frontends/php/app/views/system.warning.php index c97442981c1..ea9915173ac 100644 --- a/frontends/php/app/views/system.warning.php +++ b/frontends/php/app/views/system.warning.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/applications.php b/frontends/php/applications.php index 0db51617f08..121ce1b8875 100644 --- a/frontends/php/applications.php +++ b/frontends/php/applications.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/auditacts.php b/frontends/php/auditacts.php index 377f40a70aa..69cd5af1c94 100644 --- a/frontends/php/auditacts.php +++ b/frontends/php/auditacts.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/auditlogs.php b/frontends/php/auditlogs.php index 3e575efa5c3..26549b8f4ec 100644 --- a/frontends/php/auditlogs.php +++ b/frontends/php/auditlogs.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/authentication.php b/frontends/php/authentication.php index 30456753bd0..149be7864e0 100644 --- a/frontends/php/authentication.php +++ b/frontends/php/authentication.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/browserwarning.php b/frontends/php/browserwarning.php index 821b06c8a8f..5c844f0731e 100644 --- a/frontends/php/browserwarning.php +++ b/frontends/php/browserwarning.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/chart.php b/frontends/php/chart.php index ac2988549a7..7412d0cd260 100644 --- a/frontends/php/chart.php +++ b/frontends/php/chart.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/chart2.php b/frontends/php/chart2.php index aaecbbc54fd..277b143e77f 100644 --- a/frontends/php/chart2.php +++ b/frontends/php/chart2.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/chart3.php b/frontends/php/chart3.php index b27d61b1eac..fa1e107d49d 100644 --- a/frontends/php/chart3.php +++ b/frontends/php/chart3.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/chart4.php b/frontends/php/chart4.php index b977f5c8163..79f873d55b7 100644 --- a/frontends/php/chart4.php +++ b/frontends/php/chart4.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/chart5.php b/frontends/php/chart5.php index 78e55a85f08..a490ec9ff14 100644 --- a/frontends/php/chart5.php +++ b/frontends/php/chart5.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/chart6.php b/frontends/php/chart6.php index a9ec28bd5fb..4fee14c9271 100644 --- a/frontends/php/chart6.php +++ b/frontends/php/chart6.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/chart7.php b/frontends/php/chart7.php index 2cc02c4b65d..73eeba1c693 100644 --- a/frontends/php/chart7.php +++ b/frontends/php/chart7.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/charts.php b/frontends/php/charts.php index 0a18f85be0c..ed19159cdf8 100644 --- a/frontends/php/charts.php +++ b/frontends/php/charts.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/conf.import.php b/frontends/php/conf.import.php index 7bccb0e69b7..a5249b64bc8 100644 --- a/frontends/php/conf.import.php +++ b/frontends/php/conf.import.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/conf/maintenance.inc.php b/frontends/php/conf/maintenance.inc.php index 5db7718d1ee..5bd687ecf65 100644 --- a/frontends/php/conf/maintenance.inc.php +++ b/frontends/php/conf/maintenance.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/correlation.php b/frontends/php/correlation.php index 449cb5cca58..d72175ec2db 100644 --- a/frontends/php/correlation.php +++ b/frontends/php/correlation.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/disc_prototypes.php b/frontends/php/disc_prototypes.php index 381ff9c2ae0..e48caa1392b 100644 --- a/frontends/php/disc_prototypes.php +++ b/frontends/php/disc_prototypes.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/discoveryconf.php b/frontends/php/discoveryconf.php index 09719193f3c..da60da22a4e 100644 --- a/frontends/php/discoveryconf.php +++ b/frontends/php/discoveryconf.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/graphs.php b/frontends/php/graphs.php index 16fb3b38706..367e3f38a6f 100644 --- a/frontends/php/graphs.php +++ b/frontends/php/graphs.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/history.php b/frontends/php/history.php index 88ab3f0fc3a..b385a97688d 100644 --- a/frontends/php/history.php +++ b/frontends/php/history.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/host_discovery.php b/frontends/php/host_discovery.php index b3a2fe7df40..3dbb7c727db 100644 --- a/frontends/php/host_discovery.php +++ b/frontends/php/host_discovery.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/host_prototypes.php b/frontends/php/host_prototypes.php index 46a7174ab3c..78ff29555d7 100644 --- a/frontends/php/host_prototypes.php +++ b/frontends/php/host_prototypes.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/host_screen.php b/frontends/php/host_screen.php index 5ca006197e3..eeef5e273ca 100644 --- a/frontends/php/host_screen.php +++ b/frontends/php/host_screen.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/hostgroups.php b/frontends/php/hostgroups.php index 8bc1df4d5ef..297f1bd1aa1 100644 --- a/frontends/php/hostgroups.php +++ b/frontends/php/hostgroups.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/hostinventories.php b/frontends/php/hostinventories.php index 0f581047d82..b95cb19c058 100644 --- a/frontends/php/hostinventories.php +++ b/frontends/php/hostinventories.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/hostinventoriesoverview.php b/frontends/php/hostinventoriesoverview.php index 6bcb9b1f7d6..47150a816e6 100644 --- a/frontends/php/hostinventoriesoverview.php +++ b/frontends/php/hostinventoriesoverview.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/hosts.php b/frontends/php/hosts.php index 0e6ea48809b..49bbd4eea7f 100644 --- a/frontends/php/hosts.php +++ b/frontends/php/hosts.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/httpconf.php b/frontends/php/httpconf.php index 29751d92cc7..5003652a644 100644 --- a/frontends/php/httpconf.php +++ b/frontends/php/httpconf.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/httpdetails.php b/frontends/php/httpdetails.php index 9f3747ab947..496e7b599f4 100644 --- a/frontends/php/httpdetails.php +++ b/frontends/php/httpdetails.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/image.php b/frontends/php/image.php index f89089e3872..ca656cc571b 100644 --- a/frontends/php/image.php +++ b/frontends/php/image.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/imgstore.php b/frontends/php/imgstore.php index 84f1927a470..dd047b1a211 100644 --- a/frontends/php/imgstore.php +++ b/frontends/php/imgstore.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/acknow.inc.php b/frontends/php/include/acknow.inc.php index 766b73f2140..9b06f99e13c 100644 --- a/frontends/php/include/acknow.inc.php +++ b/frontends/php/include/acknow.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index 11749c9851f..ec01c6aebdf 100644 --- a/frontends/php/include/actions.inc.php +++ b/frontends/php/include/actions.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/audit.inc.php b/frontends/php/include/audit.inc.php index 4e27d644450..ea5cf30b545 100644 --- a/frontends/php/include/audit.inc.php +++ b/frontends/php/include/audit.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/blocks.inc.php b/frontends/php/include/blocks.inc.php index 965f2d5f94d..2ec90fec5cc 100644 --- a/frontends/php/include/blocks.inc.php +++ b/frontends/php/include/blocks.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/API.php b/frontends/php/include/classes/api/API.php index 1a8dc1e0451..b648e8c8684 100644 --- a/frontends/php/include/classes/api/API.php +++ b/frontends/php/include/classes/api/API.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/APIException.php b/frontends/php/include/classes/api/APIException.php index 33e51c41c22..0162393fbf2 100644 --- a/frontends/php/include/classes/api/APIException.php +++ b/frontends/php/include/classes/api/APIException.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/CApiClientResponse.php b/frontends/php/include/classes/api/CApiClientResponse.php index 71dd25cea30..8623bee49e3 100644 --- a/frontends/php/include/classes/api/CApiClientResponse.php +++ b/frontends/php/include/classes/api/CApiClientResponse.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/CApiService.php b/frontends/php/include/classes/api/CApiService.php index c3e365b1d37..cf35461de58 100644 --- a/frontends/php/include/classes/api/CApiService.php +++ b/frontends/php/include/classes/api/CApiService.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/CApiServiceFactory.php b/frontends/php/include/classes/api/CApiServiceFactory.php index ac718e4ee1b..a187915f336 100644 --- a/frontends/php/include/classes/api/CApiServiceFactory.php +++ b/frontends/php/include/classes/api/CApiServiceFactory.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/CAudit.php b/frontends/php/include/classes/api/CAudit.php index 12b661a219a..21c9e257173 100644 --- a/frontends/php/include/classes/api/CAudit.php +++ b/frontends/php/include/classes/api/CAudit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/CRelationMap.php b/frontends/php/include/classes/api/CRelationMap.php index 8fac09d7115..cc4182f3b75 100644 --- a/frontends/php/include/classes/api/CRelationMap.php +++ b/frontends/php/include/classes/api/CRelationMap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/clients/CApiClient.php b/frontends/php/include/classes/api/clients/CApiClient.php index 9493d2c546c..373bd9939d0 100644 --- a/frontends/php/include/classes/api/clients/CApiClient.php +++ b/frontends/php/include/classes/api/clients/CApiClient.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/clients/CLocalApiClient.php b/frontends/php/include/classes/api/clients/CLocalApiClient.php index 05c61e7661f..0861bc71829 100644 --- a/frontends/php/include/classes/api/clients/CLocalApiClient.php +++ b/frontends/php/include/classes/api/clients/CLocalApiClient.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/managers/CApplicationManager.php b/frontends/php/include/classes/api/managers/CApplicationManager.php index b73ecaf9f1d..8e60480d6c6 100644 --- a/frontends/php/include/classes/api/managers/CApplicationManager.php +++ b/frontends/php/include/classes/api/managers/CApplicationManager.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/managers/CHistoryManager.php b/frontends/php/include/classes/api/managers/CHistoryManager.php index ac837e8e1f4..b508486268a 100644 --- a/frontends/php/include/classes/api/managers/CHistoryManager.php +++ b/frontends/php/include/classes/api/managers/CHistoryManager.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -435,7 +435,7 @@ class CHistoryManager { ]; // Clock value is divided by 1000 as it is stored as milliseconds. - $formula = 'Math.floor((params.width*(((long)doc[\'clock\'].value/1000+params.delta)%params.size))'. + $formula = 'Math.floor((params.width*((doc[\'clock\'].date.getMillis()/1000+params.delta)%params.size))'. '/params.size)'; $script = [ diff --git a/frontends/php/include/classes/api/managers/CHttpTestManager.php b/frontends/php/include/classes/api/managers/CHttpTestManager.php index b35dc2ad099..230b8ba275e 100644 --- a/frontends/php/include/classes/api/managers/CHttpTestManager.php +++ b/frontends/php/include/classes/api/managers/CHttpTestManager.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CAPIInfo.php b/frontends/php/include/classes/api/services/CAPIInfo.php index 1ca249ff277..2dd1aa8da50 100644 --- a/frontends/php/include/classes/api/services/CAPIInfo.php +++ b/frontends/php/include/classes/api/services/CAPIInfo.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CAction.php b/frontends/php/include/classes/api/services/CAction.php index ad65bbff160..9531bb43330 100644 --- a/frontends/php/include/classes/api/services/CAction.php +++ b/frontends/php/include/classes/api/services/CAction.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CAlert.php b/frontends/php/include/classes/api/services/CAlert.php index 72d4ff0459b..b24dedfe5cf 100644 --- a/frontends/php/include/classes/api/services/CAlert.php +++ b/frontends/php/include/classes/api/services/CAlert.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CApplication.php b/frontends/php/include/classes/api/services/CApplication.php index 8b59fedcb27..c85f74ff748 100644 --- a/frontends/php/include/classes/api/services/CApplication.php +++ b/frontends/php/include/classes/api/services/CApplication.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CConfiguration.php b/frontends/php/include/classes/api/services/CConfiguration.php index 08d00b56712..ce568b0546b 100644 --- a/frontends/php/include/classes/api/services/CConfiguration.php +++ b/frontends/php/include/classes/api/services/CConfiguration.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CCorrelation.php b/frontends/php/include/classes/api/services/CCorrelation.php index b25d28b1577..60b5fdffb1b 100644 --- a/frontends/php/include/classes/api/services/CCorrelation.php +++ b/frontends/php/include/classes/api/services/CCorrelation.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CDCheck.php b/frontends/php/include/classes/api/services/CDCheck.php index d4bf7cacc5a..bb96cfbba88 100644 --- a/frontends/php/include/classes/api/services/CDCheck.php +++ b/frontends/php/include/classes/api/services/CDCheck.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CDHost.php b/frontends/php/include/classes/api/services/CDHost.php index 2148e771e99..072d56dd1db 100644 --- a/frontends/php/include/classes/api/services/CDHost.php +++ b/frontends/php/include/classes/api/services/CDHost.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CDRule.php b/frontends/php/include/classes/api/services/CDRule.php index 6207d1734d3..6f5ef6259d6 100644 --- a/frontends/php/include/classes/api/services/CDRule.php +++ b/frontends/php/include/classes/api/services/CDRule.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CDService.php b/frontends/php/include/classes/api/services/CDService.php index 9fdd1a167cc..27ddb934a8c 100644 --- a/frontends/php/include/classes/api/services/CDService.php +++ b/frontends/php/include/classes/api/services/CDService.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CDashboard.php b/frontends/php/include/classes/api/services/CDashboard.php index b2daa2fb701..1ace809091b 100644 --- a/frontends/php/include/classes/api/services/CDashboard.php +++ b/frontends/php/include/classes/api/services/CDashboard.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CDiscoveryRule.php b/frontends/php/include/classes/api/services/CDiscoveryRule.php index 2ca0b584195..c9188d32199 100644 --- a/frontends/php/include/classes/api/services/CDiscoveryRule.php +++ b/frontends/php/include/classes/api/services/CDiscoveryRule.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CEvent.php b/frontends/php/include/classes/api/services/CEvent.php index bdef00443f2..45bffb6b68c 100644 --- a/frontends/php/include/classes/api/services/CEvent.php +++ b/frontends/php/include/classes/api/services/CEvent.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CGraph.php b/frontends/php/include/classes/api/services/CGraph.php index 5e3a3fd4c5a..5969ff86fd4 100644 --- a/frontends/php/include/classes/api/services/CGraph.php +++ b/frontends/php/include/classes/api/services/CGraph.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CGraphGeneral.php b/frontends/php/include/classes/api/services/CGraphGeneral.php index e2174355d88..c2b07d5b884 100644 --- a/frontends/php/include/classes/api/services/CGraphGeneral.php +++ b/frontends/php/include/classes/api/services/CGraphGeneral.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CGraphItem.php b/frontends/php/include/classes/api/services/CGraphItem.php index 996d7181377..796e55a49b1 100644 --- a/frontends/php/include/classes/api/services/CGraphItem.php +++ b/frontends/php/include/classes/api/services/CGraphItem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CGraphPrototype.php b/frontends/php/include/classes/api/services/CGraphPrototype.php index f2d95cbd932..57cccba144f 100644 --- a/frontends/php/include/classes/api/services/CGraphPrototype.php +++ b/frontends/php/include/classes/api/services/CGraphPrototype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CHistory.php b/frontends/php/include/classes/api/services/CHistory.php index 55dc2eb5a6e..12ed0e91c5d 100644 --- a/frontends/php/include/classes/api/services/CHistory.php +++ b/frontends/php/include/classes/api/services/CHistory.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CHost.php b/frontends/php/include/classes/api/services/CHost.php index be955961113..71d3b3e6f6a 100644 --- a/frontends/php/include/classes/api/services/CHost.php +++ b/frontends/php/include/classes/api/services/CHost.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CHostBase.php b/frontends/php/include/classes/api/services/CHostBase.php index 3459d1137ae..101a72c258d 100644 --- a/frontends/php/include/classes/api/services/CHostBase.php +++ b/frontends/php/include/classes/api/services/CHostBase.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CHostGeneral.php b/frontends/php/include/classes/api/services/CHostGeneral.php index b44346793b9..c70c9f8b1ea 100644 --- a/frontends/php/include/classes/api/services/CHostGeneral.php +++ b/frontends/php/include/classes/api/services/CHostGeneral.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CHostGroup.php b/frontends/php/include/classes/api/services/CHostGroup.php index fc36fea1d35..393d2b07f75 100644 --- a/frontends/php/include/classes/api/services/CHostGroup.php +++ b/frontends/php/include/classes/api/services/CHostGroup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CHostInterface.php b/frontends/php/include/classes/api/services/CHostInterface.php index cbd64b9dd81..caca9acf786 100644 --- a/frontends/php/include/classes/api/services/CHostInterface.php +++ b/frontends/php/include/classes/api/services/CHostInterface.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CHostPrototype.php b/frontends/php/include/classes/api/services/CHostPrototype.php index 2c9148d052b..d540fa6d8f2 100644 --- a/frontends/php/include/classes/api/services/CHostPrototype.php +++ b/frontends/php/include/classes/api/services/CHostPrototype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CHttpTest.php b/frontends/php/include/classes/api/services/CHttpTest.php index 415bd4e4789..2edc21977c7 100644 --- a/frontends/php/include/classes/api/services/CHttpTest.php +++ b/frontends/php/include/classes/api/services/CHttpTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CIconMap.php b/frontends/php/include/classes/api/services/CIconMap.php index a73020ba100..5b8422b8ddc 100644 --- a/frontends/php/include/classes/api/services/CIconMap.php +++ b/frontends/php/include/classes/api/services/CIconMap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CImage.php b/frontends/php/include/classes/api/services/CImage.php index bd0d0452e32..8b3c89929ae 100644 --- a/frontends/php/include/classes/api/services/CImage.php +++ b/frontends/php/include/classes/api/services/CImage.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CItem.php b/frontends/php/include/classes/api/services/CItem.php index 00c27111f5c..0f7d7bca776 100644 --- a/frontends/php/include/classes/api/services/CItem.php +++ b/frontends/php/include/classes/api/services/CItem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CItemGeneral.php b/frontends/php/include/classes/api/services/CItemGeneral.php index 9f0077c7050..87046d70a78 100644 --- a/frontends/php/include/classes/api/services/CItemGeneral.php +++ b/frontends/php/include/classes/api/services/CItemGeneral.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CItemPrototype.php b/frontends/php/include/classes/api/services/CItemPrototype.php index cff40ced20d..e9962871781 100644 --- a/frontends/php/include/classes/api/services/CItemPrototype.php +++ b/frontends/php/include/classes/api/services/CItemPrototype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CMaintenance.php b/frontends/php/include/classes/api/services/CMaintenance.php index b317456afef..7ad240acf71 100644 --- a/frontends/php/include/classes/api/services/CMaintenance.php +++ b/frontends/php/include/classes/api/services/CMaintenance.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CMap.php b/frontends/php/include/classes/api/services/CMap.php index ba4fa044ef3..c779699acf1 100644 --- a/frontends/php/include/classes/api/services/CMap.php +++ b/frontends/php/include/classes/api/services/CMap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CMapElement.php b/frontends/php/include/classes/api/services/CMapElement.php index 023ba2fd5d3..ba78478eb8e 100644 --- a/frontends/php/include/classes/api/services/CMapElement.php +++ b/frontends/php/include/classes/api/services/CMapElement.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CMediatype.php b/frontends/php/include/classes/api/services/CMediatype.php index 6ae06c7f3a8..0125cc503bc 100644 --- a/frontends/php/include/classes/api/services/CMediatype.php +++ b/frontends/php/include/classes/api/services/CMediatype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CProblem.php b/frontends/php/include/classes/api/services/CProblem.php index 732be4db571..ed258944add 100644 --- a/frontends/php/include/classes/api/services/CProblem.php +++ b/frontends/php/include/classes/api/services/CProblem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CProxy.php b/frontends/php/include/classes/api/services/CProxy.php index 64bd25581d2..00ff6f7ae8f 100644 --- a/frontends/php/include/classes/api/services/CProxy.php +++ b/frontends/php/include/classes/api/services/CProxy.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CScreen.php b/frontends/php/include/classes/api/services/CScreen.php index f9a4396ced4..074b94f49fd 100644 --- a/frontends/php/include/classes/api/services/CScreen.php +++ b/frontends/php/include/classes/api/services/CScreen.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CScreenItem.php b/frontends/php/include/classes/api/services/CScreenItem.php index 2895f6b0cf4..e13bd882b69 100644 --- a/frontends/php/include/classes/api/services/CScreenItem.php +++ b/frontends/php/include/classes/api/services/CScreenItem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CScript.php b/frontends/php/include/classes/api/services/CScript.php index aa0531a20c1..664759b9a1c 100644 --- a/frontends/php/include/classes/api/services/CScript.php +++ b/frontends/php/include/classes/api/services/CScript.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CService.php b/frontends/php/include/classes/api/services/CService.php index ef12b4d7ea5..537afc6b8e3 100644 --- a/frontends/php/include/classes/api/services/CService.php +++ b/frontends/php/include/classes/api/services/CService.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CTemplate.php b/frontends/php/include/classes/api/services/CTemplate.php index 0c0b8d59422..84c0a31d2b2 100644 --- a/frontends/php/include/classes/api/services/CTemplate.php +++ b/frontends/php/include/classes/api/services/CTemplate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CTemplateScreen.php b/frontends/php/include/classes/api/services/CTemplateScreen.php index 355a5830b73..c09772e5630 100644 --- a/frontends/php/include/classes/api/services/CTemplateScreen.php +++ b/frontends/php/include/classes/api/services/CTemplateScreen.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CTemplateScreenItem.php b/frontends/php/include/classes/api/services/CTemplateScreenItem.php index 4e454020a5a..c467ef526cf 100644 --- a/frontends/php/include/classes/api/services/CTemplateScreenItem.php +++ b/frontends/php/include/classes/api/services/CTemplateScreenItem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CTrend.php b/frontends/php/include/classes/api/services/CTrend.php index 9481463ebc8..bb4f55b698d 100644 --- a/frontends/php/include/classes/api/services/CTrend.php +++ b/frontends/php/include/classes/api/services/CTrend.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CTrigger.php b/frontends/php/include/classes/api/services/CTrigger.php index 6f6c3e0779b..353d18f070c 100644 --- a/frontends/php/include/classes/api/services/CTrigger.php +++ b/frontends/php/include/classes/api/services/CTrigger.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CTriggerGeneral.php b/frontends/php/include/classes/api/services/CTriggerGeneral.php index a0c4fbea64b..8d32d8b150a 100644 --- a/frontends/php/include/classes/api/services/CTriggerGeneral.php +++ b/frontends/php/include/classes/api/services/CTriggerGeneral.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CTriggerPrototype.php b/frontends/php/include/classes/api/services/CTriggerPrototype.php index 97f2378ab71..0dd0d8526de 100644 --- a/frontends/php/include/classes/api/services/CTriggerPrototype.php +++ b/frontends/php/include/classes/api/services/CTriggerPrototype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CUser.php b/frontends/php/include/classes/api/services/CUser.php index 497a3fa6792..0feab070733 100644 --- a/frontends/php/include/classes/api/services/CUser.php +++ b/frontends/php/include/classes/api/services/CUser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CUserGroup.php b/frontends/php/include/classes/api/services/CUserGroup.php index b2ee4f0c4da..f20ac6ecc98 100644 --- a/frontends/php/include/classes/api/services/CUserGroup.php +++ b/frontends/php/include/classes/api/services/CUserGroup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CUserMacro.php b/frontends/php/include/classes/api/services/CUserMacro.php index 72067b2ac1a..26a10c9a1b5 100644 --- a/frontends/php/include/classes/api/services/CUserMacro.php +++ b/frontends/php/include/classes/api/services/CUserMacro.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/services/CValueMap.php b/frontends/php/include/classes/api/services/CValueMap.php index 5ee5bf0c521..043175531e4 100644 --- a/frontends/php/include/classes/api/services/CValueMap.php +++ b/frontends/php/include/classes/api/services/CValueMap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/wrappers/CApiWrapper.php b/frontends/php/include/classes/api/wrappers/CApiWrapper.php index 961cbadddac..24a710a0679 100644 --- a/frontends/php/include/classes/api/wrappers/CApiWrapper.php +++ b/frontends/php/include/classes/api/wrappers/CApiWrapper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/api/wrappers/CFrontendApiWrapper.php b/frontends/php/include/classes/api/wrappers/CFrontendApiWrapper.php index 31c0cfcd462..5a1dc5a730a 100644 --- a/frontends/php/include/classes/api/wrappers/CFrontendApiWrapper.php +++ b/frontends/php/include/classes/api/wrappers/CFrontendApiWrapper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/CAjaxResponse.php b/frontends/php/include/classes/core/CAjaxResponse.php index 566be3b05d1..bd53022b835 100644 --- a/frontends/php/include/classes/core/CAjaxResponse.php +++ b/frontends/php/include/classes/core/CAjaxResponse.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/CAutoloader.php b/frontends/php/include/classes/core/CAutoloader.php index 9391e98a5c5..a9f7958fe59 100644 --- a/frontends/php/include/classes/core/CAutoloader.php +++ b/frontends/php/include/classes/core/CAutoloader.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/CConfigFile.php b/frontends/php/include/classes/core/CConfigFile.php index f086aef991f..091ff50c852 100644 --- a/frontends/php/include/classes/core/CConfigFile.php +++ b/frontends/php/include/classes/core/CConfigFile.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/CHttpRequest.php b/frontends/php/include/classes/core/CHttpRequest.php index e9bbcece230..22589f13396 100644 --- a/frontends/php/include/classes/core/CHttpRequest.php +++ b/frontends/php/include/classes/core/CHttpRequest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/CJsonRpc.php b/frontends/php/include/classes/core/CJsonRpc.php index 9fb3293e102..0134c652571 100644 --- a/frontends/php/include/classes/core/CJsonRpc.php +++ b/frontends/php/include/classes/core/CJsonRpc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/CRegistryFactory.php b/frontends/php/include/classes/core/CRegistryFactory.php index c7a5cc41a47..49ab6185c8c 100644 --- a/frontends/php/include/classes/core/CRegistryFactory.php +++ b/frontends/php/include/classes/core/CRegistryFactory.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/CSession.php b/frontends/php/include/classes/core/CSession.php index 3b2fe9e43d2..e091fb91a73 100644 --- a/frontends/php/include/classes/core/CSession.php +++ b/frontends/php/include/classes/core/CSession.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/ConfigFileException.php b/frontends/php/include/classes/core/ConfigFileException.php index d2d834aa30b..4aaafe05ae9 100644 --- a/frontends/php/include/classes/core/ConfigFileException.php +++ b/frontends/php/include/classes/core/ConfigFileException.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/Manager.php b/frontends/php/include/classes/core/Manager.php index 16f2a7c8670..ef355d63f31 100644 --- a/frontends/php/include/classes/core/Manager.php +++ b/frontends/php/include/classes/core/Manager.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/Z.php b/frontends/php/include/classes/core/Z.php index f9448ffeaa7..f9588bd44d0 100644 --- a/frontends/php/include/classes/core/Z.php +++ b/frontends/php/include/classes/core/Z.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/core/ZBase.php b/frontends/php/include/classes/core/ZBase.php index 163e6c89ed0..66940107fca 100644 --- a/frontends/php/include/classes/core/ZBase.php +++ b/frontends/php/include/classes/core/ZBase.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/db/DB.php b/frontends/php/include/classes/db/DB.php index f5ae1663202..d9ddc4efb27 100644 --- a/frontends/php/include/classes/db/DB.php +++ b/frontends/php/include/classes/db/DB.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/db/DBException.php b/frontends/php/include/classes/db/DBException.php index ce0b047b9fb..a2c763f9bb9 100644 --- a/frontends/php/include/classes/db/DBException.php +++ b/frontends/php/include/classes/db/DBException.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/db/Db2DbBackend.php b/frontends/php/include/classes/db/Db2DbBackend.php index 8732cd93480..08750786160 100644 --- a/frontends/php/include/classes/db/Db2DbBackend.php +++ b/frontends/php/include/classes/db/Db2DbBackend.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/db/DbBackend.php b/frontends/php/include/classes/db/DbBackend.php index 45fd1a3e013..1e2968b067f 100644 --- a/frontends/php/include/classes/db/DbBackend.php +++ b/frontends/php/include/classes/db/DbBackend.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/db/MysqlDbBackend.php b/frontends/php/include/classes/db/MysqlDbBackend.php index b9786654543..08da49a063e 100644 --- a/frontends/php/include/classes/db/MysqlDbBackend.php +++ b/frontends/php/include/classes/db/MysqlDbBackend.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/db/OracleDbBackend.php b/frontends/php/include/classes/db/OracleDbBackend.php index 33a4e40d1ae..ec6bc9d8e94 100644 --- a/frontends/php/include/classes/db/OracleDbBackend.php +++ b/frontends/php/include/classes/db/OracleDbBackend.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/db/PostgresqlDbBackend.php b/frontends/php/include/classes/db/PostgresqlDbBackend.php index fb34e6fa6ee..76e32c3a151 100644 --- a/frontends/php/include/classes/db/PostgresqlDbBackend.php +++ b/frontends/php/include/classes/db/PostgresqlDbBackend.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/debug/CProfiler.php b/frontends/php/include/classes/debug/CProfiler.php index ea136a8f9c2..a29670b9538 100644 --- a/frontends/php/include/classes/debug/CProfiler.php +++ b/frontends/php/include/classes/debug/CProfiler.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/export/CConfigurationExport.php b/frontends/php/include/classes/export/CConfigurationExport.php index 0c931841cff..ca79d7db0d2 100644 --- a/frontends/php/include/classes/export/CConfigurationExport.php +++ b/frontends/php/include/classes/export/CConfigurationExport.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/export/CConfigurationExportBuilder.php b/frontends/php/include/classes/export/CConfigurationExportBuilder.php index 4ac283f5b17..7aaf2147fed 100644 --- a/frontends/php/include/classes/export/CConfigurationExportBuilder.php +++ b/frontends/php/include/classes/export/CConfigurationExportBuilder.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/export/writers/CExportWriter.php b/frontends/php/include/classes/export/writers/CExportWriter.php index 6ce87eba4ff..1bddd4489c3 100644 --- a/frontends/php/include/classes/export/writers/CExportWriter.php +++ b/frontends/php/include/classes/export/writers/CExportWriter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/export/writers/CExportWriterFactory.php b/frontends/php/include/classes/export/writers/CExportWriterFactory.php index 4319bc72f41..41a4e6fae6c 100644 --- a/frontends/php/include/classes/export/writers/CExportWriterFactory.php +++ b/frontends/php/include/classes/export/writers/CExportWriterFactory.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/export/writers/CJsonExportWriter.php b/frontends/php/include/classes/export/writers/CJsonExportWriter.php index 518dc8aa205..a7a1aeaf45d 100644 --- a/frontends/php/include/classes/export/writers/CJsonExportWriter.php +++ b/frontends/php/include/classes/export/writers/CJsonExportWriter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/export/writers/CXmlExportWriter.php b/frontends/php/include/classes/export/writers/CXmlExportWriter.php index db94a231d47..b58c103d6ad 100644 --- a/frontends/php/include/classes/export/writers/CXmlExportWriter.php +++ b/frontends/php/include/classes/export/writers/CXmlExportWriter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/graphdraw/CGraphDraw.php b/frontends/php/include/classes/graphdraw/CGraphDraw.php index 6fb45845cb4..3b21878e56f 100644 --- a/frontends/php/include/classes/graphdraw/CGraphDraw.php +++ b/frontends/php/include/classes/graphdraw/CGraphDraw.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/graphdraw/CLineGraphDraw.php b/frontends/php/include/classes/graphdraw/CLineGraphDraw.php index aea60953c97..c7c161d015c 100644 --- a/frontends/php/include/classes/graphdraw/CLineGraphDraw.php +++ b/frontends/php/include/classes/graphdraw/CLineGraphDraw.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/graphdraw/CPieGraphDraw.php b/frontends/php/include/classes/graphdraw/CPieGraphDraw.php index 6209e7b490b..eedadd29ee7 100644 --- a/frontends/php/include/classes/graphdraw/CPieGraphDraw.php +++ b/frontends/php/include/classes/graphdraw/CPieGraphDraw.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/helpers/CArrayHelper.php b/frontends/php/include/classes/helpers/CArrayHelper.php index f5cf9087678..72372bb1b3f 100644 --- a/frontends/php/include/classes/helpers/CArrayHelper.php +++ b/frontends/php/include/classes/helpers/CArrayHelper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/helpers/CConditionHelper.php b/frontends/php/include/classes/helpers/CConditionHelper.php index 9abf613c4fa..e392fa133b8 100644 --- a/frontends/php/include/classes/helpers/CConditionHelper.php +++ b/frontends/php/include/classes/helpers/CConditionHelper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/helpers/CElasticsearchHelper.php b/frontends/php/include/classes/helpers/CElasticsearchHelper.php index 68cc3e45f65..4db2230150a 100644 --- a/frontends/php/include/classes/helpers/CElasticsearchHelper.php +++ b/frontends/php/include/classes/helpers/CElasticsearchHelper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/helpers/CHtml.php b/frontends/php/include/classes/helpers/CHtml.php index a682bc5b054..20bd371669a 100644 --- a/frontends/php/include/classes/helpers/CHtml.php +++ b/frontends/php/include/classes/helpers/CHtml.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/helpers/CJs.php b/frontends/php/include/classes/helpers/CJs.php index 309dc8217cf..311ad8c0bcf 100644 --- a/frontends/php/include/classes/helpers/CJs.php +++ b/frontends/php/include/classes/helpers/CJs.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/helpers/CMapHelper.php b/frontends/php/include/classes/helpers/CMapHelper.php index efe7876acfc..be9aac8097e 100644 --- a/frontends/php/include/classes/helpers/CMapHelper.php +++ b/frontends/php/include/classes/helpers/CMapHelper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/helpers/CMenuPopupHelper.php b/frontends/php/include/classes/helpers/CMenuPopupHelper.php index d299be92c9c..b53c235b3f2 100644 --- a/frontends/php/include/classes/helpers/CMenuPopupHelper.php +++ b/frontends/php/include/classes/helpers/CMenuPopupHelper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/helpers/CUploadFile.php b/frontends/php/include/classes/helpers/CUploadFile.php index db0fc4253e6..6550ae8249c 100644 --- a/frontends/php/include/classes/helpers/CUploadFile.php +++ b/frontends/php/include/classes/helpers/CUploadFile.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/helpers/CViewHelper.php b/frontends/php/include/classes/helpers/CViewHelper.php index 3251cd0ea57..83f8c721cf0 100644 --- a/frontends/php/include/classes/helpers/CViewHelper.php +++ b/frontends/php/include/classes/helpers/CViewHelper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CActionButtonList.php b/frontends/php/include/classes/html/CActionButtonList.php index f249a62690d..485b7d55026 100644 --- a/frontends/php/include/classes/html/CActionButtonList.php +++ b/frontends/php/include/classes/html/CActionButtonList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CArea.php b/frontends/php/include/classes/html/CArea.php index 22c4a6bb92d..a0c2d9d0b16 100644 --- a/frontends/php/include/classes/html/CArea.php +++ b/frontends/php/include/classes/html/CArea.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CAreaMap.php b/frontends/php/include/classes/html/CAreaMap.php index 673f09c7237..be429475166 100644 --- a/frontends/php/include/classes/html/CAreaMap.php +++ b/frontends/php/include/classes/html/CAreaMap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CButton.php b/frontends/php/include/classes/html/CButton.php index ae371aa1504..109e5360ead 100644 --- a/frontends/php/include/classes/html/CButton.php +++ b/frontends/php/include/classes/html/CButton.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CButtonCancel.php b/frontends/php/include/classes/html/CButtonCancel.php index 5c0d15e7dbb..ad01b9785e5 100644 --- a/frontends/php/include/classes/html/CButtonCancel.php +++ b/frontends/php/include/classes/html/CButtonCancel.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CButtonDelete.php b/frontends/php/include/classes/html/CButtonDelete.php index 0d10bda4788..5e44ca7ce7d 100644 --- a/frontends/php/include/classes/html/CButtonDelete.php +++ b/frontends/php/include/classes/html/CButtonDelete.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CButtonQMessage.php b/frontends/php/include/classes/html/CButtonQMessage.php index f2a7770d805..5d63dabbffc 100644 --- a/frontends/php/include/classes/html/CButtonQMessage.php +++ b/frontends/php/include/classes/html/CButtonQMessage.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CCheckBox.php b/frontends/php/include/classes/html/CCheckBox.php index 9ab04b48d7d..5df3bcdb3c2 100644 --- a/frontends/php/include/classes/html/CCheckBox.php +++ b/frontends/php/include/classes/html/CCheckBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CClock.php b/frontends/php/include/classes/html/CClock.php index ff2602c1b55..c73d73b6a3b 100644 --- a/frontends/php/include/classes/html/CClock.php +++ b/frontends/php/include/classes/html/CClock.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CCol.php b/frontends/php/include/classes/html/CCol.php index 11f8223cfc9..d17b12dfb48 100644 --- a/frontends/php/include/classes/html/CCol.php +++ b/frontends/php/include/classes/html/CCol.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CColHeader.php b/frontends/php/include/classes/html/CColHeader.php index 970d26af51f..4186a4c70c5 100644 --- a/frontends/php/include/classes/html/CColHeader.php +++ b/frontends/php/include/classes/html/CColHeader.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CCollapsibleUiWidget.php b/frontends/php/include/classes/html/CCollapsibleUiWidget.php index 7249cfbc58e..bea35bba525 100644 --- a/frontends/php/include/classes/html/CCollapsibleUiWidget.php +++ b/frontends/php/include/classes/html/CCollapsibleUiWidget.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CColor.php b/frontends/php/include/classes/html/CColor.php index 54e1a4e0095..2a2c513e02a 100644 --- a/frontends/php/include/classes/html/CColor.php +++ b/frontends/php/include/classes/html/CColor.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CColorCell.php b/frontends/php/include/classes/html/CColorCell.php index a195029468b..36c28d5c585 100644 --- a/frontends/php/include/classes/html/CColorCell.php +++ b/frontends/php/include/classes/html/CColorCell.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CComboBox.php b/frontends/php/include/classes/html/CComboBox.php index da062abeaa2..3738576cedf 100644 --- a/frontends/php/include/classes/html/CComboBox.php +++ b/frontends/php/include/classes/html/CComboBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -105,6 +105,19 @@ class CComboBox extends CTag { } return $this; } + + /** + * Set with of the combo box. + * + * @param int $value Width in pixels of the element. + * + * @return CComboBox + */ + public function setWidth($value) { + $this->addStyle('width: '.$value.'px;'); + + return $this; + } } class COptGroup extends CTag { diff --git a/frontends/php/include/classes/html/CComboItem.php b/frontends/php/include/classes/html/CComboItem.php index d6aa00aae4e..246802786de 100644 --- a/frontends/php/include/classes/html/CComboItem.php +++ b/frontends/php/include/classes/html/CComboItem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CDashboardWidgetMap.php b/frontends/php/include/classes/html/CDashboardWidgetMap.php index 33f6b15791b..7cfeae7101c 100644 --- a/frontends/php/include/classes/html/CDashboardWidgetMap.php +++ b/frontends/php/include/classes/html/CDashboardWidgetMap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CDiv.php b/frontends/php/include/classes/html/CDiv.php index 57d98061381..dc3e1d6ce1b 100644 --- a/frontends/php/include/classes/html/CDiv.php +++ b/frontends/php/include/classes/html/CDiv.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CFile.php b/frontends/php/include/classes/html/CFile.php index 8f7fda5aa93..6149f41459c 100644 --- a/frontends/php/include/classes/html/CFile.php +++ b/frontends/php/include/classes/html/CFile.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CFilter.php b/frontends/php/include/classes/html/CFilter.php index f92653d58bf..e05267a0c03 100644 --- a/frontends/php/include/classes/html/CFilter.php +++ b/frontends/php/include/classes/html/CFilter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CForm.php b/frontends/php/include/classes/html/CForm.php index 2e3ee9b187a..a5f7564b6c9 100644 --- a/frontends/php/include/classes/html/CForm.php +++ b/frontends/php/include/classes/html/CForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CFormList.php b/frontends/php/include/classes/html/CFormList.php index 7535805fa95..3bb11f8a89e 100644 --- a/frontends/php/include/classes/html/CFormList.php +++ b/frontends/php/include/classes/html/CFormList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CHorList.php b/frontends/php/include/classes/html/CHorList.php index d5090bef8d0..e12ea18e6f2 100644 --- a/frontends/php/include/classes/html/CHorList.php +++ b/frontends/php/include/classes/html/CHorList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CIFrame.php b/frontends/php/include/classes/html/CIFrame.php index 35aef0e3f3e..f58e078d345 100644 --- a/frontends/php/include/classes/html/CIFrame.php +++ b/frontends/php/include/classes/html/CIFrame.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CImageTextTable.php b/frontends/php/include/classes/html/CImageTextTable.php index b0e5f36013c..25905b30ec3 100644 --- a/frontends/php/include/classes/html/CImageTextTable.php +++ b/frontends/php/include/classes/html/CImageTextTable.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CImg.php b/frontends/php/include/classes/html/CImg.php index f1b26bde2a5..5afee9284d4 100644 --- a/frontends/php/include/classes/html/CImg.php +++ b/frontends/php/include/classes/html/CImg.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CInput.php b/frontends/php/include/classes/html/CInput.php index b527ad3110a..8c92b2cdf70 100644 --- a/frontends/php/include/classes/html/CInput.php +++ b/frontends/php/include/classes/html/CInput.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CJsScript.php b/frontends/php/include/classes/html/CJsScript.php index b5622fc3cd0..7f25a068f13 100644 --- a/frontends/php/include/classes/html/CJsScript.php +++ b/frontends/php/include/classes/html/CJsScript.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CLabel.php b/frontends/php/include/classes/html/CLabel.php index 25316e1efdb..6d90ce95061 100644 --- a/frontends/php/include/classes/html/CLabel.php +++ b/frontends/php/include/classes/html/CLabel.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -28,4 +28,15 @@ class CLabel extends CTag { $this->setAttribute('for', zbx_formatDomId($for)); } } + + /** + * Allow to add visual 'asterisk' mark to label. + * + * @param bool $add_asterisk Define is label marked with asterisk or not. + * + * @return CLabel + */ + public function setAsteriskMark($add_asterisk = true) { + return $this->addClass($add_asterisk ? ZBX_STYLE_FIELD_LABEL_ASTERISK : null); + } } diff --git a/frontends/php/include/classes/html/CLink.php b/frontends/php/include/classes/html/CLink.php index 716ebd306fe..09259c93490 100644 --- a/frontends/php/include/classes/html/CLink.php +++ b/frontends/php/include/classes/html/CLink.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CList.php b/frontends/php/include/classes/html/CList.php index 59c9b890120..9bbe7897127 100644 --- a/frontends/php/include/classes/html/CList.php +++ b/frontends/php/include/classes/html/CList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CListBox.php b/frontends/php/include/classes/html/CListBox.php index c3fbc605c1d..feea9c8b8e9 100644 --- a/frontends/php/include/classes/html/CListBox.php +++ b/frontends/php/include/classes/html/CListBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CListItem.php b/frontends/php/include/classes/html/CListItem.php index 699df77e406..98fac56a06b 100644 --- a/frontends/php/include/classes/html/CListItem.php +++ b/frontends/php/include/classes/html/CListItem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CMultiSelect.php b/frontends/php/include/classes/html/CMultiSelect.php index 439c15ce6fa..0e9386c3413 100644 --- a/frontends/php/include/classes/html/CMultiSelect.php +++ b/frontends/php/include/classes/html/CMultiSelect.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CNavigationTree.php b/frontends/php/include/classes/html/CNavigationTree.php index ea79643f2d8..b80beb870e2 100644 --- a/frontends/php/include/classes/html/CNavigationTree.php +++ b/frontends/php/include/classes/html/CNavigationTree.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CNumericBox.php b/frontends/php/include/classes/html/CNumericBox.php index 1beb14fd8b9..47649a057e4 100644 --- a/frontends/php/include/classes/html/CNumericBox.php +++ b/frontends/php/include/classes/html/CNumericBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CObject.php b/frontends/php/include/classes/html/CObject.php index 17a39a09532..fdb8a489fb9 100644 --- a/frontends/php/include/classes/html/CObject.php +++ b/frontends/php/include/classes/html/CObject.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CParam.php b/frontends/php/include/classes/html/CParam.php index 96b41139042..a5649ddbe91 100644 --- a/frontends/php/include/classes/html/CParam.php +++ b/frontends/php/include/classes/html/CParam.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CPassBox.php b/frontends/php/include/classes/html/CPassBox.php index 30b64348bc9..0a9e0065d00 100644 --- a/frontends/php/include/classes/html/CPassBox.php +++ b/frontends/php/include/classes/html/CPassBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CPre.php b/frontends/php/include/classes/html/CPre.php index 2a5901df293..6967e055e2d 100644 --- a/frontends/php/include/classes/html/CPre.php +++ b/frontends/php/include/classes/html/CPre.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CRadioButtonList.php b/frontends/php/include/classes/html/CRadioButtonList.php index 6219ff045ce..e7974a80464 100644 --- a/frontends/php/include/classes/html/CRadioButtonList.php +++ b/frontends/php/include/classes/html/CRadioButtonList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -106,6 +106,10 @@ class CRadioButtonList extends CList { } } + if ($this->getAttribute('aria-required') === 'true') { + $this->setAttribute('role', 'radiogroup'); + } + return parent::toString($destroy); } } diff --git a/frontends/php/include/classes/html/CRedirectButton.php b/frontends/php/include/classes/html/CRedirectButton.php index ec26597deb6..dfdc2b2cf03 100644 --- a/frontends/php/include/classes/html/CRedirectButton.php +++ b/frontends/php/include/classes/html/CRedirectButton.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CRow.php b/frontends/php/include/classes/html/CRow.php index 74d103b3681..d9511a413cc 100644 --- a/frontends/php/include/classes/html/CRow.php +++ b/frontends/php/include/classes/html/CRow.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CRowHeader.php b/frontends/php/include/classes/html/CRowHeader.php index d0b993a994e..c4b30ee0d1c 100644 --- a/frontends/php/include/classes/html/CRowHeader.php +++ b/frontends/php/include/classes/html/CRowHeader.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CSeverity.php b/frontends/php/include/classes/html/CSeverity.php index 1afc360179c..5665a8c8b4b 100644 --- a/frontends/php/include/classes/html/CSeverity.php +++ b/frontends/php/include/classes/html/CSeverity.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CSimpleButton.php b/frontends/php/include/classes/html/CSimpleButton.php index 28554f993ca..93284eb1158 100644 --- a/frontends/php/include/classes/html/CSimpleButton.php +++ b/frontends/php/include/classes/html/CSimpleButton.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CSpan.php b/frontends/php/include/classes/html/CSpan.php index 14ae58fb2b0..03f8d96643f 100644 --- a/frontends/php/include/classes/html/CSpan.php +++ b/frontends/php/include/classes/html/CSpan.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CSubmit.php b/frontends/php/include/classes/html/CSubmit.php index e9c6554a50e..b8b43ed38e4 100644 --- a/frontends/php/include/classes/html/CSubmit.php +++ b/frontends/php/include/classes/html/CSubmit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CSubmitButton.php b/frontends/php/include/classes/html/CSubmitButton.php index ab449e698bd..32a46d67588 100644 --- a/frontends/php/include/classes/html/CSubmitButton.php +++ b/frontends/php/include/classes/html/CSubmitButton.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CSup.php b/frontends/php/include/classes/html/CSup.php index 9e2e8dbdccc..806950fd1ea 100644 --- a/frontends/php/include/classes/html/CSup.php +++ b/frontends/php/include/classes/html/CSup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CTabView.php b/frontends/php/include/classes/html/CTabView.php index 8c60ecd0aaa..1ec0878dcbb 100644 --- a/frontends/php/include/classes/html/CTabView.php +++ b/frontends/php/include/classes/html/CTabView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CTable.php b/frontends/php/include/classes/html/CTable.php index 506666b2692..b5290cf7f4c 100644 --- a/frontends/php/include/classes/html/CTable.php +++ b/frontends/php/include/classes/html/CTable.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CTableInfo.php b/frontends/php/include/classes/html/CTableInfo.php index 610ae25ee4a..a2ff7233707 100644 --- a/frontends/php/include/classes/html/CTableInfo.php +++ b/frontends/php/include/classes/html/CTableInfo.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CTag.php b/frontends/php/include/classes/html/CTag.php index 564c079b244..8c381b3be68 100644 --- a/frontends/php/include/classes/html/CTag.php +++ b/frontends/php/include/classes/html/CTag.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -294,4 +294,22 @@ class CTag extends CObject { public function getEncStrategy() { return $this->encStrategy; } + + /** + * Set or reset element 'aria-required' attribute. + * + * @param bool $is_required Define aria-required attribute for element. + * + * @return CObject + */ + public function setAriaRequired($is_required = true) { + if ($is_required) { + $this->setAttribute('aria-required', 'true'); + } + else { + $this->removeAttribute('aria-required'); + } + + return $this; + } } diff --git a/frontends/php/include/classes/html/CTextArea.php b/frontends/php/include/classes/html/CTextArea.php index c069a3b6537..6d88534ad7e 100644 --- a/frontends/php/include/classes/html/CTextArea.php +++ b/frontends/php/include/classes/html/CTextArea.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CTextBox.php b/frontends/php/include/classes/html/CTextBox.php index 68a0b2c6140..96b6daa3a90 100644 --- a/frontends/php/include/classes/html/CTextBox.php +++ b/frontends/php/include/classes/html/CTextBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CTriggersInfo.php b/frontends/php/include/classes/html/CTriggersInfo.php index 1350c334678..8f7d476880f 100644 --- a/frontends/php/include/classes/html/CTriggersInfo.php +++ b/frontends/php/include/classes/html/CTriggersInfo.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CTweenBox.php b/frontends/php/include/classes/html/CTweenBox.php index eaa21d5725e..25508c5558c 100644 --- a/frontends/php/include/classes/html/CTweenBox.php +++ b/frontends/php/include/classes/html/CTweenBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -55,6 +55,7 @@ class CTweenBox { $selected = 1; } } + if ((is_bool($selected) && $selected) || (is_int($selected) && $selected != 0) || (is_string($selected) && ($selected == 'yes' || $selected == 'selected' || $selected == 'on'))) { @@ -64,6 +65,7 @@ class CTweenBox { else { $this->rbox->addItem($value, $caption, null, $enabled); } + return $this; } @@ -78,7 +80,7 @@ class CTweenBox { $grp_tab = (new CTable()) ->addClass('tweenBoxTable') ->setAttribute('name', $this->name) - ->setId('id', zbx_formatDomId($this->name)) + ->setId(zbx_formatDomId($this->name)) ->setCellSpacing(0) ->setCellPadding(0); @@ -93,7 +95,10 @@ class CTweenBox { ->addClass(ZBX_STYLE_BTN_GREY) ->onClick('moveListBoxSelectedItem("'.$this->varname.'", "'.$this->id_l.'", "'.$this->id_r.'", "rmv");'); - $grp_tab->addRow([$this->lbox, (new CCol([$add_btn, BR(), $rmv_btn]))->addClass(ZBX_STYLE_CENTER), $this->rbox]); + $grp_tab->addRow([$this->lbox, (new CCol([$add_btn, BR(), $rmv_btn]))->addClass(ZBX_STYLE_CENTER), + $this->rbox + ]); + return $grp_tab; } @@ -101,16 +106,20 @@ class CTweenBox { if (empty($caption_l)) { $caption_l = _('In'); } + if (empty($caption_r)) { $caption_r = _('Other'); } + $tab = $this->get($caption_l, $caption_r); $tab->show(); + return $this; } public function toString() { $tab = $this->get(); + return $tab->toString(); } } diff --git a/frontends/php/include/classes/html/CUiWidget.php b/frontends/php/include/classes/html/CUiWidget.php index 64b8fb50aaf..0d6cddd8c24 100644 --- a/frontends/php/include/classes/html/CUiWidget.php +++ b/frontends/php/include/classes/html/CUiWidget.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CVar.php b/frontends/php/include/classes/html/CVar.php index 7b2bf75480f..1e5294b862f 100644 --- a/frontends/php/include/classes/html/CVar.php +++ b/frontends/php/include/classes/html/CVar.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CVisibilityBox.php b/frontends/php/include/classes/html/CVisibilityBox.php index a87d135d689..de58d1b9b26 100644 --- a/frontends/php/include/classes/html/CVisibilityBox.php +++ b/frontends/php/include/classes/html/CVisibilityBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/CWarning.php b/frontends/php/include/classes/html/CWarning.php index b81ade17185..ad9a6eff7a5 100644 --- a/frontends/php/include/classes/html/CWarning.php +++ b/frontends/php/include/classes/html/CWarning.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/interfaces/CButtonInterface.php b/frontends/php/include/classes/html/interfaces/CButtonInterface.php index ac35b50077d..b27d0c30a94 100644 --- a/frontends/php/include/classes/html/interfaces/CButtonInterface.php +++ b/frontends/php/include/classes/html/interfaces/CButtonInterface.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/pageheader/CPageHeader.php b/frontends/php/include/classes/html/pageheader/CPageHeader.php index d3723153a92..76c714298c2 100644 --- a/frontends/php/include/classes/html/pageheader/CPageHeader.php +++ b/frontends/php/include/classes/html/pageheader/CPageHeader.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/html/widget/CWidget.php b/frontends/php/include/classes/html/widget/CWidget.php index 1ec8ba39dac..b1630dff14b 100644 --- a/frontends/php/include/classes/html/widget/CWidget.php +++ b/frontends/php/include/classes/html/widget/CWidget.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/CConfigurationImport.php b/frontends/php/include/classes/import/CConfigurationImport.php index 3ba476a7c6a..934899e249c 100644 --- a/frontends/php/include/classes/import/CConfigurationImport.php +++ b/frontends/php/include/classes/import/CConfigurationImport.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/CImportDataAdapter.php b/frontends/php/include/classes/import/CImportDataAdapter.php index 24cd447c14a..a13047b697f 100644 --- a/frontends/php/include/classes/import/CImportDataAdapter.php +++ b/frontends/php/include/classes/import/CImportDataAdapter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/CImportReferencer.php b/frontends/php/include/classes/import/CImportReferencer.php index 2ed7a742a39..719b4527d44 100644 --- a/frontends/php/include/classes/import/CImportReferencer.php +++ b/frontends/php/include/classes/import/CImportReferencer.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/CImportedObjectContainer.php b/frontends/php/include/classes/import/CImportedObjectContainer.php index 4c4abb78b11..56afd38759c 100644 --- a/frontends/php/include/classes/import/CImportedObjectContainer.php +++ b/frontends/php/include/classes/import/CImportedObjectContainer.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/C10ImportConverter.php b/frontends/php/include/classes/import/converters/C10ImportConverter.php index b12813f8486..0b71b1d6438 100644 --- a/frontends/php/include/classes/import/converters/C10ImportConverter.php +++ b/frontends/php/include/classes/import/converters/C10ImportConverter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/C10ItemKeyConverter.php b/frontends/php/include/classes/import/converters/C10ItemKeyConverter.php index a5b3aa9bf5b..e2934622198 100644 --- a/frontends/php/include/classes/import/converters/C10ItemKeyConverter.php +++ b/frontends/php/include/classes/import/converters/C10ItemKeyConverter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/C10TriggerConverter.php b/frontends/php/include/classes/import/converters/C10TriggerConverter.php index 4cfc97c3b2f..3965831a095 100644 --- a/frontends/php/include/classes/import/converters/C10TriggerConverter.php +++ b/frontends/php/include/classes/import/converters/C10TriggerConverter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/C20ImportConverter.php b/frontends/php/include/classes/import/converters/C20ImportConverter.php index a38a99d1949..072e6daa84d 100644 --- a/frontends/php/include/classes/import/converters/C20ImportConverter.php +++ b/frontends/php/include/classes/import/converters/C20ImportConverter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/C20ItemKeyConverter.php b/frontends/php/include/classes/import/converters/C20ItemKeyConverter.php index 7d4d18c6f2b..d1a39c4da88 100644 --- a/frontends/php/include/classes/import/converters/C20ItemKeyConverter.php +++ b/frontends/php/include/classes/import/converters/C20ItemKeyConverter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/C20TriggerConverter.php b/frontends/php/include/classes/import/converters/C20TriggerConverter.php index d77f900edfb..207698952b1 100644 --- a/frontends/php/include/classes/import/converters/C20TriggerConverter.php +++ b/frontends/php/include/classes/import/converters/C20TriggerConverter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/C30ImportConverter.php b/frontends/php/include/classes/import/converters/C30ImportConverter.php index 20e1b32a022..485304e7f62 100644 --- a/frontends/php/include/classes/import/converters/C30ImportConverter.php +++ b/frontends/php/include/classes/import/converters/C30ImportConverter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/C32ImportConverter.php b/frontends/php/include/classes/import/converters/C32ImportConverter.php index 4ee156929c7..9498395ae1c 100644 --- a/frontends/php/include/classes/import/converters/C32ImportConverter.php +++ b/frontends/php/include/classes/import/converters/C32ImportConverter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/CConverter.php b/frontends/php/include/classes/import/converters/CConverter.php index 35a8992d548..e37e2871d33 100644 --- a/frontends/php/include/classes/import/converters/CConverter.php +++ b/frontends/php/include/classes/import/converters/CConverter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/CConverterChain.php b/frontends/php/include/classes/import/converters/CConverterChain.php index 8401d0bf189..2debb9b8676 100644 --- a/frontends/php/include/classes/import/converters/CConverterChain.php +++ b/frontends/php/include/classes/import/converters/CConverterChain.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/converters/CImportConverterFactory.php b/frontends/php/include/classes/import/converters/CImportConverterFactory.php index c2e5855c0e8..c99ac45e136 100644 --- a/frontends/php/include/classes/import/converters/CImportConverterFactory.php +++ b/frontends/php/include/classes/import/converters/CImportConverterFactory.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/importers/CAbstractScreenImporter.php b/frontends/php/include/classes/import/importers/CAbstractScreenImporter.php index 907443e5942..a7244b981ce 100644 --- a/frontends/php/include/classes/import/importers/CAbstractScreenImporter.php +++ b/frontends/php/include/classes/import/importers/CAbstractScreenImporter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/importers/CHostImporter.php b/frontends/php/include/classes/import/importers/CHostImporter.php index b5fd874c09e..f17f6a29d4f 100644 --- a/frontends/php/include/classes/import/importers/CHostImporter.php +++ b/frontends/php/include/classes/import/importers/CHostImporter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/importers/CImporter.php b/frontends/php/include/classes/import/importers/CImporter.php index b3b0d05d532..b2a1c7509e7 100644 --- a/frontends/php/include/classes/import/importers/CImporter.php +++ b/frontends/php/include/classes/import/importers/CImporter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/importers/CMapImporter.php b/frontends/php/include/classes/import/importers/CMapImporter.php index 6f950b8e023..6ce2bc6c445 100644 --- a/frontends/php/include/classes/import/importers/CMapImporter.php +++ b/frontends/php/include/classes/import/importers/CMapImporter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/importers/CScreenImporter.php b/frontends/php/include/classes/import/importers/CScreenImporter.php index aa94408b905..576e078064e 100644 --- a/frontends/php/include/classes/import/importers/CScreenImporter.php +++ b/frontends/php/include/classes/import/importers/CScreenImporter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/importers/CTemplateImporter.php b/frontends/php/include/classes/import/importers/CTemplateImporter.php index 064aeca0a9f..33b7e4660c1 100644 --- a/frontends/php/include/classes/import/importers/CTemplateImporter.php +++ b/frontends/php/include/classes/import/importers/CTemplateImporter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/importers/CTemplateScreenImporter.php b/frontends/php/include/classes/import/importers/CTemplateScreenImporter.php index 4b03aefca61..9a86e6a2928 100644 --- a/frontends/php/include/classes/import/importers/CTemplateScreenImporter.php +++ b/frontends/php/include/classes/import/importers/CTemplateScreenImporter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/readers/CImportReader.php b/frontends/php/include/classes/import/readers/CImportReader.php index 48a9a7b53a2..0f86eb2d9d7 100644 --- a/frontends/php/include/classes/import/readers/CImportReader.php +++ b/frontends/php/include/classes/import/readers/CImportReader.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/readers/CImportReaderFactory.php b/frontends/php/include/classes/import/readers/CImportReaderFactory.php index aa371aab889..2e4d15623a5 100644 --- a/frontends/php/include/classes/import/readers/CImportReaderFactory.php +++ b/frontends/php/include/classes/import/readers/CImportReaderFactory.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/readers/CJsonImportReader.php b/frontends/php/include/classes/import/readers/CJsonImportReader.php index 939b9396d57..a2f40f37ee2 100644 --- a/frontends/php/include/classes/import/readers/CJsonImportReader.php +++ b/frontends/php/include/classes/import/readers/CJsonImportReader.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/readers/CXmlImportReader.php b/frontends/php/include/classes/import/readers/CXmlImportReader.php index 153f4f3f203..4a6c72a5bb6 100644 --- a/frontends/php/include/classes/import/readers/CXmlImportReader.php +++ b/frontends/php/include/classes/import/readers/CXmlImportReader.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/validators/C10XmlValidator.php b/frontends/php/include/classes/import/validators/C10XmlValidator.php index 54bb48c68b5..233e313d1b7 100644 --- a/frontends/php/include/classes/import/validators/C10XmlValidator.php +++ b/frontends/php/include/classes/import/validators/C10XmlValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/validators/C20XmlValidator.php b/frontends/php/include/classes/import/validators/C20XmlValidator.php index 84dd327f19e..d7b87ec8e93 100644 --- a/frontends/php/include/classes/import/validators/C20XmlValidator.php +++ b/frontends/php/include/classes/import/validators/C20XmlValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/validators/C30XmlValidator.php b/frontends/php/include/classes/import/validators/C30XmlValidator.php index c3a35347132..5bb78702393 100644 --- a/frontends/php/include/classes/import/validators/C30XmlValidator.php +++ b/frontends/php/include/classes/import/validators/C30XmlValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/validators/C32XmlValidator.php b/frontends/php/include/classes/import/validators/C32XmlValidator.php index aa1934fd576..6c74c245054 100644 --- a/frontends/php/include/classes/import/validators/C32XmlValidator.php +++ b/frontends/php/include/classes/import/validators/C32XmlValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/validators/C34XmlValidator.php b/frontends/php/include/classes/import/validators/C34XmlValidator.php index 869f1d5ab3e..0eeee2bbfbe 100644 --- a/frontends/php/include/classes/import/validators/C34XmlValidator.php +++ b/frontends/php/include/classes/import/validators/C34XmlValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/validators/CXmlValidator.php b/frontends/php/include/classes/import/validators/CXmlValidator.php index 3e83e6bdb5a..a8ab586d1ee 100644 --- a/frontends/php/include/classes/import/validators/CXmlValidator.php +++ b/frontends/php/include/classes/import/validators/CXmlValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/import/validators/CXmlValidatorGeneral.php b/frontends/php/include/classes/import/validators/CXmlValidatorGeneral.php index d7a53e90c4b..7be20e1ec57 100644 --- a/frontends/php/include/classes/import/validators/CXmlValidatorGeneral.php +++ b/frontends/php/include/classes/import/validators/CXmlValidatorGeneral.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/items/CHelpItems.php b/frontends/php/include/classes/items/CHelpItems.php index b91505019db..f04010a6558 100644 --- a/frontends/php/include/classes/items/CHelpItems.php +++ b/frontends/php/include/classes/items/CHelpItems.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/json/CJson.php b/frontends/php/include/classes/json/CJson.php index 734bd285df2..bc8b0784097 100644 --- a/frontends/php/include/classes/json/CJson.php +++ b/frontends/php/include/classes/json/CJson.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/ldap/CLdap.php b/frontends/php/include/classes/ldap/CLdap.php index dd91e5c1271..397d1f56685 100644 --- a/frontends/php/include/classes/ldap/CLdap.php +++ b/frontends/php/include/classes/ldap/CLdap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/macros/CMacrosResolver.php b/frontends/php/include/classes/macros/CMacrosResolver.php index 5fd99efd2ae..dd82c08f8bc 100644 --- a/frontends/php/include/classes/macros/CMacrosResolver.php +++ b/frontends/php/include/classes/macros/CMacrosResolver.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/macros/CMacrosResolverGeneral.php b/frontends/php/include/classes/macros/CMacrosResolverGeneral.php index a15d0f9dcc7..4bc88448c50 100644 --- a/frontends/php/include/classes/macros/CMacrosResolverGeneral.php +++ b/frontends/php/include/classes/macros/CMacrosResolverGeneral.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/macros/CMacrosResolverHelper.php b/frontends/php/include/classes/macros/CMacrosResolverHelper.php index 998a103e15f..77ce91abf32 100644 --- a/frontends/php/include/classes/macros/CMacrosResolverHelper.php +++ b/frontends/php/include/classes/macros/CMacrosResolverHelper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/mvc/CController.php b/frontends/php/include/classes/mvc/CController.php index 799391d870d..85939eef6d2 100644 --- a/frontends/php/include/classes/mvc/CController.php +++ b/frontends/php/include/classes/mvc/CController.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/mvc/CControllerResponse.php b/frontends/php/include/classes/mvc/CControllerResponse.php index 37ae20ee18c..73b04a6770b 100644 --- a/frontends/php/include/classes/mvc/CControllerResponse.php +++ b/frontends/php/include/classes/mvc/CControllerResponse.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/mvc/CControllerResponseData.php b/frontends/php/include/classes/mvc/CControllerResponseData.php index 704fbfd98a8..559b23709ce 100644 --- a/frontends/php/include/classes/mvc/CControllerResponseData.php +++ b/frontends/php/include/classes/mvc/CControllerResponseData.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/mvc/CControllerResponseFatal.php b/frontends/php/include/classes/mvc/CControllerResponseFatal.php index 4c178069c49..8d08fd007b8 100644 --- a/frontends/php/include/classes/mvc/CControllerResponseFatal.php +++ b/frontends/php/include/classes/mvc/CControllerResponseFatal.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/mvc/CControllerResponseRedirect.php b/frontends/php/include/classes/mvc/CControllerResponseRedirect.php index 9761a8badc0..85f84960525 100644 --- a/frontends/php/include/classes/mvc/CControllerResponseRedirect.php +++ b/frontends/php/include/classes/mvc/CControllerResponseRedirect.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/mvc/CRouter.php b/frontends/php/include/classes/mvc/CRouter.php index 905a27d6f45..e950bb4b7fb 100644 --- a/frontends/php/include/classes/mvc/CRouter.php +++ b/frontends/php/include/classes/mvc/CRouter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/mvc/CView.php b/frontends/php/include/classes/mvc/CView.php index 518f2a88945..71a341f61a0 100644 --- a/frontends/php/include/classes/mvc/CView.php +++ b/frontends/php/include/classes/mvc/CView.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/pagefilter/CPageFilter.php b/frontends/php/include/classes/pagefilter/CPageFilter.php index 47f5ffc375b..e45f70b5793 100644 --- a/frontends/php/include/classes/pagefilter/CPageFilter.php +++ b/frontends/php/include/classes/pagefilter/CPageFilter.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CConditionFormula.php b/frontends/php/include/classes/parsers/CConditionFormula.php index 7ceda268545..fe2cda0bd39 100644 --- a/frontends/php/include/classes/parsers/CConditionFormula.php +++ b/frontends/php/include/classes/parsers/CConditionFormula.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CDnsParser.php b/frontends/php/include/classes/parsers/CDnsParser.php index ea0228135fb..2566ae8e687 100644 --- a/frontends/php/include/classes/parsers/CDnsParser.php +++ b/frontends/php/include/classes/parsers/CDnsParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CFlexibleIntervalParser.php b/frontends/php/include/classes/parsers/CFlexibleIntervalParser.php index e08439188ad..29652ca11e3 100644 --- a/frontends/php/include/classes/parsers/CFlexibleIntervalParser.php +++ b/frontends/php/include/classes/parsers/CFlexibleIntervalParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CFunctionIdParser.php b/frontends/php/include/classes/parsers/CFunctionIdParser.php index f4ccf3cdd0d..83c8505fc83 100644 --- a/frontends/php/include/classes/parsers/CFunctionIdParser.php +++ b/frontends/php/include/classes/parsers/CFunctionIdParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CFunctionMacroParser.php b/frontends/php/include/classes/parsers/CFunctionMacroParser.php index 5f05278261b..455232e9825 100644 --- a/frontends/php/include/classes/parsers/CFunctionMacroParser.php +++ b/frontends/php/include/classes/parsers/CFunctionMacroParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CFunctionParser.php b/frontends/php/include/classes/parsers/CFunctionParser.php index 841ad5a2623..a57de478bfb 100644 --- a/frontends/php/include/classes/parsers/CFunctionParser.php +++ b/frontends/php/include/classes/parsers/CFunctionParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CIPParser.php b/frontends/php/include/classes/parsers/CIPParser.php index f4a14435ad8..5184b67d3f5 100644 --- a/frontends/php/include/classes/parsers/CIPParser.php +++ b/frontends/php/include/classes/parsers/CIPParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CIPRangeParser.php b/frontends/php/include/classes/parsers/CIPRangeParser.php index cb734c1d01e..49024137085 100644 --- a/frontends/php/include/classes/parsers/CIPRangeParser.php +++ b/frontends/php/include/classes/parsers/CIPRangeParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CIPv4Parser.php b/frontends/php/include/classes/parsers/CIPv4Parser.php index 245cb65c0da..1db2dc06bca 100644 --- a/frontends/php/include/classes/parsers/CIPv4Parser.php +++ b/frontends/php/include/classes/parsers/CIPv4Parser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CIPv6Parser.php b/frontends/php/include/classes/parsers/CIPv6Parser.php index 23e2f8b6e58..b151b8e8fa6 100644 --- a/frontends/php/include/classes/parsers/CIPv6Parser.php +++ b/frontends/php/include/classes/parsers/CIPv6Parser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CItemKey.php b/frontends/php/include/classes/parsers/CItemKey.php index 22ecddb5427..46dddbdf937 100644 --- a/frontends/php/include/classes/parsers/CItemKey.php +++ b/frontends/php/include/classes/parsers/CItemKey.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CLLDMacroParser.php b/frontends/php/include/classes/parsers/CLLDMacroParser.php index b1268184393..661e0dec118 100644 --- a/frontends/php/include/classes/parsers/CLLDMacroParser.php +++ b/frontends/php/include/classes/parsers/CLLDMacroParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CMacroFunctionParser.php b/frontends/php/include/classes/parsers/CMacroFunctionParser.php index 4759a56750f..08c607c8998 100644 --- a/frontends/php/include/classes/parsers/CMacroFunctionParser.php +++ b/frontends/php/include/classes/parsers/CMacroFunctionParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CMacroParser.php b/frontends/php/include/classes/parsers/CMacroParser.php index 263646731fb..5230a9cffac 100644 --- a/frontends/php/include/classes/parsers/CMacroParser.php +++ b/frontends/php/include/classes/parsers/CMacroParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CParser.php b/frontends/php/include/classes/parsers/CParser.php index 5865b5f3a05..c5c71ba95fb 100644 --- a/frontends/php/include/classes/parsers/CParser.php +++ b/frontends/php/include/classes/parsers/CParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CReferenceParser.php b/frontends/php/include/classes/parsers/CReferenceParser.php index 3ae6e62d512..159574fed63 100644 --- a/frontends/php/include/classes/parsers/CReferenceParser.php +++ b/frontends/php/include/classes/parsers/CReferenceParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CReplacementParser.php b/frontends/php/include/classes/parsers/CReplacementParser.php index 5a79316dad0..0147c05000f 100644 --- a/frontends/php/include/classes/parsers/CReplacementParser.php +++ b/frontends/php/include/classes/parsers/CReplacementParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CSchedulingIntervalParser.php b/frontends/php/include/classes/parsers/CSchedulingIntervalParser.php index 340e75614be..63c05d34d73 100644 --- a/frontends/php/include/classes/parsers/CSchedulingIntervalParser.php +++ b/frontends/php/include/classes/parsers/CSchedulingIntervalParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CSetParser.php b/frontends/php/include/classes/parsers/CSetParser.php index a6ba6726e56..927ba94ebf6 100644 --- a/frontends/php/include/classes/parsers/CSetParser.php +++ b/frontends/php/include/classes/parsers/CSetParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CSimpleIntervalParser.php b/frontends/php/include/classes/parsers/CSimpleIntervalParser.php index 30a82ba0f6b..2e86f4c1d40 100644 --- a/frontends/php/include/classes/parsers/CSimpleIntervalParser.php +++ b/frontends/php/include/classes/parsers/CSimpleIntervalParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CTimePeriodParser.php b/frontends/php/include/classes/parsers/CTimePeriodParser.php index 7d23936db4a..f1acb3a87b3 100644 --- a/frontends/php/include/classes/parsers/CTimePeriodParser.php +++ b/frontends/php/include/classes/parsers/CTimePeriodParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CTimePeriodsParser.php b/frontends/php/include/classes/parsers/CTimePeriodsParser.php index b79d36a243a..1b2f81b7bf0 100644 --- a/frontends/php/include/classes/parsers/CTimePeriodsParser.php +++ b/frontends/php/include/classes/parsers/CTimePeriodsParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CTriggerExpression.php b/frontends/php/include/classes/parsers/CTriggerExpression.php index 804811aab4e..857a8ca37b2 100644 --- a/frontends/php/include/classes/parsers/CTriggerExpression.php +++ b/frontends/php/include/classes/parsers/CTriggerExpression.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CUpdateIntervalParser.php b/frontends/php/include/classes/parsers/CUpdateIntervalParser.php index 7ca2e9aaea6..d2cca05cda2 100644 --- a/frontends/php/include/classes/parsers/CUpdateIntervalParser.php +++ b/frontends/php/include/classes/parsers/CUpdateIntervalParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CUserMacroParser.php b/frontends/php/include/classes/parsers/CUserMacroParser.php index 985d6bf5f5f..3f989a16b73 100644 --- a/frontends/php/include/classes/parsers/CUserMacroParser.php +++ b/frontends/php/include/classes/parsers/CUserMacroParser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/CValidationRule.php b/frontends/php/include/classes/parsers/CValidationRule.php index b76889acf87..13fbd8f77b5 100644 --- a/frontends/php/include/classes/parsers/CValidationRule.php +++ b/frontends/php/include/classes/parsers/CValidationRule.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/results/CParserResult.php b/frontends/php/include/classes/parsers/results/CParserResult.php index 46d5406b607..a96b2e16f63 100644 --- a/frontends/php/include/classes/parsers/results/CParserResult.php +++ b/frontends/php/include/classes/parsers/results/CParserResult.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/parsers/results/CTriggerExpressionParserResult.php b/frontends/php/include/classes/parsers/results/CTriggerExpressionParserResult.php index 9fb8109b562..7925d1794f5 100644 --- a/frontends/php/include/classes/parsers/results/CTriggerExpressionParserResult.php +++ b/frontends/php/include/classes/parsers/results/CTriggerExpressionParserResult.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/regexp/CGlobalRegexp.php b/frontends/php/include/classes/regexp/CGlobalRegexp.php index cb016dfeb46..67418a5e940 100644 --- a/frontends/php/include/classes/regexp/CGlobalRegexp.php +++ b/frontends/php/include/classes/regexp/CGlobalRegexp.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/routing/CUrl.php b/frontends/php/include/classes/routing/CUrl.php index 67427d3c705..3d1455d62f9 100644 --- a/frontends/php/include/classes/routing/CUrl.php +++ b/frontends/php/include/classes/routing/CUrl.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/routing/CUrlFactory.php b/frontends/php/include/classes/routing/CUrlFactory.php index 6e6df61e0de..69d8549ea05 100644 --- a/frontends/php/include/classes/routing/CUrlFactory.php +++ b/frontends/php/include/classes/routing/CUrlFactory.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenActions.php b/frontends/php/include/classes/screens/CScreenActions.php index 094a6c2e8dc..8a0e675b88c 100644 --- a/frontends/php/include/classes/screens/CScreenActions.php +++ b/frontends/php/include/classes/screens/CScreenActions.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenBase.php b/frontends/php/include/classes/screens/CScreenBase.php index 4f510898ae4..0619267e9fd 100644 --- a/frontends/php/include/classes/screens/CScreenBase.php +++ b/frontends/php/include/classes/screens/CScreenBase.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenBuilder.php b/frontends/php/include/classes/screens/CScreenBuilder.php index 6d9c7f75c7f..4dc695bcdde 100644 --- a/frontends/php/include/classes/screens/CScreenBuilder.php +++ b/frontends/php/include/classes/screens/CScreenBuilder.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenChart.php b/frontends/php/include/classes/screens/CScreenChart.php index 782824a84cc..0600298f3d6 100644 --- a/frontends/php/include/classes/screens/CScreenChart.php +++ b/frontends/php/include/classes/screens/CScreenChart.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenClock.php b/frontends/php/include/classes/screens/CScreenClock.php index 527d6ff88a3..7abf63884c4 100644 --- a/frontends/php/include/classes/screens/CScreenClock.php +++ b/frontends/php/include/classes/screens/CScreenClock.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenDataOverview.php b/frontends/php/include/classes/screens/CScreenDataOverview.php index 317df723ec3..3cbd32c34c4 100644 --- a/frontends/php/include/classes/screens/CScreenDataOverview.php +++ b/frontends/php/include/classes/screens/CScreenDataOverview.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenDiscovery.php b/frontends/php/include/classes/screens/CScreenDiscovery.php index 6cd15d6e76d..643f2d96603 100644 --- a/frontends/php/include/classes/screens/CScreenDiscovery.php +++ b/frontends/php/include/classes/screens/CScreenDiscovery.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenEvents.php b/frontends/php/include/classes/screens/CScreenEvents.php index 9b8fe20caba..de9f298be14 100644 --- a/frontends/php/include/classes/screens/CScreenEvents.php +++ b/frontends/php/include/classes/screens/CScreenEvents.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenGraph.php b/frontends/php/include/classes/screens/CScreenGraph.php index 6a2be0dcdf5..6b30705260a 100644 --- a/frontends/php/include/classes/screens/CScreenGraph.php +++ b/frontends/php/include/classes/screens/CScreenGraph.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenHistory.php b/frontends/php/include/classes/screens/CScreenHistory.php index 94c2de344dd..e60dde165b7 100644 --- a/frontends/php/include/classes/screens/CScreenHistory.php +++ b/frontends/php/include/classes/screens/CScreenHistory.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenHostTriggers.php b/frontends/php/include/classes/screens/CScreenHostTriggers.php index 4cfab6dacb3..63454e7acf6 100644 --- a/frontends/php/include/classes/screens/CScreenHostTriggers.php +++ b/frontends/php/include/classes/screens/CScreenHostTriggers.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenHostgroupTriggers.php b/frontends/php/include/classes/screens/CScreenHostgroupTriggers.php index ebad47d9485..6f995411676 100644 --- a/frontends/php/include/classes/screens/CScreenHostgroupTriggers.php +++ b/frontends/php/include/classes/screens/CScreenHostgroupTriggers.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenHostsInfo.php b/frontends/php/include/classes/screens/CScreenHostsInfo.php index dadf1875540..9575df9693e 100644 --- a/frontends/php/include/classes/screens/CScreenHostsInfo.php +++ b/frontends/php/include/classes/screens/CScreenHostsInfo.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenHttpTest.php b/frontends/php/include/classes/screens/CScreenHttpTest.php index 48b08c419c9..3b93d0835e2 100644 --- a/frontends/php/include/classes/screens/CScreenHttpTest.php +++ b/frontends/php/include/classes/screens/CScreenHttpTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenHttpTestDetails.php b/frontends/php/include/classes/screens/CScreenHttpTestDetails.php index 567f238d589..f4a0e371c0d 100644 --- a/frontends/php/include/classes/screens/CScreenHttpTestDetails.php +++ b/frontends/php/include/classes/screens/CScreenHttpTestDetails.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenLldGraph.php b/frontends/php/include/classes/screens/CScreenLldGraph.php index e9671abe78e..83336861850 100644 --- a/frontends/php/include/classes/screens/CScreenLldGraph.php +++ b/frontends/php/include/classes/screens/CScreenLldGraph.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenLldGraphBase.php b/frontends/php/include/classes/screens/CScreenLldGraphBase.php index 268e97d98c9..341abe8300d 100644 --- a/frontends/php/include/classes/screens/CScreenLldGraphBase.php +++ b/frontends/php/include/classes/screens/CScreenLldGraphBase.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenLldSimpleGraph.php b/frontends/php/include/classes/screens/CScreenLldSimpleGraph.php index 2fa5df5e039..2f61022e151 100644 --- a/frontends/php/include/classes/screens/CScreenLldSimpleGraph.php +++ b/frontends/php/include/classes/screens/CScreenLldSimpleGraph.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenMap.php b/frontends/php/include/classes/screens/CScreenMap.php index 736a6dee7ea..315c5b1b0dc 100644 --- a/frontends/php/include/classes/screens/CScreenMap.php +++ b/frontends/php/include/classes/screens/CScreenMap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenPlainText.php b/frontends/php/include/classes/screens/CScreenPlainText.php index 1915fa66fe6..c310e22dd53 100644 --- a/frontends/php/include/classes/screens/CScreenPlainText.php +++ b/frontends/php/include/classes/screens/CScreenPlainText.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenProblem.php b/frontends/php/include/classes/screens/CScreenProblem.php index 5f7b8618402..b866c3f6b4e 100644 --- a/frontends/php/include/classes/screens/CScreenProblem.php +++ b/frontends/php/include/classes/screens/CScreenProblem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenScreen.php b/frontends/php/include/classes/screens/CScreenScreen.php index f89c907dc11..46b3764d916 100644 --- a/frontends/php/include/classes/screens/CScreenScreen.php +++ b/frontends/php/include/classes/screens/CScreenScreen.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenServerInfo.php b/frontends/php/include/classes/screens/CScreenServerInfo.php index 6737fcf0564..ba0d766c249 100644 --- a/frontends/php/include/classes/screens/CScreenServerInfo.php +++ b/frontends/php/include/classes/screens/CScreenServerInfo.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenSimpleGraph.php b/frontends/php/include/classes/screens/CScreenSimpleGraph.php index 4de6349ff97..e217ba5ee79 100644 --- a/frontends/php/include/classes/screens/CScreenSimpleGraph.php +++ b/frontends/php/include/classes/screens/CScreenSimpleGraph.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenSystemStatus.php b/frontends/php/include/classes/screens/CScreenSystemStatus.php index 22ebf2102c2..c32b05279b2 100644 --- a/frontends/php/include/classes/screens/CScreenSystemStatus.php +++ b/frontends/php/include/classes/screens/CScreenSystemStatus.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenTriggersInfo.php b/frontends/php/include/classes/screens/CScreenTriggersInfo.php index faf8835147e..93bbb6d7272 100644 --- a/frontends/php/include/classes/screens/CScreenTriggersInfo.php +++ b/frontends/php/include/classes/screens/CScreenTriggersInfo.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenTriggersOverview.php b/frontends/php/include/classes/screens/CScreenTriggersOverview.php index 7a7a3e376d7..1d556b7332b 100644 --- a/frontends/php/include/classes/screens/CScreenTriggersOverview.php +++ b/frontends/php/include/classes/screens/CScreenTriggersOverview.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/screens/CScreenUrl.php b/frontends/php/include/classes/screens/CScreenUrl.php index 047e6735baf..599ff84cc21 100644 --- a/frontends/php/include/classes/screens/CScreenUrl.php +++ b/frontends/php/include/classes/screens/CScreenUrl.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/server/CZabbixServer.php b/frontends/php/include/classes/server/CZabbixServer.php index ec730428a66..f2f69393414 100644 --- a/frontends/php/include/classes/server/CZabbixServer.php +++ b/frontends/php/include/classes/server/CZabbixServer.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/setup/CFrontendSetup.php b/frontends/php/include/classes/setup/CFrontendSetup.php index 82451feef65..b4edc4781c8 100644 --- a/frontends/php/include/classes/setup/CFrontendSetup.php +++ b/frontends/php/include/classes/setup/CFrontendSetup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/setup/CSetupWizard.php b/frontends/php/include/classes/setup/CSetupWizard.php index fa5526f8a7a..9b6142a59a4 100644 --- a/frontends/php/include/classes/setup/CSetupWizard.php +++ b/frontends/php/include/classes/setup/CSetupWizard.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/tree/CServiceTree.php b/frontends/php/include/classes/tree/CServiceTree.php index 94a62426800..5dbf8840ee3 100644 --- a/frontends/php/include/classes/tree/CServiceTree.php +++ b/frontends/php/include/classes/tree/CServiceTree.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/tree/CTree.php b/frontends/php/include/classes/tree/CTree.php index 6fadbb7d9f7..a5fc7d83bfd 100644 --- a/frontends/php/include/classes/tree/CTree.php +++ b/frontends/php/include/classes/tree/CTree.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/triggers/CTextTriggerConstructor.php b/frontends/php/include/classes/triggers/CTextTriggerConstructor.php index b5adc1484ee..d88ad7f4d7c 100644 --- a/frontends/php/include/classes/triggers/CTextTriggerConstructor.php +++ b/frontends/php/include/classes/triggers/CTextTriggerConstructor.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/user/CFavorite.php b/frontends/php/include/classes/user/CFavorite.php index 58d23fa7bb5..a9215475466 100644 --- a/frontends/php/include/classes/user/CFavorite.php +++ b/frontends/php/include/classes/user/CFavorite.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/user/CProfile.php b/frontends/php/include/classes/user/CProfile.php index 0ff6c7dd248..ef90c35995a 100644 --- a/frontends/php/include/classes/user/CProfile.php +++ b/frontends/php/include/classes/user/CProfile.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/user/CWebUser.php b/frontends/php/include/classes/user/CWebUser.php index df686097e56..7dd4e35345b 100644 --- a/frontends/php/include/classes/user/CWebUser.php +++ b/frontends/php/include/classes/user/CWebUser.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CActionCondValidator.php b/frontends/php/include/classes/validators/CActionCondValidator.php index 3e400b59f82..a1c26ca213d 100644 --- a/frontends/php/include/classes/validators/CActionCondValidator.php +++ b/frontends/php/include/classes/validators/CActionCondValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CApiInputValidator.php b/frontends/php/include/classes/validators/CApiInputValidator.php index c7f92ec8be1..a933e82cdc0 100644 --- a/frontends/php/include/classes/validators/CApiInputValidator.php +++ b/frontends/php/include/classes/validators/CApiInputValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CCollectionValidator.php b/frontends/php/include/classes/validators/CCollectionValidator.php index b322c1de827..6a7949f5e49 100644 --- a/frontends/php/include/classes/validators/CCollectionValidator.php +++ b/frontends/php/include/classes/validators/CCollectionValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CColorValidator.php b/frontends/php/include/classes/validators/CColorValidator.php index b0d1a3d698e..d30dd18ce4c 100644 --- a/frontends/php/include/classes/validators/CColorValidator.php +++ b/frontends/php/include/classes/validators/CColorValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CDecimalStringValidator.php b/frontends/php/include/classes/validators/CDecimalStringValidator.php index d1719e8d37c..65c23fcfb4b 100644 --- a/frontends/php/include/classes/validators/CDecimalStringValidator.php +++ b/frontends/php/include/classes/validators/CDecimalStringValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CDecimalValidator.php b/frontends/php/include/classes/validators/CDecimalValidator.php index 20d78a65409..19cf7cf94cb 100644 --- a/frontends/php/include/classes/validators/CDecimalValidator.php +++ b/frontends/php/include/classes/validators/CDecimalValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CEmailValidator.php b/frontends/php/include/classes/validators/CEmailValidator.php index 5f6aaed2d44..8e5c087f733 100644 --- a/frontends/php/include/classes/validators/CEmailValidator.php +++ b/frontends/php/include/classes/validators/CEmailValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CFunctionValidator.php b/frontends/php/include/classes/validators/CFunctionValidator.php index 9fe5cd91cde..037147b1aae 100644 --- a/frontends/php/include/classes/validators/CFunctionValidator.php +++ b/frontends/php/include/classes/validators/CFunctionValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CHtmlUrlValidator.php b/frontends/php/include/classes/validators/CHtmlUrlValidator.php index 4f5e67a51e2..a1f34b5563a 100644 --- a/frontends/php/include/classes/validators/CHtmlUrlValidator.php +++ b/frontends/php/include/classes/validators/CHtmlUrlValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CIdValidator.php b/frontends/php/include/classes/validators/CIdValidator.php index b5076bf0564..ebb50cb6db6 100644 --- a/frontends/php/include/classes/validators/CIdValidator.php +++ b/frontends/php/include/classes/validators/CIdValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CLdapAuthValidator.php b/frontends/php/include/classes/validators/CLdapAuthValidator.php index e1d945b3ada..00e263b5e00 100644 --- a/frontends/php/include/classes/validators/CLdapAuthValidator.php +++ b/frontends/php/include/classes/validators/CLdapAuthValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CLimitedSetValidator.php b/frontends/php/include/classes/validators/CLimitedSetValidator.php index 499084c8c00..fec38a70750 100644 --- a/frontends/php/include/classes/validators/CLimitedSetValidator.php +++ b/frontends/php/include/classes/validators/CLimitedSetValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CNewValidator.php b/frontends/php/include/classes/validators/CNewValidator.php index eb4ac0b8261..d320d831ed8 100644 --- a/frontends/php/include/classes/validators/CNewValidator.php +++ b/frontends/php/include/classes/validators/CNewValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CPartialValidatorInterface.php b/frontends/php/include/classes/validators/CPartialValidatorInterface.php index 155beea5b5d..6581575b2ad 100644 --- a/frontends/php/include/classes/validators/CPartialValidatorInterface.php +++ b/frontends/php/include/classes/validators/CPartialValidatorInterface.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CRegexValidator.php b/frontends/php/include/classes/validators/CRegexValidator.php index a480b5412c2..a40ae7108c5 100644 --- a/frontends/php/include/classes/validators/CRegexValidator.php +++ b/frontends/php/include/classes/validators/CRegexValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CStringValidator.php b/frontends/php/include/classes/validators/CStringValidator.php index 41994f8d69e..060b9282399 100644 --- a/frontends/php/include/classes/validators/CStringValidator.php +++ b/frontends/php/include/classes/validators/CStringValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/CValidator.php b/frontends/php/include/classes/validators/CValidator.php index 2aa0d256709..0556deb8b75 100644 --- a/frontends/php/include/classes/validators/CValidator.php +++ b/frontends/php/include/classes/validators/CValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/event/CEventSourceObjectValidator.php b/frontends/php/include/classes/validators/event/CEventSourceObjectValidator.php index aabbe7886a0..325c984deef 100644 --- a/frontends/php/include/classes/validators/event/CEventSourceObjectValidator.php +++ b/frontends/php/include/classes/validators/event/CEventSourceObjectValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/host/CHostNormalValidator.php b/frontends/php/include/classes/validators/host/CHostNormalValidator.php index 396e38f30e5..08b2c26205c 100644 --- a/frontends/php/include/classes/validators/host/CHostNormalValidator.php +++ b/frontends/php/include/classes/validators/host/CHostNormalValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/hostgroup/CHostGroupNameValidator.php b/frontends/php/include/classes/validators/hostgroup/CHostGroupNameValidator.php index 43ab8a35446..0cdbf6fb842 100644 --- a/frontends/php/include/classes/validators/hostgroup/CHostGroupNameValidator.php +++ b/frontends/php/include/classes/validators/hostgroup/CHostGroupNameValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/hostgroup/CHostGroupNormalValidator.php b/frontends/php/include/classes/validators/hostgroup/CHostGroupNormalValidator.php index 8bb849ee133..9c04258728b 100644 --- a/frontends/php/include/classes/validators/hostgroup/CHostGroupNormalValidator.php +++ b/frontends/php/include/classes/validators/hostgroup/CHostGroupNormalValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/object/CConditionValidator.php b/frontends/php/include/classes/validators/object/CConditionValidator.php index 34165ad5c63..2d80a754b0d 100644 --- a/frontends/php/include/classes/validators/object/CConditionValidator.php +++ b/frontends/php/include/classes/validators/object/CConditionValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/object/CUpdateDiscoveredValidator.php b/frontends/php/include/classes/validators/object/CUpdateDiscoveredValidator.php index 5079a895bed..5dedac06bd1 100644 --- a/frontends/php/include/classes/validators/object/CUpdateDiscoveredValidator.php +++ b/frontends/php/include/classes/validators/object/CUpdateDiscoveredValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/schema/CPartialSchemaValidator.php b/frontends/php/include/classes/validators/schema/CPartialSchemaValidator.php index 650dba8484c..c97d73828ac 100644 --- a/frontends/php/include/classes/validators/schema/CPartialSchemaValidator.php +++ b/frontends/php/include/classes/validators/schema/CPartialSchemaValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/schema/CSchemaValidator.php b/frontends/php/include/classes/validators/schema/CSchemaValidator.php index 8ab204e9647..dd8721a2c9b 100644 --- a/frontends/php/include/classes/validators/schema/CSchemaValidator.php +++ b/frontends/php/include/classes/validators/schema/CSchemaValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/validators/string/CLldMacroStringValidator.php b/frontends/php/include/classes/validators/string/CLldMacroStringValidator.php index b3adc14b53d..a3c8a4339c2 100644 --- a/frontends/php/include/classes/validators/string/CLldMacroStringValidator.php +++ b/frontends/php/include/classes/validators/string/CLldMacroStringValidator.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetField.php b/frontends/php/include/classes/widgetfields/CWidgetField.php index 978ec1060e2..8f9d7446789 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetField.php +++ b/frontends/php/include/classes/widgetfields/CWidgetField.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -22,6 +22,7 @@ class CWidgetField { const FLAG_ACKNOWLEDGES = 0x01; const FLAG_NOT_EMPTY = 0x02; + const FLAG_LABEL_ASTERISK = 0x04; protected $name; protected $label; diff --git a/frontends/php/include/classes/widgetfields/CWidgetFieldCheckBox.php b/frontends/php/include/classes/widgetfields/CWidgetFieldCheckBox.php index a04d4433fb6..db2c2796ec3 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldCheckBox.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldCheckBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldComboBox.php b/frontends/php/include/classes/widgetfields/CWidgetFieldComboBox.php index 9d86b425185..23e9aa5571b 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldComboBox.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldComboBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldGroup.php b/frontends/php/include/classes/widgetfields/CWidgetFieldGroup.php index 26c00742d56..5a18860891e 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldGroup.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldGroup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldHidden.php b/frontends/php/include/classes/widgetfields/CWidgetFieldHidden.php index 8b0efea735a..1c6a635488b 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldHidden.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldHidden.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldHost.php b/frontends/php/include/classes/widgetfields/CWidgetFieldHost.php index 3e05d0b609a..bc64a0d7f7b 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldHost.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldHost.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldNumericBox.php b/frontends/php/include/classes/widgetfields/CWidgetFieldNumericBox.php index 3c35a673130..615aee53045 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldNumericBox.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldNumericBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldRadioButtonList.php b/frontends/php/include/classes/widgetfields/CWidgetFieldRadioButtonList.php index 63ce10abdec..5e8eb1fe8c9 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldRadioButtonList.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldRadioButtonList.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldReference.php b/frontends/php/include/classes/widgetfields/CWidgetFieldReference.php index 1b2d2e7cfc2..67902e8f0cb 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldReference.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldReference.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldSelectResource.php b/frontends/php/include/classes/widgetfields/CWidgetFieldSelectResource.php index d7df75caaf9..69030f09d01 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldSelectResource.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldSelectResource.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldSeverities.php b/frontends/php/include/classes/widgetfields/CWidgetFieldSeverities.php index 5891945965d..529b6232295 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldSeverities.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldSeverities.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldTags.php b/frontends/php/include/classes/widgetfields/CWidgetFieldTags.php index 16baf169157..0a8a8ea26e7 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldTags.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldTags.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldTextBox.php b/frontends/php/include/classes/widgetfields/CWidgetFieldTextBox.php index 8b8557d3bd4..d2f5ee6bf7e 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldTextBox.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldTextBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldUrl.php b/frontends/php/include/classes/widgetfields/CWidgetFieldUrl.php index 0d14013f21a..456b3ed73ff 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldUrl.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldUrl.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgetfields/CWidgetFieldWidgetListComboBox.php b/frontends/php/include/classes/widgetfields/CWidgetFieldWidgetListComboBox.php index a09a72c1732..fdce379b41c 100644 --- a/frontends/php/include/classes/widgetfields/CWidgetFieldWidgetListComboBox.php +++ b/frontends/php/include/classes/widgetfields/CWidgetFieldWidgetListComboBox.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgets/CActionLogWidgetForm.php b/frontends/php/include/classes/widgets/CActionLogWidgetForm.php index 9f9b7864b9a..f15e822ba76 100644 --- a/frontends/php/include/classes/widgets/CActionLogWidgetForm.php +++ b/frontends/php/include/classes/widgets/CActionLogWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -46,7 +46,9 @@ class CActionLogWidgetForm extends CWidgetForm { $field_lines = (new CWidgetFieldNumericBox('show_lines', _('Show lines'), ZBX_MIN_WIDGET_LINES, ZBX_MAX_WIDGET_LINES - ))->setDefault(25); + )) + ->setFlags(CWidgetField::FLAG_LABEL_ASTERISK) + ->setDefault(25); if (array_key_exists('show_lines', $this->data)) { $field_lines->setValue($this->data['show_lines']); diff --git a/frontends/php/include/classes/widgets/CClockWidgetForm.php b/frontends/php/include/classes/widgets/CClockWidgetForm.php index 95dedac2bfc..3b69fd9d863 100644 --- a/frontends/php/include/classes/widgets/CClockWidgetForm.php +++ b/frontends/php/include/classes/widgets/CClockWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -44,7 +44,7 @@ class CClockWidgetForm extends CWidgetForm { // Item field if ($field_time_type->getValue() === TIME_TYPE_HOST) { $field_item = (new CWidgetFieldSelectResource('itemid', _('Item'), WIDGET_FIELD_SELECT_RES_ITEM)) - ->setFlags(CWidgetField::FLAG_NOT_EMPTY); + ->setFlags(CWidgetField::FLAG_NOT_EMPTY | CWidgetField::FLAG_LABEL_ASTERISK); if (array_key_exists('itemid', $this->data)) { $field_item->setValue($this->data['itemid']); diff --git a/frontends/php/include/classes/widgets/CDataOverviewWidgetForm.php b/frontends/php/include/classes/widgets/CDataOverviewWidgetForm.php index 5845090448b..86e63508c16 100644 --- a/frontends/php/include/classes/widgets/CDataOverviewWidgetForm.php +++ b/frontends/php/include/classes/widgets/CDataOverviewWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgets/CGraphWidgetForm.php b/frontends/php/include/classes/widgets/CGraphWidgetForm.php index 961ad0ba903..8e492c4882d 100644 --- a/frontends/php/include/classes/widgets/CGraphWidgetForm.php +++ b/frontends/php/include/classes/widgets/CGraphWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -43,7 +43,7 @@ class CGraphWidgetForm extends CWidgetForm { && $this->data['source_type'] == ZBX_WIDGET_FIELD_RESOURCE_SIMPLE_GRAPH) { // item field $field_item = (new CWidgetFieldSelectResource('itemid', _('Item'), WIDGET_FIELD_SELECT_RES_SIMPLE_GRAPH)) - ->setFlags(CWidgetField::FLAG_NOT_EMPTY); + ->setFlags(CWidgetField::FLAG_NOT_EMPTY | CWidgetField::FLAG_LABEL_ASTERISK); if (array_key_exists('itemid', $this->data)) { $field_item->setValue($this->data['itemid']); @@ -54,7 +54,7 @@ class CGraphWidgetForm extends CWidgetForm { else { // Select graph field. $field_graph = (new CWidgetFieldSelectResource('graphid', _('Graph'), WIDGET_FIELD_SELECT_RES_GRAPH)) - ->setFlags(CWidgetField::FLAG_NOT_EMPTY); + ->setFlags(CWidgetField::FLAG_NOT_EMPTY | CWidgetField::FLAG_LABEL_ASTERISK); if (array_key_exists('graphid', $this->data)) { $field_graph->setValue($this->data['graphid']); diff --git a/frontends/php/include/classes/widgets/CHostsWidgetForm.php b/frontends/php/include/classes/widgets/CHostsWidgetForm.php index 8c6f45e6864..052ca147cb9 100644 --- a/frontends/php/include/classes/widgets/CHostsWidgetForm.php +++ b/frontends/php/include/classes/widgets/CHostsWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgets/CNavigationWidgetForm.php b/frontends/php/include/classes/widgets/CNavigationWidgetForm.php index 471099cf236..8eed132b2b9 100644 --- a/frontends/php/include/classes/widgets/CNavigationWidgetForm.php +++ b/frontends/php/include/classes/widgets/CNavigationWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgets/CPlainTextWidgetForm.php b/frontends/php/include/classes/widgets/CPlainTextWidgetForm.php index 70fbeb69e29..e450aafb010 100644 --- a/frontends/php/include/classes/widgets/CPlainTextWidgetForm.php +++ b/frontends/php/include/classes/widgets/CPlainTextWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -26,7 +26,7 @@ class CPlainTextWidgetForm extends CWidgetForm { // item field $field_item = (new CWidgetFieldSelectResource('itemid', _('Item'), WIDGET_FIELD_SELECT_RES_ITEM)) - ->setFlags(CWidgetField::FLAG_NOT_EMPTY); + ->setFlags(CWidgetField::FLAG_NOT_EMPTY | CWidgetField::FLAG_LABEL_ASTERISK); if (array_key_exists('itemid', $this->data)) { $field_item->setValue($this->data['itemid']); @@ -37,7 +37,9 @@ class CPlainTextWidgetForm extends CWidgetForm { // Number of records to display. $field_lines = (new CWidgetFieldNumericBox('show_lines', _('Show lines'), ZBX_MIN_WIDGET_LINES, ZBX_MAX_WIDGET_LINES - ))->setDefault(25); + )) + ->setFlags(CWidgetField::FLAG_LABEL_ASTERISK) + ->setDefault(25); if (array_key_exists('show_lines', $this->data)) { $field_lines->setValue($this->data['show_lines']); diff --git a/frontends/php/include/classes/widgets/CProblemsWidgetForm.php b/frontends/php/include/classes/widgets/CProblemsWidgetForm.php index e904337e5a6..3c48b8d46b8 100644 --- a/frontends/php/include/classes/widgets/CProblemsWidgetForm.php +++ b/frontends/php/include/classes/widgets/CProblemsWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -142,7 +142,9 @@ class CProblemsWidgetForm extends CWidgetForm { // show lines $field_lines = (new CWidgetFieldNumericBox('show_lines', _('Show lines'), ZBX_MIN_WIDGET_LINES, ZBX_MAX_WIDGET_LINES - ))->setDefault(ZBX_DEFAULT_WIDGET_LINES); + )) + ->setFlags(CWidgetField::FLAG_LABEL_ASTERISK) + ->setDefault(ZBX_DEFAULT_WIDGET_LINES); if (array_key_exists('show_lines', $this->data)) { $field_lines->setValue($this->data['show_lines']); diff --git a/frontends/php/include/classes/widgets/CSysmapWidgetForm.php b/frontends/php/include/classes/widgets/CSysmapWidgetForm.php index 35c0ea78e95..1994830c830 100644 --- a/frontends/php/include/classes/widgets/CSysmapWidgetForm.php +++ b/frontends/php/include/classes/widgets/CSysmapWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -51,7 +51,9 @@ class CSysmapWidgetForm extends CWidgetForm { if ($field_source_type->getValue() === WIDGET_SYSMAP_SOURCETYPE_FILTER) { $field_filter_widget = (new CWidgetFieldWidgetListComboBox('filter_widget_reference', _('Filter'), 'type', 'navigationtree' - ))->setDefault(''); + )) + ->setDefault('') + ->setFlags(CWidgetField::FLAG_LABEL_ASTERISK); if (array_key_exists('filter_widget_reference', $this->data)) { $field_filter_widget->setValue($this->data['filter_widget_reference']); @@ -62,7 +64,7 @@ class CSysmapWidgetForm extends CWidgetForm { else { // select sysmap field $field_map = (new CWidgetFieldSelectResource('sysmapid', _('Map'), WIDGET_FIELD_SELECT_RES_SYSMAP)) - ->setFlags(CWidgetField::FLAG_NOT_EMPTY); + ->setFlags(CWidgetField::FLAG_NOT_EMPTY | CWidgetField::FLAG_LABEL_ASTERISK); if (array_key_exists('sysmapid', $this->data)) { $field_map->setValue($this->data['sysmapid']); diff --git a/frontends/php/include/classes/widgets/CSystemWidgetForm.php b/frontends/php/include/classes/widgets/CSystemWidgetForm.php index 2ad56f90497..c77d7c5d1cd 100644 --- a/frontends/php/include/classes/widgets/CSystemWidgetForm.php +++ b/frontends/php/include/classes/widgets/CSystemWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgets/CTrigOverviewWidgetForm.php b/frontends/php/include/classes/widgets/CTrigOverviewWidgetForm.php index 51396e235af..76e90d2d1f4 100644 --- a/frontends/php/include/classes/widgets/CTrigOverviewWidgetForm.php +++ b/frontends/php/include/classes/widgets/CTrigOverviewWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgets/CUrlWidgetForm.php b/frontends/php/include/classes/widgets/CUrlWidgetForm.php index b1c40d6241c..5261288a763 100644 --- a/frontends/php/include/classes/widgets/CUrlWidgetForm.php +++ b/frontends/php/include/classes/widgets/CUrlWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -29,7 +29,7 @@ class CUrlWidgetForm extends CWidgetForm { // URL field $field_url = (new CWidgetFieldUrl('url', _('URL'))) - ->setFlags(CWidgetField::FLAG_NOT_EMPTY); + ->setFlags(CWidgetField::FLAG_NOT_EMPTY | CWidgetField::FLAG_LABEL_ASTERISK); if (array_key_exists('url', $this->data)) { $field_url->setValue($this->data['url']); diff --git a/frontends/php/include/classes/widgets/CWebWidgetForm.php b/frontends/php/include/classes/widgets/CWebWidgetForm.php index dbde8c34786..65b9f380e14 100644 --- a/frontends/php/include/classes/widgets/CWebWidgetForm.php +++ b/frontends/php/include/classes/widgets/CWebWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgets/CWidgetConfig.php b/frontends/php/include/classes/widgets/CWidgetConfig.php index 0aa3f1dc8c5..4d296677f47 100644 --- a/frontends/php/include/classes/widgets/CWidgetConfig.php +++ b/frontends/php/include/classes/widgets/CWidgetConfig.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/classes/widgets/CWidgetForm.php b/frontends/php/include/classes/widgets/CWidgetForm.php index 2bc664ae61d..0d2e5673ffe 100644 --- a/frontends/php/include/classes/widgets/CWidgetForm.php +++ b/frontends/php/include/classes/widgets/CWidgetForm.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 7fdbdfb151d..1842830d915 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/correlation.inc.php b/frontends/php/include/correlation.inc.php index 693a89609d3..1b99d7de2ba 100644 --- a/frontends/php/include/correlation.inc.php +++ b/frontends/php/include/correlation.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php index e2c614ea787..9af15cccd8a 100644 --- a/frontends/php/include/db.inc.php +++ b/frontends/php/include/db.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/debug.inc.php b/frontends/php/include/debug.inc.php index 126b3ceca93..3f6b4093f60 100644 --- a/frontends/php/include/debug.inc.php +++ b/frontends/php/include/debug.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index db414624b66..e41b63b2553 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -19,13 +19,13 @@ **/ -define('ZABBIX_VERSION', '4.0.0alpha2'); +define('ZABBIX_VERSION', '4.0.0alpha3'); define('ZABBIX_API_VERSION', '4.0.0'); define('ZABBIX_EXPORT_VERSION', '3.4'); define('ZABBIX_DB_VERSION', 3050028); define('ZABBIX_COPYRIGHT_FROM', '2001'); -define('ZABBIX_COPYRIGHT_TO', '2017'); +define('ZABBIX_COPYRIGHT_TO', '2018'); define('ZBX_LOGIN_ATTEMPTS', 5); define('ZBX_LOGIN_BLOCK', 30); // sec @@ -1482,6 +1482,7 @@ define('ZBX_STYLE_UPPERCASE', 'uppercase'); define('ZBX_STYLE_WARNING_BG', 'warning-bg'); define('ZBX_STYLE_BLINK_HIDDEN', 'blink-hidden'); define('ZBX_STYLE_YELLOW', 'yellow'); +define('ZBX_STYLE_FIELD_LABEL_ASTERISK', 'form-label-asterisk'); // server variables define('HTTPS', isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] && $_SERVER['HTTPS'] != 'off'); diff --git a/frontends/php/include/discovery.inc.php b/frontends/php/include/discovery.inc.php index c72fb0d0418..41f7c38e85f 100644 --- a/frontends/php/include/discovery.inc.php +++ b/frontends/php/include/discovery.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/draw.inc.php b/frontends/php/include/draw.inc.php index b05b111d976..37fb172dc0a 100644 --- a/frontends/php/include/draw.inc.php +++ b/frontends/php/include/draw.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/events.inc.php b/frontends/php/include/events.inc.php index 5b3b92fedeb..25efed21588 100644 --- a/frontends/php/include/events.inc.php +++ b/frontends/php/include/events.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index 8f5ab14fda5..7caf9c27eef 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -1765,7 +1765,7 @@ function getTriggerFormData(array $data) { } function get_timeperiod_form() { - $tblPeriod = new CTable(); + $form = new CFormList(); // init new_timeperiod variable $new_timeperiod = getRequest('new_timeperiod', []); @@ -1773,10 +1773,10 @@ function get_timeperiod_form() { if (is_array($new_timeperiod)) { if (isset($new_timeperiod['id'])) { - $tblPeriod->addItem(new CVar('new_timeperiod[id]', $new_timeperiod['id'])); + $form->addItem(new CVar('new_timeperiod[id]', $new_timeperiod['id'])); } if (isset($new_timeperiod['timeperiodid'])) { - $tblPeriod->addItem(new CVar('new_timeperiod[timeperiodid]', $new_timeperiod['timeperiodid'])); + $form->addItem(new CVar('new_timeperiod[timeperiodid]', $new_timeperiod['timeperiodid'])); } } if (!is_array($new_timeperiod)) { @@ -1879,202 +1879,219 @@ function get_timeperiod_form() { $bit_dayofweek = strrev($dayofweek); $bit_month = strrev($month); - $cmbType = new CComboBox('new_timeperiod[timeperiod_type]', $new_timeperiod['timeperiod_type'], 'submit()'); - $cmbType->addItem(TIMEPERIOD_TYPE_ONETIME, _('One time only')); - $cmbType->addItem(TIMEPERIOD_TYPE_DAILY, _('Daily')); - $cmbType->addItem(TIMEPERIOD_TYPE_WEEKLY, _('Weekly')); - $cmbType->addItem(TIMEPERIOD_TYPE_MONTHLY, _('Monthly')); - - $tblPeriod->addRow([_('Period type'), $cmbType]); + $form->addRow( + (new Clabel(_('Period type'), 'new_timeperiod[timeperiod_type]')), + (new CComboBox('new_timeperiod[timeperiod_type]', $new_timeperiod['timeperiod_type'], 'submit()', [ + TIMEPERIOD_TYPE_ONETIME => _('One time only'), + TIMEPERIOD_TYPE_DAILY => _('Daily'), + TIMEPERIOD_TYPE_WEEKLY => _('Weekly'), + TIMEPERIOD_TYPE_MONTHLY => _('Monthly') + ])) + ); if ($new_timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_DAILY) { - $tblPeriod->addItem(new CVar('new_timeperiod[dayofweek]', bindec($bit_dayofweek))); - $tblPeriod->addItem(new CVar('new_timeperiod[month]', bindec($bit_month))); - $tblPeriod->addItem(new CVar('new_timeperiod[day]', $new_timeperiod['day'])); - $tblPeriod->addItem(new CVar('new_timeperiod[start_date]', $new_timeperiod['start_date'])); - $tblPeriod->addItem(new CVar('new_timeperiod[month_date_type]', $new_timeperiod['month_date_type'])); - $tblPeriod->addRow([_('Every day(s)'), - (new CNumericBox('new_timeperiod[every]', $new_timeperiod['every'], 3)) - ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) - ]); + $form + ->addItem(new CVar('new_timeperiod[dayofweek]', bindec($bit_dayofweek))) + ->addItem(new CVar('new_timeperiod[month]', bindec($bit_month))) + ->addItem(new CVar('new_timeperiod[day]', $new_timeperiod['day'])) + ->addItem(new CVar('new_timeperiod[start_date]', $new_timeperiod['start_date'])) + ->addItem(new CVar('new_timeperiod[month_date_type]', $new_timeperiod['month_date_type'])) + ->addRow( + (new CLabel(_('Every day(s)'), 'new_timeperiod[every]'))->setAsteriskMark(), + (new CNumericBox('new_timeperiod[every]', $new_timeperiod['every'], 3)) + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired() + ); } elseif ($new_timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_WEEKLY) { - $tblPeriod->addItem(new CVar('new_timeperiod[month]', bindec($bit_month))); - $tblPeriod->addItem(new CVar('new_timeperiod[day]', $new_timeperiod['day'])); - $tblPeriod->addItem(new CVar('new_timeperiod[start_date]', $new_timeperiod['start_date'])); - $tblPeriod->addItem(new CVar('new_timeperiod[month_date_type]', $new_timeperiod['month_date_type'])); - $tblPeriod->addRow([_('Every week(s)'), - (new CNumericBox('new_timeperiod[every]', $new_timeperiod['every'], 2)) - ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) - ]); - - $tabDays = (new CTable()) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_mo]')) - ->setLabel(_('Monday')) - ->setChecked($dayofweek[0] == 1) - ) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_tu]')) - ->setLabel(_('Tuesday')) - ->setChecked($dayofweek[1] == 1) - ) + $form + ->addItem(new CVar('new_timeperiod[month]', bindec($bit_month))) + ->addItem(new CVar('new_timeperiod[day]', $new_timeperiod['day'])) + ->addItem(new CVar('new_timeperiod[start_date]', $new_timeperiod['start_date'])) + ->addItem(new CVar('new_timeperiod[month_date_type]', $new_timeperiod['month_date_type'])) ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_we]')) - ->setLabel(_('Wednesday')) - ->setChecked($dayofweek[2] == 1) - ) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_th]')) - ->setLabel(_('Thursday')) - ->setChecked($dayofweek[3] == 1) - ) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_fr]')) - ->setLabel(_('Friday')) - ->setChecked($dayofweek[4] == 1) - ) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_sa]')) - ->setLabel(_('Saturday')) - ->setChecked($dayofweek[5] == 1) + (new CLabel(_('Every week(s)'), 'new_timeperiod[every]'))->setAsteriskMark(), + (new CNumericBox('new_timeperiod[every]', $new_timeperiod['every'], 2)) + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired() ) ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_su]')) - ->setLabel(_('Sunday')) - ->setChecked($dayofweek[6] == 1) + (new CLabel(_('Day of week'), 'new_timeperiod_dayofweek'))->setAsteriskMark(), + (new CTable()) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_mo]')) + ->setLabel(_('Monday')) + ->setChecked($dayofweek[0] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_tu]')) + ->setLabel(_('Tuesday')) + ->setChecked($dayofweek[1] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_we]')) + ->setLabel(_('Wednesday')) + ->setChecked($dayofweek[2] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_th]')) + ->setLabel(_('Thursday')) + ->setChecked($dayofweek[3] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_fr]')) + ->setLabel(_('Friday')) + ->setChecked($dayofweek[4] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_sa]')) + ->setLabel(_('Saturday')) + ->setChecked($dayofweek[5] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_su]')) + ->setLabel(_('Sunday')) + ->setChecked($dayofweek[6] == 1) + ) + ->setId('new_timeperiod_dayofweek') ); - $tblPeriod->addRow([_('Day of week'), $tabDays]); } elseif ($new_timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_MONTHLY) { - $tblPeriod->addItem(new CVar('new_timeperiod[start_date]', $new_timeperiod['start_date'])); - - $tabMonths = (new CTable()) - ->addRow([ - (new CCheckBox('new_timeperiod[month_jan]')) - ->setLabel(_('January')) - ->setChecked($month[0] == 1), - (new CCheckBox('new_timeperiod[month_jul]')) - ->setLabel(_('July')) - ->setChecked($month[6] == 1) - ]) - ->addRow([ - (new CCheckBox('new_timeperiod[month_feb]')) - ->setLabel(_('February')) - ->setChecked($month[1] == 1), - (new CCheckBox('new_timeperiod[month_aug]')) - ->setLabel(_('August')) - ->setChecked($month[7] == 1) - ]) - ->addRow([ - (new CCheckBox('new_timeperiod[month_mar]')) - ->setLabel(_('March')) - ->setChecked($month[2] == 1), - (new CCheckBox('new_timeperiod[month_sep]')) - ->setLabel(_('September')) - ->setChecked($month[8] == 1) - ]) - ->addRow([ - (new CCheckBox('new_timeperiod[month_apr]')) - ->setLabel(_('April')) - ->setChecked($month[3] == 1), - (new CCheckBox('new_timeperiod[month_oct]')) - ->setLabel(_('October')) - ->setChecked($month[9] == 1) - ]) - ->addRow([ - (new CCheckBox('new_timeperiod[month_may]')) - ->setLabel(_('May')) - ->setChecked($month[4] == 1), - (new CCheckBox('new_timeperiod[month_nov]')) - ->setLabel(_('November')) - ->setChecked($month[10] == 1) - ]) - ->addRow([ - (new CCheckBox('new_timeperiod[month_jun]')) - ->setLabel(_('June')) - ->setChecked($month[5] == 1), - (new CCheckBox('new_timeperiod[month_dec]')) - ->setLabel(_('December')) - ->setChecked($month[11] == 1) - ]); - $tblPeriod->addRow([_('Month'), $tabMonths]); - - $tblPeriod->addRow([_('Date'), - (new CRadioButtonList('new_timeperiod[month_date_type]', (int) $new_timeperiod['month_date_type'])) - ->addValue(_('Day of month'), 0, null, 'submit()') - ->addValue(_('Day of week'), 1, null, 'submit()') - ->setModern(true) - ]); + $form + ->addItem(new CVar('new_timeperiod[start_date]', $new_timeperiod['start_date'])) + ->addRow( + (new CLabel(_('Month'), 'new_timeperiod_month'))->setAsteriskMark(), + (new CTable()) + ->addRow([ + (new CCheckBox('new_timeperiod[month_jan]')) + ->setLabel(_('January')) + ->setChecked($month[0] == 1), + (new CCheckBox('new_timeperiod[month_jul]')) + ->setLabel(_('July')) + ->setChecked($month[6] == 1) + ]) + ->addRow([ + (new CCheckBox('new_timeperiod[month_feb]')) + ->setLabel(_('February')) + ->setChecked($month[1] == 1), + (new CCheckBox('new_timeperiod[month_aug]')) + ->setLabel(_('August')) + ->setChecked($month[7] == 1) + ]) + ->addRow([ + (new CCheckBox('new_timeperiod[month_mar]')) + ->setLabel(_('March')) + ->setChecked($month[2] == 1), + (new CCheckBox('new_timeperiod[month_sep]')) + ->setLabel(_('September')) + ->setChecked($month[8] == 1) + ]) + ->addRow([ + (new CCheckBox('new_timeperiod[month_apr]')) + ->setLabel(_('April')) + ->setChecked($month[3] == 1), + (new CCheckBox('new_timeperiod[month_oct]')) + ->setLabel(_('October')) + ->setChecked($month[9] == 1) + ]) + ->addRow([ + (new CCheckBox('new_timeperiod[month_may]')) + ->setLabel(_('May')) + ->setChecked($month[4] == 1), + (new CCheckBox('new_timeperiod[month_nov]')) + ->setLabel(_('November')) + ->setChecked($month[10] == 1) + ]) + ->addRow([ + (new CCheckBox('new_timeperiod[month_jun]')) + ->setLabel(_('June')) + ->setChecked($month[5] == 1), + (new CCheckBox('new_timeperiod[month_dec]')) + ->setLabel(_('December')) + ->setChecked($month[11] == 1) + ]) + ->setId('new_timeperiod_month') + ) + ->addRow(_('Date'), + (new CRadioButtonList('new_timeperiod[month_date_type]', (int) $new_timeperiod['month_date_type'])) + ->addValue(_('Day of month'), 0, null, 'submit()') + ->addValue(_('Day of week'), 1, null, 'submit()') + ->setModern(true) + ); if ($new_timeperiod['month_date_type'] > 0) { - $tblPeriod->addItem(new CVar('new_timeperiod[day]', $new_timeperiod['day'])); - - $cmbCount = new CComboBox('new_timeperiod[every]', $new_timeperiod['every']); - $cmbCount->addItem(1, _('First')); - $cmbCount->addItem(2, _x('Second', 'adjective')); - $cmbCount->addItem(3, _('Third')); - $cmbCount->addItem(4, _('Fourth')); - $cmbCount->addItem(5, _('Last')); - - $td = (new CCol($cmbCount))->setColSpan(2); - - $tabDays = (new CTable()) - ->addRow($td) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_mo]')) - ->setLabel(_('Monday')) - ->setChecked($dayofweek[0] == 1) - ) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_tu]')) - ->setLabel(_('Tuesday')) - ->setChecked($dayofweek[1] == 1) - ) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_we]')) - ->setLabel(_('Wednesday')) - ->setChecked($dayofweek[2] == 1) - ) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_th]')) - ->setLabel(_('Thursday')) - ->setChecked($dayofweek[3] == 1) - ) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_fr]')) - ->setLabel(_('Friday')) - ->setChecked($dayofweek[4] == 1) - ) + $form + ->addItem(new CVar('new_timeperiod[day]', $new_timeperiod['day'])) ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_sa]')) - ->setLabel(_('Saturday')) - ->setChecked($dayofweek[5] == 1) - ) - ->addRow( - (new CCheckBox('new_timeperiod[dayofweek_su]')) - ->setLabel(_('Sunday')) - ->setChecked($dayofweek[6] == 1) + (new CLabel(_('Day of week'), 'new_timeperiod_dayofweek'))->setAsteriskMark(), + (new CTable()) + ->addRow((new CCol(new CComboBox('new_timeperiod[every]', $new_timeperiod['every'], null, [ + 1 => _('First'), + 2 => _x('Second', 'adjective'), + 3 => _('Third'), + 4 => _('Fourth'), + 5 => _('Last') + ]))) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_mo]')) + ->setLabel(_('Monday')) + ->setChecked($dayofweek[0] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_tu]')) + ->setLabel(_('Tuesday')) + ->setChecked($dayofweek[1] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_we]')) + ->setLabel(_('Wednesday')) + ->setChecked($dayofweek[2] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_th]')) + ->setLabel(_('Thursday')) + ->setChecked($dayofweek[3] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_fr]')) + ->setLabel(_('Friday')) + ->setChecked($dayofweek[4] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_sa]')) + ->setLabel(_('Saturday')) + ->setChecked($dayofweek[5] == 1) + ) + ->addRow( + (new CCheckBox('new_timeperiod[dayofweek_su]')) + ->setLabel(_('Sunday')) + ->setChecked($dayofweek[6] == 1) + ) + ->setId('new_timeperiod_dayofweek') ); - $tblPeriod->addRow([_('Day of week'), $tabDays]); } else { - $tblPeriod->addItem(new CVar('new_timeperiod[dayofweek]', bindec($bit_dayofweek))); - $tblPeriod->addRow([_('Day of month'), - (new CNumericBox('new_timeperiod[day]', $new_timeperiod['day'], 2)) - ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) - ]); + $form + ->addItem(new CVar('new_timeperiod[dayofweek]', bindec($bit_dayofweek))) + ->addRow( + (new CLabel(_('Day of month'), 'new_timeperiod[day]'))->setAsteriskMark(), + (new CNumericBox('new_timeperiod[day]', $new_timeperiod['day'], 2)) + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired() + ); } } else { - $tblPeriod->addItem(new CVar('new_timeperiod[every]', $new_timeperiod['every'], 'new_timeperiod_every_tmp')); - $tblPeriod->addItem(new CVar('new_timeperiod[month]', bindec($bit_month), 'new_timeperiod_month_tmp')); - $tblPeriod->addItem(new CVar('new_timeperiod[day]', $new_timeperiod['day'], 'new_timeperiod_day_tmp')); - $tblPeriod->addItem(new CVar('new_timeperiod[hour]', $new_timeperiod['hour'], 'new_timeperiod_hour_tmp')); - $tblPeriod->addItem(new CVar('new_timeperiod[minute]', $new_timeperiod['minute'], 'new_timeperiod_minute_tmp')); - $tblPeriod->addItem(new CVar('new_timeperiod[start_date]', $new_timeperiod['start_date'])); - $tblPeriod->addItem(new CVar('new_timeperiod[month_date_type]', $new_timeperiod['month_date_type'])); - $tblPeriod->addItem(new CVar('new_timeperiod[dayofweek]', bindec($bit_dayofweek))); + $form + ->addItem(new CVar('new_timeperiod[every]', $new_timeperiod['every'], 'new_timeperiod_every_tmp')) + ->addItem(new CVar('new_timeperiod[month]', bindec($bit_month), 'new_timeperiod_month_tmp')) + ->addItem(new CVar('new_timeperiod[day]', $new_timeperiod['day'], 'new_timeperiod_day_tmp')) + ->addItem(new CVar('new_timeperiod[hour]', $new_timeperiod['hour'], 'new_timeperiod_hour_tmp')) + ->addItem(new CVar('new_timeperiod[minute]', $new_timeperiod['minute'], 'new_timeperiod_minute_tmp')) + ->addItem(new CVar('new_timeperiod[start_date]', $new_timeperiod['start_date'])) + ->addItem(new CVar('new_timeperiod[month_date_type]', $new_timeperiod['month_date_type'])) + ->addItem(new CVar('new_timeperiod[dayofweek]', bindec($bit_dayofweek))); if (isset($_REQUEST['add_timeperiod'])) { $date = [ @@ -2090,11 +2107,14 @@ function get_timeperiod_form() { ? $new_timeperiod['start_date'] : date(TIMESTAMP_FORMAT_ZERO_TIME, time())); } - $tblPeriod->addRow([_('Date'), createDateSelector('new_timeperiod_start_date', $date)]); + $form->addRow( + (new CLabel(_('Date'), 'new_timeperiod_start_date'))->setAsteriskMark(), + (new CDiv(createDateSelector('new_timeperiod_start_date', $date)))->setId('new_timeperiod_start_date') + ); } if ($new_timeperiod['timeperiod_type'] != TIMEPERIOD_TYPE_ONETIME) { - $tblPeriod->addRow([_('At (hour:minute)'), [ + $form->addRow(_('At (hour:minute)'), [ (new CNumericBox('new_timeperiod[hour]', $new_timeperiod['hour'], 2)) ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), @@ -2102,14 +2122,14 @@ function get_timeperiod_form() { (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CNumericBox('new_timeperiod[minute]', $new_timeperiod['minute'], 2)) ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) - ]]); + ]); } $perHours = new CComboBox('new_timeperiod[period_hours]', $new_timeperiod['period_hours'], null, range(0, 23)); $perMinutes = new CComboBox('new_timeperiod[period_minutes]', $new_timeperiod['period_minutes'], null, range(0, 59)); - $tblPeriod->addRow([ - _('Maintenance period length'), - [ + $form->addRow( + (new CLabel(_('Maintenance period length'), 'new_timeperiod'))->setAsteriskMark(), + (new CDiv([ (new CNumericBox('new_timeperiod[period_days]', $new_timeperiod['period_days'], 3)) ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH), _('Days').SPACE.SPACE, @@ -2117,7 +2137,8 @@ function get_timeperiod_form() { _('Hours').SPACE.SPACE, $perMinutes, _('Minutes') - ]]); + ]))->setId('new_timeperiod') + ); - return $tblPeriod; + return $form; } diff --git a/frontends/php/include/func.inc.php b/frontends/php/include/func.inc.php index 869bddbc1bc..7b297bd4936 100644 --- a/frontends/php/include/func.inc.php +++ b/frontends/php/include/func.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/gettextwrapper.inc.php b/frontends/php/include/gettextwrapper.inc.php index 5ca331263e9..8b664b02928 100644 --- a/frontends/php/include/gettextwrapper.inc.php +++ b/frontends/php/include/gettextwrapper.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php index 3e95d7153f6..314377b24a5 100644 --- a/frontends/php/include/graphs.inc.php +++ b/frontends/php/include/graphs.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/hostgroups.inc.php b/frontends/php/include/hostgroups.inc.php index be58459693b..c0346695728 100644 --- a/frontends/php/include/hostgroups.inc.php +++ b/frontends/php/include/hostgroups.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php index fe5b825fd09..6bd2c7ef5a1 100644 --- a/frontends/php/include/hosts.inc.php +++ b/frontends/php/include/hosts.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/html.inc.php b/frontends/php/include/html.inc.php index 3647f0db83e..ff646b9e3fe 100644 --- a/frontends/php/include/html.inc.php +++ b/frontends/php/include/html.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/httptest.inc.php b/frontends/php/include/httptest.inc.php index c2a7bc6b9c9..015efe3d842 100644 --- a/frontends/php/include/httptest.inc.php +++ b/frontends/php/include/httptest.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/ident.inc.php b/frontends/php/include/ident.inc.php index f6d5167cd0e..77fec97b3d1 100644 --- a/frontends/php/include/ident.inc.php +++ b/frontends/php/include/ident.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/images.inc.php b/frontends/php/include/images.inc.php index 5f97067b5d6..84d1e6f8cf8 100644 --- a/frontends/php/include/images.inc.php +++ b/frontends/php/include/images.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php index f41442e22b2..276982a2526 100644 --- a/frontends/php/include/items.inc.php +++ b/frontends/php/include/items.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/js.inc.php b/frontends/php/include/js.inc.php index c930d12b376..17e5344aa37 100644 --- a/frontends/php/include/js.inc.php +++ b/frontends/php/include/js.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/locales.inc.php b/frontends/php/include/locales.inc.php index 8946c38365e..2399161815b 100644 --- a/frontends/php/include/locales.inc.php +++ b/frontends/php/include/locales.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/maintenances.inc.php b/frontends/php/include/maintenances.inc.php index e41b34af389..f08edba8033 100644 --- a/frontends/php/include/maintenances.inc.php +++ b/frontends/php/include/maintenances.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php index 7472f885c65..a55227382a1 100644 --- a/frontends/php/include/maps.inc.php +++ b/frontends/php/include/maps.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/media.inc.php b/frontends/php/include/media.inc.php index 20039741491..2ad54aea0a2 100644 --- a/frontends/php/include/media.inc.php +++ b/frontends/php/include/media.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/menu.inc.php b/frontends/php/include/menu.inc.php index 4ce4518992b..378f4e70428 100644 --- a/frontends/php/include/menu.inc.php +++ b/frontends/php/include/menu.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/page_footer.php b/frontends/php/include/page_footer.php index 4a3677c6188..74b43b32cc1 100644 --- a/frontends/php/include/page_footer.php +++ b/frontends/php/include/page_footer.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/page_header.php b/frontends/php/include/page_header.php index 6b132d008be..7dc932e9f12 100644 --- a/frontends/php/include/page_header.php +++ b/frontends/php/include/page_header.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/perm.inc.php b/frontends/php/include/perm.inc.php index 6f2d8373de5..8a5e84ef747 100644 --- a/frontends/php/include/perm.inc.php +++ b/frontends/php/include/perm.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/profiles.inc.php b/frontends/php/include/profiles.inc.php index aba4ea71bc6..cdeaff48e58 100644 --- a/frontends/php/include/profiles.inc.php +++ b/frontends/php/include/profiles.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/regexp.inc.php b/frontends/php/include/regexp.inc.php index fc4aece0037..4c10bbddc95 100644 --- a/frontends/php/include/regexp.inc.php +++ b/frontends/php/include/regexp.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php index e7e961132e5..7e030aabac1 100644 --- a/frontends/php/include/screens.inc.php +++ b/frontends/php/include/screens.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php index e7855fc649f..1fa1285eb5b 100644 --- a/frontends/php/include/services.inc.php +++ b/frontends/php/include/services.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/sounds.inc.php b/frontends/php/include/sounds.inc.php index 315165e656d..a97d91761a6 100644 --- a/frontends/php/include/sounds.inc.php +++ b/frontends/php/include/sounds.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/translateDefines.inc.php b/frontends/php/include/translateDefines.inc.php index c3f664c868d..ed484052200 100644 --- a/frontends/php/include/translateDefines.inc.php +++ b/frontends/php/include/translateDefines.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php index eafb89b61db..1466cf46696 100644 --- a/frontends/php/include/triggers.inc.php +++ b/frontends/php/include/triggers.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/users.inc.php b/frontends/php/include/users.inc.php index 72f4139a988..af2d081687b 100644 --- a/frontends/php/include/users.inc.php +++ b/frontends/php/include/users.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/validate.inc.php b/frontends/php/include/validate.inc.php index 4fe23d7f383..4a0313cec61 100644 --- a/frontends/php/include/validate.inc.php +++ b/frontends/php/include/validate.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/valuemap.inc.php b/frontends/php/include/valuemap.inc.php index 2ad840afa6f..133705c6a1b 100644 --- a/frontends/php/include/valuemap.inc.php +++ b/frontends/php/include/valuemap.inc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/administration.auditacts.list.php b/frontends/php/include/views/administration.auditacts.list.php index 1be52038030..5d5d1595be1 100644 --- a/frontends/php/include/views/administration.auditacts.list.php +++ b/frontends/php/include/views/administration.auditacts.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/administration.auditlogs.list.php b/frontends/php/include/views/administration.auditlogs.list.php index f5a6222209f..ae7440c6d6a 100644 --- a/frontends/php/include/views/administration.auditlogs.list.php +++ b/frontends/php/include/views/administration.auditlogs.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/administration.authentication.edit.php b/frontends/php/include/views/administration.authentication.edit.php index e8195cf90ba..4d32b661048 100644 --- a/frontends/php/include/views/administration.authentication.edit.php +++ b/frontends/php/include/views/administration.authentication.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -51,8 +51,10 @@ if ($this->data['ldap_extension_enabled'] && $this->data['config']['authenticati } $authenticationFormList->addRow( - _('LDAP host'), - (new CTextBox('ldap_host', $this->data['config']['ldap_host']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + (new CLabel(_('LDAP host'), 'ldap_host'))->setAsteriskMark(), + (new CTextBox('ldap_host', $this->data['config']['ldap_host'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ); $authenticationFormList->addRow( _('Port'), @@ -60,11 +62,13 @@ if ($this->data['ldap_extension_enabled'] && $this->data['config']['authenticati ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ); $authenticationFormList->addRow( - _('Base DN'), - (new CTextBox('ldap_base_dn', $this->data['config']['ldap_base_dn']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + (new CLabel(_('Base DN'), 'ldap_base_dn'))->setAsteriskMark(), + (new CTextBox('ldap_base_dn', $this->data['config']['ldap_base_dn'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ); $authenticationFormList->addRow( - _('Search attribute'), + (new CLabel(_('Search attribute'), 'ldap_search_attribute'))->setAsteriskMark(), (new CTextBox( 'ldap_search_attribute', (zbx_empty($this->data['config']['ldap_search_attribute']) && $this->data['form_refresh'] == 0) @@ -72,7 +76,9 @@ if ($this->data['ldap_extension_enabled'] && $this->data['config']['authenticati : $this->data['config']['ldap_search_attribute'], false, 128 - ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + )) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ); $authenticationFormList->addRow( _('Bind DN'), @@ -100,7 +106,11 @@ if ($this->data['ldap_extension_enabled'] && $this->data['config']['authenticati $authenticationFormList->addRow(_('Test authentication'), ' ['._('must be a valid LDAP user').']'); $authenticationFormList->addRow(_('Login'), $userComboBox); - $authenticationFormList->addRow(_('User password'), (new CPassBox('user_password'))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)); + $authenticationFormList->addRow((new CLabel(_('User password'), 'user_password'))->setAsteriskMark(), + (new CPassBox('user_password')) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() + ); } // append form list to tab diff --git a/frontends/php/include/views/administration.general.gui.edit.php b/frontends/php/include/views/administration.general.gui.edit.php index a43dee778f8..a9afc71339b 100644 --- a/frontends/php/include/views/administration.general.gui.edit.php +++ b/frontends/php/include/views/administration.general.gui.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -40,20 +40,28 @@ $guiTab = (new CFormList()) ->setLabel(_('remember selected')) ->setChecked($data['dropdown_first_remember'] == 1) ]) - ->addRow(_('Limit for search and filter results'), - (new CNumericBox('search_limit', $data['search_limit'], 6))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->addRow((new CLabel(_('Limit for search and filter results'), 'search_limit'))->setAsteriskMark(), + (new CNumericBox('search_limit', $data['search_limit'], 6)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ) - ->addRow(_('Max count of elements to show inside table cell'), - (new CNumericBox('max_in_table', $data['max_in_table'], 5))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->addRow((new CLabel(_('Max count of elements to show inside table cell'), 'max_in_table'))->setAsteriskMark(), + (new CNumericBox('max_in_table', $data['max_in_table'], 5)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ) ->addRow(_('Enable event acknowledgement'), (new CCheckBox('event_ack_enable'))->setChecked($data['event_ack_enable'] == 1) ) - ->addRow(_('Show events not older than'), - (new CTextBox('event_expire', $data['event_expire']))->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->addRow((new CLabel(_('Show events not older than'), 'event_expire'))->setAsteriskMark(), + (new CTextBox('event_expire', $data['event_expire'])) + ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Max count of events per trigger to show'), - (new CTextBox('event_show_max', $data['event_show_max']))->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->addRow((new CLabel(_('Max count of events per trigger to show'), 'event_show_max'))->setAsteriskMark(), + (new CTextBox('event_show_max', $data['event_show_max'])) + ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->setAriaRequired() ) ->addRow(_('Show warning if Zabbix server is down'), (new CCheckBox('server_check_interval', SERVER_CHECK_INTERVAL)) diff --git a/frontends/php/include/views/administration.general.housekeeper.edit.php b/frontends/php/include/views/administration.general.housekeeper.edit.php index 22645558a2f..834f9562c24 100644 --- a/frontends/php/include/views/administration.general.housekeeper.edit.php +++ b/frontends/php/include/views/administration.general.housekeeper.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -35,28 +35,34 @@ $houseKeeperTab = (new CFormList()) (new CCheckBox('hk_events_mode'))->setChecked($data['hk_events_mode'] == 1) ) ->addRow( - new CLabel(_('Trigger data storage period'), 'hk_events_trigger'), + (new CLabel(_('Trigger data storage period'), 'hk_events_trigger'))->setAsteriskMark(), (new CTextBox('hk_events_trigger', $data['hk_events_trigger'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ->setEnabled($data['hk_events_mode'] == 1) + ->setAriaRequired() ) ->addRow( - new CLabel(_('Internal data storage period'), 'hk_events_internal'), + (new CLabel(_('Internal data storage period'), 'hk_events_internal'))->setAsteriskMark(), (new CTextBox('hk_events_internal', $data['hk_events_internal'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ->setEnabled($data['hk_events_mode'] == 1) + ->setAriaRequired() ) ->addRow( - new CLabel(_('Network discovery data storage period'), 'hk_events_discovery'), + (new CLabel(_('Network discovery data storage period'), 'hk_events_discovery')) + ->setAsteriskMark(), (new CTextBox('hk_events_discovery', $data['hk_events_discovery'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ->setEnabled($data['hk_events_mode'] == 1) + ->setAriaRequired() ) ->addRow( - new CLabel(_('Auto-registration data storage period'), 'hk_events_autoreg'), + (new CLabel(_('Auto-registration data storage period'), 'hk_events_autoreg')) + ->setAsteriskMark(), (new CTextBox('hk_events_autoreg', $data['hk_events_autoreg'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ->setEnabled($data['hk_events_mode'] == 1) + ->setAriaRequired() ) ->addRow(null) ->addRow(new CTag('h4', true, _('Services'))) @@ -65,10 +71,12 @@ $houseKeeperTab = (new CFormList()) (new CCheckBox('hk_services_mode'))->setChecked($data['hk_services_mode'] == 1) ) ->addRow( - new CLabel(_('Data storage period'), 'hk_services'), + (new CLabel(_('Data storage period'), 'hk_services')) + ->setAsteriskMark(), (new CTextBox('hk_services', $data['hk_services'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ->setEnabled($data['hk_services_mode'] == 1) + ->setAriaRequired() ) ->addRow(null) ->addRow(new CTag('h4', true, _('Audit'))) @@ -77,10 +85,12 @@ $houseKeeperTab = (new CFormList()) (new CCheckBox('hk_audit_mode'))->setChecked($data['hk_audit_mode'] == 1) ) ->addRow( - new CLabel(_('Data storage period'), 'hk_audit'), + (new CLabel(_('Data storage period'), 'hk_audit')) + ->setAsteriskMark(), (new CTextBox('hk_audit', $data['hk_audit'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ->setEnabled($data['hk_audit_mode'] == 1) + ->setAriaRequired() ) ->addRow(null) ->addRow(new CTag('h4', true, _('User sessions'))) @@ -89,10 +99,12 @@ $houseKeeperTab = (new CFormList()) (new CCheckBox('hk_sessions_mode'))->setChecked($data['hk_sessions_mode'] == 1) ) ->addRow( - new CLabel(_('Data storage period'), 'hk_sessions'), + (new CLabel(_('Data storage period'), 'hk_sessions')) + ->setAsteriskMark(), (new CTextBox('hk_sessions', $data['hk_sessions'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ->setEnabled($data['hk_sessions_mode'] == 1) + ->setAriaRequired() ) ->addRow(null) ->addRow(new CTag('h4', true, _('History'))) @@ -105,10 +117,12 @@ $houseKeeperTab = (new CFormList()) (new CCheckBox('hk_history_global'))->setChecked($data['hk_history_global'] == 1) ) ->addRow( - new CLabel(_('Data storage period'), 'hk_history'), + (new CLabel(_('Data storage period'), 'hk_history')) + ->setAsteriskMark(), (new CTextBox('hk_history', $data['hk_history'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ->setEnabled($data['hk_history_global'] == 1) + ->setAriaRequired() ) ->addRow(null) ->addRow(new CTag('h4', true, _('Trends'))) @@ -121,10 +135,12 @@ $houseKeeperTab = (new CFormList()) (new CCheckBox('hk_trends_global'))->setChecked($data['hk_trends_global'] == 1) ) ->addRow( - new CLabel(_('Data storage period'), 'hk_trends'), + (new CLabel(_('Data storage period'), 'hk_trends')) + ->setAsteriskMark(), (new CTextBox('hk_trends', $data['hk_trends'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ->setEnabled($data['hk_trends_global'] == 1) + ->setAriaRequired() ); $houseKeeperView = (new CTabView()) diff --git a/frontends/php/include/views/administration.general.iconmap.edit.php b/frontends/php/include/views/administration.general.iconmap.edit.php index f7fc38077fb..7bdbf47876d 100644 --- a/frontends/php/include/views/administration.general.iconmap.edit.php +++ b/frontends/php/include/views/administration.general.iconmap.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -33,8 +33,9 @@ $iconMapTab = new CFormList(); $name = (new CTextBox('iconmap[name]', $this->data['iconmap']['name'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setAttribute('maxlength', 64) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus'); -$iconMapTab->addRow(_('Name'), $name); +$iconMapTab->addRow((new CLabel(_('Name'), 'iconmap[name]'))->setAsteriskMark(), $name); $iconMapForm = (new CForm()) ->addVar('form', 1); @@ -50,43 +51,33 @@ $iconMapTable = (new CTable()) order_result($this->data['iconmap']['mappings'], 'sortorder'); $i = 0; foreach ($this->data['iconmap']['mappings'] as $mapping) { - $numSpan = (new CSpan(($i + 1).':'))->addClass('rowNum'); - - $profileLinksComboBox = new CComboBox('iconmap[mappings]['.$i.'][inventory_link]', $mapping['inventory_link'], null, - $this->data['inventoryList'] - ); - - $expressionTextBox = [ - (new CTextBox('iconmap[mappings]['.$i.'][expression]', $mapping['expression'])) - ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) - ->setAttribute('maxlength', 64) - ]; - - $iconsComboBox = new CComboBox('iconmap[mappings]['.$i.'][iconid]', $mapping['iconid'], null, - $this->data['iconList'] - ); - $iconsComboBox->addClass('mappingIcon'); - - $iconPreviewImage = (new CImg('imgstore.php?iconid='.$mapping['iconid'].'&width='.ZBX_ICON_PREVIEW_WIDTH. - '&height='.ZBX_ICON_PREVIEW_HEIGHT, _('Preview'), null, null)) - ->addClass('preview') - ->addClass(ZBX_STYLE_CURSOR_POINTER) - ->setAttribute('data-image-full', 'imgstore.php?iconid='.$mapping['iconid']); - $iconMapTable->addRow( (new CRow([ (new CCol( (new CDiv())->addClass(ZBX_STYLE_DRAG_ICON) ))->addClass(ZBX_STYLE_TD_DRAG_ICON), - $numSpan, - $profileLinksComboBox, - $expressionTextBox, - $iconsComboBox, - (new CCol($iconPreviewImage))->setAttribute('style', 'vertical-align: middle;'), + (new CSpan(($i + 1).':'))->addClass('rowNum'), + (new CComboBox('iconmap[mappings]['.$i.'][inventory_link]', $mapping['inventory_link'], + null, $data['inventoryList'] + )), + (new CTextBox('iconmap[mappings]['.$i.'][expression]', $mapping['expression'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() + ->setAttribute('maxlength', 64), + (new CComboBox('iconmap[mappings]['.$i.'][iconid]', $mapping['iconid'], null, $data['iconList'])) + ->addClass('mappingIcon'), + (new CCol( + (new CImg('imgstore.php?iconid='.$mapping['iconid'].'&width='.ZBX_ICON_PREVIEW_WIDTH. + '&height='.ZBX_ICON_PREVIEW_HEIGHT, _('Preview'), null, null + )) + ->addClass('preview') + ->addClass(ZBX_STYLE_CURSOR_POINTER) + ->setAttribute('data-image-full', 'imgstore.php?iconid='.$mapping['iconid']) + ))->setAttribute('style', 'vertical-align: middle;'), (new CCol( (new CButton('remove', _('Remove'))) ->addClass(ZBX_STYLE_BTN_LINK) - ->addClass('removeMapping') + ->addClass('remove_mapping') ))->addClass(ZBX_STYLE_NOWRAP) ])) ->addClass('sortable') @@ -97,35 +88,33 @@ foreach ($this->data['iconmap']['mappings'] as $mapping) { } // add row button -$iconMapTable->addRow((new CRow([ - (new CCol( - (new CButton('addMapping', _('Add')))->addClass(ZBX_STYLE_BTN_LINK) - ))->setColSpan(7) -]))->setId('iconMapListFooter')); - -// <default icon row> -$iconsComboBox = new CComboBox('iconmap[default_iconid]', $this->data['iconmap']['default_iconid'], null, - $this->data['iconList'] -); -$iconsComboBox->addClass('mappingIcon'); - -$iconPreviewImage = (new CImg('imgstore.php?iconid='.$this->data['iconmap']['default_iconid']. - '&width='.ZBX_ICON_PREVIEW_WIDTH.'&height='.ZBX_ICON_PREVIEW_HEIGHT, _('Preview'), null, null)) - ->addClass(ZBX_STYLE_CURSOR_POINTER) - ->addClass('preview') - ->setAttribute('data-image-full', 'imgstore.php?iconid='.$this->data['iconmap']['default_iconid']); - -$iconMapTable->addRow([ - (new CCol(_('Default')))->setColSpan(4), - $iconsComboBox, - (new CCol($iconPreviewImage))->setAttribute('style', 'vertical-align: middle;') -]); +$iconMapTable + ->addRow((new CRow([ + (new CCol( + (new CButton('addMapping', _('Add')))->addClass(ZBX_STYLE_BTN_LINK) + ))->setColSpan(7) + ]))->setId('iconMapListFooter')) + ->addRow([ + (new CCol(_('Default')))->setColSpan(4), + (new CComboBox('iconmap[default_iconid]', $data['iconmap']['default_iconid'], null, $data['iconList'])) + ->addClass('mappingIcon'), + (new CCol( + (new CImg('imgstore.php?iconid='.$data['iconmap']['default_iconid']. + '&width='.ZBX_ICON_PREVIEW_WIDTH.'&height='.ZBX_ICON_PREVIEW_HEIGHT, _('Preview'), null, null + )) + ->addClass(ZBX_STYLE_CURSOR_POINTER) + ->addClass('preview') + ->setAttribute('data-image-full', 'imgstore.php?iconid='.$data['iconmap']['default_iconid']) + ))->setAttribute('style', 'vertical-align: middle;') + ]); // </default icon row> -$iconMapTab->addRow(_('Mappings'), +$iconMapTab->addRow( + (new CLabel(_('Mappings'), 'iconmap_list'))->setAsteriskMark(), (new CDiv($iconMapTable)) ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;') + ->setId('iconmap_list') ); $iconMapView = new CTabView(); $iconMapView->addTab('iconmap', _('Icon map'), $iconMapTab); diff --git a/frontends/php/include/views/administration.general.iconmap.list.php b/frontends/php/include/views/administration.general.iconmap.list.php index 6e1d5e4b65c..825f5b3f225 100644 --- a/frontends/php/include/views/administration.general.iconmap.list.php +++ b/frontends/php/include/views/administration.general.iconmap.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/administration.general.image.edit.php b/frontends/php/include/views/administration.general.image.edit.php index 760155b9702..d542e5a3d85 100644 --- a/frontends/php/include/views/administration.general.image.edit.php +++ b/frontends/php/include/views/administration.general.image.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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,12 +34,18 @@ $imageForm->addVar('imagetype', $this->data['imagetype']); // append form list $imageFormList = (new CFormList('imageFormList')) - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $this->data['imagename'], false, 64)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setAttribute('autofocus', 'autofocus') + ->setAriaRequired() ) - ->addRow(_('Upload'), (new CFile('image'))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)); + ->addRow( + (new CLabel(_('Upload'), 'image'))->setAsteriskMark(), + (new CFile('image'))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ); if (isset($this->data['imageid'])) { if ($this->data['imagetype'] == IMAGE_TYPE_BACKGROUND) { diff --git a/frontends/php/include/views/administration.general.image.list.php b/frontends/php/include/views/administration.general.image.list.php index 2af68b9549b..4e3a2fef746 100644 --- a/frontends/php/include/views/administration.general.image.list.php +++ b/frontends/php/include/views/administration.general.image.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/administration.general.macros.edit.php b/frontends/php/include/views/administration.general.macros.edit.php index d139d304399..f7310a73edd 100644 --- a/frontends/php/include/views/administration.general.macros.edit.php +++ b/frontends/php/include/views/administration.general.macros.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/administration.general.other.edit.php b/frontends/php/include/views/administration.general.other.edit.php index 298f2b0f737..4f9ebdbec79 100644 --- a/frontends/php/include/views/administration.general.other.edit.php +++ b/frontends/php/include/views/administration.general.other.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -40,9 +40,10 @@ foreach ($data['alert_usrgrps'] as $usrgrp) { } $otherTab - ->addRow(_('Refresh unsupported items'), + ->addRow((new CLabel(_('Refresh unsupported items'), 'refresh_unsupported'))->setAsteriskMark(), (new CTextBox('refresh_unsupported', $data['refresh_unsupported'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->setAriaRequired() ) ->addRow(_('Group for discovered hosts'), $discoveryGroup) ->addRow(_('Default host inventory mode'), diff --git a/frontends/php/include/views/administration.general.regularexpressions.edit.php b/frontends/php/include/views/administration.general.regularexpressions.edit.php index b23c13eff02..debc2c7a344 100644 --- a/frontends/php/include/views/administration.general.regularexpressions.edit.php +++ b/frontends/php/include/views/administration.general.regularexpressions.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -61,7 +61,8 @@ foreach ($data['expressions'] as $i => $expression) { expression_type2str() ))->onChange('onChangeExpressionType(this, '.$i.')'), (new CTextBox('expressions['.$i.'][expression]', $expression['expression'], false, 255)) - ->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH), + ->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) + ->setAriaRequired(), $exp_delimiter, (new CCheckBox('expressions['.$i.'][case_sensitive]', '1'))->setChecked($expression['case_sensitive'] == 1) ]; @@ -91,14 +92,18 @@ $exprTable->setFooter( ); $exprTab = (new CFormList('exprTab')) - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $data['name'], false, 128)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setAttribute('autofocus', 'autofocus') + ->setAriaRequired() ) - ->addRow(_('Expressions'), (new CDiv($exprTable)) - ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) - ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;') + ->addRow( + (new CLabel(_('Expressions'), 'tbl_expr'))->setAsteriskMark(), + (new CDiv($exprTable)) + ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) + ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;') ); /* diff --git a/frontends/php/include/views/administration.general.regularexpressions.list.php b/frontends/php/include/views/administration.general.regularexpressions.list.php index 6279cc0f8a0..309c05b02f1 100644 --- a/frontends/php/include/views/administration.general.regularexpressions.list.php +++ b/frontends/php/include/views/administration.general.regularexpressions.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/administration.general.trigger.options.edit.php b/frontends/php/include/views/administration.general.trigger.options.edit.php index 43f879cecdf..e95dbacb60d 100644 --- a/frontends/php/include/views/administration.general.trigger.options.edit.php +++ b/frontends/php/include/views/administration.general.trigger.options.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -29,43 +29,45 @@ $widget = (new CWidget()) ); $triggerDOFormList = (new CFormList()) - ->addRow(_('Unacknowledged PROBLEM events'), [ - new CColor('problem_unack_color', $data['problem_unack_color']), + ->addRow((new CLabel(_('Unacknowledged PROBLEM events'), 'problem_unack_color'))->setAsteriskMark(), [ + (new CColor('problem_unack_color', $data['problem_unack_color']))->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CCheckBox('problem_unack_style')) ->setLabel(_('blinking')) ->setChecked($data['problem_unack_style'] == 1) ]) - ->addRow(_('Acknowledged PROBLEM events'), [ - new CColor('problem_ack_color', $data['problem_ack_color']), + ->addRow((new CLabel(_('Acknowledged PROBLEM events'), 'problem_ack_color'))->setAsteriskMark(), [ + (new CColor('problem_ack_color', $data['problem_ack_color']))->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CCheckBox('problem_ack_style')) ->setLabel(_('blinking')) ->setChecked($data['problem_ack_style'] == 1) ]) - ->addRow(_('Unacknowledged OK events'), [ - new CColor('ok_unack_color', $data['ok_unack_color']), + ->addRow((new CLabel(_('Unacknowledged OK events'), 'ok_unack_color'))->setAsteriskMark(), [ + (new CColor('ok_unack_color', $data['ok_unack_color']))->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CCheckBox('ok_unack_style')) ->setLabel(_('blinking')) ->setChecked($data['ok_unack_style'] == 1) ]) - ->addRow(_('Acknowledged OK events'), [ - new CColor('ok_ack_color', $data['ok_ack_color']), + ->addRow((new CLabel(_('Acknowledged OK events'), 'ok_ack_color'))->setAsteriskMark(), [ + (new CColor('ok_ack_color', $data['ok_ack_color']))->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CCheckBox('ok_ack_style')) ->setLabel(_('blinking')) ->setChecked($data['ok_ack_style'] == 1) ]) ->addRow(null) - ->addRow(_('Display OK triggers for'), [ + ->addRow((new CLabel(_('Display OK triggers for'), 'ok_period'))->setAsteriskMark(), [ (new CTextBox('ok_period', $data['ok_period'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->setAriaRequired() ->setAttribute('maxlength', '6') ]) - ->addRow(_('On status change triggers blink for'), [ + ->addRow((new CLabel(_('On status change triggers blink for'), 'blink_period'))->setAsteriskMark(), [ (new CTextBox('blink_period', $data['blink_period'])) ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->setAriaRequired() ->setAttribute('maxlength', '6') ]); diff --git a/frontends/php/include/views/administration.general.triggerSeverity.edit.php b/frontends/php/include/views/administration.general.triggerSeverity.edit.php index d4e82e86189..9e5958b4754 100644 --- a/frontends/php/include/views/administration.general.triggerSeverity.edit.php +++ b/frontends/php/include/views/administration.general.triggerSeverity.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -29,44 +29,50 @@ $widget = (new CWidget()) ); $severityTab = (new CFormList()) - ->addRow(_('Not classified'), [ + ->addRow((new CLabel(_('Not classified'), 'severity_name_0'))->setAsteriskMark(), [ (new CTextBox('severity_name_0', $data['severity_name_0'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('maxlength', 32), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), new CColor('severity_color_0', $data['severity_color_0']) ]) - ->addRow(_('Information'), [ + ->addRow((new CLabel(_('Information'), 'severity_name_1'))->setAsteriskMark(), [ (new CTextBox('severity_name_1', $data['severity_name_1'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('maxlength', 32), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), new CColor('severity_color_1', $data['severity_color_1']) ]) - ->addRow(_('Warning'), [ + ->addRow((new CLabel(_('Warning'), 'severity_name_2'))->setAsteriskMark(), [ (new CTextBox('severity_name_2', $data['severity_name_2'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('maxlength', 32), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), new CColor('severity_color_2', $data['severity_color_2']) ]) - ->addRow(_('Average'), [ + ->addRow((new CLabel(_('Average'), 'severity_name_3'))->setAsteriskMark(), [ (new CTextBox('severity_name_3', $data['severity_name_3'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('maxlength', 32), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), new CColor('severity_color_3', $data['severity_color_3']) ]) - ->addRow(_('High'), [ + ->addRow((new CLabel(_('High'), 'severity_name_4'))->setAsteriskMark(), [ (new CTextBox('severity_name_4', $data['severity_name_4'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('maxlength', 32), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), new CColor('severity_color_4', $data['severity_color_4']) ]) - ->addRow(_('Disaster'), [ + ->addRow((new CLabel(_('Disaster'), 'severity_name_5'))->setAsteriskMark(), [ (new CTextBox('severity_name_5', $data['severity_name_5'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('maxlength', 32), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), new CColor('severity_color_5', $data['severity_color_5']) diff --git a/frontends/php/include/views/administration.general.valuemapping.edit.php b/frontends/php/include/views/administration.general.valuemapping.edit.php index 585d2fd080e..c3aefc79012 100644 --- a/frontends/php/include/views/administration.general.valuemapping.edit.php +++ b/frontends/php/include/views/administration.general.valuemapping.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -35,9 +35,11 @@ if ($data['valuemapid'] != 0) { } $form_list = (new CFormList()) - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $data['name'], false, 64)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ); @@ -51,7 +53,8 @@ foreach ($data['mappings'] as $i => $mapping) { (new CTextBox('mappings['.$i.'][value]', $mapping['value'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), '⇒', (new CTextBox('mappings['.$i.'][newvalue]', $mapping['newvalue'], false, 64)) - ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), (new CButton('mappings['.$i.'][remove]', _('Remove'))) ->addClass(ZBX_STYLE_BTN_LINK) ->addClass('element-table-remove') @@ -68,7 +71,8 @@ $table->addRow([ ))->setColSpan(4) ]); -$form_list->addRow(_('Mappings'), +$form_list->addRow( + (new CLabel(_('Mappings'), $table->getId()))->setAsteriskMark(), (new CDiv($table)) ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px;') diff --git a/frontends/php/include/views/administration.general.valuemapping.list.php b/frontends/php/include/views/administration.general.valuemapping.list.php index 0b7214d9d0c..dfe5a8303bf 100644 --- a/frontends/php/include/views/administration.general.valuemapping.list.php +++ b/frontends/php/include/views/administration.general.valuemapping.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/administration.general.workingtime.edit.php b/frontends/php/include/views/administration.general.workingtime.edit.php index b652fc035f1..760dc8b9b5c 100644 --- a/frontends/php/include/views/administration.general.workingtime.edit.php +++ b/frontends/php/include/views/administration.general.workingtime.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -29,9 +29,10 @@ $widget = (new CWidget()) $workingTimeView = (new CTabView()) ->addTab('workingTime', _('Working time'), (new CFormList()) - ->addRow(_('Working time'), + ->addRow((new CLabel(_('Working time'), 'work_period'))->setAsteriskMark(), (new CTextBox('work_period', $data['work_period'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ) ) diff --git a/frontends/php/include/views/administration.usergroups.edit.php b/frontends/php/include/views/administration.usergroups.edit.php index 942f3c2464c..0c82b533ef0 100644 --- a/frontends/php/include/views/administration.usergroups.edit.php +++ b/frontends/php/include/views/administration.usergroups.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -33,9 +33,11 @@ if ($data['usrgrpid'] != 0) { * User group tab */ $userGroupFormList = (new CFormList()) - ->addRow(_('Group name'), + ->addRow( + (new CLabel(_('Group name'), 'gname'))->setAsteriskMark(), (new CTextBox('gname', $data['name'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ->setAttribute('maxlength', DB::getFieldLength('usrgrp', 'name')) ); @@ -57,11 +59,14 @@ $userGroupFormList->addRow(_('Users'), $usersTweenBox->get(_('In group'), [_('Ot // append frontend and user status to from list $isGranted = ($data['usrgrpid'] != 0) ? granted2update_group($data['usrgrpid']) : true; if ($isGranted) { - $userGroupFormList->addRow(_('Frontend access'), new CComboBox('gui_access', $data['gui_access'], null, [ - GROUP_GUI_ACCESS_SYSTEM => user_auth_type2str(GROUP_GUI_ACCESS_SYSTEM), - GROUP_GUI_ACCESS_INTERNAL => user_auth_type2str(GROUP_GUI_ACCESS_INTERNAL), - GROUP_GUI_ACCESS_DISABLED => user_auth_type2str(GROUP_GUI_ACCESS_DISABLED) - ])); + $userGroupFormList->addRow( + (new CLabel(_('Frontend access'), 'gui_access')), + (new CComboBox('gui_access', $data['gui_access'], null, [ + GROUP_GUI_ACCESS_SYSTEM => user_auth_type2str(GROUP_GUI_ACCESS_SYSTEM), + GROUP_GUI_ACCESS_INTERNAL => user_auth_type2str(GROUP_GUI_ACCESS_INTERNAL), + GROUP_GUI_ACCESS_DISABLED => user_auth_type2str(GROUP_GUI_ACCESS_DISABLED) + ])) + ); $userGroupFormList->addRow(_('Enabled'), (new CCheckBox('users_status'))->setChecked($data['users_status'] == GROUP_STATUS_ENABLED) ); @@ -132,7 +137,6 @@ $new_permissions_table = (new CTable()) (new CMultiSelect([ 'name' => 'groupids[]', 'objectName' => 'hostGroup', - 'styles' => ['margin-top' => '-.3em'], 'popup' => [ 'parameters' => [ 'srctbl' => 'host_groups', diff --git a/frontends/php/include/views/administration.usergroups.list.php b/frontends/php/include/views/administration.usergroups.list.php index 36c41714091..58d9bc47f06 100644 --- a/frontends/php/include/views/administration.usergroups.list.php +++ b/frontends/php/include/views/administration.usergroups.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/administration.users.edit.php b/frontends/php/include/views/administration.users.edit.php index acb0cb06906..38ba3f87603 100644 --- a/frontends/php/include/views/administration.users.edit.php +++ b/frontends/php/include/views/administration.users.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -45,9 +45,12 @@ if ($data['userid'] != 0) { $userFormList = new CFormList('userFormList'); if (!$data['is_profile']) { - $userFormList->addRow(_('Alias'), (new CTextBox('alias', $this->data['alias'])) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) - ->setAttribute('autofocus', 'autofocus') + $userFormList->addRow( + (new CLabel(_('Alias'), 'alias'))->setAsteriskMark(), + (new CTextBox('alias', $this->data['alias'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ->setAttribute('autofocus', 'autofocus') ->setAttribute('maxlength', DB::getFieldLength('users', 'alias')) ); $userFormList->addRow(_x('Name', 'user first name'), @@ -71,7 +74,7 @@ if (!$this->data['is_profile']) { } $userFormList->addRow( - _('Groups'), + (new CLabel(_('Groups'), 'user_groups[]'))->setAsteriskMark(), (new CMultiSelect([ 'name' => 'user_groups[]', 'objectName' => 'usersGroups', @@ -85,7 +88,9 @@ if (!$this->data['is_profile']) { 'multiselect' => '1' ] ] - ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ); } @@ -93,12 +98,16 @@ if (!$this->data['is_profile']) { if ($data['auth_type'] == ZBX_AUTH_INTERNAL) { if ($data['userid'] == 0 || isset($this->data['change_password'])) { $userFormList->addRow( - _('Password'), - (new CPassBox('password1', $this->data['password1']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + (new CLabel(_('Password'), 'password1'))->setAsteriskMark(), + (new CPassBox('password1', $this->data['password1'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ); $userFormList->addRow( - _('Password (once again)'), - (new CPassBox('password2', $this->data['password2']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + (new CLabel(_('Password (once again)'), 'password2'))->setAsteriskMark(), + (new CPassBox('password2', $this->data['password2'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ); if (isset($this->data['change_password'])) { @@ -187,12 +196,15 @@ if ($this->data['alias'] != ZBX_GUEST_USER) { } $userFormList - ->addRow(_('Refresh'), - (new CTextBox('refresh', $data['refresh']))->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->addRow((new CLabel(_('Refresh'), 'refresh'))->setAsteriskMark(), + (new CTextBox('refresh', $data['refresh'])) + ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Rows per page'), + ->addRow((new CLabel(_('Rows per page'), 'rows_per_page'))->setAsteriskMark(), (new CNumericBox('rows_per_page', $this->data['rows_per_page'], 6)) ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired() ) ->addRow(_('URL (after login)'), (new CTextBox('url', $this->data['url']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) diff --git a/frontends/php/include/views/administration.users.list.php b/frontends/php/include/views/administration.users.list.php index 93fa2eda530..8bae58a9824 100644 --- a/frontends/php/include/views/administration.users.list.php +++ b/frontends/php/include/views/administration.users.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/common.filter.trigger.php b/frontends/php/include/views/common.filter.trigger.php index 24f18f54f9c..21cc85411bc 100644 --- a/frontends/php/include/views/common.filter.trigger.php +++ b/frontends/php/include/views/common.filter.trigger.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/conf.import.php b/frontends/php/include/views/conf.import.php index b904caaf01f..3f2e781975a 100644 --- a/frontends/php/include/views/conf.import.php +++ b/frontends/php/include/views/conf.import.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -103,7 +103,11 @@ foreach ($titles as $key => $title) { // form list $form_list = (new CFormList()) - ->addRow(_('Import file'), (new CFile('import_file'))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)) + ->addRow((new CLabel(_('Import file'), 'import_file'))->setAsteriskMark(), + (new CFile('import_file')) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ) ->addRow(_('Rules'), new CDiv($rulesTable)); // tab diff --git a/frontends/php/include/views/configuration.action.edit.php b/frontends/php/include/views/configuration.action.edit.php index 7513656be5f..78368531dba 100644 --- a/frontends/php/include/views/configuration.action.edit.php +++ b/frontends/php/include/views/configuration.action.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -35,9 +35,11 @@ if ($data['actionid']) { // Action tab. $action_tab = (new CFormList()) - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $data['action']['name'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ); @@ -420,9 +422,11 @@ $action_tab->addRow(_('Enabled'), $operation_tab = new CFormList('operationlist'); if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVENT_SOURCE_INTERNAL) { - $operation_tab->addRow(_('Default operation step duration'), [ - (new CTextBox('esc_period', $data['action']['esc_period']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) - ]); + $operation_tab->addRow((new CLabel(_('Default operation step duration'), 'esc_period'))->setAsteriskMark(), + (new CTextBox('esc_period', $data['action']['esc_period'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() + ); } $operation_tab @@ -633,7 +637,9 @@ if (!empty($data['new_operation'])) { foreach ($data['allowedOperations'][ACTION_OPERATION] as $operation) { $operationTypeComboBox->addItem($operation, operation_type2str($operation)); } - $new_operation_formlist->addRow(_('Operation type'), $operationTypeComboBox); + $new_operation_formlist->addRow((new CLabel(_('Operation type'), 'new_operation[operationtype]')), + $operationTypeComboBox + ); } switch ($data['new_operation']['operationtype']) { @@ -758,6 +764,7 @@ if (!empty($data['new_operation'])) { zbx_add_post_js($js_insert); $new_operation_formlist + ->addRow('', (new CLabel(_('At least one user or user group must be selected.')))->setAsteriskMark()) ->addRow(_('Send to User groups'), (new CDiv($usrgrpList)) ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) @@ -886,7 +893,8 @@ if (!empty($data['new_operation'])) { zbx_add_post_js($js_insert); // target list - $new_operation_formlist->addRow(_('Target list'), + $new_operation_formlist->addRow( + (new CLabel(_('Target list'), 'opCmdList'))->setAsteriskMark(), (new CDiv( (new CTable()) ->setAttribute('style', 'width: 100%;') @@ -906,90 +914,111 @@ if (!empty($data['new_operation'])) { ->setId('opCmdList') ); - // type - $typeComboBox = new CComboBox('new_operation[opcommand][type]', - $data['new_operation']['opcommand']['type'], - 'showOpTypeForm('.ACTION_OPERATION.')', [ - ZBX_SCRIPT_TYPE_IPMI => _('IPMI'), - ZBX_SCRIPT_TYPE_CUSTOM_SCRIPT => _('Custom script'), - ZBX_SCRIPT_TYPE_SSH => _('SSH'), - ZBX_SCRIPT_TYPE_TELNET => _('Telnet'), - ZBX_SCRIPT_TYPE_GLOBAL_SCRIPT => _('Global script') - ] - ); - $userScript = [ new CVar('new_operation[opcommand][scriptid]', $data['new_operation']['opcommand']['scriptid']), - (new CTextBox( - 'new_operation[opcommand][script]', $data['new_operation']['opcommand']['script'], true - ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + (new CTextBox('new_operation[opcommand][script]', $data['new_operation']['opcommand']['script'], true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('select_operation_opcommand_script', _('Select')))->addClass(ZBX_STYLE_BTN_GREY) ]; - $new_operation_formlist->addRow(_('Type'), $typeComboBox); - $new_operation_formlist->addRow(_('Script name'), (new CDiv($userScript))->addClass(ZBX_STYLE_NOWRAP)); - - // script - $new_operation_formlist->addRow(_('Execute on'), - (new CRadioButtonList('new_operation[opcommand][execute_on]', - (int) $data['new_operation']['opcommand']['execute_on'] - )) - ->addValue(_('Zabbix agent'), ZBX_SCRIPT_EXECUTE_ON_AGENT) - ->addValue(_('Zabbix server (proxy)'), ZBX_SCRIPT_EXECUTE_ON_PROXY) - ->addValue(_('Zabbix server'), ZBX_SCRIPT_EXECUTE_ON_SERVER) - ->setModern(true) - ); - - // ssh - $authTypeComboBox = new CComboBox('new_operation[opcommand][authtype]', - $data['new_operation']['opcommand']['authtype'], - 'showOpTypeAuth('.ACTION_OPERATION.')', [ - ITEM_AUTHTYPE_PASSWORD => _('Password'), - ITEM_AUTHTYPE_PUBLICKEY => _('Public key') - ] - ); - - $new_operation_formlist->addRow(_('Authentication method'), $authTypeComboBox); - $new_operation_formlist->addRow(_('User name'), - (new CTextBox('new_operation[opcommand][username]', $data['new_operation']['opcommand']['username'])) - ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) - ); - $new_operation_formlist->addRow(_('Public key file'), - (new CTextBox('new_operation[opcommand][publickey]', $data['new_operation']['opcommand']['publickey'])) - ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) - ); - $new_operation_formlist->addRow(_('Private key file'), - (new CTextBox('new_operation[opcommand][privatekey]', $data['new_operation']['opcommand']['privatekey'])) - ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) - ); - $new_operation_formlist->addRow(_('Password'), - (new CTextBox('new_operation[opcommand][password]', $data['new_operation']['opcommand']['password'])) - ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) - ); - - // set custom id because otherwise they are set based on name (sick!) and produce duplicate ids - $passphraseCB = (new CTextBox('new_operation[opcommand][password]', $data['new_operation']['opcommand']['password'])) - ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) - ->setId('new_operation_opcommand_passphrase'); - $new_operation_formlist->addRow(_('Key passphrase'), $passphraseCB); - - // ssh && telnet - $new_operation_formlist->addRow(_('Port'), - (new CTextBox('new_operation[opcommand][port]', $data['new_operation']['opcommand']['port'])) - ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) - ); - - // command - $new_operation_formlist->addRow(_('Commands'), - (new CTextArea('new_operation[opcommand][command]', $data['new_operation']['opcommand']['command'])) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) - ); - $new_operation_formlist->addRow(_('Commands'), - (new CTextBox('new_operation[opcommand][command]', $data['new_operation']['opcommand']['command'])) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) - ->setId('new_operation_opcommand_command_ipmi') - ); + $new_operation_formlist + // type + ->addRow( + (new CLabel(_('Type'), 'new_operation[opcommand][type]')), + (new CComboBox('new_operation[opcommand][type]', + $data['new_operation']['opcommand']['type'], + 'showOpTypeForm('.ACTION_OPERATION.')', [ + ZBX_SCRIPT_TYPE_IPMI => _('IPMI'), + ZBX_SCRIPT_TYPE_CUSTOM_SCRIPT => _('Custom script'), + ZBX_SCRIPT_TYPE_SSH => _('SSH'), + ZBX_SCRIPT_TYPE_TELNET => _('Telnet'), + ZBX_SCRIPT_TYPE_GLOBAL_SCRIPT => _('Global script') + ] + )) + ) + ->addRow( + (new CLabel(_('Script name'), 'new_operation_opcommand_script'))->setAsteriskMark(), + (new CDiv($userScript))->addClass(ZBX_STYLE_NOWRAP) + ) + // script + ->addRow( + (new CLabel(_('Execute on'), 'new_operation[opcommand][execute_on]')), + (new CRadioButtonList('new_operation[opcommand][execute_on]', + (int) $data['new_operation']['opcommand']['execute_on'] + )) + ->addValue(_('Zabbix agent'), ZBX_SCRIPT_EXECUTE_ON_AGENT) + ->addValue(_('Zabbix server (proxy)'), ZBX_SCRIPT_EXECUTE_ON_PROXY) + ->addValue(_('Zabbix server'), ZBX_SCRIPT_EXECUTE_ON_SERVER) + ->setModern(true) + ) + // ssh + ->addRow(_('Authentication method'), + new CComboBox('new_operation[opcommand][authtype]', + $data['new_operation']['opcommand']['authtype'], + 'showOpTypeAuth('.ACTION_OPERATION.')', [ + ITEM_AUTHTYPE_PASSWORD => _('Password'), + ITEM_AUTHTYPE_PUBLICKEY => _('Public key') + ] + ) + ) + ->addRow( + (new CLabel(_('User name'), 'new_operation[opcommand][username]'))->setAsteriskMark(), + (new CTextBox('new_operation[opcommand][username]', + $data['new_operation']['opcommand']['username'] + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() + ) + ->addRow( + (new CLabel(_('Public key file'), 'new_operation[opcommand][publickey]'))->setAsteriskMark(), + (new CTextBox('new_operation[opcommand][publickey]', + $data['new_operation']['opcommand']['publickey'] + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() + ) + ->addRow( + (new CLabel(_('Private key file'), 'new_operation[opcommand][privatekey]'))->setAsteriskMark(), + (new CTextBox('new_operation[opcommand][privatekey]', + $data['new_operation']['opcommand']['privatekey'] + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() + ) + ->addRow(_('Password'), + (new CTextBox('new_operation[opcommand][password]', + $data['new_operation']['opcommand']['password'] + ))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ) + // set custom id because otherwise they are set based on name (sick!) and produce duplicate ids + ->addRow(_('Key passphrase'), + (new CTextBox('new_operation[opcommand][password]', + $data['new_operation']['opcommand']['password'] + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setId('new_operation_opcommand_passphrase') + ) + // ssh && telnet + ->addRow(_('Port'), + (new CTextBox('new_operation[opcommand][port]', $data['new_operation']['opcommand']['port'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ) + // command + ->addRow( + (new CLabel(_('Commands'), 'new_operation[opcommand][command]'))->setAsteriskMark(), + (new CTextArea('new_operation[opcommand][command]', $data['new_operation']['opcommand']['command'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ) + ->addRow( + (new CLabel(_('Commands'), 'new_operation[opcommand][command]'))->setAsteriskMark(), + (new CTextBox('new_operation[opcommand][command]', $data['new_operation']['opcommand']['command'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setId('new_operation_opcommand_command_ipmi') + ->setAriaRequired() + ); break; case OPERATION_TYPE_HOST_ADD: @@ -1004,7 +1033,8 @@ if (!empty($data['new_operation'])) { case OPERATION_TYPE_GROUP_ADD: case OPERATION_TYPE_GROUP_REMOVE: - $new_operation_formlist->addRow(_('Host groups'), + $new_operation_formlist->addRow( + (new CLabel(_('Host groups'), 'new_operation[groupids][]'))->setAsteriskMark(), (new CMultiSelect([ 'name' => 'new_operation[groupids][]', 'objectName' => 'hostGroup', @@ -1020,13 +1050,16 @@ if (!empty($data['new_operation'])) { 'multiselect' => '1' ] ] - ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ])) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ); break; case OPERATION_TYPE_TEMPLATE_ADD: case OPERATION_TYPE_TEMPLATE_REMOVE: - $new_operation_formlist->addRow(_('Templates'), + $new_operation_formlist->addRow( + (new CLabel(_('Templates'), 'new_operation[templateids][]'))->setAsteriskMark(), (new CMultiSelect([ 'name' => 'new_operation[templateids][]', 'objectName' => 'templates', @@ -1044,12 +1077,15 @@ if (!empty($data['new_operation'])) { 'writeonly' => '1' ] ] - ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ])) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ); break; case OPERATION_TYPE_HOST_INVENTORY: - $new_operation_formlist->addRow(_('Inventory mode'), + $new_operation_formlist->addRow( + (new CLabel(_('Inventory mode'), 'new_operation[opinventory][inventory_mode]')), (new CRadioButtonList('new_operation[opinventory][inventory_mode]', (int) $data['new_operation']['opinventory']['inventory_mode'] )) @@ -1242,8 +1278,11 @@ $action_tabs = (new CTabView()) ->addTab('actionTab', _('Action'), $action_tab) ->addTab('operationTab', _('Operations'), $operation_tab); +$bottom_note = _('At least one operation must exist.'); + // Recovery operation tab. if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVENT_SOURCE_INTERNAL) { + $bottom_note = _('At least one operation or recovery operation must exist.'); $recovery_tab = (new CFormList('operationlist')) ->addRow(_('Default subject'), (new CTextBox('r_shortdata', $data['action']['r_shortdata']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) @@ -1367,7 +1406,9 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVE foreach ($data['allowedOperations'][ACTION_RECOVERY_OPERATION] as $operation) { $operationTypeComboBox->addItem($operation, operation_type2str($operation)); } - $new_operation_formlist->addRow(_('Operation type'), $operationTypeComboBox); + $new_operation_formlist->addRow((new CLabel(_('Operation type'), 'new_recovery_operation[operationtype]')), + $operationTypeComboBox + ); } switch ($data['new_recovery_operation']['operationtype']) { @@ -1474,6 +1515,10 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVE zbx_add_post_js($js_insert); $new_operation_formlist + ->addRow('', + (new CLabel(_('At least one user or user group must be selected.'))) + ->setAsteriskMark() + ) ->addRow(_('Send to User groups'), (new CDiv($usrgrpList)) ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) @@ -1623,7 +1668,8 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVE zbx_add_post_js($js_insert); // target list - $new_operation_formlist->addRow(_('Target list'), + $new_operation_formlist->addRow( + (new CLabel(_('Target list'), 'recOpCmdList'))->setAsteriskMark(), (new CDiv( (new CTable()) ->setAttribute('style', 'width: 100%;') @@ -1644,7 +1690,7 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVE ); // type - $typeComboBox = new CComboBox('new_recovery_operation[opcommand][type]', + $typeComboBox = (new CComboBox('new_recovery_operation[opcommand][type]', $data['new_recovery_operation']['opcommand']['type'], 'showOpTypeForm('.ACTION_RECOVERY_OPERATION.')', [ ZBX_SCRIPT_TYPE_IPMI => _('IPMI'), @@ -1653,7 +1699,7 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVE ZBX_SCRIPT_TYPE_TELNET => _('Telnet'), ZBX_SCRIPT_TYPE_GLOBAL_SCRIPT => _('Global script') ] - ); + )); $userScript = [ new CVar('new_recovery_operation[opcommand][scriptid]', @@ -1661,17 +1707,25 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVE ), (new CTextBox('new_recovery_operation[opcommand][script]', $data['new_recovery_operation']['opcommand']['script'], true - ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + )) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('select_recovery_operation_opcommand_script', _('Select'))) ->addClass(ZBX_STYLE_BTN_GREY) ]; - $new_operation_formlist->addRow(_('Type'), $typeComboBox); - $new_operation_formlist->addRow(_('Script name'), (new CDiv($userScript))->addClass(ZBX_STYLE_NOWRAP)); + $new_operation_formlist->addRow((new CLabel(_('Type'), 'new_recovery_operation[opcommand][type]')), + $typeComboBox + ); + $new_operation_formlist->addRow( + (new CLabel(_('Script name'), 'new_recovery_operation[opcommand][script]'))->setAsteriskMark(), + (new CDiv($userScript))->addClass(ZBX_STYLE_NOWRAP) + ); // script - $new_operation_formlist->addRow(_('Execute on'), + $new_operation_formlist->addRow( + (new CLabel(_('Execute on'), 'new_recovery_operation[opcommand][execute_on]')), (new CRadioButtonList('new_recovery_operation[opcommand][execute_on]', (int) $data['new_recovery_operation']['opcommand']['execute_on'] )) @@ -1691,20 +1745,31 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVE ); $new_operation_formlist->addRow(_('Authentication method'), $authTypeComboBox); - $new_operation_formlist->addRow(_('User name'), + $new_operation_formlist->addRow( + (new CLabel(_('User name'), 'new_recovery_operation[opcommand][username]'))->setAsteriskMark(), (new CTextBox('new_recovery_operation[opcommand][username]', $data['new_recovery_operation']['opcommand']['username'] - ))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ); - $new_operation_formlist->addRow(_('Public key file'), + $new_operation_formlist->addRow( + (new CLabel(_('Public key file'), 'new_recovery_operation[opcommand][publickey]')) + ->setAsteriskMark(), (new CTextBox('new_recovery_operation[opcommand][publickey]', $data['new_recovery_operation']['opcommand']['publickey'] - ))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ); - $new_operation_formlist->addRow(_('Private key file'), + $new_operation_formlist->addRow( + (new CLabel(_('Private key file'), 'new_recovery_operation[opcommand][privatekey]')) + ->setAsteriskMark(), (new CTextBox('new_recovery_operation[opcommand][privatekey]', $data['new_recovery_operation']['opcommand']['privatekey'] - ))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ); $new_operation_formlist->addRow(_('Password'), (new CTextBox('new_recovery_operation[opcommand][password]', @@ -1728,17 +1793,22 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVE ); // command - $new_operation_formlist->addRow(_('Commands'), + $new_operation_formlist->addRow( + (new CLabel(_('Commands'), 'new_recovery_operation[opcommand][command]'))->setAsteriskMark(), (new CTextArea('new_recovery_operation[opcommand][command]', $data['new_recovery_operation']['opcommand']['command'] - ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + )) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ); - $new_operation_formlist->addRow(_('Commands'), + $new_operation_formlist->addRow( + (new CLabel(_('Commands'), 'new_recovery_operation_opcommand_command_ipmi'))->setAsteriskMark(), (new CTextBox('new_recovery_operation[opcommand][command]', $data['new_recovery_operation']['opcommand']['command'] )) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setId('new_recovery_operation_opcommand_command_ipmi') + ->setAriaRequired() ); break; @@ -1806,6 +1876,7 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVE // Acknowledge operations if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) { + $bottom_note = _('At least one operation, recovery operation or acknowledge operation must exist.'); $action_formname = $actionForm->getName(); $acknowledge_tab = (new CFormList('operationlist')) @@ -1900,7 +1971,9 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) { $operationtype->addItem($operation, operation_type2str($operation)); } - $new_operation_formlist->addRow(_('Operation type'), $operationtype); + $new_operation_formlist->addRow((new CLabel(_('Operation type'), 'new_ack_operation[operationtype]')), + $operationtype + ); $usrgrp_list = null; $user_list = null; @@ -2070,7 +2143,8 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) { $js_insert .= 'addPopupValues('.$group_values.');'; zbx_add_post_js($js_insert); - $new_operation_formlist->addRow(_('Target list'), + $new_operation_formlist->addRow( + (new CLabel(_('Target list'), 'ackOpCmdList'))->setAsteriskMark(), (new CDiv( (new CTable()) ->addStyle('width: 100%;') @@ -2089,29 +2163,36 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) { ->addStyle('min-width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px;') ->setId('ackOpCmdList') ) - ->addRow(_('Type'), - new CComboBox('new_ack_operation[opcommand][type]', $data['new_ack_operation']['opcommand']['type'], + ->addRow( + (new CLabel(_('Type'), 'new_ack_operation[opcommand][type]')), + (new CComboBox('new_ack_operation[opcommand][type]', + $data['new_ack_operation']['opcommand']['type'], 'showOpTypeForm('.ACTION_ACKNOWLEDGE_OPERATION.')', [ ZBX_SCRIPT_TYPE_IPMI => _('IPMI'), ZBX_SCRIPT_TYPE_CUSTOM_SCRIPT => _('Custom script'), ZBX_SCRIPT_TYPE_SSH => _('SSH'), ZBX_SCRIPT_TYPE_TELNET => _('Telnet'), ZBX_SCRIPT_TYPE_GLOBAL_SCRIPT => _('Global script') - ]) + ])) ) - ->addRow(_('Script name'), (new CDiv([ + ->addRow( + (new CLabel(_('Script name'), 'new_ack_operation[opcommand][script]'))->setAsteriskMark(), + (new CDiv([ new CVar('new_ack_operation[opcommand][scriptid]', $data['new_ack_operation']['opcommand']['scriptid'] ), (new CTextBox('new_ack_operation[opcommand][script]', $data['new_ack_operation']['opcommand']['script'], true - ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + )) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('select_ack_operation_opcommand_script', _('Select'))) ->addClass(ZBX_STYLE_BTN_GREY) ]))->addClass(ZBX_STYLE_NOWRAP) ) - ->addRow(_('Execute on'), + ->addRow( + (new CLabel(_('Execute on'), 'new_ack_operation[opcommand][execute_on]')), (new CRadioButtonList('new_ack_operation[opcommand][execute_on]', (int) $data['new_ack_operation']['opcommand']['execute_on'] )) @@ -2128,20 +2209,28 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) { ITEM_AUTHTYPE_PUBLICKEY => _('Public key') ]) ) - ->addRow(_('User name'), + ->addRow((new CLabel(_('User name'), 'new_ack_operation[opcommand][username]'))->setAsteriskMark(), (new CTextBox('new_ack_operation[opcommand][username]', $data['new_ack_operation']['opcommand']['username'] - ))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Public key file'), + ->addRow( + (new CLabel(_('Public key file'), 'new_ack_operation[opcommand][publickey]'))->setAsteriskMark(), (new CTextBox('new_ack_operation[opcommand][publickey]', $data['new_ack_operation']['opcommand']['publickey'] - ))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Private key file'), + ->addRow( + (new CLabel(_('Private key file'), 'new_ack_operation[opcommand][privatekey]'))->setAsteriskMark(), (new CTextBox('new_ack_operation[opcommand][privatekey]', $data['new_ack_operation']['opcommand']['privatekey'] - ))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ) ->addRow(_('Password'), (new CTextBox('new_ack_operation[opcommand][password]', @@ -2151,7 +2240,8 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) { ->addRow(_('Key passphrase'), (new CTextBox('new_ack_operation[opcommand][password]', $data['new_ack_operation']['opcommand']['password'] - ))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + )) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) ->setId('new_ack_operation_opcommand_passphrase') ) ->addRow(_('Port'), @@ -2159,20 +2249,32 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) { $data['new_ack_operation']['opcommand']['port'] ))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) ) - ->addRow(_('Commands'), + ->addRow( + (new CLabel(_('Commands'), 'new_ack_operation[opcommand][command]'))->setAsteriskMark(), (new CTextArea('new_ack_operation[opcommand][command]', $data['new_ack_operation']['opcommand']['command'] - ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + )) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Commands'), + ->addRow( + (new CLabel(_('Commands'), 'new_ack_operation[opcommand][command]'))->setAsteriskMark(), (new CTextBox('new_ack_operation[opcommand][command]', $data['new_ack_operation']['opcommand']['command'] )) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setId('new_ack_operation_opcommand_command_ipmi') + ->setAriaRequired() ); } + if ($usrgrp_list || $user_list) { + $new_operation_formlist->addRow('', + (new CLabel(_('At least one user or user group must be selected.'))) + ->setAsteriskMark() + ); + } + if ($usrgrp_list) { $new_operation_formlist->addRow(_('Send to User groups'), (new CDiv($usrgrp_list)) @@ -2268,7 +2370,7 @@ if (!hasRequest('form_refresh')) { // Append buttons to form. $others = []; if ($data['actionid']) { - $action_tabs->setFooter(makeFormFooter( + $form_buttons = [ new CSubmit('update', _('Update')), [ new CButton('clone', _('Clone')), new CButtonDelete( @@ -2277,15 +2379,25 @@ if ($data['actionid']) { ), new CButtonCancel(url_param('actiontype')) ] - )); + ]; } else { - $action_tabs->setFooter(makeFormFooter( + $form_buttons = [ new CSubmit('add', _('Add')), [new CButtonCancel(url_param('actiontype'))] - )); + ]; } +$action_tabs->setFooter([ + (new CList()) + ->addClass(ZBX_STYLE_TABLE_FORMS) + ->addItem([ + new CDiv(''), + (new CDiv((new CLabel($bottom_note))->setAsteriskMark())) + ->addClass(ZBX_STYLE_TABLE_FORMS_TD_RIGHT) + ]), + makeFormFooter($form_buttons[0], $form_buttons[1]) +]); $actionForm->addItem($action_tabs); // Append form to widget. diff --git a/frontends/php/include/views/configuration.action.list.php b/frontends/php/include/views/configuration.action.list.php index e04883f28dc..44c8cc34954 100644 --- a/frontends/php/include/views/configuration.action.list.php +++ b/frontends/php/include/views/configuration.action.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.application.edit.php b/frontends/php/include/views/configuration.application.edit.php index c4a261fae22..152f4cc8b8a 100644 --- a/frontends/php/include/views/configuration.application.edit.php +++ b/frontends/php/include/views/configuration.application.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -35,9 +35,10 @@ if (!empty($this->data['applicationid'])) { $applicationTab = (new CTabView()) ->addTab('applicationTab', _('Application'), (new CFormList()) - ->addRow(_('Name'), + ->addRow((new CLabel(_('Name'), 'appname'))->setAsteriskMark(), (new CTextBox('appname', $this->data['appname'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ) ); diff --git a/frontends/php/include/views/configuration.application.list.php b/frontends/php/include/views/configuration.application.list.php index a910be9afc0..cd5f60b4cde 100644 --- a/frontends/php/include/views/configuration.application.list.php +++ b/frontends/php/include/views/configuration.application.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.copy.elements.php b/frontends/php/include/views/configuration.copy.elements.php index 2465e0daf55..18122c166ae 100644 --- a/frontends/php/include/views/configuration.copy.elements.php +++ b/frontends/php/include/views/configuration.copy.elements.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -43,14 +43,16 @@ $triggersFormList = new CFormList('triggersFormList'); // append copy types to form list -$triggersFormList->addRow(_('Target type'), new CComboBox('copy_type', $this->data['copy_type'], 'submit()', [ - COPY_TYPE_TO_HOST => _('Hosts'), - COPY_TYPE_TO_TEMPLATE => _('Templates'), - COPY_TYPE_TO_HOST_GROUP => _('Host groups') -])); +$triggersFormList->addRow((new CLabel(_('Target type'), 'copy_type'))->setAsteriskMark(), + (new CComboBox('copy_type', $data['copy_type'], 'submit()', [ + COPY_TYPE_TO_HOST => _('Hosts'), + COPY_TYPE_TO_TEMPLATE => _('Templates'), + COPY_TYPE_TO_HOST_GROUP => _('Host groups') + ]))->setAriaRequired() +); // append groups to form list -if ($this->data['copy_type'] == COPY_TYPE_TO_HOST || $this->data['copy_type'] == COPY_TYPE_TO_TEMPLATE) { +if ($data['copy_type'] == COPY_TYPE_TO_HOST || $data['copy_type'] == COPY_TYPE_TO_TEMPLATE) { $groupComboBox = new CComboBox('copy_groupid', $this->data['copy_groupid'], 'submit()'); foreach ($this->data['groups'] as $group) { if (empty($this->data['copy_groupid'])) { @@ -62,9 +64,11 @@ if ($this->data['copy_type'] == COPY_TYPE_TO_HOST || $this->data['copy_type'] == } // append targets to form list -$targets = (new CList())->addClass(ZBX_STYLE_LIST_CHECK_RADIO); +$targets = (new CList()) + ->addClass(ZBX_STYLE_LIST_CHECK_RADIO) + ->setId('copy_targets'); -if ($this->data['copy_type'] == COPY_TYPE_TO_HOST) { +if ($data['copy_type'] == COPY_TYPE_TO_HOST) { foreach ($this->data['hosts'] as $host) { $targets->addItem( (new CCheckBox('copy_targetid['.$host['hostid'].']', $host['hostid'])) @@ -73,7 +77,7 @@ if ($this->data['copy_type'] == COPY_TYPE_TO_HOST) { ); } } -elseif ($this->data['copy_type'] == COPY_TYPE_TO_TEMPLATE) { +elseif ($data['copy_type'] == COPY_TYPE_TO_TEMPLATE) { foreach ($this->data['templates'] as $template) { $targets->addItem( (new CCheckBox('copy_targetid['.$template['templateid'].']', $template['templateid'])) @@ -91,7 +95,7 @@ else { ); } } -$triggersFormList->addRow(_('Target'), $targets); +$triggersFormList->addRow((new CLabel(_('Target'), $targets->getId()))->setAsteriskMark(), $targets); // append tabs to form $triggersTab = (new CTabView()) diff --git a/frontends/php/include/views/configuration.correlation.edit.php b/frontends/php/include/views/configuration.correlation.edit.php index 217d1444ec1..f821e70023d 100644 --- a/frontends/php/include/views/configuration.correlation.edit.php +++ b/frontends/php/include/views/configuration.correlation.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -32,9 +32,11 @@ if ($data['correlationid']) { } $correlation_tab = (new CFormList()) - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $data['correlation']['name'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ); @@ -98,10 +100,12 @@ $correlation_tab ->setId('formula') ->setAttribute('placeholder', 'A or (B and C) …') ]) - ->addRow(_('Conditions'), + ->addRow( + (new CLabel(_('Conditions'), $condition_table->getId()))->setAsteriskMark(), (new CDiv($condition_table)) ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;') + ->setAriaRequired() ); $condition2 = null; @@ -202,7 +206,10 @@ $correlation_tab // Operations tab. $operation_tab = new CFormList('operationlist'); -$operations_table = (new CTable())->setAttribute('style', 'width: 100%;')->setHeader([_('Details'), _('Action')]); +$operations_table = (new CTable()) + ->setAttribute('style', 'width: 100%;') + ->setHeader([_('Details'), _('Action')]) + ->setId('operations_table'); if ($data['correlation']['operations']) { foreach ($data['correlation']['operations'] as $operationid => $operation) { @@ -223,7 +230,8 @@ if ($data['correlation']['operations']) { } $operation_tab - ->addRow(_('Operations'), + ->addRow( + (new CLabel(_('Operations'), $operations_table->getId()))->setAsteriskMark(), (new CDiv([$operations_table])) ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;') diff --git a/frontends/php/include/views/configuration.correlation.list.php b/frontends/php/include/views/configuration.correlation.list.php index 4e561fe1dc6..ceb791ca9fc 100644 --- a/frontends/php/include/views/configuration.correlation.list.php +++ b/frontends/php/include/views/configuration.correlation.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.discovery.edit.php b/frontends/php/include/views/configuration.discovery.edit.php index 586404c15c2..455956873c3 100644 --- a/frontends/php/include/views/configuration.discovery.edit.php +++ b/frontends/php/include/views/configuration.discovery.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -33,9 +33,11 @@ if (!empty($this->data['druleid'])) { // create form list $discoveryFormList = (new CFormList()) - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $this->data['drule']['name'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ); @@ -48,15 +50,19 @@ foreach ($this->data['proxies'] as $proxy) { $discoveryFormList ->addRow(_('Discovery by proxy'), $proxyComboBox) - ->addRow(_('IP range'), + ->addRow((new CLabel(_('IP range'), 'iprange'))->setAsteriskMark(), (new CTextArea('iprange', $this->data['drule']['iprange'], ['maxlength' => 2048])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Update interval'), - (new CTextBox('delay', $data['drule']['delay']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->addRow((new CLabel(_('Update interval'), 'delay'))->setAsteriskMark(), + (new CTextBox('delay', $data['drule']['delay'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ); -$discoveryFormList->addRow(_('Checks'), +$discoveryFormList->addRow( + (new CLabel(_('Checks'), 'dcheckList'))->setAsteriskMark(), (new CDiv( (new CTable()) ->setAttribute('style', 'width: 100%;') diff --git a/frontends/php/include/views/configuration.discovery.list.php b/frontends/php/include/views/configuration.discovery.list.php index 20ea3881195..cfa46c49eec 100644 --- a/frontends/php/include/views/configuration.discovery.list.php +++ b/frontends/php/include/views/configuration.discovery.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.graph.edit.php b/frontends/php/include/views/configuration.graph.edit.php index 7c0e8b8339f..5be9790fdf8 100644 --- a/frontends/php/include/views/configuration.graph.edit.php +++ b/frontends/php/include/views/configuration.graph.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -70,20 +70,24 @@ if ($discovered_graph) { } $graphFormList - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $this->data['name'], $readonly)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ) - ->addRow(_('Width'), + ->addRow((new CLabel(_('Width'), 'width'))->setAsteriskMark(), (new CNumericBox('width', $this->data['width'], 5, $readonly)) ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Height'), + ->addRow((new CLabel(_('Height'), 'height'))->setAsteriskMark(), (new CNumericBox('height', $this->data['height'], 5, $readonly)) ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Graph type'), + ->addRow((new CLabel(_('Graph type'), 'graphtype')), (new CComboBox('graphtype', $this->data['graphtype'], 'submit()', graphType()))->setEnabled(!$readonly) ) ->addRow(_('Show legend'), @@ -168,7 +172,9 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == } $yaxisMinData[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN); - $yaxisMinData[] = (new CTextBox('ymin_name', $ymin_name, $readonly))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); + $yaxisMinData[] = (new CTextBox('ymin_name', $ymin_name, $readonly)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(); $yaxisMinData[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN); // Select item button. @@ -212,7 +218,14 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == $graphForm->addVar('yaxismin', $this->data['yaxismin']); } - $graphFormList->addRow(_('Y axis MIN value'), $yaxisMinData); + $yaxismin_label = new CLabel(_('Y axis MIN value')); + if ($this->data['ymin_type'] == GRAPH_YAXIS_TYPE_ITEM_VALUE) { + $yaxismin_label + ->setAsteriskMark() + ->setAttribute('for', 'ymin_name'); + } + + $graphFormList->addRow($yaxismin_label, $yaxisMinData); $yaxisMaxData = [(new CComboBox('ymax_type', $this->data['ymax_type'], null, [ GRAPH_YAXIS_TYPE_CALCULATED => _('Calculated'), @@ -239,7 +252,9 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == } $yaxisMaxData[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN); - $yaxisMaxData[] = (new CTextBox('ymax_name', $ymax_name, $readonly))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); + $yaxisMaxData[] = (new CTextBox('ymax_name', $ymax_name, $readonly)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(); $yaxisMaxData[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN); // Select item button. @@ -283,7 +298,14 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == $graphForm->addVar('yaxismax', $this->data['yaxismax']); } - $graphFormList->addRow(_('Y axis MAX value'), $yaxisMaxData); + $yaxismax_label = new CLabel(_('Y axis MAX value')); + if ($this->data['ymax_type'] == GRAPH_YAXIS_TYPE_ITEM_VALUE) { + $yaxismax_label + ->setAsteriskMark() + ->setAttribute('for', 'ymax_name'); + } + + $graphFormList->addRow($yaxismax_label, $yaxisMaxData); } else { $graphFormList->addRow(_('3D view'), @@ -294,7 +316,7 @@ else { } // Append items to form list. -$itemsTable = (new CTable()) +$items_table = (new CTable()) ->setId('itemsTable') ->setHeader([ (new CColHeader())->setWidth(15), @@ -352,7 +374,7 @@ if ($data['parent_discoveryid']) { $popup_options_add_prototype['parent_discoveryid'] = $data['parent_discoveryid']; } -$itemsTable->addRow( +$items_table->addRow( (new CRow( $readonly ? null @@ -393,7 +415,10 @@ foreach ($this->data['items'] as $n => $item) { ); } -$graphFormList->addRow(_('Items'), (new CDiv($itemsTable))->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)); +$graphFormList->addRow( + (new CLabel(_('Items'), $items_table->getId()))->setAsteriskMark(), + (new CDiv($items_table))->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) +); // Append tabs to form. $graphTab = new CTabView(); diff --git a/frontends/php/include/views/configuration.graph.list.php b/frontends/php/include/views/configuration.graph.list.php index 73b01e10cbf..da3eb5fdfeb 100644 --- a/frontends/php/include/views/configuration.graph.list.php +++ b/frontends/php/include/views/configuration.graph.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.host.discovery.edit.php b/frontends/php/include/views/configuration.host.discovery.edit.php index 48aeb3bcdd1..e4075e71931 100644 --- a/frontends/php/include/views/configuration.host.discovery.edit.php +++ b/frontends/php/include/views/configuration.host.discovery.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -41,32 +41,38 @@ if (!empty($this->data['templates'])) { $itemFormList->addRow(_('Parent discovery rules'), $this->data['templates']); } -$itemFormList->addRow(_('Name'), (new CTextBox('name', $this->data['name'], $this->data['limited'])) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) - ->setAttribute('autofocus', 'autofocus') +$itemFormList->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), + (new CTextBox('name', $this->data['name'], $this->data['limited'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ->setAttribute('autofocus', 'autofocus') ); // append type to form list if ($this->data['limited']) { $itemForm->addVar('type', $this->data['type']); - $itemFormList->addRow(_('Type'), + $itemFormList->addRow((new CLabel(_('Type'), 'typename')), (new CTextBox('typename', item_type2str($this->data['type']), true))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) ); } else { - $typeComboBox = (new CComboBox('type', $this->data['type'])) - ->addItems($this->data['types']); - $itemFormList->addRow(_('Type'), $typeComboBox); + $itemFormList->addRow((new CLabel(_('Type'), 'type')), + (new CComboBox('type', $this->data['type']))->addItems($this->data['types']) + ); } // append key to form list -$itemFormList->addRow(_('Key'), [ - (new CTextBox('key', $this->data['key'], $this->data['limited']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) -]); +$itemFormList->addRow( + (new CLabel(_('Key'), 'key'))->setAsteriskMark(), + (new CTextBox('key', $this->data['key'], $this->data['limited'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() +); // append interfaces to form list if (!empty($this->data['interfaces'])) { - $interfacesComboBox = new CComboBox('interfaceid', $data['interfaceid']); + $interfaces_combobox = (new CComboBox('interfaceid', $data['interfaceid']))->setAriaRequired(); // Set up interface groups sorted by priority. $interface_types = zbx_objectValues($this->data['interfaces'], 'type'); @@ -89,7 +95,7 @@ if (!empty($this->data['interfaces'])) { $interface_groups[$interface['type']]->addItem($option); } foreach ($interface_groups as $interface_group) { - $interfacesComboBox->addItem($interface_group); + $interfaces_combobox->addItem($interface_group); } $span = (new CSpan(_('No interface found'))) @@ -97,19 +103,27 @@ if (!empty($this->data['interfaces'])) { ->setId('interface_not_defined') ->setAttribute('style', 'display: none;'); - $itemFormList->addRow(_('Host interface'), [$interfacesComboBox, $span], 'interface_row'); + $itemFormList->addRow((new CLabel(_('Host interface'), 'interfaceid'))->setAsteriskMark(), + [$interfaces_combobox, $span], 'interface_row' + ); $itemForm->addVar('selectedInterfaceId', $data['interfaceid']); } -$itemFormList->addRow(_('SNMP OID'), - (new CTextBox('snmp_oid', $this->data['snmp_oid'], $this->data['limited'], 512))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow( + (new CLabel(_('SNMP OID'), 'snmp_oid'))->setAsteriskMark(), + (new CTextBox('snmp_oid', $this->data['snmp_oid'], $this->data['limited'], 512)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_snmp_oid' ); $itemFormList->addRow(_('Context name'), (new CTextBox('snmpv3_contextname', $this->data['snmpv3_contextname']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), 'row_snmpv3_contextname' ); -$itemFormList->addRow(_('SNMP community'), - (new CTextBox('snmp_community', $this->data['snmp_community'], false, 64))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow( + (new CLabel(_('SNMP community'), 'snmp_community'))->setAsteriskMark(), + (new CTextBox('snmp_community', $this->data['snmp_community'], false, 64)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_snmp_community' ); $itemFormList->addRow(_('Security name'), @@ -125,7 +139,7 @@ $securityLevelComboBox = new CComboBox('snmpv3_securitylevel', $this->data['snmp ITEM_SNMPV3_SECURITYLEVEL_AUTHPRIV => 'authPriv' ]); $itemFormList->addRow(_('Security level'), $securityLevelComboBox, 'row_snmpv3_securitylevel'); -$itemFormList->addRow(_('Authentication protocol'), +$itemFormList->addRow((new CLabel(_('Authentication protocol'), 'snmpv3_authprotocol')), (new CRadioButtonList('snmpv3_authprotocol', (int) $this->data['snmpv3_authprotocol'])) ->addValue(_('MD5'), ITEM_AUTHPROTOCOL_MD5) ->addValue(_('SHA'), ITEM_AUTHPROTOCOL_SHA) @@ -137,7 +151,7 @@ $itemFormList->addRow(_('Authentication passphrase'), ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), 'row_snmpv3_authpassphrase' ); -$itemFormList->addRow(_('Privacy protocol'), +$itemFormList->addRow((new CLabel(_('Privacy protocol'), 'snmpv3_privprotocol')), (new CRadioButtonList('snmpv3_privprotocol', (int) $this->data['snmpv3_privprotocol'])) ->addValue(_('DES'), ITEM_PRIVPROTOCOL_DES) ->addValue(_('AES'), ITEM_PRIVPROTOCOL_AES) @@ -152,9 +166,11 @@ $itemFormList->addRow(_('Privacy passphrase'), $itemFormList->addRow(_('Port'), (new CTextBox('port', $this->data['port'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), 'row_port' ); -$itemFormList->addRow(_('IPMI sensor'), +$itemFormList->addRow( + (new CLabel(_('IPMI sensor'), 'ipmi_sensor'))->setAsteriskMark(), (new CTextBox('ipmi_sensor', $this->data['ipmi_sensor'], $this->data['limited'], 128)) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_ipmi_sensor' ); @@ -164,37 +180,53 @@ $authTypeComboBox = new CComboBox('authtype', $this->data['authtype'], null, [ ITEM_AUTHTYPE_PUBLICKEY => _('Public key') ]); $itemFormList->addRow(_('Authentication method'), $authTypeComboBox, 'row_authtype'); -$itemFormList->addRow(_('JMX endpoint'), - (new CTextBox('jmx_endpoint', $data['jmx_endpoint'], false, 255))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow((new CLabel(_('JMX endpoint'), 'jmx_endpoint'))->setAsteriskMark(), + (new CTextBox('jmx_endpoint', $data['jmx_endpoint'], false, 255)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_jmx_endpoint' ); $itemFormList->addRow(_('User name'), (new CTextBox('username', $this->data['username'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), 'row_username' ); -$itemFormList->addRow(_('Public key file'), - (new CTextBox('publickey', $this->data['publickey'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), +$itemFormList->addRow( + (new CLabel(_('Public key file'), 'publickey'))->setAsteriskMark(), + (new CTextBox('publickey', $this->data['publickey'], false, 64)) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), 'row_publickey' ); -$itemFormList->addRow(_('Private key file'), - (new CTextBox('privatekey', $this->data['privatekey'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), +$itemFormList->addRow( + (new CLabel(_('Private key file'), 'privatekey'))->setAsteriskMark(), + (new CTextBox('privatekey', $this->data['privatekey'], false, 64)) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), 'row_privatekey' ); $itemFormList->addRow(_('Password'), (new CTextBox('password', $this->data['password'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), 'row_password' ); -$itemFormList->addRow(_('Executed script'), - (new CTextArea('params_es', $this->data['params']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow( + (new CLabel(_('Executed script'), 'params_es'))->setAsteriskMark(), + (new CTextArea('params_es', $this->data['params'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'label_executed_script' ); -$itemFormList->addRow(_('SQL query'), - (new CTextArea('params_ap', $this->data['params']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow( + (new CLabel(_('SQL query'), 'params_ap'))->setAsteriskMark(), + (new CTextArea('params_ap', $this->data['params'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'label_params' ); -$itemFormList->addRow(_('Update interval'), - (new CTextBox('delay', $data['delay']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), +$itemFormList->addRow((new CLabel(_('Update interval'), 'delay'))->setAsteriskMark(), + (new CTextBox('delay', $data['delay'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), 'row_delay' ); @@ -239,7 +271,8 @@ foreach ($data['delay_flex'] as $i => $delay_flex) { $delayFlexTable->addRow([(new CButton('interval_add', _('Add'))) ->addClass(ZBX_STYLE_BTN_LINK) - ->addClass('element-table-add')]); + ->addClass('element-table-add') +]); $itemFormList->addRow(_('Custom intervals'), (new CDiv($delayFlexTable)) @@ -247,16 +280,18 @@ $itemFormList->addRow(_('Custom intervals'), ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px;'), 'row_flex_intervals' ) - ->addRow(_('Keep lost resources period'), - (new CTextBox('lifetime', $data['lifetime']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->addRow((new CLabel(_('Keep lost resources period'), 'lifetime'))->setAsteriskMark(), + (new CTextBox('lifetime', $data['lifetime'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ) ->addRow(_('Allowed hosts'), (new CTextBox('trapper_hosts', $this->data['trapper_hosts']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), - 'row_trapper_hosts' + 'row_trapper_hosts' ) ->addRow(_('Description'), (new CTextArea('description', $this->data['description']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) -); + ); // status $enabledCheckBox = (new CCheckBox('status', ITEM_STATUS_ACTIVE))->setChecked($this->data['status'] == ITEM_STATUS_ACTIVE); diff --git a/frontends/php/include/views/configuration.host.discovery.list.php b/frontends/php/include/views/configuration.host.discovery.list.php index 355af373a9e..08df76f8023 100644 --- a/frontends/php/include/views/configuration.host.discovery.list.php +++ b/frontends/php/include/views/configuration.host.discovery.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.host.edit.php b/frontends/php/include/views/configuration.host.edit.php index a50353e0da6..ccfd2428fc4 100644 --- a/frontends/php/include/views/configuration.host.edit.php +++ b/frontends/php/include/views/configuration.host.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -60,9 +60,11 @@ if ($data['flags'] == ZBX_FLAG_DISCOVERY_CREATED) { ); } -$hostList->addRow(_('Host name'), +$hostList->addRow( + (new CLabel(_('Host name'), 'host'))->setAsteriskMark(), (new CTextBox('host', $data['host'], ($data['flags'] == ZBX_FLAG_DISCOVERY_CREATED), 128)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ); @@ -72,21 +74,23 @@ $hostList->addRow(_('Visible name'), ); if ($data['flags'] != ZBX_FLAG_DISCOVERY_CREATED) { - // groups for normal hosts - $groupsTB = new CTweenBox($frmHost, 'groups', $data['groups'], 10); + // Groups for normal hosts. + $groups_tweenbox = new CTweenBox($frmHost, 'groups', $data['groups'], 10); foreach ($data['groupsAll'] as $group) { if (in_array($group['groupid'], $data['groups'])) { - $groupsTB->addItem($group['groupid'], $group['name'], null, + $groups_tweenbox->addItem($group['groupid'], $group['name'], null, array_key_exists($group['groupid'], $data['groupsAllowed']) ); } elseif (array_key_exists($group['groupid'], $data['groupsAllowed'])) { - $groupsTB->addItem($group['groupid'], $group['name']); + $groups_tweenbox->addItem($group['groupid'], $group['name']); } } - $hostList->addRow(_('Groups'), $groupsTB->get(_('In groups'), _('Other groups'))); + $hostList->addRow((new CLabel(_('Groups'), 'groups_tweenbox'))->setAsteriskMark(), + $groups_tweenbox->get(_('In groups'), _('Other groups')) + ); $new_group = (new CTextBox('newgroup', $data['newgroup']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); $new_group_label = _('New group'); @@ -99,17 +103,19 @@ if ($data['flags'] != ZBX_FLAG_DISCOVERY_CREATED) { ); } else { - // groups for discovered hosts - $groupBox = new CListBox(null, null, 10); - $groupBox->setEnabled(false); + // Groups for discovered hosts. + $group_box = (new CListBox(null, null, 10)) + ->setEnabled(false) + ->setId('host_groups'); + foreach ($data['groupsAll'] as $group) { if (in_array($group['groupid'], $data['groups'])) { - $groupBox->addItem($group['groupid'], $group['name'], null, + $group_box->addItem($group['groupid'], $group['name'], null, array_key_exists($group['groupid'], $data['groupsAllowed']) ); } } - $hostList->addRow(_('Groups'), $groupBox); + $hostList->addRow((new CLabel(_('Groups'), $group_box->getId()))->setAsteriskMark(), $group_box); $hostList->addVar('groups', $data['groups']); } @@ -119,6 +125,9 @@ if ($data['flags'] != ZBX_FLAG_DISCOVERY_CREATED) { ? 'hostInterfacesManager.add('.CJs::encodeJson($data['interfaces']).');' : 'hostInterfacesManager.addNew("agent");'); + $hostList->addRow('', + (new CLabel(_('At least one interface must exist.')))->setAsteriskMark() + ); // Zabbix agent interfaces $ifTab = (new CTable()) ->setId('agentInterfaces') @@ -799,13 +808,17 @@ $encryption_form_list = (new CFormList('encryption')) ->setEnabled($data['flags'] != ZBX_FLAG_DISCOVERY_CREATED) ) ) - ->addRow(_('PSK identity'), + ->addRow( + (new CLabel(_('PSK identity'), 'tls_psk_identity'))->setAsteriskMark(), (new CTextBox('tls_psk_identity', $data['tls_psk_identity'], $data['flags'] == ZBX_FLAG_DISCOVERY_CREATED, 128)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ) - ->addRow(_('PSK'), + ->addRow( + (new CLabel(_('PSK'), 'tls_psk'))->setAsteriskMark(), (new CTextBox('tls_psk', $data['tls_psk'], $data['flags'] == ZBX_FLAG_DISCOVERY_CREATED, 512)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ) ->addRow(_('Issuer'), (new CTextBox('tls_issuer', $data['tls_issuer'], $data['flags'] == ZBX_FLAG_DISCOVERY_CREATED, 1024)) diff --git a/frontends/php/include/views/configuration.host.list.php b/frontends/php/include/views/configuration.host.list.php index 55936060770..20b784e1c1d 100644 --- a/frontends/php/include/views/configuration.host.list.php +++ b/frontends/php/include/views/configuration.host.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.host.massupdate.php b/frontends/php/include/views/configuration.host.massupdate.php index c46229c0ea5..16cef974b89 100644 --- a/frontends/php/include/views/configuration.host.massupdate.php +++ b/frontends/php/include/views/configuration.host.massupdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.host.prototype.edit.php b/frontends/php/include/views/configuration.host.prototype.edit.php index 2b2dec7a829..dae95f398d6 100644 --- a/frontends/php/include/views/configuration.host.prototype.edit.php +++ b/frontends/php/include/views/configuration.host.prototype.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -68,8 +68,9 @@ if (isset($hostPrototype['hostid'])) { $hostTB = (new CTextBox('host', $hostPrototype['host'], (bool) $hostPrototype['templateid'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setAttribute('maxlength', 128) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus'); -$hostList->addRow(_('Host name'), $hostTB); +$hostList->addRow((new CLabel(_('Host name'), 'host'))->setAsteriskMark(), $hostTB); $name = ($hostPrototype['name'] != $hostPrototype['host']) ? $hostPrototype['name'] : ''; $visiblenameTB = (new CTextBox('name', $name, (bool) $hostPrototype['templateid'])) @@ -191,7 +192,8 @@ foreach ($data['groups'] as $group) { 'name' => $group['name'] ]; } -$groupList->addRow(_('Groups'), +$groupList->addRow( + (new CLabel(_('Groups'), 'group_links[]'))->setAsteriskMark(), (new CMultiSelect([ 'name' => 'group_links[]', 'objectName' => 'hostGroup', @@ -212,7 +214,9 @@ $groupList->addRow(_('Groups'), 'normal_only' => '1' ] ] - ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ); // new group prototypes diff --git a/frontends/php/include/views/configuration.host.prototype.list.php b/frontends/php/include/views/configuration.host.prototype.list.php index 53a64d1c89f..2f00333614a 100644 --- a/frontends/php/include/views/configuration.host.prototype.list.php +++ b/frontends/php/include/views/configuration.host.prototype.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.hostgroups.edit.php b/frontends/php/include/views/configuration.hostgroups.edit.php index 144bf3e162a..f505c82595a 100644 --- a/frontends/php/include/views/configuration.hostgroups.edit.php +++ b/frontends/php/include/views/configuration.hostgroups.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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,9 +34,10 @@ $hostGroupFormList = new CFormList('hostgroupFormList'); $nameTextBox = (new CTextBox('name', $this->data['name'], ($this->data['groupid'] && $this->data['group']['flags'] == ZBX_FLAG_DISCOVERY_CREATED) )) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(); $nameTextBox->setAttribute('autofocus', 'autofocus'); -$hostGroupFormList->addRow(_('Group name'), $nameTextBox); +$hostGroupFormList->addRow((new CLabel(_('Group name'), 'name'))->setAsteriskMark(), $nameTextBox); // append groups and hosts to form list $groupsComboBox = new CComboBox('twb_groupid', $this->data['twb_groupid'], 'submit()'); diff --git a/frontends/php/include/views/configuration.hostgroups.list.php b/frontends/php/include/views/configuration.hostgroups.list.php index 3291f92221f..7a2fe6f250c 100644 --- a/frontends/php/include/views/configuration.hostgroups.list.php +++ b/frontends/php/include/views/configuration.hostgroups.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.httpconf.edit.php b/frontends/php/include/views/configuration.httpconf.edit.php index 95b0afd37da..ae8e6483b98 100644 --- a/frontends/php/include/views/configuration.httpconf.edit.php +++ b/frontends/php/include/views/configuration.httpconf.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -51,11 +51,12 @@ if (!empty($this->data['templates'])) { // Name $nameTextBox = (new CTextBox('name', $this->data['name'], $this->data['templated'], 64)) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(); if (!$this->data['templated']) { $nameTextBox->setAttribute('autofocus', 'autofocus'); } -$httpFormList->addRow(_('Name'), $nameTextBox); +$httpFormList->addRow((new CLabel(_('Name'), 'name'))->setAsteriskMark(), $nameTextBox); // Application if ($this->data['application_list']) { @@ -75,11 +76,16 @@ $httpFormList (new CTextBox('new_application', $this->data['new_application']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ))->addClass(ZBX_STYLE_FORM_NEW_GROUP) ) - ->addRow(_('Update interval'), - (new CTextBox('delay', $data['delay']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->addRow((new CLabel(_('Update interval'), 'delay'))->setAsteriskMark(), + (new CTextBox('delay', $data['delay'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Attempts'), - (new CNumericBox('retries', $this->data['retries'], 2))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->addRow( + (new CLabel(_('Attempts'), 'retries'))->setAsteriskMark(), + (new CNumericBox('retries', $this->data['retries'], 2)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ); $agentComboBox = new CComboBox('agent', $this->data['agent']); @@ -149,13 +155,15 @@ $httpAuthenticationFormList->addRow(_('HTTP authentication'), ); $httpAuthenticationFormList - ->addRow(_('User'), + ->addRow((new CLabel(_('User'), 'http_user'))->setAsteriskMark(), (new CTextBox('http_user', $this->data['http_user'], false, 64)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Password'), + ->addRow((new CLabel(_('Password'), 'http_password'))->setAsteriskMark(), (new CTextBox('http_password', $this->data['http_password'], false, 64)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ) ->addRow(_('SSL verify peer'), (new CCheckBox('verify_peer'))->setChecked($this->data['verify_peer'] == 1) @@ -178,7 +186,7 @@ $httpAuthenticationFormList * Step tab */ $httpStepFormList = new CFormList('httpFormList'); -$stepsTable = (new CTable()) +$steps_table = (new CTable()) ->setId('httpStepTable') ->setHeader([ (new CColHeader())->setWidth('15'), @@ -237,7 +245,7 @@ foreach ($this->data['steps'] as $stepid => $step) { ->setAttribute('remove_step', $stepid); } - $stepsTable->addRow( + $steps_table->addRow( (new CRow([ $dragHandler, $numSpan, @@ -254,15 +262,17 @@ foreach ($this->data['steps'] as $stepid => $step) { } if (!$this->data['templated']) { - $stepsTable->addRow( + $steps_table->addRow( (new CCol( (new CButton('add_step', _('Add')))->addClass(ZBX_STYLE_BTN_LINK) ))->setColSpan(8) ); } -$httpStepFormList->addRow(_('Steps'), - (new CDiv($stepsTable))->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) +$httpStepFormList->addRow((new CLabel(_('Steps'), $steps_table->getId()))->setAsteriskMark(), + (new CDiv($steps_table)) + ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) + ->setAriaRequired() ); // append tabs to form diff --git a/frontends/php/include/views/configuration.httpconf.list.php b/frontends/php/include/views/configuration.httpconf.list.php index 85fecffb11e..916465538b6 100644 --- a/frontends/php/include/views/configuration.httpconf.list.php +++ b/frontends/php/include/views/configuration.httpconf.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.item.edit.php b/frontends/php/include/views/configuration.item.edit.php index b06758eb453..52d7ad9894c 100644 --- a/frontends/php/include/views/configuration.item.edit.php +++ b/frontends/php/include/views/configuration.item.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -58,25 +58,32 @@ if ($discovered_item) { )); } -$itemFormList->addRow(_('Name'), +$itemFormList->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $data['name'], $readonly)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ); // Append type to form list. if ($readonly) { $itemForm->addVar('type', $data['type']); - $itemFormList->addRow(_('Type'), + $itemFormList->addRow((new CLabel(_('Type'), 'type_name')), (new CTextBox('type_name', item_type2str($data['type']), true))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) ); } else { - $itemFormList->addRow(_('Type'), new CComboBox('type', $data['type'], null, $data['types'])); + $itemFormList->addRow((new CLabel(_('Type'), 'type')), + (new CComboBox('type', $data['type'], null, $data['types'])) + ); } // Append key to form list. -$key_controls = [(new CTextBox('key', $data['key'], $readonly))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)]; +$key_controls = [(new CTextBox('key', $data['key'], $readonly)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() +]; if (!$readonly) { $key_controls[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN); @@ -93,10 +100,13 @@ if (!$readonly) { ); } -$itemFormList->addRow(_('Key'), $key_controls); +$itemFormList->addRow((new CLabel(_('Key'), 'key'))->setAsteriskMark(), $key_controls); // Append master item select. -$master_item = [(new CTextBox('master_itemname', $data['master_itemname'], true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$master_item = [ + (new CTextBox('master_itemname', $data['master_itemname'], true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CVar('master_itemid', $data['master_itemid'], 'master_itemid')) ]; @@ -119,7 +129,11 @@ if (!$readonly) { ); } -$itemFormList->addRow(_('Master item'), $master_item, 'row_master_item'); +$itemFormList->addRow( + (new CLabel(_('Master item'), 'master_itemname'))->setAsteriskMark(), + $master_item, + 'row_master_item' +); // Append interface(s) to form list. if ($data['interfaces']) { @@ -128,16 +142,20 @@ if ($data['interfaces']) { $data['interfaces'] = zbx_toHash($data['interfaces'], 'interfaceid'); $interface = $data['interfaces'][$data['interfaceid']]; - $itemFormList->addRow(_('Host interface'), new CTextBox('interface', - $interface['useip'] - ? $interface['ip'].' : '.$interface['port'] - : $interface['dns'].' : '.$interface['port'], - true - ), 'interface_row'); + $itemFormList->addRow((new CLabel(_('Host interface'), 'interface'))->setAsteriskMark(), + (new CTextBox('interface', + $interface['useip'] + ? $interface['ip'].' : '.$interface['port'] + : $interface['dns'].' : '.$interface['port'], + true + ))->setAriaRequired(), + 'interface_row' + ); } } else { - $interfacesComboBox = new CComboBox('interfaceid', $data['interfaceid']); + $interfacesComboBox = (new CComboBox('interfaceid', $data['interfaceid'])) + ->setAriaRequired(); // Set up interface groups sorted by priority. $interface_types = zbx_objectValues($this->data['interfaces'], 'type'); @@ -168,14 +186,19 @@ if ($data['interfaces']) { ->setId('interface_not_defined') ->setAttribute('style', 'display: none;'); - $itemFormList->addRow(_('Host interface'), [$interfacesComboBox, $span], 'interface_row'); + $itemFormList->addRow((new CLabel(_('Host interface'), 'interfaceid'))->setAsteriskMark(), + [$interfacesComboBox, $span], 'interface_row' + ); $itemForm->addVar('selectedInterfaceId', $data['interfaceid']); } } // Append SNMP common fields fields. -$itemFormList->addRow(_('SNMP OID'), - (new CTextBox('snmp_oid', $data['snmp_oid'], $readonly, 512))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow( + (new CLabel(_('SNMP OID'), 'snmp_oid'))->setAsteriskMark(), + (new CTextBox('snmp_oid', $data['snmp_oid'], $readonly, 512)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_snmp_oid' ); $itemFormList->addRow(_('Context name'), @@ -183,9 +206,11 @@ $itemFormList->addRow(_('Context name'), ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), 'row_snmpv3_contextname' ); -$itemFormList->addRow(_('SNMP community'), +$itemFormList->addRow( + (new CLabel(_('SNMP community'), 'snmp_community'))->setAsteriskMark(), (new CTextBox('snmp_community', $data['snmp_community'], $discovered_item, 64)) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_snmp_community' ); $itemFormList->addRow(_('Security name'), @@ -229,7 +254,10 @@ else { ->setModern(true); } -$itemFormList->addRow(_('Authentication protocol'), $snmpv3_authprotocol, 'row_snmpv3_authprotocol'); +$itemFormList->addRow((new CLabel(_('Authentication protocol'), 'snmpv3_authprotocol')), + $snmpv3_authprotocol, + 'row_snmpv3_authprotocol' +); // Append snmpv3 authentication passphrase to form list. $itemFormList->addRow(_('Authentication passphrase'), @@ -253,7 +281,10 @@ else { ->addValue(_('AES'), ITEM_PRIVPROTOCOL_AES) ->setModern(true); } -$itemFormList->addRow(_('Privacy protocol'), $snmpv3_privprotocol, 'row_snmpv3_privprotocol'); +$itemFormList->addRow((new CLabel(_('Privacy protocol'), 'snmpv3_privprotocol')), + $snmpv3_privprotocol, + 'row_snmpv3_privprotocol' +); // Append snmpv3 privacy passphrase to form list. $itemFormList->addRow(_('Privacy passphrase'), @@ -265,9 +296,11 @@ $itemFormList->addRow(_('Port'), (new CTextBox('port', $data['port'], $discovered_item, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), 'row_port' ); -$itemFormList->addRow(_('IPMI sensor'), +$itemFormList->addRow( + (new CLabel(_('IPMI sensor'), 'ipmi_sensor'))->setAsteriskMark(), (new CTextBox('ipmi_sensor', $data['ipmi_sensor'], $readonly, 128)) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_ipmi_sensor' ); @@ -285,41 +318,55 @@ else { } $itemFormList->addRow(_('Authentication method'), $authTypeComboBox, 'row_authtype'); -$itemFormList->addRow(_('JMX endpoint'), - (new CTextBox('jmx_endpoint', $data['jmx_endpoint'], $discovered_item, 255))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow((new CLabel(_('JMX endpoint'), 'jmx_endpoint'))->setAsteriskMark(), + (new CTextBox('jmx_endpoint', $data['jmx_endpoint'], $discovered_item, 255)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_jmx_endpoint' ); $itemFormList->addRow(_('User name'), (new CTextBox('username', $data['username'], $discovered_item, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), 'row_username' ); -$itemFormList->addRow(_('Public key file'), - (new CTextBox('publickey', $data['publickey'], $discovered_item, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), +$itemFormList->addRow( + (new CLabel(_('Public key file'), 'publickey'))->setAsteriskMark(), + (new CTextBox('publickey', $data['publickey'], $discovered_item, 64)) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), 'row_publickey' ); -$itemFormList->addRow(_('Private key file'), - (new CTextBox('privatekey', $data['privatekey'], $discovered_item, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), +$itemFormList->addRow( + (new CLabel(_('Private key file'), 'privatekey'))->setAsteriskMark(), + (new CTextBox('privatekey', $data['privatekey'], $discovered_item, 64)) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), 'row_privatekey' ); $itemFormList->addRow(_('Password'), (new CTextBox('password', $data['password'], $discovered_item, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), 'row_password' ); -$itemFormList->addRow(_('Executed script'), +$itemFormList->addRow( + (new CLabel(_('Executed script'), 'params_es'))->setAsteriskMark(), (new CTextArea('params_es', $data['params'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setReadonly($discovered_item), 'label_executed_script' ); -$itemFormList->addRow(_('SQL query'), +$itemFormList->addRow( + (new CLabel(_('SQL query'), 'params_ap'))->setAsteriskMark(), (new CTextArea('params_ap', $data['params'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setReadonly($discovered_item), 'label_params' ); -$itemFormList->addRow(_('Formula'), +$itemFormList->addRow( + (new CLabel(_('Formula'), 'params_f'))->setAsteriskMark(), (new CTextArea('params_f', $data['params'], $discovered_item)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setReadonly($discovered_item), 'label_formula' ); @@ -327,19 +374,21 @@ $itemFormList->addRow(_('Formula'), // Append value type to form list. if ($readonly) { $itemForm->addVar('value_type', $data['value_type']); - $itemFormList->addRow(_('Type of information'), + $itemFormList->addRow((new CLabel(_('Type of information'), 'value_type_name'))->setAsteriskMark(), (new CTextBox('value_type_name', itemValueTypeString($data['value_type']), true)) ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) ); } else { - $itemFormList->addRow(_('Type of information'), new CComboBox('value_type', $data['value_type'], null, [ - ITEM_VALUE_TYPE_UINT64 => _('Numeric (unsigned)'), - ITEM_VALUE_TYPE_FLOAT => _('Numeric (float)'), - ITEM_VALUE_TYPE_STR => _('Character'), - ITEM_VALUE_TYPE_LOG => _('Log'), - ITEM_VALUE_TYPE_TEXT => _('Text') - ])); + $itemFormList->addRow((new CLabel(_('Type of information'), 'value_type')), + (new CComboBox('value_type', $data['value_type'], null, [ + ITEM_VALUE_TYPE_UINT64 => _('Numeric (unsigned)'), + ITEM_VALUE_TYPE_FLOAT => _('Numeric (float)'), + ITEM_VALUE_TYPE_STR => _('Character'), + ITEM_VALUE_TYPE_LOG => _('Log'), + ITEM_VALUE_TYPE_TEXT => _('Text') + ])) + ); } $itemFormList->addRow(_('Units'), @@ -347,8 +396,11 @@ $itemFormList->addRow(_('Units'), 'row_units' ); -$itemFormList->addRow(_('Update interval'), - (new CTextBox('delay', $data['delay'], $discovered_item))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), 'row_delay' +$itemFormList->addRow((new CLabel(_('Update interval'), 'delay'))->setAsteriskMark(), + (new CTextBox('delay', $data['delay'], $discovered_item)) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), + 'row_delay' ); // Append custom intervals to form list. @@ -417,7 +469,9 @@ $itemFormList->addRow(_('Custom intervals'), // Append history storage to form list. $keepHistory = []; -$keepHistory[] = (new CTextBox('history', $data['history'], $discovered_item))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH); +$keepHistory[] = (new CTextBox('history', $data['history'], $discovered_item)) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(); if ($data['config']['hk_history_global'] && ($host['status'] == HOST_STATUS_MONITORED || $host['status'] == HOST_STATUS_NOT_MONITORED)) { @@ -435,11 +489,15 @@ if ($data['config']['hk_history_global'] $keepHistory[] = ' ('.$data['config']['hk_history'].')'; } -$itemFormList->addRow(_('History storage period'), $keepHistory); +$itemFormList->addRow((new CLabel(_('History storage period'), 'history'))->setAsteriskMark(), + $keepHistory +); // Append trend storage to form list. $keepTrend = []; -$keepTrend[] = (new CTextBox('trends', $data['trends'], $discovered_item))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH); +$keepTrend[] = (new CTextBox('trends', $data['trends'], $discovered_item)) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(); if ($data['config']['hk_trends_global'] && ($host['status'] == HOST_STATUS_MONITORED || $host['status'] == HOST_STATUS_NOT_MONITORED)) { @@ -457,7 +515,9 @@ if ($data['config']['hk_trends_global'] $keepTrend[] = ' ('.$data['config']['hk_trends'].')'; } -$itemFormList->addRow(_('Trend storage period'), $keepTrend, 'row_trends'); +$itemFormList->addRow((new CLabel(_('Trend storage period'), 'trends'))->setAsteriskMark(), $keepTrend, + 'row_trends' +); $itemFormList->addRow(_('Log time format'), (new CTextBox('logtimefmt', $data['logtimefmt'], $readonly, 64))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), diff --git a/frontends/php/include/views/configuration.item.list.php b/frontends/php/include/views/configuration.item.list.php index 82734e09271..e5b14ad3951 100644 --- a/frontends/php/include/views/configuration.item.list.php +++ b/frontends/php/include/views/configuration.item.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.item.massupdate.php b/frontends/php/include/views/configuration.item.massupdate.php index 1d58ec9852c..a5d6d31a747 100644 --- a/frontends/php/include/views/configuration.item.massupdate.php +++ b/frontends/php/include/views/configuration.item.massupdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.item.prototype.edit.php b/frontends/php/include/views/configuration.item.prototype.edit.php index 84ed5d53d03..16c87118c9a 100644 --- a/frontends/php/include/views/configuration.item.prototype.edit.php +++ b/frontends/php/include/views/configuration.item.prototype.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -46,26 +46,32 @@ if ($data['limited']) { $readonly = true; } -$itemFormList->addRow(_('Name'), +$itemFormList->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $this->data['name'], $readonly)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ); // append type to form list if ($readonly) { $itemForm->addVar('type', $this->data['type']); - $itemFormList->addRow(_('Type'), + $itemFormList->addRow((new CLabel(_('Type'), 'typename')), (new CTextBox('typename', item_type2str($this->data['type']), true))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) ); } else { - $itemFormList->addRow(_('Type'), new CComboBox('type', $this->data['type'], null, $this->data['types'])); + $itemFormList->addRow((new CLabel(_('Type'), 'type')), + (new CComboBox('type', $this->data['type'], null, $this->data['types'])) + ); } // append key to form list $key_controls = [ - (new CTextBox('key', $this->data['key'], $readonly))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + (new CTextBox('key', $this->data['key'], $readonly)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ]; if (!$readonly) { $key_controls[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN); @@ -83,10 +89,12 @@ if (!$readonly) { } -$itemFormList->addRow(_('Key'), $key_controls); +$itemFormList->addRow((new CLabel(_('Key'), 'key'))->setAsteriskMark(), $key_controls); // Append master item select. -$master_item = [(new CTextBox('master_itemname', $data['master_itemname'], true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$master_item = [(new CTextBox('master_itemname', $data['master_itemname'], true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CVar('master_itemid', $data['master_itemid'], 'master_itemid')) ]; @@ -108,11 +116,15 @@ if (!$readonly) { ); } -$itemFormList->addRow(_('Master item'), $master_item, 'row_master_item'); +$itemFormList->addRow( + (new CLabel(_('Master item'), 'master_itemname'))->setAsteriskMark(), + $master_item, + 'row_master_item' +); // append interfaces to form list if (!empty($this->data['interfaces'])) { - $interfacesComboBox = new CComboBox('interfaceid', $data['interfaceid']); + $interfacesComboBox = (new CComboBox('interfaceid', $data['interfaceid']))->setAriaRequired(); // Set up interface groups sorted by priority. $interface_types = zbx_objectValues($this->data['interfaces'], 'type'); @@ -143,19 +155,27 @@ if (!empty($this->data['interfaces'])) { ->setId('interface_not_defined') ->setAttribute('style', 'display: none;'); - $itemFormList->addRow(_('Host interface'), [$interfacesComboBox, $span], 'interface_row'); + $itemFormList->addRow((new CLabel(_('Host interface'), 'interfaceid'))->setAsteriskMark(), + [$interfacesComboBox, $span], 'interface_row' + ); $itemForm->addVar('selectedInterfaceId', $data['interfaceid']); } -$itemFormList->addRow(_('SNMP OID'), - (new CTextBox('snmp_oid', $this->data['snmp_oid'], $readonly, 512))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow( + (new CLabel(_('SNMP OID'), 'snmp_oid'))->setAsteriskMark(), + (new CTextBox('snmp_oid', $this->data['snmp_oid'], $readonly, 512)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_snmp_oid' ); $itemFormList->addRow(_('Context name'), (new CTextBox('snmpv3_contextname', $this->data['snmpv3_contextname']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), 'row_snmpv3_contextname' ); -$itemFormList->addRow(_('SNMP community'), - (new CTextBox('snmp_community', $this->data['snmp_community'], false, 64))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow( + (new CLabel(_('SNMP community'), 'snmp_community'))->setAsteriskMark(), + (new CTextBox('snmp_community', $this->data['snmp_community'], false, 64)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_snmp_community' ); $itemFormList->addRow(_('Security name'), @@ -171,7 +191,7 @@ $securityLevelComboBox = new CComboBox('snmpv3_securitylevel', $this->data['snmp ITEM_SNMPV3_SECURITYLEVEL_AUTHPRIV => 'authPriv' ]); $itemFormList->addRow(_('Security level'), $securityLevelComboBox, 'row_snmpv3_securitylevel'); -$itemFormList->addRow(_('Authentication protocol'), +$itemFormList->addRow((new CLabel(_('Authentication protocol'), 'snmpv3_authprotocol')), (new CRadioButtonList('snmpv3_authprotocol', (int) $this->data['snmpv3_authprotocol'])) ->addValue(_('MD5'), ITEM_AUTHPROTOCOL_MD5) ->addValue(_('SHA'), ITEM_AUTHPROTOCOL_SHA) @@ -183,7 +203,7 @@ $itemFormList->addRow(_('Authentication passphrase'), ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), 'row_snmpv3_authpassphrase' ); -$itemFormList->addRow(_('Privacy protocol'), +$itemFormList->addRow((new CLabel(_('Privacy protocol'), 'snmpv3_privprotocol')), (new CRadioButtonList('snmpv3_privprotocol', (int) $this->data['snmpv3_privprotocol'])) ->addValue(_('DES'), ITEM_PRIVPROTOCOL_DES) ->addValue(_('AES'), ITEM_PRIVPROTOCOL_AES) @@ -198,9 +218,11 @@ $itemFormList->addRow(_('Privacy passphrase'), $itemFormList->addRow(_('Port'), (new CTextBox('port', $this->data['port'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), 'row_port' ); -$itemFormList->addRow(_('IPMI sensor'), +$itemFormList->addRow( + (new CLabel(_('IPMI sensor'), 'ipmi_sensor'))->setAsteriskMark(), (new CTextBox('ipmi_sensor', $this->data['ipmi_sensor'], $readonly, 128)) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_ipmi_sensor' ); @@ -210,56 +232,74 @@ $authTypeComboBox = new CComboBox('authtype', $this->data['authtype'], null, [ ITEM_AUTHTYPE_PUBLICKEY => _('Public key') ]); $itemFormList->addRow(_('Authentication method'), $authTypeComboBox, 'row_authtype'); -$itemFormList->addRow(_('JMX endpoint'), - (new CTextBox('jmx_endpoint', $data['jmx_endpoint'], false, 255))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow((new CLabel(_('JMX endpoint'), 'jmx_endpoint'))->setAsteriskMark(), + (new CTextBox('jmx_endpoint', $data['jmx_endpoint'], false, 255)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'row_jmx_endpoint' ); $itemFormList->addRow(_('User name'), - (new CTextBox('username', $this->data['username'], false, 64)) - ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), + (new CTextBox('username', $this->data['username'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), 'row_username' ); -$itemFormList->addRow(_('Public key file'), - (new CTextBox('publickey', $this->data['publickey'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), +$itemFormList->addRow( + (new CLabel(_('Public key file'), 'publickey'))->setAsteriskMark(), + (new CTextBox('publickey', $this->data['publickey'], false, 64)) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), 'row_publickey' ); -$itemFormList->addRow(_('Private key file'), - (new CTextBox('privatekey', $this->data['privatekey'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), +$itemFormList->addRow( + (new CLabel(_('Private key file'), 'privatekey'))->setAsteriskMark(), + (new CTextBox('privatekey', $this->data['privatekey'], false, 64)) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), 'row_privatekey' ); $itemFormList->addRow(_('Password'), (new CTextBox('password', $this->data['password'], false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), 'row_password' ); -$itemFormList->addRow(_('Executed script'), - (new CTextArea('params_es', $this->data['params']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow( + (new CLabel(_('Executed script'), 'params_es'))->setAsteriskMark(), + (new CTextArea('params_es', $this->data['params'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'label_executed_script' ); -$itemFormList->addRow(_('SQL query'), - (new CTextArea('params_ap', $this->data['params']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow( + (new CLabel(_('SQL query'), 'params_ap'))->setAsteriskMark(), + (new CTextArea('params_ap', $this->data['params'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'label_params' ); -$itemFormList->addRow(_('Formula'), - (new CTextArea('params_f', $this->data['params']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$itemFormList->addRow( + (new CLabel(_('Formula'), 'params_f'))->setAsteriskMark(), + (new CTextArea('params_f', $this->data['params'])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'label_formula' ); // append value type to form list if ($readonly) { $itemForm->addVar('value_type', $this->data['value_type']); - $itemFormList->addRow(_('Type of information'), + $itemFormList->addRow((new CLabel(_('Type of information'), 'value_type_name')), (new CTextBox('value_type_name', itemValueTypeString($this->data['value_type']), true)) ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) ); } else { - $itemFormList->addRow(_('Type of information'), new CComboBox('value_type', $this->data['value_type'], null, [ - ITEM_VALUE_TYPE_UINT64 => _('Numeric (unsigned)'), - ITEM_VALUE_TYPE_FLOAT => _('Numeric (float)'), - ITEM_VALUE_TYPE_STR => _('Character'), - ITEM_VALUE_TYPE_LOG => _('Log'), - ITEM_VALUE_TYPE_TEXT => _('Text') - ])); + $itemFormList->addRow((new CLabel(_('Type of information'), 'value_type')), + (new CComboBox('value_type', $this->data['value_type'], null, [ + ITEM_VALUE_TYPE_UINT64 => _('Numeric (unsigned)'), + ITEM_VALUE_TYPE_FLOAT => _('Numeric (float)'), + ITEM_VALUE_TYPE_STR => _('Character'), + ITEM_VALUE_TYPE_LOG => _('Log'), + ITEM_VALUE_TYPE_TEXT => _('Text') + ])) + ); } $itemFormList->addRow(_('Units'), @@ -267,8 +307,10 @@ $itemFormList->addRow(_('Units'), 'row_units' ); -$itemFormList->addRow(_('Update interval'), - (new CTextBox('delay', $data['delay']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), +$itemFormList->addRow((new CLabel(_('Update interval'), 'delay'))->setAsteriskMark(), + (new CTextBox('delay', $data['delay'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), 'row_delay' ); @@ -323,16 +365,23 @@ $itemFormList->addRow(_('Custom intervals'), ); $keepHistory = []; -$keepHistory[] = (new CTextBox('history', $data['history']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH); -$itemFormList->addRow(_('History storage period'), $keepHistory); +$keepHistory[] = (new CTextBox('history', $data['history'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(); +$itemFormList->addRow((new CLabel(_('History storage period'), 'history'))->setAsteriskMark(), + $keepHistory +); $keepTrend = []; -$keepTrend[] = (new CTextBox('trends', $data['trends']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH); -$itemFormList->addRow(_('Trend storage period'), $keepTrend, 'row_trends'); +$keepTrend[] = (new CTextBox('trends', $data['trends'])) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(); +$itemFormList->addRow((new CLabel(_('Trend storage period'), 'trends'))->setAsteriskMark(), $keepTrend, + 'row_trends' +); $itemFormList->addRow(_('Log time format'), - (new CTextBox('logtimefmt', $this->data['logtimefmt'], $readonly, 64)) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + (new CTextBox('logtimefmt', $this->data['logtimefmt'], $readonly, 64))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), 'row_logtimefmt' ); diff --git a/frontends/php/include/views/configuration.item.prototype.list.php b/frontends/php/include/views/configuration.item.prototype.list.php index bb5a2a07c23..b70b3f737a9 100644 --- a/frontends/php/include/views/configuration.item.prototype.list.php +++ b/frontends/php/include/views/configuration.item.prototype.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.maintenance.edit.php b/frontends/php/include/views/configuration.maintenance.edit.php index 96159f01900..05aa424896b 100644 --- a/frontends/php/include/views/configuration.maintenance.edit.php +++ b/frontends/php/include/views/configuration.maintenance.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -33,13 +33,15 @@ if (isset($this->data['maintenanceid'])) { * Maintenance tab */ $maintenanceFormList = (new CFormList('maintenanceFormList')) - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'mname'))->setAsteriskMark(), (new CTextBox('mname', $this->data['mname'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ->setAttribute('maxlength', DB::getFieldLength('maintenances', 'name')) ) - ->addRow(_('Maintenance type'), + ->addRow((new CLabel(_('Maintenance type'), 'maintenance_type')), (new CRadioButtonList('maintenance_type', (int) $data['maintenance_type'])) ->addValue(_('With data collection'), MAINTENANCE_TYPE_NORMAL) ->addValue(_('No data collection'), MAINTENANCE_TYPE_NODATA) @@ -101,12 +103,14 @@ $maintenanceFormList->addRow(_('Description'), * Maintenance period tab */ $maintenancePeriodFormList = new CFormList('maintenancePeriodFormList'); -$maintenancePeriodTable = (new CTable()) +$maintenance_period_table = (new CTable()) ->setAttribute('style', 'width: 100%;') - ->setHeader([_('Period type'), _('Schedule'), _('Period'), _('Action')]); + ->setHeader([_('Period type'), _('Schedule'), _('Period'), _('Action')]) + ->setId('maintenance_periods') + ->setAriaRequired(); foreach ($this->data['timeperiods'] as $id => $timeperiod) { - $maintenancePeriodTable->addRow([ + $maintenance_period_table->addRow([ (new CCol(timeperiod_type2str($timeperiod['timeperiod_type'])))->addClass(ZBX_STYLE_NOWRAP), shedule2str($timeperiod), (new CCol(zbx_date2age(0, $timeperiod['period'])))->addClass(ZBX_STYLE_NOWRAP), @@ -139,9 +143,10 @@ foreach ($this->data['timeperiods'] as $id => $timeperiod) { ->addVar('timeperiods['.$id.'][period]', $timeperiod['period']); } -$periodsDiv = (new CDiv($maintenancePeriodTable)) +$periodsDiv = (new CDiv($maintenance_period_table)) ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;'); + if (!isset($_REQUEST['new_timeperiod'])) { $periodsDiv->addItem( (new CSimpleButton(_('New'))) @@ -149,7 +154,9 @@ if (!isset($_REQUEST['new_timeperiod'])) { ->addClass(ZBX_STYLE_BTN_LINK) ); } -$maintenancePeriodFormList->addRow(_('Periods'), $periodsDiv); +$maintenancePeriodFormList->addRow( + (new CLabel(_('Periods'), $maintenance_period_table->getId()))->setAsteriskMark(), $periodsDiv +); if (isset($_REQUEST['new_timeperiod'])) { if (is_array($_REQUEST['new_timeperiod']) && isset($_REQUEST['new_timeperiod']['id'])) { @@ -179,7 +186,9 @@ if (isset($_REQUEST['new_timeperiod'])) { /* * Hosts & groups tab */ -$hostsAndGroupsFormList = new CFormList('hostsAndGroupsFormList'); +$hostsAndGroupsFormList = (new CFormList('hostsAndGroupsFormList'))->addRow('', + (new CLabel(_('At least one host or host group must be selected.')))->setAsteriskMark() +); $hostTweenBox = new CTweenBox($maintenanceForm, 'hostids', $this->data['hostids'], 10); foreach ($this->data['hosts'] as $host) { $hostTweenBox->addItem($host['hostid'], $host['name']); diff --git a/frontends/php/include/views/configuration.maintenance.list.php b/frontends/php/include/views/configuration.maintenance.list.php index 66cc0446f61..cbf0954b241 100644 --- a/frontends/php/include/views/configuration.maintenance.list.php +++ b/frontends/php/include/views/configuration.maintenance.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.services.edit.php b/frontends/php/include/views/configuration.services.edit.php index 942d2a3c9a1..cec05ff4c20 100644 --- a/frontends/php/include/views/configuration.services.edit.php +++ b/frontends/php/include/views/configuration.services.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -38,9 +38,11 @@ if (isset($this->data['service'])) { // create form list $servicesFormList = (new CFormList('servicesFormList')) - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $this->data['name'], false, 128)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ); @@ -51,8 +53,10 @@ $parent_service_popup_options = [ if ($this->data['service']['serviceid']) { $parent_service_popup_options['serviceid'] = $this->data['service']['serviceid']; } -$servicesFormList->addRow(_('Parent service'), [ - (new CTextBox('parent_name', $this->data['parentname'], true, 128))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), +$servicesFormList->addRow((new CLabel(_('Parent service'), 'parent_name'))->setAsteriskMark(), [ + (new CTextBox('parent_name', $this->data['parentname'], true, 128)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('select_parent', _x('Change', 'verb'))) ->addClass(ZBX_STYLE_BTN_GREY) @@ -63,8 +67,9 @@ $servicesFormList->addRow(_('Parent service'), [ ]); // append algorithm to form list -$servicesFormList->addRow(_('Status calculation algorithm'), - new CComboBox('algorithm', $this->data['algorithm'], null, serviceAlgorithm()) +$servicesFormList->addRow( + (new CLabel(_('Status calculation algorithm'), 'algorithm')), + (new CComboBox('algorithm', $data['algorithm'], null, serviceAlgorithm())) ); // append SLA to form list @@ -96,8 +101,11 @@ $servicesFormList->addRow(_('Trigger'), [ ]).');' ) ]); -$servicesFormList->addRow(_('Sort order (0->999)'), (new CTextBox('sortorder', $this->data['sortorder'], false, 3)) - ->setWidth(ZBX_TEXTAREA_TINY_WIDTH)); +$servicesFormList->addRow((new CLabel(_('Sort order (0->999)'), 'sortorder'))->setAsteriskMark(), + (new CTextBox('sortorder', $this->data['sortorder'], false, 3)) + ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->setAriaRequired() +); /* * Dependencies tab @@ -207,15 +215,15 @@ $servicesTimeFormList->addRow(_('Service times'), ); // create service time table -$serviceTimeTable = (new CTable()) - ->addRow([ - _('Period type'), - new CComboBox('new_service_time[type]', $this->data['new_service_time']['type'], 'submit()', [ +$serviceTimeTable = (new CFormList()) + ->addRow( + (new CLabel(_('Period type'), 'new_service_time[type]')), + (new CComboBox('new_service_time[type]', $data['new_service_time']['type'], 'submit()', [ SERVICE_TIME_TYPE_UPTIME => _('Uptime'), SERVICE_TIME_TYPE_DOWNTIME => _('Downtime'), SERVICE_TIME_TYPE_ONETIME_DOWNTIME => _('One-time downtime') - ]) - ]); + ])) + ); if ($this->data['new_service_time']['type'] == SERVICE_TIME_TYPE_ONETIME_DOWNTIME) { // downtime since @@ -265,14 +273,22 @@ if ($this->data['new_service_time']['type'] == SERVICE_TIME_TYPE_ONETIME_DOWNTIM $servicesForm->addVar('new_service_time[to]', $serviceTimeTo); $serviceTimeTable - ->addRow([ + ->addRow( _('Note'), (new CTextBox('new_service_time[note]')) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setAttribute('placeholder', _('short description')) - ]) - ->addRow([_('From'), createDateSelector('new_service_time_from', $fromDate, 'new_service_time_to')]) - ->addRow([_('Till'), createDateSelector('new_service_time_to', $toDate, 'new_service_time_from')]); + ) + ->addRow( + (new CLabel(_('From'), 'new_service_time_from'))->setAsteriskMark(), + (new CDiv(createDateSelector('new_service_time_from', $fromDate, 'new_service_time_to'))) + ->setId('new_service_time_from') + ) + ->addRow( + (new CLabel(_('Till'), 'new_service_time_to'))->setAsteriskMark(), + (new CDiv(createDateSelector('new_service_time_to', $toDate, 'new_service_time_from'))) + ->setId('new_service_time_to') + ); } else { $weekFromComboBox = new CComboBox('new_service_time[from_week]', isset($_REQUEST['new_service_time']['from_week']) @@ -286,48 +302,53 @@ else { $timeFromHourTextBox = (new CTextBox('new_service_time[from_hour]', isset($_REQUEST['new_service_time']['from_hour']) ? $_REQUEST['new_service_time']['from_hour'] : '', false, 2)) ->setWidth(ZBX_TEXTAREA_2DIGITS_WIDTH) + ->setAriaRequired() ->setAttribute('placeholder', _('hh')); $timeFromMinuteTextBox = (new CTextBox('new_service_time[from_minute]', isset($_REQUEST['new_service_time']['from_minute']) ? $_REQUEST['new_service_time']['from_minute'] : '', false, 2)) ->setWidth(ZBX_TEXTAREA_2DIGITS_WIDTH) + ->setAriaRequired() ->setAttribute('placeholder', _('mm')); $timeToHourTextBox = (new CTextBox('new_service_time[to_hour]', isset($_REQUEST['new_service_time']['to_hour']) ? $_REQUEST['new_service_time']['to_hour'] : '', false, 2)) ->setWidth(ZBX_TEXTAREA_2DIGITS_WIDTH) + ->setAriaRequired() ->setAttribute('placeholder', _('hh')); $timeToMinuteTextBox = (new CTextBox('new_service_time[to_minute]', isset($_REQUEST['new_service_time']['to_minute']) ? $_REQUEST['new_service_time']['to_minute'] : '', false, 2)) ->setWidth(ZBX_TEXTAREA_2DIGITS_WIDTH) + ->setAriaRequired() ->setAttribute('placeholder', _('mm')); - $serviceTimeTable->addRow([ - _('From'), - [ - $weekFromComboBox, - (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), - _('Time'), - (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), - $timeFromHourTextBox, - (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), - ':', - (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), - $timeFromMinuteTextBox - ] - ]); - $serviceTimeTable->addRow([ - _('Till'), - [ - $weekToComboBox, - (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), - _('Time'), - (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), - $timeToHourTextBox, - (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), - ':', - (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), - $timeToMinuteTextBox - ] - ]); + $serviceTimeTable + ->addRow( + (new CLabel(_('From'), 'new_service_time_from'))->setAsteriskMark(), + (new CDiv([ + $weekFromComboBox, + (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), + _('Time'), + (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), + $timeFromHourTextBox, + (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), + ':', + (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), + $timeFromMinuteTextBox + ]))->setId('new_service_time_from') + ) + ->addRow( + (new CLabel(_('Till'), 'new_service_time_to'))->setAsteriskMark(), + (new CDiv([ + $weekToComboBox, + (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), + _('Time'), + (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), + $timeToHourTextBox, + (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), + ':', + (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), + $timeToMinuteTextBox + ]))->setId('new_service_time_to') + ); $servicesForm->addVar('new_service_time[note]', ''); } diff --git a/frontends/php/include/views/configuration.services.list.php b/frontends/php/include/views/configuration.services.list.php index 3005e5c9602..62dfba995b7 100644 --- a/frontends/php/include/views/configuration.services.list.php +++ b/frontends/php/include/views/configuration.services.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.services.parent.list.php b/frontends/php/include/views/configuration.services.parent.list.php index cb02cc51da8..3d91cd2a7d5 100644 --- a/frontends/php/include/views/configuration.services.parent.list.php +++ b/frontends/php/include/views/configuration.services.parent.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.template.edit.php b/frontends/php/include/views/configuration.template.edit.php index cb2e48e1c99..18a16d24423 100644 --- a/frontends/php/include/views/configuration.template.edit.php +++ b/frontends/php/include/views/configuration.template.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -73,15 +73,18 @@ $frmHost->addVar('clear_templates', $clear_templates); // TEMPLATE WIDGET { $templateList = (new CFormList('hostlist')) - ->addRow(_('Template name'), (new CTextBox('template_name', $host, false, 128)) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) - ->setAttribute('autofocus', 'autofocus') + ->addRow( + (new CLabel(_('Template name'), 'template_name'))->setAsteriskMark(), + (new CTextBox('template_name', $host, false, 128)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ->setAttribute('autofocus', 'autofocus') ) ->addRow(_('Visible name'), (new CTextBox('visiblename', $visiblename, false, 128)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ); -$groupsTB = new CTweenBox($frmHost, 'groups', $data['groupIds'], 10); +$groups_tweenbox = new CTweenBox($frmHost, 'groups', $data['groupIds'], 10); if ($data['form'] === 'update') { // Add existing template groups to list and, depending on permissions show name as enabled or disabled. @@ -90,7 +93,7 @@ if ($data['form'] === 'update') { foreach ($data['groupsAll'] as $group) { if (isset($data['groupIds'][$group['groupid']])) { - $groupsTB->addItem($group['groupid'], $group['name'], true, + $groups_tweenbox->addItem($group['groupid'], $group['name'], true, isset($data['groupsAllowed'][$group['groupid']]) ); $groupsInList[] = $group['groupid']; @@ -100,7 +103,7 @@ if ($data['form'] === 'update') { // Add other host groups that user has permissions to, if not yet added to list. foreach ($data['groupsAllowed'] as $group) { if (!in_array($group['groupid'], $groupsInList)) { - $groupsTB->addItem($group['groupid'], $group['name']); + $groups_tweenbox->addItem($group['groupid'], $group['name']); } } } @@ -111,11 +114,13 @@ else { */ foreach ($data['groupsAllowed'] as $group) { - $groupsTB->addItem($group['groupid'], $group['name']); + $groups_tweenbox->addItem($group['groupid'], $group['name']); } } -$templateList->addRow(_('Groups'), $groupsTB->get(_('In groups'), _('Other groups'))); +$templateList->addRow((new CLabel(_('Groups'), 'groups_tweenbox'))->setAsteriskMark(), + $groups_tweenbox->get(_('In groups'), _('Other groups')) +); // FORM ITEM : new group text box [ ] $new_group = (new CTextBox('newgroup', $newgroup))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); diff --git a/frontends/php/include/views/configuration.template.list.php b/frontends/php/include/views/configuration.template.list.php index 179b3b48196..d28b7d30b96 100644 --- a/frontends/php/include/views/configuration.template.list.php +++ b/frontends/php/include/views/configuration.template.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.trigger.prototype.edit.php b/frontends/php/include/views/configuration.trigger.prototype.edit.php index 82de27c293c..1536f324314 100644 --- a/frontends/php/include/views/configuration.trigger.prototype.edit.php +++ b/frontends/php/include/views/configuration.trigger.prototype.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -57,9 +57,11 @@ $triggersFormList = new CFormList('triggersFormList'); if (!empty($data['templates'])) { $triggersFormList->addRow(_('Parent triggers'), $data['templates']); } -$triggersFormList->addRow(_('Name'), +$triggersFormList->addRow( + (new CLabel(_('Name'), 'description'))->setAsteriskMark(), (new CTextBox('description', $data['description'], $data['limited'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ) ->addRow(_('Severity'), new CSeverity(['name' => 'priority', 'value' => (int) $data['priority']])); @@ -98,7 +100,9 @@ $expression_row = [ $data['expression_field_name'], $data['expression_field_value'], ['readonly' => $data['expression_field_readonly']] - ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + )) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), $add_expression_button ]; @@ -155,7 +159,11 @@ elseif ($data['expression_constructor'] != IM_FORCED) { $expression_row[] = [BR(), $input_method_toggle]; } -$triggersFormList->addRow(_('Expression'), $expression_row, 'expression_row'); +$triggersFormList->addRow( + (new CLabel(_('Expression'), $data['expression_field_name']))->setAsteriskMark(), + $expression_row, + 'expression_row' +); // Append expression table to form list. if ($data['expression_constructor'] == IM_TREE) { @@ -294,7 +302,9 @@ $recovery_expression_row = [ $data['recovery_expression_field_name'], $data['recovery_expression_field_value'], ['readonly' => $data['recovery_expression_field_readonly']] - ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + )) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), $add_recovery_expression_button ]; @@ -343,7 +353,10 @@ elseif ($data['recovery_expression_constructor'] != IM_FORCED) { $recovery_expression_row[] = [BR(), $input_method_toggle]; } -$triggersFormList->addRow(_('Recovery expression'), $recovery_expression_row, null, +$triggersFormList->addRow( + (new CLabel(_('Recovery expression'), $data['recovery_expression_field_name']))->setAsteriskMark(), + $recovery_expression_row, + null, 'recovery_expression_constructor_row' ); @@ -470,9 +483,11 @@ $triggersFormList ->setEnabled(!$data['limited']), 'correlation_mode_row' ) - ->addRow(_('Tag for matching'), + ->addRow( + (new CLabel(_('Tag for matching'), 'correlation_tag'))->setAsteriskMark(), (new CTextBox('correlation_tag', $data['correlation_tag'], $data['limited'])) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'correlation_tag_row' ); diff --git a/frontends/php/include/views/configuration.trigger.prototype.list.php b/frontends/php/include/views/configuration.trigger.prototype.list.php index 7418f0574fb..dd9ac715247 100644 --- a/frontends/php/include/views/configuration.trigger.prototype.list.php +++ b/frontends/php/include/views/configuration.trigger.prototype.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.trigger.prototype.massupdate.php b/frontends/php/include/views/configuration.trigger.prototype.massupdate.php index f99376bd900..a1ea62b68b8 100644 --- a/frontends/php/include/views/configuration.trigger.prototype.massupdate.php +++ b/frontends/php/include/views/configuration.trigger.prototype.massupdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.triggers.edit.php b/frontends/php/include/views/configuration.triggers.edit.php index b3a85c14eab..f4d44156843 100644 --- a/frontends/php/include/views/configuration.triggers.edit.php +++ b/frontends/php/include/views/configuration.triggers.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -75,9 +75,11 @@ if ($discovered_trigger) { )); } -$triggersFormList->addRow(_('Name'), +$triggersFormList->addRow( + (new CLabel(_('Name'), 'description'))->setAsteriskMark(), (new CTextBox('description', $data['description'], $readonly)) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ); @@ -117,7 +119,9 @@ $expression_row = [ $data['expression_field_name'], $data['expression_field_value'], ['readonly' => $data['expression_field_readonly']] - ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + )) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('insert', ($data['expression_constructor'] == IM_TREE) ? _('Edit') : _('Add'))) ->addClass(ZBX_STYLE_BTN_GREY) @@ -176,7 +180,11 @@ elseif ($data['expression_constructor'] != IM_FORCED) { $expression_row[] = [BR(), $input_method_toggle]; } -$triggersFormList->addRow(_('Expression'), $expression_row, 'expression_row'); +$triggersFormList->addRow( + (new CLabel(_('Expression'), $data['expression_field_name']))->setAsteriskMark(), + $expression_row, + 'expression_row' +); // Append expression table to form list. if ($data['expression_constructor'] == IM_TREE) { @@ -309,7 +317,9 @@ $recovery_expression_row = [ $data['recovery_expression_field_name'], $data['recovery_expression_field_value'], ['readonly' => $data['recovery_expression_field_readonly']] - ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + )) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('insert', ($data['recovery_expression_constructor'] == IM_TREE) ? _('Edit') : _('Add'))) ->addClass(ZBX_STYLE_BTN_GREY) @@ -364,7 +374,10 @@ elseif ($data['recovery_expression_constructor'] != IM_FORCED) { $recovery_expression_row[] = [BR(), $input_method_toggle]; } -$triggersFormList->addRow(_('Recovery expression'), $recovery_expression_row, null, +$triggersFormList->addRow( + (new CLabel(_('Recovery expression'), $data['recovery_expression_field_name']))->setAsteriskMark(), + $recovery_expression_row, + null, 'recovery_expression_constructor_row' ); @@ -493,9 +506,11 @@ $triggersFormList ->setEnabled(!$readonly), 'correlation_mode_row' ) - ->addRow(_('Tag for matching'), + ->addRow( + (new CLabel(_('Tag for matching'), 'correlation_tag'))->setAsteriskMark(), (new CTextBox('correlation_tag', $data['correlation_tag'], $readonly)) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'correlation_tag_row' ); diff --git a/frontends/php/include/views/configuration.triggers.list.php b/frontends/php/include/views/configuration.triggers.list.php index 1f09839f1d6..d966ef86729 100644 --- a/frontends/php/include/views/configuration.triggers.list.php +++ b/frontends/php/include/views/configuration.triggers.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/configuration.triggers.massupdate.php b/frontends/php/include/views/configuration.triggers.massupdate.php index 3b2853af132..9d76e70abdc 100644 --- a/frontends/php/include/views/configuration.triggers.massupdate.php +++ b/frontends/php/include/views/configuration.triggers.massupdate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/general.browserwarning.php b/frontends/php/include/views/general.browserwarning.php index 5bb66092d24..fadab75007f 100644 --- a/frontends/php/include/views/general.browserwarning.php +++ b/frontends/php/include/views/general.browserwarning.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/general.login.php b/frontends/php/include/views/general.login.php index 6aa358867c3..2bd34b765c5 100644 --- a/frontends/php/include/views/general.login.php +++ b/frontends/php/include/views/general.login.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -63,7 +63,7 @@ global $ZBX_SERVER_NAME; ) ]))->addClass(ZBX_STYLE_SIGNIN_CONTAINER), (new CDiv([ - (new CLink(_('Help'), 'http://www.zabbix.com/documentation/3.4/')) + (new CLink(_('Help'), 'http://www.zabbix.com/documentation/4.0/')) ->setTarget('_blank') ->addClass(ZBX_STYLE_GREY) ->addClass(ZBX_STYLE_LINK_ALT), diff --git a/frontends/php/include/views/general.warning.php b/frontends/php/include/views/general.warning.php index 7823c4c03fe..b11de775d29 100644 --- a/frontends/php/include/views/general.warning.php +++ b/frontends/php/include/views/general.warning.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/hostmacros.php b/frontends/php/include/views/hostmacros.php index 5cbb5b25e85..6d3f4f2c91e 100644 --- a/frontends/php/include/views/hostmacros.php +++ b/frontends/php/include/views/hostmacros.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/inventory.host.list.php b/frontends/php/include/views/inventory.host.list.php index 687b433cc8f..907958f7659 100644 --- a/frontends/php/include/views/inventory.host.list.php +++ b/frontends/php/include/views/inventory.host.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/inventory.host.view.php b/frontends/php/include/views/inventory.host.view.php index c2d6ffa0f39..9d4582e676b 100644 --- a/frontends/php/include/views/inventory.host.view.php +++ b/frontends/php/include/views/inventory.host.view.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/js/adm.regexprs.edit.js.php b/frontends/php/include/views/js/adm.regexprs.edit.js.php index ca7653bacf2..99320cd3049 100644 --- a/frontends/php/include/views/js/adm.regexprs.edit.js.php +++ b/frontends/php/include/views/js/adm.regexprs.edit.js.php @@ -2,7 +2,9 @@ <?= (new CRow([ (new CComboBox('expressions[#{rowNum}][expression_type]', null, null, expression_type2str())) ->onChange('onChangeExpressionType(this, #{rowNum})'), - (new CTextBox('expressions[#{rowNum}][expression]', '', false, 255))->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH), + (new CTextBox('expressions[#{rowNum}][expression]', '', false, 255)) + ->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) + ->setAriaRequired(), (new CComboBox('expressions[#{rowNum}][exp_delimiter]', null, null, expressionDelimiters())) ->addStyle('display: none;'), new CCheckBox('expressions[#{rowNum}][case_sensitive]'), diff --git a/frontends/php/include/views/js/administration.general.iconmap.js.php b/frontends/php/include/views/js/administration.general.iconmap.js.php index c0ec6572555..620d0304182 100644 --- a/frontends/php/include/views/js/administration.general.iconmap.js.php +++ b/frontends/php/include/views/js/administration.general.iconmap.js.php @@ -1,37 +1,38 @@ <script type="text/x-jquery-tmpl" id="iconMapRowTPL"> -<tr class="sortable" id="iconmapidRow_#{iconmappingid}"> - <td class="<?= ZBX_STYLE_TD_DRAG_ICON ?>"> - <div class="<?= ZBX_STYLE_DRAG_ICON ?>"></div> - </td> - <td> - <span class="rowNum">#0:</span> - </td> - <td> - <select id="iconmap_mappings_#{iconmappingid}_inventory_link" name="iconmap[mappings][#{iconmappingid}][inventory_link]" autocomplete="off"> - <?php foreach ($this->data['inventoryList'] as $key => $value): ?> - <option value="<?= $key ?>"><?= $value ?></option> - <?php endforeach ?> - </select> - </td> - <td> - <input id="iconmap_mappings_#{iconmappingid}_expression" name="iconmap[mappings][#{iconmappingid}][expression]" value="" style="width: <?= ZBX_TEXTAREA_SMALL_WIDTH ?>px" maxlength="64" type="text" /> - </td> - <td> - <select class="mappingIcon" id="iconmap_mappings_#{iconmappingid}_iconid" name="iconmap[mappings][#{iconmappingid}][iconid]" autocomplete="off"> - <?php foreach ($this->data['iconList'] as $key => $value): ?> - <option value="<?= $key ?>"><?= $value ?></option> - <?php endforeach ?> - </select> - </td> - <td style="vertical-align: middle;"> - <?php reset($this->data['iconList']) ?> - <?php $iconid = key($this->data['iconList']) ?> - <img class="pointer preview" name="Preview" alt="Preview" src="imgstore.php?iconid=<?= $iconid ?>&width=24&height=24" data-image-full="imgstore.php?iconid=<?= $iconid ?>" border="0"> - </td> - <td class="<?= ZBX_STYLE_NOWRAP ?>"> - <button class="<?= ZBX_STYLE_BTN_LINK ?> removeMapping" type="button" id="remove" name="remove">Remove</button> - </td> -</tr> +<?= + (new CRow([ + (new CCol( + (new CDiv())->addClass(ZBX_STYLE_DRAG_ICON) + ))->addClass(ZBX_STYLE_TD_DRAG_ICON), + (new CSpan('#0:'))->addClass('rowNum'), + (new CComboBox('iconmap[mappings][#{iconmappingid}][inventory_link]', null, null, $data['inventoryList'])) + ->setId('iconmap_mappings_#{iconmappingid}_inventory_link') + ->setAttribute('autocomplete', 'off'), + (new CTextBox('iconmap[mappings][#{iconmappingid}][expression]', '', false, 64)) + ->setId('iconmap_mappings_#{iconmappingid}_expression') + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), + (new CComboBox('iconmap[mappings][#{iconmappingid}][iconid]', null, null, $data['iconList'])) + ->setId('iconmap_mappings_#{iconmappingid}_iconid') + ->addClass('mappingIcon') + ->setAttribute('autocomplete', 'off'), + (new CCol( + (new CImg('imgstore.php?iconid='.$data['default_imageid'].'&width='.ZBX_ICON_PREVIEW_WIDTH. + '&height='.ZBX_ICON_PREVIEW_HEIGHT, _('Preview')) + ) + ->setAttribute('data-image-full', 'imgstore.php?iconid='.$data['default_imageid']) + ->addClass(ZBX_STYLE_CURSOR_POINTER) + ->addClass('preview') + ))->addStyle('vertical-align: middle'), + (new CCol( + (new CButton('remove', _('Remove'))) + ->addClass(ZBX_STYLE_BTN_LINK) + ->addClass('remove_mapping') + ))->addClass(ZBX_STYLE_NOWRAP) + ])) + ->setId('iconmapidRow_#{iconmappingid}') + ->addClass('sortable') +?> </script> <script type="text/javascript"> jQuery(function($) { @@ -77,7 +78,7 @@ }); iconMapTable.find('tbody') - .on('click', '.removeMapping', function() { + .on('click', '.remove_mapping', function() { $(this).parent().parent().remove(); if (iconMapTable.find('tr.sortable').length < 2) { diff --git a/frontends/php/include/views/js/administration.general.valuemapping.edit.js.php b/frontends/php/include/views/js/administration.general.valuemapping.edit.js.php index 500086666dd..b2cfa52fc19 100644 --- a/frontends/php/include/views/js/administration.general.valuemapping.edit.js.php +++ b/frontends/php/include/views/js/administration.general.valuemapping.edit.js.php @@ -2,7 +2,9 @@ <?= (new CRow([ (new CTextBox('mappings[#{rowNum}][value]', '', false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), '⇒', - (new CTextBox('mappings[#{rowNum}][newvalue]', '', false, 64))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH), + (new CTextBox('mappings[#{rowNum}][newvalue]', '', false, 64)) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired(), (new CButton('mappings[#{rowNum}][remove]', _('Remove'))) ->addClass(ZBX_STYLE_BTN_LINK) ->addClass('element-table-remove') diff --git a/frontends/php/include/views/js/configuration.action.edit.js.php b/frontends/php/include/views/js/configuration.action.edit.js.php index becde0aa23d..17f75500477 100644 --- a/frontends/php/include/views/js/configuration.action.edit.js.php +++ b/frontends/php/include/views/js/configuration.action.edit.js.php @@ -407,7 +407,8 @@ 'class': 'multiselect', css: { width: '<?= ZBX_TEXTAREA_MEDIUM_WIDTH ?>px' - } + }, + 'aria-required': 'true' }); opCmdTarget.parent().append(opCmdTargetObject); diff --git a/frontends/php/include/views/js/configuration.discovery.edit.js.php b/frontends/php/include/views/js/configuration.discovery.edit.js.php index 5384523de3c..4912ebac7ff 100644 --- a/frontends/php/include/views/js/configuration.discovery.edit.js.php +++ b/frontends/php/include/views/js/configuration.discovery.edit.js.php @@ -28,109 +28,109 @@ ?> </script> <script type="text/x-jquery-tmpl" id="newDCheckTPL"> - <div id="new_check_form"> - <div class="<?= ZBX_STYLE_TABLE_FORMS_SEPARATOR ?>" style="min-width: <?= ZBX_TEXTAREA_STANDARD_WIDTH ?>px;"> - <table> - <tbody> - <tr> - <td><label for="type"><?= _('Check type') ?></label></td> - <td><select id="type" name="type"></select></td> - </tr> - <tr id="newCheckPortsRow"> - <td><label for="ports"><?= _('Port range') ?></label></td> - <td> - <input type="text" id="ports" name="ports" value="" - style="width: <?= ZBX_TEXTAREA_SMALL_WIDTH ?>px" maxlength="255"> - </td> - </tr> - <tr id="newCheckCommunityRow"> - <td><label for="snmp_community"><?= _('SNMP community') ?></label></td> - <td> - <input type="text" id="snmp_community" name="snmp_community" value="" - style="width: <?= ZBX_TEXTAREA_MEDIUM_WIDTH ?>px" maxlength="255"> - </td> - </tr> - <tr id="newCheckKeyRow"> - <td><label for="key_"><?= _('Key') ?></label></td> - <td> - <input type="text" id="key_" name="key_" value="" - style="width: <?= ZBX_TEXTAREA_MEDIUM_WIDTH ?>px" maxlength="255"> - </td> - </tr> - <tr id="new_check_snmp_oid_row"> - <td><label for="snmp_oid"><?= _('SNMP OID') ?></label></td> - <td> - <input type="text" id="snmp_oid" name="snmp_oid" value="" - style="width: <?= ZBX_TEXTAREA_MEDIUM_WIDTH ?>px" maxlength="512"> - </td> - </tr> - <tr id="newCheckContextRow"> - <td><label for="snmpv3_contextname"><?= _('Context name') ?></label></td> - <td> - <input type="text" id="snmpv3_contextname" name="snmpv3_contextname" value="" - style="width: <?= ZBX_TEXTAREA_MEDIUM_WIDTH ?>px" maxlength="255"> - </td> - </tr> - <tr id="newCheckSecNameRow"> - <td><label for="snmpv3_securityname"><?= _('Security name') ?></label></td> - <td> - <input type="text" id="snmpv3_securityname" name="snmpv3_securityname" value="" - style="width: <?= ZBX_TEXTAREA_MEDIUM_WIDTH ?>px" maxlength="64"> - </td> - </tr> - <tr id="newCheckSecLevRow"> - <td><label for="snmpv3_securitylevel"><?= _('Security level') ?></label></td> - <td> - <select id="snmpv3_securitylevel" name="snmpv3_securitylevel"> - <option value="0"><?= 'noAuthNoPriv' ?> </option> - <option value="1"><?= 'authNoPriv' ?> </option> - <option value="2"><?= 'authPriv' ?> </option> - </select> - </td> - </tr> - <?= (new CRow([ - _('Authentication protocol'), - (new CRadioButtonList('snmpv3_authprotocol', ITEM_AUTHPROTOCOL_MD5)) - ->addValue(_('MD5'), ITEM_AUTHPROTOCOL_MD5, 'snmpv3_authprotocol_'.ITEM_AUTHPROTOCOL_MD5) - ->addValue(_('SHA'), ITEM_AUTHPROTOCOL_SHA, 'snmpv3_authprotocol_'.ITEM_AUTHPROTOCOL_SHA) - ->setModern(true) - ])) - ->setId('newCheckAuthProtocolRow') - ->toString() - ?> - <tr id="newCheckAuthPassRow"> - <td><label for="snmpv3_authpassphrase"><?= _('Authentication passphrase') ?></label></td> - <td> - <input type="text" id="snmpv3_authpassphrase" name="snmpv3_authpassphrase" value="" - style="width: <?= ZBX_TEXTAREA_MEDIUM_WIDTH ?>px" maxlength="64"> - </td> - </tr> - <?= (new CRow([ - _('Privacy protocol'), - (new CRadioButtonList('snmpv3_privprotocol', ITEM_PRIVPROTOCOL_DES)) - ->addValue(_('DES'), ITEM_PRIVPROTOCOL_DES, 'snmpv3_privprotocol_'.ITEM_PRIVPROTOCOL_DES) - ->addValue(_('AES'), ITEM_PRIVPROTOCOL_AES, 'snmpv3_privprotocol_'.ITEM_PRIVPROTOCOL_AES) - ->setModern(true) - ])) - ->setId('newCheckPrivProtocolRow') - ->toString() - ?> - <tr id="newCheckPrivPassRow"> - <td><label for="snmpv3_privpassphrase"><?= _('Privacy passphrase') ?></label></td> - <td> - <input type="text" id="snmpv3_privpassphrase" name="snmpv3_privpassphrase" value="" - style="width: <?= ZBX_TEXTAREA_MEDIUM_WIDTH ?>px" maxlength="64"> - </td> - </tr> - </tbody> - </table> - <?= (new CHorList([ - (new CButton('add_new_dcheck', _('Add')))->addClass(ZBX_STYLE_BTN_LINK), - (new CButton('cancel_new_dcheck', _('Cancel')))->addClass(ZBX_STYLE_BTN_LINK) - ]))->toString() - ?> - </div> - </div> +<?= + (new CDiv( + (new CDiv([ + (new CFormList()) + ->addRow( + (new CLabel(_('Check type'), 'type')), + (new CComboBox('type')) + ) + ->addRow( + (new CLabel(_('Port range'), 'ports'))->setAsteriskMark(), + (new CTextBox('ports')) + ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH) + ->setAriaRequired() + ->setAttribute('maxlength', 255), + 'newCheckPortsRow' + ) + ->addRow( + (new CLabel(_('SNMP community'), 'snmp_community'))->setAsteriskMark(), + (new CTextBox('snmp_community')) + ->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) + ->setAriaRequired() + ->setAttribute('maxlength', 255), + 'newCheckCommunityRow' + ) + ->addRow( + (new CLabel(_('Key'), 'key_'))->setAsteriskMark(), + (new CTextBox('key_')) + ->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) + ->setAriaRequired() + ->setAttribute('maxlength', 255), + 'newCheckKeyRow' + ) + ->addRow( + (new CLabel(_('SNMP OID'), 'snmp_oid'))->setAsteriskMark(), + (new CTextBox('snmp_oid')) + ->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) + ->setAriaRequired() + ->setAttribute('maxlength', 512), + 'new_check_snmp_oid_row' + ) + ->addRow( + (new CLabel(_('Context name'), 'snmpv3_contextname')), + (new CTextBox('snmpv3_contextname')) + ->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) + ->setAttribute('maxlength', 255), + 'newCheckContextRow' + ) + ->addRow( + (new CLabel(_('Security name'), 'snmpv3_securityname')), + (new CTextBox('snmpv3_securityname')) + ->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) + ->setAttribute('maxlength', 64), + 'newCheckSecNameRow' + ) + ->addRow( + new CLabel(_('Security level'), 'snmpv3_securitylevel'), + new CComboBox('snmpv3_securitylevel', null, null, [ + ITEM_SNMPV3_SECURITYLEVEL_NOAUTHNOPRIV => 'noAuthNoPriv', + ITEM_SNMPV3_SECURITYLEVEL_AUTHNOPRIV => 'authNoPriv', + ITEM_SNMPV3_SECURITYLEVEL_AUTHPRIV => 'authPriv' + ]), + 'newCheckSecLevRow' + ) + ->addRow( + (new CLabel(_('Authentication protocol'), 'snmpv3_authprotocol')), + (new CRadioButtonList('snmpv3_authprotocol', ITEM_AUTHPROTOCOL_MD5)) + ->addValue(_('MD5'), ITEM_AUTHPROTOCOL_MD5, 'snmpv3_authprotocol_'.ITEM_AUTHPROTOCOL_MD5) + ->addValue(_('SHA'), ITEM_AUTHPROTOCOL_SHA, 'snmpv3_authprotocol_'.ITEM_AUTHPROTOCOL_SHA) + ->setModern(true), + 'newCheckAuthProtocolRow' + ) + ->addRow( + (new CLabel(_('Authentication passphrase'), 'snmpv3_authpassphrase')), + (new CTextBox('snmpv3_authpassphrase')) + ->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) + ->setAttribute('maxlength', 64), + 'newCheckAuthPassRow' + ) + ->addRow( + (new CLabel(_('Privacy protocol'), 'snmpv3_privprotocol')), + (new CRadioButtonList('snmpv3_privprotocol', ITEM_PRIVPROTOCOL_DES)) + ->addValue(_('DES'), ITEM_PRIVPROTOCOL_DES, 'snmpv3_privprotocol_'.ITEM_PRIVPROTOCOL_DES) + ->addValue(_('AES'), ITEM_PRIVPROTOCOL_AES, 'snmpv3_privprotocol_'.ITEM_PRIVPROTOCOL_AES) + ->setModern(true), + 'newCheckPrivProtocolRow' + ) + ->addRow( + (new CLabel(_('Privacy passphrase'), 'snmpv3_privpassphrase'))->setAsteriskMark(), + (new CTextBox('snmpv3_privpassphrase')) + ->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) + ->setAriaRequired() + ->setAttribute('maxlength', 64), + 'newCheckPrivPassRow' + ), + (new CHorList([ + (new CButton('add_new_dcheck', _('Add')))->addClass(ZBX_STYLE_BTN_LINK), + (new CButton('cancel_new_dcheck', _('Cancel')))->addClass(ZBX_STYLE_BTN_LINK) + ])) + ])) + ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) + ->addStyle('min-width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px') + ))->setId('new_check_form') +?> </script> <script type="text/javascript"> var ZBX_SVC = { diff --git a/frontends/php/include/views/js/configuration.host.discovery.edit.js.php b/frontends/php/include/views/js/configuration.host.discovery.edit.js.php index d5fea56541c..46cf63a5e45 100644 --- a/frontends/php/include/views/js/configuration.host.discovery.edit.js.php +++ b/frontends/php/include/views/js/configuration.host.discovery.edit.js.php @@ -79,6 +79,20 @@ include dirname(__FILE__).'/common.item.edit.js.php'; }); $('#evaltype').trigger('change'); + + $('#type').change(function() { + var type = parseInt($('#type').val()), + asterisk = '<?= ZBX_STYLE_FIELD_LABEL_ASTERISK ?>'; + + if (type == <?= ITEM_TYPE_SSH ?> || type == <?= ITEM_TYPE_TELNET ?>) { + $('label[for=username]').addClass(asterisk); + $('input[name=username]').attr('aria-required', 'true'); + } + else { + $('label[for=username]').removeClass(asterisk); + $('input[name=username]').removeAttr('aria-required'); + } + }).trigger('change'); }); })(jQuery); </script> diff --git a/frontends/php/include/views/js/configuration.host.edit.js.php b/frontends/php/include/views/js/configuration.host.edit.js.php index 9d284d7cfca..56c85144bd0 100644 --- a/frontends/php/include/views/js/configuration.host.edit.js.php +++ b/frontends/php/include/views/js/configuration.host.edit.js.php @@ -34,7 +34,10 @@ ))->toString() ?> <td class="interface-port"> - <input name="interfaces[#{iface.interfaceid}][port]" type="text" style="width: <?= ZBX_TEXTAREA_INTERFACE_PORT_WIDTH ?>px" maxlength="64" value="#{iface.port}"> + <?= (new CTextBox('interfaces[#{iface.interfaceid}][port]', '#{iface.port}', false, 64)) + ->setWidth(ZBX_TEXTAREA_INTERFACE_PORT_WIDTH) + ->setAriaRequired() + ?> </td> <td class="interface-default"> <input class="mainInterface <?= ZBX_STYLE_CHECKBOX_RADIO ?>" type="radio" id="interface_main_#{iface.interfaceid}" name="mainInterfaces[#{iface.type}]" value="#{iface.interfaceid}"> @@ -72,7 +75,8 @@ jQuery('.interface-bulk', domRow).remove(); } - jQuery('#interfaces_' + hostInterface.interfaceid + '_useip_' + hostInterface.useip).prop('checked', true); + jQuery('#interfaces_' + hostInterface.interfaceid + '_useip_' + hostInterface.useip).prop('checked', true) + .trigger('click'); if (hostInterface.locked > 0) { addNotDraggableIcon(domRow); @@ -338,6 +342,12 @@ jQuery('#hostlist').on('click', 'input[type=radio][id*="_useip_"]', function() { var interfaceId = jQuery(this).attr('id').match(/\d+/); hostInterfacesManager.setUseipForInterface(interfaceId[0], jQuery(this).val()); + + jQuery('[name^="interfaces['+interfaceId[0]+']["]') + .filter('[name$="[ip]"],[name$="[dns]"]') + .removeAttr('aria-required') + .filter((jQuery(this).val() == <?= INTERFACE_USE_IP ?>) ? '[name$="[ip]"]' : '[name$="[dns]"]') + .attr('aria-required', true); }); jQuery('#tls_connect, #tls_in_psk, #tls_in_cert').change(function() { diff --git a/frontends/php/include/views/js/configuration.item.edit.js.php b/frontends/php/include/views/js/configuration.item.edit.js.php index fe6aac76e3e..51e41471aa4 100644 --- a/frontends/php/include/views/js/configuration.item.edit.js.php +++ b/frontends/php/include/views/js/configuration.item.edit.js.php @@ -32,41 +32,51 @@ zbx_subarray_push($this->data['valueTypeVisibility'], ITEM_VALUE_TYPE_UINT64, 'i zbx_subarray_push($this->data['valueTypeVisibility'], ITEM_VALUE_TYPE_UINT64, 'row_inventory_link'); ?> <script type="text/javascript"> - function displayKeyButton() { - // selected item type - var type = parseInt(jQuery('#type').val()); + jQuery(document).ready(function($) { + function typeChangeHandler() { + // selected item type + var type = parseInt($('#type').val()), + asterisk = '<?= ZBX_STYLE_FIELD_LABEL_ASTERISK ?>'; - jQuery('#keyButton').prop('disabled', - type != <?php echo ITEM_TYPE_ZABBIX; ?> - && type != <?php echo ITEM_TYPE_ZABBIX_ACTIVE; ?> - && type != <?php echo ITEM_TYPE_SIMPLE; ?> - && type != <?php echo ITEM_TYPE_INTERNAL; ?> - && type != <?php echo ITEM_TYPE_AGGREGATE; ?> - && type != <?php echo ITEM_TYPE_DB_MONITOR; ?> - && type != <?php echo ITEM_TYPE_SNMPTRAP; ?> - && type != <?php echo ITEM_TYPE_JMX; ?> - ) - } + $('#keyButton').prop('disabled', + type != <?= ITEM_TYPE_ZABBIX ?> + && type != <?= ITEM_TYPE_ZABBIX_ACTIVE ?> + && type != <?= ITEM_TYPE_SIMPLE ?> + && type != <?= ITEM_TYPE_INTERNAL ?> + && type != <?= ITEM_TYPE_AGGREGATE ?> + && type != <?= ITEM_TYPE_DB_MONITOR ?> + && type != <?= ITEM_TYPE_SNMPTRAP ?> + && type != <?= ITEM_TYPE_JMX ?> + ) + + if ((type == <?= ITEM_TYPE_SSH ?> || type == <?= ITEM_TYPE_TELNET ?>)) { + $('label[for=username]').addClass(asterisk); + $('input[name=username]').attr('aria-required', 'true'); + } + else { + $('label[for=username]').removeClass(asterisk); + $('input[name=username]').removeAttr('aria-required'); + } + } - jQuery(document).ready(function() { // field switchers <?php if (!empty($this->data['valueTypeVisibility'])) { ?> var valueTypeSwitcher = new CViewSwitcher('value_type', 'change', - <?php echo zbx_jsvalue($this->data['valueTypeVisibility'], true); ?>); + <?= zbx_jsvalue($this->data['valueTypeVisibility'], true) ?>); <?php } ?> - jQuery('#type').change(function() { - displayKeyButton(); + $('#type').change(function() { + typeChangeHandler(); }) .trigger('change'); // Whenever non-numeric type is changed back to numeric type, set the default value in "trends" field. - jQuery('#value_type').on('focus', function () { - old_value = jQuery(this).val(); + $('#value_type').on('focus', function () { + old_value = $(this).val(); }).change(function() { - var new_value = jQuery(this).val(), - trends = jQuery('#trends'); + var new_value = $(this).val(), + trends = $('#trends'); if ((old_value == <?= ITEM_VALUE_TYPE_STR ?> || old_value == <?= ITEM_VALUE_TYPE_LOG ?> || old_value == <?= ITEM_VALUE_TYPE_TEXT ?>) diff --git a/frontends/php/include/views/js/configuration.item.prototype.edit.js.php b/frontends/php/include/views/js/configuration.item.prototype.edit.js.php index df7aa5ae5f8..402b072978e 100644 --- a/frontends/php/include/views/js/configuration.item.prototype.edit.js.php +++ b/frontends/php/include/views/js/configuration.item.prototype.edit.js.php @@ -24,42 +24,52 @@ zbx_subarray_push($this->data['valueTypeVisibility'], ITEM_VALUE_TYPE_UINT64, 'r zbx_subarray_push($this->data['valueTypeVisibility'], ITEM_VALUE_TYPE_UINT64, 'valuemap_name'); ?> <script type="text/javascript"> - function displayKeyButton() { - // selected item type - var type = parseInt(jQuery('#type').val()); + jQuery(document).ready(function($) { + function typeChangeHandler() { + // selected item type + var type = parseInt($('#type').val()), + asterisk = '<?= ZBX_STYLE_FIELD_LABEL_ASTERISK ?>'; - jQuery('#keyButton').prop('disabled', - type != <?php echo ITEM_TYPE_ZABBIX; ?> - && type != <?php echo ITEM_TYPE_ZABBIX_ACTIVE; ?> - && type != <?php echo ITEM_TYPE_SIMPLE; ?> - && type != <?php echo ITEM_TYPE_INTERNAL; ?> - && type != <?php echo ITEM_TYPE_AGGREGATE; ?> - && type != <?php echo ITEM_TYPE_DB_MONITOR; ?> - && type != <?php echo ITEM_TYPE_SNMPTRAP; ?> - && type != <?php echo ITEM_TYPE_JMX; ?> - ) - } + $('#keyButton').prop('disabled', + type != <?= ITEM_TYPE_ZABBIX ?> + && type != <?= ITEM_TYPE_ZABBIX_ACTIVE ?> + && type != <?= ITEM_TYPE_SIMPLE ?> + && type != <?= ITEM_TYPE_INTERNAL ?> + && type != <?= ITEM_TYPE_AGGREGATE ?> + && type != <?= ITEM_TYPE_DB_MONITOR ?> + && type != <?= ITEM_TYPE_SNMPTRAP ?> + && type != <?= ITEM_TYPE_JMX ?> + ) + + if (type == <?= ITEM_TYPE_SSH ?> || type == <?= ITEM_TYPE_TELNET ?>) { + $('label[for=username]').addClass(asterisk); + $('input[name=username]').attr('aria-required', 'true'); + } + else { + $('label[for=username]').removeClass(asterisk); + $('input[name=username]').removeAttr('aria-required'); + } + } - jQuery(document).ready(function() { // field switchers <?php if (!empty($this->data['valueTypeVisibility'])) { ?> var valueTypeSwitcher = new CViewSwitcher('value_type', 'change', - <?php echo zbx_jsvalue($this->data['valueTypeVisibility'], true); ?>); + <?= zbx_jsvalue($this->data['valueTypeVisibility'], true) ?>); <?php } ?> - jQuery('#type') + $('#type') .change(function() { - displayKeyButton(); + typeChangeHandler(); }) .trigger('change'); // Whenever non-numeric type is changed back to numeric type, set the default value in "trends" field. - jQuery('#value_type').on('focus', function () { - old_value = jQuery(this).val(); + $('#value_type').on('focus', function () { + old_value = $(this).val(); }).change(function() { - var new_value = jQuery(this).val(), - trends = jQuery('#trends'); + var new_value = $(this).val(), + trends = $('#trends'); if ((old_value == <?= ITEM_VALUE_TYPE_STR ?> || old_value == <?= ITEM_VALUE_TYPE_LOG ?> || old_value == <?= ITEM_VALUE_TYPE_TEXT ?>) diff --git a/frontends/php/include/views/js/monitoring.sysmaps.js.php b/frontends/php/include/views/js/monitoring.sysmaps.js.php index b705abb060b..03a5b1648d2 100644 --- a/frontends/php/include/views/js/monitoring.sysmaps.js.php +++ b/frontends/php/include/views/js/monitoring.sysmaps.js.php @@ -123,21 +123,23 @@ function getFontComboBox($name) { MAP_LABEL_LOC_TOP => _('Top') ]) ) - ->addRow(_('Host group'), + ->addRow((new CLabel(_('Host group'), 'elementNameHostGroup'))->setAsteriskMark(), (new CMultiSelect([ 'name' => 'elementNameHostGroup', 'objectName' => 'hostGroup' - ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'hostGroupSelectRow' ) - ->addRow(_('Host'), + ->addRow((new CLabel(_('Host'), 'elementNameHost'))->setAsteriskMark(), (new CMultiSelect([ 'name' => 'elementNameHost', 'objectName' => 'hosts' - ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), 'hostSelectRow' ) - ->addRow(_('Triggers'), [ + ->addRow((new CLabel(_('Triggers'), 'triggerContainer'))->setAsteriskMark(), [ (new CDiv([ (new CTable()) ->setHeader(['', _('Name'), (new CColHeader(_('Action')))->addStyle('padding: 0 5px;')]) @@ -166,7 +168,8 @@ function getFontComboBox($name) { 'srcfld1' => 'triggerid', 'with_triggers' => '1', 'real_hosts' => '1', - 'multiselect' => '1' + 'multiselect' => '1', + 'noempty' => '1' ] ] ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), @@ -179,11 +182,12 @@ function getFontComboBox($name) { ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;'), 'triggerSelectRow' ) - ->addRow(_('Map'), [ + ->addRow((new CLabel(_('Map'), 'elementName'))->setAsteriskMark(), [ (new CTextBox('elementName')) ->setReadonly(true) ->setId('elementNameMap') - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CVar('elements[0][sysmapid]', 0, 'sysmapid')), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton(null, _('Select'))) diff --git a/frontends/php/include/views/monitoring.charts.php b/frontends/php/include/views/monitoring.charts.php index 37cd4edadd1..463be004773 100644 --- a/frontends/php/include/views/monitoring.charts.php +++ b/frontends/php/include/views/monitoring.charts.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.history.php b/frontends/php/include/views/monitoring.history.php index 368a83529bf..905c724fb87 100644 --- a/frontends/php/include/views/monitoring.history.php +++ b/frontends/php/include/views/monitoring.history.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.hostscreen.php b/frontends/php/include/views/monitoring.hostscreen.php index 7b731443c58..0092e13c691 100644 --- a/frontends/php/include/views/monitoring.hostscreen.php +++ b/frontends/php/include/views/monitoring.hostscreen.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.overview.items.php b/frontends/php/include/views/monitoring.overview.items.php index a30babd49c2..c0d79a5ec75 100644 --- a/frontends/php/include/views/monitoring.overview.items.php +++ b/frontends/php/include/views/monitoring.overview.items.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.overview.triggers.php b/frontends/php/include/views/monitoring.overview.triggers.php index 686a944caa2..c8a70c74e22 100644 --- a/frontends/php/include/views/monitoring.overview.triggers.php +++ b/frontends/php/include/views/monitoring.overview.triggers.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.screen.constructor.edit.php b/frontends/php/include/views/monitoring.screen.constructor.edit.php index 02ec22ecd6e..063683ce7f6 100644 --- a/frontends/php/include/views/monitoring.screen.constructor.edit.php +++ b/frontends/php/include/views/monitoring.screen.constructor.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -92,7 +92,9 @@ if ($this->data['screen']['templateid']) { } $screenFormList = (new CFormList()) - ->addRow(_('Resource'), new CComboBox('resourcetype', $resourceType, 'submit()', $screenResources)); + ->addRow((new CLabel(_('Resource'), 'resourcetype')), + (new CComboBox('resourcetype', $resourceType, 'submit()', $screenResources)) + ); /* * Screen item: Graph @@ -150,8 +152,10 @@ if ($resourceType == SCREEN_RESOURCE_GRAPH) { } $form->addVar('resourceid', $id); - $screenFormList->addRow(_('Graph'), [ - (new CTextBox('caption', $caption, true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + $screenFormList->addRow((new CLabel(_('Graph'), 'caption'))->setAsteriskMark(), [ + (new CTextBox('caption', $caption, true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), $selectButton ]); @@ -213,14 +217,18 @@ elseif ($resourceType == SCREEN_RESOURCE_LLD_GRAPH) { } $form->addVar('resourceid', $id); - $screenFormList->addRow(_('Graph prototype'), [ - (new CTextBox('caption', $caption, true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + $screenFormList->addRow((new CLabel(_('Graph prototype'), 'caption'))->setAsteriskMark(), [ + (new CTextBox('caption', $caption, true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), $selectButton ]); - $screenFormList->addRow(_('Max columns'), + $screenFormList->addRow( + (new CLabel(_('Max columns'), 'max_columns'))->setAsteriskMark(), (new CNumericBox('max_columns', $maxColumns, 3, false, false, false)) + ->setAriaRequired() ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ); } @@ -284,8 +292,10 @@ elseif ($resourceType == SCREEN_RESOURCE_SIMPLE_GRAPH) { } $form->addVar('resourceid', $id); - $screenFormList->addRow(_('Item'), [ - (new CTextBox('caption', $caption, true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + $screenFormList->addRow((new CLabel(_('Item'), 'caption'))->setAsteriskMark(), [ + (new CTextBox('caption', $caption, true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), $selectButton ]); @@ -351,14 +361,18 @@ elseif ($resourceType == SCREEN_RESOURCE_LLD_SIMPLE_GRAPH) { } $form->addVar('resourceid', $id); - $screenFormList->addRow(_('Item prototype'), [ - (new CTextBox('caption', $caption, true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + $screenFormList->addRow((new CLabel(_('Item prototype'), 'caption'))->setAsteriskMark(), [ + (new CTextBox('caption', $caption, true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), $selectButton ]); - $screenFormList->addRow(_('Max columns'), + $screenFormList->addRow( + (new CLabel(_('Max columns'), 'max_columns'))->setAsteriskMark(), (new CNumericBox('max_columns', $maxColumns, 3, false, false, false)) + ->setAriaRequired() ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ); } @@ -381,8 +395,10 @@ elseif ($resourceType == SCREEN_RESOURCE_MAP) { } $form->addVar('resourceid', $id); - $screenFormList->addRow(_('Map'), [ - (new CTextBox('caption', $caption, true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + $screenFormList->addRow((new CLabel(_('Map'), 'caption'))->setAsteriskMark(), [ + (new CTextBox('caption', $caption, true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('select', _('Select'))) ->addClass(ZBX_STYLE_BTN_GREY) @@ -456,13 +472,17 @@ elseif ($resourceType == SCREEN_RESOURCE_PLAIN_TEXT) { } $screenFormList - ->addRow(_('Item'), [ - (new CTextBox('caption', $caption, true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + ->addRow((new CLabel(_('Item'), 'caption'))->setAsteriskMark(), [ + (new CTextBox('caption', $caption, true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), $selectButton ]) - ->addRow(_('Show lines'), - (new CNumericBox('elements', $elements, 3))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->addRow((new CLabel(_('Show lines'), 'elements'))->setAsteriskMark(), + (new CNumericBox('elements', $elements, 3)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ) ->addRow(_('Show text as HTML'), (new CCheckBox('style'))->setChecked($style == 1)); } @@ -532,8 +552,11 @@ elseif (in_array($resourceType, [SCREEN_RESOURCE_HOSTGROUP_TRIGGERS, SCREEN_RESO ); } - $screenFormList->addRow(_('Show lines'), - (new CNumericBox('elements', $elements, 3))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + $screenFormList->addRow( + (new CLabel(_('Show lines'), 'elements'))->setAsteriskMark(), + (new CNumericBox('elements', $elements, 3)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ); $screenFormList->addRow( _('Sort triggers by'), @@ -549,8 +572,11 @@ elseif (in_array($resourceType, [SCREEN_RESOURCE_HOSTGROUP_TRIGGERS, SCREEN_RESO * Screen item: Action log */ elseif ($resourceType == SCREEN_RESOURCE_ACTIONS) { - $screenFormList->addRow(_('Show lines'), - (new CNumericBox('elements', $elements, 3))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + $screenFormList->addRow( + (new CLabel(_('Show lines'), 'elements'))->setAsteriskMark(), + (new CNumericBox('elements', $elements, 3)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ); $screenFormList->addRow( _('Sort entries by'), @@ -571,8 +597,11 @@ elseif ($resourceType == SCREEN_RESOURCE_ACTIONS) { * Screen item: History of events */ elseif ($resourceType == SCREEN_RESOURCE_EVENTS) { - $screenFormList->addRow(_('Show lines'), - (new CNumericBox('elements', $elements, 3))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + $screenFormList->addRow( + (new CLabel(_('Show lines'), 'elements'))->setAsteriskMark(), + (new CNumericBox('elements', $elements, 3)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ); $form->addVar('resourceid', 0); } @@ -594,7 +623,7 @@ elseif (in_array($resourceType, [SCREEN_RESOURCE_TRIGGER_OVERVIEW, SCREEN_RESOUR } } - $screenFormList->addRow(_('Group'), + $screenFormList->addRow((new CLabel(_('Group'), 'resourceid'))->setAsteriskMark(), (new CMultiSelect([ 'name' => 'resourceid', 'objectName' => 'hostGroup', @@ -608,7 +637,9 @@ elseif (in_array($resourceType, [SCREEN_RESOURCE_TRIGGER_OVERVIEW, SCREEN_RESOUR 'srcfld1' => 'groupid' ] ] - ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ])) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ); $screenFormList->addRow(_('Application'), (new CTextBox('application', $application, false, 255))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) @@ -643,8 +674,10 @@ elseif ($resourceType == SCREEN_RESOURCE_SCREEN) { } $form->addVar('resourceid', $id); - $screenFormList->addRow(_('Screen'), [ - (new CTextBox('caption', $caption, true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + $screenFormList->addRow((new CLabel(_('Screen'), 'caption'))->setAsteriskMark(), [ + (new CTextBox('caption', $caption, true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), (new CButton('select', _('Select'))) ->addClass(ZBX_STYLE_BTN_GREY) @@ -720,10 +753,10 @@ elseif ($resourceType == SCREEN_RESOURCE_CLOCK) { } $screenFormList->addRow(_('Time type'), new CComboBox('style', $style, 'submit()', [ - TIME_TYPE_LOCAL => _('Local time'), - TIME_TYPE_SERVER => _('Server time'), - TIME_TYPE_HOST => _('Host time') - ])); + TIME_TYPE_LOCAL => _('Local time'), + TIME_TYPE_SERVER => _('Server time'), + TIME_TYPE_HOST => _('Host time') + ])); if (TIME_TYPE_HOST == $style) { $form->addVar('resourceid', $resourceId); @@ -759,8 +792,10 @@ elseif ($resourceType == SCREEN_RESOURCE_CLOCK) { ]).');' ); } - $screenFormList->addRow(_('Item'), [ - (new CTextBox('caption', $caption, true))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH), + $screenFormList->addRow((new CLabel(_('Item'), 'caption'))->setAsteriskMark(), [ + (new CTextBox('caption', $caption, true)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(), (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN), $selectButton ]); @@ -794,7 +829,9 @@ elseif ($resourceType != SCREEN_RESOURCE_CLOCK) { } if (in_array($resourceType, [SCREEN_RESOURCE_URL])) { - $screenFormList->addRow(_('URL'), (new CTextBox('url', $url))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)); + $screenFormList->addRow((new CLabel(_('URL'), 'url'))->setAsteriskMark(), + (new CTextBox('url', $url))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)->setAriaRequired() + ); } else { $form->addVar('url', ''); @@ -851,11 +888,17 @@ $screenFormList->addRow(_('Vertical align'), ->addValue(_('Bottom'), VALIGN_BOTTOM) ->setModern(true) ); -$screenFormList->addRow(_('Column span'), - (new CNumericBox('colspan', $colspan, 3))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) +$screenFormList->addRow( + (new CLabel(_('Column span'), 'colspan'))->setAsteriskMark(), + (new CNumericBox('colspan', $colspan, 3)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ); -$screenFormList->addRow(_('Row span'), - (new CNumericBox('rowspan', $rowspan, 3))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) +$screenFormList->addRow( + (new CLabel(_('Row span'), 'rowspan'))->setAsteriskMark(), + (new CNumericBox('rowspan', $rowspan, 3)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) ); // dynamic addon diff --git a/frontends/php/include/views/monitoring.screen.constructor.list.php b/frontends/php/include/views/monitoring.screen.constructor.list.php index 111cc4d1d3e..fb364b36adb 100644 --- a/frontends/php/include/views/monitoring.screen.constructor.list.php +++ b/frontends/php/include/views/monitoring.screen.constructor.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.screen.edit.php b/frontends/php/include/views/monitoring.screen.edit.php index eb9ff87be0b..60a9d58f84f 100644 --- a/frontends/php/include/views/monitoring.screen.edit.php +++ b/frontends/php/include/views/monitoring.screen.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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,16 +91,21 @@ if (!$data['screen']['templateid']) { $multiselect_data['data'] = $owner_data; // Append multiselect to screen tab. - $screen_tab->addRow(_('Owner'), - (new CMultiSelect($multiselect_data))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + $screen_tab->addRow((new CLabel(_('Owner'), 'userid'))->setAsteriskMark(), + (new CMultiSelect($multiselect_data)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ); } else { - $multiselect_userid = (new CMultiSelect($multiselect_data))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); + $multiselect_userid = (new CMultiSelect($multiselect_data)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(); // Administrators can change screen owner, but cannot see users from other groups. if ($user_type == USER_TYPE_ZABBIX_ADMIN) { - $screen_tab->addRow(_('Owner'), $multiselect_userid) + $screen_tab + ->addRow((new CLabel(_('Owner'), 'userid'))->setAsteriskMark(), $multiselect_userid) ->addRow('', _('Inaccessible user'), 'inaccessible_user'); } else { @@ -115,16 +120,22 @@ if (!$data['screen']['templateid']) { } } -$screen_tab->addRow(_('Name'), +$screen_tab->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $data['screen']['name'])) - ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) - ->setAttribute('autofocus', 'autofocus') + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() + ->setAttribute('autofocus', 'autofocus') ) - ->addRow(_('Columns'), - (new CNumericBox('hsize', $data['screen']['hsize'], 3))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->addRow((new CLabel(_('Columns'), 'hsize'))->setAsteriskMark(), + (new CNumericBox('hsize', $data['screen']['hsize'], 3)) + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Rows'), - (new CNumericBox('vsize', $data['screen']['vsize'], 3))->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->addRow((new CLabel(_('Rows'), 'vsize'))->setAsteriskMark(), + (new CNumericBox('vsize', $data['screen']['vsize'], 3)) + ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired() ); // append tab to form diff --git a/frontends/php/include/views/monitoring.screen.list.php b/frontends/php/include/views/monitoring.screen.list.php index 659ab168ca1..8bb74351ce3 100644 --- a/frontends/php/include/views/monitoring.screen.list.php +++ b/frontends/php/include/views/monitoring.screen.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.screen.php b/frontends/php/include/views/monitoring.screen.php index 90a69b12901..933b5bc88dc 100644 --- a/frontends/php/include/views/monitoring.screen.php +++ b/frontends/php/include/views/monitoring.screen.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.slideconf.edit.php b/frontends/php/include/views/monitoring.slideconf.edit.php index fd8d7220195..7ab09294a84 100644 --- a/frontends/php/include/views/monitoring.slideconf.edit.php +++ b/frontends/php/include/views/monitoring.slideconf.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -81,8 +81,11 @@ if ($slideshow_ownerid === '' || $slideshow_ownerid && array_key_exists($slidesh $multiselect_data['data'] = $owner_data; // Append multiselect to slide show tab. - $slideshow_tab->addRow(_('Owner'), - (new CMultiSelect($multiselect_data))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + $slideshow_tab->addRow( + (new CLabel(_('Owner'), 'userid'))->setAsteriskMark(), + (new CMultiSelect($multiselect_data)) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ); } else { @@ -106,13 +109,18 @@ else { } $slideshow_tab - ->addRow(_('Name'), + ->addRow( + (new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $data['slideshow']['name'])) + ->setAriaRequired() ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setAttribute('autofocus', 'autofocus') ) - ->addRow(_('Default delay'), - (new CTextBox('delay', $data['slideshow']['delay']))->setWidth(ZBX_TEXTAREA_TINY_WIDTH) + ->addRow( + (new CLabel(_('Default delay'), 'delay'))->setAsteriskMark(), + (new CTextBox('delay', $data['slideshow']['delay'])) + ->setAriaRequired() + ->setWidth(ZBX_TEXTAREA_TINY_WIDTH) ); // append slide table @@ -170,7 +178,8 @@ $addButtonColumn = (new CCol( $addButtonColumn->setAttribute('style', 'vertical-align: middle;'); $slideTable->addRow((new CRow($addButtonColumn))->setId('screenListFooter')); -$slideshow_tab->addRow(_('Slides'), +$slideshow_tab->addRow( + (new CLabel(_('Slides'), $slideTable->getId()))->setAsteriskMark(), (new CDiv($slideTable)) ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR) ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;') diff --git a/frontends/php/include/views/monitoring.slideconf.list.php b/frontends/php/include/views/monitoring.slideconf.list.php index d460d790b90..b124dc6f53c 100644 --- a/frontends/php/include/views/monitoring.slideconf.list.php +++ b/frontends/php/include/views/monitoring.slideconf.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.slides.php b/frontends/php/include/views/monitoring.slides.php index 97a98479002..59eea87be28 100644 --- a/frontends/php/include/views/monitoring.slides.php +++ b/frontends/php/include/views/monitoring.slides.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.sysmap.constructor.php b/frontends/php/include/views/monitoring.sysmap.constructor.php index 24178eef939..be96bfd81d0 100644 --- a/frontends/php/include/views/monitoring.sysmap.constructor.php +++ b/frontends/php/include/views/monitoring.sysmap.constructor.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.sysmap.edit.php b/frontends/php/include/views/monitoring.sysmap.edit.php index 86a6b0959a0..f61a0443890 100644 --- a/frontends/php/include/views/monitoring.sysmap.edit.php +++ b/frontends/php/include/views/monitoring.sysmap.edit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -80,16 +80,21 @@ if (!$map_ownerid || $map_ownerid && array_key_exists($map_ownerid, $data['users $multiselect_data['data'] = $owner_data; // Append multiselect to map tab. - $map_tab->addRow(_('Owner'), - (new CMultiSelect($multiselect_data))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) - ); + $multiselect_userid = (new CMultiSelect($multiselect_data)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(); + + $map_tab->addRow((new CLabel(_('Owner'), $multiselect_userid->getId()))->setAsteriskMark(), $multiselect_userid); } else { - $multiselect_userid = (new CMultiSelect($multiselect_data))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH); + $multiselect_userid = (new CMultiSelect($multiselect_data)) + ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired(); // Administrators can change map owner, but cannot see users from other groups. if ($user_type == USER_TYPE_ZABBIX_ADMIN) { - $map_tab->addRow(_('Owner'), $multiselect_userid) + $map_tab + ->addRow((new CLabel(_('Owner'), $multiselect_userid->getId()))->setAsteriskMark(), $multiselect_userid) ->addRow('', _('Inaccessible user'), 'inaccessible_user'); } else { @@ -103,19 +108,22 @@ else { } } -$map_tab->addRow(_('Name'), +$map_tab->addRow((new CLabel(_('Name'), 'name'))->setAsteriskMark(), (new CTextBox('name', $data['sysmap']['name'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) + ->setAriaRequired() ->setAttribute('autofocus', 'autofocus') ->setAttribute('maxlength', DB::getFieldLength('sysmaps', 'name')) ) - ->addRow(_('Width'), + ->addRow((new CLabel(_('Width'), 'width'))->setAsteriskMark(), (new CNumericBox('width', $data['sysmap']['width'], 5)) ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired() ) - ->addRow(_('Height'), + ->addRow((new CLabel(_('Height'), 'height'))->setAsteriskMark(), (new CNumericBox('height', $data['sysmap']['height'], 5)) ->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH) + ->setAriaRequired() ); // Append background image to form list. diff --git a/frontends/php/include/views/monitoring.sysmap.list.php b/frontends/php/include/views/monitoring.sysmap.list.php index 2ded6a4ff18..ee6bbf54ba8 100644 --- a/frontends/php/include/views/monitoring.sysmap.list.php +++ b/frontends/php/include/views/monitoring.sysmap.list.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/monitoring.triggerComment.php b/frontends/php/include/views/monitoring.triggerComment.php index 4dd8e3e5111..3f8ce7554ca 100644 --- a/frontends/php/include/views/monitoring.triggerComment.php +++ b/frontends/php/include/views/monitoring.triggerComment.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/include/views/reports.toptriggers.php b/frontends/php/include/views/reports.toptriggers.php index 45f3f8e6628..c8aaa1fdc9c 100644 --- a/frontends/php/include/views/reports.toptriggers.php +++ b/frontends/php/include/views/reports.toptriggers.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/index.php b/frontends/php/index.php index e3f2af3766e..7b152e64a0e 100644 --- a/frontends/php/index.php +++ b/frontends/php/index.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/items.php b/frontends/php/items.php index f08190ef1e5..28d48f3fe87 100644 --- a/frontends/php/items.php +++ b/frontends/php/items.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/browsers.js b/frontends/php/js/browsers.js index a0fb462ffe0..bece9c448c3 100644 --- a/frontends/php/js/browsers.js +++ b/frontends/php/js/browsers.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/chkbxrange.js b/frontends/php/js/chkbxrange.js index 57a8041eaa9..98cbefd7bf3 100644 --- a/frontends/php/js/chkbxrange.js +++ b/frontends/php/js/chkbxrange.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.bbcode.js b/frontends/php/js/class.bbcode.js index 2c2f5ac4e0c..c2cb768361e 100644 --- a/frontends/php/js/class.bbcode.js +++ b/frontends/php/js/class.bbcode.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.calendar.js b/frontends/php/js/class.calendar.js index 4ff1c119fa1..88c380233ad 100644 --- a/frontends/php/js/class.calendar.js +++ b/frontends/php/js/class.calendar.js @@ -1,7 +1,7 @@ // JavaScript Document /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.cdate.js b/frontends/php/js/class.cdate.js index 42704cfb91e..bd3142254e6 100644 --- a/frontends/php/js/class.cdate.js +++ b/frontends/php/js/class.cdate.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.cdebug.js b/frontends/php/js/class.cdebug.js index c0792fb3899..61a8e935094 100644 --- a/frontends/php/js/class.cdebug.js +++ b/frontends/php/js/class.cdebug.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.cmap.js b/frontends/php/js/class.cmap.js index 5fd22a86dfd..92f9cc8c060 100644 --- a/frontends/php/js/class.cmap.js +++ b/frontends/php/js/class.cmap.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -2756,7 +2756,8 @@ ZABBIX.apps.map = (function($) { dstfld1: 'elementNameTriggers', with_triggers: '1', real_hosts: '1', - multiselect: '1' + multiselect: '1', + noempty: '1' } } }); diff --git a/frontends/php/js/class.cmessages.js b/frontends/php/js/class.cmessages.js index 33a6eb94829..f4082b16933 100644 --- a/frontends/php/js/class.cmessages.js +++ b/frontends/php/js/class.cmessages.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.cnavtree.js b/frontends/php/js/class.cnavtree.js index 1ba9d985853..2f656e83971 100644 --- a/frontends/php/js/class.cnavtree.js +++ b/frontends/php/js/class.cnavtree.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.cookie.js b/frontends/php/js/class.cookie.js index e531e316781..ab7191d29bc 100644 --- a/frontends/php/js/class.cookie.js +++ b/frontends/php/js/class.cookie.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.cscreen.js b/frontends/php/js/class.cscreen.js index d265461b5a0..823b2e09e9f 100644 --- a/frontends/php/js/class.cscreen.js +++ b/frontends/php/js/class.cscreen.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.csuggest.js b/frontends/php/js/class.csuggest.js index a0554e0221d..d9132cb1c56 100644 --- a/frontends/php/js/class.csuggest.js +++ b/frontends/php/js/class.csuggest.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.cswitcher.js b/frontends/php/js/class.cswitcher.js index e20dc68d4d0..880ca859ae5 100644 --- a/frontends/php/js/class.cswitcher.js +++ b/frontends/php/js/class.cswitcher.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.ctree.js b/frontends/php/js/class.ctree.js index cd86ef2af5c..14e70561664 100644 --- a/frontends/php/js/class.ctree.js +++ b/frontends/php/js/class.ctree.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.curl.js b/frontends/php/js/class.curl.js index a3883b03a2f..8a11a8fca14 100644 --- a/frontends/php/js/class.curl.js +++ b/frontends/php/js/class.curl.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.cviewswitcher.js b/frontends/php/js/class.cviewswitcher.js index 6a024c6486a..8f0ff36a1d4 100644 --- a/frontends/php/js/class.cviewswitcher.js +++ b/frontends/php/js/class.cviewswitcher.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.mapWidget.js b/frontends/php/js/class.mapWidget.js index f80142203cd..4a805e2debb 100644 --- a/frontends/php/js/class.mapWidget.js +++ b/frontends/php/js/class.mapWidget.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.pmaster.js b/frontends/php/js/class.pmaster.js index 8673078c2f7..fa12558f1c9 100644 --- a/frontends/php/js/class.pmaster.js +++ b/frontends/php/js/class.pmaster.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/class.rpc.js b/frontends/php/js/class.rpc.js index 3530ad10eca..465047ea1b1 100644 --- a/frontends/php/js/class.rpc.js +++ b/frontends/php/js/class.rpc.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/common.js b/frontends/php/js/common.js index 9afc4a4f0f9..216842b0513 100644 --- a/frontends/php/js/common.js +++ b/frontends/php/js/common.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -613,32 +613,6 @@ function add_media(formname, media, mediatypeid, sendto, period, active, severit } /** - * Send media form data to server for validation before adding them to user media tab. - * - * @param {string} formname form name that is sent to server for validation - */ -function validate_media(formname) { - var form = window.document.forms[formname]; - - jQuery.ajax({ - url: jQuery(form).attr('action'), - data: jQuery(form).serialize(), - success: function(ret) { - jQuery(form).parent().find('.msg-bad, .msg-good').remove(); - - if (typeof ret.errors !== 'undefined') { - jQuery(ret.errors).insertBefore(jQuery(form)); - } - else { - add_media(ret.dstfrm, ret.media, ret.mediatypeid, ret.sendto, ret.period, ret.active, ret.severity); - } - }, - dataType: 'json', - type: 'post' - }); -} - -/** * Send trigger expression form data to server for validation before adding it to trigger expression field. * * @param {string} formname form name that is sent to server for validation @@ -683,46 +657,6 @@ function validate_trigger_expression(formname, dialogueid) { }); } -/** - * Send http test step form data to server for validation before adding it to web scenarion tab. - * - * @param {string} formname form name that is sent to server for validation - * @param {string} dialogueid (optional) id of overlay dialogue. - */ -function validate_httpstep(formname, dialogueid) { - var form = window.document.forms[formname], - url = new Curl(jQuery(form).attr('action')), - dialogueid = dialogueid || null; - - url.setArgument('validate', 1); - - jQuery.ajax({ - url: url.getUrl(), - data: jQuery(form).serialize(), - success: function(ret) { - jQuery(form).parent().find('.msg-bad, .msg-good').remove(); - - if (typeof ret.errors !== 'undefined') { - jQuery(ret.errors).insertBefore(jQuery(form)); - } - else { - if (typeof ret.params.stepid !== 'undefined') { - update_httpstep(ret.dstfrm, ret.list_name, ret.params); - } - else { - add_httpstep(ret.dstfrm, ret.params); - } - - if (dialogueid) { - overlayDialogueDestroy(dialogueid); - } - } - }, - dataType: 'json', - type: 'post' - }); -} - function redirect(uri, method, needle, invert_needle) { method = method || 'get'; var url = new Curl(uri); @@ -879,7 +813,10 @@ jQuery.fn.trimValues = function(selectors) { jQuery.each(selectors, function(i, value) { obj = jQuery(value, form); - obj.val(jQuery.trim(obj.val())); + + jQuery(obj).each(function() { + jQuery(this).val(jQuery.trim(jQuery(this).val())); + }); }); }; diff --git a/frontends/php/js/dashboard.grid.js b/frontends/php/js/dashboard.grid.js index 103e7ffcda1..725e83699a0 100644 --- a/frontends/php/js/dashboard.grid.js +++ b/frontends/php/js/dashboard.grid.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/flickerfreescreen.js b/frontends/php/js/flickerfreescreen.js index 8c4900f0e9b..45798246259 100644 --- a/frontends/php/js/flickerfreescreen.js +++ b/frontends/php/js/flickerfreescreen.js @@ -1,6 +1,6 @@ /* ** Zabbix - ** Copyright (C) 2001-2017 Zabbix SIA + ** Copyright (C) 2001-2018 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/frontends/php/js/functions.js b/frontends/php/js/functions.js index aa7ac7d956d..35829772c15 100644 --- a/frontends/php/js/functions.js +++ b/frontends/php/js/functions.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/gtlc.js b/frontends/php/js/gtlc.js index dafb43e03ec..0a021f582d8 100644 --- a/frontends/php/js/gtlc.js +++ b/frontends/php/js/gtlc.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/init.js b/frontends/php/js/init.js index 0e609d8550a..4c0e004ac68 100644 --- a/frontends/php/js/init.js +++ b/frontends/php/js/init.js @@ -1,6 +1,6 @@ /* ** Zabbix - ** Copyright (C) 2001-2017 Zabbix SIA + ** Copyright (C) 2001-2018 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/frontends/php/js/main.js b/frontends/php/js/main.js index 187ca5546ff..fef91a97f90 100644 --- a/frontends/php/js/main.js +++ b/frontends/php/js/main.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/menupopup.js b/frontends/php/js/menupopup.js index ef200a5bb11..a565b241f41 100644 --- a/frontends/php/js/menupopup.js +++ b/frontends/php/js/menupopup.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/multiselect.js b/frontends/php/js/multiselect.js index 0f28b796a1c..93271d71781 100644 --- a/frontends/php/js/multiselect.js +++ b/frontends/php/js/multiselect.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -498,6 +498,10 @@ jQuery(function($) { $(obj).removeClass('active'); cleanSearchInput(obj); }); + if (obj.attr('aria-required')) { + input.attr('aria-required', obj.attr('aria-required')); + obj.removeAttr('aria-required'); + } obj.append(input); } diff --git a/frontends/php/js/pages/items.js b/frontends/php/js/pages/items.js index 73e231d1e59..cdcdc63d31d 100644 --- a/frontends/php/js/pages/items.js +++ b/frontends/php/js/pages/items.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/servercheck.js b/frontends/php/js/servercheck.js index 1b1c615c71d..f021cdd3680 100644 --- a/frontends/php/js/servercheck.js +++ b/frontends/php/js/servercheck.js @@ -1,6 +1,6 @@ /* ** Zabbix - ** Copyright (C) 2001-2017 Zabbix SIA + ** Copyright (C) 2001-2018 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/frontends/php/js/vector/class.svg.canvas.js b/frontends/php/js/vector/class.svg.canvas.js index 29225148759..e966080f2b3 100644 --- a/frontends/php/js/vector/class.svg.canvas.js +++ b/frontends/php/js/vector/class.svg.canvas.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/js/vector/class.svg.map.js b/frontends/php/js/vector/class.svg.map.js index 78127d43a7d..32412408d5e 100644 --- a/frontends/php/js/vector/class.svg.map.js +++ b/frontends/php/js/vector/class.svg.map.js @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/jsLoader.php b/frontends/php/jsLoader.php index 9cb82d76ad5..dca0fd372f6 100644 --- a/frontends/php/jsLoader.php +++ b/frontends/php/jsLoader.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/jsrpc.php b/frontends/php/jsrpc.php index 69da21b90e9..032cc4d4275 100644 --- a/frontends/php/jsrpc.php +++ b/frontends/php/jsrpc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/latest.php b/frontends/php/latest.php index 4c5f7d592ca..7a05a8f5258 100644 --- a/frontends/php/latest.php +++ b/frontends/php/latest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -120,13 +120,18 @@ if ($filter['groupids'] !== null) { 'preservekeys' => true ]); - foreach ($filterGroups as $group) { - $multiSelectHostGroupData[] = [ - 'id' => $group['groupid'], - 'name' => $group['name'] - ]; + if ($filterGroups) { + foreach ($filterGroups as $group) { + $multiSelectHostGroupData[] = [ + 'id' => $group['groupid'], + 'name' => $group['name'] + ]; - $child_groups[] = $group['name'].'/'; + $child_groups[] = $group['name'].'/'; + } + } + else { + $filter['groupids'] = []; } } diff --git a/frontends/php/maintenance.php b/frontends/php/maintenance.php index 998d8e48987..fc23dda6037 100644 --- a/frontends/php/maintenance.php +++ b/frontends/php/maintenance.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/map.import.php b/frontends/php/map.import.php index 90e37036351..40970726584 100644 --- a/frontends/php/map.import.php +++ b/frontends/php/map.import.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/map.php b/frontends/php/map.php index ba6b4ce64b2..c2e582fdca7 100644 --- a/frontends/php/map.php +++ b/frontends/php/map.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/overview.php b/frontends/php/overview.php index 8113d07ec82..7251d9485f5 100644 --- a/frontends/php/overview.php +++ b/frontends/php/overview.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/profile.php b/frontends/php/profile.php index a11833f7ff3..0aba0b19d5d 100644 --- a/frontends/php/profile.php +++ b/frontends/php/profile.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/queue.php b/frontends/php/queue.php index 4eabd2b9327..0454b050b41 100644 --- a/frontends/php/queue.php +++ b/frontends/php/queue.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/report2.php b/frontends/php/report2.php index a4f81782df8..568e43b1624 100644 --- a/frontends/php/report2.php +++ b/frontends/php/report2.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/report4.php b/frontends/php/report4.php index 05d9cf86cf7..c7474d44239 100644 --- a/frontends/php/report4.php +++ b/frontends/php/report4.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/screen.import.php b/frontends/php/screen.import.php index fb0a3a56ba4..b72366fee2f 100644 --- a/frontends/php/screen.import.php +++ b/frontends/php/screen.import.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/screenconf.php b/frontends/php/screenconf.php index 856df57260f..279ea1ad9cf 100644 --- a/frontends/php/screenconf.php +++ b/frontends/php/screenconf.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/screenedit.php b/frontends/php/screenedit.php index a368001965a..6db9a0dbb89 100644 --- a/frontends/php/screenedit.php +++ b/frontends/php/screenedit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/screens.php b/frontends/php/screens.php index 98a3f2ac6ac..30105cec78b 100644 --- a/frontends/php/screens.php +++ b/frontends/php/screens.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/search.php b/frontends/php/search.php index 90854376f16..6574094f447 100644 --- a/frontends/php/search.php +++ b/frontends/php/search.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/services.php b/frontends/php/services.php index 3eb03087b41..457c7610fd2 100644 --- a/frontends/php/services.php +++ b/frontends/php/services.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/setup.php b/frontends/php/setup.php index 1189212ef0c..f200b9d937d 100644 --- a/frontends/php/setup.php +++ b/frontends/php/setup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/slideconf.php b/frontends/php/slideconf.php index ac34a402edb..6a91469ccf5 100644 --- a/frontends/php/slideconf.php +++ b/frontends/php/slideconf.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/slides.php b/frontends/php/slides.php index 502742c2f41..ecddeb4d5a0 100644 --- a/frontends/php/slides.php +++ b/frontends/php/slides.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/srv_status.php b/frontends/php/srv_status.php index ca45579fcdc..3d8ce72743d 100644 --- a/frontends/php/srv_status.php +++ b/frontends/php/srv_status.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/styles/blue-theme.css b/frontends/php/styles/blue-theme.css index a0c5615f1b3..29b51c7586c 100644 --- a/frontends/php/styles/blue-theme.css +++ b/frontends/php/styles/blue-theme.css @@ -1173,6 +1173,12 @@ footer, .footer { -moz-transition: none; transition: none; } +label.form-label-asterisk:before { + color: #e33734; + display: inline-block; + content: '*'; + margin-right: 0.3em; } + label input[type="checkbox"] { margin-right: 3px; } label input[type="radio"] { @@ -2293,8 +2299,6 @@ button[disabled], button[disabled]:hover, button[disabled]:active { .overlay-dialogue .table-paging { border: none; border-top: 1px solid #ebeef0; } - .overlay-dialogue .table-forms-td-left { - text-align: left; } .overlay-dialogue .table-forms-td-right td { vertical-align: middle; } .overlay-dialogue .table-forms-td-right td label { diff --git a/frontends/php/styles/dark-theme.css b/frontends/php/styles/dark-theme.css index 6237bccfe98..feee322d56d 100644 --- a/frontends/php/styles/dark-theme.css +++ b/frontends/php/styles/dark-theme.css @@ -1199,6 +1199,12 @@ footer, .footer { -moz-transition: none; transition: none; } +label.form-label-asterisk:before { + color: #e45959; + display: inline-block; + content: '*'; + margin-right: 0.3em; } + label input[type="checkbox"] { margin-right: 3px; } label input[type="radio"] { @@ -2319,8 +2325,6 @@ button[disabled], button[disabled]:hover, button[disabled]:active { .overlay-dialogue .table-paging { border: none; border-top: 1px solid #383838; } - .overlay-dialogue .table-forms-td-left { - text-align: left; } .overlay-dialogue .table-forms-td-right td { vertical-align: middle; } .overlay-dialogue .table-forms-td-right td label { diff --git a/frontends/php/styles/hc-dark.css b/frontends/php/styles/hc-dark.css index ff5c67d9407..b23b2725268 100644 --- a/frontends/php/styles/hc-dark.css +++ b/frontends/php/styles/hc-dark.css @@ -1173,6 +1173,12 @@ footer, .footer { -moz-transition: none; transition: none; } +label.form-label-asterisk:before { + color: #ff5050; + display: inline-block; + content: '*'; + margin-right: 0.3em; } + label input[type="checkbox"] { margin-right: 3px; } label input[type="radio"] { @@ -2293,8 +2299,6 @@ button[disabled], button[disabled]:hover, button[disabled]:active { .overlay-dialogue .table-paging { border: none; border-top: 1px solid #333; } - .overlay-dialogue .table-forms-td-left { - text-align: left; } .overlay-dialogue .table-forms-td-right td { vertical-align: middle; } .overlay-dialogue .table-forms-td-right td label { diff --git a/frontends/php/styles/hc-light.css b/frontends/php/styles/hc-light.css index e7faf9e08cf..c2278fec5b6 100644 --- a/frontends/php/styles/hc-light.css +++ b/frontends/php/styles/hc-light.css @@ -1173,6 +1173,12 @@ footer, .footer { -moz-transition: none; transition: none; } +label.form-label-asterisk:before { + color: #990000; + display: inline-block; + content: '*'; + margin-right: 0.3em; } + label input[type="checkbox"] { margin-right: 3px; } label input[type="radio"] { @@ -2293,8 +2299,6 @@ button[disabled], button[disabled]:hover, button[disabled]:active { .overlay-dialogue .table-paging { border: none; border-top: 1px solid #888; } - .overlay-dialogue .table-forms-td-left { - text-align: left; } .overlay-dialogue .table-forms-td-right td { vertical-align: middle; } .overlay-dialogue .table-forms-td-right td label { diff --git a/frontends/php/sysmap.php b/frontends/php/sysmap.php index b9ac890ab2a..9581aae6f6d 100644 --- a/frontends/php/sysmap.php +++ b/frontends/php/sysmap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/sysmaps.php b/frontends/php/sysmaps.php index f9fee0eb2e3..ecc2a74be8d 100644 --- a/frontends/php/sysmaps.php +++ b/frontends/php/sysmaps.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/templates.php b/frontends/php/templates.php index 4a3a62f5371..ee09855dfc1 100644 --- a/frontends/php/templates.php +++ b/frontends/php/templates.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/agent.php b/frontends/php/tests/agent.php index 5b8deb1cdd7..8583ccb71df 100644 --- a/frontends/php/tests/agent.php +++ b/frontends/php/tests/agent.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/agent/AgentTests.php b/frontends/php/tests/agent/AgentTests.php index 930bbeeea1c..b89a2d4995b 100644 --- a/frontends/php/tests/agent/AgentTests.php +++ b/frontends/php/tests/agent/AgentTests.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/agent/testMetrics.php b/frontends/php/tests/agent/testMetrics.php index 1e2c533563d..efa99317d24 100644 --- a/frontends/php/tests/agent/testMetrics.php +++ b/frontends/php/tests/agent/testMetrics.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/ApiJsonTests.php b/frontends/php/tests/api_json/ApiJsonTests.php index f90d35317b9..01755b2d2d0 100644 --- a/frontends/php/tests/api_json/ApiJsonTests.php +++ b/frontends/php/tests/api_json/ApiJsonTests.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/CHost.php b/frontends/php/tests/api_json/CHost.php index 6faa3dca988..f751d2b9052 100644 --- a/frontends/php/tests/api_json/CHost.php +++ b/frontends/php/tests/api_json/CHost.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/CItem.php b/frontends/php/tests/api_json/CItem.php index c3485981b33..6d53896d79a 100644 --- a/frontends/php/tests/api_json/CItem.php +++ b/frontends/php/tests/api_json/CItem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/CJsonRpcTest.php b/frontends/php/tests/api_json/CJsonRpcTest.php index 1e8c3a4b0fb..c52b936a31a 100644 --- a/frontends/php/tests/api_json/CJsonRpcTest.php +++ b/frontends/php/tests/api_json/CJsonRpcTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/CMap.php b/frontends/php/tests/api_json/CMap.php index fd03d64fe73..b0236ee6d45 100644 --- a/frontends/php/tests/api_json/CMap.php +++ b/frontends/php/tests/api_json/CMap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testAPIInfo.php b/frontends/php/tests/api_json/testAPIInfo.php index bf25a5281b5..ecc9a6aff08 100644 --- a/frontends/php/tests/api_json/testAPIInfo.php +++ b/frontends/php/tests/api_json/testAPIInfo.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testApplication.php b/frontends/php/tests/api_json/testApplication.php index ad813fe79e4..2ca567ee49c 100644 --- a/frontends/php/tests/api_json/testApplication.php +++ b/frontends/php/tests/api_json/testApplication.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testConfiguration.php b/frontends/php/tests/api_json/testConfiguration.php index f4b82cfdc40..ae921f95c29 100644 --- a/frontends/php/tests/api_json/testConfiguration.php +++ b/frontends/php/tests/api_json/testConfiguration.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testHostGroup.php b/frontends/php/tests/api_json/testHostGroup.php index d36d517b1c0..08ce5e188f5 100644 --- a/frontends/php/tests/api_json/testHostGroup.php +++ b/frontends/php/tests/api_json/testHostGroup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testIconMap.php b/frontends/php/tests/api_json/testIconMap.php index bd890128263..26be158e326 100644 --- a/frontends/php/tests/api_json/testIconMap.php +++ b/frontends/php/tests/api_json/testIconMap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testProxy.php b/frontends/php/tests/api_json/testProxy.php index 19b3448508e..898c7962e40 100644 --- a/frontends/php/tests/api_json/testProxy.php +++ b/frontends/php/tests/api_json/testProxy.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testScripts.php b/frontends/php/tests/api_json/testScripts.php index 6d747eff757..706ef41458d 100644 --- a/frontends/php/tests/api_json/testScripts.php +++ b/frontends/php/tests/api_json/testScripts.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testUserGroup.php b/frontends/php/tests/api_json/testUserGroup.php index 3177e5a24d7..3710728dafd 100644 --- a/frontends/php/tests/api_json/testUserGroup.php +++ b/frontends/php/tests/api_json/testUserGroup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testUserMacro.php b/frontends/php/tests/api_json/testUserMacro.php index 8bed667f9eb..55563a4b716 100644 --- a/frontends/php/tests/api_json/testUserMacro.php +++ b/frontends/php/tests/api_json/testUserMacro.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testUsers.php b/frontends/php/tests/api_json/testUsers.php index 30bd6405818..14d06f322bb 100644 --- a/frontends/php/tests/api_json/testUsers.php +++ b/frontends/php/tests/api_json/testUsers.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/api_json/testValuemap.php b/frontends/php/tests/api_json/testValuemap.php index 25281892ea5..ca415e8bb4f 100644 --- a/frontends/php/tests/api_json/testValuemap.php +++ b/frontends/php/tests/api_json/testValuemap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/frontend.php b/frontends/php/tests/frontend.php index edaf192f321..07977e3b47b 100644 --- a/frontends/php/tests/frontend.php +++ b/frontends/php/tests/frontend.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/GeneralTests.php b/frontends/php/tests/general/GeneralTests.php index 85f24dfe176..6eed68d1918 100644 --- a/frontends/php/tests/general/GeneralTests.php +++ b/frontends/php/tests/general/GeneralTests.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/class_CDescription.php b/frontends/php/tests/general/class_CDescription.php index f4d79440bec..93ca7ab6709 100644 --- a/frontends/php/tests/general/class_CDescription.php +++ b/frontends/php/tests/general/class_CDescription.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/dbConditionIntTest.php b/frontends/php/tests/general/dbConditionIntTest.php index 979e803c4e7..28d80d0d9bb 100644 --- a/frontends/php/tests/general/dbConditionIntTest.php +++ b/frontends/php/tests/general/dbConditionIntTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/dbConditionStringTest.php b/frontends/php/tests/general/dbConditionStringTest.php index 0b162941701..a5ab062c7bf 100644 --- a/frontends/php/tests/general/dbConditionStringTest.php +++ b/frontends/php/tests/general/dbConditionStringTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/function_DBclose.php b/frontends/php/tests/general/function_DBclose.php index ec6f2f05107..7a24a50fa04 100644 --- a/frontends/php/tests/general/function_DBclose.php +++ b/frontends/php/tests/general/function_DBclose.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/function_DBcommit.php b/frontends/php/tests/general/function_DBcommit.php index c5ab6e685a1..5c139b3133f 100644 --- a/frontends/php/tests/general/function_DBcommit.php +++ b/frontends/php/tests/general/function_DBcommit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/function_DBconnect.php b/frontends/php/tests/general/function_DBconnect.php index 01e72bd446f..a8652f4801f 100644 --- a/frontends/php/tests/general/function_DBconnect.php +++ b/frontends/php/tests/general/function_DBconnect.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/function_DBend.php b/frontends/php/tests/general/function_DBend.php index b5c8ead2237..cab2cd22d7f 100644 --- a/frontends/php/tests/general/function_DBend.php +++ b/frontends/php/tests/general/function_DBend.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/function_DBexecute.php b/frontends/php/tests/general/function_DBexecute.php index b3d6ddae7c9..0e72a03abc8 100644 --- a/frontends/php/tests/general/function_DBexecute.php +++ b/frontends/php/tests/general/function_DBexecute.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/function_DBfetch.php b/frontends/php/tests/general/function_DBfetch.php index f77f6b62607..b06977c9655 100644 --- a/frontends/php/tests/general/function_DBfetch.php +++ b/frontends/php/tests/general/function_DBfetch.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/function_DBloadfile.php b/frontends/php/tests/general/function_DBloadfile.php index 741981743b3..f3808bdfb99 100644 --- a/frontends/php/tests/general/function_DBloadfile.php +++ b/frontends/php/tests/general/function_DBloadfile.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/function_DBrollback.php b/frontends/php/tests/general/function_DBrollback.php index f63bf17a8b3..c2598a5aab4 100644 --- a/frontends/php/tests/general/function_DBrollback.php +++ b/frontends/php/tests/general/function_DBrollback.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/function_DBselect.php b/frontends/php/tests/general/function_DBselect.php index 281e9ca1378..9f0fa104973 100644 --- a/frontends/php/tests/general/function_DBselect.php +++ b/frontends/php/tests/general/function_DBselect.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/function_DBstart.php b/frontends/php/tests/general/function_DBstart.php index 06f5a073ec6..f2c796d8873 100644 --- a/frontends/php/tests/general/function_DBstart.php +++ b/frontends/php/tests/general/function_DBstart.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/urlParamTest.php b/frontends/php/tests/general/urlParamTest.php index b4ec25befb9..a7af9e550d2 100644 --- a/frontends/php/tests/general/urlParamTest.php +++ b/frontends/php/tests/general/urlParamTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/general/zbx_dbcast_2bigintTest.php b/frontends/php/tests/general/zbx_dbcast_2bigintTest.php index d9708e4c4f8..c425a3ca2ee 100644 --- a/frontends/php/tests/general/zbx_dbcast_2bigintTest.php +++ b/frontends/php/tests/general/zbx_dbcast_2bigintTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/include/class.cexceptionhelper.php b/frontends/php/tests/include/class.cexceptionhelper.php index 93646cf1e98..3c8fe440772 100644 --- a/frontends/php/tests/include/class.cexceptionhelper.php +++ b/frontends/php/tests/include/class.cexceptionhelper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/include/class.cwebtest.php b/frontends/php/tests/include/class.cwebtest.php index 25344187d5d..54c4e775748 100644 --- a/frontends/php/tests/include/class.cwebtest.php +++ b/frontends/php/tests/include/class.cwebtest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -379,9 +379,13 @@ class CWebTest extends PHPUnit_Framework_TestCase { $this->webDriver->findElement(WebDriverBy::id($id))->sendKeys($str); } - public function zbxTestInputTypeByXpath($xpath, $str) { + public function zbxTestInputTypeByXpath($xpath, $str, $validate = true) { $this->zbxTestWaitUntilElementVisible(WebDriverBy::xpath($xpath)); $this->webDriver->findElement(WebDriverBy::xpath($xpath))->sendKeys($str); + + if ($validate) { + $this->zbxTestWaitUntilElementValuePresent(WebDriverBy::xpath($xpath), $str); + } } public function zbxTestInputTypeWait($id, $str) { @@ -511,6 +515,18 @@ class CWebTest extends PHPUnit_Framework_TestCase { $this->webDriver->wait(60, self::WAIT_ITERATION)->until(WebDriverExpectedCondition::visibilityOfElementLocated($by), 'after 60 sec element still not visible'); } + public function zbxTestWaitUntilElementValuePresent($by, $value) { + $this->webDriver->wait(20, self::WAIT_ITERATION)->until( + function ($driver) use ($by, $value) { + try { + return $driver->findElement($by)->getAttribute('value') === $value; + } catch (StaleElementReferenceException $e) { + return null; + } + } + ); + } + public function zbxTestWaitUntilElementNotVisible($by) { $this->webDriver->wait(60)->until(WebDriverExpectedCondition::invisibilityOfElementLocated($by), 'after 60 sec element still visible'); } diff --git a/frontends/php/tests/include/class.czabbixtest.php b/frontends/php/tests/include/class.czabbixtest.php index 84cc3c921f3..4d1dfb6d0d5 100644 --- a/frontends/php/tests/include/class.czabbixtest.php +++ b/frontends/php/tests/include/class.czabbixtest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/include/dbfunc.php b/frontends/php/tests/include/dbfunc.php index d2963551a30..208726ae2ff 100644 --- a/frontends/php/tests/include/dbfunc.php +++ b/frontends/php/tests/include/dbfunc.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/SeleniumTests.php b/frontends/php/tests/selenium/SeleniumTests.php index 2f9bf8740ea..7a128a4db79 100644 --- a/frontends/php/tests/selenium/SeleniumTests.php +++ b/frontends/php/tests/selenium/SeleniumTests.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAction.php b/frontends/php/tests/selenium/testFormAction.php index 23de4865160..b536ffa9c20 100644 --- a/frontends/php/tests/selenium/testFormAction.php +++ b/frontends/php/tests/selenium/testFormAction.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationDMProxies.php b/frontends/php/tests/selenium/testFormAdministrationDMProxies.php index a1516ba043c..b5cb57185a0 100644 --- a/frontends/php/tests/selenium/testFormAdministrationDMProxies.php +++ b/frontends/php/tests/selenium/testFormAdministrationDMProxies.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralGUI.php b/frontends/php/tests/selenium/testFormAdministrationGeneralGUI.php index 5c6f646266b..dd2e3f7246c 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralGUI.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralGUI.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralHousekeeper.php b/frontends/php/tests/selenium/testFormAdministrationGeneralHousekeeper.php index 0c291a11e53..36636473681 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralHousekeeper.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralHousekeeper.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralImages.php b/frontends/php/tests/selenium/testFormAdministrationGeneralImages.php index 16eb66a8f84..74593fc261f 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralImages.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralImages.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralInstallation.php b/frontends/php/tests/selenium/testFormAdministrationGeneralInstallation.php index 0917aa2131e..a222baa8061 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralInstallation.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralInstallation.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralMacro.php b/frontends/php/tests/selenium/testFormAdministrationGeneralMacro.php index 24e8d6dbf49..436d55d9b1b 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralMacro.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralMacro.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralOtherParams.php b/frontends/php/tests/selenium/testFormAdministrationGeneralOtherParams.php index 62e61b33a65..a50963642f2 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralOtherParams.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralOtherParams.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php b/frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php index ccc62e00b6a..c10cc241d28 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralTrigDisplOptions.php b/frontends/php/tests/selenium/testFormAdministrationGeneralTrigDisplOptions.php index 7bc77477bf8..c8e12be4795 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralTrigDisplOptions.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralTrigDisplOptions.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralTriggerSeverities.php b/frontends/php/tests/selenium/testFormAdministrationGeneralTriggerSeverities.php index c10e1b635bb..c26f0b90edc 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralTriggerSeverities.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralTriggerSeverities.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralValuemap.php b/frontends/php/tests/selenium/testFormAdministrationGeneralValuemap.php index ce56be6d9bc..23f0a0a7436 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralValuemap.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralValuemap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationGeneralWorkperiod.php b/frontends/php/tests/selenium/testFormAdministrationGeneralWorkperiod.php index 48b70fbd333..bafe411e6ca 100644 --- a/frontends/php/tests/selenium/testFormAdministrationGeneralWorkperiod.php +++ b/frontends/php/tests/selenium/testFormAdministrationGeneralWorkperiod.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationMediaTypes.php b/frontends/php/tests/selenium/testFormAdministrationMediaTypes.php index bd3e342b087..b8de31cc3d2 100644 --- a/frontends/php/tests/selenium/testFormAdministrationMediaTypes.php +++ b/frontends/php/tests/selenium/testFormAdministrationMediaTypes.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationScripts.php b/frontends/php/tests/selenium/testFormAdministrationScripts.php index 9a8ebdf77c2..c9856893dfa 100644 --- a/frontends/php/tests/selenium/testFormAdministrationScripts.php +++ b/frontends/php/tests/selenium/testFormAdministrationScripts.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationUserCreate.php b/frontends/php/tests/selenium/testFormAdministrationUserCreate.php index fce1195f11a..e0b6e500475 100644 --- a/frontends/php/tests/selenium/testFormAdministrationUserCreate.php +++ b/frontends/php/tests/selenium/testFormAdministrationUserCreate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormAdministrationUserGroups.php b/frontends/php/tests/selenium/testFormAdministrationUserGroups.php index 106a7dcb740..3d0a367f6c1 100644 --- a/frontends/php/tests/selenium/testFormAdministrationUserGroups.php +++ b/frontends/php/tests/selenium/testFormAdministrationUserGroups.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormApplication.php b/frontends/php/tests/selenium/testFormApplication.php index 1237e23d964..276d524a903 100644 --- a/frontends/php/tests/selenium/testFormApplication.php +++ b/frontends/php/tests/selenium/testFormApplication.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormConfigTriggerSeverity.php b/frontends/php/tests/selenium/testFormConfigTriggerSeverity.php index 95b6082206e..01bba4a26e6 100644 --- a/frontends/php/tests/selenium/testFormConfigTriggerSeverity.php +++ b/frontends/php/tests/selenium/testFormConfigTriggerSeverity.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormDiscoveryRule.php b/frontends/php/tests/selenium/testFormDiscoveryRule.php index 680fe479d7e..201fa97c843 100644 --- a/frontends/php/tests/selenium/testFormDiscoveryRule.php +++ b/frontends/php/tests/selenium/testFormDiscoveryRule.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormGraph.php b/frontends/php/tests/selenium/testFormGraph.php index b192cb75e27..abc941ebdb7 100644 --- a/frontends/php/tests/selenium/testFormGraph.php +++ b/frontends/php/tests/selenium/testFormGraph.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormGraphPrototype.php b/frontends/php/tests/selenium/testFormGraphPrototype.php index 634c3a9847d..5a1a2e44833 100644 --- a/frontends/php/tests/selenium/testFormGraphPrototype.php +++ b/frontends/php/tests/selenium/testFormGraphPrototype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormHost.php b/frontends/php/tests/selenium/testFormHost.php index 4a3aa02d174..7390fe0af3c 100644 --- a/frontends/php/tests/selenium/testFormHost.php +++ b/frontends/php/tests/selenium/testFormHost.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormHostGroup.php b/frontends/php/tests/selenium/testFormHostGroup.php index 824a6b2bd08..fc5505b5ccf 100644 --- a/frontends/php/tests/selenium/testFormHostGroup.php +++ b/frontends/php/tests/selenium/testFormHostGroup.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormItem.php b/frontends/php/tests/selenium/testFormItem.php index efdc1c95d02..49ffca7bfe8 100644 --- a/frontends/php/tests/selenium/testFormItem.php +++ b/frontends/php/tests/selenium/testFormItem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormItemPrototype.php b/frontends/php/tests/selenium/testFormItemPrototype.php index c81257f8e09..67e63c6de9b 100644 --- a/frontends/php/tests/selenium/testFormItemPrototype.php +++ b/frontends/php/tests/selenium/testFormItemPrototype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormLogin.php b/frontends/php/tests/selenium/testFormLogin.php index f419462d8b8..66ba4622e2d 100644 --- a/frontends/php/tests/selenium/testFormLogin.php +++ b/frontends/php/tests/selenium/testFormLogin.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormMap.php b/frontends/php/tests/selenium/testFormMap.php index e2ba7952ce6..113455c6e38 100644 --- a/frontends/php/tests/selenium/testFormMap.php +++ b/frontends/php/tests/selenium/testFormMap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormScreen.php b/frontends/php/tests/selenium/testFormScreen.php index f8b434fe43f..9192c9762fe 100644 --- a/frontends/php/tests/selenium/testFormScreen.php +++ b/frontends/php/tests/selenium/testFormScreen.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormSysmap.php b/frontends/php/tests/selenium/testFormSysmap.php index 188f6f6de16..1fdfe0b5d11 100644 --- a/frontends/php/tests/selenium/testFormSysmap.php +++ b/frontends/php/tests/selenium/testFormSysmap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormTemplate.php b/frontends/php/tests/selenium/testFormTemplate.php index 489438a46df..5e7b5d0fa56 100644 --- a/frontends/php/tests/selenium/testFormTemplate.php +++ b/frontends/php/tests/selenium/testFormTemplate.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormTrigger.php b/frontends/php/tests/selenium/testFormTrigger.php index 33c238bc4d8..1376d770307 100644 --- a/frontends/php/tests/selenium/testFormTrigger.php +++ b/frontends/php/tests/selenium/testFormTrigger.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormTriggerPrototype.php b/frontends/php/tests/selenium/testFormTriggerPrototype.php index 41a0c8892f7..934ac545963 100644 --- a/frontends/php/tests/selenium/testFormTriggerPrototype.php +++ b/frontends/php/tests/selenium/testFormTriggerPrototype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testFormUserProfile.php b/frontends/php/tests/selenium/testFormUserProfile.php index ba6ea4c9ebf..f273b22b7ec 100644 --- a/frontends/php/tests/selenium/testFormUserProfile.php +++ b/frontends/php/tests/selenium/testFormUserProfile.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -563,6 +563,8 @@ class testFormUserProfile extends CWebTest { switch ($data['expected']) { case TEST_GOOD: + $this->zbxTestWaitForPageToLoad(); + $this->zbxTestWaitUntilElementNotVisible(WebDriverBy::xpath("//div[@id='overlay_bg']")); $this->zbxTestClickWait('update'); $this->zbxTestCheckHeader('Dashboard'); $this->zbxTestCheckFatalErrors(); diff --git a/frontends/php/tests/selenium/testFormWeb.php b/frontends/php/tests/selenium/testFormWeb.php index 9cbc9536143..e999dca7046 100644 --- a/frontends/php/tests/selenium/testFormWeb.php +++ b/frontends/php/tests/selenium/testFormWeb.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -1507,11 +1507,12 @@ class testFormWeb extends CWebTest { $this->zbxTestClickWait('add_step'); $this->zbxTestLaunchOverlayDialog('Step of web scenario'); $step = $item['step'].' step'; - $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="name"]', $step); + $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="name"]', $step, false); $url = $step.' url'; $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="url"]', $url); $this->zbxTestClickXpath('//div[@class="overlay-dialogue-footer"]//button[text()="Add"]'); $this->zbxTestWaitForPageToLoad(); + $this->zbxTestWaitUntilElementNotVisible(WebDriverBy::xpath("//div[@id='overlay_bg']")); if (isset($item['remove'])) { $this->zbxTestClickWait('remove_0'); diff --git a/frontends/php/tests/selenium/testFormWebStep.php b/frontends/php/tests/selenium/testFormWebStep.php index a3c14dd158f..e2c77ab956c 100644 --- a/frontends/php/tests/selenium/testFormWebStep.php +++ b/frontends/php/tests/selenium/testFormWebStep.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -343,7 +343,7 @@ class testFormWebStep extends CWebTest { [ 'expected' => TEST_ERROR, 'name' => 'Post data validation pair value contains unencoded “=” character', - 'step_name' => 'Step post data validation pair value contains unencoded “=” character', + 'step_name' => 'Step post data validation pair value contains unencoded “=” char', 'url' => 'http://www.zabbix.com', 'raw_data' => 'name=val=ue', 'raw' => true, @@ -664,10 +664,8 @@ class testFormWebStep extends CWebTest { 'step_name' => 'Step timeout -1', 'url' => 'http://www.zabbix.com', 'timeout' => '-1', - 'error_webform' => true, - 'error_msg' => 'Cannot add web scenario', 'errors' => [ - 'Invalid parameter "/1/steps/1/timeout": a time unit is expected.' + 'Incorrect value for field "timeout": a time unit is expected.' ] ] ], @@ -678,10 +676,8 @@ class testFormWebStep extends CWebTest { 'step_name' => 'Step timeout 3601', 'url' => 'http://www.zabbix.com', 'timeout' => 3601, - 'error_webform' => true, - 'error_msg' => 'Cannot add web scenario', 'errors' => [ - 'Invalid parameter "/1/steps/1/timeout": value must be one of 0-3600.' + 'Incorrect value for field "timeout": a number is too large.' ] ] ], @@ -692,10 +688,8 @@ class testFormWebStep extends CWebTest { 'step_name' => 'Step timeout string', 'url' => 'http://www.zabbix.com', 'timeout' => 'abc', - 'error_webform' => true, - 'error_msg' => 'Cannot add web scenario', 'errors' => [ - 'Invalid parameter "/1/steps/1/timeout": a time unit is expected.' + 'Incorrect value for field "timeout": a time unit is expected.' ] ] ], @@ -770,6 +764,19 @@ class testFormWebStep extends CWebTest { ]; } + /* + * Type text into input field and fire onchange event. + */ + protected function typeAndEscalateChangeEvent($xpath, $text) { + $this->zbxTestInputTypeByXpath($xpath, $text); + + $this->webDriver->executeScript('var event = document.createEvent("HTMLEvents");'. + 'event.initEvent("change", false, true);'. + 'arguments[0].dispatchEvent(event);', + [$this->webDriver->findElement(WebDriverBy::xpath($xpath))] + ); + } + /** * @dataProvider steps */ @@ -795,10 +802,10 @@ class testFormWebStep extends CWebTest { $i = 3; foreach($data['query'] as $item) { if (array_key_exists('name', $item)) { - $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_name"]', $item['name']); + $this->typeAndEscalateChangeEvent('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_name"]', $item['name']); } if (array_key_exists('value', $item)) { - $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_value"]', $item['value']); + $this->typeAndEscalateChangeEvent('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_value"]', $item['value']); } $this->zbxTestClickXpath('//div[@class="overlay-dialogue-body"]//tr[@id="query_fields_footer"]//button[text()="Add"]'); $i = 7; @@ -813,10 +820,10 @@ class testFormWebStep extends CWebTest { $i = 4; foreach($data['post'] as $item) { if (array_key_exists('name', $item)) { - $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_name"]', $item['name']); + $this->typeAndEscalateChangeEvent('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_name"]', $item['name']); } if (array_key_exists('value', $item)) { - $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_value"]', $item['value']); + $this->typeAndEscalateChangeEvent('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_value"]', $item['value']); } $this->zbxTestClickXpath('//div[@class="overlay-dialogue-body"]//tr[@id="post_fields_footer"]//button[text()="Add"]'); $i = 7; @@ -827,10 +834,10 @@ class testFormWebStep extends CWebTest { $i = 5; foreach($data['variables'] as $item) { if (array_key_exists('name', $item)) { - $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_name"]', $item['name']); + $this->typeAndEscalateChangeEvent('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_name"]', $item['name']); } if (array_key_exists('value', $item)) { - $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_value"]', $item['value']); + $this->typeAndEscalateChangeEvent('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_value"]', $item['value']); } $this->zbxTestClickXpath('//div[@class="overlay-dialogue-body"]//tr[@id="variables_footer"]//button[text()="Add"]'); $i = 7; @@ -841,10 +848,10 @@ class testFormWebStep extends CWebTest { $i = 6; foreach($data['headers'] as $item) { if (array_key_exists('name', $item)) { - $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_name"]', $item['name']); + $this->typeAndEscalateChangeEvent('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_name"]', $item['name']); } if (array_key_exists('value', $item)) { - $this->zbxTestInputTypeByXpath('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_value"]', $item['value']); + $this->typeAndEscalateChangeEvent('//div[@class="overlay-dialogue-body"]//input[@id="pairs_'.$i.'_value"]', $item['value']); } $this->zbxTestClickXpath('//div[@class="overlay-dialogue-body"]//tr[@id="headers_footer"]//button[text()="Add"]'); $i = 7; @@ -937,12 +944,14 @@ class testFormWebStep extends CWebTest { if (array_key_exists('error_webform', $data)) { $this->zbxTestWaitForPageToLoad(); + $this->zbxTestWaitUntilElementNotVisible(WebDriverBy::xpath("//div[@id='overlay_bg']")); $this->zbxTestClickWait('add'); } switch ($data['expected']) { case TEST_GOOD: $this->zbxTestWaitForPageToLoad(); + $this->zbxTestWaitUntilElementNotVisible(WebDriverBy::xpath("//div[@id='overlay_bg']")); $this->zbxTestClickWait('add'); $this->zbxTestWaitUntilMessageTextPresent('msg-good', 'Web scenario added'); $this->zbxTestCheckFatalErrors(); diff --git a/frontends/php/tests/selenium/testGeneric.php b/frontends/php/tests/selenium/testGeneric.php index ee486427da1..1a1ec6b7006 100644 --- a/frontends/php/tests/selenium/testGeneric.php +++ b/frontends/php/tests/selenium/testGeneric.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testInheritanceDiscoveryRule.php b/frontends/php/tests/selenium/testInheritanceDiscoveryRule.php index 052e74bea22..52c14d7c226 100644 --- a/frontends/php/tests/selenium/testInheritanceDiscoveryRule.php +++ b/frontends/php/tests/selenium/testInheritanceDiscoveryRule.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testInheritanceGraph.php b/frontends/php/tests/selenium/testInheritanceGraph.php index aa8d4fa5eef..15626c7e665 100644 --- a/frontends/php/tests/selenium/testInheritanceGraph.php +++ b/frontends/php/tests/selenium/testInheritanceGraph.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testInheritanceGraphPrototype.php b/frontends/php/tests/selenium/testInheritanceGraphPrototype.php index 70558819ec0..381135e9ee4 100644 --- a/frontends/php/tests/selenium/testInheritanceGraphPrototype.php +++ b/frontends/php/tests/selenium/testInheritanceGraphPrototype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testInheritanceItem.php b/frontends/php/tests/selenium/testInheritanceItem.php index a71bb733b1c..4115b352880 100644 --- a/frontends/php/tests/selenium/testInheritanceItem.php +++ b/frontends/php/tests/selenium/testInheritanceItem.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testInheritanceItemPrototype.php b/frontends/php/tests/selenium/testInheritanceItemPrototype.php index 7c11918e901..3b130edfab0 100644 --- a/frontends/php/tests/selenium/testInheritanceItemPrototype.php +++ b/frontends/php/tests/selenium/testInheritanceItemPrototype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testInheritanceTrigger.php b/frontends/php/tests/selenium/testInheritanceTrigger.php index 5dfc17260a8..7262edacff5 100644 --- a/frontends/php/tests/selenium/testInheritanceTrigger.php +++ b/frontends/php/tests/selenium/testInheritanceTrigger.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testInheritanceTriggerPrototype.php b/frontends/php/tests/selenium/testInheritanceTriggerPrototype.php index a01bd9562f1..76f01b8283a 100644 --- a/frontends/php/tests/selenium/testInheritanceTriggerPrototype.php +++ b/frontends/php/tests/selenium/testInheritanceTriggerPrototype.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testInheritanceWeb.php b/frontends/php/tests/selenium/testInheritanceWeb.php index 44c67d3c96f..eb7e03eff6b 100644 --- a/frontends/php/tests/selenium/testInheritanceWeb.php +++ b/frontends/php/tests/selenium/testInheritanceWeb.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageActions.php b/frontends/php/tests/selenium/testPageActions.php index a43e362ddca..aa25f47a036 100644 --- a/frontends/php/tests/selenium/testPageActions.php +++ b/frontends/php/tests/selenium/testPageActions.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageAdministrationAudit.php b/frontends/php/tests/selenium/testPageAdministrationAudit.php index 33bf20ae5cd..757d1506e70 100644 --- a/frontends/php/tests/selenium/testPageAdministrationAudit.php +++ b/frontends/php/tests/selenium/testPageAdministrationAudit.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageAdministrationAuditActions.php b/frontends/php/tests/selenium/testPageAdministrationAuditActions.php index 71007284d01..eab0c0df3f9 100644 --- a/frontends/php/tests/selenium/testPageAdministrationAuditActions.php +++ b/frontends/php/tests/selenium/testPageAdministrationAuditActions.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageAdministrationDMProxies.php b/frontends/php/tests/selenium/testPageAdministrationDMProxies.php index 0961b1572b0..0d17387a874 100644 --- a/frontends/php/tests/selenium/testPageAdministrationDMProxies.php +++ b/frontends/php/tests/selenium/testPageAdministrationDMProxies.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageAdministrationGeneralImages.php b/frontends/php/tests/selenium/testPageAdministrationGeneralImages.php index 3a9e3c99ab8..1b0fc99b987 100644 --- a/frontends/php/tests/selenium/testPageAdministrationGeneralImages.php +++ b/frontends/php/tests/selenium/testPageAdministrationGeneralImages.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php b/frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php index 4b8198d2e38..461b516f621 100644 --- a/frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php +++ b/frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageAdministrationGeneralValuemap.php b/frontends/php/tests/selenium/testPageAdministrationGeneralValuemap.php index 28f9e188dc9..25395e6849c 100644 --- a/frontends/php/tests/selenium/testPageAdministrationGeneralValuemap.php +++ b/frontends/php/tests/selenium/testPageAdministrationGeneralValuemap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageAdministrationMediaTypes.php b/frontends/php/tests/selenium/testPageAdministrationMediaTypes.php index db5e6ecfda0..f82565ce1dc 100644 --- a/frontends/php/tests/selenium/testPageAdministrationMediaTypes.php +++ b/frontends/php/tests/selenium/testPageAdministrationMediaTypes.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageAdministrationScripts.php b/frontends/php/tests/selenium/testPageAdministrationScripts.php index 90317ba61fa..e9adb037a35 100644 --- a/frontends/php/tests/selenium/testPageAdministrationScripts.php +++ b/frontends/php/tests/selenium/testPageAdministrationScripts.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageApplications.php b/frontends/php/tests/selenium/testPageApplications.php index f09406d4ac8..974fadfd6e0 100644 --- a/frontends/php/tests/selenium/testPageApplications.php +++ b/frontends/php/tests/selenium/testPageApplications.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageAvailabilityReport.php b/frontends/php/tests/selenium/testPageAvailabilityReport.php index 200d32a0c98..0c27d8263f3 100644 --- a/frontends/php/tests/selenium/testPageAvailabilityReport.php +++ b/frontends/php/tests/selenium/testPageAvailabilityReport.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageBrowserWarning.php b/frontends/php/tests/selenium/testPageBrowserWarning.php index 5d89e90af13..f5dd15cf3c0 100644 --- a/frontends/php/tests/selenium/testPageBrowserWarning.php +++ b/frontends/php/tests/selenium/testPageBrowserWarning.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageDashboard.php b/frontends/php/tests/selenium/testPageDashboard.php index 176c5fbf055..e5d6173b8de 100644 --- a/frontends/php/tests/selenium/testPageDashboard.php +++ b/frontends/php/tests/selenium/testPageDashboard.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -42,20 +42,21 @@ class testPageDashboard extends CWebTest { $this->zbxTestCheckNoRealHostnames(); break; case 'admin' : - $this->authenticateUser('09e7d4286dfdca4ba7be15e0f3b2b55c' , 4); + $this->authenticateUser('09e7d4286dfdca4ba7be15e0f3b2b55c', 4); $this->zbxTestOpen('zabbix.php?action=dashboard.view'); $this->zbxTestCheckTitle('Dashboard'); $this->zbxTestCheckHeader('Dashboard'); $this->zbxTestAssertElementText("//div[@class='dashbrd-grid-widget-container']/div[8]//a[@href='zabbix.php?action=discovery.view&druleid=3']", 'External network'); break; case 'user'; - $this->authenticateUser('09e7d4286dfdca4ba7be15e0f3b2b55d' , 5); + $this->authenticateUser('09e7d4286dfdca4ba7be15e0f3b2b55d', 5); $this->zbxTestOpen('zabbix.php?action=dashboard.view'); $this->zbxTestCheckTitle('Dashboard'); $this->zbxTestCheckHeader('Dashboard'); $this->zbxTestAssertElementText("//div[@class='dashbrd-grid-widget-container']/div[8]//tr[@class='nothing-to-show']/td", 'No permissions to referred object or it does not exist!'); break; case 'guest'; + $this->authenticateUser('09e7d4286dfdca4ba7be15e0f3b2b55e', 2); $this->zbxTestOpen('zabbix.php?action=dashboard.view'); $this->zbxTestCheckTitle('Dashboard'); $this->zbxTestCheckHeader('Dashboard'); diff --git a/frontends/php/tests/selenium/testPageDiscovery.php b/frontends/php/tests/selenium/testPageDiscovery.php index 227fc40b159..d6cf3a96672 100644 --- a/frontends/php/tests/selenium/testPageDiscovery.php +++ b/frontends/php/tests/selenium/testPageDiscovery.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageDiscoveryRules.php b/frontends/php/tests/selenium/testPageDiscoveryRules.php index 3f9b9aad4df..d72b1a811fe 100644 --- a/frontends/php/tests/selenium/testPageDiscoveryRules.php +++ b/frontends/php/tests/selenium/testPageDiscoveryRules.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageHistory.php b/frontends/php/tests/selenium/testPageHistory.php index c48118bd1ba..0cd0e75a527 100644 --- a/frontends/php/tests/selenium/testPageHistory.php +++ b/frontends/php/tests/selenium/testPageHistory.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageHosts.php b/frontends/php/tests/selenium/testPageHosts.php index d80e83b11a1..6a081ce1c34 100644 --- a/frontends/php/tests/selenium/testPageHosts.php +++ b/frontends/php/tests/selenium/testPageHosts.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageInventory.php b/frontends/php/tests/selenium/testPageInventory.php index 854293d29ce..947545d0cef 100644 --- a/frontends/php/tests/selenium/testPageInventory.php +++ b/frontends/php/tests/selenium/testPageInventory.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageItemPrototypes.php b/frontends/php/tests/selenium/testPageItemPrototypes.php index 11c7bc59022..44140efb2f3 100644 --- a/frontends/php/tests/selenium/testPageItemPrototypes.php +++ b/frontends/php/tests/selenium/testPageItemPrototypes.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageItems.php b/frontends/php/tests/selenium/testPageItems.php index af5365f6df6..03e6cc9f0c9 100644 --- a/frontends/php/tests/selenium/testPageItems.php +++ b/frontends/php/tests/selenium/testPageItems.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageLatestData.php b/frontends/php/tests/selenium/testPageLatestData.php index cb75ec0a763..9e1c31dd296 100644 --- a/frontends/php/tests/selenium/testPageLatestData.php +++ b/frontends/php/tests/selenium/testPageLatestData.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageMaintenance.php b/frontends/php/tests/selenium/testPageMaintenance.php index a3d5145bb2b..22c0c86a4c5 100644 --- a/frontends/php/tests/selenium/testPageMaintenance.php +++ b/frontends/php/tests/selenium/testPageMaintenance.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageMaps.php b/frontends/php/tests/selenium/testPageMaps.php index a3a96f09617..b520f4c3f5d 100644 --- a/frontends/php/tests/selenium/testPageMaps.php +++ b/frontends/php/tests/selenium/testPageMaps.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageOverview.php b/frontends/php/tests/selenium/testPageOverview.php index af9430cd10c..51349641f83 100644 --- a/frontends/php/tests/selenium/testPageOverview.php +++ b/frontends/php/tests/selenium/testPageOverview.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageProblems.php b/frontends/php/tests/selenium/testPageProblems.php index 378832258c3..20e5bd10ab4 100644 --- a/frontends/php/tests/selenium/testPageProblems.php +++ b/frontends/php/tests/selenium/testPageProblems.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageQueueDetails.php b/frontends/php/tests/selenium/testPageQueueDetails.php index 2816cbb34d2..6a787406a1f 100644 --- a/frontends/php/tests/selenium/testPageQueueDetails.php +++ b/frontends/php/tests/selenium/testPageQueueDetails.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageQueueOverview.php b/frontends/php/tests/selenium/testPageQueueOverview.php index e0eb586315b..a018de7001b 100644 --- a/frontends/php/tests/selenium/testPageQueueOverview.php +++ b/frontends/php/tests/selenium/testPageQueueOverview.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageQueueOverviewByProxy.php b/frontends/php/tests/selenium/testPageQueueOverviewByProxy.php index 22a9d149b86..d100e4d9f53 100644 --- a/frontends/php/tests/selenium/testPageQueueOverviewByProxy.php +++ b/frontends/php/tests/selenium/testPageQueueOverviewByProxy.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageScreens.php b/frontends/php/tests/selenium/testPageScreens.php index 3daa7ca056f..cfaf5bdf863 100644 --- a/frontends/php/tests/selenium/testPageScreens.php +++ b/frontends/php/tests/selenium/testPageScreens.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageSearch.php b/frontends/php/tests/selenium/testPageSearch.php index 8d27d60fcbf..6dab09e8737 100644 --- a/frontends/php/tests/selenium/testPageSearch.php +++ b/frontends/php/tests/selenium/testPageSearch.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageSlideShows.php b/frontends/php/tests/selenium/testPageSlideShows.php index 95033eab6c0..07feb98743c 100644 --- a/frontends/php/tests/selenium/testPageSlideShows.php +++ b/frontends/php/tests/selenium/testPageSlideShows.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageStatusOfTriggers.php b/frontends/php/tests/selenium/testPageStatusOfTriggers.php index abe6e8c8dce..e7c4ec37923 100644 --- a/frontends/php/tests/selenium/testPageStatusOfTriggers.php +++ b/frontends/php/tests/selenium/testPageStatusOfTriggers.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageStatusOfZabbix.php b/frontends/php/tests/selenium/testPageStatusOfZabbix.php index d1fff8c98fa..30964af68f8 100644 --- a/frontends/php/tests/selenium/testPageStatusOfZabbix.php +++ b/frontends/php/tests/selenium/testPageStatusOfZabbix.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageTemplates.php b/frontends/php/tests/selenium/testPageTemplates.php index 0990c7b3501..47e16a39669 100644 --- a/frontends/php/tests/selenium/testPageTemplates.php +++ b/frontends/php/tests/selenium/testPageTemplates.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageTriggerPrototypes.php b/frontends/php/tests/selenium/testPageTriggerPrototypes.php index e85a785026e..3e57036f100 100644 --- a/frontends/php/tests/selenium/testPageTriggerPrototypes.php +++ b/frontends/php/tests/selenium/testPageTriggerPrototypes.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageTriggers.php b/frontends/php/tests/selenium/testPageTriggers.php index 4ef946ef27b..10387976ebf 100644 --- a/frontends/php/tests/selenium/testPageTriggers.php +++ b/frontends/php/tests/selenium/testPageTriggers.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageUserGroups.php b/frontends/php/tests/selenium/testPageUserGroups.php index 065b46b0b38..9f337d54dd0 100644 --- a/frontends/php/tests/selenium/testPageUserGroups.php +++ b/frontends/php/tests/selenium/testPageUserGroups.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageUsers.php b/frontends/php/tests/selenium/testPageUsers.php index 6ae34d9d8ce..ded90658cb5 100644 --- a/frontends/php/tests/selenium/testPageUsers.php +++ b/frontends/php/tests/selenium/testPageUsers.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testPageWeb.php b/frontends/php/tests/selenium/testPageWeb.php index ecadf94a9e0..efaa7786ee2 100644 --- a/frontends/php/tests/selenium/testPageWeb.php +++ b/frontends/php/tests/selenium/testPageWeb.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testTemplateInheritance.php b/frontends/php/tests/selenium/testTemplateInheritance.php index 7d22f8a6a03..db855d491a8 100644 --- a/frontends/php/tests/selenium/testTemplateInheritance.php +++ b/frontends/php/tests/selenium/testTemplateInheritance.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testTriggerDependencies.php b/frontends/php/tests/selenium/testTriggerDependencies.php index 5df4ea6ade0..1bf42a9400b 100644 --- a/frontends/php/tests/selenium/testTriggerDependencies.php +++ b/frontends/php/tests/selenium/testTriggerDependencies.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testTriggerExpressions.php b/frontends/php/tests/selenium/testTriggerExpressions.php index aa5722cafca..e05f0a77f7c 100644 --- a/frontends/php/tests/selenium/testTriggerExpressions.php +++ b/frontends/php/tests/selenium/testTriggerExpressions.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testUrlParameters.php b/frontends/php/tests/selenium/testUrlParameters.php index 7bf625b4c06..6ecc0e76824 100644 --- a/frontends/php/tests/selenium/testUrlParameters.php +++ b/frontends/php/tests/selenium/testUrlParameters.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testUrlUserPermissions.php b/frontends/php/tests/selenium/testUrlUserPermissions.php index 6df2b5ad5ab..b35d47ac663 100644 --- a/frontends/php/tests/selenium/testUrlUserPermissions.php +++ b/frontends/php/tests/selenium/testUrlUserPermissions.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testZBX6339.php b/frontends/php/tests/selenium/testZBX6339.php index 036459ae8bd..664ce17b254 100644 --- a/frontends/php/tests/selenium/testZBX6339.php +++ b/frontends/php/tests/selenium/testZBX6339.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testZBX6648.php b/frontends/php/tests/selenium/testZBX6648.php index 90ff9d30b48..e938de1e6b7 100644 --- a/frontends/php/tests/selenium/testZBX6648.php +++ b/frontends/php/tests/selenium/testZBX6648.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/selenium/testZBX6663.php b/frontends/php/tests/selenium/testZBX6663.php index ae789cad79c..2869e3f43fb 100644 --- a/frontends/php/tests/selenium/testZBX6663.php +++ b/frontends/php/tests/selenium/testZBX6663.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/bootstrap.php b/frontends/php/tests/unit/bootstrap.php index 4d95c71322c..07ce014f634 100644 --- a/frontends/php/tests/unit/bootstrap.php +++ b/frontends/php/tests/unit/bootstrap.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/api/APITest.php b/frontends/php/tests/unit/include/classes/api/APITest.php index 4b76e3127fe..fee577286b1 100644 --- a/frontends/php/tests/unit/include/classes/api/APITest.php +++ b/frontends/php/tests/unit/include/classes/api/APITest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php b/frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php index 5abd98f810c..48b765ff450 100644 --- a/frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php +++ b/frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/core/CGlobalRegexpTest.php b/frontends/php/tests/unit/include/classes/core/CGlobalRegexpTest.php index c02afe33bed..b75c6b5fe5a 100644 --- a/frontends/php/tests/unit/include/classes/core/CGlobalRegexpTest.php +++ b/frontends/php/tests/unit/include/classes/core/CGlobalRegexpTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/core/CRegistryFactoryTest.php b/frontends/php/tests/unit/include/classes/core/CRegistryFactoryTest.php index 96f7afb828d..ce247558808 100644 --- a/frontends/php/tests/unit/include/classes/core/CRegistryFactoryTest.php +++ b/frontends/php/tests/unit/include/classes/core/CRegistryFactoryTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/db/DBTest.php b/frontends/php/tests/unit/include/classes/db/DBTest.php index 928f1e2bbed..f4f5908c48b 100644 --- a/frontends/php/tests/unit/include/classes/db/DBTest.php +++ b/frontends/php/tests/unit/include/classes/db/DBTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/export/writers/CXmlExportWriterTest.php b/frontends/php/tests/unit/include/classes/export/writers/CXmlExportWriterTest.php index f46f0aedbe5..3c07ab2329e 100644 --- a/frontends/php/tests/unit/include/classes/export/writers/CXmlExportWriterTest.php +++ b/frontends/php/tests/unit/include/classes/export/writers/CXmlExportWriterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/helpers/CConditionHelperTest.php b/frontends/php/tests/unit/include/classes/helpers/CConditionHelperTest.php index 016d986c5b4..e2070923ff6 100644 --- a/frontends/php/tests/unit/include/classes/helpers/CConditionHelperTest.php +++ b/frontends/php/tests/unit/include/classes/helpers/CConditionHelperTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/html/CButtonTest.php b/frontends/php/tests/unit/include/classes/html/CButtonTest.php index 24b6023119e..9d4c8ab19aa 100644 --- a/frontends/php/tests/unit/include/classes/html/CButtonTest.php +++ b/frontends/php/tests/unit/include/classes/html/CButtonTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/html/CRedirectButtonTest.php b/frontends/php/tests/unit/include/classes/html/CRedirectButtonTest.php index 1de968f6434..6dd3a7ad364 100644 --- a/frontends/php/tests/unit/include/classes/html/CRedirectButtonTest.php +++ b/frontends/php/tests/unit/include/classes/html/CRedirectButtonTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/html/CRowTest.php b/frontends/php/tests/unit/include/classes/html/CRowTest.php index fdf5fe2e60a..d19d7a62155 100644 --- a/frontends/php/tests/unit/include/classes/html/CRowTest.php +++ b/frontends/php/tests/unit/include/classes/html/CRowTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/html/CSimpleButtonTest.php b/frontends/php/tests/unit/include/classes/html/CSimpleButtonTest.php index 93ff4e59045..65b2bcd99ed 100644 --- a/frontends/php/tests/unit/include/classes/html/CSimpleButtonTest.php +++ b/frontends/php/tests/unit/include/classes/html/CSimpleButtonTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/html/CSubmitButtonTest.php b/frontends/php/tests/unit/include/classes/html/CSubmitButtonTest.php index e88549e3f79..c9df03cd7f1 100644 --- a/frontends/php/tests/unit/include/classes/html/CSubmitButtonTest.php +++ b/frontends/php/tests/unit/include/classes/html/CSubmitButtonTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/html/CSubmitTest.php b/frontends/php/tests/unit/include/classes/html/CSubmitTest.php index 7af1272c5f3..58600a037c7 100644 --- a/frontends/php/tests/unit/include/classes/html/CSubmitTest.php +++ b/frontends/php/tests/unit/include/classes/html/CSubmitTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/html/CTagTest.php b/frontends/php/tests/unit/include/classes/html/CTagTest.php index 8041e9606bb..68d25ce26e2 100644 --- a/frontends/php/tests/unit/include/classes/html/CTagTest.php +++ b/frontends/php/tests/unit/include/classes/html/CTagTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/CImportDataAdapterTest.php b/frontends/php/tests/unit/include/classes/import/CImportDataAdapterTest.php index 9e086ce670d..455a50f6928 100644 --- a/frontends/php/tests/unit/include/classes/import/CImportDataAdapterTest.php +++ b/frontends/php/tests/unit/include/classes/import/CImportDataAdapterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/converters/C10ImportConverterTest.php b/frontends/php/tests/unit/include/classes/import/converters/C10ImportConverterTest.php index aeca82ed0d7..d751d13f66e 100644 --- a/frontends/php/tests/unit/include/classes/import/converters/C10ImportConverterTest.php +++ b/frontends/php/tests/unit/include/classes/import/converters/C10ImportConverterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/converters/C10ItemKeyConverterTest.php b/frontends/php/tests/unit/include/classes/import/converters/C10ItemKeyConverterTest.php index 9e9bc4732c7..c51cb976ee0 100644 --- a/frontends/php/tests/unit/include/classes/import/converters/C10ItemKeyConverterTest.php +++ b/frontends/php/tests/unit/include/classes/import/converters/C10ItemKeyConverterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/converters/C10TriggerConverterTest.php b/frontends/php/tests/unit/include/classes/import/converters/C10TriggerConverterTest.php index a750b192fda..26b478da088 100644 --- a/frontends/php/tests/unit/include/classes/import/converters/C10TriggerConverterTest.php +++ b/frontends/php/tests/unit/include/classes/import/converters/C10TriggerConverterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/converters/C20ImportConverterTest.php b/frontends/php/tests/unit/include/classes/import/converters/C20ImportConverterTest.php index fabfe8b22b8..a6f256471e6 100644 --- a/frontends/php/tests/unit/include/classes/import/converters/C20ImportConverterTest.php +++ b/frontends/php/tests/unit/include/classes/import/converters/C20ImportConverterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/converters/C20ItemKeyConverterTest.php b/frontends/php/tests/unit/include/classes/import/converters/C20ItemKeyConverterTest.php index 0a048295839..b4e305828c9 100644 --- a/frontends/php/tests/unit/include/classes/import/converters/C20ItemKeyConverterTest.php +++ b/frontends/php/tests/unit/include/classes/import/converters/C20ItemKeyConverterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/converters/C20TriggerConverterTest.php b/frontends/php/tests/unit/include/classes/import/converters/C20TriggerConverterTest.php index d030201fc9d..d6adc58ac02 100644 --- a/frontends/php/tests/unit/include/classes/import/converters/C20TriggerConverterTest.php +++ b/frontends/php/tests/unit/include/classes/import/converters/C20TriggerConverterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/converters/C30ImportConverterTest.php b/frontends/php/tests/unit/include/classes/import/converters/C30ImportConverterTest.php index e952539745a..cd98a4e37a3 100644 --- a/frontends/php/tests/unit/include/classes/import/converters/C30ImportConverterTest.php +++ b/frontends/php/tests/unit/include/classes/import/converters/C30ImportConverterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/converters/C32ImportConverterTest.php b/frontends/php/tests/unit/include/classes/import/converters/C32ImportConverterTest.php index 2f60c458dd3..1d3e92452f2 100644 --- a/frontends/php/tests/unit/include/classes/import/converters/C32ImportConverterTest.php +++ b/frontends/php/tests/unit/include/classes/import/converters/C32ImportConverterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/converters/CConverterChainTest.php b/frontends/php/tests/unit/include/classes/import/converters/CConverterChainTest.php index 1c9bc46a7d3..63caec88615 100644 --- a/frontends/php/tests/unit/include/classes/import/converters/CConverterChainTest.php +++ b/frontends/php/tests/unit/include/classes/import/converters/CConverterChainTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/converters/CImportConverterTest.php b/frontends/php/tests/unit/include/classes/import/converters/CImportConverterTest.php index addacb4af17..ac4360d3b67 100644 --- a/frontends/php/tests/unit/include/classes/import/converters/CImportConverterTest.php +++ b/frontends/php/tests/unit/include/classes/import/converters/CImportConverterTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/import/readers/CXmlImportReaderTest.php b/frontends/php/tests/unit/include/classes/import/readers/CXmlImportReaderTest.php index 18ab72f518b..faad3879fe8 100644 --- a/frontends/php/tests/unit/include/classes/import/readers/CXmlImportReaderTest.php +++ b/frontends/php/tests/unit/include/classes/import/readers/CXmlImportReaderTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CConditionFormulaTest.php b/frontends/php/tests/unit/include/classes/parsers/CConditionFormulaTest.php index fbc3b800506..1d49862e477 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CConditionFormulaTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CConditionFormulaTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CDnsParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CDnsParserTest.php index 28d9c67b61f..a7a60125aaf 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CDnsParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CDnsParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CFlexibleIntervalParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CFlexibleIntervalParserTest.php index b14dc26f20e..65808d3df3e 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CFlexibleIntervalParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CFlexibleIntervalParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CFunctionIdParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CFunctionIdParserTest.php index f2819f826ab..ad4aef7f5ec 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CFunctionIdParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CFunctionIdParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php index cd32bea6d6c..13d6e6c5d7f 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CFunctionParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CFunctionParserTest.php index 0b4af605540..d9e8e9c9c71 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CFunctionParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CFunctionParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CIPParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CIPParserTest.php index 6d7b8948d8d..69b261f2830 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CIPParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CIPParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CIPRangeParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CIPRangeParserTest.php index 20c1db5d62f..4574af01218 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CIPRangeParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CIPRangeParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CIPv4ParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CIPv4ParserTest.php index b8729deee19..b85cfd06538 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CIPv4ParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CIPv4ParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CIPv6ParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CIPv6ParserTest.php index da3d51e80ec..ee84126f72b 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CIPv6ParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CIPv6ParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CItemKeyTest.php b/frontends/php/tests/unit/include/classes/parsers/CItemKeyTest.php index 778f117459e..9f61cbdc678 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CItemKeyTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CItemKeyTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CLLDMacroParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CLLDMacroParserTest.php index eecb48b8634..6a971705b53 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CLLDMacroParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CLLDMacroParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CMacroParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CMacroParserTest.php index ef363c8fd8f..29a53c26d68 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CMacroParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CMacroParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CParserTest.php index 31673544bc8..d71d34c91a6 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CReferenceParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CReferenceParserTest.php index 0bdc582ab66..a0afaa64dca 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CReferenceParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CReferenceParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CSchedulingIntervalParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CSchedulingIntervalParserTest.php index c3ffe780bfb..7e7ef4a1de3 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CSchedulingIntervalParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CSchedulingIntervalParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CSetParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CSetParserTest.php index 0ea0afeffbf..c786b32690a 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CSetParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CSetParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CSimpleIntervalParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CSimpleIntervalParserTest.php index 074c030fd96..a4e1024b9dd 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CSimpleIntervalParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CSimpleIntervalParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CTimePeriodParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CTimePeriodParserTest.php index 5f23eaa1f4d..b7d76012ea6 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CTimePeriodParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CTimePeriodParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CTimePeriodsParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CTimePeriodsParserTest.php index 53f3133f194..b6d39c28cd5 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CTimePeriodsParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CTimePeriodsParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CTriggerExpressionTest.php b/frontends/php/tests/unit/include/classes/parsers/CTriggerExpressionTest.php index 8094ba71d40..925709a535e 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CTriggerExpressionTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CTriggerExpressionTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CUpdateIntervalParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CUpdateIntervalParserTest.php index a6ef82da92a..4d86c41aa0e 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CUpdateIntervalParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CUpdateIntervalParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CUserMacroParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CUserMacroParserTest.php index 8e7542637da..db1cac401e2 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CUserMacroParserTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CUserMacroParserTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/parsers/CValidationRuleTest.php b/frontends/php/tests/unit/include/classes/parsers/CValidationRuleTest.php index d7c8d096e66..d8014f43355 100644 --- a/frontends/php/tests/unit/include/classes/parsers/CValidationRuleTest.php +++ b/frontends/php/tests/unit/include/classes/parsers/CValidationRuleTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php b/frontends/php/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php index 36f5f3512c5..b1f40908f7f 100644 --- a/frontends/php/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php +++ b/frontends/php/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php b/frontends/php/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php index 069d597aeb3..0c945d61cc4 100644 --- a/frontends/php/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php +++ b/frontends/php/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CActionCondValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CActionCondValidatorTest.php index bb262fee1e1..54cf7b72fd5 100644 --- a/frontends/php/tests/unit/include/classes/validators/CActionCondValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CActionCondValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CApiInputValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CApiInputValidatorTest.php index 0fbd480e30f..19a5426a453 100644 --- a/frontends/php/tests/unit/include/classes/validators/CApiInputValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CApiInputValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php index 7c0a9741fdd..e072c8fb89e 100644 --- a/frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php index b231f3a9d55..ce5c14d2a3c 100644 --- a/frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CConditionValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CConditionValidatorTest.php index b4dbdcd62a9..0e02a4da687 100644 --- a/frontends/php/tests/unit/include/classes/validators/CConditionValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CConditionValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CDecimalStringValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CDecimalStringValidatorTest.php index 3fca57a6b64..d0ebfb5e87a 100644 --- a/frontends/php/tests/unit/include/classes/validators/CDecimalStringValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CDecimalStringValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CDecimalValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CDecimalValidatorTest.php index 20cd3cff1d6..894f6e6749a 100644 --- a/frontends/php/tests/unit/include/classes/validators/CDecimalValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CDecimalValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CEmailValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CEmailValidatorTest.php index da269bc3311..fed7705694b 100644 --- a/frontends/php/tests/unit/include/classes/validators/CEmailValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CEmailValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CFunctionValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CFunctionValidatorTest.php index 9d899eab727..af548de5c6a 100644 --- a/frontends/php/tests/unit/include/classes/validators/CFunctionValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CFunctionValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php index 07bd8107367..5476db56619 100644 --- a/frontends/php/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CIdValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CIdValidatorTest.php index 0c9854a5ee7..4187741ca4c 100644 --- a/frontends/php/tests/unit/include/classes/validators/CIdValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CIdValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php index c97cb52d93b..5da659ac1c2 100644 --- a/frontends/php/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php index ea1db4a7aa0..e1d76c7400e 100644 --- a/frontends/php/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CRegexValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CRegexValidatorTest.php index e54247ef488..6dda2a1a6ea 100644 --- a/frontends/php/tests/unit/include/classes/validators/CRegexValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CRegexValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CStringValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CStringValidatorTest.php index b8c55f9a382..0ce43f7eeea 100644 --- a/frontends/php/tests/unit/include/classes/validators/CStringValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CStringValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/CValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CValidatorTest.php index ac45a652200..453f04610b7 100644 --- a/frontends/php/tests/unit/include/classes/validators/CValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/CValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/classes/validators/hostgroup/CHostGroupNameValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/hostgroup/CHostGroupNameValidatorTest.php index bd64a702a09..216a951acd2 100644 --- a/frontends/php/tests/unit/include/classes/validators/hostgroup/CHostGroupNameValidatorTest.php +++ b/frontends/php/tests/unit/include/classes/validators/hostgroup/CHostGroupNameValidatorTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/function_convert_unitsTest.php b/frontends/php/tests/unit/include/function_convert_unitsTest.php index b36060e800b..cbfbaf25935 100644 --- a/frontends/php/tests/unit/include/function_convert_unitsTest.php +++ b/frontends/php/tests/unit/include/function_convert_unitsTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php b/frontends/php/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php index 438df343405..ee770065053 100644 --- a/frontends/php/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php +++ b/frontends/php/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/services/CalculateItServiceStatusTest.php b/frontends/php/tests/unit/include/services/CalculateItServiceStatusTest.php index c8f3302656f..183cca64443 100644 --- a/frontends/php/tests/unit/include/services/CalculateItServiceStatusTest.php +++ b/frontends/php/tests/unit/include/services/CalculateItServiceStatusTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/str2memTest.php b/frontends/php/tests/unit/include/str2memTest.php index 677c7166e56..4fbd45ae4a6 100644 --- a/frontends/php/tests/unit/include/str2memTest.php +++ b/frontends/php/tests/unit/include/str2memTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/triggerExpressionReplaceHostTest.php b/frontends/php/tests/unit/include/triggerExpressionReplaceHostTest.php index d50e02cb6d7..0ded87d631d 100644 --- a/frontends/php/tests/unit/include/triggerExpressionReplaceHostTest.php +++ b/frontends/php/tests/unit/include/triggerExpressionReplaceHostTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/triggers/EvalExpressionDataTest.php b/frontends/php/tests/unit/include/triggers/EvalExpressionDataTest.php index b8257fe7129..63c3a4b2717 100644 --- a/frontends/php/tests/unit/include/triggers/EvalExpressionDataTest.php +++ b/frontends/php/tests/unit/include/triggers/EvalExpressionDataTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tests/unit/include/zbxjsvalueTest.php b/frontends/php/tests/unit/include/zbxjsvalueTest.php index a24109c507b..3a5b636ba01 100644 --- a/frontends/php/tests/unit/include/zbxjsvalueTest.php +++ b/frontends/php/tests/unit/include/zbxjsvalueTest.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/toptriggers.php b/frontends/php/toptriggers.php index 27c7a2acf17..4c145b1a08c 100644 --- a/frontends/php/toptriggers.php +++ b/frontends/php/toptriggers.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tr_comments.php b/frontends/php/tr_comments.php index e6e23827396..60ea5ab6d22 100644 --- a/frontends/php/tr_comments.php +++ b/frontends/php/tr_comments.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tr_events.php b/frontends/php/tr_events.php index e94d27c854c..4e28e2b58a6 100644 --- a/frontends/php/tr_events.php +++ b/frontends/php/tr_events.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/tr_status.php b/frontends/php/tr_status.php index 62241d16753..7931c7289be 100644 --- a/frontends/php/tr_status.php +++ b/frontends/php/tr_status.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/trigger_prototypes.php b/frontends/php/trigger_prototypes.php index 133bf168310..93404760062 100644 --- a/frontends/php/trigger_prototypes.php +++ b/frontends/php/trigger_prototypes.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/triggers.php b/frontends/php/triggers.php index faa85fe5fd2..9fe3c907c1d 100644 --- a/frontends/php/triggers.php +++ b/frontends/php/triggers.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/usergrps.php b/frontends/php/usergrps.php index 5d854f4fc77..87bfcca1297 100644 --- a/frontends/php/usergrps.php +++ b/frontends/php/usergrps.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/users.php b/frontends/php/users.php index 31cb6f96308..c7aa3ec0a14 100644 --- a/frontends/php/users.php +++ b/frontends/php/users.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/frontends/php/zabbix.php b/frontends/php/zabbix.php index d937de2ac5c..023aa2683b1 100644 --- a/frontends/php/zabbix.php +++ b/frontends/php/zabbix.php @@ -1,7 +1,7 @@ <?php /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/alias.h b/include/alias.h index bb8bec43269..5b5ef69c6f9 100644 --- a/include/alias.h +++ b/include/alias.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/base64.h b/include/base64.h index 58c04ba3029..f731fd45c1d 100644 --- a/include/base64.h +++ b/include/base64.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/cfg.h b/include/cfg.h index 3461cbad227..02a2cada622 100644 --- a/include/cfg.h +++ b/include/cfg.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/common.h b/include/common.h index 200dc0db6bd..d0c4bc7e4e4 100644 --- a/include/common.h +++ b/include/common.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -497,6 +497,40 @@ zbx_group_status_type_t; #define ZBX_PROGRAM_TYPE_GET 0x20 const char *get_program_type_string(unsigned char program_type); +/* process type */ +#define ZBX_PROCESS_TYPE_POLLER 0 +#define ZBX_PROCESS_TYPE_UNREACHABLE 1 +#define ZBX_PROCESS_TYPE_IPMIPOLLER 2 +#define ZBX_PROCESS_TYPE_PINGER 3 +#define ZBX_PROCESS_TYPE_JAVAPOLLER 4 +#define ZBX_PROCESS_TYPE_HTTPPOLLER 5 +#define ZBX_PROCESS_TYPE_TRAPPER 6 +#define ZBX_PROCESS_TYPE_SNMPTRAPPER 7 +#define ZBX_PROCESS_TYPE_PROXYPOLLER 8 +#define ZBX_PROCESS_TYPE_ESCALATOR 9 +#define ZBX_PROCESS_TYPE_HISTSYNCER 10 +#define ZBX_PROCESS_TYPE_DISCOVERER 11 +#define ZBX_PROCESS_TYPE_ALERTER 12 +#define ZBX_PROCESS_TYPE_TIMER 13 +#define ZBX_PROCESS_TYPE_HOUSEKEEPER 14 +#define ZBX_PROCESS_TYPE_DATASENDER 15 +#define ZBX_PROCESS_TYPE_CONFSYNCER 16 +#define ZBX_PROCESS_TYPE_HEARTBEAT 17 +#define ZBX_PROCESS_TYPE_SELFMON 18 +#define ZBX_PROCESS_TYPE_VMWARE 19 +#define ZBX_PROCESS_TYPE_COLLECTOR 20 +#define ZBX_PROCESS_TYPE_LISTENER 21 +#define ZBX_PROCESS_TYPE_ACTIVE_CHECKS 22 +#define ZBX_PROCESS_TYPE_TASKMANAGER 23 +#define ZBX_PROCESS_TYPE_IPMIMANAGER 24 +#define ZBX_PROCESS_TYPE_ALERTMANAGER 25 +#define ZBX_PROCESS_TYPE_PREPROCMAN 26 +#define ZBX_PROCESS_TYPE_PREPROCESSOR 27 +#define ZBX_PROCESS_TYPE_COUNT 28 /* number of process types */ +#define ZBX_PROCESS_TYPE_UNKNOWN 255 +const char *get_process_type_string(unsigned char process_type); +int get_process_type_by_name(const char *proc_type_str); + /* maintenance */ typedef enum { diff --git a/include/comms.h b/include/comms.h index 657e4a130ae..f0c8ffa3ed6 100644 --- a/include/comms.h +++ b/include/comms.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/daemon.h b/include/daemon.h index 0205234c8ed..eb6e8d39a07 100644 --- a/include/daemon.h +++ b/include/daemon.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -32,6 +32,7 @@ int daemon_start(int allow_root, const char *user, unsigned int flags); void daemon_stop(void); int zbx_sigusr_send(int flags); +void zbx_set_sigusr_handler(void (*handler)(int flags)); #define ZBX_IS_RUNNING() 1 #define ZBX_DO_EXIT() diff --git a/include/db.h b/include/db.h index ba9bc9780d5..6658dc4eb2a 100644 --- a/include/db.h +++ b/include/db.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/dbcache.h b/include/dbcache.h index 467ff01fd37..95bf4e43113 100644 --- a/include/dbcache.h +++ b/include/dbcache.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/dbschema.h b/include/dbschema.h index 279f7a0c630..0a41c8b97b3 100644 --- a/include/dbschema.h +++ b/include/dbschema.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/discovery.h b/include/discovery.h index fffccea3d7b..e7c61068826 100644 --- a/include/discovery.h +++ b/include/discovery.h @@ -1,7 +1,7 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/disk.h b/include/disk.h index 1b11c6a9289..9d370d8afcf 100644 --- a/include/disk.h +++ b/include/disk.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/ipc.h b/include/ipc.h index b1fcefeadee..46b5b525ae2 100644 --- a/include/ipc.h +++ b/include/ipc.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/log.h b/include/log.h index dc6e9084fde..5857cf604a0 100644 --- a/include/log.h +++ b/include/log.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/memalloc.h b/include/memalloc.h index 3130bcca4bd..f6f760e4cf4 100644 --- a/include/memalloc.h +++ b/include/memalloc.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/module.h b/include/module.h index a7e7d872318..58bddb6b8e6 100644 --- a/include/module.h +++ b/include/module.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/mutexs.h b/include/mutexs.h index 7df360107eb..c227ff4ac17 100644 --- a/include/mutexs.h +++ b/include/mutexs.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/perfmon.h b/include/perfmon.h index 300bf4f9c96..ba9c303ddba 100644 --- a/include/perfmon.h +++ b/include/perfmon.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/pid.h b/include/pid.h index d031c014b0a..cdff9b72c44 100644 --- a/include/pid.h +++ b/include/pid.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/preproc.h b/include/preproc.h index 6c52c63dd1d..9c633af9ffb 100644 --- a/include/preproc.h +++ b/include/preproc.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/proxy.h b/include/proxy.h index 5679cdc1eef..386b559dd18 100644 --- a/include/proxy.h +++ b/include/proxy.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/service.h b/include/service.h index 8e3c8f2b8b0..5f3da0f4d32 100644 --- a/include/service.h +++ b/include/service.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/setproctitle.h b/include/setproctitle.h index ff0b23bb09d..a3735f744e8 100644 --- a/include/setproctitle.h +++ b/include/setproctitle.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/sighandler.h b/include/sighandler.h index 09ec23193c8..daf02678c32 100644 --- a/include/sighandler.h +++ b/include/sighandler.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/symbols.h b/include/symbols.h index 7f292442cd7..72ac1a8f8a4 100644 --- a/include/symbols.h +++ b/include/symbols.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/sysinc.h b/include/sysinc.h index 7e75f9420a0..b05bd106af1 100644 --- a/include/sysinc.h +++ b/include/sysinc.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/sysinfo.h b/include/sysinfo.h index 233f32402b6..126c4814750 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/telnet.h b/include/telnet.h index 49ca1d9cee3..1550b3ce278 100644 --- a/include/telnet.h +++ b/include/telnet.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/threads.h b/include/threads.h index e1a7f8e8538..9bc0812b499 100644 --- a/include/threads.h +++ b/include/threads.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/version.h b/include/version.h index 8ba51d65734..d5df34fc871 100644 --- a/include/version.h +++ b/include/version.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -24,12 +24,12 @@ #define ZBX_STR(str) ZBX_STR2(str) #define APPLICATION_NAME "Zabbix Agent" -#define ZABBIX_REVDATE "20 December 2017" +#define ZABBIX_REVDATE "8 January 2018" #define ZABBIX_VERSION_MAJOR 4 #define ZABBIX_VERSION_MINOR 0 #define ZABBIX_VERSION_PATCH 0 #define ZABBIX_VERSION_REVISION {ZABBIX_REVISION} -#define ZABBIX_VERSION_RC "alpha2" +#define ZABBIX_VERSION_RC "alpha3" #define ZABBIX_VERSION ZBX_STR(ZABBIX_VERSION_MAJOR) "." ZBX_STR(ZABBIX_VERSION_MINOR) "." \ ZBX_STR(ZABBIX_VERSION_PATCH) ZABBIX_VERSION_RC #define ZABBIX_REVISION ZBX_STR(ZABBIX_VERSION_REVISION) diff --git a/include/zbxalgo.h b/include/zbxalgo.h index fca1228a3e6..181cead1766 100644 --- a/include/zbxalgo.h +++ b/include/zbxalgo.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxdb.h b/include/zbxdb.h index e95d6f977cf..03cbedbd7ff 100644 --- a/include/zbxdb.h +++ b/include/zbxdb.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxdbupgrade.h b/include/zbxdbupgrade.h index 204155f7b8c..79570363600 100644 --- a/include/zbxdbupgrade.h +++ b/include/zbxdbupgrade.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxexec.h b/include/zbxexec.h index 336a0fedffd..17df089a6fa 100644 --- a/include/zbxexec.h +++ b/include/zbxexec.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxhistory.h b/include/zbxhistory.h index 940911d1b74..f995865aa88 100644 --- a/include/zbxhistory.h +++ b/include/zbxhistory.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxhttp.h b/include/zbxhttp.h index e46aa08b09b..db2c7c45858 100644 --- a/include/zbxhttp.h +++ b/include/zbxhttp.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxicmpping.h b/include/zbxicmpping.h index 5c29f464789..41a7fabd564 100644 --- a/include/zbxicmpping.h +++ b/include/zbxicmpping.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxipcservice.h b/include/zbxipcservice.h index 826dccde070..87e5f366e38 100644 --- a/include/zbxipcservice.h +++ b/include/zbxipcservice.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxjson.h b/include/zbxjson.h index 06e9497caa6..22ad4f7a6df 100644 --- a/include/zbxjson.h +++ b/include/zbxjson.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxmedia.h b/include/zbxmedia.h index 7562a5f824c..a2765316019 100644 --- a/include/zbxmedia.h +++ b/include/zbxmedia.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxmodules.h b/include/zbxmodules.h index e3b28d33c6f..74c77239f4e 100644 --- a/include/zbxmodules.h +++ b/include/zbxmodules.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxnix.h b/include/zbxnix.h index cba7e2b5299..ad494f21920 100644 --- a/include/zbxnix.h +++ b/include/zbxnix.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxregexp.h b/include/zbxregexp.h index 34a7fa32e1f..651c714a5fd 100644 --- a/include/zbxregexp.h +++ b/include/zbxregexp.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxself.h b/include/zbxself.h index 5dd71302f00..a165a27a76b 100644 --- a/include/zbxself.h +++ b/include/zbxself.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -20,44 +20,9 @@ #ifndef ZABBIX_ZBXSELF_H #define ZABBIX_ZBXSELF_H -#define ZBX_PROCESS_STATE_IDLE 0 -#define ZBX_PROCESS_STATE_BUSY 1 -#define ZBX_PROCESS_STATE_COUNT 2 /* number of process states */ - -#define ZBX_PROCESS_TYPE_POLLER 0 -#define ZBX_PROCESS_TYPE_UNREACHABLE 1 -#define ZBX_PROCESS_TYPE_IPMIPOLLER 2 -#define ZBX_PROCESS_TYPE_PINGER 3 -#define ZBX_PROCESS_TYPE_JAVAPOLLER 4 -#define ZBX_PROCESS_TYPE_HTTPPOLLER 5 -#define ZBX_PROCESS_TYPE_TRAPPER 6 -#define ZBX_PROCESS_TYPE_SNMPTRAPPER 7 -#define ZBX_PROCESS_TYPE_PROXYPOLLER 8 -#define ZBX_PROCESS_TYPE_ESCALATOR 9 -#define ZBX_PROCESS_TYPE_HISTSYNCER 10 -#define ZBX_PROCESS_TYPE_DISCOVERER 11 -#define ZBX_PROCESS_TYPE_ALERTER 12 -#define ZBX_PROCESS_TYPE_TIMER 13 -#define ZBX_PROCESS_TYPE_HOUSEKEEPER 14 -#define ZBX_PROCESS_TYPE_DATASENDER 15 -#define ZBX_PROCESS_TYPE_CONFSYNCER 16 -#define ZBX_PROCESS_TYPE_HEARTBEAT 17 -#define ZBX_PROCESS_TYPE_SELFMON 18 -#define ZBX_PROCESS_TYPE_VMWARE 19 -#define ZBX_PROCESS_TYPE_COLLECTOR 20 -#define ZBX_PROCESS_TYPE_LISTENER 21 -#define ZBX_PROCESS_TYPE_ACTIVE_CHECKS 22 -#define ZBX_PROCESS_TYPE_TASKMANAGER 23 -#define ZBX_PROCESS_TYPE_IPMIMANAGER 24 -#define ZBX_PROCESS_TYPE_ALERTMANAGER 25 -#define ZBX_PROCESS_TYPE_PREPROCMAN 26 -#define ZBX_PROCESS_TYPE_PREPROCESSOR 27 -#define ZBX_PROCESS_TYPE_COUNT 28 /* number of process types */ -#define ZBX_PROCESS_TYPE_UNKNOWN 255 - -#define ZBX_RTC_LOG_SCOPE_FLAG 0x80 -#define ZBX_RTC_LOG_SCOPE_PROC 0 -#define ZBX_RTC_LOG_SCOPE_PID 1 +#define ZBX_PROCESS_STATE_IDLE 0 +#define ZBX_PROCESS_STATE_BUSY 1 +#define ZBX_PROCESS_STATE_COUNT 2 /* number of process states */ #define ZBX_AGGR_FUNC_ONE 0 #define ZBX_AGGR_FUNC_AVG 1 @@ -66,22 +31,19 @@ #define ZBX_SELFMON_DELAY 1 -int get_process_type_by_name(const char *proc_type_str); -int get_process_type_forks(unsigned char process_type); -const char *get_process_type_string(unsigned char process_type); +int get_process_type_forks(unsigned char process_type); #ifndef _WINDOWS -int init_selfmon_collector(char **error); -void free_selfmon_collector(void); -void update_selfmon_counter(unsigned char state); -void collect_selfmon_stats(void); -void get_selfmon_stats(unsigned char process_type, unsigned char aggr_func, int process_num, - unsigned char state, double *value); -void zbx_sleep_loop(int sleeptime); -void zbx_sleep_forever(void); -void zbx_wakeup(void); -int zbx_sleep_get_remainder(void); -void zbx_set_sigusr_handler(void (*handler)(int flags)); +int init_selfmon_collector(char **error); +void free_selfmon_collector(void); +void update_selfmon_counter(unsigned char state); +void collect_selfmon_stats(void); +void get_selfmon_stats(unsigned char process_type, unsigned char aggr_func, int process_num, + unsigned char state, double *value); +void zbx_sleep_loop(int sleeptime); +void zbx_sleep_forever(void); +void zbx_wakeup(void); +int zbx_sleep_get_remainder(void); #endif #endif /* ZABBIX_ZBXSELF_H */ diff --git a/include/zbxserialize.h b/include/zbxserialize.h index 5af9212d6dc..35167a2ad38 100644 --- a/include/zbxserialize.h +++ b/include/zbxserialize.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxserver.h b/include/zbxserver.h index ddf80ae0cf9..5a1da4675de 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxtasks.h b/include/zbxtasks.h index bddee908fba..aaf1a300a82 100644 --- a/include/zbxtasks.h +++ b/include/zbxtasks.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/include/zbxtypes.h b/include/zbxtypes.h index 7ff09649abf..afc8d46afa1 100644 --- a/include/zbxtypes.h +++ b/include/zbxtypes.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/m4/libxml2.m4 b/m4/libxml2.m4 index f6a3ea3916f..945d6523ee9 100644 --- a/m4/libxml2.m4 +++ b/m4/libxml2.m4 @@ -1,6 +1,6 @@ # # Zabbix -# Copyright (C) 2001-2017 Zabbix SIA +# Copyright (C) 2001-2018 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/misc/init.d/debian/zabbix-agent b/misc/init.d/debian/zabbix-agent index 2c8eeefe120..76c14a54b9f 100755 --- a/misc/init.d/debian/zabbix-agent +++ b/misc/init.d/debian/zabbix-agent @@ -2,7 +2,7 @@ # # Zabbix agent start/stop script. # -# Copyright (C) 2001-2017 Zabbix SIA +# Copyright (C) 2001-2018 Zabbix SIA NAME=zabbix_agentd DAEMON=/usr/local/sbin/${NAME} diff --git a/misc/init.d/debian/zabbix-server b/misc/init.d/debian/zabbix-server index ddd3be5a6a0..9587cfbedc6 100755 --- a/misc/init.d/debian/zabbix-server +++ b/misc/init.d/debian/zabbix-server @@ -2,7 +2,7 @@ # # Zabbix daemon start/stop script. # -# Copyright (C) 2001-2017 Zabbix SIA +# Copyright (C) 2001-2018 Zabbix SIA NAME=zabbix_server DAEMON=/usr/local/sbin/${NAME} diff --git a/misc/init.d/tru64/zabbix_agentd b/misc/init.d/tru64/zabbix_agentd index ed7e42a0ec0..5948e5c04f5 100644 --- a/misc/init.d/tru64/zabbix_agentd +++ b/misc/init.d/tru64/zabbix_agentd @@ -1,7 +1,7 @@ #!/bin/sh # Zabbix -# Copyright (C) 2001-2017 Zabbix SIA +# Copyright (C) 2001-2018 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/misc/init.d/tru64/zabbix_server b/misc/init.d/tru64/zabbix_server index c01c2c24664..917ac1223e5 100644 --- a/misc/init.d/tru64/zabbix_server +++ b/misc/init.d/tru64/zabbix_server @@ -1,7 +1,7 @@ #!/bin/sh # Zabbix -# Copyright (C) 2001-2017 Zabbix SIA +# Copyright (C) 2001-2018 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/misc/snmptrap/snmptrap.sh b/misc/snmptrap/snmptrap.sh index 2e99bab83a4..daa6d986b7a 100755 --- a/misc/snmptrap/snmptrap.sh +++ b/misc/snmptrap/snmptrap.sh @@ -1,7 +1,7 @@ #!/bin/bash # # Zabbix -# Copyright (C) 2001-2017 Zabbix SIA +# Copyright (C) 2001-2018 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/misc/snmptrap/zabbix_trap_receiver.pl b/misc/snmptrap/zabbix_trap_receiver.pl index fc54a25169a..3f7937a8fa3 100644 --- a/misc/snmptrap/zabbix_trap_receiver.pl +++ b/misc/snmptrap/zabbix_trap_receiver.pl @@ -2,7 +2,7 @@ # # Zabbix -# Copyright (C) 2001-2017 Zabbix SIA +# Copyright (C) 2001-2018 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/sass/stylesheets/sass/_colors.scss b/sass/stylesheets/sass/_colors.scss index a0fb4265bd8..f60e8b00176 100644 --- a/sass/stylesheets/sass/_colors.scss +++ b/sass/stylesheets/sass/_colors.scss @@ -65,6 +65,7 @@ $form-font-color: #1f2c33 !default; $form-bg-color: #fff !default; $form-border-color: #acbbc2 !default; $form-border-focus-color: #02659f !default; +$form-label-asterisk-color: $red; $form-disabled-font-color: #acbbc2 !default; $form-disabled-bg-color: #ebebeb !default; diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss index ad731614add..b3ec8dbbbfa 100644 --- a/sass/stylesheets/sass/screen.scss +++ b/sass/stylesheets/sass/screen.scss @@ -1707,6 +1707,17 @@ footer { } label { + &.form-label-asterisk { + &:before { + color: $form-label-asterisk-color; + display: inline-block; + content: '*'; + margin-right: 0.3em; + } + } +} + +label { input[type="checkbox"] { margin-right: 3px; } @@ -3282,10 +3293,6 @@ $form-icon-btn: ( border-top: 1px solid $table-border-color; } - .table-forms-td-left { - text-align: left; - } - .table-forms-td-right { td { diff --git a/src/libs/Makefile.am b/src/libs/Makefile.am index c2626cd6412..8f1d82fead1 100644 --- a/src/libs/Makefile.am +++ b/src/libs/Makefile.am @@ -59,11 +59,6 @@ PROXY_SUBDIRS = \ zbxself \ zbxtasks \ zbxhistory -else -if AGENT -AGENT_SUBDIRS = \ - zbxself -endif endif endif diff --git a/src/libs/zbxalgo/algodefs.c b/src/libs/zbxalgo/algodefs.c index da6ba17c186..2871a768090 100644 --- a/src/libs/zbxalgo/algodefs.c +++ b/src/libs/zbxalgo/algodefs.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxalgo/binaryheap.c b/src/libs/zbxalgo/binaryheap.c index fff0d5cc9fd..aff8aa5d6b1 100644 --- a/src/libs/zbxalgo/binaryheap.c +++ b/src/libs/zbxalgo/binaryheap.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxalgo/evaluate.c b/src/libs/zbxalgo/evaluate.c index 6276ea32e37..03e217e7251 100644 --- a/src/libs/zbxalgo/evaluate.c +++ b/src/libs/zbxalgo/evaluate.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxalgo/hashmap.c b/src/libs/zbxalgo/hashmap.c index b39a83d5ac3..1082590011d 100644 --- a/src/libs/zbxalgo/hashmap.c +++ b/src/libs/zbxalgo/hashmap.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxalgo/hashset.c b/src/libs/zbxalgo/hashset.c index b718056144d..4a291156823 100644 --- a/src/libs/zbxalgo/hashset.c +++ b/src/libs/zbxalgo/hashset.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxalgo/int128.c b/src/libs/zbxalgo/int128.c index 51b0efc3c24..66ac8015dd5 100644 --- a/src/libs/zbxalgo/int128.c +++ b/src/libs/zbxalgo/int128.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxalgo/prediction.c b/src/libs/zbxalgo/prediction.c index 20aec38d74d..58a31e814cd 100644 --- a/src/libs/zbxalgo/prediction.c +++ b/src/libs/zbxalgo/prediction.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxalgo/queue.c b/src/libs/zbxalgo/queue.c index 6e6b81b0e7b..7b4b37e72f7 100644 --- a/src/libs/zbxalgo/queue.c +++ b/src/libs/zbxalgo/queue.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxalgo/queue_test.c b/src/libs/zbxalgo/queue_test.c index 9fa6d07b31d..186789ba961 100644 --- a/src/libs/zbxalgo/queue_test.c +++ b/src/libs/zbxalgo/queue_test.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxalgo/vector.c b/src/libs/zbxalgo/vector.c index abf4b75c2ed..b59437f24a7 100644 --- a/src/libs/zbxalgo/vector.c +++ b/src/libs/zbxalgo/vector.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxalgo/vectorimpl.h b/src/libs/zbxalgo/vectorimpl.h index 73fe83c1fd4..aede4f4f55d 100644 --- a/src/libs/zbxalgo/vectorimpl.h +++ b/src/libs/zbxalgo/vectorimpl.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcommon/alias.c b/src/libs/zbxcommon/alias.c index 8cd5217f51a..02117dcd4dd 100644 --- a/src/libs/zbxcommon/alias.c +++ b/src/libs/zbxcommon/alias.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcommon/comms.c b/src/libs/zbxcommon/comms.c index 91b0e8aed37..e4d324ca754 100644 --- a/src/libs/zbxcommon/comms.c +++ b/src/libs/zbxcommon/comms.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcommon/file.c b/src/libs/zbxcommon/file.c index a93c6571723..9b8b879dc5c 100644 --- a/src/libs/zbxcommon/file.c +++ b/src/libs/zbxcommon/file.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcommon/iprange.c b/src/libs/zbxcommon/iprange.c index 73b90187592..91fa7c18164 100644 --- a/src/libs/zbxcommon/iprange.c +++ b/src/libs/zbxcommon/iprange.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcommon/misc.c b/src/libs/zbxcommon/misc.c index 91adf5d04e4..01b4fd580bf 100644 --- a/src/libs/zbxcommon/misc.c +++ b/src/libs/zbxcommon/misc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcommon/setproctitle.c b/src/libs/zbxcommon/setproctitle.c index fe757d14449..bb1f73d7d1b 100644 --- a/src/libs/zbxcommon/setproctitle.c +++ b/src/libs/zbxcommon/setproctitle.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcommon/str.c b/src/libs/zbxcommon/str.c index ac96f9703be..79dbbaecdf9 100644 --- a/src/libs/zbxcommon/str.c +++ b/src/libs/zbxcommon/str.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -26,7 +26,7 @@ #endif static const char copyright_message[] = - "Copyright (C) 2017 Zabbix SIA\n" + "Copyright (C) 2018 Zabbix SIA\n" "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>.\n" "This is free software: you are free to change and redistribute it according to\n" "the license. There is NO WARRANTY, to the extent permitted by law."; @@ -1930,6 +1930,99 @@ int cmp_key_id(const char *key_1, const char *key_2) return ('\0' == *p || '[' == *p) && ('\0' == *q || '[' == *q) ? SUCCEED : FAIL; } +/****************************************************************************** + * * + * Function: get_process_type_string * + * * + * Purpose: Returns process name * + * * + * Parameters: process_type - [IN] process type; ZBX_PROCESS_TYPE_* * + * * + * Author: Alexander Vladishev * + * * + * Comments: used in internals checks zabbix["process",...], process titles * + * and log files * + * * + ******************************************************************************/ +const char *get_process_type_string(unsigned char proc_type) +{ + switch (proc_type) + { + case ZBX_PROCESS_TYPE_POLLER: + return "poller"; + case ZBX_PROCESS_TYPE_UNREACHABLE: + return "unreachable poller"; + case ZBX_PROCESS_TYPE_IPMIPOLLER: + return "ipmi poller"; + case ZBX_PROCESS_TYPE_PINGER: + return "icmp pinger"; + case ZBX_PROCESS_TYPE_JAVAPOLLER: + return "java poller"; + case ZBX_PROCESS_TYPE_HTTPPOLLER: + return "http poller"; + case ZBX_PROCESS_TYPE_TRAPPER: + return "trapper"; + case ZBX_PROCESS_TYPE_SNMPTRAPPER: + return "snmp trapper"; + case ZBX_PROCESS_TYPE_PROXYPOLLER: + return "proxy poller"; + case ZBX_PROCESS_TYPE_ESCALATOR: + return "escalator"; + case ZBX_PROCESS_TYPE_HISTSYNCER: + return "history syncer"; + case ZBX_PROCESS_TYPE_DISCOVERER: + return "discoverer"; + case ZBX_PROCESS_TYPE_ALERTER: + return "alerter"; + case ZBX_PROCESS_TYPE_TIMER: + return "timer"; + case ZBX_PROCESS_TYPE_HOUSEKEEPER: + return "housekeeper"; + case ZBX_PROCESS_TYPE_DATASENDER: + return "data sender"; + case ZBX_PROCESS_TYPE_CONFSYNCER: + return "configuration syncer"; + case ZBX_PROCESS_TYPE_HEARTBEAT: + return "heartbeat sender"; + case ZBX_PROCESS_TYPE_SELFMON: + return "self-monitoring"; + case ZBX_PROCESS_TYPE_VMWARE: + return "vmware collector"; + case ZBX_PROCESS_TYPE_COLLECTOR: + return "collector"; + case ZBX_PROCESS_TYPE_LISTENER: + return "listener"; + case ZBX_PROCESS_TYPE_ACTIVE_CHECKS: + return "active checks"; + case ZBX_PROCESS_TYPE_TASKMANAGER: + return "task manager"; + case ZBX_PROCESS_TYPE_IPMIMANAGER: + return "ipmi manager"; + case ZBX_PROCESS_TYPE_ALERTMANAGER: + return "alert manager"; + case ZBX_PROCESS_TYPE_PREPROCMAN: + return "preprocessing manager"; + case ZBX_PROCESS_TYPE_PREPROCESSOR: + return "preprocessing worker"; + } + + THIS_SHOULD_NEVER_HAPPEN; + exit(EXIT_FAILURE); +} + +int get_process_type_by_name(const char *proc_type_str) +{ + int i; + + for (i = 0; i < ZBX_PROCESS_TYPE_COUNT; i++) + { + if (0 == strcmp(proc_type_str, get_process_type_string(i))) + return i; + } + + return ZBX_PROCESS_TYPE_UNKNOWN; +} + const char *get_program_type_string(unsigned char program_type) { switch (program_type) diff --git a/src/libs/zbxcommon/str_test.c b/src/libs/zbxcommon/str_test.c index a0cf0dadc1b..71027bbc649 100644 --- a/src/libs/zbxcommon/str_test.c +++ b/src/libs/zbxcommon/str_test.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcommon/variant.c b/src/libs/zbxcommon/variant.c index 65a2f1d824d..feeb16bd389 100644 --- a/src/libs/zbxcommon/variant.c +++ b/src/libs/zbxcommon/variant.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcommon/xml.c b/src/libs/zbxcommon/xml.c index 8b5be3dbccb..81623f6892c 100644 --- a/src/libs/zbxcommon/xml.c +++ b/src/libs/zbxcommon/xml.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcomms/comms.c b/src/libs/zbxcomms/comms.c index c6f9bb4e293..b6ae09bdef5 100644 --- a/src/libs/zbxcomms/comms.c +++ b/src/libs/zbxcomms/comms.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcomms/telnet.c b/src/libs/zbxcomms/telnet.c index 143abc123c7..84ecd193596 100644 --- a/src/libs/zbxcomms/telnet.c +++ b/src/libs/zbxcomms/telnet.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcommshigh/comms.c b/src/libs/zbxcommshigh/comms.c index b776da12669..d8e1c9101fb 100644 --- a/src/libs/zbxcommshigh/comms.c +++ b/src/libs/zbxcommshigh/comms.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxconf/cfg.c b/src/libs/zbxconf/cfg.c index f30e4477e52..1c53757e0c2 100644 --- a/src/libs/zbxconf/cfg.c +++ b/src/libs/zbxconf/cfg.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcrypto/base64.c b/src/libs/zbxcrypto/base64.c index 78d2254c7ab..7712a15c7d3 100644 --- a/src/libs/zbxcrypto/base64.c +++ b/src/libs/zbxcrypto/base64.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcrypto/tls.c b/src/libs/zbxcrypto/tls.c index c94d491a79d..3e4521e6f34 100644 --- a/src/libs/zbxcrypto/tls.c +++ b/src/libs/zbxcrypto/tls.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcrypto/tls.h b/src/libs/zbxcrypto/tls.h index 34ca2a999ea..ed9b2be0441 100644 --- a/src/libs/zbxcrypto/tls.h +++ b/src/libs/zbxcrypto/tls.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcrypto/tls_tcp.h b/src/libs/zbxcrypto/tls_tcp.h index fd0d93e617b..5e220c68251 100644 --- a/src/libs/zbxcrypto/tls_tcp.h +++ b/src/libs/zbxcrypto/tls_tcp.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcrypto/tls_tcp_active.h b/src/libs/zbxcrypto/tls_tcp_active.h index fcd1cc50a01..976a5ab98cd 100644 --- a/src/libs/zbxcrypto/tls_tcp_active.h +++ b/src/libs/zbxcrypto/tls_tcp_active.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcunit/zbxcunit.c b/src/libs/zbxcunit/zbxcunit.c index edb94aad673..f1bf394964a 100644 --- a/src/libs/zbxcunit/zbxcunit.c +++ b/src/libs/zbxcunit/zbxcunit.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxcunit/zbxcunit.h b/src/libs/zbxcunit/zbxcunit.h index 1348222e592..dcbfc8414f2 100644 --- a/src/libs/zbxcunit/zbxcunit.h +++ b/src/libs/zbxcunit/zbxcunit.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -180,8 +180,6 @@ const char *zbx_cu_assert_args_int(const char *description, const char *operatio const char *zbx_cu_assert_args_char(const char *description, const char *operation, const char *expression1, char actual, const char *expression2, char expected); -extern struct mallinfo zbx_cu_minfo; - void zbx_cu_run(int args, char *argv[]); void *zbx_cu_galloc(void *old, size_t size); diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c index b7c737605bd..ed343a608e6 100644 --- a/src/libs/zbxdb/db.c +++ b/src/libs/zbxdb/db.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -969,8 +969,10 @@ int zbx_db_commit(void) rc = zbx_db_execute("%s", "commit;"); #endif - if (ZBX_DB_OK > rc) - return rc; /* commit failed */ + if (ZBX_DB_OK > rc) { /* commit failed */ + txn_error = rc; + return rc; + } #ifdef HAVE_SQLITE3 zbx_mutex_unlock(&sqlite_access); diff --git a/src/libs/zbxdbcache/dbcache.c b/src/libs/zbxdbcache/dbcache.c index 806805c8f40..2e6e9ac61f8 100644 --- a/src/libs/zbxdbcache/dbcache.c +++ b/src/libs/zbxdbcache/dbcache.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c index d149af1d64a..0d06c0d8f6f 100644 --- a/src/libs/zbxdbcache/dbconfig.c +++ b/src/libs/zbxdbcache/dbconfig.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbcache/dbconfig.h b/src/libs/zbxdbcache/dbconfig.h index b6ffa4c18b3..1bd1c7e1912 100644 --- a/src/libs/zbxdbcache/dbconfig.h +++ b/src/libs/zbxdbcache/dbconfig.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbcache/dbconfig_dump.c b/src/libs/zbxdbcache/dbconfig_dump.c index 9a3598a4a89..0ebfa337e23 100644 --- a/src/libs/zbxdbcache/dbconfig_dump.c +++ b/src/libs/zbxdbcache/dbconfig_dump.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbcache/dbconfig_test.c b/src/libs/zbxdbcache/dbconfig_test.c index 21bd98a0a57..2259c980639 100644 --- a/src/libs/zbxdbcache/dbconfig_test.c +++ b/src/libs/zbxdbcache/dbconfig_test.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbcache/dbsync.c b/src/libs/zbxdbcache/dbsync.c index af14191af64..8d6ac96923b 100644 --- a/src/libs/zbxdbcache/dbsync.c +++ b/src/libs/zbxdbcache/dbsync.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbcache/dbsync.h b/src/libs/zbxdbcache/dbsync.h index c2bb15b6280..ef954bee701 100644 --- a/src/libs/zbxdbcache/dbsync.h +++ b/src/libs/zbxdbcache/dbsync.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbcache/valuecache.c b/src/libs/zbxdbcache/valuecache.c index 8f1fb9cc5cb..abc37d99ce0 100644 --- a/src/libs/zbxdbcache/valuecache.c +++ b/src/libs/zbxdbcache/valuecache.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -2997,37 +2997,6 @@ int zbx_vc_get_statistics(zbx_vc_stats_t *stats) /****************************************************************************** * * - * Function: zbx_vc_history_value2str * - * * - * Purpose: converts history value to string format * - * * - * Parameters: buffer - [OUT] the output buffer * - * size - [IN] the output buffer size * - * value - [IN] the value to convert * - * value_type - [IN] the history value type * - * * - ******************************************************************************/ -void zbx_vc_history_value2str(char *buffer, size_t size, history_value_t *value, int value_type) -{ - switch (value_type) - { - case ITEM_VALUE_TYPE_FLOAT: - zbx_snprintf(buffer, size, ZBX_FS_DBL, value->dbl); - break; - case ITEM_VALUE_TYPE_UINT64: - zbx_snprintf(buffer, size, ZBX_FS_UI64, value->ui64); - break; - case ITEM_VALUE_TYPE_STR: - case ITEM_VALUE_TYPE_TEXT: - zbx_strlcpy_utf8(buffer, value->str, size); - break; - case ITEM_VALUE_TYPE_LOG: - zbx_strlcpy_utf8(buffer, value->log->value, size); - } -} - -/****************************************************************************** - * * * Function: zbx_vc_lock * * * * Purpose: locks the cache for batch usage * diff --git a/src/libs/zbxdbcache/valuecache.h b/src/libs/zbxdbcache/valuecache.h index 275bf2a995a..447450f68b9 100644 --- a/src/libs/zbxdbcache/valuecache.h +++ b/src/libs/zbxdbcache/valuecache.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index 24728b9c706..7b6a970ec93 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/discovery.c b/src/libs/zbxdbhigh/discovery.c index e376feec377..574420d4d36 100644 --- a/src/libs/zbxdbhigh/discovery.c +++ b/src/libs/zbxdbhigh/discovery.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/event.c b/src/libs/zbxdbhigh/event.c index 6a9ad2a3af9..1b6da719321 100644 --- a/src/libs/zbxdbhigh/event.c +++ b/src/libs/zbxdbhigh/event.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c index 0d9831aaef3..438e679a228 100644 --- a/src/libs/zbxdbhigh/host.c +++ b/src/libs/zbxdbhigh/host.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/itservices.c b/src/libs/zbxdbhigh/itservices.c index 068f7ddd12c..9b3fe6f5372 100644 --- a/src/libs/zbxdbhigh/itservices.c +++ b/src/libs/zbxdbhigh/itservices.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/lld.c b/src/libs/zbxdbhigh/lld.c index 46deb81a07e..a77133dd01e 100644 --- a/src/libs/zbxdbhigh/lld.c +++ b/src/libs/zbxdbhigh/lld.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/lld.h b/src/libs/zbxdbhigh/lld.h index 851a21e7972..c34fe7b8c9e 100644 --- a/src/libs/zbxdbhigh/lld.h +++ b/src/libs/zbxdbhigh/lld.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/lld_common.c b/src/libs/zbxdbhigh/lld_common.c index e87630cd2b7..7c17eb2dec5 100644 --- a/src/libs/zbxdbhigh/lld_common.c +++ b/src/libs/zbxdbhigh/lld_common.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/lld_graph.c b/src/libs/zbxdbhigh/lld_graph.c index 7b0f68916a4..5e482dea6f8 100644 --- a/src/libs/zbxdbhigh/lld_graph.c +++ b/src/libs/zbxdbhigh/lld_graph.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/lld_host.c b/src/libs/zbxdbhigh/lld_host.c index 4ea1d43b4a0..e46ee0b826e 100644 --- a/src/libs/zbxdbhigh/lld_host.c +++ b/src/libs/zbxdbhigh/lld_host.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/lld_item.c b/src/libs/zbxdbhigh/lld_item.c index 4d506bd279b..bb92e30270b 100644 --- a/src/libs/zbxdbhigh/lld_item.c +++ b/src/libs/zbxdbhigh/lld_item.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -487,7 +487,7 @@ static void lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt zbx_lld_item_t *item, *master; zbx_lld_item_preproc_t *preproc_op; zbx_lld_item_prototype_t *item_prototype; - zbx_uint64_t db_valuemapid, db_interfaceid, itemid; + zbx_uint64_t db_valuemapid, db_interfaceid, itemid, master_itemid; zbx_vector_uint64_t parent_itemids; int i, index; char *sql = NULL; @@ -664,20 +664,23 @@ static void lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt { item = (zbx_lld_item_t *)items->values[i]; - if (0 == item->master_itemid) - continue; - - if (FAIL == (index = zbx_vector_ptr_bsearch(items, &item->master_itemid, - ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC))) + if (0 != item->master_itemid) { - /* dependent item without master item should be removed */ - THIS_SHOULD_NEVER_HAPPEN; - lld_item_free(item); - zbx_vector_ptr_remove(items, i); - continue; - } + if (FAIL == (index = zbx_vector_ptr_bsearch(items, &item->master_itemid, + ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC))) + { + /* dependent item without master item should be removed */ + THIS_SHOULD_NEVER_HAPPEN; + lld_item_free(item); + zbx_vector_ptr_remove(items, i); + continue; + } - master = (zbx_lld_item_t *)items->values[index]; + master = (zbx_lld_item_t *)items->values[index]; + master_itemid = master->parent_itemid; + } + else + master_itemid = 0; if (FAIL == (index = zbx_vector_ptr_bsearch(item_prototypes, &item->parent_itemid, ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC))) @@ -688,7 +691,7 @@ static void lld_items_get(const zbx_vector_ptr_t *item_prototypes, zbx_vector_pt item_prototype = (zbx_lld_item_prototype_t *)item_prototypes->values[index]; - if (master->parent_itemid != item_prototype->master_itemid) + if (master_itemid != item_prototype->master_itemid) item->flags |= ZBX_FLAG_LLD_ITEM_UPDATE_MASTER_ITEM; item->master_itemid = item_prototype->master_itemid; @@ -1522,11 +1525,13 @@ static void lld_items_preproc_make(const zbx_vector_ptr_t *item_prototypes, zbx_ * * * Function: lld_item_save * * * - * Purpose: save (insert or update) LLD item * + * Purpose: recursively prepare LLD item bulk insert if any and * + * update dependent items with their masters * * * * Parameters: hostid - [IN] parent host id * * item_prototypes - [IN] item prototypes * - * item - [IN] item to be saved * + * item - [IN/OUT] item to be saved and set * + * master for dependentent items * * itemid - [IN/OUT] item id used for insert * * operations * * itemdiscoveryid - [IN/OUT] item discovery id used for * @@ -1534,22 +1539,13 @@ static void lld_items_preproc_make(const zbx_vector_ptr_t *item_prototypes, zbx_ * db_insert - [IN] prepared item bulk insert * * db_insert_idiscovery - [IN] prepared item discovery bulk * * insert * - * sql - [IN/OUT] sql buffer pointer used for * - * update operations * - * sql_alloc - [IN/OUT] sql buffer already allocated * - * memory * - * sql_offset - [IN/OUT] offset for writing within sql * - * buffer * * * ******************************************************************************/ static void lld_item_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prototypes, zbx_lld_item_t *item, zbx_uint64_t *itemid, zbx_uint64_t *itemdiscoveryid, zbx_db_insert_t *db_insert, - zbx_db_insert_t *db_insert_idiscovery, char **sql, size_t *sql_alloc, size_t *sql_offset) + zbx_db_insert_t *db_insert_idiscovery) { - const zbx_lld_item_prototype_t *item_prototype; - char *value_esc; - int i, index; - zbx_lld_item_t *dependent; + int index; if (0 == (item->flags & ZBX_FLAG_LLD_ITEM_DISCOVERED)) return; @@ -1561,10 +1557,11 @@ static void lld_item_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot return; } - item_prototype = (zbx_lld_item_prototype_t *)item_prototypes->values[index]; - if (0 == item->itemid) { + const zbx_lld_item_prototype_t *item_prototype; + + item_prototype = (zbx_lld_item_prototype_t *)item_prototypes->values[index]; item->itemid = (*itemid)++; zbx_db_insert_add_values(db_insert, item->itemid, item->name, item->key, hostid, @@ -1585,285 +1582,287 @@ static void lld_item_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot zbx_db_insert_add_values(db_insert_idiscovery, (*itemdiscoveryid)++, item->itemid, item->parent_itemid, item_prototype->key); } - else + + for (index = 0; index < item->dependent_items.values_num; index++) { - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE)) - { - const char *d = ""; + zbx_lld_item_t *dependent; - zbx_strcpy_alloc(sql, sql_alloc, sql_offset, "update items set "); - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_NAME)) - { - value_esc = DBdyn_escape_string(item->name); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "name='%s'", value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_KEY)) - { - value_esc = DBdyn_escape_string(item->key); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%skey_='%s'", d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_TYPE)) - { - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%stype=%d", d, - (int)item_prototype->type); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_VALUE_TYPE)) - { - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%svalue_type=%d", - d, (int)item_prototype->value_type); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_DELAY)) - { - value_esc = DBdyn_escape_string(item->delay); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sdelay='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_HISTORY)) - { - value_esc = DBdyn_escape_string(item->history); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%shistory='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_TRENDS)) - { - value_esc = DBdyn_escape_string(item->trends); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%strends='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_TRAPPER_HOSTS)) - { - value_esc = DBdyn_escape_string(item_prototype->trapper_hosts); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%strapper_hosts='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_UNITS)) - { - value_esc = DBdyn_escape_string(item->units); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sunits='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_FORMULA)) - { - value_esc = DBdyn_escape_string(item_prototype->formula); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sformula='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_LOGTIMEFMT)) - { - value_esc = DBdyn_escape_string(item_prototype->logtimefmt); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%slogtimefmt='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_VALUEMAPID)) - { - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%svaluemapid=%s", - d, DBsql_id_ins(item_prototype->valuemapid)); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PARAMS)) - { - value_esc = DBdyn_escape_string(item->params); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sparams='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_IPMI_SENSOR)) - { - value_esc = DBdyn_escape_string(item->ipmi_sensor); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sipmi_sensor='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMP_COMMUNITY)) - { - value_esc = DBdyn_escape_string(item_prototype->snmp_community); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmp_community='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMP_OID)) - { - value_esc = DBdyn_escape_string(item->snmp_oid); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmp_oid='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PORT)) - { - value_esc = DBdyn_escape_string(item_prototype->port); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sport='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_SECURITYNAME)) - { - value_esc = DBdyn_escape_string(item_prototype->snmpv3_securityname); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, - "%ssnmpv3_securityname='%s'", d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_SECURITYLEVEL)) - { - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, - "%ssnmpv3_securitylevel=%d", d, - (int)item_prototype->snmpv3_securitylevel); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_AUTHPROTOCOL)) - { - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, - "%ssnmpv3_authprotocol=%d", d, - (int)item_prototype->snmpv3_authprotocol); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_AUTHPASSPHRASE)) - { - value_esc = DBdyn_escape_string(item_prototype->snmpv3_authpassphrase); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, - "%ssnmpv3_authpassphrase='%s'", d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_PRIVPROTOCOL)) - { - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, - "%ssnmpv3_privprotocol=%d", d, - (int)item_prototype->snmpv3_privprotocol); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_PRIVPASSPHRASE)) - { - value_esc = DBdyn_escape_string(item_prototype->snmpv3_privpassphrase); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, - "%ssnmpv3_privpassphrase='%s'", d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_AUTHTYPE)) - { - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sauthtype=%d", - d, (int)item_prototype->authtype); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_USERNAME)) - { - value_esc = DBdyn_escape_string(item_prototype->username); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%susername='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PASSWORD)) - { - value_esc = DBdyn_escape_string(item_prototype->password); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spassword='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PUBLICKEY)) - { - value_esc = DBdyn_escape_string(item_prototype->publickey); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spublickey='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PRIVATEKEY)) - { - value_esc = DBdyn_escape_string(item_prototype->privatekey); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sprivatekey='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_DESCRIPTION)) - { - value_esc = DBdyn_escape_string(item->description); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sdescription='%s'", - d, value_esc); - zbx_free(value_esc); - d = ","; + dependent = (zbx_lld_item_t *)item->dependent_items.values[index]; + dependent->master_itemid = item->itemid; + lld_item_save(hostid, item_prototypes, dependent, itemid, itemdiscoveryid, db_insert, + db_insert_idiscovery); + } +} - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_INTERFACEID)) - { - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sinterfaceid=%s", - d, DBsql_id_ins(item_prototype->interfaceid)); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_CONTEXTNAME)) - { - value_esc = DBdyn_escape_string(item_prototype->snmpv3_contextname); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, - "%ssnmpv3_contextname='%s'", d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_JMX_ENDPOINT)) - { - value_esc = DBdyn_escape_string(item->jmx_endpoint); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, - "%sjmx_endpoint='%s'", d, value_esc); - zbx_free(value_esc); - d = ","; - } - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_MASTER_ITEM)) - { - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%smaster_itemid=%s", - d, DBsql_id_ins(item->master_itemid)); - } +/****************************************************************************** + * * + * Function: lld_item_prepare_update * + * * + * Purpose: prepare sql to update LLD item * + * * + * Parameters: hostid - [IN] parent host id * + * item_prototypes - [IN] item prototypes * + * item - [IN] item to be updated * + * sql - [IN/OUT] sql buffer pointer used for * + * update operations * + * sql_alloc - [IN/OUT] sql buffer already allocated * + * memory * + * sql_offset - [IN/OUT] offset for writing within sql * + * buffer * + * * + ******************************************************************************/ +static void lld_item_prepare_update(const zbx_vector_ptr_t *item_prototypes, const zbx_lld_item_t *item, char **sql, + size_t *sql_alloc, size_t *sql_offset) +{ + const zbx_lld_item_prototype_t *item_prototype; + char *value_esc; + const char *d = ""; + int index; - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, " where itemid=" ZBX_FS_UI64 ";\n", - item->itemid); - } + if (0 == (item->flags & ZBX_FLAG_LLD_ITEM_DISCOVERED) || 0 == (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE)) + return; - if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_KEY)) - { - value_esc = DBdyn_escape_string(item_prototype->key); - zbx_snprintf_alloc(sql, sql_alloc, sql_offset, - "update item_discovery" - " set key_='%s'" - " where itemid=" ZBX_FS_UI64 ";\n", - value_esc, item->itemid); - zbx_free(value_esc); - } + if (FAIL == (index = zbx_vector_ptr_bsearch(item_prototypes, &item->parent_itemid, + ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC))) + { + THIS_SHOULD_NEVER_HAPPEN; + return; } - DBexecute_overflowed_sql(sql, sql_alloc, sql_offset); + item_prototype = item_prototypes->values[index]; - for (i = 0; i < item->dependent_items.values_num; i++) + zbx_strcpy_alloc(sql, sql_alloc, sql_offset, "update items set "); + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_NAME)) { - dependent = (zbx_lld_item_t *)item->dependent_items.values[i]; - dependent->master_itemid = item->itemid; - lld_item_save(hostid, item_prototypes, dependent, itemid, itemdiscoveryid, db_insert, - db_insert_idiscovery, sql, sql_alloc, sql_offset); + value_esc = DBdyn_escape_string(item->name); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "name='%s'", value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_KEY)) + { + value_esc = DBdyn_escape_string(item->key); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%skey_='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_TYPE)) + { + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%stype=%d", d, (int)item_prototype->type); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_VALUE_TYPE)) + { + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%svalue_type=%d", d, (int)item_prototype->value_type); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_DELAY)) + { + value_esc = DBdyn_escape_string(item->delay); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sdelay='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_HISTORY)) + { + value_esc = DBdyn_escape_string(item->history); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%shistory='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_TRENDS)) + { + value_esc = DBdyn_escape_string(item->trends); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%strends='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_TRAPPER_HOSTS)) + { + value_esc = DBdyn_escape_string(item_prototype->trapper_hosts); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%strapper_hosts='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_UNITS)) + { + value_esc = DBdyn_escape_string(item->units); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sunits='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_FORMULA)) + { + value_esc = DBdyn_escape_string(item_prototype->formula); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sformula='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_LOGTIMEFMT)) + { + value_esc = DBdyn_escape_string(item_prototype->logtimefmt); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%slogtimefmt='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_VALUEMAPID)) + { + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%svaluemapid=%s", + d, DBsql_id_ins(item_prototype->valuemapid)); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PARAMS)) + { + value_esc = DBdyn_escape_string(item->params); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sparams='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_IPMI_SENSOR)) + { + value_esc = DBdyn_escape_string(item->ipmi_sensor); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sipmi_sensor='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMP_COMMUNITY)) + { + value_esc = DBdyn_escape_string(item_prototype->snmp_community); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmp_community='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMP_OID)) + { + value_esc = DBdyn_escape_string(item->snmp_oid); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmp_oid='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PORT)) + { + value_esc = DBdyn_escape_string(item_prototype->port); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sport='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_SECURITYNAME)) + { + value_esc = DBdyn_escape_string(item_prototype->snmpv3_securityname); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmpv3_securityname='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_SECURITYLEVEL)) + { + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmpv3_securitylevel=%d", d, + (int)item_prototype->snmpv3_securitylevel); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_AUTHPROTOCOL)) + { + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmpv3_authprotocol=%d", d, + (int)item_prototype->snmpv3_authprotocol); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_AUTHPASSPHRASE)) + { + value_esc = DBdyn_escape_string(item_prototype->snmpv3_authpassphrase); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmpv3_authpassphrase='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_PRIVPROTOCOL)) + { + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmpv3_privprotocol=%d", d, + (int)item_prototype->snmpv3_privprotocol); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_PRIVPASSPHRASE)) + { + value_esc = DBdyn_escape_string(item_prototype->snmpv3_privpassphrase); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmpv3_privpassphrase='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_AUTHTYPE)) + { + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sauthtype=%d", d, (int)item_prototype->authtype); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_USERNAME)) + { + value_esc = DBdyn_escape_string(item_prototype->username); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%susername='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PASSWORD)) + { + value_esc = DBdyn_escape_string(item_prototype->password); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spassword='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PUBLICKEY)) + { + value_esc = DBdyn_escape_string(item_prototype->publickey); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spublickey='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PRIVATEKEY)) + { + value_esc = DBdyn_escape_string(item_prototype->privatekey); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sprivatekey='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_DESCRIPTION)) + { + value_esc = DBdyn_escape_string(item->description); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sdescription='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_INTERFACEID)) + { + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sinterfaceid=%s", + d, DBsql_id_ins(item_prototype->interfaceid)); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_SNMPV3_CONTEXTNAME)) + { + value_esc = DBdyn_escape_string(item_prototype->snmpv3_contextname); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%ssnmpv3_contextname='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_JMX_ENDPOINT)) + { + value_esc = DBdyn_escape_string(item->jmx_endpoint); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sjmx_endpoint='%s'", d, value_esc); + zbx_free(value_esc); + d = ","; + } + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_MASTER_ITEM)) + { + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%smaster_itemid=%s", + d, DBsql_id_ins(item->master_itemid)); + } + + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, " where itemid=" ZBX_FS_UI64 ";\n", item->itemid); + + if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_KEY)) + { + value_esc = DBdyn_escape_string(item_prototype->key); + zbx_snprintf_alloc(sql, sql_alloc, sql_offset, + "update item_discovery" + " set key_='%s'" + " where itemid=" ZBX_FS_UI64 ";\n", + value_esc, item->itemid); + zbx_free(value_esc); } } @@ -1884,14 +1883,12 @@ static void lld_item_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot static int lld_items_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prototypes, zbx_vector_ptr_t *items, int *host_locked) { - const char *__function_name = "lld_items_save"; + const char *__function_name = "lld_items_save"; - int ret = SUCCEED, i, new_items = 0, upd_items = 0; - zbx_lld_item_t *item; - zbx_uint64_t itemid = 0, itemdiscoveryid = 0; - char *sql = NULL; - size_t sql_alloc = 8 * ZBX_KIBIBYTE, sql_offset = 0; - zbx_db_insert_t db_insert, db_insert_idiscovery; + int ret = SUCCEED, i, new_items = 0, upd_items = 0; + zbx_lld_item_t *item; + zbx_uint64_t itemid, itemdiscoveryid; + zbx_db_insert_t db_insert, db_insert_idiscovery; zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name); @@ -1944,12 +1941,6 @@ static int lld_items_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot "parent_itemid", "key_", NULL); } - if (0 != upd_items) - { - sql = (char *)zbx_malloc(sql, sql_alloc); - DBbegin_multiple_update(&sql, &sql_alloc, &sql_offset); - } - for (i = 0; i < items->values_num; i++) { item = (zbx_lld_item_t *)items->values[i]; @@ -1957,18 +1948,11 @@ static int lld_items_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot /* dependent items are saved within recursive lld_item_save calls while saving master */ if (0 == item->master_itemid) { - lld_item_save(hostid, item_prototypes, item, &itemid, &itemdiscoveryid, &db_insert, - &db_insert_idiscovery, &sql, &sql_alloc, &sql_offset); + lld_item_save(hostid, item_prototypes, item, &itemid, &itemdiscoveryid, + &db_insert, &db_insert_idiscovery); } } - if (0 != upd_items) - { - DBend_multiple_update(&sql, &sql_alloc, &sql_offset); - DBexecute("%s", sql); - zbx_free(sql); - } - if (0 != new_items) { zbx_db_insert_execute(&db_insert); @@ -1979,6 +1963,28 @@ static int lld_items_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot zbx_vector_ptr_sort(items, ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC); } + + if (0 != upd_items) + { + char *sql = NULL; + size_t sql_alloc = 8 * ZBX_KIBIBYTE, sql_offset = 0; + + sql = (char*)zbx_malloc(NULL, sql_alloc); + DBbegin_multiple_update(&sql, &sql_alloc, &sql_offset); + + for (i = 0; i < items->values_num; i++) + { + item = (zbx_lld_item_t *)items->values[i]; + + lld_item_prepare_update(item_prototypes, item, &sql, &sql_alloc, &sql_offset); + DBexecute_overflowed_sql(&sql, &sql_alloc, &sql_offset); + } + + DBend_multiple_update(&sql, &sql_alloc, &sql_offset); + if (sql_offset > 16) + DBexecute("%s", sql); + zbx_free(sql); + } out: zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name); diff --git a/src/libs/zbxdbhigh/lld_trigger.c b/src/libs/zbxdbhigh/lld_trigger.c index 5f99f96bd35..cf452c7bc51 100644 --- a/src/libs/zbxdbhigh/lld_trigger.c +++ b/src/libs/zbxdbhigh/lld_trigger.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/proxy.c b/src/libs/zbxdbhigh/proxy.c index 60e052f6c0c..d2ee00fa0ee 100644 --- a/src/libs/zbxdbhigh/proxy.c +++ b/src/libs/zbxdbhigh/proxy.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/template.h b/src/libs/zbxdbhigh/template.h index 057d6e1231a..ca9766e6075 100644 --- a/src/libs/zbxdbhigh/template.h +++ b/src/libs/zbxdbhigh/template.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/template_item.c b/src/libs/zbxdbhigh/template_item.c index a14f8a42416..4e2ae40f6bb 100644 --- a/src/libs/zbxdbhigh/template_item.c +++ b/src/libs/zbxdbhigh/template_item.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbhigh/trigger.c b/src/libs/zbxdbhigh/trigger.c index 276b21d745b..a50ad478a94 100644 --- a/src/libs/zbxdbhigh/trigger.c +++ b/src/libs/zbxdbhigh/trigger.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade.c b/src/libs/zbxdbupgrade/dbupgrade.c index b85216dd0bd..cfc18ee7d87 100644 --- a/src/libs/zbxdbupgrade/dbupgrade.c +++ b/src/libs/zbxdbupgrade/dbupgrade.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade.h b/src/libs/zbxdbupgrade/dbupgrade.h index d82bd2b3fbb..57293071375 100644 --- a/src/libs/zbxdbupgrade/dbupgrade.h +++ b/src/libs/zbxdbupgrade/dbupgrade.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_2010.c b/src/libs/zbxdbupgrade/dbupgrade_2010.c index 1d931e2908e..1b36d93356f 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_2010.c +++ b/src/libs/zbxdbupgrade/dbupgrade_2010.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_2020.c b/src/libs/zbxdbupgrade/dbupgrade_2020.c index 6301f94e341..6dcfe57d692 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_2020.c +++ b/src/libs/zbxdbupgrade/dbupgrade_2020.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_2030.c b/src/libs/zbxdbupgrade/dbupgrade_2030.c index d05a3b06f00..313c013bc85 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_2030.c +++ b/src/libs/zbxdbupgrade/dbupgrade_2030.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_2040.c b/src/libs/zbxdbupgrade/dbupgrade_2040.c index 09d5593d4cf..76a3dbcaa4a 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_2040.c +++ b/src/libs/zbxdbupgrade/dbupgrade_2040.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_2050.c b/src/libs/zbxdbupgrade/dbupgrade_2050.c index 73c271c83a3..b95df1e3061 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_2050.c +++ b/src/libs/zbxdbupgrade/dbupgrade_2050.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_3000.c b/src/libs/zbxdbupgrade/dbupgrade_3000.c index b1597a9dcfc..d2353d3eb20 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_3000.c +++ b/src/libs/zbxdbupgrade/dbupgrade_3000.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_3010.c b/src/libs/zbxdbupgrade/dbupgrade_3010.c index 4f975997745..2c9bb0372c6 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_3010.c +++ b/src/libs/zbxdbupgrade/dbupgrade_3010.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_3020.c b/src/libs/zbxdbupgrade/dbupgrade_3020.c index 85369fc0e7b..b671258bb2a 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_3020.c +++ b/src/libs/zbxdbupgrade/dbupgrade_3020.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_3030.c b/src/libs/zbxdbupgrade/dbupgrade_3030.c index 2344d38bc17..9ef6692685b 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_3030.c +++ b/src/libs/zbxdbupgrade/dbupgrade_3030.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_3040.c b/src/libs/zbxdbupgrade/dbupgrade_3040.c index b39f31c7292..f271eb02aec 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_3040.c +++ b/src/libs/zbxdbupgrade/dbupgrade_3040.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxdbupgrade/dbupgrade_3050.c b/src/libs/zbxdbupgrade/dbupgrade_3050.c index 8c7bbc9a6bc..3a45ce3653c 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_3050.c +++ b/src/libs/zbxdbupgrade/dbupgrade_3050.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxexec/execute.c b/src/libs/zbxexec/execute.c index a3ca389a6f9..c26f9ce1903 100644 --- a/src/libs/zbxexec/execute.c +++ b/src/libs/zbxexec/execute.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxhistory/history.c b/src/libs/zbxhistory/history.c index 34662f2adaa..eea1c637331 100644 --- a/src/libs/zbxhistory/history.c +++ b/src/libs/zbxhistory/history.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxhistory/history.h b/src/libs/zbxhistory/history.h index 3f237e5011a..8ac64439105 100644 --- a/src/libs/zbxhistory/history.h +++ b/src/libs/zbxhistory/history.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxhistory/history_elastic.c b/src/libs/zbxhistory/history_elastic.c index a74d35fa9d0..c21a149906e 100644 --- a/src/libs/zbxhistory/history_elastic.c +++ b/src/libs/zbxhistory/history_elastic.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxhistory/history_sql.c b/src/libs/zbxhistory/history_sql.c index fece020cc40..73407ae01ac 100644 --- a/src/libs/zbxhistory/history_sql.c +++ b/src/libs/zbxhistory/history_sql.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxhttp/punycode.c b/src/libs/zbxhttp/punycode.c index 9602c335d1d..fc0c5db8f89 100644 --- a/src/libs/zbxhttp/punycode.c +++ b/src/libs/zbxhttp/punycode.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxhttp/punycode.h b/src/libs/zbxhttp/punycode.h index 836a861895b..6ae642cb384 100644 --- a/src/libs/zbxhttp/punycode.h +++ b/src/libs/zbxhttp/punycode.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxhttp/urlencode.c b/src/libs/zbxhttp/urlencode.c index 59f137007a2..bb9621c8ece 100644 --- a/src/libs/zbxhttp/urlencode.c +++ b/src/libs/zbxhttp/urlencode.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxicmpping/icmpping.c b/src/libs/zbxicmpping/icmpping.c index fe29a03c593..251c716a978 100644 --- a/src/libs/zbxicmpping/icmpping.c +++ b/src/libs/zbxicmpping/icmpping.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxjson/json.c b/src/libs/zbxjson/json.c index 6baeab50373..3d18913d94b 100644 --- a/src/libs/zbxjson/json.c +++ b/src/libs/zbxjson/json.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -1032,7 +1032,7 @@ static int zbx_jsonpath_error(const char *path) * FAIL - json path parsing error * * * ******************************************************************************/ -static int zbx_jsonpath_next(const char *path, const char **pnext, zbx_strloc_t *loc, int *type) +int zbx_jsonpath_next(const char *path, const char **pnext, zbx_strloc_t *loc, int *type) { const char *next = *pnext; size_t pos; @@ -1217,4 +1217,3 @@ void zbx_json_value_dyn(const struct zbx_json_parse *jp, char **string, size_t * } } - diff --git a/src/libs/zbxjson/json_parser.c b/src/libs/zbxjson/json_parser.c index 12c2f7337f0..cb2ed51877d 100644 --- a/src/libs/zbxjson/json_parser.c +++ b/src/libs/zbxjson/json_parser.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxjson/json_parser.h b/src/libs/zbxjson/json_parser.h index d88eee204bb..7b38d40531f 100644 --- a/src/libs/zbxjson/json_parser.h +++ b/src/libs/zbxjson/json_parser.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxjson/json_test.c b/src/libs/zbxjson/json_test.c index c2454841094..b12ae32171d 100644 --- a/src/libs/zbxjson/json_test.c +++ b/src/libs/zbxjson/json_test.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxlog/log.c b/src/libs/zbxlog/log.c index 57b199a1810..e55abe7b3ae 100644 --- a/src/libs/zbxlog/log.c +++ b/src/libs/zbxlog/log.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxmedia/email.c b/src/libs/zbxmedia/email.c index adc195c62e2..deb8a1ce2f7 100644 --- a/src/libs/zbxmedia/email.c +++ b/src/libs/zbxmedia/email.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxmedia/eztexting.c b/src/libs/zbxmedia/eztexting.c index 0cbef47ffc5..e13ad04662c 100644 --- a/src/libs/zbxmedia/eztexting.c +++ b/src/libs/zbxmedia/eztexting.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxmedia/jabber.c b/src/libs/zbxmedia/jabber.c index aeabac7f6cd..bd7bbb11ffe 100644 --- a/src/libs/zbxmedia/jabber.c +++ b/src/libs/zbxmedia/jabber.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxmedia/sms.c b/src/libs/zbxmedia/sms.c index 1bfe6c29b74..b6f0b0c51da 100644 --- a/src/libs/zbxmedia/sms.c +++ b/src/libs/zbxmedia/sms.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxmemory/memalloc.c b/src/libs/zbxmemory/memalloc.c index c745e9a74bd..8b2f421033c 100644 --- a/src/libs/zbxmemory/memalloc.c +++ b/src/libs/zbxmemory/memalloc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxmodules/modules.c b/src/libs/zbxmodules/modules.c index 10413f2cd8d..3fcfa6c2677 100644 --- a/src/libs/zbxmodules/modules.c +++ b/src/libs/zbxmodules/modules.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxnix/control.c b/src/libs/zbxnix/control.c index 4639267ee6c..d1d645e8473 100644 --- a/src/libs/zbxnix/control.c +++ b/src/libs/zbxnix/control.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxnix/control.h b/src/libs/zbxnix/control.h index a719b7215ed..3eda2b11cfb 100644 --- a/src/libs/zbxnix/control.h +++ b/src/libs/zbxnix/control.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -21,7 +21,10 @@ #define ZABBIX_CONTROL_H #include "common.h" -#include "zbxself.h" + +#define ZBX_RTC_LOG_SCOPE_FLAG 0x80 +#define ZBX_RTC_LOG_SCOPE_PROC 0 +#define ZBX_RTC_LOG_SCOPE_PID 1 int parse_rtc_options(const char *opt, unsigned char program_type, int *message); diff --git a/src/libs/zbxnix/coredump.c b/src/libs/zbxnix/coredump.c index fc32d739458..37999cb598a 100644 --- a/src/libs/zbxnix/coredump.c +++ b/src/libs/zbxnix/coredump.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxnix/daemon.c b/src/libs/zbxnix/daemon.c index c0d688a21e0..082031de240 100644 --- a/src/libs/zbxnix/daemon.c +++ b/src/libs/zbxnix/daemon.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -23,7 +23,7 @@ #include "pid.h" #include "cfg.h" #include "log.h" -#include "zbxself.h" +#include "control.h" #include "fatal.h" #include "sighandler.h" diff --git a/src/libs/zbxnix/dshm.c b/src/libs/zbxnix/dshm.c index 52216288c37..a9760ff0269 100644 --- a/src/libs/zbxnix/dshm.c +++ b/src/libs/zbxnix/dshm.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxnix/fatal.c b/src/libs/zbxnix/fatal.c index 3f50bae9893..7b28d12dc30 100644 --- a/src/libs/zbxnix/fatal.c +++ b/src/libs/zbxnix/fatal.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxnix/fatal.h b/src/libs/zbxnix/fatal.h index 0bed1cd7610..e06289e4afc 100644 --- a/src/libs/zbxnix/fatal.h +++ b/src/libs/zbxnix/fatal.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxnix/ipc.c b/src/libs/zbxnix/ipc.c index f92a1e20c90..0572d17afc4 100644 --- a/src/libs/zbxnix/ipc.c +++ b/src/libs/zbxnix/ipc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c index c126b8ca88f..95ddd261f3f 100644 --- a/src/libs/zbxnix/pid.c +++ b/src/libs/zbxnix/pid.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxnix/sigcommon.h b/src/libs/zbxnix/sigcommon.h index 1d3f4122fd9..6861685d04f 100644 --- a/src/libs/zbxnix/sigcommon.h +++ b/src/libs/zbxnix/sigcommon.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxnix/sighandler.c b/src/libs/zbxnix/sighandler.c index 9c106b06856..038cb86a2d5 100644 --- a/src/libs/zbxnix/sighandler.c +++ b/src/libs/zbxnix/sighandler.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxregexp/zbxregexp.c b/src/libs/zbxregexp/zbxregexp.c index f2ea995b8a6..7d63ae3525e 100644 --- a/src/libs/zbxregexp/zbxregexp.c +++ b/src/libs/zbxregexp/zbxregexp.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxself/selfmon.c b/src/libs/zbxself/selfmon.c index 80476c5297e..6b537821634 100644 --- a/src/libs/zbxself/selfmon.c +++ b/src/libs/zbxself/selfmon.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -198,99 +198,6 @@ int get_process_type_forks(unsigned char proc_type) exit(EXIT_FAILURE); } -/****************************************************************************** - * * - * Function: get_process_type_string * - * * - * Purpose: Returns process name * - * * - * Parameters: process_type - [IN] process type; ZBX_PROCESS_TYPE_* * - * * - * Author: Alexander Vladishev * - * * - * Comments: used in internals checks zabbix["process",...], process titles * - * and log files * - * * - ******************************************************************************/ -const char *get_process_type_string(unsigned char proc_type) -{ - switch (proc_type) - { - case ZBX_PROCESS_TYPE_POLLER: - return "poller"; - case ZBX_PROCESS_TYPE_UNREACHABLE: - return "unreachable poller"; - case ZBX_PROCESS_TYPE_IPMIPOLLER: - return "ipmi poller"; - case ZBX_PROCESS_TYPE_PINGER: - return "icmp pinger"; - case ZBX_PROCESS_TYPE_JAVAPOLLER: - return "java poller"; - case ZBX_PROCESS_TYPE_HTTPPOLLER: - return "http poller"; - case ZBX_PROCESS_TYPE_TRAPPER: - return "trapper"; - case ZBX_PROCESS_TYPE_SNMPTRAPPER: - return "snmp trapper"; - case ZBX_PROCESS_TYPE_PROXYPOLLER: - return "proxy poller"; - case ZBX_PROCESS_TYPE_ESCALATOR: - return "escalator"; - case ZBX_PROCESS_TYPE_HISTSYNCER: - return "history syncer"; - case ZBX_PROCESS_TYPE_DISCOVERER: - return "discoverer"; - case ZBX_PROCESS_TYPE_ALERTER: - return "alerter"; - case ZBX_PROCESS_TYPE_TIMER: - return "timer"; - case ZBX_PROCESS_TYPE_HOUSEKEEPER: - return "housekeeper"; - case ZBX_PROCESS_TYPE_DATASENDER: - return "data sender"; - case ZBX_PROCESS_TYPE_CONFSYNCER: - return "configuration syncer"; - case ZBX_PROCESS_TYPE_HEARTBEAT: - return "heartbeat sender"; - case ZBX_PROCESS_TYPE_SELFMON: - return "self-monitoring"; - case ZBX_PROCESS_TYPE_VMWARE: - return "vmware collector"; - case ZBX_PROCESS_TYPE_COLLECTOR: - return "collector"; - case ZBX_PROCESS_TYPE_LISTENER: - return "listener"; - case ZBX_PROCESS_TYPE_ACTIVE_CHECKS: - return "active checks"; - case ZBX_PROCESS_TYPE_TASKMANAGER: - return "task manager"; - case ZBX_PROCESS_TYPE_IPMIMANAGER: - return "ipmi manager"; - case ZBX_PROCESS_TYPE_ALERTMANAGER: - return "alert manager"; - case ZBX_PROCESS_TYPE_PREPROCMAN: - return "preprocessing manager"; - case ZBX_PROCESS_TYPE_PREPROCESSOR: - return "preprocessing worker"; - } - - THIS_SHOULD_NEVER_HAPPEN; - exit(EXIT_FAILURE); -} - -int get_process_type_by_name(const char *proc_type_str) -{ - int i; - - for (i = 0; i < ZBX_PROCESS_TYPE_COUNT; i++) - { - if (0 == strcmp(proc_type_str, get_process_type_string(i))) - return i; - } - - return ZBX_PROCESS_TYPE_UNKNOWN; -} - #ifndef _WINDOWS /****************************************************************************** * * diff --git a/src/libs/zbxserver/evalfunc.c b/src/libs/zbxserver/evalfunc.c index e34a255c9f4..77b9d091efc 100644 --- a/src/libs/zbxserver/evalfunc.c +++ b/src/libs/zbxserver/evalfunc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxserver/evalfunc.h b/src/libs/zbxserver/evalfunc.h index 3ec8bf182e7..e40e8e99db3 100644 --- a/src/libs/zbxserver/evalfunc.h +++ b/src/libs/zbxserver/evalfunc.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c index 567f452eafc..6f868c67e09 100644 --- a/src/libs/zbxserver/expression.c +++ b/src/libs/zbxserver/expression.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxserver/macrofunc.c b/src/libs/zbxserver/macrofunc.c index bb6952f02d4..9298773f506 100644 --- a/src/libs/zbxserver/macrofunc.c +++ b/src/libs/zbxserver/macrofunc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxserver/macrofunc.h b/src/libs/zbxserver/macrofunc.h index 1c3446c1a0a..abd2f426071 100644 --- a/src/libs/zbxserver/macrofunc.h +++ b/src/libs/zbxserver/macrofunc.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsys/mutexs.c b/src/libs/zbxsys/mutexs.c index 898d8e2a872..a55744c1992 100644 --- a/src/libs/zbxsys/mutexs.c +++ b/src/libs/zbxsys/mutexs.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsys/symbols.c b/src/libs/zbxsys/symbols.c index f9e16d22795..f1fc5256c8b 100644 --- a/src/libs/zbxsys/symbols.c +++ b/src/libs/zbxsys/symbols.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsys/threads.c b/src/libs/zbxsys/threads.c index 036ac64411c..a78e179b3be 100644 --- a/src/libs/zbxsys/threads.c +++ b/src/libs/zbxsys/threads.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/agent/agent.c b/src/libs/zbxsysinfo/agent/agent.c index a8a8a4aa936..5984e6dcd63 100644 --- a/src/libs/zbxsysinfo/agent/agent.c +++ b/src/libs/zbxsysinfo/agent/agent.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/agent/agent.h b/src/libs/zbxsysinfo/agent/agent.h index 09463e197d5..5f52ba3548b 100644 --- a/src/libs/zbxsysinfo/agent/agent.h +++ b/src/libs/zbxsysinfo/agent/agent.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/aix.c b/src/libs/zbxsysinfo/aix/aix.c index e601803e28d..61b405f87ca 100644 --- a/src/libs/zbxsysinfo/aix/aix.c +++ b/src/libs/zbxsysinfo/aix/aix.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/cpu.c b/src/libs/zbxsysinfo/aix/cpu.c index d28f1c4db4d..3825eb7fd49 100644 --- a/src/libs/zbxsysinfo/aix/cpu.c +++ b/src/libs/zbxsysinfo/aix/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/diskio.c b/src/libs/zbxsysinfo/aix/diskio.c index 92565095c11..894c4c620c0 100644 --- a/src/libs/zbxsysinfo/aix/diskio.c +++ b/src/libs/zbxsysinfo/aix/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/diskspace.c b/src/libs/zbxsysinfo/aix/diskspace.c index 62d427c0201..7dfa61c2a9b 100644 --- a/src/libs/zbxsysinfo/aix/diskspace.c +++ b/src/libs/zbxsysinfo/aix/diskspace.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/hostname.c b/src/libs/zbxsysinfo/aix/hostname.c index a007d17d59f..ddd950e0de5 100644 --- a/src/libs/zbxsysinfo/aix/hostname.c +++ b/src/libs/zbxsysinfo/aix/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/inodes.c b/src/libs/zbxsysinfo/aix/inodes.c index 01e883d4cc9..c593449d88d 100644 --- a/src/libs/zbxsysinfo/aix/inodes.c +++ b/src/libs/zbxsysinfo/aix/inodes.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/memory.c b/src/libs/zbxsysinfo/aix/memory.c index 1f1b17bdb1d..4730315afa7 100644 --- a/src/libs/zbxsysinfo/aix/memory.c +++ b/src/libs/zbxsysinfo/aix/memory.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/net.c b/src/libs/zbxsysinfo/aix/net.c index 108b5035bbc..dd74f5f4ead 100644 --- a/src/libs/zbxsysinfo/aix/net.c +++ b/src/libs/zbxsysinfo/aix/net.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/proc.c b/src/libs/zbxsysinfo/aix/proc.c index 265abd43d04..1344d31e9ed 100644 --- a/src/libs/zbxsysinfo/aix/proc.c +++ b/src/libs/zbxsysinfo/aix/proc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/software.c b/src/libs/zbxsysinfo/aix/software.c index 0f47002a5be..e209a88eb65 100644 --- a/src/libs/zbxsysinfo/aix/software.c +++ b/src/libs/zbxsysinfo/aix/software.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/swap.c b/src/libs/zbxsysinfo/aix/swap.c index 7d11b6068a7..3a7d30cc701 100644 --- a/src/libs/zbxsysinfo/aix/swap.c +++ b/src/libs/zbxsysinfo/aix/swap.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/system.c b/src/libs/zbxsysinfo/aix/system.c index 851447cbe01..e99e8ee6ae3 100644 --- a/src/libs/zbxsysinfo/aix/system.c +++ b/src/libs/zbxsysinfo/aix/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/uptime.c b/src/libs/zbxsysinfo/aix/uptime.c index f138acfaabd..847a0cd1bd9 100644 --- a/src/libs/zbxsysinfo/aix/uptime.c +++ b/src/libs/zbxsysinfo/aix/uptime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/aix/vmstats.c b/src/libs/zbxsysinfo/aix/vmstats.c index 89f6f0fa77f..1e355b1a9e6 100644 --- a/src/libs/zbxsysinfo/aix/vmstats.c +++ b/src/libs/zbxsysinfo/aix/vmstats.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/common.c b/src/libs/zbxsysinfo/common/common.c index 86be45286fa..21805d63ebc 100644 --- a/src/libs/zbxsysinfo/common/common.c +++ b/src/libs/zbxsysinfo/common/common.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/common.h b/src/libs/zbxsysinfo/common/common.h index b843f2e3a6c..cae46504356 100644 --- a/src/libs/zbxsysinfo/common/common.h +++ b/src/libs/zbxsysinfo/common/common.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/cpu.c b/src/libs/zbxsysinfo/common/cpu.c index 04d32f2ec2b..e8860c351ad 100644 --- a/src/libs/zbxsysinfo/common/cpu.c +++ b/src/libs/zbxsysinfo/common/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/cpu.h b/src/libs/zbxsysinfo/common/cpu.h index 391aceaeb8b..05411e05942 100644 --- a/src/libs/zbxsysinfo/common/cpu.h +++ b/src/libs/zbxsysinfo/common/cpu.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/dir.c b/src/libs/zbxsysinfo/common/dir.c index 4869c776814..a2db93d94bf 100644 --- a/src/libs/zbxsysinfo/common/dir.c +++ b/src/libs/zbxsysinfo/common/dir.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -933,8 +933,8 @@ static int vfs_dir_count(AGENT_REQUEST *request, AGENT_RESULT *result) (S_ISFIFO(status.st_mode) && 0 != (types & DET_FIFO))) && (min_size <= (zbx_uint64_t)status.st_size && (zbx_uint64_t)status.st_size <= max_size) && - (min_time < status.st_mtim.tv_sec && - status.st_mtim.tv_sec <= max_time)) + (min_time < status.st_mtime && + status.st_mtime <= max_time)) { ++count; } diff --git a/src/libs/zbxsysinfo/common/dir.h b/src/libs/zbxsysinfo/common/dir.h index b42e959a47d..991f1e81050 100644 --- a/src/libs/zbxsysinfo/common/dir.h +++ b/src/libs/zbxsysinfo/common/dir.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/file.c b/src/libs/zbxsysinfo/common/file.c index 03f13db39dc..87f1df36399 100644 --- a/src/libs/zbxsysinfo/common/file.c +++ b/src/libs/zbxsysinfo/common/file.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/file.h b/src/libs/zbxsysinfo/common/file.h index c329de1a6f0..bdc3dba6546 100644 --- a/src/libs/zbxsysinfo/common/file.h +++ b/src/libs/zbxsysinfo/common/file.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/http.c b/src/libs/zbxsysinfo/common/http.c index b77a66c792a..a7a1f9d41d7 100644 --- a/src/libs/zbxsysinfo/common/http.c +++ b/src/libs/zbxsysinfo/common/http.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/http.h b/src/libs/zbxsysinfo/common/http.h index 248a0854b35..830eac676ca 100644 --- a/src/libs/zbxsysinfo/common/http.h +++ b/src/libs/zbxsysinfo/common/http.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/net.c b/src/libs/zbxsysinfo/common/net.c index d2cce19d9db..e6a78309174 100644 --- a/src/libs/zbxsysinfo/common/net.c +++ b/src/libs/zbxsysinfo/common/net.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/net.h b/src/libs/zbxsysinfo/common/net.h index c00a3577fef..cfb49a9c92c 100644 --- a/src/libs/zbxsysinfo/common/net.h +++ b/src/libs/zbxsysinfo/common/net.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/system.c b/src/libs/zbxsysinfo/common/system.c index 60585995840..ddbda1152bc 100644 --- a/src/libs/zbxsysinfo/common/system.c +++ b/src/libs/zbxsysinfo/common/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/common/system.h b/src/libs/zbxsysinfo/common/system.h index 5c010277ba9..c972e7b6000 100644 --- a/src/libs/zbxsysinfo/common/system.h +++ b/src/libs/zbxsysinfo/common/system.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/boottime.c b/src/libs/zbxsysinfo/freebsd/boottime.c index 087813c13e2..cbb77ea2653 100644 --- a/src/libs/zbxsysinfo/freebsd/boottime.c +++ b/src/libs/zbxsysinfo/freebsd/boottime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/cpu.c b/src/libs/zbxsysinfo/freebsd/cpu.c index 38f4f39f09f..94336e00bb0 100644 --- a/src/libs/zbxsysinfo/freebsd/cpu.c +++ b/src/libs/zbxsysinfo/freebsd/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/diskio.c b/src/libs/zbxsysinfo/freebsd/diskio.c index 31e71a2ef3b..5cef1568b33 100644 --- a/src/libs/zbxsysinfo/freebsd/diskio.c +++ b/src/libs/zbxsysinfo/freebsd/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/diskspace.c b/src/libs/zbxsysinfo/freebsd/diskspace.c index 5dccb25da68..6ee4f8d2e52 100644 --- a/src/libs/zbxsysinfo/freebsd/diskspace.c +++ b/src/libs/zbxsysinfo/freebsd/diskspace.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/freebsd.c b/src/libs/zbxsysinfo/freebsd/freebsd.c index 86fa179b9c0..c89ade55a19 100644 --- a/src/libs/zbxsysinfo/freebsd/freebsd.c +++ b/src/libs/zbxsysinfo/freebsd/freebsd.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/hostname.c b/src/libs/zbxsysinfo/freebsd/hostname.c index a007d17d59f..ddd950e0de5 100644 --- a/src/libs/zbxsysinfo/freebsd/hostname.c +++ b/src/libs/zbxsysinfo/freebsd/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/inodes.c b/src/libs/zbxsysinfo/freebsd/inodes.c index 7d8c164b6d1..6a36fd470c4 100644 --- a/src/libs/zbxsysinfo/freebsd/inodes.c +++ b/src/libs/zbxsysinfo/freebsd/inodes.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/kernel.c b/src/libs/zbxsysinfo/freebsd/kernel.c index 54f5c6fa435..a1e40eba515 100644 --- a/src/libs/zbxsysinfo/freebsd/kernel.c +++ b/src/libs/zbxsysinfo/freebsd/kernel.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/memory.c b/src/libs/zbxsysinfo/freebsd/memory.c index aa5b76da16e..5005b89fcfe 100644 --- a/src/libs/zbxsysinfo/freebsd/memory.c +++ b/src/libs/zbxsysinfo/freebsd/memory.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/net.c b/src/libs/zbxsysinfo/freebsd/net.c index b4353c829d7..5b8fc42be05 100644 --- a/src/libs/zbxsysinfo/freebsd/net.c +++ b/src/libs/zbxsysinfo/freebsd/net.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/proc.c b/src/libs/zbxsysinfo/freebsd/proc.c index d31bf1d4664..0816ce64884 100644 --- a/src/libs/zbxsysinfo/freebsd/proc.c +++ b/src/libs/zbxsysinfo/freebsd/proc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/software.c b/src/libs/zbxsysinfo/freebsd/software.c index 0f47002a5be..e209a88eb65 100644 --- a/src/libs/zbxsysinfo/freebsd/software.c +++ b/src/libs/zbxsysinfo/freebsd/software.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/swap.c b/src/libs/zbxsysinfo/freebsd/swap.c index 6eeba3bab46..6411fd9c24a 100644 --- a/src/libs/zbxsysinfo/freebsd/swap.c +++ b/src/libs/zbxsysinfo/freebsd/swap.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/system.c b/src/libs/zbxsysinfo/freebsd/system.c index 851447cbe01..e99e8ee6ae3 100644 --- a/src/libs/zbxsysinfo/freebsd/system.c +++ b/src/libs/zbxsysinfo/freebsd/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/freebsd/uptime.c b/src/libs/zbxsysinfo/freebsd/uptime.c index 3e45b986be1..b49e48c84bb 100644 --- a/src/libs/zbxsysinfo/freebsd/uptime.c +++ b/src/libs/zbxsysinfo/freebsd/uptime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/cpu.c b/src/libs/zbxsysinfo/hpux/cpu.c index d5498330de7..b74838bcf56 100644 --- a/src/libs/zbxsysinfo/hpux/cpu.c +++ b/src/libs/zbxsysinfo/hpux/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/diskio.c b/src/libs/zbxsysinfo/hpux/diskio.c index ce388d6842b..cf17ea723c2 100644 --- a/src/libs/zbxsysinfo/hpux/diskio.c +++ b/src/libs/zbxsysinfo/hpux/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/diskspace.c b/src/libs/zbxsysinfo/hpux/diskspace.c index 4e8105bf405..8b3b66e067c 100644 --- a/src/libs/zbxsysinfo/hpux/diskspace.c +++ b/src/libs/zbxsysinfo/hpux/diskspace.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/hostname.c b/src/libs/zbxsysinfo/hpux/hostname.c index 3db79dcb72b..78606ea477d 100644 --- a/src/libs/zbxsysinfo/hpux/hostname.c +++ b/src/libs/zbxsysinfo/hpux/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/hpux.c b/src/libs/zbxsysinfo/hpux/hpux.c index 50a4cb444b0..68951bb711a 100644 --- a/src/libs/zbxsysinfo/hpux/hpux.c +++ b/src/libs/zbxsysinfo/hpux/hpux.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/inodes.c b/src/libs/zbxsysinfo/hpux/inodes.c index 7d8c164b6d1..6a36fd470c4 100644 --- a/src/libs/zbxsysinfo/hpux/inodes.c +++ b/src/libs/zbxsysinfo/hpux/inodes.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/memory.c b/src/libs/zbxsysinfo/hpux/memory.c index fce45a52193..4f3b28c2875 100644 --- a/src/libs/zbxsysinfo/hpux/memory.c +++ b/src/libs/zbxsysinfo/hpux/memory.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/net.c b/src/libs/zbxsysinfo/hpux/net.c index c56f020ee47..5ef12738c77 100644 --- a/src/libs/zbxsysinfo/hpux/net.c +++ b/src/libs/zbxsysinfo/hpux/net.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/proc.c b/src/libs/zbxsysinfo/hpux/proc.c index 049b17c48f2..c815a6a57f2 100644 --- a/src/libs/zbxsysinfo/hpux/proc.c +++ b/src/libs/zbxsysinfo/hpux/proc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/software.c b/src/libs/zbxsysinfo/hpux/software.c index 0f47002a5be..e209a88eb65 100644 --- a/src/libs/zbxsysinfo/hpux/software.c +++ b/src/libs/zbxsysinfo/hpux/software.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/hpux/system.c b/src/libs/zbxsysinfo/hpux/system.c index 6a955aa4307..5814994027e 100644 --- a/src/libs/zbxsysinfo/hpux/system.c +++ b/src/libs/zbxsysinfo/hpux/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/boottime.c b/src/libs/zbxsysinfo/linux/boottime.c index cd022a7c952..800f91ce160 100644 --- a/src/libs/zbxsysinfo/linux/boottime.c +++ b/src/libs/zbxsysinfo/linux/boottime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c index c809c4b9c95..d744f4403a4 100644 --- a/src/libs/zbxsysinfo/linux/cpu.c +++ b/src/libs/zbxsysinfo/linux/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/diskio.c b/src/libs/zbxsysinfo/linux/diskio.c index 139290a1f8c..fcb0c0ff492 100644 --- a/src/libs/zbxsysinfo/linux/diskio.c +++ b/src/libs/zbxsysinfo/linux/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/diskspace.c b/src/libs/zbxsysinfo/linux/diskspace.c index 52332fd7950..ebbae75851d 100644 --- a/src/libs/zbxsysinfo/linux/diskspace.c +++ b/src/libs/zbxsysinfo/linux/diskspace.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/hardware.c b/src/libs/zbxsysinfo/linux/hardware.c index 92072fa3259..a7cb69fdb16 100644 --- a/src/libs/zbxsysinfo/linux/hardware.c +++ b/src/libs/zbxsysinfo/linux/hardware.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/hardware.h b/src/libs/zbxsysinfo/linux/hardware.h index 80cf8fcb09a..a613af2641d 100644 --- a/src/libs/zbxsysinfo/linux/hardware.h +++ b/src/libs/zbxsysinfo/linux/hardware.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/hostname.c b/src/libs/zbxsysinfo/linux/hostname.c index 7f0b6caf981..cc0681b1247 100644 --- a/src/libs/zbxsysinfo/linux/hostname.c +++ b/src/libs/zbxsysinfo/linux/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/inodes.c b/src/libs/zbxsysinfo/linux/inodes.c index 35e6cef2dde..7537e018860 100644 --- a/src/libs/zbxsysinfo/linux/inodes.c +++ b/src/libs/zbxsysinfo/linux/inodes.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/kernel.c b/src/libs/zbxsysinfo/linux/kernel.c index 389223b8629..302c1b124fe 100644 --- a/src/libs/zbxsysinfo/linux/kernel.c +++ b/src/libs/zbxsysinfo/linux/kernel.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/linux.c b/src/libs/zbxsysinfo/linux/linux.c index 5c27ff20e6c..bf6448711b4 100644 --- a/src/libs/zbxsysinfo/linux/linux.c +++ b/src/libs/zbxsysinfo/linux/linux.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/memory.c b/src/libs/zbxsysinfo/linux/memory.c index 8d00938e3b1..e922b670ca2 100644 --- a/src/libs/zbxsysinfo/linux/memory.c +++ b/src/libs/zbxsysinfo/linux/memory.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/net.c b/src/libs/zbxsysinfo/linux/net.c index 65e97df27dd..46820bd13ae 100644 --- a/src/libs/zbxsysinfo/linux/net.c +++ b/src/libs/zbxsysinfo/linux/net.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/proc.c b/src/libs/zbxsysinfo/linux/proc.c index 164d6822860..ca6beac7e99 100644 --- a/src/libs/zbxsysinfo/linux/proc.c +++ b/src/libs/zbxsysinfo/linux/proc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/proc.h b/src/libs/zbxsysinfo/linux/proc.h index 3d72317f248..52ab0e65ae5 100644 --- a/src/libs/zbxsysinfo/linux/proc.h +++ b/src/libs/zbxsysinfo/linux/proc.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/sensors.c b/src/libs/zbxsysinfo/linux/sensors.c index 085532d1cd3..f735af1de3d 100644 --- a/src/libs/zbxsysinfo/linux/sensors.c +++ b/src/libs/zbxsysinfo/linux/sensors.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/software.c b/src/libs/zbxsysinfo/linux/software.c index 1c88726917d..7f2720755e3 100644 --- a/src/libs/zbxsysinfo/linux/software.c +++ b/src/libs/zbxsysinfo/linux/software.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/software.h b/src/libs/zbxsysinfo/linux/software.h index d0cb174333f..d1069fecacb 100644 --- a/src/libs/zbxsysinfo/linux/software.h +++ b/src/libs/zbxsysinfo/linux/software.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/swap.c b/src/libs/zbxsysinfo/linux/swap.c index 6d20f07938a..41f6748ff41 100644 --- a/src/libs/zbxsysinfo/linux/swap.c +++ b/src/libs/zbxsysinfo/linux/swap.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/system.c b/src/libs/zbxsysinfo/linux/system.c index de6be36692d..a56670394af 100644 --- a/src/libs/zbxsysinfo/linux/system.c +++ b/src/libs/zbxsysinfo/linux/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/linux/uptime.c b/src/libs/zbxsysinfo/linux/uptime.c index 14f8b4ec6c7..90d0391312d 100644 --- a/src/libs/zbxsysinfo/linux/uptime.c +++ b/src/libs/zbxsysinfo/linux/uptime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/boottime.c b/src/libs/zbxsysinfo/netbsd/boottime.c index 087813c13e2..cbb77ea2653 100644 --- a/src/libs/zbxsysinfo/netbsd/boottime.c +++ b/src/libs/zbxsysinfo/netbsd/boottime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/cpu.c b/src/libs/zbxsysinfo/netbsd/cpu.c index 6c8a5f36247..369361b37b5 100644 --- a/src/libs/zbxsysinfo/netbsd/cpu.c +++ b/src/libs/zbxsysinfo/netbsd/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/diskio.c b/src/libs/zbxsysinfo/netbsd/diskio.c index ce388d6842b..cf17ea723c2 100644 --- a/src/libs/zbxsysinfo/netbsd/diskio.c +++ b/src/libs/zbxsysinfo/netbsd/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/diskspace.c b/src/libs/zbxsysinfo/netbsd/diskspace.c index cf22272adbf..cf76f7f8ade 100644 --- a/src/libs/zbxsysinfo/netbsd/diskspace.c +++ b/src/libs/zbxsysinfo/netbsd/diskspace.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/hostname.c b/src/libs/zbxsysinfo/netbsd/hostname.c index a007d17d59f..ddd950e0de5 100644 --- a/src/libs/zbxsysinfo/netbsd/hostname.c +++ b/src/libs/zbxsysinfo/netbsd/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/inodes.c b/src/libs/zbxsysinfo/netbsd/inodes.c index 7d8c164b6d1..6a36fd470c4 100644 --- a/src/libs/zbxsysinfo/netbsd/inodes.c +++ b/src/libs/zbxsysinfo/netbsd/inodes.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/kernel.c b/src/libs/zbxsysinfo/netbsd/kernel.c index 54f5c6fa435..a1e40eba515 100644 --- a/src/libs/zbxsysinfo/netbsd/kernel.c +++ b/src/libs/zbxsysinfo/netbsd/kernel.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/memory.c b/src/libs/zbxsysinfo/netbsd/memory.c index 98e7c0a3b85..66f0cd9cfb4 100644 --- a/src/libs/zbxsysinfo/netbsd/memory.c +++ b/src/libs/zbxsysinfo/netbsd/memory.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/net.c b/src/libs/zbxsysinfo/netbsd/net.c index 00118683744..2d716a7c7ba 100644 --- a/src/libs/zbxsysinfo/netbsd/net.c +++ b/src/libs/zbxsysinfo/netbsd/net.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/netbsd.c b/src/libs/zbxsysinfo/netbsd/netbsd.c index 59f616deb12..fe9c49f52aa 100644 --- a/src/libs/zbxsysinfo/netbsd/netbsd.c +++ b/src/libs/zbxsysinfo/netbsd/netbsd.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/proc.c b/src/libs/zbxsysinfo/netbsd/proc.c index cd3be44d0b0..ac77a8966d0 100644 --- a/src/libs/zbxsysinfo/netbsd/proc.c +++ b/src/libs/zbxsysinfo/netbsd/proc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/software.c b/src/libs/zbxsysinfo/netbsd/software.c index 0f47002a5be..e209a88eb65 100644 --- a/src/libs/zbxsysinfo/netbsd/software.c +++ b/src/libs/zbxsysinfo/netbsd/software.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/system.c b/src/libs/zbxsysinfo/netbsd/system.c index 851447cbe01..e99e8ee6ae3 100644 --- a/src/libs/zbxsysinfo/netbsd/system.c +++ b/src/libs/zbxsysinfo/netbsd/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/netbsd/uptime.c b/src/libs/zbxsysinfo/netbsd/uptime.c index 3e45b986be1..b49e48c84bb 100644 --- a/src/libs/zbxsysinfo/netbsd/uptime.c +++ b/src/libs/zbxsysinfo/netbsd/uptime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/boottime.c b/src/libs/zbxsysinfo/openbsd/boottime.c index 087813c13e2..cbb77ea2653 100644 --- a/src/libs/zbxsysinfo/openbsd/boottime.c +++ b/src/libs/zbxsysinfo/openbsd/boottime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/cpu.c b/src/libs/zbxsysinfo/openbsd/cpu.c index 82e400d911b..cd609ce51f8 100644 --- a/src/libs/zbxsysinfo/openbsd/cpu.c +++ b/src/libs/zbxsysinfo/openbsd/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/diskio.c b/src/libs/zbxsysinfo/openbsd/diskio.c index 8dc17b5f07c..c6e77e14bae 100644 --- a/src/libs/zbxsysinfo/openbsd/diskio.c +++ b/src/libs/zbxsysinfo/openbsd/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/diskspace.c b/src/libs/zbxsysinfo/openbsd/diskspace.c index 5dccb25da68..6ee4f8d2e52 100644 --- a/src/libs/zbxsysinfo/openbsd/diskspace.c +++ b/src/libs/zbxsysinfo/openbsd/diskspace.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/hostname.c b/src/libs/zbxsysinfo/openbsd/hostname.c index a007d17d59f..ddd950e0de5 100644 --- a/src/libs/zbxsysinfo/openbsd/hostname.c +++ b/src/libs/zbxsysinfo/openbsd/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/inodes.c b/src/libs/zbxsysinfo/openbsd/inodes.c index 7d8c164b6d1..6a36fd470c4 100644 --- a/src/libs/zbxsysinfo/openbsd/inodes.c +++ b/src/libs/zbxsysinfo/openbsd/inodes.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/kernel.c b/src/libs/zbxsysinfo/openbsd/kernel.c index b042abe622e..fdfe729e664 100644 --- a/src/libs/zbxsysinfo/openbsd/kernel.c +++ b/src/libs/zbxsysinfo/openbsd/kernel.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/memory.c b/src/libs/zbxsysinfo/openbsd/memory.c index c5abb6baecd..e6bb5548078 100644 --- a/src/libs/zbxsysinfo/openbsd/memory.c +++ b/src/libs/zbxsysinfo/openbsd/memory.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/net.c b/src/libs/zbxsysinfo/openbsd/net.c index 81735293d55..c1d511a530a 100644 --- a/src/libs/zbxsysinfo/openbsd/net.c +++ b/src/libs/zbxsysinfo/openbsd/net.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/openbsd.c b/src/libs/zbxsysinfo/openbsd/openbsd.c index 5e0cfe552dd..88e4ba0afd6 100644 --- a/src/libs/zbxsysinfo/openbsd/openbsd.c +++ b/src/libs/zbxsysinfo/openbsd/openbsd.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/proc.c b/src/libs/zbxsysinfo/openbsd/proc.c index a941847ebed..0e42042c101 100644 --- a/src/libs/zbxsysinfo/openbsd/proc.c +++ b/src/libs/zbxsysinfo/openbsd/proc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/sensors.c b/src/libs/zbxsysinfo/openbsd/sensors.c index e71ad869373..dbe4f1a033b 100644 --- a/src/libs/zbxsysinfo/openbsd/sensors.c +++ b/src/libs/zbxsysinfo/openbsd/sensors.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/software.c b/src/libs/zbxsysinfo/openbsd/software.c index 0f47002a5be..e209a88eb65 100644 --- a/src/libs/zbxsysinfo/openbsd/software.c +++ b/src/libs/zbxsysinfo/openbsd/software.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/swap.c b/src/libs/zbxsysinfo/openbsd/swap.c index 0c37f393ebd..eddf60f2da3 100644 --- a/src/libs/zbxsysinfo/openbsd/swap.c +++ b/src/libs/zbxsysinfo/openbsd/swap.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/system.c b/src/libs/zbxsysinfo/openbsd/system.c index 851447cbe01..e99e8ee6ae3 100644 --- a/src/libs/zbxsysinfo/openbsd/system.c +++ b/src/libs/zbxsysinfo/openbsd/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/openbsd/uptime.c b/src/libs/zbxsysinfo/openbsd/uptime.c index 2b5055c9dda..55a6f611ace 100644 --- a/src/libs/zbxsysinfo/openbsd/uptime.c +++ b/src/libs/zbxsysinfo/openbsd/uptime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/cpu.c b/src/libs/zbxsysinfo/osf/cpu.c index d01119922f9..6db0b056b97 100644 --- a/src/libs/zbxsysinfo/osf/cpu.c +++ b/src/libs/zbxsysinfo/osf/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/diskio.c b/src/libs/zbxsysinfo/osf/diskio.c index ce388d6842b..cf17ea723c2 100644 --- a/src/libs/zbxsysinfo/osf/diskio.c +++ b/src/libs/zbxsysinfo/osf/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/diskspace.c b/src/libs/zbxsysinfo/osf/diskspace.c index e4cc4b0ec85..f536138b1c4 100644 --- a/src/libs/zbxsysinfo/osf/diskspace.c +++ b/src/libs/zbxsysinfo/osf/diskspace.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/hostname.c b/src/libs/zbxsysinfo/osf/hostname.c index a007d17d59f..ddd950e0de5 100644 --- a/src/libs/zbxsysinfo/osf/hostname.c +++ b/src/libs/zbxsysinfo/osf/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/inodes.c b/src/libs/zbxsysinfo/osf/inodes.c index 7d8c164b6d1..6a36fd470c4 100644 --- a/src/libs/zbxsysinfo/osf/inodes.c +++ b/src/libs/zbxsysinfo/osf/inodes.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/kernel.c b/src/libs/zbxsysinfo/osf/kernel.c index 87d02c670c2..eec5d4524de 100644 --- a/src/libs/zbxsysinfo/osf/kernel.c +++ b/src/libs/zbxsysinfo/osf/kernel.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/memory.c b/src/libs/zbxsysinfo/osf/memory.c index f705791715e..ac2ce8619cd 100644 --- a/src/libs/zbxsysinfo/osf/memory.c +++ b/src/libs/zbxsysinfo/osf/memory.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/osf.c b/src/libs/zbxsysinfo/osf/osf.c index 40eeb7368eb..1bda56b19cb 100644 --- a/src/libs/zbxsysinfo/osf/osf.c +++ b/src/libs/zbxsysinfo/osf/osf.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/proc.c b/src/libs/zbxsysinfo/osf/proc.c index d6dde844b95..fd178664f90 100644 --- a/src/libs/zbxsysinfo/osf/proc.c +++ b/src/libs/zbxsysinfo/osf/proc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/software.c b/src/libs/zbxsysinfo/osf/software.c index 0f47002a5be..e209a88eb65 100644 --- a/src/libs/zbxsysinfo/osf/software.c +++ b/src/libs/zbxsysinfo/osf/software.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/swap.c b/src/libs/zbxsysinfo/osf/swap.c index 20d6ff090a2..14647b6c376 100644 --- a/src/libs/zbxsysinfo/osf/swap.c +++ b/src/libs/zbxsysinfo/osf/swap.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/system.c b/src/libs/zbxsysinfo/osf/system.c index 851447cbe01..e99e8ee6ae3 100644 --- a/src/libs/zbxsysinfo/osf/system.c +++ b/src/libs/zbxsysinfo/osf/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osf/uptime.c b/src/libs/zbxsysinfo/osf/uptime.c index e629b84ca50..14fa12970f2 100644 --- a/src/libs/zbxsysinfo/osf/uptime.c +++ b/src/libs/zbxsysinfo/osf/uptime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/boottime.c b/src/libs/zbxsysinfo/osx/boottime.c index aa4fc2de2c0..37c99bc5f94 100644 --- a/src/libs/zbxsysinfo/osx/boottime.c +++ b/src/libs/zbxsysinfo/osx/boottime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/cpu.c b/src/libs/zbxsysinfo/osx/cpu.c index 793b6327385..b20c4f4d647 100644 --- a/src/libs/zbxsysinfo/osx/cpu.c +++ b/src/libs/zbxsysinfo/osx/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/diskio.c b/src/libs/zbxsysinfo/osx/diskio.c index ce388d6842b..cf17ea723c2 100644 --- a/src/libs/zbxsysinfo/osx/diskio.c +++ b/src/libs/zbxsysinfo/osx/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/diskspace.c b/src/libs/zbxsysinfo/osx/diskspace.c index 5dccb25da68..6ee4f8d2e52 100644 --- a/src/libs/zbxsysinfo/osx/diskspace.c +++ b/src/libs/zbxsysinfo/osx/diskspace.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/hostname.c b/src/libs/zbxsysinfo/osx/hostname.c index a007d17d59f..ddd950e0de5 100644 --- a/src/libs/zbxsysinfo/osx/hostname.c +++ b/src/libs/zbxsysinfo/osx/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/inodes.c b/src/libs/zbxsysinfo/osx/inodes.c index 7d8c164b6d1..6a36fd470c4 100644 --- a/src/libs/zbxsysinfo/osx/inodes.c +++ b/src/libs/zbxsysinfo/osx/inodes.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/kernel.c b/src/libs/zbxsysinfo/osx/kernel.c index 2ec9f915f8b..e5baeaaaeda 100644 --- a/src/libs/zbxsysinfo/osx/kernel.c +++ b/src/libs/zbxsysinfo/osx/kernel.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/memory.c b/src/libs/zbxsysinfo/osx/memory.c index 2d460450349..96a76ddd2ed 100644 --- a/src/libs/zbxsysinfo/osx/memory.c +++ b/src/libs/zbxsysinfo/osx/memory.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/net.c b/src/libs/zbxsysinfo/osx/net.c index 8ad74b0aaf6..9bc43ae80e3 100644 --- a/src/libs/zbxsysinfo/osx/net.c +++ b/src/libs/zbxsysinfo/osx/net.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/osx.c b/src/libs/zbxsysinfo/osx/osx.c index 0854ae45ed1..2dfb750f488 100644 --- a/src/libs/zbxsysinfo/osx/osx.c +++ b/src/libs/zbxsysinfo/osx/osx.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/software.c b/src/libs/zbxsysinfo/osx/software.c index 0f47002a5be..e209a88eb65 100644 --- a/src/libs/zbxsysinfo/osx/software.c +++ b/src/libs/zbxsysinfo/osx/software.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/system.c b/src/libs/zbxsysinfo/osx/system.c index 851447cbe01..e99e8ee6ae3 100644 --- a/src/libs/zbxsysinfo/osx/system.c +++ b/src/libs/zbxsysinfo/osx/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/osx/uptime.c b/src/libs/zbxsysinfo/osx/uptime.c index c04ab265efc..a23e2810036 100644 --- a/src/libs/zbxsysinfo/osx/uptime.c +++ b/src/libs/zbxsysinfo/osx/uptime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/simple/ntp.c b/src/libs/zbxsysinfo/simple/ntp.c index 3dcc6b49269..28911347c84 100644 --- a/src/libs/zbxsysinfo/simple/ntp.c +++ b/src/libs/zbxsysinfo/simple/ntp.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/simple/ntp.h b/src/libs/zbxsysinfo/simple/ntp.h index afb14447580..25fa04601d5 100644 --- a/src/libs/zbxsysinfo/simple/ntp.h +++ b/src/libs/zbxsysinfo/simple/ntp.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/simple/simple.c b/src/libs/zbxsysinfo/simple/simple.c index 2bb74e2a4bb..ae12ed4a293 100644 --- a/src/libs/zbxsysinfo/simple/simple.c +++ b/src/libs/zbxsysinfo/simple/simple.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/simple/simple.h b/src/libs/zbxsysinfo/simple/simple.h index 48652263faa..27965cfdff0 100644 --- a/src/libs/zbxsysinfo/simple/simple.h +++ b/src/libs/zbxsysinfo/simple/simple.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/boottime.c b/src/libs/zbxsysinfo/solaris/boottime.c index c162c08ebc1..d50206c784a 100644 --- a/src/libs/zbxsysinfo/solaris/boottime.c +++ b/src/libs/zbxsysinfo/solaris/boottime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/cpu.c b/src/libs/zbxsysinfo/solaris/cpu.c index f8ee5b9805d..b777f052a4f 100644 --- a/src/libs/zbxsysinfo/solaris/cpu.c +++ b/src/libs/zbxsysinfo/solaris/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/diskio.c b/src/libs/zbxsysinfo/solaris/diskio.c index f00830cae6f..6c35e9a426a 100644 --- a/src/libs/zbxsysinfo/solaris/diskio.c +++ b/src/libs/zbxsysinfo/solaris/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/diskspace.c b/src/libs/zbxsysinfo/solaris/diskspace.c index 52a76363422..6031b4f7c3d 100644 --- a/src/libs/zbxsysinfo/solaris/diskspace.c +++ b/src/libs/zbxsysinfo/solaris/diskspace.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/hostname.c b/src/libs/zbxsysinfo/solaris/hostname.c index a007d17d59f..ddd950e0de5 100644 --- a/src/libs/zbxsysinfo/solaris/hostname.c +++ b/src/libs/zbxsysinfo/solaris/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/inodes.c b/src/libs/zbxsysinfo/solaris/inodes.c index 1b8870cb840..76df48962a1 100644 --- a/src/libs/zbxsysinfo/solaris/inodes.c +++ b/src/libs/zbxsysinfo/solaris/inodes.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/kernel.c b/src/libs/zbxsysinfo/solaris/kernel.c index 98421abce58..594ca11a090 100644 --- a/src/libs/zbxsysinfo/solaris/kernel.c +++ b/src/libs/zbxsysinfo/solaris/kernel.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/memory.c b/src/libs/zbxsysinfo/solaris/memory.c index 6723d8a6de8..c34c65a7733 100644 --- a/src/libs/zbxsysinfo/solaris/memory.c +++ b/src/libs/zbxsysinfo/solaris/memory.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/net.c b/src/libs/zbxsysinfo/solaris/net.c index 14a110f8308..e858b3bdcf3 100644 --- a/src/libs/zbxsysinfo/solaris/net.c +++ b/src/libs/zbxsysinfo/solaris/net.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/proc.c b/src/libs/zbxsysinfo/solaris/proc.c index be7c793e7ed..6be57ae8209 100644 --- a/src/libs/zbxsysinfo/solaris/proc.c +++ b/src/libs/zbxsysinfo/solaris/proc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/software.c b/src/libs/zbxsysinfo/solaris/software.c index 0f47002a5be..e209a88eb65 100644 --- a/src/libs/zbxsysinfo/solaris/software.c +++ b/src/libs/zbxsysinfo/solaris/software.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/solaris.c b/src/libs/zbxsysinfo/solaris/solaris.c index ab07c4087c6..1976e4c38de 100644 --- a/src/libs/zbxsysinfo/solaris/solaris.c +++ b/src/libs/zbxsysinfo/solaris/solaris.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/swap.c b/src/libs/zbxsysinfo/solaris/swap.c index 5735c6d66a0..ec4e53821c0 100644 --- a/src/libs/zbxsysinfo/solaris/swap.c +++ b/src/libs/zbxsysinfo/solaris/swap.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/system.c b/src/libs/zbxsysinfo/solaris/system.c index 851447cbe01..e99e8ee6ae3 100644 --- a/src/libs/zbxsysinfo/solaris/system.c +++ b/src/libs/zbxsysinfo/solaris/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/solaris/uptime.c b/src/libs/zbxsysinfo/solaris/uptime.c index b2a756b5885..0404bd55cf3 100644 --- a/src/libs/zbxsysinfo/solaris/uptime.c +++ b/src/libs/zbxsysinfo/solaris/uptime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/specsysinfo.h b/src/libs/zbxsysinfo/specsysinfo.h index 8d1a151e4df..70e81d8e8aa 100644 --- a/src/libs/zbxsysinfo/specsysinfo.h +++ b/src/libs/zbxsysinfo/specsysinfo.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c index 70fb27a9898..4e91db1251e 100644 --- a/src/libs/zbxsysinfo/sysinfo.c +++ b/src/libs/zbxsysinfo/sysinfo.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/unknown/diskio.c b/src/libs/zbxsysinfo/unknown/diskio.c index ce388d6842b..cf17ea723c2 100644 --- a/src/libs/zbxsysinfo/unknown/diskio.c +++ b/src/libs/zbxsysinfo/unknown/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/unknown/hostname.c b/src/libs/zbxsysinfo/unknown/hostname.c index 8953bc8c1d7..11756a83a50 100644 --- a/src/libs/zbxsysinfo/unknown/hostname.c +++ b/src/libs/zbxsysinfo/unknown/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/unknown/unknown.c b/src/libs/zbxsysinfo/unknown/unknown.c index f42040c5551..d5bbd5dc956 100644 --- a/src/libs/zbxsysinfo/unknown/unknown.c +++ b/src/libs/zbxsysinfo/unknown/unknown.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/cpu.c b/src/libs/zbxsysinfo/win32/cpu.c index 3a85999069b..8f2c7874a5b 100644 --- a/src/libs/zbxsysinfo/win32/cpu.c +++ b/src/libs/zbxsysinfo/win32/cpu.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/diskio.c b/src/libs/zbxsysinfo/win32/diskio.c index ce388d6842b..cf17ea723c2 100644 --- a/src/libs/zbxsysinfo/win32/diskio.c +++ b/src/libs/zbxsysinfo/win32/diskio.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/diskspace.c b/src/libs/zbxsysinfo/win32/diskspace.c index 9c97497cf8c..16d38395809 100644 --- a/src/libs/zbxsysinfo/win32/diskspace.c +++ b/src/libs/zbxsysinfo/win32/diskspace.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/hostname.c b/src/libs/zbxsysinfo/win32/hostname.c index 6af1272991e..d09178f8020 100644 --- a/src/libs/zbxsysinfo/win32/hostname.c +++ b/src/libs/zbxsysinfo/win32/hostname.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/memory.c b/src/libs/zbxsysinfo/win32/memory.c index a1190083542..73a11ba919e 100644 --- a/src/libs/zbxsysinfo/win32/memory.c +++ b/src/libs/zbxsysinfo/win32/memory.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/net.c b/src/libs/zbxsysinfo/win32/net.c index c7c9ba6716f..417e6aa19a9 100644 --- a/src/libs/zbxsysinfo/win32/net.c +++ b/src/libs/zbxsysinfo/win32/net.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/pdhmon.c b/src/libs/zbxsysinfo/win32/pdhmon.c index 7af771230da..f40a93b6d09 100644 --- a/src/libs/zbxsysinfo/win32/pdhmon.c +++ b/src/libs/zbxsysinfo/win32/pdhmon.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/proc.c b/src/libs/zbxsysinfo/win32/proc.c index 3ec805e9aa7..3ff6a4554d8 100644 --- a/src/libs/zbxsysinfo/win32/proc.c +++ b/src/libs/zbxsysinfo/win32/proc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/services.c b/src/libs/zbxsysinfo/win32/services.c index 511b1fe151a..7727818b358 100644 --- a/src/libs/zbxsysinfo/win32/services.c +++ b/src/libs/zbxsysinfo/win32/services.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/software.c b/src/libs/zbxsysinfo/win32/software.c index 84fc441ecc3..1db3048e6b9 100644 --- a/src/libs/zbxsysinfo/win32/software.c +++ b/src/libs/zbxsysinfo/win32/software.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/swap.c b/src/libs/zbxsysinfo/win32/swap.c index a9aacde7134..f048ff182aa 100644 --- a/src/libs/zbxsysinfo/win32/swap.c +++ b/src/libs/zbxsysinfo/win32/swap.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/system.c b/src/libs/zbxsysinfo/win32/system.c index e4da6e0190b..7472956689d 100644 --- a/src/libs/zbxsysinfo/win32/system.c +++ b/src/libs/zbxsysinfo/win32/system.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/uptime.c b/src/libs/zbxsysinfo/win32/uptime.c index 917b5170fe5..50fcf63f380 100644 --- a/src/libs/zbxsysinfo/win32/uptime.c +++ b/src/libs/zbxsysinfo/win32/uptime.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/win32.c b/src/libs/zbxsysinfo/win32/win32.c index 6748075116f..3f9c940d544 100644 --- a/src/libs/zbxsysinfo/win32/win32.c +++ b/src/libs/zbxsysinfo/win32/win32.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxsysinfo/win32/wmi.cpp b/src/libs/zbxsysinfo/win32/wmi.cpp index e2d89c889a7..644dba7c786 100644 --- a/src/libs/zbxsysinfo/win32/wmi.cpp +++ b/src/libs/zbxsysinfo/win32/wmi.cpp @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxtasks/task.c b/src/libs/zbxtasks/task.c index d6621e0d232..63703b8f2fd 100644 --- a/src/libs/zbxtasks/task.c +++ b/src/libs/zbxtasks/task.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxwin32/disk.c b/src/libs/zbxwin32/disk.c index 970cf66f1cb..ef774653bea 100644 --- a/src/libs/zbxwin32/disk.c +++ b/src/libs/zbxwin32/disk.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxwin32/fatal.c b/src/libs/zbxwin32/fatal.c index c4cfa4de45a..f5d7fde5d75 100644 --- a/src/libs/zbxwin32/fatal.c +++ b/src/libs/zbxwin32/fatal.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxwin32/perfmon.c b/src/libs/zbxwin32/perfmon.c index 182b04975da..8e043d449ce 100644 --- a/src/libs/zbxwin32/perfmon.c +++ b/src/libs/zbxwin32/perfmon.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/libs/zbxwin32/service.c b/src/libs/zbxwin32/service.c index af8f5f34285..6e4ecd29645 100644 --- a/src/libs/zbxwin32/service.c +++ b/src/libs/zbxwin32/service.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/modules/dummy/dummy.c b/src/modules/dummy/dummy.c index 5b8e8004879..b45965ba55f 100644 --- a/src/modules/dummy/dummy.c +++ b/src/modules/dummy/dummy.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am index 773cd364b1f..2f36fe2c8fa 100644 --- a/src/zabbix_agent/Makefile.am +++ b/src/zabbix_agent/Makefile.am @@ -36,8 +36,7 @@ zabbix_agentd_LDADD = \ $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ $(top_srcdir)/src/libs/zbxexec/libzbxexec.a \ - $(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \ - $(top_srcdir)/src/libs/zbxself/libzbxself.a + $(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a zabbix_agentd_LDADD += @AGENT_LIBS@ diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c index 8a3396c40c8..8e9059749ac 100644 --- a/src/zabbix_agent/active.c +++ b/src/zabbix_agent/active.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -20,7 +20,6 @@ #include "common.h" #include "active.h" #include "zbxconf.h" -#include "zbxself.h" #include "cfg.h" #include "log.h" @@ -275,6 +274,42 @@ out: /****************************************************************************** * * + * Function: mode_parameter_is_skip * + * * + * Purpose: test log[] or log.count[] item key if <mode> parameter is set to * + * 'skip' * + * * + * Return value: SUCCEED - <mode> parameter is set to 'skip' * + * FAIL - <mode> is not 'skip' or error * + * * + ******************************************************************************/ +static int mode_parameter_is_skip(unsigned char flags, const char *itemkey) +{ + AGENT_REQUEST request; + const char *skip; + int ret = FAIL, max_num_parameters; + + if (0 == (ZBX_METRIC_FLAG_LOG_COUNT & flags)) /* log[] */ + max_num_parameters = 7; + else /* log.count[] */ + max_num_parameters = 6; + + init_request(&request); + + if (SUCCEED == parse_item_key(itemkey, &request) && 0 < get_rparams_num(&request) && + max_num_parameters >= get_rparams_num(&request) && NULL != (skip = get_rparam(&request, 4)) && + 0 == strcmp(skip, "skip")) + { + ret = SUCCEED; + } + + free_request(&request); + + return ret; +} + +/****************************************************************************** + * * * Function: parse_list_of_checks * * * * Purpose: Parse list of active checks received from server * @@ -398,6 +433,17 @@ static int parse_list_of_checks(char *str, const char *host, unsigned short port metric = (ZBX_ACTIVE_METRIC *)active_metrics.values[i]; + /* 'Do-not-delete' exception for log[] and log.count[] items with <mode> parameter set to 'skip'. */ + /* We need to keep their state, namely 'skip_old_data', in case the items become NOTSUPPORTED as */ + /* server might not send them in a new active check list. */ + + if (0 != (ZBX_METRIC_FLAG_LOG_LOG & metric->flags) && ITEM_STATE_NOTSUPPORTED == metric->state && + 0 == metric->skip_old_data && SUCCEED == mode_parameter_is_skip(metric->flags, + metric->key)) + { + continue; + } + for (j = 0; j < received_metrics.values_num; j++) { if (0 == strcmp(metric->key_orig, received_metrics.values[j])) diff --git a/src/zabbix_agent/active.h b/src/zabbix_agent/active.h index 52e806965e5..6da92bb6f94 100644 --- a/src/zabbix_agent/active.h +++ b/src/zabbix_agent/active.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/cpustat.c b/src/zabbix_agent/cpustat.c index 9fd2aeaa40b..d94ac270b13 100644 --- a/src/zabbix_agent/cpustat.c +++ b/src/zabbix_agent/cpustat.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/cpustat.h b/src/zabbix_agent/cpustat.h index 345595bd0cf..1c634ad0c0b 100644 --- a/src/zabbix_agent/cpustat.h +++ b/src/zabbix_agent/cpustat.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/diskdevices.c b/src/zabbix_agent/diskdevices.c index eab12d595d9..9a289ff039f 100644 --- a/src/zabbix_agent/diskdevices.c +++ b/src/zabbix_agent/diskdevices.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/diskdevices.h b/src/zabbix_agent/diskdevices.h index 57a44421e42..12af363cd4a 100644 --- a/src/zabbix_agent/diskdevices.h +++ b/src/zabbix_agent/diskdevices.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/eventlog.c b/src/zabbix_agent/eventlog.c index 158d2d67736..cfa2dc1adad 100644 --- a/src/zabbix_agent/eventlog.c +++ b/src/zabbix_agent/eventlog.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/eventlog.h b/src/zabbix_agent/eventlog.h index a488942da87..d9c571f281c 100644 --- a/src/zabbix_agent/eventlog.h +++ b/src/zabbix_agent/eventlog.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/listener.c b/src/zabbix_agent/listener.c index 09897b11568..88932fd9cdd 100644 --- a/src/zabbix_agent/listener.c +++ b/src/zabbix_agent/listener.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -19,7 +19,6 @@ #include "common.h" #include "listener.h" -#include "zbxself.h" #include "comms.h" #include "cfg.h" diff --git a/src/zabbix_agent/listener.h b/src/zabbix_agent/listener.h index 2ff2fa4aeb4..d3731dd86fe 100644 --- a/src/zabbix_agent/listener.h +++ b/src/zabbix_agent/listener.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/logfiles.c b/src/zabbix_agent/logfiles.c index 5b4871c89f0..6558420f0c2 100644 --- a/src/zabbix_agent/logfiles.c +++ b/src/zabbix_agent/logfiles.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -33,6 +33,7 @@ #define ZBX_SAME_FILE_NO 0 #define ZBX_SAME_FILE_YES 1 #define ZBX_SAME_FILE_RETRY 2 +#define ZBX_NO_FILE_ERROR 3 /****************************************************************************** * * @@ -1317,10 +1318,12 @@ clean: * logfiles_alloc - [IN/OUT] number of logfiles memory was allocated for * * logfiles_num - [IN/OUT] number of already inserted logfiles * * use_ino - [IN/OUT] how to use inode numbers * - * err_msg - [IN/OUT] error message why an item became * - * NOTSUPPORTED * + * err_msg - [IN/OUT] error message (if FAIL or ZBX_NO_FILE_ERROR * + * is returned) * * * - * Return value: SUCCEED or FAIL * + * Return value: SUCCEED - file list successfully built, * + * ZBX_NO_FILE_ERROR - file(s) do not exist, * + * FAIL - other errors * * * ******************************************************************************/ static int make_logfile_list(unsigned char flags, const char *filename, const int *mtime, @@ -1335,7 +1338,7 @@ static int make_logfile_list(unsigned char flags, const char *filename, const in { *err_msg = zbx_dsprintf(*err_msg, "Cannot obtain information for file \"%s\": %s", filename, zbx_strerror(errno)); - ret = FAIL; + ret = ZBX_NO_FILE_ERROR; goto clean; } @@ -1401,6 +1404,7 @@ static int make_logfile_list(unsigned char flags, const char *filename, const in #ifdef _WINDOWS zabbix_log(LOG_LEVEL_WARNING, "there are no files matching \"%s\" in \"%s\" or insufficient " "access rights", format, directory); + ret = ZBX_NO_FILE_ERROR; #else if (0 != access(directory, X_OK)) { @@ -1411,6 +1415,7 @@ static int make_logfile_list(unsigned char flags, const char *filename, const in { zabbix_log(LOG_LEVEL_WARNING, "there are no files matching \"%s\" in \"%s\"", format, directory); + ret = ZBX_NO_FILE_ERROR; } #endif } @@ -1420,7 +1425,7 @@ clean1: zbx_free(directory); zbx_free(format); - if (FAIL == ret) + if (FAIL == ret || ZBX_NO_FILE_ERROR == ret) goto clean; } else @@ -1464,7 +1469,7 @@ clean3: } } clean: - if (FAIL == ret && NULL != *logfiles) + if ((FAIL == ret || ZBX_NO_FILE_ERROR == ret) && NULL != *logfiles) destroy_logfile_list(logfiles, logfiles_alloc, logfiles_num); return ret; @@ -1886,8 +1891,12 @@ static int process_log(unsigned char flags, const char *filename, zbx_uint64_t * if ((zbx_uint64_t)buf.st_size == *lastlogsize) { - /* The file size has not changed. Nothing to do. Here we do not deal with a case of changing */ + /* The file size has not changed, no new lines. Here we do not deal with a case of changing */ /* a logfile's content while keeping the same length. */ + + if (1 == *skip_old_data) + *skip_old_data = 0; + ret = SUCCEED; goto out; } @@ -2328,7 +2337,7 @@ int process_logrt(unsigned char flags, const char *filename, zbx_uint64_t *lastl { const char *__function_name = "process_logrt"; int i, j, start_idx, ret = FAIL, logfiles_num = 0, logfiles_alloc = 0, seq = 1, - max_old_seq = 0, old_last, from_first_file = 1, last_processed, limit_reached = 0; + max_old_seq = 0, old_last, from_first_file = 1, last_processed, limit_reached = 0, res; char *old2new = NULL; struct st_logfile *logfiles = NULL; time_t now; @@ -2352,11 +2361,18 @@ int process_logrt(unsigned char flags, const char *filename, zbx_uint64_t *lastl "seconds back.", (int)(old_mtime - now)); } - if (SUCCEED != make_logfile_list(flags, filename, mtime, &logfiles, &logfiles_alloc, &logfiles_num, use_ino, - err_msg)) + if (SUCCEED != (res = make_logfile_list(flags, filename, mtime, &logfiles, &logfiles_alloc, &logfiles_num, + use_ino, err_msg))) { - /* an error occurred or a file was not accessible for a log[] or log.count[] item */ - goto out; + if (ZBX_NO_FILE_ERROR == res && 1 == *skip_old_data) + { + *skip_old_data = 0; + zabbix_log(LOG_LEVEL_DEBUG, "%s(): no files, setting skip_old_data to 0", __function_name); + } + + /* file was not accessible for a log[] or log.count[] item or an error occurred */ + if (0 != (ZBX_METRIC_FLAG_LOG_LOG & flags) || (0 != (ZBX_METRIC_FLAG_LOG_LOGRT & flags) && FAIL == res)) + goto out; } if (0 == logfiles_num) diff --git a/src/zabbix_agent/logfiles.h b/src/zabbix_agent/logfiles.h index 9b2629c125e..204f28e0fe7 100644 --- a/src/zabbix_agent/logfiles.h +++ b/src/zabbix_agent/logfiles.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/perfstat.c b/src/zabbix_agent/perfstat.c index 48a0466cbcb..ff7c1b2a3dd 100644 --- a/src/zabbix_agent/perfstat.c +++ b/src/zabbix_agent/perfstat.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/perfstat.h b/src/zabbix_agent/perfstat.h index a1771e19f55..9e0ce7a1785 100644 --- a/src/zabbix_agent/perfstat.h +++ b/src/zabbix_agent/perfstat.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/procstat.c b/src/zabbix_agent/procstat.c index bb8c25ee491..5ebc7154c80 100644 --- a/src/zabbix_agent/procstat.c +++ b/src/zabbix_agent/procstat.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/procstat.h b/src/zabbix_agent/procstat.h index 9a398d68e0c..0c86eb1ef62 100644 --- a/src/zabbix_agent/procstat.h +++ b/src/zabbix_agent/procstat.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/stats.c b/src/zabbix_agent/stats.c index 3d91bc02fcc..3fe5f4ac2a6 100644 --- a/src/zabbix_agent/stats.c +++ b/src/zabbix_agent/stats.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -21,7 +21,6 @@ #include "stats.h" #include "log.h" #include "zbxconf.h" -#include "zbxself.h" #ifndef _WINDOWS # include "diskdevices.h" diff --git a/src/zabbix_agent/stats.h b/src/zabbix_agent/stats.h index eafe80a7453..666aab37c74 100644 --- a/src/zabbix_agent/stats.h +++ b/src/zabbix_agent/stats.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/vmstats.c b/src/zabbix_agent/vmstats.c index c106aaa20f9..b87bfc1ad83 100644 --- a/src/zabbix_agent/vmstats.c +++ b/src/zabbix_agent/vmstats.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/vmstats.h b/src/zabbix_agent/vmstats.h index 6edd8845e8a..19cc04b7ba1 100644 --- a/src/zabbix_agent/vmstats.h +++ b/src/zabbix_agent/vmstats.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 348b4a69a2f..15acbb218eb 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -24,7 +24,6 @@ #include "log.h" #include "zbxconf.h" #include "zbxgetopt.h" -#include "zbxself.h" #include "comms.h" char *CONFIG_HOSTS_ALLOWED = NULL; diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c index 264a0f05292..6f27eee9f8e 100644 --- a/src/zabbix_agent/zbxconf.c +++ b/src/zabbix_agent/zbxconf.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_agent/zbxconf.h b/src/zabbix_agent/zbxconf.h index 78f89be649c..5cd0cec52a9 100644 --- a/src/zabbix_agent/zbxconf.h +++ b/src/zabbix_agent/zbxconf.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_get/zabbix_get.c b/src/zabbix_get/zabbix_get.c index 1f81951ba84..f631d4c4011 100644 --- a/src/zabbix_get/zabbix_get.c +++ b/src/zabbix_get/zabbix_get.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/BinaryProtocolSpeaker.java b/src/zabbix_java/src/com/zabbix/gateway/BinaryProtocolSpeaker.java index 31edaf98a3a..c2dd903d39e 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/BinaryProtocolSpeaker.java +++ b/src/zabbix_java/src/com/zabbix/gateway/BinaryProtocolSpeaker.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/ConfigurationManager.java b/src/zabbix_java/src/com/zabbix/gateway/ConfigurationManager.java index 68de814f3d4..e12090bc997 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/ConfigurationManager.java +++ b/src/zabbix_java/src/com/zabbix/gateway/ConfigurationManager.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/ConfigurationParameter.java b/src/zabbix_java/src/com/zabbix/gateway/ConfigurationParameter.java index 73d5bf38dff..1b4dbe3f7e2 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/ConfigurationParameter.java +++ b/src/zabbix_java/src/com/zabbix/gateway/ConfigurationParameter.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java index a4edc469615..0a463a38cb0 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java +++ b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -22,9 +22,9 @@ package com.zabbix.gateway; class GeneralInformation { static final String APPLICATION_NAME = "Zabbix Java Gateway"; - static final String REVISION_DATE = "20 December 2017"; + static final String REVISION_DATE = "8 January 2018"; static final String REVISION = "{ZABBIX_REVISION}"; - static final String VERSION = "4.0.0alpha2"; + static final String VERSION = "4.0.0alpha3"; static void printVersion() { diff --git a/src/zabbix_java/src/com/zabbix/gateway/HelperFunctionChest.java b/src/zabbix_java/src/com/zabbix/gateway/HelperFunctionChest.java index 9efe68cfe72..312384cdbf4 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/HelperFunctionChest.java +++ b/src/zabbix_java/src/com/zabbix/gateway/HelperFunctionChest.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/InputValidator.java b/src/zabbix_java/src/com/zabbix/gateway/InputValidator.java index fbcd84d8496..28528434643 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/InputValidator.java +++ b/src/zabbix_java/src/com/zabbix/gateway/InputValidator.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/IntegerValidator.java b/src/zabbix_java/src/com/zabbix/gateway/IntegerValidator.java index 28607b72303..3df4d0edfa1 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/IntegerValidator.java +++ b/src/zabbix_java/src/com/zabbix/gateway/IntegerValidator.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/InternalItemChecker.java b/src/zabbix_java/src/com/zabbix/gateway/InternalItemChecker.java index 84cb27be54a..846442e6a49 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/InternalItemChecker.java +++ b/src/zabbix_java/src/com/zabbix/gateway/InternalItemChecker.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/ItemChecker.java b/src/zabbix_java/src/com/zabbix/gateway/ItemChecker.java index dcf00454e9b..0d09619c7fb 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/ItemChecker.java +++ b/src/zabbix_java/src/com/zabbix/gateway/ItemChecker.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java b/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java index 6a6c1ed328b..620b614b060 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java +++ b/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/JavaGateway.java b/src/zabbix_java/src/com/zabbix/gateway/JavaGateway.java index 2f4ca606ccb..761a1168666 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/JavaGateway.java +++ b/src/zabbix_java/src/com/zabbix/gateway/JavaGateway.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/PostInputValidator.java b/src/zabbix_java/src/com/zabbix/gateway/PostInputValidator.java index 6bbbdb8795a..e26cef26d4e 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/PostInputValidator.java +++ b/src/zabbix_java/src/com/zabbix/gateway/PostInputValidator.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/SocketProcessor.java b/src/zabbix_java/src/com/zabbix/gateway/SocketProcessor.java index a37bb3c72f7..e052359223d 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/SocketProcessor.java +++ b/src/zabbix_java/src/com/zabbix/gateway/SocketProcessor.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/ZabbixException.java b/src/zabbix_java/src/com/zabbix/gateway/ZabbixException.java index e4a3b0fb0b2..09d7368ff5e 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/ZabbixException.java +++ b/src/zabbix_java/src/com/zabbix/gateway/ZabbixException.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/ZabbixItem.java b/src/zabbix_java/src/com/zabbix/gateway/ZabbixItem.java index 7814a8eeb69..9d096e6a81a 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/ZabbixItem.java +++ b/src/zabbix_java/src/com/zabbix/gateway/ZabbixItem.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/src/com/zabbix/gateway/ZabbixJMXConnectorFactory.java b/src/zabbix_java/src/com/zabbix/gateway/ZabbixJMXConnectorFactory.java index 97d29bd606b..7acdb0000fa 100644 --- a/src/zabbix_java/src/com/zabbix/gateway/ZabbixJMXConnectorFactory.java +++ b/src/zabbix_java/src/com/zabbix/gateway/ZabbixJMXConnectorFactory.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/tests/com/zabbix/gateway/AllTestRunner.java b/src/zabbix_java/tests/com/zabbix/gateway/AllTestRunner.java index 39d4de87ebb..cb9fd96cf84 100644 --- a/src/zabbix_java/tests/com/zabbix/gateway/AllTestRunner.java +++ b/src/zabbix_java/tests/com/zabbix/gateway/AllTestRunner.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/tests/com/zabbix/gateway/IntegerValidatorTest.java b/src/zabbix_java/tests/com/zabbix/gateway/IntegerValidatorTest.java index 4583c4b1b44..c3dc3df6659 100644 --- a/src/zabbix_java/tests/com/zabbix/gateway/IntegerValidatorTest.java +++ b/src/zabbix_java/tests/com/zabbix/gateway/IntegerValidatorTest.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_java/tests/com/zabbix/gateway/ZabbixItemTest.java b/src/zabbix_java/tests/com/zabbix/gateway/ZabbixItemTest.java index a9cb34d3cfe..e328cb7ce03 100644 --- a/src/zabbix_java/tests/com/zabbix/gateway/ZabbixItemTest.java +++ b/src/zabbix_java/tests/com/zabbix/gateway/ZabbixItemTest.java @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/datasender/datasender.c b/src/zabbix_proxy/datasender/datasender.c index c7f96e78522..0035c9cae26 100644 --- a/src/zabbix_proxy/datasender/datasender.c +++ b/src/zabbix_proxy/datasender/datasender.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/datasender/datasender.h b/src/zabbix_proxy/datasender/datasender.h index fa88232239d..6c65090f6eb 100644 --- a/src/zabbix_proxy/datasender/datasender.h +++ b/src/zabbix_proxy/datasender/datasender.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/events.c b/src/zabbix_proxy/events.c index 77e116b0529..5994d3597b6 100644 --- a/src/zabbix_proxy/events.c +++ b/src/zabbix_proxy/events.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/heart/heart.c b/src/zabbix_proxy/heart/heart.c index 089a4575805..e54b1ba9af0 100644 --- a/src/zabbix_proxy/heart/heart.c +++ b/src/zabbix_proxy/heart/heart.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/heart/heart.h b/src/zabbix_proxy/heart/heart.h index ee2aba6bb13..547c0435655 100644 --- a/src/zabbix_proxy/heart/heart.h +++ b/src/zabbix_proxy/heart/heart.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/housekeeper/housekeeper.c b/src/zabbix_proxy/housekeeper/housekeeper.c index 231d09e80c8..f68d1c15aa1 100644 --- a/src/zabbix_proxy/housekeeper/housekeeper.c +++ b/src/zabbix_proxy/housekeeper/housekeeper.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/housekeeper/housekeeper.h b/src/zabbix_proxy/housekeeper/housekeeper.h index 5c0e2a71019..22ad34836dd 100644 --- a/src/zabbix_proxy/housekeeper/housekeeper.h +++ b/src/zabbix_proxy/housekeeper/housekeeper.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/preprocessing.c b/src/zabbix_proxy/preprocessing.c index b7b16baf059..3c6863f09c5 100644 --- a/src/zabbix_proxy/preprocessing.c +++ b/src/zabbix_proxy/preprocessing.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index c330376bb65..b0ba371622b 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/proxyconfig/proxyconfig.c b/src/zabbix_proxy/proxyconfig/proxyconfig.c index 14953b801bc..13ac21897be 100644 --- a/src/zabbix_proxy/proxyconfig/proxyconfig.c +++ b/src/zabbix_proxy/proxyconfig/proxyconfig.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/proxyconfig/proxyconfig.h b/src/zabbix_proxy/proxyconfig/proxyconfig.h index 4ff128a48fc..9a09b42b079 100644 --- a/src/zabbix_proxy/proxyconfig/proxyconfig.h +++ b/src/zabbix_proxy/proxyconfig/proxyconfig.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/servercomms.c b/src/zabbix_proxy/servercomms.c index e8c9190db6b..915fc089560 100644 --- a/src/zabbix_proxy/servercomms.c +++ b/src/zabbix_proxy/servercomms.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/servercomms.h b/src/zabbix_proxy/servercomms.h index 8d28e346a10..9a3ef81d5ef 100644 --- a/src/zabbix_proxy/servercomms.h +++ b/src/zabbix_proxy/servercomms.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/taskmanager/server_tasks.c b/src/zabbix_proxy/taskmanager/server_tasks.c index d4e39d0cf58..87619340107 100644 --- a/src/zabbix_proxy/taskmanager/server_tasks.c +++ b/src/zabbix_proxy/taskmanager/server_tasks.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/taskmanager/taskmanager.c b/src/zabbix_proxy/taskmanager/taskmanager.c index 7be36448b60..528b5b75655 100644 --- a/src/zabbix_proxy/taskmanager/taskmanager.c +++ b/src/zabbix_proxy/taskmanager/taskmanager.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_proxy/taskmanager/taskmanager.h b/src/zabbix_proxy/taskmanager/taskmanager.h index 2f8848a7ef7..26562d6d0bc 100644 --- a/src/zabbix_proxy/taskmanager/taskmanager.h +++ b/src/zabbix_proxy/taskmanager/taskmanager.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_sender/win32/zabbix_sender.c b/src/zabbix_sender/win32/zabbix_sender.c index 94ccbad1312..361af9a2838 100644 --- a/src/zabbix_sender/win32/zabbix_sender.c +++ b/src/zabbix_sender/win32/zabbix_sender.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_sender/win32/zabbix_sender.h b/src/zabbix_sender/win32/zabbix_sender.h index 2ff99847448..1c583400d22 100644 --- a/src/zabbix_sender/win32/zabbix_sender.h +++ b/src/zabbix_sender/win32/zabbix_sender.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c index 42bf5b2949d..7c7ba35a346 100644 --- a/src/zabbix_sender/zabbix_sender.c +++ b/src/zabbix_sender/zabbix_sender.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/actions.c b/src/zabbix_server/actions.c index e64e0874aba..21b9e070fd3 100644 --- a/src/zabbix_server/actions.c +++ b/src/zabbix_server/actions.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/actions.h b/src/zabbix_server/actions.h index 67fb1ca2e4e..8333e8f42fe 100644 --- a/src/zabbix_server/actions.h +++ b/src/zabbix_server/actions.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/alerter/alert_manager.c b/src/zabbix_server/alerter/alert_manager.c index ae8fe9dfbf6..81b8139ab38 100644 --- a/src/zabbix_server/alerter/alert_manager.c +++ b/src/zabbix_server/alerter/alert_manager.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/alerter/alert_manager.h b/src/zabbix_server/alerter/alert_manager.h index 242f80c96fa..e0e67c58d35 100644 --- a/src/zabbix_server/alerter/alert_manager.h +++ b/src/zabbix_server/alerter/alert_manager.h @@ -1,9 +1,21 @@ /* - * alertmanager.h - * - * Created on: Mar 8, 2017 - * Author: wiper - */ +** Zabbix +** Copyright (C) 2001-2018 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 +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ #ifndef ZABBIX_ALERT_MANAGER_H #define ZABBIX_ALERT_MANAGER_H diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c index 477a926d850..5e722adedde 100644 --- a/src/zabbix_server/alerter/alerter.c +++ b/src/zabbix_server/alerter/alerter.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/alerter/alerter.h b/src/zabbix_server/alerter/alerter.h index 5b15413424d..e6afc0983ab 100644 --- a/src/zabbix_server/alerter/alerter.h +++ b/src/zabbix_server/alerter/alerter.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/alerter/alerter_protocol.c b/src/zabbix_server/alerter/alerter_protocol.c index db6ee0dd6b0..7a3b34d2515 100644 --- a/src/zabbix_server/alerter/alerter_protocol.c +++ b/src/zabbix_server/alerter/alerter_protocol.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/alerter/alerter_protocol.h b/src/zabbix_server/alerter/alerter_protocol.h index 5fe2ff94893..aca071659bb 100644 --- a/src/zabbix_server/alerter/alerter_protocol.h +++ b/src/zabbix_server/alerter/alerter_protocol.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/dbconfig/dbconfig.c b/src/zabbix_server/dbconfig/dbconfig.c index 8dd25a2429e..4e3df16bfee 100644 --- a/src/zabbix_server/dbconfig/dbconfig.c +++ b/src/zabbix_server/dbconfig/dbconfig.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/dbconfig/dbconfig.h b/src/zabbix_server/dbconfig/dbconfig.h index 8e7e5128bef..f8f6206dbf0 100644 --- a/src/zabbix_server/dbconfig/dbconfig.h +++ b/src/zabbix_server/dbconfig/dbconfig.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/dbsyncer/dbsyncer.c b/src/zabbix_server/dbsyncer/dbsyncer.c index c7e1601d2a3..1b7cf7716a8 100644 --- a/src/zabbix_server/dbsyncer/dbsyncer.c +++ b/src/zabbix_server/dbsyncer/dbsyncer.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/dbsyncer/dbsyncer.h b/src/zabbix_server/dbsyncer/dbsyncer.h index 8204109d028..1e1f36adcaf 100644 --- a/src/zabbix_server/dbsyncer/dbsyncer.h +++ b/src/zabbix_server/dbsyncer/dbsyncer.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/discoverer/discoverer.c b/src/zabbix_server/discoverer/discoverer.c index 2069e4cff8b..294b6f0357d 100644 --- a/src/zabbix_server/discoverer/discoverer.c +++ b/src/zabbix_server/discoverer/discoverer.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/discoverer/discoverer.h b/src/zabbix_server/discoverer/discoverer.h index 6fa73b90015..f0be1ba683c 100644 --- a/src/zabbix_server/discoverer/discoverer.h +++ b/src/zabbix_server/discoverer/discoverer.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/escalator/escalator.c b/src/zabbix_server/escalator/escalator.c index d95b1356e4f..865be153c0c 100644 --- a/src/zabbix_server/escalator/escalator.c +++ b/src/zabbix_server/escalator/escalator.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/escalator/escalator.h b/src/zabbix_server/escalator/escalator.h index 0ded7810644..89bed8b2d1e 100644 --- a/src/zabbix_server/escalator/escalator.h +++ b/src/zabbix_server/escalator/escalator.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/events.c b/src/zabbix_server/events.c index af019eab397..487c07067c9 100644 --- a/src/zabbix_server/events.c +++ b/src/zabbix_server/events.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/events.h b/src/zabbix_server/events.h index bd3505bdd19..111f644ec34 100644 --- a/src/zabbix_server/events.h +++ b/src/zabbix_server/events.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c index 0e430cccaab..2d9659e4cd2 100644 --- a/src/zabbix_server/housekeeper/housekeeper.c +++ b/src/zabbix_server/housekeeper/housekeeper.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -900,23 +900,22 @@ static int housekeeping_audit(int now) static int housekeeping_events(int now) { +#define ZBX_HK_EVENT_RULE " and not exists (select null from problem where events.eventid=problem.eventid)" \ + " and not exists (select null from problem where events.eventid=problem.r_eventid)" + static zbx_hk_rule_t rules[] = { {"events", "events.source=" ZBX_STR(EVENT_SOURCE_TRIGGERS) " and events.object=" ZBX_STR(EVENT_OBJECT_TRIGGER) - " and not exists (select null from problem where events.eventid=problem.eventid" - " or events.eventid=problem.r_eventid)", 0, &cfg.hk.events_trigger}, + ZBX_HK_EVENT_RULE, 0, &cfg.hk.events_trigger}, {"events", "events.source=" ZBX_STR(EVENT_SOURCE_INTERNAL) " and events.object=" ZBX_STR(EVENT_OBJECT_TRIGGER) - " and not exists (select null from problem where events.eventid=problem.eventid" - " or events.eventid=problem.r_eventid)", 0, &cfg.hk.events_internal}, + ZBX_HK_EVENT_RULE, 0, &cfg.hk.events_internal}, {"events", "events.source=" ZBX_STR(EVENT_SOURCE_INTERNAL) " and events.object=" ZBX_STR(EVENT_OBJECT_ITEM) - " and not exists (select null from problem where events.eventid=problem.eventid" - " or events.eventid=problem.r_eventid)", 0, &cfg.hk.events_internal}, + ZBX_HK_EVENT_RULE, 0, &cfg.hk.events_internal}, {"events", "events.source=" ZBX_STR(EVENT_SOURCE_INTERNAL) " and events.object=" ZBX_STR(EVENT_OBJECT_LLDRULE) - " and not exists (select null from problem where events.eventid=problem.eventid" - " or events.eventid=problem.r_eventid)", 0, &cfg.hk.events_internal}, + ZBX_HK_EVENT_RULE, 0, &cfg.hk.events_internal}, {"events", "events.source=" ZBX_STR(EVENT_SOURCE_DISCOVERY) " and events.object=" ZBX_STR(EVENT_OBJECT_DHOST), 0, &cfg.hk.events_discovery}, {"events", "events.source=" ZBX_STR(EVENT_SOURCE_DISCOVERY) @@ -936,6 +935,7 @@ static int housekeeping_events(int now) deleted += housekeeping_process_rule(now, rule); return deleted; +#undef ZBX_HK_EVENT_RULE } static int housekeeping_problems(int now) diff --git a/src/zabbix_server/housekeeper/housekeeper.h b/src/zabbix_server/housekeeper/housekeeper.h index 99b4e6bb99a..be41a3e7df6 100644 --- a/src/zabbix_server/housekeeper/housekeeper.h +++ b/src/zabbix_server/housekeeper/housekeeper.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/httppoller/httpmacro.c b/src/zabbix_server/httppoller/httpmacro.c index 9ae78ab39e2..f1e6118718b 100644 --- a/src/zabbix_server/httppoller/httpmacro.c +++ b/src/zabbix_server/httppoller/httpmacro.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/httppoller/httpmacro.h b/src/zabbix_server/httppoller/httpmacro.h index 277e6d323b3..1cbe25374f0 100644 --- a/src/zabbix_server/httppoller/httpmacro.h +++ b/src/zabbix_server/httppoller/httpmacro.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/httppoller/httppoller.c b/src/zabbix_server/httppoller/httppoller.c index 48e76ec3f15..7c8d4295b3d 100644 --- a/src/zabbix_server/httppoller/httppoller.c +++ b/src/zabbix_server/httppoller/httppoller.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/httppoller/httppoller.h b/src/zabbix_server/httppoller/httppoller.h index 4e86f8abc84..d63b91ca546 100644 --- a/src/zabbix_server/httppoller/httppoller.h +++ b/src/zabbix_server/httppoller/httppoller.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/httppoller/httptest.c b/src/zabbix_server/httppoller/httptest.c index 6707bc8c6f4..2c51c21e465 100644 --- a/src/zabbix_server/httppoller/httptest.c +++ b/src/zabbix_server/httppoller/httptest.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/httppoller/httptest.h b/src/zabbix_server/httppoller/httptest.h index 6bda1b23cf2..30e34c741b5 100644 --- a/src/zabbix_server/httppoller/httptest.h +++ b/src/zabbix_server/httppoller/httptest.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/ipmi/checks_ipmi.c b/src/zabbix_server/ipmi/checks_ipmi.c index 250edaa3d22..cbd2b672475 100644 --- a/src/zabbix_server/ipmi/checks_ipmi.c +++ b/src/zabbix_server/ipmi/checks_ipmi.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/ipmi/checks_ipmi.h b/src/zabbix_server/ipmi/checks_ipmi.h index 8efeb262fe6..a68db5ab486 100644 --- a/src/zabbix_server/ipmi/checks_ipmi.h +++ b/src/zabbix_server/ipmi/checks_ipmi.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/ipmi/ipmi.c b/src/zabbix_server/ipmi/ipmi.c index ed62e7b24d2..ba983a6789a 100644 --- a/src/zabbix_server/ipmi/ipmi.c +++ b/src/zabbix_server/ipmi/ipmi.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/ipmi/ipmi.h b/src/zabbix_server/ipmi/ipmi.h index 11b34c0c188..3650778efd9 100644 --- a/src/zabbix_server/ipmi/ipmi.h +++ b/src/zabbix_server/ipmi/ipmi.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/ipmi/ipmi_manager.c b/src/zabbix_server/ipmi/ipmi_manager.c index ea09e76f4c7..24633b9204f 100644 --- a/src/zabbix_server/ipmi/ipmi_manager.c +++ b/src/zabbix_server/ipmi/ipmi_manager.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/ipmi/ipmi_manager.h b/src/zabbix_server/ipmi/ipmi_manager.h index d680d1d713e..bfae665425e 100644 --- a/src/zabbix_server/ipmi/ipmi_manager.h +++ b/src/zabbix_server/ipmi/ipmi_manager.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/ipmi/ipmi_poller.c b/src/zabbix_server/ipmi/ipmi_poller.c index 289ed816d65..5b76f580fd6 100644 --- a/src/zabbix_server/ipmi/ipmi_poller.c +++ b/src/zabbix_server/ipmi/ipmi_poller.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/ipmi/ipmi_poller.h b/src/zabbix_server/ipmi/ipmi_poller.h index 2b960a1aed3..488abdc344e 100644 --- a/src/zabbix_server/ipmi/ipmi_poller.h +++ b/src/zabbix_server/ipmi/ipmi_poller.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/ipmi/ipmi_protocol.c b/src/zabbix_server/ipmi/ipmi_protocol.c index 4dfc49e271a..da56e94d3a8 100644 --- a/src/zabbix_server/ipmi/ipmi_protocol.c +++ b/src/zabbix_server/ipmi/ipmi_protocol.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/ipmi/ipmi_protocol.h b/src/zabbix_server/ipmi/ipmi_protocol.h index 557f6e420f0..1b768ae5255 100644 --- a/src/zabbix_server/ipmi/ipmi_protocol.h +++ b/src/zabbix_server/ipmi/ipmi_protocol.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/odbc/odbc.c b/src/zabbix_server/odbc/odbc.c index 36a720bcbac..3579412a6db 100644 --- a/src/zabbix_server/odbc/odbc.c +++ b/src/zabbix_server/odbc/odbc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/odbc/odbc.h b/src/zabbix_server/odbc/odbc.h index 90eae18f728..9e75a1b2a39 100644 --- a/src/zabbix_server/odbc/odbc.h +++ b/src/zabbix_server/odbc/odbc.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/operations.c b/src/zabbix_server/operations.c index 29992a2376b..cfc1f5185a9 100644 --- a/src/zabbix_server/operations.c +++ b/src/zabbix_server/operations.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/operations.h b/src/zabbix_server/operations.h index 35bbdbe1a11..ff5ef136ad9 100644 --- a/src/zabbix_server/operations.h +++ b/src/zabbix_server/operations.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/pinger/pinger.c b/src/zabbix_server/pinger/pinger.c index 9e7eebae179..4b0b023613e 100644 --- a/src/zabbix_server/pinger/pinger.c +++ b/src/zabbix_server/pinger/pinger.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/pinger/pinger.h b/src/zabbix_server/pinger/pinger.h index 8d6491b5086..e7c194a8ae3 100644 --- a/src/zabbix_server/pinger/pinger.h +++ b/src/zabbix_server/pinger/pinger.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_agent.c b/src/zabbix_server/poller/checks_agent.c index e1830a95010..c23312af3c5 100644 --- a/src/zabbix_server/poller/checks_agent.c +++ b/src/zabbix_server/poller/checks_agent.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_agent.h b/src/zabbix_server/poller/checks_agent.h index eed9fc9e5c7..d72551992f4 100644 --- a/src/zabbix_server/poller/checks_agent.h +++ b/src/zabbix_server/poller/checks_agent.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_aggregate.c b/src/zabbix_server/poller/checks_aggregate.c index feb332e6b19..f994f2178ca 100644 --- a/src/zabbix_server/poller/checks_aggregate.c +++ b/src/zabbix_server/poller/checks_aggregate.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_aggregate.h b/src/zabbix_server/poller/checks_aggregate.h index 72423706510..7c032c0de9e 100644 --- a/src/zabbix_server/poller/checks_aggregate.h +++ b/src/zabbix_server/poller/checks_aggregate.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_calculated.c b/src/zabbix_server/poller/checks_calculated.c index 8573535233b..a0c50078f96 100644 --- a/src/zabbix_server/poller/checks_calculated.c +++ b/src/zabbix_server/poller/checks_calculated.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_calculated.h b/src/zabbix_server/poller/checks_calculated.h index ef5c5de3d97..e5fa8134e89 100644 --- a/src/zabbix_server/poller/checks_calculated.h +++ b/src/zabbix_server/poller/checks_calculated.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_db.c b/src/zabbix_server/poller/checks_db.c index 9160875973d..67111da1976 100644 --- a/src/zabbix_server/poller/checks_db.c +++ b/src/zabbix_server/poller/checks_db.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_db.h b/src/zabbix_server/poller/checks_db.h index 3f53f84befd..064123a330c 100644 --- a/src/zabbix_server/poller/checks_db.h +++ b/src/zabbix_server/poller/checks_db.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_external.c b/src/zabbix_server/poller/checks_external.c index 188b1220d64..7f5634204d2 100644 --- a/src/zabbix_server/poller/checks_external.c +++ b/src/zabbix_server/poller/checks_external.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -75,8 +75,8 @@ int get_value_external(DC_ITEM *item, AGENT_RESULT *result) param = get_rparam(&request, i); - param_esc = zbx_dyn_escape_string(param, "\"\\"); - zbx_snprintf_alloc(&cmd, &cmd_alloc, &cmd_offset, " \"%s\"", param_esc); + param_esc = zbx_dyn_escape_shell_single_quote(param); + zbx_snprintf_alloc(&cmd, &cmd_alloc, &cmd_offset, " '%s'", param_esc); zbx_free(param_esc); } diff --git a/src/zabbix_server/poller/checks_external.h b/src/zabbix_server/poller/checks_external.h index 0fa589403d7..e8c28d92933 100644 --- a/src/zabbix_server/poller/checks_external.h +++ b/src/zabbix_server/poller/checks_external.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_internal.c b/src/zabbix_server/poller/checks_internal.c index 0322b4b250c..33778931049 100644 --- a/src/zabbix_server/poller/checks_internal.c +++ b/src/zabbix_server/poller/checks_internal.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_internal.h b/src/zabbix_server/poller/checks_internal.h index 4eb0b362cd5..4df8db10876 100644 --- a/src/zabbix_server/poller/checks_internal.h +++ b/src/zabbix_server/poller/checks_internal.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_java.c b/src/zabbix_server/poller/checks_java.c index f46093fadec..0a16631ae0e 100644 --- a/src/zabbix_server/poller/checks_java.c +++ b/src/zabbix_server/poller/checks_java.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_java.h b/src/zabbix_server/poller/checks_java.h index 3d62e0d4c23..6e780e213ce 100644 --- a/src/zabbix_server/poller/checks_java.h +++ b/src/zabbix_server/poller/checks_java.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_simple.c b/src/zabbix_server/poller/checks_simple.c index 3239d177fd9..d392c2d68fc 100644 --- a/src/zabbix_server/poller/checks_simple.c +++ b/src/zabbix_server/poller/checks_simple.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_simple.h b/src/zabbix_server/poller/checks_simple.h index 131290c91a9..12f0f8f80c8 100644 --- a/src/zabbix_server/poller/checks_simple.h +++ b/src/zabbix_server/poller/checks_simple.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_simple_vmware.c b/src/zabbix_server/poller/checks_simple_vmware.c index 90fde2e564e..64563d6213a 100644 --- a/src/zabbix_server/poller/checks_simple_vmware.c +++ b/src/zabbix_server/poller/checks_simple_vmware.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_simple_vmware.h b/src/zabbix_server/poller/checks_simple_vmware.h index 0c445259498..3e6c8f0c726 100644 --- a/src/zabbix_server/poller/checks_simple_vmware.h +++ b/src/zabbix_server/poller/checks_simple_vmware.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_snmp.c b/src/zabbix_server/poller/checks_snmp.c index e0ac99edde4..2f5b126c189 100644 --- a/src/zabbix_server/poller/checks_snmp.c +++ b/src/zabbix_server/poller/checks_snmp.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_snmp.h b/src/zabbix_server/poller/checks_snmp.h index 2feea131046..6bdad47b0cc 100644 --- a/src/zabbix_server/poller/checks_snmp.h +++ b/src/zabbix_server/poller/checks_snmp.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_ssh.c b/src/zabbix_server/poller/checks_ssh.c index d118d0de9b9..533ec3ef9d5 100644 --- a/src/zabbix_server/poller/checks_ssh.c +++ b/src/zabbix_server/poller/checks_ssh.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_ssh.h b/src/zabbix_server/poller/checks_ssh.h index d933c5098f9..ef4ada1f497 100644 --- a/src/zabbix_server/poller/checks_ssh.h +++ b/src/zabbix_server/poller/checks_ssh.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_telnet.c b/src/zabbix_server/poller/checks_telnet.c index 041a7c08db3..257d094acb7 100644 --- a/src/zabbix_server/poller/checks_telnet.c +++ b/src/zabbix_server/poller/checks_telnet.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/checks_telnet.h b/src/zabbix_server/poller/checks_telnet.h index b7617a77f47..cb35b87c816 100644 --- a/src/zabbix_server/poller/checks_telnet.h +++ b/src/zabbix_server/poller/checks_telnet.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c index 9eb0c2bbc3b..41528bd6493 100644 --- a/src/zabbix_server/poller/poller.c +++ b/src/zabbix_server/poller/poller.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/poller/poller.h b/src/zabbix_server/poller/poller.h index b6d52a8f65b..08711fff67f 100644 --- a/src/zabbix_server/poller/poller.h +++ b/src/zabbix_server/poller/poller.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/postinit.c b/src/zabbix_server/postinit.c index fc066524181..2ed42c7f9c3 100644 --- a/src/zabbix_server/postinit.c +++ b/src/zabbix_server/postinit.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/postinit.h b/src/zabbix_server/postinit.h index 8d6b0b1fce9..47d96378d66 100644 --- a/src/zabbix_server/postinit.h +++ b/src/zabbix_server/postinit.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/preprocessor/item_preproc.c b/src/zabbix_server/preprocessor/item_preproc.c index cb29371c172..c6d25831be3 100644 --- a/src/zabbix_server/preprocessor/item_preproc.c +++ b/src/zabbix_server/preprocessor/item_preproc.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -799,9 +799,9 @@ static int item_preproc_regsub(zbx_variant_t *value, const char *params, char ** ******************************************************************************/ static int item_preproc_jsonpath_op(zbx_variant_t *value, const char *params, char **errmsg) { - struct zbx_json_parse jp, jp_out; - char *data = NULL; - size_t data_alloc = 0; + struct zbx_json_parse jp, jp_out; + char *data = NULL; + size_t data_alloc = 0; if (FAIL == item_preproc_convert_value(value, ZBX_VARIANT_STR, errmsg)) return FAIL; @@ -848,7 +848,7 @@ static int item_preproc_jsonpath(zbx_variant_t *value, const char *params, char /****************************************************************************** * * - * Function: item_preproc_xpath_op * + * Function: item_preproc_xpath_op * * * * Purpose: execute xpath query * * * @@ -873,7 +873,7 @@ static int item_preproc_xpath_op(zbx_variant_t *value, const char *params, char xmlXPathObject *xpathObj; xmlNodeSetPtr nodeset; xmlErrorPtr pErr; - xmlBufferPtr xmlBuf; + xmlBufferPtr xmlBufferLocal; int ret = FAIL, i; char buffer[32], *ptr; @@ -901,19 +901,19 @@ static int item_preproc_xpath_op(zbx_variant_t *value, const char *params, char switch (xpathObj->type) { case XPATH_NODESET: - xmlBuf = xmlBufferCreate(); + xmlBufferLocal = xmlBufferCreate(); if (0 == xmlXPathNodeSetIsEmpty(xpathObj->nodesetval)) { nodeset = xpathObj->nodesetval; for (i = 0; i < nodeset->nodeNr; i++) - xmlNodeDump(xmlBuf, doc, nodeset->nodeTab[i], 0, 0); + xmlNodeDump(xmlBufferLocal, doc, nodeset->nodeTab[i], 0, 0); } zbx_variant_clear(value); - zbx_variant_set_str(value, zbx_strdup(NULL, (const char *)xmlBuf->content)); + zbx_variant_set_str(value, zbx_strdup(NULL, (const char *)xmlBufferLocal->content)); - xmlBufferFree(xmlBuf); + xmlBufferFree(xmlBufferLocal); ret = SUCCEED; break; case XPATH_STRING: @@ -960,7 +960,7 @@ out: /****************************************************************************** * * - * Function: item_preproc_xpath_op * + * Function: item_preproc_xpath * * * * Purpose: execute xpath query * * * diff --git a/src/zabbix_server/preprocessor/item_preproc.h b/src/zabbix_server/preprocessor/item_preproc.h index 8f64bcb7b32..d01c9d00f18 100644 --- a/src/zabbix_server/preprocessor/item_preproc.h +++ b/src/zabbix_server/preprocessor/item_preproc.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/preprocessor/item_preproc_test.c b/src/zabbix_server/preprocessor/item_preproc_test.c index 009955a16da..f537cb63696 100644 --- a/src/zabbix_server/preprocessor/item_preproc_test.c +++ b/src/zabbix_server/preprocessor/item_preproc_test.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/preprocessor/linked_list.c b/src/zabbix_server/preprocessor/linked_list.c index 6cbc85bebc4..7a8cf01aeaa 100644 --- a/src/zabbix_server/preprocessor/linked_list.c +++ b/src/zabbix_server/preprocessor/linked_list.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/preprocessor/linked_list.h b/src/zabbix_server/preprocessor/linked_list.h index f738ca1a641..b7a5090adfa 100644 --- a/src/zabbix_server/preprocessor/linked_list.h +++ b/src/zabbix_server/preprocessor/linked_list.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/preprocessor/preproc_manager.c b/src/zabbix_server/preprocessor/preproc_manager.c index d7aceade95c..d77889c4064 100644 --- a/src/zabbix_server/preprocessor/preproc_manager.c +++ b/src/zabbix_server/preprocessor/preproc_manager.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/preprocessor/preproc_manager.h b/src/zabbix_server/preprocessor/preproc_manager.h index cdce19956f1..6341555f2b1 100644 --- a/src/zabbix_server/preprocessor/preproc_manager.h +++ b/src/zabbix_server/preprocessor/preproc_manager.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/preprocessor/preproc_worker.c b/src/zabbix_server/preprocessor/preproc_worker.c index df4ff093bce..279b4db887e 100644 --- a/src/zabbix_server/preprocessor/preproc_worker.c +++ b/src/zabbix_server/preprocessor/preproc_worker.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/preprocessor/preproc_worker.h b/src/zabbix_server/preprocessor/preproc_worker.h index b0bbeecd8ab..dade961381c 100644 --- a/src/zabbix_server/preprocessor/preproc_worker.h +++ b/src/zabbix_server/preprocessor/preproc_worker.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/preprocessor/preprocessing.c b/src/zabbix_server/preprocessor/preprocessing.c index ac794ab084c..012297264b2 100644 --- a/src/zabbix_server/preprocessor/preprocessing.c +++ b/src/zabbix_server/preprocessor/preprocessing.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/preprocessor/preprocessing.h b/src/zabbix_server/preprocessor/preprocessing.h index 744c45b8c06..91c78ce5d4f 100644 --- a/src/zabbix_server/preprocessor/preprocessing.h +++ b/src/zabbix_server/preprocessor/preprocessing.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/proxypoller/proxypoller.c b/src/zabbix_server/proxypoller/proxypoller.c index f70ee096657..e78c7705afe 100644 --- a/src/zabbix_server/proxypoller/proxypoller.c +++ b/src/zabbix_server/proxypoller/proxypoller.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/proxypoller/proxypoller.h b/src/zabbix_server/proxypoller/proxypoller.h index f9e072556a9..944a873ee7f 100644 --- a/src/zabbix_server/proxypoller/proxypoller.h +++ b/src/zabbix_server/proxypoller/proxypoller.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/scripts/scripts.c b/src/zabbix_server/scripts/scripts.c index 14ac1c5c770..bd4d3b72ec4 100644 --- a/src/zabbix_server/scripts/scripts.c +++ b/src/zabbix_server/scripts/scripts.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/scripts/scripts.h b/src/zabbix_server/scripts/scripts.h index 9d7cedcbbd5..3bb0618471c 100644 --- a/src/zabbix_server/scripts/scripts.h +++ b/src/zabbix_server/scripts/scripts.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/selfmon/selfmon.c b/src/zabbix_server/selfmon/selfmon.c index 17047579366..78b1beee926 100644 --- a/src/zabbix_server/selfmon/selfmon.c +++ b/src/zabbix_server/selfmon/selfmon.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/selfmon/selfmon.h b/src/zabbix_server/selfmon/selfmon.h index ac14fb093fc..c97ab3ffdc3 100644 --- a/src/zabbix_server/selfmon/selfmon.h +++ b/src/zabbix_server/selfmon/selfmon.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/server.c b/src/zabbix_server/server.c index 496ff9faea3..61435b7d44b 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/snmptrapper/snmptrapper.c b/src/zabbix_server/snmptrapper/snmptrapper.c index be0cb77ac63..0a045cebe3e 100644 --- a/src/zabbix_server/snmptrapper/snmptrapper.c +++ b/src/zabbix_server/snmptrapper/snmptrapper.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/snmptrapper/snmptrapper.h b/src/zabbix_server/snmptrapper/snmptrapper.h index 5af46622480..56529d21fba 100644 --- a/src/zabbix_server/snmptrapper/snmptrapper.h +++ b/src/zabbix_server/snmptrapper/snmptrapper.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/taskmanager/proxy_tasks.c b/src/zabbix_server/taskmanager/proxy_tasks.c index 06c2843f9e9..794c297eae9 100644 --- a/src/zabbix_server/taskmanager/proxy_tasks.c +++ b/src/zabbix_server/taskmanager/proxy_tasks.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/taskmanager/taskmanager.c b/src/zabbix_server/taskmanager/taskmanager.c index ef888219dd4..5201b527545 100644 --- a/src/zabbix_server/taskmanager/taskmanager.c +++ b/src/zabbix_server/taskmanager/taskmanager.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/taskmanager/taskmanager.h b/src/zabbix_server/taskmanager/taskmanager.h index 2f8848a7ef7..26562d6d0bc 100644 --- a/src/zabbix_server/taskmanager/taskmanager.h +++ b/src/zabbix_server/taskmanager/taskmanager.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c index 5cf7b817290..db9ea075f33 100644 --- a/src/zabbix_server/timer/timer.c +++ b/src/zabbix_server/timer/timer.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/timer/timer.h b/src/zabbix_server/timer/timer.h index 42647079d5a..273125baf0a 100644 --- a/src/zabbix_server/timer/timer.h +++ b/src/zabbix_server/timer/timer.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/active.c b/src/zabbix_server/trapper/active.c index 515446b4be0..a217ddcb9f4 100644 --- a/src/zabbix_server/trapper/active.c +++ b/src/zabbix_server/trapper/active.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/active.h b/src/zabbix_server/trapper/active.h index 3449985a50e..1c0212945d6 100644 --- a/src/zabbix_server/trapper/active.h +++ b/src/zabbix_server/trapper/active.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/nodecommand.c b/src/zabbix_server/trapper/nodecommand.c index 433d28e0a26..4ab43fad58b 100644 --- a/src/zabbix_server/trapper/nodecommand.c +++ b/src/zabbix_server/trapper/nodecommand.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/nodecommand.h b/src/zabbix_server/trapper/nodecommand.h index c722b49d5fb..de96a9a6e90 100644 --- a/src/zabbix_server/trapper/nodecommand.h +++ b/src/zabbix_server/trapper/nodecommand.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/proxyautoreg.c b/src/zabbix_server/trapper/proxyautoreg.c index 036768d2ac8..124cee12144 100644 --- a/src/zabbix_server/trapper/proxyautoreg.c +++ b/src/zabbix_server/trapper/proxyautoreg.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/proxyautoreg.h b/src/zabbix_server/trapper/proxyautoreg.h index 5bc662960e2..b9460228fb6 100644 --- a/src/zabbix_server/trapper/proxyautoreg.h +++ b/src/zabbix_server/trapper/proxyautoreg.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/proxyconfig.c b/src/zabbix_server/trapper/proxyconfig.c index cf33f5b216b..27cdf1696be 100644 --- a/src/zabbix_server/trapper/proxyconfig.c +++ b/src/zabbix_server/trapper/proxyconfig.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/proxyconfig.h b/src/zabbix_server/trapper/proxyconfig.h index ef476651a37..59aa097bf48 100644 --- a/src/zabbix_server/trapper/proxyconfig.h +++ b/src/zabbix_server/trapper/proxyconfig.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/proxydata.c b/src/zabbix_server/trapper/proxydata.c index 9e35d32a07a..76d778fb61d 100644 --- a/src/zabbix_server/trapper/proxydata.c +++ b/src/zabbix_server/trapper/proxydata.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -53,7 +53,7 @@ int zbx_send_proxy_data_respose(const DC_PROXY *proxy, zbx_socket_t *sock, const if (0 != tasks.values_num) zbx_tm_json_serialize_tasks(&json, &tasks); - if (SUCCEED == (ret = zbx_tcp_send_raw(sock, json.buffer))) + if (SUCCEED == (ret = zbx_tcp_send(sock, json.buffer))) { if (0 != tasks.values_num) zbx_tm_update_task_status(&tasks, ZBX_TM_STATUS_INPROGRESS); diff --git a/src/zabbix_server/trapper/proxydata.h b/src/zabbix_server/trapper/proxydata.h index c7008e6d025..257633b7fa6 100644 --- a/src/zabbix_server/trapper/proxydata.h +++ b/src/zabbix_server/trapper/proxydata.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/proxydiscovery.c b/src/zabbix_server/trapper/proxydiscovery.c index 94109fc2c9b..0f41506efa7 100644 --- a/src/zabbix_server/trapper/proxydiscovery.c +++ b/src/zabbix_server/trapper/proxydiscovery.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/proxydiscovery.h b/src/zabbix_server/trapper/proxydiscovery.h index e45a9ba0c7b..f10f0d40df8 100644 --- a/src/zabbix_server/trapper/proxydiscovery.h +++ b/src/zabbix_server/trapper/proxydiscovery.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/proxyhosts.c b/src/zabbix_server/trapper/proxyhosts.c index ca85c7f10d5..db6b8e41800 100644 --- a/src/zabbix_server/trapper/proxyhosts.c +++ b/src/zabbix_server/trapper/proxyhosts.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/proxyhosts.h b/src/zabbix_server/trapper/proxyhosts.h index 9e5c17f1b1a..42c97a72b36 100644 --- a/src/zabbix_server/trapper/proxyhosts.h +++ b/src/zabbix_server/trapper/proxyhosts.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c index 27ca1b6148b..e1f21f067a4 100644 --- a/src/zabbix_server/trapper/trapper.c +++ b/src/zabbix_server/trapper/trapper.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/trapper/trapper.h b/src/zabbix_server/trapper/trapper.h index d24715b2aa1..52cb4c47b99 100644 --- a/src/zabbix_server/trapper/trapper.h +++ b/src/zabbix_server/trapper/trapper.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c index 44a138fff98..6ece9603fe2 100644 --- a/src/zabbix_server/vmware/vmware.c +++ b/src/zabbix_server/vmware/vmware.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/src/zabbix_server/vmware/vmware.h b/src/zabbix_server/vmware/vmware.h index 67a8380b73f..835cbeef34e 100644 --- a/src/zabbix_server/vmware/vmware.h +++ b/src/zabbix_server/vmware/vmware.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/Makefile.am b/tests/Makefile.am index d2997e8d7b9..156dec62e98 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,4 +17,8 @@ libzbxmockdata_a_SOURCES = \ zbxmockfile.c \ zbxmockstat.c \ zbxmockdata.c \ - zbxmockdata.h + zbxmockdata.h \ + zbxmockassert.c \ + zbxmockassert.h \ + zbxmockutil.c \ + zbxmockutil.h diff --git a/tests/libs/Makefile.am b/tests/libs/Makefile.am index 5a052b838f9..a48fc9f9498 100644 --- a/tests/libs/Makefile.am +++ b/tests/libs/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = \ zbxconf \ zbxdbhigh \ + zbxjson \ zbxsysinfo + diff --git a/tests/libs/zbxconf/Makefile.am b/tests/libs/zbxconf/Makefile.am index 70c1e6df352..d4339585b3a 100644 --- a/tests/libs/zbxconf/Makefile.am +++ b/tests/libs/zbxconf/Makefile.am @@ -71,5 +71,7 @@ parse_cfg_file_LDADD = \ parse_cfg_file_LDADD += @SERVER_LIBS@ +parse_cfg_file_LDFLAGS = @SERVER_LDFLAGS@ + parse_cfg_file_CFLAGS = -I@top_srcdir@/tests endif diff --git a/tests/libs/zbxconf/parse_cfg_file.c b/tests/libs/zbxconf/parse_cfg_file.c index d7e05967068..ccc4f8f89f5 100644 --- a/tests/libs/zbxconf/parse_cfg_file.c +++ b/tests/libs/zbxconf/parse_cfg_file.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/libs/zbxdbhigh/DBselect_uint64.c b/tests/libs/zbxdbhigh/DBselect_uint64.c index ba04b091ce0..fa323467fd1 100644 --- a/tests/libs/zbxdbhigh/DBselect_uint64.c +++ b/tests/libs/zbxdbhigh/DBselect_uint64.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/libs/zbxdbhigh/Makefile.am b/tests/libs/zbxdbhigh/Makefile.am index e1c995e871f..c770ae017d9 100644 --- a/tests/libs/zbxdbhigh/Makefile.am +++ b/tests/libs/zbxdbhigh/Makefile.am @@ -71,5 +71,7 @@ DBselect_uint64_LDADD = \ DBselect_uint64_LDADD += @SERVER_LIBS@ +DBselect_uint64_LDFLAGS = @SERVER_LDFLAGS@ + DBselect_uint64_CFLAGS = -I@top_srcdir@/tests endif diff --git a/tests/libs/zbxjson/Makefile.am b/tests/libs/zbxjson/Makefile.am new file mode 100644 index 00000000000..24d960a91f7 --- /dev/null +++ b/tests/libs/zbxjson/Makefile.am @@ -0,0 +1,29 @@ +noinst_PROGRAMS = zbx_jsonpath_next zbx_json_path_open + +JSON_LIBS = \ + $(top_srcdir)/tests/libzbxmocktest.a \ + $(top_srcdir)/tests/libzbxmockdata.a \ + $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ + $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \ + $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ + $(top_srcdir)/src/libs/zbxlog/libzbxlog.a \ + $(top_srcdir)/src/libs/zbxsys/libzbxsys.a \ + $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ + $(top_srcdir)/tests/libzbxmockdata.a + +zbx_jsonpath_next_SOURCES = \ + zbx_jsonpath_next.c \ + ../../zbxmocktest.h + +zbx_jsonpath_next_LDADD = $(JSON_LIBS) + +zbx_jsonpath_next_CFLAGS = -I@top_srcdir@/tests + +zbx_json_path_open_SOURCES = \ + zbx_json_path_open.c \ + ../../zbxmocktest.h + +zbx_json_path_open_LDADD = $(JSON_LIBS) + +zbx_json_path_open_CFLAGS = -I@top_srcdir@/tests + diff --git a/tests/libs/zbxjson/zbx_json_path_open.c b/tests/libs/zbxjson/zbx_json_path_open.c new file mode 100644 index 00000000000..10cf4abdefd --- /dev/null +++ b/tests/libs/zbxjson/zbx_json_path_open.c @@ -0,0 +1,60 @@ +/* +** Zabbix +** Copyright (C) 2001-2018 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 +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ + +#include "zbxmocktest.h" +#include "zbxmockdata.h" +#include "zbxmockassert.h" +#include "zbxmockutil.h" + +#include "common.h" +#include "zbxjson.h" + +void zbx_mock_test_entry(void **state) +{ + const char *json, *path, *result, *value; + struct zbx_json_parse jp, jp_out; + char *buffer = NULL; + int ret; + size_t size = 0; + + ZBX_UNUSED(state); + + json = zbx_mock_get_parameter_string("in.json"); + path = zbx_mock_get_parameter_string("in.path"); + result = zbx_mock_get_parameter_string("out.result"); + + ret = zbx_json_open(json, &jp); + zbx_mock_assert_result_eq("Invalid zbx_json_open() return value", SUCCEED, ret); + + if (FAIL == (ret = zbx_json_path_open(&jp, path, &jp_out))) + { + zbx_mock_assert_str_eq("Invalid zbx_json_path_open() return value", result, "fail"); + return; + } + + zbx_mock_assert_result_eq("Invalid zbx_json_path_open() return value", SUCCEED, ret); + zbx_mock_assert_str_eq("Invalid zbx_json_path_open() return value", result, "succeed"); + + zbx_json_value_dyn(&jp_out, &buffer, &size); + + value = zbx_mock_get_parameter_string("out.value"); + zbx_mock_assert_str_eq("Invalid value", value, buffer); + + zbx_free(buffer); +} diff --git a/tests/libs/zbxjson/zbx_json_path_open.yaml b/tests/libs/zbxjson/zbx_json_path_open.yaml new file mode 100644 index 00000000000..f0271d433d6 --- /dev/null +++ b/tests/libs/zbxjson/zbx_json_path_open.yaml @@ -0,0 +1,124 @@ +--- +test case: 'Invalid path $.a[] in {"a":{"b": [{"x":10}, 2, 3] }}' +in: + json: '{"a":{"b": [{"x":10}, 2, 3] }}' + path: $.a[] +out: + result: fail +--- +test case: 'Invalid path $a in {"a":1}' +in: + json: '{"a":1}' + path: $a +out: + result: fail +--- +test case: 'Invalid path "" in {"a":1}' +in: + json: '{"a":1}' + path: "" +out: + result: fail +--- +test case: 'Invalid location $.x.b in {"a":{"b": [{"x":10}, 2, 3] }}' +in: + json: '{"a":{"b": [{"x":10}, 2, 3] }}' + path: $.x.b +out: + result: fail +--- +test case: 'Invalid location $[3] in [1, 2, 3]' +in: + json: '[1, 2, 3]' + path: $[3] +out: + result: fail +--- +test case: 'Valid location $[0] in [1, 2, 3]' +in: + json: '[1, 2, 3]' + path: $[0] +out: + result: succeed + value: 1 +--- +test case: 'Valid location $[1] in [1, 2, 3]' +in: + json: '[1, 2, 3]' + path: $[1] +out: + result: succeed + value: 2 +--- +test case: 'Valid location $[2] in [1, 2, 3]' +in: + json: '[1, 2, 3]' + path: $[2] +out: + result: succeed + value: 3 +--- +test case: 'Valid location $[1][0] in [1,["a","b","c"],3]' +in: + json: '[1,["a","b","c"],3]' + path: $[1][0] +out: + result: succeed + value: a +--- +test case: 'Valid location $.x[1][2] in {"x":[1, ["a", "b", "c"], 3]}' +in: + json: '{"x":[1, ["a", "b", "c"], 3]}' + path: $.x[1][2] +out: + result: succeed + value: c +--- +test case: 'Valid location $.a in {"a":{"b": [{"x":10}, 2, 3] }}' +in: + json: '{"a":{"b": [{"x":10}, 2, 3] }}' + path: $.a +out: + result: succeed + value: '{"b": [{"x":10}, 2, 3] }' +--- +test case: 'Valid location $.a in {"a" : {"b": [{"x":10}, 2, 3] }}' +in: + json: '{"a" : {"b": [{"x":10}, 2, 3] }}' + path: $.a +out: + result: succeed + value: '{"b": [{"x":10}, 2, 3] }' +--- +test case: 'Valid location $.a.b in {"a":{"b": [{"x":10}, 2, 3] }}' +in: + json: '{"a":{"b": [{"x":10}, 2, 3] }}' + path: $.a.b +out: + result: succeed + value: '[{"x":10}, 2, 3]' +--- +test case: 'Valid location $.a.b[0] in {"a":{"b": [{"x":10}, 2, 3] }}' +in: + json: '{"a":{"b": [{"x":10}, 2, 3] }}' + path: $.a.b[0] +out: + result: succeed + value: '{"x":10}' +--- +test case: 'Valid location $.a.b[1] in {"a":{"b": [{"x":10}, 2, 3] }}' +in: + json: '{"a":{"b": [{"x":10}, 2, 3] }}' + path: $.a.b[1] +out: + result: succeed + value: 2 +--- +test case: 'Valid location $.a.b[2] in {"a":{"b": [{"x":10}, 2, 3] }}' +in: + json: '{"a":{"b": [{"x":10}, 2, 3] }}' + path: $.a.b[2] +out: + result: succeed + value: 3 +... diff --git a/tests/libs/zbxjson/zbx_jsonpath_next.c b/tests/libs/zbxjson/zbx_jsonpath_next.c new file mode 100644 index 00000000000..dbd47ba3e37 --- /dev/null +++ b/tests/libs/zbxjson/zbx_jsonpath_next.c @@ -0,0 +1,99 @@ +/* +** Zabbix +** Copyright (C) 2001-2018 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 +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ + +#include "zbxmocktest.h" +#include "zbxmockdata.h" +#include "zbxmockassert.h" +#include "zbxmockutil.h" + +#include "common.h" +#include "zbxjson.h" + +/* 'internal' jsonpath support function prototype */ +int zbx_jsonpath_next(const char *path, const char **pnext, zbx_strloc_t *loc, int *type); + +void zbx_mock_test_entry(void **state) +{ + zbx_mock_handle_t components, component; + const char *path, *next = NULL, *component_class, *component_value, *result; + zbx_mock_error_t err; + zbx_strloc_t loc; + int type, ret; + char *buffer; + + ZBX_UNUSED(state); + + path = zbx_mock_get_parameter_string("in.path"); + result = zbx_mock_get_parameter_string("out.result"); + components = zbx_mock_get_parameter_handle("out.components"); + + buffer = zbx_malloc(NULL, strlen(path) + 1); + + while (1) + { + if (SUCCEED != (ret = zbx_jsonpath_next(path, &next, &loc, &type))) + { + zbx_mock_assert_str_eq("Return value", result, "fail"); + break; + } + + if (ZBX_MOCK_SUCCESS != (err = zbx_mock_vector_element(components, &component))) + { + if (ZBX_MOCK_END_OF_VECTOR == err || ZBX_MOCK_NOT_A_VECTOR == err) + fail_msg("Too many path components parsed"); + else + fail_msg("Cannot get vector element: %s", zbx_mock_error_string(err)); + } + + component_class = zbx_mock_get_object_member_string(component, "class"); + + switch (type) + { + case 0: /* ZBX_JSONPATH_COMPONENT_DOT */ + zbx_mock_assert_str_eq("Component class", component_class, "dot"); + break; + case 1: /* ZBX_JSONPATH_COMPONENT_BRACKET */ + zbx_mock_assert_str_eq("Component class", component_class, "bracket"); + break; + case 2: /* ZBX_JSONPATH_ARRAY_INDEX */ + zbx_mock_assert_str_eq("Component class", component_class, "index"); + break; + } + + zbx_strlcpy(buffer, path + loc.l, loc.r - loc.l + 2); + + component_value = zbx_mock_get_object_member_string(component, "value"); + zbx_mock_assert_str_eq("Component value", component_value, buffer); + + if ('\0' == *next) + { + zbx_mock_assert_str_eq("Return value", result, "succeed"); + break; + } + } + + if (ZBX_MOCK_SUCCESS == (err = zbx_mock_vector_element(components, &component))) + fail_msg("Too many path components parsed"); + + if (ZBX_MOCK_END_OF_VECTOR != err && ZBX_MOCK_NOT_A_VECTOR != err) + fail_msg("Cannot get vector element: %s", zbx_mock_error_string(err)); + + zbx_free(buffer); +} + diff --git a/tests/libs/zbxjson/zbx_jsonpath_next.yaml b/tests/libs/zbxjson/zbx_jsonpath_next.yaml new file mode 100644 index 00000000000..1a8e1b3d7d2 --- /dev/null +++ b/tests/libs/zbxjson/zbx_jsonpath_next.yaml @@ -0,0 +1,265 @@ +# Invalid JSON paths + +--- +test case: Invalid path "" - empty path +in: + path: "" +out: + result: fail + components: +--- +test case: Invalid path "$" - only root node specified +in: + path: $ +out: + result: fail + components: +--- +test case: Invalid path "$." - missing dot notation member name +in: + path: $. +out: + result: fail + components: +--- +test case: Invalid path "$['a'" - unclosed bracket notation bracket +in: + path: $['a' +out: + result: fail + components: +--- +test case: Invalid path "$[a']" - unquoted bracket notation member name +in: + path: $[a'] +out: + result: fail + components: +--- +test case: Invalid path "$['']" - empty bracked notation member name +in: + path: $[''] +out: + result: fail + components: +--- +test case: Invalid path "$.a[]" - empty bracked notation member name +in: + path: $.a[] +out: + result: fail + components: + - class: dot + value: a +--- +test case: Invalid path "$.a[1" - missing array index closing bracket +in: + path: $.a[1 +out: + result: fail + components: + - class: dot + value: a +--- +test case: Invalid path "$['a'][]" - empty bracked notation member name +in: + path: $['a'][] +out: + result: fail + components: + - class: bracket + value: a +--- +test case: Invalid path "$['a'][1" - missing array index closing bracket +in: + path: $['a'][1 +out: + result: fail + components: + - class: bracket + value: a +--- +test case: Invalid path "$.a." - missing dot notation member name +in: + path: $.a. +out: + result: fail + components: + - class: dot + value: a +--- +test case: Invalid path "$.['a']" - missing dot notation member name +in: + path: $.['a'] +out: + result: fail + components: + +# Valid JSON paths + +--- +test case: Valid path "$.a" - get dot notation first level member +in: + path: $.a +out: + result: succeed + components: + - class: dot + value: a +--- +test case: Valid path "$['a']" - get bracket notation (single quotes) first level member +in: + path: $['a'] +out: + result: succeed + components: + - class: bracket + value: a +--- +test case: Valid path "$[ 'a' ]" - get bracket notation first level member with spacing around member name +in: + path: $[ 'a' ] +out: + result: succeed + components: + - class: bracket + value: a +--- +test case: Valid path '$["a"]' - get bracket notation (double quotes) first level member +in: + path: $["a"] +out: + result: succeed + components: + - class: bracket + value: a +--- +test case: Valid path "$.a.b" - get dot notation second level member +in: + path: $.a.b +out: + result: succeed + components: + - class: dot + value: a + - class: dot + value: b +--- +test case: Valid path "$['a'].b" - get mixed notation second level member +in: + path: $['a'].b +out: + result: succeed + components: + - class: bracket + value: a + - class: dot + value: b +--- +test case: Valid path "$['a']['b']" - get bracket notation second level member +in: + path: $['a']['b'] +out: + result: succeed + components: + - class: bracket + value: a + - class: bracket + value: b +--- +test case: Valid path $.a['b'] - get mixed notation second level member +in: + path: $.a['b'] +out: + result: succeed + components: + - class: dot + value: a + - class: bracket + value: b +--- +test case: Valid path $.a[0] - get first array element +in: + path: $.a[0] +out: + result: succeed + components: + - class: dot + value: a + - class: index + value: 0 +--- +test case: Valid path $.a[0].b[1] - get array elements from mixed dot notation members and arrays +in: + path: $.a[0].b[1] +out: + result: succeed + components: + - class: dot + value: a + - class: index + value: 0 + - class: dot + value: b + - class: index + value: 1 +--- +test case: Valid path $.a[1000] - get 1001th array element +in: + path: $.a[1000] +out: + result: succeed + components: + - class: dot + value: a + - class: index + value: 1000 +--- +test case: Valid path $.a[ 1 ] - get second array element with whitespace enclosing index +in: + path: $.a[ 1 ] +out: + result: succeed + components: + - class: dot + value: a + - class: index + value: 1 +--- +test case: Valid path $['a'][2] - get third array element of bracket notation first level member +in: + path: $['a'][2] +out: + result: succeed + components: + - class: bracket + value: a + - class: index + value: 2 +--- +test case: Valid path $['a'][2]['b'][3] - get array elements from mixed bracket notation members and arrays +in: + path: $['a'][2]['b'][3] +out: + result: succeed + components: + - class: bracket + value: a + - class: index + value: 2 + - class: bracket + value: b + - class: index + value: 3 +--- +test case: Valid path $[1][2] - get nested array element +in: + path: $[1][2] +out: + result: succeed + components: + - class: index + value: 1 + - class: index + value: 2 +... diff --git a/tests/libs/zbxsysinfo/Makefile.am b/tests/libs/zbxsysinfo/Makefile.am index a969a1ecefb..1236968d691 100644 --- a/tests/libs/zbxsysinfo/Makefile.am +++ b/tests/libs/zbxsysinfo/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ + common \ @ARCH@ if SERVER @@ -81,6 +82,8 @@ parse_item_key_LDADD = \ parse_item_key_LDADD += @SERVER_LIBS@ +parse_item_key_LDFLAGS = @SERVER_LDFLAGS@ + parse_item_key_CFLAGS = -I@top_srcdir@/tests endif @@ -117,7 +120,6 @@ process_LDADD = \ $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ $(top_srcdir)/src/libs/zbxexec/libzbxexec.a \ $(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \ - $(top_srcdir)/src/libs/zbxself/libzbxself.a \ $(top_srcdir)/tests/libzbxmocktest.a \ $(top_srcdir)/tests/libzbxmockdata.a @@ -141,5 +143,7 @@ process_WRAP_FUNCS = \ process_LDADD += @AGENT_LIBS@ +process_LDFLAGS = @AGENT_LDFLAGS@ + process_CFLAGS = $(process_WRAP_FUNCS) -DZABBIX_DAEMON -I@top_srcdir@/tests endif diff --git a/tests/libs/zbxsysinfo/common/Makefile.am b/tests/libs/zbxsysinfo/common/Makefile.am new file mode 100644 index 00000000000..ecb57787a0e --- /dev/null +++ b/tests/libs/zbxsysinfo/common/Makefile.am @@ -0,0 +1,61 @@ +if AGENT +AGENT_tests = SYSTEM_LOCALTIME +endif + +noinst_PROGRAMS = $(AGENT_tests) + +if AGENT +COMMON_SRC_FILES = \ + ../../../../src/zabbix_agent/active.c ../../../../src/zabbix_agent/active.h \ + ../../../../src/zabbix_agent/stats.c \ + ../../../../src/zabbix_agent/cpustat.c \ + ../../../../src/zabbix_agent/diskdevices.c \ + ../../../../src/zabbix_agent/vmstats.c \ + ../../../../src/zabbix_agent/logfiles.c \ + ../../../../src/zabbix_agent/zbxconf.c \ + ../../../../src/zabbix_agent/listener.c \ + ../../../../src/zabbix_agent/procstat.c \ + ../../../zbxmocktest.h + +COMMON_LIB_FILES = \ + $(top_srcdir)/src/libs/zbxsysinfo/libzbxagentsysinfo.a \ + $(top_srcdir)/src/libs/zbxsysinfo/$(ARCH)/libspecsysinfo.a \ + $(top_srcdir)/src/libs/zbxsysinfo/$(ARCH)/libspechostnamesysinfo.a \ + $(top_srcdir)/src/libs/zbxsysinfo/agent/libagentsysinfo.a \ + $(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \ + $(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \ + $(top_srcdir)/src/libs/zbxlog/libzbxlog.a \ + $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \ + $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \ + $(top_srcdir)/src/libs/zbxsys/libzbxsys.a \ + $(top_srcdir)/src/libs/zbxnix/libzbxnix.a \ + $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ + $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ + $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ + $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ + $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ + $(top_srcdir)/src/libs/zbxexec/libzbxexec.a \ + $(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \ + $(top_srcdir)/src/libs/zbxself/libzbxself.a \ + $(top_srcdir)/tests/libzbxmocktest.a \ + $(top_srcdir)/tests/libzbxmockdata.a + +COMMON_COMPILER_FLAGS = -DZABBIX_DAEMON -I@top_srcdir@/tests + +SYSTEM_LOCALTIME_SOURCES = \ + SYSTEM_LOCALTIME.c \ + $(COMMON_SRC_FILES) + +SYSTEM_LOCALTIME_WRAP_FUNCS = \ + -Wl,--wrap=time \ + -Wl,--wrap=gettimeofday + +SYSTEM_LOCALTIME_LDADD = \ + $(COMMON_LIB_FILES) + +SYSTEM_LOCALTIME_LDADD += @AGENT_LIBS@ + +SYSTEM_LOCALTIME_LDFLAGS = @AGENT_LDFLAGS@ + +SYSTEM_LOCALTIME_CFLAGS = $(SYSTEM_LOCALTIME_WRAP_FUNCS) $(COMMON_COMPILER_FLAGS) +endif diff --git a/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.c b/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.c new file mode 100644 index 00000000000..5589cfe17cd --- /dev/null +++ b/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.c @@ -0,0 +1,194 @@ +/* +** Zabbix +** Copyright (C) 2001-2018 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 +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ + +#include "zbxmocktest.h" +#include "zbxmockdata.h" + +#include "common.h" +#include "sysinfo.h" +#include "../../../../src/libs/zbxsysinfo/common/system.h" + +#define LONG_DATETIME_LENGTH 30 /* Length of datetime like "2017-12-18,14:06:09.123,+02:30" */ +#define SHORT_DATETIME_LENGTH 19 /* Length of datetime like "2017-12-18,14:06:09" */ + +static zbx_timespec_t timespec; + +static void zbx_mock_time(void) +{ + static int time_parsed = 0; + zbx_mock_error_t error; + zbx_mock_handle_t param_handle; + const char *timestamp; + struct tm tm; + int ms, hour, min; + char sign, tmp[16]; + size_t length; + + if (0 != time_parsed) + return; /* timestamp param was already parsed */ + + memset(&tm, 0, sizeof(tm)); + memset(×pec, 0, sizeof(timespec)); + + if (ZBX_MOCK_SUCCESS != (error = zbx_mock_in_parameter("timestamp", ¶m_handle)) || + ZBX_MOCK_SUCCESS != (error = zbx_mock_string(param_handle, ×tamp))) + { + fail_msg("Cannot get expected 'timestamp' parameter from test case data: %s", + zbx_mock_error_string(error)); + } + + length = strlen(timestamp); + if (SHORT_DATETIME_LENGTH == length || LONG_DATETIME_LENGTH == length) + { + if (6 != sscanf(timestamp, "%04d-%02d-%02d,%02d:%02d:%02d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, + &tm.tm_hour, &tm.tm_min, &tm.tm_sec) || 1900 > tm.tm_year || 1 > tm.tm_mon || + 12 < tm.tm_mon || 1 > tm.tm_mday || 31 < tm.tm_mday || 0 > tm.tm_hour || + 23 < tm.tm_hour || 0 > tm.tm_min || 59 < tm.tm_min || 0 > tm.tm_sec || 59 < tm.tm_sec) + { + fail_msg("Cannot parse date and time part of 'timestamp' parameter: %s", timestamp); + } + + tm.tm_year -= 1900; + tm.tm_mon--; + + if (LONG_DATETIME_LENGTH == length) + { + if (4 != sscanf(timestamp + SHORT_DATETIME_LENGTH, ".%d,%c%d:%d", &ms, &sign, &hour, &min) || + 0 > ms || 1000 <= ms || ('-' != sign && '+' != sign) || 0 > hour || 23 < hour || + 0 > min || 59 < min) + { + fail_msg("Cannot parse ms and timezone part of 'timestamp' parameter: %s", timestamp); + } + + timespec.ns = ms * 1000000; + + zbx_snprintf(tmp, sizeof(tmp), "ZBX%c%02d:%02d", (sign == '+' ? '-' : '+'), hour, min); + if (0 != setenv("TZ", tmp, 1)) + fail_msg("Cannot set timezone value: %s", tmp); + + tzset(); + } + + timespec.sec = mktime(&tm); + } + else + { + /* Fallback to numeric timestamp format */ + if (FAIL == is_uint32(timestamp, ×pec.sec)) + fail_msg("Cannot convert 'timestamp' parameter value to numeric: %s", timestamp); + } + + time_parsed = 1; +} + +void zbx_mock_test_entry(void **state) +{ + AGENT_REQUEST request; + AGENT_RESULT param_result; + zbx_mock_error_t error; + zbx_mock_handle_t param_handle; + const char *expected_value_string, *expected_return_string, *key_string; + char *value = NULL; + int expected_result = SYSINFO_RET_FAIL, actual_result; + + ZBX_UNUSED(state); + + if (ZBX_MOCK_SUCCESS != (error = zbx_mock_out_parameter("return", ¶m_handle)) || + ZBX_MOCK_SUCCESS != (error = zbx_mock_string(param_handle, &expected_return_string))) + { + fail_msg("Cannot get expected 'return' parameter from test case data: %s", + zbx_mock_error_string(error)); + } + + if (0 == strcmp("SYSINFO_RET_OK", expected_return_string)) + expected_result = SYSINFO_RET_OK; + else if (0 == strcmp("SYSINFO_RET_FAIL", expected_return_string)) + expected_result = SYSINFO_RET_FAIL; + else + fail_msg("Got unexpected 'return' parameter from test case data: %s", expected_return_string); + + if (ZBX_MOCK_SUCCESS != (error = zbx_mock_out_parameter("result", ¶m_handle)) || + ZBX_MOCK_SUCCESS != (error = zbx_mock_string(param_handle, &expected_value_string))) + { + fail_msg("Cannot get expected 'result' parameter from test case data: %s", + zbx_mock_error_string(error)); + } + + if (ZBX_MOCK_SUCCESS != (error = zbx_mock_in_parameter("key", ¶m_handle)) || + ZBX_MOCK_SUCCESS != zbx_mock_string(param_handle, &key_string)) + { + fail_msg("Cannot get expected 'key' parameter from test case data: %s", + zbx_mock_error_string(error)); + } + + init_request(&request); + init_result(¶m_result); + + if (SUCCEED != parse_item_key(key_string, &request)) + fail_msg("Cannot parse item key from string '%s'", key_string); + + if (0 != strcmp(request.key, "system.localtime")) + fail_msg("Got unexpected item key parameter from test case data: %s", key_string); + + if (expected_result != (actual_result = SYSTEM_LOCALTIME(&request, ¶m_result))) + { + fail_msg("Got '%s' instead of '%s' as a result.", zbx_sysinfo_ret_string(actual_result), + zbx_sysinfo_ret_string(expected_result)); + } + + if (SYSINFO_RET_OK == expected_result) + value = (NULL != GET_TEXT_RESULT(¶m_result)) ? *GET_TEXT_RESULT(¶m_result) : NULL; + else + value = (NULL != GET_MSG_RESULT(¶m_result)) ? *GET_MSG_RESULT(¶m_result) : NULL; + + if (NULL == value || 0 != strcmp(expected_value_string, value)) + { + fail_msg("Got '%s' instead of '%s' as a value.", (NULL != value ? value : "NULL"), + expected_value_string); + } + + free_request(&request); + free_result(¶m_result); +} + +time_t __wrap_time(time_t *seconds) +{ + zbx_mock_time(); + + if (NULL != seconds) + *seconds = timespec.sec; + + return timespec.sec; +} + +int __wrap_gettimeofday(struct timeval *__restrict tv, __timezone_ptr_t tz) +{ + if (NULL != tv) + { + zbx_mock_time(); + + tv->tv_sec = timespec.sec; + tv->tv_usec = timespec.ns / 1000; + } + + if (NULL != tz) + fail_msg("Timezone param in gettimeofday() call is not set to null"); + + return 0; +} diff --git a/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.yaml b/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.yaml new file mode 100644 index 00000000000..6ff25863840 --- /dev/null +++ b/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.yaml @@ -0,0 +1,46 @@ +--- +test case: "timestamp check without params" +in: + timestamp: 1513598769 + key: "system.localtime" +out: + result: "1513598769" + return: "SYSINFO_RET_OK" +--- +test case: "timestamp check with empty params" +in: + timestamp: 1513598769 + key: "system.localtime[]" +out: + result: "1513598769" + return: "SYSINFO_RET_OK" +--- +test case: "timestamp check with UTC type param" +in: + timestamp: "1513598769" + key: "system.localtime[utc]" +out: + result: "1513598769" + return: "SYSINFO_RET_OK" +--- +test case: "localtime check" +in: + timestamp: "2017-12-18,14:06:09.123,+02:30" + key: "system.localtime[local]" +out: + result: "2017-12-18,14:06:09.123,+02:30" + return: "SYSINFO_RET_OK" +--- +test case: "input parameter count check" +in: + key: "system.localtime[1,2]" +out: + result: "Too many parameters." + return: "SYSINFO_RET_FAIL" +--- +test case: "input parameter value check" +in: + key: "system.localtime[bebebe]" +out: + result: "Invalid first parameter." + return: "SYSINFO_RET_FAIL" diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c b/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c index ea6c5cda249..2c8c8382267 100644 --- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c +++ b/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c b/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c index 6cbca339853..01e539fa7e9 100644 --- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c +++ b/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/libs/zbxsysinfo/linux/Makefile.am b/tests/libs/zbxsysinfo/linux/Makefile.am index 2ad6170f612..63f9cea220e 100644 --- a/tests/libs/zbxsysinfo/linux/Makefile.am +++ b/tests/libs/zbxsysinfo/linux/Makefile.am @@ -4,7 +4,9 @@ AGENT_tests = \ VFS_FS_DISCOVERY \ KERNEL_MAXPROC \ SYSTEM_CPU_SWITCHES \ - KERNEL_MAXFILES + KERNEL_MAXFILES \ + SYSTEM_CPU_INTR \ + SYSTEM_BOOTTIME endif noinst_PROGRAMS = $(AGENT_tests) @@ -41,7 +43,6 @@ COMMON_LIB_FILES = \ $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ $(top_srcdir)/src/libs/zbxexec/libzbxexec.a \ $(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \ - $(top_srcdir)/src/libs/zbxself/libzbxself.a \ $(top_srcdir)/tests/libzbxmocktest.a \ $(top_srcdir)/tests/libzbxmockdata.a @@ -56,6 +57,8 @@ NET_IF_DISCOVERY_LDADD = \ NET_IF_DISCOVERY_LDADD += @AGENT_LIBS@ +NET_IF_DISCOVERY_LDFLAGS = @AGENT_LDFLAGS@ + NET_IF_DISCOVERY_CFLAGS = $(COMMON_COMPILER_FLAGS) VFS_FS_DISCOVERY_SOURCES = \ @@ -67,6 +70,8 @@ VFS_FS_DISCOVERY_LDADD = \ VFS_FS_DISCOVERY_LDADD += @AGENT_LIBS@ +VFS_FS_DISCOVERY_LDFLAGS = @AGENT_LDFLAGS@ + VFS_FS_DISCOVERY_CFLAGS = $(COMMON_COMPILER_FLAGS) KERNEL_MAXPROC_SOURCES = \ @@ -78,6 +83,8 @@ KERNEL_MAXPROC_LDADD = \ KERNEL_MAXPROC_LDADD += @AGENT_LIBS@ +KERNEL_MAXPROC_LDFLAGS = @AGENT_LDFLAGS@ + KERNEL_MAXPROC_CFLAGS = $(COMMON_COMPILER_FLAGS) SYSTEM_CPU_SWITCHES_SOURCES = \ @@ -89,6 +96,8 @@ SYSTEM_CPU_SWITCHES_LDADD = \ SYSTEM_CPU_SWITCHES_LDADD += @AGENT_LIBS@ +SYSTEM_CPU_SWITCHES_LDFLAGS = @AGENT_LDFLAGS@ + SYSTEM_CPU_SWITCHES_CFLAGS = $(COMMON_COMPILER_FLAGS) KERNEL_MAXFILES_SOURCES = \ @@ -100,6 +109,34 @@ KERNEL_MAXFILES_LDADD = \ KERNEL_MAXFILES_LDADD += @AGENT_LIBS@ +KERNEL_MAXFILES_LDFLAGS = @AGENT_LDFLAGS@ + KERNEL_MAXFILES_CFLAGS = $(COMMON_COMPILER_FLAGS) +SYSTEM_CPU_INTR_SOURCES = \ + SYSTEM_CPU_INTR.c \ + $(COMMON_SRC_FILES) + +SYSTEM_CPU_INTR_LDADD = \ + $(COMMON_LIB_FILES) + +SYSTEM_CPU_INTR_LDADD += @AGENT_LIBS@ + +SYSTEM_CPU_INTR_LDFLAGS = @AGENT_LDFLAGS@ + +SYSTEM_CPU_INTR_CFLAGS = $(COMMON_COMPILER_FLAGS) + +SYSTEM_BOOTTIME_SOURCES = \ + SYSTEM_BOOTTIME.c \ + $(COMMON_SRC_FILES) + +SYSTEM_BOOTTIME_LDADD = \ + $(COMMON_LIB_FILES) + +SYSTEM_BOOTTIME_LDADD += @AGENT_LIBS@ + +SYSTEM_BOOTTIME_LDFLAGS = @AGENT_LDFLAGS@ + +SYSTEM_BOOTTIME_CFLAGS = $(COMMON_COMPILER_FLAGS) + endif diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c b/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c index dc1df0b5607..42288132716 100644 --- a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c +++ b/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c b/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c new file mode 100644 index 00000000000..e4ac84677fa --- /dev/null +++ b/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c @@ -0,0 +1,85 @@ +/* +** Zabbix +** Copyright (C) 2001-2018 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 +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ + +#include "zbxmocktest.h" +#include "zbxmockdata.h" + +#include "common.h" +#include "sysinfo.h" + +void zbx_mock_test_entry(void **state) +{ + zbx_mock_error_t error; + zbx_mock_handle_t handle; + const char *expected_result = NULL, *expected_error = NULL; + char **actual_result, **actual_error; + AGENT_REQUEST request; + AGENT_RESULT result; + int ret; + + ZBX_UNUSED(state); + + if (ZBX_MOCK_NO_PARAMETER == (error = zbx_mock_out_parameter("result", &handle))) + { + if (ZBX_MOCK_NO_PARAMETER == (error = zbx_mock_out_parameter("error", &handle))) + fail_msg("Either \"result\" or \"error\" must be present in test case data."); + + if (ZBX_MOCK_SUCCESS != error || ZBX_MOCK_SUCCESS != (error = zbx_mock_string(handle, &expected_error))) + fail_msg("Cannot get \"error\" parameter from test case data: %s", zbx_mock_error_string(error)); + } + else + { + if (ZBX_MOCK_SUCCESS != error || ZBX_MOCK_SUCCESS != (error = zbx_mock_string(handle, &expected_result))) + fail_msg("Cannot get \"result\" parameter from test case data: %s", zbx_mock_error_string(error)); + + if (ZBX_MOCK_SUCCESS == zbx_mock_out_parameter("error", &handle)) + fail_msg("Parameters \"result\" and \"error\" cannot be both present in test case data."); + } + + init_request(&request); + init_result(&result); + + if (SUCCEED != parse_item_key("system.boottime", &request)) + fail_msg("Parsing of \"system.boottime\" key failed."); + + switch (ret = SYSTEM_BOOTTIME(&request, &result)) + { + case SYSINFO_RET_OK: + if (NULL == expected_result) + fail_msg("SYSTEM_BOOTTIME() was not expected to succeed."); + if (NULL == (actual_result = GET_TEXT_RESULT(&result))) + fail_msg("Result is not set."); + if (0 != strcmp(*actual_result, expected_result)) + fail_msg("Expected result \"%s\" instead of \"%s\".", expected_result, *actual_result); + break; + case SYSINFO_RET_FAIL: + if (NULL == expected_error) + fail_msg("SYSTEM_BOOTTIME() was not expected to fail."); + if (NULL == (actual_error = GET_MSG_RESULT(&result))) + fail_msg("Error message is not set."); + if (0 != strcmp(*actual_error, expected_error)) + fail_msg("Expected error \"%s\" instead of \"%s\".", expected_error, *actual_error); + break; + default: + fail_msg("Unexpected return of SYSTEM_BOOTTIME(): %d (%s).", ret, zbx_sysinfo_ret_string(ret)); + } + + free_request(&request); + free_result(&result); +} diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.yaml b/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.yaml new file mode 100644 index 00000000000..0d6747e45fc --- /dev/null +++ b/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.yaml @@ -0,0 +1,44 @@ +# This are test cases for SYSTEM_BOOTTIME() function responsible for "system.boottime" item checks on Linux OS. +# Section "out" must contain either "result" with expected result of successful SYSTEM_BOOTTIME() execution or "error" +# with expected error message when SYSTEM_BOOTTIME() should fail. Since check is based on reading /proc/stat file in +# search for "btime", section "files" should typically contain "/proc/stat" with some contents to be parsed. +--- +test case: no /proc/stat file +out: + error: 'Cannot open /proc/stat: [2] No such file or directory' +--- +test case: /proc/stat file without btime +out: + error: 'Cannot find a line with "btime" in /proc/stat.' +files: + /proc/stat: '' +--- +test case: /proc/stat file with invalid format of btime +out: + error: 'Cannot find a line with "btime" in /proc/stat.' +files: + /proc/stat: | + btime is not a number +--- +test case: valid /proc/stat file +out: + result: 1512377956 +files: + /proc/stat: | + cpu 48536 52 16734 3689406 1745 0 132 0 0 0 + cpu0 7832 10 2211 458989 254 0 49 0 0 0 + cpu1 7425 4 2378 459463 165 0 43 0 0 0 + cpu2 7818 25 2262 458776 597 0 26 0 0 0 + cpu3 6731 5 2218 460257 227 0 2 0 0 0 + cpu4 4964 0 2188 462364 177 0 5 0 0 0 + cpu5 4073 1 1214 464625 127 0 1 0 0 0 + cpu6 4706 0 1144 463997 106 0 2 0 0 0 + cpu7 4985 4 3116 460932 90 0 1 0 0 0 + intr 1815518 24 2 0 0 0 0 0 0 1 0 0 0 4 0 0 0 0 0 0 28 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75006 62313 67169 308632 46 1327 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + ctxt 7898192 + btime 1512377956 + processes 7174 + procs_running 1 + procs_blocked 0 + softirq 1667043 3 564791 942 74955 61066 0 3246 530041 0 431999 +... diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c b/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c new file mode 100644 index 00000000000..a2f5b74a094 --- /dev/null +++ b/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c @@ -0,0 +1,80 @@ +#include "zbxmocktest.h" +#include "zbxmockdata.h" +#include "common.h" +#include "module.h" +#include "sysinfo.h" + +static zbx_uint64_t read_yaml_uint64(const char *out) +{ + zbx_mock_handle_t handle; + zbx_mock_error_t error; + const char *str; + zbx_uint64_t value; + + if (ZBX_MOCK_SUCCESS != (error = zbx_mock_out_parameter(out, &handle))) + fail_msg("Cannot get interruptions since boot: %s", zbx_mock_error_string(error)); + + if (ZBX_MOCK_SUCCESS != (error = zbx_mock_string(handle, &str))) + fail_msg("Cannot read interruptions since boot: %s", zbx_mock_error_string(error)); + + if (FAIL == is_uint64(str, &value)) + fail_msg("\"%s\" is not a valid numeric unsigned value", str); + + return value; +} + +static int read_yaml_ret(void) +{ + zbx_mock_handle_t handle; + zbx_mock_error_t error; + const char *str; + + if (ZBX_MOCK_SUCCESS != (error = zbx_mock_out_parameter("ret", &handle))) + fail_msg("Cannot get return code: %s", zbx_mock_error_string(error)); + + if (ZBX_MOCK_SUCCESS != (error = zbx_mock_string(handle, &str))) + fail_msg("Cannot read return code: %s", zbx_mock_error_string(error)); + + if (0 == strcasecmp(str, "succeed")) + return SYSINFO_RET_OK; + + if (0 != strcasecmp(str, "fail")) + fail_msg("Incorrect return code '%s'", str); + + return SYSINFO_RET_FAIL; +} + +void zbx_mock_test_entry(void **state) +{ + const char *itemkey = "system.cpu.intr"; + AGENT_RESULT result; + AGENT_REQUEST request; + int ret; + + ZBX_UNUSED(state); + + init_result(&result); + init_request(&request); + + if (SUCCEED != parse_item_key(itemkey, &request)) + fail_msg("Invalid item key format '%s'", itemkey); + + if (read_yaml_ret() != (ret = SYSTEM_CPU_INTR(&request, &result))) + fail_msg("unexpected return code '%s'", zbx_sysinfo_ret_string(ret)); + + if (SYSINFO_RET_OK == ret) + { + zbx_uint64_t interr; + + if (NULL == GET_UI64_RESULT(&result)) + fail_msg("result does not contain numeric unsigned value"); + + if ((interr = read_yaml_uint64("interrupts_since_boot")) != result.ui64) + fail_msg("expected:" ZBX_FS_UI64 " actual:" ZBX_FS_UI64, interr, result.ui64); + } + else if (NULL == GET_MSG_RESULT(&result)) + fail_msg("result does not contain failure message"); + + free_request(&request); + free_result(&result); +} diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.yaml b/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.yaml new file mode 100644 index 00000000000..05925c16cb5 --- /dev/null +++ b/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.yaml @@ -0,0 +1,69 @@ +--- +test case: system cpu interruptions correct read +out: + interrupts_since_boot: '308874139' + ret: 'succeed' +files: + /proc/stat: | + cpu 6834887 14572 1282582 290126897 172774 279140 218973 0 0 0 + cpu0 770269 2717 190592 36174457 82296 60412 61315 0 0 0 + cpu1 813031 1873 166100 36298785 25335 33680 25133 0 0 0 + cpu2 829277 1523 139795 36341487 7353 29706 21682 0 0 0 + cpu3 876703 1694 145870 36291131 4996 29534 23278 0 0 0 + cpu4 872936 1981 186859 36221149 25491 33786 23872 0 0 0 + cpu5 892386 1582 171935 36229879 17961 32753 22534 0 0 0 + cpu6 882281 1600 140378 36292877 5066 29581 20469 0 0 0 + cpu7 898000 1597 141050 36277128 4274 29684 20686 0 0 0 + intr 308874139 44 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 13 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6225580 3465668 7647079 18262670 62 1088 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + ctxt 684166014 + btime 1512372375 + processes 993030 + procs_running 1 + procs_blocked 1 + softirq 268158714 18474107 124646202 68120 9044282 6086868 0 143543 60880180 0 48815412 +--- +test case: system cpu interruptions correct read of max value +out: + interrupts_since_boot: '9223372036854775807' + ret: 'succeed' +files: + /proc/stat: | + cpu 6834887 14572 1282582 290126897 172774 279140 218973 0 0 0 + cpu0 770269 2717 190592 36174457 82296 60412 61315 0 0 0 + cpu1 813031 1873 166100 36298785 25335 33680 25133 0 0 0 + cpu2 829277 1523 139795 36341487 7353 29706 21682 0 0 0 + cpu3 876703 1694 145870 36291131 4996 29534 23278 0 0 0 + cpu4 872936 1981 186859 36221149 25491 33786 23872 0 0 0 + cpu5 892386 1582 171935 36229879 17961 32753 22534 0 0 0 + cpu6 882281 1600 140378 36292877 5066 29581 20469 0 0 0 + cpu7 898000 1597 141050 36277128 4274 29684 20686 0 0 0 + intr 9223372036854775807 44 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 13 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6225580 3465668 7647079 18262670 62 1088 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + ctxt 684166014 + btime 1512372375 + processes 993030 + procs_running 1 + procs_blocked 1 + softirq 268158714 18474107 124646202 68120 9044282 6086868 0 143543 60880180 0 48815412 +--- +test case: system cpu interruptions missing +out: + ret: 'fail' +files: + /proc/stat: | + cpu 6834887 14572 1282582 290126897 172774 279140 218973 0 0 0 + cpu0 770269 2717 190592 36174457 82296 60412 61315 0 0 0 + cpu1 813031 1873 166100 36298785 25335 33680 25133 0 0 0 + cpu2 829277 1523 139795 36341487 7353 29706 21682 0 0 0 + cpu3 876703 1694 145870 36291131 4996 29534 23278 0 0 0 + cpu4 872936 1981 186859 36221149 25491 33786 23872 0 0 0 + cpu5 892386 1582 171935 36229879 17961 32753 22534 0 0 0 + cpu6 882281 1600 140378 36292877 5066 29581 20469 0 0 0 + cpu7 898000 1597 141050 36277128 4274 29684 20686 0 0 0 + missing 9223372036854775807 44 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 13 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6225580 3465668 7647079 18262670 62 1088 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + ctxt 684166014 + btime 1512372375 + processes 993030 + procs_running 1 + procs_blocked 1 + softirq 268158714 18474107 124646202 68120 9044282 6086868 0 143543 60880180 0 48815412 +... diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c b/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c index 45f97c73f10..8b8af0c4ac6 100644 --- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c +++ b/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c b/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c index 57ae8b8acf4..afee7f4b4d3 100644 --- a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c +++ b/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/libs/zbxsysinfo/parse_item_key.c b/tests/libs/zbxsysinfo/parse_item_key.c index 70dfd0b7bf4..004f7f2a2a4 100644 --- a/tests/libs/zbxsysinfo/parse_item_key.c +++ b/tests/libs/zbxsysinfo/parse_item_key.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/libs/zbxsysinfo/process.c b/tests/libs/zbxsysinfo/process.c index e02705c11b1..cbaf7c81dbf 100644 --- a/tests/libs/zbxsysinfo/process.c +++ b/tests/libs/zbxsysinfo/process.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/tests_run.pl b/tests/tests_run.pl index 69462a9c65e..28949f2b970 100755 --- a/tests/tests_run.pl +++ b/tests/tests_run.pl @@ -12,6 +12,12 @@ use File::Basename qw(dirname); use constant TEST_SUITE_ATTRIBUTES => ('name', 'tests', 'skipped', 'errors', 'failures', 'time'); use constant TEST_CASE_ATTRIBUTES => ('name', 'assertions', 'time'); +use constant TEST_CASE_HEADER_FORMAT => " %*s │ %-7s │ %s\n"; +use constant TEST_CASE_FORMAT => " %*d │ %-7s │ %s\n"; +use constant TEST_SUITE_HEADER_FORMAT => " %-*s │ %9s │ %7s │ %6s │ %8s │ %5s\n"; +use constant TEST_SUITE_FORMAT => " %-*s │ %9d │ %7d │ %6d │ %8d │ %5.2f\n"; +use constant TEST_SUITE_PATTERN => qr/^( [a-zA-Z0-9_:]+\b\D*)(\d+)(\D*)(\d+)(\D*)(\d+)(\D*)(\d+)(.*)$/; + sub escape_xml_entity($) { my $entity = shift; @@ -113,6 +119,177 @@ while (my $path = $iter->()) push(@test_suites, $test_suite); } +if (-t STDOUT) +{ + use Term::ANSIColor qw(:constants); + + # find out requirements for column width + + my $longest_suite_name = 0; + my $largest_case_index = 1; + my $longest_case_name = 0; + + foreach my $test_suite (@test_suites) + { + if ($longest_suite_name < length($test_suite->{'name'})) + { + $longest_suite_name = length($test_suite->{'name'}); + } + + $largest_case_index = $test_suite->{'tests'} if ($largest_case_index < $test_suite->{'tests'}); + + foreach my $test_case (@{$test_suite->{'testcases'}}) + { + if ($longest_case_name < length($test_case->{'name'})) + { + $longest_case_name = length($test_case->{'name'}); + } + } + } + + $largest_case_index--; # indices start from 0 + + my $longest_case_index = 1; + + until (($largest_case_index /= 10) < 1) + { + $longest_case_index++; + } + + if ($longest_case_name < length("Test case description")) + { + $longest_case_name = length("Test case description"); + } + + # do the printing + + my $split_cases = sub ($) { + my $split_character = shift; + + print("─") for 1 .. $longest_case_index + 2; + print($split_character); + print("─") for 1 .. 7 + 2; + print($split_character); + print("─") for 1 .. $longest_case_name + 2; + print("\n"); + }; + + $split_cases->("┬"); + printf(TEST_CASE_HEADER_FORMAT, $longest_case_index, "#", "Status", "Test case description"); + $split_cases->("┴"); + + foreach my $test_suite (@test_suites) + { + print(" " . BOLD . $test_suite->{'name'} . RESET . "\n"); + $split_cases->("┬"); + + my $case_index = 0; + + foreach my $test_case (@{$test_suite->{'testcases'}}) + { + my $case_status; + my $color_status; + + if (exists($test_case->{'skipped'})) + { + $color_status = BRIGHT_YELLOW . ($case_status = "SKIPPED") . RESET; + } + elsif (exists($test_case->{'error'})) + { + $color_status = BRIGHT_MAGENTA . ($case_status = "ERROR") . RESET; + } + elsif (exists($test_case->{'failure'})) + { + $color_status = BRIGHT_RED . ($case_status = "FAILURE") . RESET; + } + else + { + $color_status = BRIGHT_GREEN . ($case_status = "OK") . RESET; + } + + my $line = sprintf(TEST_CASE_FORMAT, $longest_case_index, $case_index, $case_status, + $test_case->{'name'}); + + $line =~ s/$case_status/$color_status/; + print($line); + + if (exists($test_case->{'system-out'})) + { + print(BRIGHT_CYAN . BOLD . "STDOUT:" . RESET . "\n" . $test_case->{'system-out'}); + } + + if (exists($test_case->{'system-err'})) + { + print(BRIGHT_RED . BOLD . "STDERR:" . RESET . "\n" . $test_case->{'system-err'}); + } + + $case_index++; + } + + $split_cases->("┴"); + } + + my $split_suites = sub ($) { + my $split_character = shift; + + print("─") for 1 .. $longest_suite_name + 2; + print($split_character); + print("─") for 1 .. 9 + 2; + print($split_character); + print("─") for 1 .. 7 + 2; + print($split_character); + print("─") for 1 .. 6 + 2; + print($split_character); + print("─") for 1 .. 8 + 2; + print($split_character); + print("─") for 1 .. 5 + 2; + print("\n"); + }; + + $split_suites->("┬"); + printf(TEST_SUITE_HEADER_FORMAT, $longest_suite_name, "Test suite", "Succeeded", "Skipped", "Errors", + "Failures", "Time"); + $split_suites->("┼"); + + my $succeeded = 0; + my $skipped = 0; + my $errors = 0; + my $failures = 0; + my $time = 0.0; + + foreach my $test_suite (@test_suites) + { + sprintf(TEST_SUITE_FORMAT, $longest_suite_name, $test_suite->{'name'}, $test_suite->{'tests'} - + $test_suite->{'skipped'} - $test_suite->{'errors'} - $test_suite->{'failures'}, + $test_suite->{'skipped'}, $test_suite->{'errors'}, $test_suite->{'failures'}, + $test_suite->{'time'}) =~ TEST_SUITE_PATTERN; + + print($1 . $2 . $3. ($4 eq "0" ? "0" : BRIGHT_YELLOW . BOLD . $4 . RESET) . $5 . + ($6 eq "0" ? "0" : BRIGHT_MAGENTA . BOLD . $6 . RESET) . $7 . + ($8 eq "0" ? "0" : BRIGHT_RED . BOLD . $8 . RESET) . $9 . "\n"); + + $succeeded += $test_suite->{'tests'} - $test_suite->{'skipped'} - $test_suite->{'errors'} - + $test_suite->{'failures'}; + $skipped += $test_suite->{'skipped'}; + $errors += $test_suite->{'errors'}; + $failures += $test_suite->{'failures'}; + $time += $test_suite->{'time'}; + } + + $split_suites->("┼"); + printf(TEST_SUITE_HEADER_FORMAT, $longest_suite_name, "Test suite", "Succeeded", "Skipped", "Errors", + "Failures", "Time"); + $split_suites->("┼"); + sprintf(TEST_SUITE_FORMAT, $longest_suite_name, "Total:", $succeeded, $skipped, $errors, $failures, $time) =~ + TEST_SUITE_PATTERN; + print($1 . $2 . $3. ($4 eq "0" ? "0" : BRIGHT_YELLOW . BOLD . $4 . RESET) . $5 . + ($6 eq "0" ? "0" : BRIGHT_MAGENTA . BOLD . $6 . RESET) . $7 . + ($8 eq "0" ? "0" : BRIGHT_RED . BOLD . $8 . RESET) . $9 . "\n"); + $split_suites->("┴"); + + exit(); # stop here, do not print XML +} + print("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); print("<testsuites>\n"); diff --git a/tests/zbxmockassert.c b/tests/zbxmockassert.c new file mode 100644 index 00000000000..e15a95d43ab --- /dev/null +++ b/tests/zbxmockassert.c @@ -0,0 +1,131 @@ +/* +** Zabbix +** Copyright (C) 2001-2018 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 +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ + +#include "zbxmocktest.h" +#include "zbxmockdata.h" +#include "zbxmockassert.h" + +#include "common.h" + +void cm_print_error(const char * const format, ...); + +#define _FAIL(file, line, prefix, message, ...) \ + \ +do \ +{ \ + cm_print_error("%s%s" message "\n", (NULL != prefix_msg ? prefix_msg : ""), \ + (NULL != prefix_msg && '\0' != *prefix_msg ? ": " : ""), \ + __VA_ARGS__); \ + _fail(file, line); \ +} \ +while(0) + +void __zbx_mock_assert_str_eq(const char *file, int line, const char *prefix_msg, const char *expected_value, + const char *return_value) +{ + if (0 == strcmp(return_value, expected_value)) + return; + + _FAIL(file, line, prefix_msg, "Expected value \"%s\" while got \"%s\"", expected_value, return_value); +} + +void __zbx_mock_assert_str_ne(const char *file, int line, const char *prefix_msg, const char *expected_value, + const char *return_value) +{ + if (0 != strcmp(return_value, expected_value)) + return; + + _FAIL(file, line, prefix_msg, "Did not expect value \"%s\"", return_value); +} + +void __zbx_mock_assert_uint64_eq(const char *file, int line, const char *prefix_msg, zbx_uint64_t expected_value, + zbx_uint64_t return_value) +{ + if (return_value == expected_value) + return; + + _FAIL(file, line, prefix_msg, "Expected value \"" ZBX_FS_UI64 "\" while got \"" ZBX_FS_UI64 "\"", expected_value, + return_value); +} + +void __zbx_mock_assert_uint64_ne(const char *file, int line, const char *prefix_msg, zbx_uint64_t expected_value, + zbx_uint64_t return_value) +{ + if (return_value != expected_value) + return; + + _FAIL(file, line, prefix_msg, "Did not expect value \"" ZBX_FS_UI64 "\"", return_value); +} + +void __zbx_mock_assert_int_eq(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value) +{ + if (return_value == expected_value) + return; + + _FAIL(file, line, prefix_msg, "Expected value \"%d\" while got \"%d\"", expected_value, return_value); +} + +void __zbx_mock_assert_int_ne(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value) +{ + if (return_value != expected_value) + return; + + _FAIL(file, line, prefix_msg, "Did not expect value \"%d\"", return_value); +} + +void __zbx_mock_assert_result_eq(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value) +{ + if (expected_value == return_value) + return; + + _FAIL(file, line, prefix_msg, "Expected result \"%s\" while got \"%s\"", + zbx_result_string(expected_value), zbx_result_string(return_value)); +} + +void __zbx_mock_assert_result_ne(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value) +{ + if (expected_value != return_value) + return; + + _FAIL(file, line, prefix_msg, "Did not expect result \"%s\"", zbx_result_string(return_value)); +} + +void __zbx_mock_assert_sysinfo_ret_eq(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value) +{ + if (expected_value == return_value) + return; + + _FAIL(file, line, prefix_msg, "Expected sysinfo result \"%s\" while got \"%s\"", + zbx_sysinfo_ret_string(expected_value), zbx_sysinfo_ret_string(return_value)); +} + +void __zbx_mock_assert_sysinfo_ret_ne(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value) +{ + if (expected_value != return_value) + return; + + _FAIL(file, line, prefix_msg, "Did not expect sysinfo result \"%s\"", zbx_sysinfo_ret_string(return_value)); +} + diff --git a/tests/zbxmockassert.h b/tests/zbxmockassert.h new file mode 100644 index 00000000000..3bb9501ef83 --- /dev/null +++ b/tests/zbxmockassert.h @@ -0,0 +1,85 @@ +/* +** Zabbix +** Copyright (C) 2001-2018 Zabbix SIA +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Ge_neral Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU Ge_neral Public License for more details. +** +** You should have received a copy of the GNU Ge_neral Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ + +#ifndef ZABBIX_MOCK_ASSERT_H +#define ZABBIX_MOCK_ASSERT_H + +#include "common.h" + +void __zbx_mock_assert_str_eq(const char *file, int line, const char *prefix_msg, const char *expected_value, + const char *return_value); + +void __zbx_mock_assert_str__ne(const char *file, int line, const char *prefix_msg, const char *expected_value, + const char *return_value); + +void __zbx_mock_assert_uint64_eq(const char *file, int line, const char *prefix_msg, zbx_uint64_t expected_value, + zbx_uint64_t return_value); + +void __zbx_mock_assert_uint64__ne(const char *file, int line, const char *prefix_msg, zbx_uint64_t expected_value, + zbx_uint64_t return_value); + +void __zbx_mock_assert_int_eq(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value); + +void __zbx_mock_assert_int_ne(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value); + +void __zbx_mock_assert_result_eq(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value); + +void __zbx_mock_assert_result_ne(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value); + +void __zbx_mock_assert_sysinfo_ret_eq(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value); + +void __zbx_mock_assert_sysinfo_ret_ne(const char *file, int line, const char *prefix_msg, int expected_value, + int return_value); + +#define zbx_mock_assert_str_eq(prefix_msg, expected_value, return_value) \ + __zbx_mock_assert_str_eq(__FILE__, __LINE__, prefix_msg, expected_value, return_value) + +#define zbx_mock_assert_str_ne(prefix_msg, expected_value, return_value) \ + __zbx_mock_assert_str_ne(__FILE__, __LINE__, prefix_msg, expected_value, return_value) + +#define zbx_mock_assert_uint64_eq(prefix_msg, expected_value, return_value) \ + __zbx_mock_assert_uint64_eq(__FILE__, __LINE__, prefix_msg, expected_value, return_value) + +#define zbx_mock_assert_uint64_ne(prefix_msg, expected_value, return_value) \ + __zbx_mock_assert_uint64_ne(__FILE__, __LINE__, prefix_msg, expected_value, return_value) + +#define zbx_mock_assert_int_eq(prefix_msg, expected_value, return_value) \ + __zbx_mock_assert_int_eq(__FILE__, __LINE__, prefix_msg, expected_value, return_value) + +#define zbx_mock_assert_int_ne(prefix_msg, expected_value, return_value) \ + __zbx_mock_assert_int_ne(__FILE__, __LINE__, prefix_msg, expected_value, return_value) + +#define zbx_mock_assert_result_eq(prefix_msg, expected_value, return_value) \ + __zbx_mock_assert_result_eq(__FILE__, __LINE__, prefix_msg, expected_value, return_value) + +#define zbx_mock_assert_result_ne(prefix_msg, expected_value, return_value) \ + __zbx_mock_assert_result_ne(__FILE__, __LINE__, prefix_msg, expected_value, return_value) + +#define zbx_mock_assert_sysinfo_ret_eq(prefix_msg, expected_value, return_value) \ + __zbx_mock_assert_sysinfo_ret_eq(__FILE__, __LINE__, prefix_msg, expected_value, return_value) + +#define zbx_mock_assert_sysinfo_ret_ne(prefix_msg, expected_value, return_value) \ + __zbx_mock_assert_sysinfo_ret_ne(__FILE__, __LINE__, prefix_msg, expected_value, return_value) + +#endif diff --git a/tests/zbxmockdata.c b/tests/zbxmockdata.c index d82f02e3c4c..388bdb129ce 100644 --- a/tests/zbxmockdata.c +++ b/tests/zbxmockdata.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -28,12 +28,14 @@ static zbx_vector_ptr_t handle_pool; /* a place to store handles provided to mock data user */ static zbx_vector_str_t string_pool; /* a place to store strings provided to mock data user */ static yaml_document_t test_case; /* parsed YAML document with test case data */ +static const yaml_node_t *root; /* the root document node */ static const yaml_node_t *in = NULL; /* pointer to "in" section of test case document */ static const yaml_node_t *out = NULL; /* pointer to "out" section of test case document */ static const yaml_node_t *db_data = NULL; /* pointer to "db data" section of test case document */ static const yaml_node_t *files = NULL; /* pointer to "files" section of test case document */ static const yaml_node_t *exit_code = NULL; /* pointer to "exit code" section of test case document */ + typedef struct { const yaml_node_t *node; /* node of test_case document handle is associated with */ @@ -83,6 +85,17 @@ static int zbx_yaml_scalar_cmp(const char *str, const yaml_node_t *node) return strncmp(str, (const char *)node->data.scalar.value, node->data.scalar.length); } +static int zbx_yaml_scalar_ncmp(const char *str, size_t len, const yaml_node_t *node) +{ + if (YAML_SCALAR_NODE != node->type) + fail_msg("Internal error: scalar comparison of nonscalar node."); + + if (len != node->data.scalar.length) + return -1; + + return strncmp(str, (const char *)node->data.scalar.value, node->data.scalar.length); +} + /* TODO: validate that keys in "in", "out", "db data" are scalars; validate "db data" */ int zbx_mock_data_init(void **state) { @@ -95,8 +108,6 @@ int zbx_mock_data_init(void **state) if (0 != yaml_parser_load(&parser, &test_case)) { - const yaml_node_t *root; - if (NULL != (root = yaml_document_get_root_node(&test_case))) { yaml_document_t tmp; @@ -105,6 +116,8 @@ int zbx_mock_data_init(void **state) { if (NULL == yaml_document_get_root_node(&tmp)) { + yaml_document_delete(&tmp); + if (YAML_MAPPING_NODE == root->type) { const yaml_node_pair_t *pair; @@ -283,12 +296,14 @@ const char *zbx_mock_error_string(zbx_mock_error_t error) return "Provided handle is not a string handle."; case ZBX_MOCK_INTERNAL_ERROR: return "Internal error, please report to maintainers."; + case ZBX_MOCK_INVALID_YAML_PATH: + return "Invalid YAML path syntax."; default: return "Unknown error."; } } -static zbx_mock_error_t zbx_mock_parameter(zbx_mock_parameter_t type, const char *name, zbx_mock_handle_t *parameter) +static zbx_mock_error_t zbx_mock_builtin_parameter(zbx_mock_parameter_t type, const char *name, zbx_mock_handle_t *parameter) { const yaml_node_t *source; const yaml_node_pair_t *pair; @@ -338,22 +353,22 @@ static zbx_mock_error_t zbx_mock_parameter(zbx_mock_parameter_t type, const char zbx_mock_error_t zbx_mock_in_parameter(const char *name, zbx_mock_handle_t *parameter) { - return zbx_mock_parameter(ZBX_MOCK_IN, name, parameter); + return zbx_mock_builtin_parameter(ZBX_MOCK_IN, name, parameter); } zbx_mock_error_t zbx_mock_out_parameter(const char *name, zbx_mock_handle_t *parameter) { - return zbx_mock_parameter(ZBX_MOCK_OUT, name, parameter); + return zbx_mock_builtin_parameter(ZBX_MOCK_OUT, name, parameter); } zbx_mock_error_t zbx_mock_db_rows(const char *data_source, zbx_mock_handle_t *rows) { - return zbx_mock_parameter(ZBX_MOCK_DB_DATA, data_source, rows); + return zbx_mock_builtin_parameter(ZBX_MOCK_DB_DATA, data_source, rows); } zbx_mock_error_t zbx_mock_file(const char *path, zbx_mock_handle_t *file) { - return zbx_mock_parameter(ZBX_MOCK_FILES, path, file); + return zbx_mock_builtin_parameter(ZBX_MOCK_FILES, path, file); } zbx_mock_error_t zbx_mock_exit_code(int *status) @@ -441,6 +456,156 @@ zbx_mock_error_t zbx_mock_string(zbx_mock_handle_t string, const char **value) tmp = zbx_malloc(tmp, handle->node->data.scalar.length + 1); memcpy(tmp, handle->node->data.scalar.value, handle->node->data.scalar.length); tmp[handle->node->data.scalar.length] = '\0'; + zbx_vector_str_append(&string_pool, tmp); *value = tmp; return ZBX_MOCK_SUCCESS; } + +static zbx_mock_error_t zbx_yaml_path_next(const char **pnext, const char **key, int *key_len, int *index) +{ + const char *next = *pnext; + size_t pos; + char quotes; + + while ('.' == *next) + next++; + + /* process dot notation component */ + if ('[' != *next) + { + *key = next; + + while (0 != isalnum(*next) || '_' == *next) + next++; + + if (*key == next) + return ZBX_MOCK_INVALID_YAML_PATH; + + *key_len = next - *key; + + if ('\0' != *next && '.' != *next && '[' != *next) + return ZBX_MOCK_INVALID_YAML_PATH; + + *pnext = next; + *index = 0; + + return ZBX_MOCK_SUCCESS; + } + + while (*(++next) == ' ') + ; + + /* process array index component */ + if (0 != isdigit(*next)) + { + for (pos = 0; 0 != isdigit(next[pos]); pos++) + ; + + if (0 == pos) + return ZBX_MOCK_INVALID_YAML_PATH; + + *key = next; + *key_len = pos; + + next += pos; + + while (*next == ' ') + next++; + + if (']' != *next++) + return ZBX_MOCK_INVALID_YAML_PATH; + + *pnext = next; + *index = 1; + + return ZBX_MOCK_SUCCESS; + } + + /* process bracket notation component */ + + if ('\'' != *next && '"' != *next) + return ZBX_MOCK_INVALID_YAML_PATH; + + *key = next + 1; + + for (quotes = *next++; quotes != *next; next++) + { + if ('\0' == *next) + return ZBX_MOCK_INVALID_YAML_PATH; + } + + if (*key == next) + return ZBX_MOCK_INVALID_YAML_PATH; + + *key_len = next - *key; + + while (*(++next) == ' ') + ; + + if (']' != *next++) + return ZBX_MOCK_INVALID_YAML_PATH; + + *pnext = next; + *index = 0; + + return ZBX_MOCK_SUCCESS; +} + +static zbx_mock_error_t zbx_mock_parameter_rec(const yaml_node_t *node, const char *path, zbx_mock_handle_t *parameter) +{ + const yaml_node_pair_t *pair; + const char *pnext = path, *key_name; + int err, key_len, index; + + /* end of the path, return whatever has been found */ + if ('\0' == *pnext) + { + *parameter = zbx_mock_handle_alloc(node); + return ZBX_MOCK_SUCCESS; + } + + if (ZBX_MOCK_SUCCESS != (err = zbx_yaml_path_next(&pnext, &key_name, &key_len, &index))) + return err; + + /* the path component is array index, attempt to extract sequence element */ + if (0 != index) + { + const yaml_node_t *element; + + if (YAML_SEQUENCE_NODE != node->type) + return ZBX_MOCK_NOT_A_VECTOR; + + index = atoi(key_name); + + if (0 > index || index >= (node->data.sequence.items.top - node->data.sequence.items.start)) + return ZBX_MOCK_END_OF_VECTOR; + + element = yaml_document_get_node(&test_case, node->data.sequence.items.start[index]); + return zbx_mock_parameter_rec(element, pnext, parameter); + } + + /* the patch component is object key, attempt to extract object member */ + + if (YAML_MAPPING_NODE != node->type) + return ZBX_MOCK_NOT_AN_OBJECT; + + for (pair = node->data.mapping.pairs.start; pair < node->data.mapping.pairs.top; pair++) + { + const yaml_node_t *key, *value; + + key = yaml_document_get_node(&test_case, pair->key); + + if (0 == zbx_yaml_scalar_ncmp(key_name, key_len, key)) + { + value = yaml_document_get_node(&test_case, pair->value); + return zbx_mock_parameter_rec(value, pnext, parameter); + } + } + + return ZBX_MOCK_NO_SUCH_MEMBER; +} + +zbx_mock_error_t zbx_mock_parameter(const char *path, zbx_mock_handle_t *parameter) +{ + return zbx_mock_parameter_rec(root, path, parameter); +} diff --git a/tests/zbxmockdata.h b/tests/zbxmockdata.h index a4fb63572ae..fb69d751f03 100644 --- a/tests/zbxmockdata.h +++ b/tests/zbxmockdata.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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 @@ -36,7 +36,8 @@ typedef enum ZBX_MOCK_NOT_A_VECTOR, ZBX_MOCK_END_OF_VECTOR, ZBX_MOCK_NOT_A_STRING, - ZBX_MOCK_INTERNAL_ERROR + ZBX_MOCK_INTERNAL_ERROR, + ZBX_MOCK_INVALID_YAML_PATH } zbx_mock_error_t; @@ -50,5 +51,6 @@ zbx_mock_error_t zbx_mock_exit_code(int *status); zbx_mock_error_t zbx_mock_object_member(zbx_mock_handle_t object, const char *name, zbx_mock_handle_t *member); zbx_mock_error_t zbx_mock_vector_element(zbx_mock_handle_t vector, zbx_mock_handle_t *element); zbx_mock_error_t zbx_mock_string(zbx_mock_handle_t string, const char **value); +zbx_mock_error_t zbx_mock_parameter(const char *path, zbx_mock_handle_t *parameter); #endif /* ZABBIX_MOCK_DATA_H */ diff --git a/tests/zbxmockdb.c b/tests/zbxmockdb.c index 63ae7fb2f13..3ecb8ab267e 100644 --- a/tests/zbxmockdb.c +++ b/tests/zbxmockdb.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/zbxmockdir.c b/tests/zbxmockdir.c index dba4e727baa..c5390152603 100644 --- a/tests/zbxmockdir.c +++ b/tests/zbxmockdir.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/zbxmockexit.c b/tests/zbxmockexit.c index 67c147b6a12..d7cc454f02c 100644 --- a/tests/zbxmockexit.c +++ b/tests/zbxmockexit.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/zbxmockfile.c b/tests/zbxmockfile.c index b194f05b3d8..811a89a8a9a 100644 --- a/tests/zbxmockfile.c +++ b/tests/zbxmockfile.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/zbxmockstat.c b/tests/zbxmockstat.c index 4bcf2cb7625..e19f61dad27 100644 --- a/tests/zbxmockstat.c +++ b/tests/zbxmockstat.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/zbxmocktest.c b/tests/zbxmocktest.c index 56a7844456d..d65560c73bd 100644 --- a/tests/zbxmocktest.c +++ b/tests/zbxmocktest.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/zbxmocktest.h b/tests/zbxmocktest.h index b07c340dcdb..bf311aeb435 100644 --- a/tests/zbxmocktest.h +++ b/tests/zbxmocktest.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2017 Zabbix SIA +** Copyright (C) 2001-2018 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/tests/zbxmockutil.c b/tests/zbxmockutil.c new file mode 100644 index 00000000000..640f53f80d6 --- /dev/null +++ b/tests/zbxmockutil.c @@ -0,0 +1,78 @@ +/* +** Zabbix +** Copyright (C) 2001-2018 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 +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ + +#include "zbxmocktest.h" +#include "zbxmockdata.h" +#include "zbxmockassert.h" +#include "zbxmockutil.h" + +#include "common.h" + +const char *zbx_mock_get_parameter_string(const char *path) +{ + zbx_mock_error_t err; + zbx_mock_handle_t handle; + const char *parameter; + + if (ZBX_MOCK_SUCCESS != (err = zbx_mock_parameter(path, &handle)) || + ZBX_MOCK_SUCCESS != (err = zbx_mock_string(handle, ¶meter))) + { + fail_msg("Cannot read parameter at \"%s\": %s", path, zbx_mock_error_string(err)); + } + + return parameter; +} + +const char *zbx_mock_get_object_member_string(zbx_mock_handle_t object, const char *name) +{ + zbx_mock_error_t err; + zbx_mock_handle_t handle; + const char *member; + + if (ZBX_MOCK_SUCCESS != (err = zbx_mock_object_member(object, name, &handle)) || + ZBX_MOCK_SUCCESS != (err = zbx_mock_string(handle, &member))) + { + fail_msg("Cannot read object member \"%s\": %s", name, zbx_mock_error_string(err)); + } + + return member; +} + +zbx_mock_handle_t zbx_mock_get_parameter_handle(const char *path) +{ + zbx_mock_error_t err; + zbx_mock_handle_t parameter; + + if (ZBX_MOCK_SUCCESS != (err = zbx_mock_parameter(path, ¶meter))) + fail_msg("Cannot read parameter at \"%s\": %s", path, zbx_mock_error_string(err)); + + return parameter; +} + +zbx_mock_handle_t zbx_mock_get_object_member_handle(zbx_mock_handle_t object, const char *name) +{ + zbx_mock_error_t err; + zbx_mock_handle_t member; + + if (ZBX_MOCK_SUCCESS != (err = zbx_mock_object_member(object, name, &member))) + fail_msg("Cannot read object member \"%s\": %s", name, zbx_mock_error_string(err)); + + return member; +} + diff --git a/tests/zbxmockutil.h b/tests/zbxmockutil.h new file mode 100644 index 00000000000..af3059a840f --- /dev/null +++ b/tests/zbxmockutil.h @@ -0,0 +1,32 @@ +/* +** Zabbix +** Copyright (C) 2001-2018 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 +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**/ + +#ifndef ZABBIX_MOCK_UTIL_H +#define ZABBIX_MOCK_UTIL_H + +#include "zbxmockdata.h" + +const char *zbx_mock_get_parameter_string(const char *path); +const char *zbx_mock_get_object_member_string(zbx_mock_handle_t object, const char *name); + +zbx_mock_handle_t zbx_mock_get_parameter_handle(const char *path); +zbx_mock_handle_t zbx_mock_get_object_member_handle(zbx_mock_handle_t object, const char *name); + + +#endif |
