(net/cacti) Updated 1.2.3 to 1.2.7

1.2.7
-security#2964: CVE-2019-16723 Security issue allows to view all graphs
-issue#1181: When opening the Scheduler, it may appear off screen when opened near the bottom of a window
-issue#2894: When using Remote Data Collectors, database information and recommendations may show Incorrect values
-issue#2895: When using data sources from different RRDs, Percentile calculation may be incorrect
-issue#2899: When displaying a form, variable substitution may not always work as expected
-issue#2922: When running a data query, the result may come back as undefined
-issue#2925: When using consolidation functions, retrieving the first step can cause errors
-issue#2926: When editing a graph, variable validation errors may prevent changes from being saved
-issue#2929: Boost performance may become poor even in single server mode
-issue#2930: RRDtool can generate errors to standard output which can corrupt images
-issue#2932: When RRDTool generates an error creating an image, it is not always reportedly properly
-issue#2936: Installer will loop when number of tables exceeds PHP's max_input_vars limit
-issue#2938: Under CentOS packages, upgrade_database.php script uses incorrect location for DB upgrade scripts
-issue#2940: Images are not always properly sized until the page size changes
-issue#2949: Order icons may not be properly aligned
-issue#2951: Allow legends to be modified for Aggregate Graphs
-issue#2958: Drop down autocomplete lists do not always open as expected
-issue#2961: When syncing device templates, undefined function may be raised
-issue#2963: When running ss_cpoller script, avgTime incorrect returns maxTime
-issue#2966: Realtime popup windows do not always honor settings
-issue#2967: When using Spikekill, gap and range fill are not operating as expected
-issue#2970: When a user edits their profile, buttons may appear as unusable whilst still being enabled
-issue#2973: User menu does not always display properly on mobile devices
-issue#2974: Script Server can raise unexpected warnings when 'arg_num_indexes' set but not found in data source
-issue#2975: Datasource Debug does not properly handle European numbers in certain circumstances
-issue#2976: Boost messages should be stored in their own log file
-issue#2977: Data updates with past timestamps can cause boost errors
-issue#2978: Moving hosts between data collectors is slow
-issue#2979: Multi Output Fields are not parsed correctly
-issue#2984: When checking SQL fields, value was not always primed
-issue#2986: Selecting 'Devices' menu pick closes 'Management' menu
-feature#2943: Allow all Data Queries of a device to be re-indexed at once
-feature#2952: If device is down or threshold breached, highlight in tree view
-feature#2985: Update phpseclib to 2.0.23

1.2.6
-issue#2794: Graph template not saved on graph edit
-issue#2825: "innodb_doublewrite = off" possibly dangerous recommendation
-issue#2829: PHP recommendations always see memory limit as unlimited
-issue#2830: Disabled Top/Bottom external links should not be displayed
-issue#2832: Install/Upgrade log does not show anything
-issue#2833: Undefined index can occur when data source does not have an snmp_index
-issue#2834: Boost performance drops on very large systems
-issue#2835: When creating graphs and inneficient query is causing long creation times
-issue#2837: Sunrise theme does not render checkboxes 100% correctly
-issue#2838: jQueryMultiselect does not match upstream due to forking
-issue#2839: Non regular expression search filters don't support international characters
-issue#2841: Total count is wrong after searching for External Link pages
-issue#2843: DSStats reruns Daily Aggregation every minute
-issue#2844: Autocomplete settings for passwords are not properly defined
-issue#2845: Data Template can't be edited when it is in use
-issue#2846: Allow tooltips for section headers with 'question' icon
-issue#2847: Permanently convert an Aggregate to a regular graph
-issue#2848: Aggregate graphs get clipped due to incorrect date range
-issue#2856: Aggregate issues with very long RRDtool command lines
-issue#2857: When trying to find the best index to use, a 'must implement Countable' warning appears
-issue#2860: When testing remote poller connections during install, undefined variable warning can occur
-issue#2862: Automation does not calculate network information correctly for single hosts
-issue#2866: Add poller ID to subject for admin notifications
-issue#2869: When creating aggregates from Graphs, JavaScript issues can occur
-issue#2872: Add support for MySQL 8 and use of grouping as name for a column
-issue#2875: Undefined variable when removing spikes in some cases
-issue#2877: When attempting to send report, undefined function 'get_tinespan' messages appear
-issue#2878: Function get_magic_quotes_gpc() is now deprecated in PHP 7.4
-issue#2879: Switching from authPriv to authNoPriv produces error when saving
-issue#2884: Replication continues to occur when poller has been disabled by sysres-dev
-issue#2891: Script server script ss_fping.php generates error when not called by script server
-issue#2901: Poller overrun warning message is badly worded
-issue#2902: Mailer incorrectly reports it is sending to noone
-issue#2903: PHP recommendations can generate a warning causing JSON issues
-issue#2905: Sorting plugins by version can lead to unexpected ordering
-issue#2907: SSL column for multiple pollers can be incorrectly set causing SQL errors
-issue#2908: When URL_PATH is blank, it should assume that it is '/'
-issue#2909: Correct usage of affect vs effect in strings
-issue#2910: Can not show user menu when in portrait mode on mobile devices
-issue#2911: Graph variables are not always encoded to JSON properly resulting in warnings
-issue#2912: Navigation cache can sometimes be corrupted resulting in a non-array value
-issue#2913: When adding new graphs, the type of graph is not remembered
-issue#2917: Action icons next to graphs can sometimes become unselectable due to zoom
-issue#2919: When refreshing menu, selected items are sometimes lost and submenu items can become hidden

1.2.5
-issue#1978: Popup Menus can appear off screen when using Graph Thumbnails
-issue#2282: Installation wizard does not detect RRDtool version correctly
-issue#2524: When editing a tree, Drag and Drop of Devices does not always work as expected
-issue#2573: Associated Graph Template for Data Query can sometime disappear
-issue#2656: GPRINT text_format does not replace Data Query and Host Fields
-issue#2661: Automation does not always calculate network range/subnet correctly
-issue#2663: Some legacy Data Queries can not determine their index order causing broken graphs
-issue#2674: Large strings can sometimes cause language translation can fail
-issue#2719: Automation may sometimes create empty graphs
-issue#2721: When replacing '|input_xxxx|' strings, undefined index can occur
-issue#2722: Calls to _db_replace() are not consistent resulting in warnings
-issue#2723: When replicating to remote pollers, Undefined Variable errors may be seen
-issue#2724: When graphing HRULE items, 'Only Variables should be passed by reference' error may be seen
-issue#2725: When viewing logs in utilities, filenames should be limited the same as clog
-issue#2726: During Automation logging, include the Rule ID that triggers the creation of an item by xmacan
-issue#2732: When using basic authentication, automatically strip any @domain information
-issue#2734: Allow non-english labels to be used on Graph Templates
-issue#2727: When using Polling Hosts Template, warnings can be issued when CMD.PHP is the poller
-issue#2733: When processing SNMP data, space delimited hex strings do not always convert into MAC addresses
-issue#2735: Mouse cursor should show as default pointer if column is not sortable
-issue#2736: When using MySQL 8 or above, 'function' is considered a reserved word unless quoted by xmacan
-issue#2741: Various errors can occur due to undefined or incorrect variable names
-issue#2742: Various errors can occur due to undefined or incorrect variable names
-issue#2743: Attempts to close a tooltip when no tooltip has been set may cause errors
-issue#2744: When changing password, undefined index error can occur if user is not logged in
-issue#2748: If PHP location setting is invalid during install/upgrade, this should be notified on modules page
-issue#2750: When performing multiple sort, highlighting of content occurs
-issue#2751: When editing a Tree, display filter may not allow 'All' option to work
-issue#2752: When running verbose query on device, you are unable to copy text from items
-issue#2753: Unable to copy entire verbose query using clipboard command
-issue#2757: Page Navigation can be subject to XSS injection
-issue#2758: Various sensitive directories are browsable if web server directory browsing is enabled
-issue#2760: Unable to add items into a report
-issue#2762: Creating an aggregate graph can sometimes fail due to unknown RRD tools error
-issue#2766: When modifying Aggregate Templates, changes are not always cascaded to Graph
-issue#2768: Aggregate Graphs may sometimes show the wrong row count
-issue#2770: ItemType is not updated when saving Report Items
-issue#2772: Add tooltip support to html_header() and html_header_checkbox()
-issue#2775: Remote pollers may sometimes fail to replicate data back to main system
-issue#2777: Attempting to edit a non-existent report generates an error
-issue#2778: When rendering graphs, resizing can sometimes occur repeatedly
-issue#2779: On new installations, automation rules for Interface Graphs are broken
-issue#2780: Upgrade database script not actually upgrading Cacti
-issue#2782: When replicating the syslog plugin, the configuration file is ignored causing errors
-issue#2783: When limiting the number of displayed characters, international characters may sometimes display incorrectly
-issue#2784: When removing a device with graphs but no data sources , errors are generated
-issue#2785: When editing a graph rule, warnings incorrectly appear about unsaved changes
-issue#2792: When a checkbox 'friendly name' has a comma, checkbox functionality stops working
-issue#2797: When upgrading from before 1.x, SuperLinks view permissions may not be correct
-issue#2799: Under heavy use of Real Time Graphs, SQL errors may start appearing
-issue#2800: When editing a tree, using a comma in the search field stops search from working
-issue#2802: If a Device lacks ifName, an alternative field is not always found even if available
-issue#2807: When editing a Data Template that has dependant graphs, some attributes should not be modifiable
-issue#2808: When navigating a tree, the layout may unexpectedly move
-issue#2814: When viewing the utilities page, HTML tags may be seen rather than rendered
-issue#2816: When viewing logs, paging does not always working correctly
-issue#2818: Automation can sometimes incorrectly add duplicate devices with the same sysname
-issue#2820: When path is blank, is_resource_writable() will generate 'Uninitialized string offset: -1'
-issue#2821: When the desired locale can not be located, a number format issue may occur
-feature#2728: Update phpseclib to 2.0.17 by DavidLiedke
-feature#2809: Update c3.js & d3.js by DavidLiedke
-feature#2730: Update jstree.js to 3.3.8 by DavidLiedke
-feature#2754: Allow Devices, Graphs and Data Sources to be searched by ID
-feature#2765: When editing a tree, allow cascading selection of available graphics
-feature#2805: Merged plugins are not always upgraded correctly
-feature#2823: Enhance the splice_rrd.php to be able to merge RRDfiles of differing step

1.2.4
-issue#2523: Send A Test Email stops working under PHP 7.3
-issue#2589: Missing RRD file can cause DSSTATS to throw errors
-issue#2590: When installing, chosen language is sometimes lost
-issue#2591: Menu selection does not always match selected page/section
-issue#2592: When viewing an aggregate graph, 'Display graphs from this aggregate' option does always not work
-issue#2593: Unable to migrate aggregate graphs to matching aggregate template
-issue#2598: Creating an aggregate graph without associated template causes RRDtool error
-issue#2599: Creating/Updating an Aggregate Graph to use LINE/STACK's generates invalid SQL statements
-issue#2604: When adding a dataquery, SQL errors can be generated
-issue#2605: When installing, checking database tables can cause errors
-issue#2608: db_update_table() function should not require an engine type or comment
-issue#2609: When updating from earlier than 1.2, timezone column might not exist
-issue#2610: Data Sources troubleshooter generates warning that each() function is deprecated
-issue#2612: When RRDtool fails to initialize, DSStats generates lots of warnings
-issue#2618: ifAdminStatus in snmp_queries/interfaces.xml
-issue#2621: File paths that accept blanks are not allowing blanks
-issue#2622: Various undefined variables generate errors within database.php
-issue#2623: When using form_text_area(), invalid HTML can be generated
-issue#2627: Some filenames can be lost in log file selection list
-issue#2629: When upgrading, ldap library is not loaded properly due to incorrect paths
-issue#2632: Automated Networks are not being properly replicated to additional pollers
-issue#2635: When running automation scans, database connection should be forced to central database
-issue#2638: Support disabling PHP SNMP extension by mhoran
-issue#2645: Some URLs are incorrectly calculated
-issue#2649: Automation not creating graphs when there are custom items
-issue#2650: Several undefined variables are generating warnings
-issue#2662: HRULE objects broken in some cases
-issue#2668: Trailing parentheses are removed from the SNMP system description
-issue#2672: Cacti Install on Windows Fails
-issue#2676: Skin paper plane not working on iPhone XR
-issue#2678: Call to undefined function _() in data_queries.php
-issue#2679: Users with passwords that do not meet complexity requirements are not redirected to the Change Password page
-issue#2680: Remove deprecated $php_errormsg usage
-issue#2689: Increase boost maximum memory limits
-issue#2693: Graph links do not contain URL path causing links to fail
-issue#2698: Avoid duplicated icon in the main.js of all themes
-issue#2699: Login option "Show the page that user pointed their browser to" does not work properly
-issue#2702: sqltable_to_php.php does not always generate valid table data arrays
-issue#2707: Some pages that have permission errors dont raise proper messages
-issue#2712: PHP memory should be unlimited in scripts that need more memory than the default
-issue#2713: SNMP System Description with UTF8 strings properly are not properly parsed
-issue#2718: When links are converted to ajax calls, mailto links should not be included
-issue#2720: When calculating percentiles, the value is incorrect as the steps are not placed in correct order
-issue#2822: When stderr log file is not populated, clog generates 'empty needle' error
-feature#2538: Allow users to change default method of removing data sources when deleting graphs
-feature#2539: Allow users to set the default graph lock status
-feature#2540: Allow users to enable/disable graph tree history
-feature#2646: Allow application of automation rules on CLI by rb83
-feature#2654: New hook to notify plugins of user profile changes ('auth_profile_update_data')
-feature#2664: Add option to purge spikekill backups
-feature#2701: Provide option to continue graphing objects that loose their index
-feature#2704: Device and template cache do not refresh properly

6 files changed, 355 insertions, 53 deletions

diff --git a/net/cacti/Makefile b/net/cacti/Makefile
index aef749c941f..e0841e70be2 100644
--- a/net/cacti/Makefile
+++ b/net/cacti/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2020/03/10 22:10:43 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2020/04/21 13:42:52 mef Exp $
 
-DISTNAME=	cacti-1.2.3
-PKGREVISION=	5
+DISTNAME=	cacti-1.2.7
 CATEGORIES=	net
 MASTER_SITES=	https://www.cacti.net/downloads/
 
@@ -51,7 +50,8 @@ CACTI_RRADIR?=		${VARBASE}/db/cacti-rra
 REPLACE_INTERPRETER+=	php
 REPLACE.php.old=	.*php[^ ]*
 REPLACE.php.new=	${PREFIX}/bin/php
-REPLACE_FILES.php=	cli/*.php
+REPLACE_FILES.php=	include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules
+
 
 REPLACE_PERL+=		scripts/*.pl
 
@@ -79,14 +79,9 @@ SUBST_VARS.paths+=	PKG_PHP_MAJOR_VERS SH
 
 SUBST_CLASSES+=		perl-xml
 SUBST_STAGE.perl-xml=	pre-configure
-SUBST_FILES.perl-xml=	resource/script_queries/*.xml
+SUBST_FILES.perl-xml=	resource/script_queries/unix_disk.xml
 SUBST_SED.perl-xml=	-e 's,>perl,>${PERL5},'
 
-SUBST_CLASSES+=		docs
-SUBST_STAGE.docs=	pre-configure
-SUBST_FILES.docs=	docs/*.html
-SUBST_SED.docs=		-e 's,/var/www/html/cacti,${CACTIDIR},g'
-
 OWN_DIRS_PERMS+=	${CACTI_LOGDIR} ${CACTI_USER} ${APACHE_GROUP} 775
 OWN_DIRS_PERMS+=	${CACTIDIR}/cache ${CACTI_USER} ${APACHE_GROUP} 775
 OWN_DIRS_PERMS+=	${CACTIDIR}/cache/boost ${CACTI_USER} ${APACHE_GROUP} 775
diff --git a/net/cacti/PLIST b/net/cacti/PLIST
index 80bd9ad4f79..6f3d4042455 100644
--- a/net/cacti/PLIST
+++ b/net/cacti/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.9 2019/04/26 14:52:16 gavan Exp $
+@comment $NetBSD: PLIST,v 1.10 2020/04/21 13:42:52 mef Exp $
 bin/cacti-poller
-share/cacti/.github/ISSUE_TEMPLATE/bug_report.md
-share/cacti/.github/ISSUE_TEMPLATE/feature_request.md
 share/cacti/CHANGELOG
 share/cacti/LICENSE
 share/cacti/README.md
@@ -39,6 +37,7 @@ share/cacti/cli/add_graphs.php
 share/cacti/cli/add_perms.php
 share/cacti/cli/add_tree.php
 share/cacti/cli/analyze_database.php
+share/cacti/cli/apply_automation_rules.php
 share/cacti/cli/audit_database.php
 share/cacti/cli/convert_tables.php
 share/cacti/cli/copy_user.php
@@ -62,7 +61,7 @@ share/cacti/cli/reorder_data_query.php
 share/cacti/cli/repair_database.php
 share/cacti/cli/repair_graphs.php
 share/cacti/cli/repair_templates.php
-share/cacti/cli/splice_rra.php
+share/cacti/cli/splice_rrd.php
 share/cacti/cli/sqltable_to_php.php
 share/cacti/cli/structure_rra_paths.php
 share/cacti/cli/upgrade_database.php
@@ -119,6 +118,7 @@ share/cacti/docs/How-to-Graph-a-Custom-Collection-Script.html
 share/cacti/docs/Import-Template.html
 share/cacti/docs/Install-Under-CentOS_LAMP.html
 share/cacti/docs/Install-Under-CentOS_LEMP.html
+share/cacti/docs/Installing-Under-Ubuntu-Debian.html
 share/cacti/docs/Installing-Under-Windows.html
 share/cacti/docs/Navigating-The-User-Interface.html
 share/cacti/docs/PHP-Script-Server.html
@@ -149,6 +149,7 @@ share/cacti/docs/Table-of-Contents.html
 share/cacti/docs/Templates.html
 share/cacti/docs/Tree-Rules.html
 share/cacti/docs/Trees.html
+share/cacti/docs/Upgrading-Cacti-Under-FreeBSD.html
 share/cacti/docs/Upgrading-Cacti-Under-Windows.html
 share/cacti/docs/Upgrading-Cacti.html
 share/cacti/docs/User-Domains.html
@@ -159,6 +160,9 @@ share/cacti/docs/Variables.html
 share/cacti/docs/Version-Specific-Release-Notes.html
 share/cacti/docs/Viewing-Graphs.html
 share/cacti/docs/audit_schema.sql
+share/cacti/docs/images/Add_Device_screen.png
+share/cacti/docs/images/Device_console_windows.JPG
+share/cacti/docs/images/add_device_button.png
 share/cacti/docs/images/aggregate-templates-edit1.png
 share/cacti/docs/images/aggregate-templates-edit2.png
 share/cacti/docs/images/aggregate-templates-edit3.png
@@ -176,9 +180,11 @@ share/cacti/docs/images/automation-graph-rules-edit3.png
 share/cacti/docs/images/automation-graph-rules-edit4.png
 share/cacti/docs/images/automation-graph-rules-edit5.png
 share/cacti/docs/images/automation-graph-rules.png
+share/cacti/docs/images/automation-network-main.png
 share/cacti/docs/images/automation-networks-edit1.png
 share/cacti/docs/images/automation-networks-edit2.png
 share/cacti/docs/images/automation-networks.png
+share/cacti/docs/images/automation-reachability-settings.png
 share/cacti/docs/images/automation-snmp-options-edit1.png
 share/cacti/docs/images/automation-snmp-options-edit2.png
 share/cacti/docs/images/automation-snmp-options-edit3.png
@@ -190,6 +196,20 @@ share/cacti/docs/images/automation-tree-rules-edit4.png
 share/cacti/docs/images/automation-tree-rules.png
 share/cacti/docs/images/cacti-page-layout.png
 share/cacti/docs/images/cacti-tree-view-page.png
+share/cacti/docs/images/cacti_add_device_site.JPG
+share/cacti/docs/images/cacti_add_sites.JPG
+share/cacti/docs/images/cacti_default_tree.png
+share/cacti/docs/images/cacti_device_datasource.JPG
+share/cacti/docs/images/cacti_graph_managment.JPG
+share/cacti/docs/images/cacti_graph_managment_graph.JPG
+share/cacti/docs/images/cacti_graph_template_options.JPG
+share/cacti/docs/images/cacti_remote_poller_setup.JPG
+share/cacti/docs/images/cacti_sites_automation.JPG
+share/cacti/docs/images/cacti_sites_page.png
+share/cacti/docs/images/cacti_system_utilities.JPG
+share/cacti/docs/images/cacti_thold_enable.JPG
+share/cacti/docs/images/cacti_thold_plugin_install.JPG
+share/cacti/docs/images/cacti_trees_screen.png
 share/cacti/docs/images/cdef-01.preview.png
 share/cacti/docs/images/cdefs-edit1.png
 share/cacti/docs/images/cdefs-edit2.png
@@ -424,6 +444,7 @@ share/cacti/docs/images/system-utilities-viewclog.png
 share/cacti/docs/images/system-utilities-viewdqcache.png
 share/cacti/docs/images/system-utilities-viewpcache.png
 share/cacti/docs/images/system-utilities-viewulog.png
+share/cacti/docs/images/tree_options.png
 share/cacti/docs/images/user-domains-edit1.png
 share/cacti/docs/images/user-domains-edit2.png
 share/cacti/docs/images/user-domains.png
@@ -831,6 +852,7 @@ share/cacti/include/themes/classic/index.php
 share/cacti/include/themes/classic/jquery-ui.css
 share/cacti/include/themes/classic/jquery.colorpicker.css
 share/cacti/include/themes/classic/jquery.multiselect.css
+share/cacti/include/themes/classic/jquery.multiselect.filter.css
 share/cacti/include/themes/classic/jquery.timepicker.css
 share/cacti/include/themes/classic/jquery.zoom.css
 share/cacti/include/themes/classic/main.css
@@ -883,6 +905,7 @@ share/cacti/include/themes/dark/index.php
 share/cacti/include/themes/dark/jquery-ui.css
 share/cacti/include/themes/dark/jquery.colorpicker.css
 share/cacti/include/themes/dark/jquery.multiselect.css
+share/cacti/include/themes/dark/jquery.multiselect.filter.css
 share/cacti/include/themes/dark/jquery.timepicker.css
 share/cacti/include/themes/dark/jquery.zoom.css
 share/cacti/include/themes/dark/main.css
@@ -934,6 +957,7 @@ share/cacti/include/themes/modern/index.php
 share/cacti/include/themes/modern/jquery-ui.css
 share/cacti/include/themes/modern/jquery.colorpicker.css
 share/cacti/include/themes/modern/jquery.multiselect.css
+share/cacti/include/themes/modern/jquery.multiselect.filter.css
 share/cacti/include/themes/modern/jquery.timepicker.css
 share/cacti/include/themes/modern/jquery.zoom.css
 share/cacti/include/themes/modern/main.css
@@ -984,6 +1008,7 @@ share/cacti/include/themes/paper-plane/index.php
 share/cacti/include/themes/paper-plane/jquery-ui.css
 share/cacti/include/themes/paper-plane/jquery.colorpicker.css
 share/cacti/include/themes/paper-plane/jquery.multiselect.css
+share/cacti/include/themes/paper-plane/jquery.multiselect.filter.css
 share/cacti/include/themes/paper-plane/jquery.timepicker.css
 share/cacti/include/themes/paper-plane/jquery.zoom.css
 share/cacti/include/themes/paper-plane/main.css
@@ -1034,6 +1059,7 @@ share/cacti/include/themes/paw/index.php
 share/cacti/include/themes/paw/jquery-ui.css
 share/cacti/include/themes/paw/jquery.colorpicker.css
 share/cacti/include/themes/paw/jquery.multiselect.css
+share/cacti/include/themes/paw/jquery.multiselect.filter.css
 share/cacti/include/themes/paw/jquery.timepicker.css
 share/cacti/include/themes/paw/jquery.zoom.css
 share/cacti/include/themes/paw/main.css
@@ -1084,6 +1110,7 @@ share/cacti/include/themes/sunrise/index.php
 share/cacti/include/themes/sunrise/jquery-ui.css
 share/cacti/include/themes/sunrise/jquery.colorpicker.css
 share/cacti/include/themes/sunrise/jquery.multiselect.css
+share/cacti/include/themes/sunrise/jquery.multiselect.filter.css
 share/cacti/include/themes/sunrise/jquery.timepicker.css
 share/cacti/include/themes/sunrise/jquery.zoom.css
 share/cacti/include/themes/sunrise/main.css
@@ -1093,6 +1120,36 @@ share/cacti/include/themes/sunrise/rrdtheme.php
 share/cacti/include/top_general_header.php
 share/cacti/include/top_graph_header.php
 share/cacti/include/top_header.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/.gitattributes
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/.gitignore
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/LICENSE
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/README.md
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/UNICODE-LICENSE.txt
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules.bat
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/composer.json
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/phpunit.xml
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/Category.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/CldrData.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Docs.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Exporter.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Html.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Json.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Php.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Po.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Prettyjson.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Xml.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/FormulaConverter.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/Language.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/autoloader.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/cldr-data/main/en-US/languages.json
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/cldr-data/main/en-US/scripts.json
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/cldr-data/main/en-US/territories.json
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/src/cldr-data/supplemental/plurals.json
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/tests/Get/GetTest.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/tests/Rules/RulesTest.php
+share/cacti/include/vendor/cldr-to-gettext-plural-rules/tests/bootstrap.php
 share/cacti/include/vendor/csrf/LICENSE
 share/cacti/include/vendor/csrf/NEWS
 share/cacti/include/vendor/csrf/README
@@ -1105,10 +1162,12 @@ share/cacti/include/vendor/flag-icon-css/README.md
 share/cacti/include/vendor/flag-icon-css/assets/docs.css
 share/cacti/include/vendor/flag-icon-css/assets/docs.js
 share/cacti/include/vendor/flag-icon-css/assets/docs.less
+share/cacti/include/vendor/flag-icon-css/assets/index.php
 share/cacti/include/vendor/flag-icon-css/bower.json
 share/cacti/include/vendor/flag-icon-css/composer.json
 share/cacti/include/vendor/flag-icon-css/css/flag-icon.css
 share/cacti/include/vendor/flag-icon-css/css/flag-icon.min.css
+share/cacti/include/vendor/flag-icon-css/css/index.php
 share/cacti/include/vendor/flag-icon-css/flags/1x1/ad.svg
 share/cacti/include/vendor/flag-icon-css/flags/1x1/ae.svg
 share/cacti/include/vendor/flag-icon-css/flags/1x1/af.svg
@@ -1622,6 +1681,7 @@ share/cacti/include/vendor/flag-icon-css/flags/4x3/za.svg
 share/cacti/include/vendor/flag-icon-css/flags/4x3/zm.svg
 share/cacti/include/vendor/flag-icon-css/flags/4x3/zw.svg
 share/cacti/include/vendor/flag-icon-css/index.html
+share/cacti/include/vendor/flag-icon-css/index.php
 share/cacti/include/vendor/flag-icon-css/less/flag-icon-base.less
 share/cacti/include/vendor/flag-icon-css/less/flag-icon-list.less
 share/cacti/include/vendor/flag-icon-css/less/flag-icon-more.less
@@ -1633,10 +1693,240 @@ share/cacti/include/vendor/flag-icon-css/sass/_flag-icon-list.scss
 share/cacti/include/vendor/flag-icon-css/sass/_flag-icon-more.scss
 share/cacti/include/vendor/flag-icon-css/sass/_variables.scss
 share/cacti/include/vendor/flag-icon-css/sass/flag-icon.scss
+share/cacti/include/vendor/flag-icon-css/sass/index.php
 share/cacti/include/vendor/flag-icon-css/svgo.yaml
 share/cacti/include/vendor/flag-icon-css/yarn.lock
+share/cacti/include/vendor/gettext/CHANGELOG.md
+share/cacti/include/vendor/gettext/CONTRIBUTING.md
+share/cacti/include/vendor/gettext/LICENSE
+share/cacti/include/vendor/gettext/README.md
+share/cacti/include/vendor/gettext/composer.json
+share/cacti/include/vendor/gettext/oscarotero.php
+share/cacti/include/vendor/gettext/phpcs.xml
+share/cacti/include/vendor/gettext/phpunit.xml
+share/cacti/include/vendor/gettext/src/BaseTranslator.php
+share/cacti/include/vendor/gettext/src/Extractors/Blade.php
+share/cacti/include/vendor/gettext/src/Extractors/Csv.php
+share/cacti/include/vendor/gettext/src/Extractors/CsvDictionary.php
+share/cacti/include/vendor/gettext/src/Extractors/Extractor.php
+share/cacti/include/vendor/gettext/src/Extractors/ExtractorInterface.php
+share/cacti/include/vendor/gettext/src/Extractors/Jed.php
+share/cacti/include/vendor/gettext/src/Extractors/JsCode.php
+share/cacti/include/vendor/gettext/src/Extractors/Json.php
+share/cacti/include/vendor/gettext/src/Extractors/JsonDictionary.php
+share/cacti/include/vendor/gettext/src/Extractors/Mo.php
+share/cacti/include/vendor/gettext/src/Extractors/PhpArray.php
+share/cacti/include/vendor/gettext/src/Extractors/PhpCode.php
+share/cacti/include/vendor/gettext/src/Extractors/Po.php
+share/cacti/include/vendor/gettext/src/Extractors/Twig.php
+share/cacti/include/vendor/gettext/src/Extractors/VueJs.php
+share/cacti/include/vendor/gettext/src/Extractors/Xliff.php
+share/cacti/include/vendor/gettext/src/Extractors/Yaml.php
+share/cacti/include/vendor/gettext/src/Extractors/YamlDictionary.php
+share/cacti/include/vendor/gettext/src/Generators/Csv.php
+share/cacti/include/vendor/gettext/src/Generators/CsvDictionary.php
+share/cacti/include/vendor/gettext/src/Generators/Generator.php
+share/cacti/include/vendor/gettext/src/Generators/GeneratorInterface.php
+share/cacti/include/vendor/gettext/src/Generators/Jed.php
+share/cacti/include/vendor/gettext/src/Generators/Json.php
+share/cacti/include/vendor/gettext/src/Generators/JsonDictionary.php
+share/cacti/include/vendor/gettext/src/Generators/Mo.php
+share/cacti/include/vendor/gettext/src/Generators/PhpArray.php
+share/cacti/include/vendor/gettext/src/Generators/Po.php
+share/cacti/include/vendor/gettext/src/Generators/Xliff.php
+share/cacti/include/vendor/gettext/src/Generators/Yaml.php
+share/cacti/include/vendor/gettext/src/Generators/YamlDictionary.php
+share/cacti/include/vendor/gettext/src/GettextTranslator.php
+share/cacti/include/vendor/gettext/src/Merge.php
+share/cacti/include/vendor/gettext/src/Translation.php
+share/cacti/include/vendor/gettext/src/Translations.php
+share/cacti/include/vendor/gettext/src/Translator.php
+share/cacti/include/vendor/gettext/src/TranslatorInterface.php
+share/cacti/include/vendor/gettext/src/Utils/CsvTrait.php
+share/cacti/include/vendor/gettext/src/Utils/DictionaryTrait.php
+share/cacti/include/vendor/gettext/src/Utils/FunctionsScanner.php
+share/cacti/include/vendor/gettext/src/Utils/HeadersExtractorTrait.php
+share/cacti/include/vendor/gettext/src/Utils/HeadersGeneratorTrait.php
+share/cacti/include/vendor/gettext/src/Utils/JsFunctionsScanner.php
+share/cacti/include/vendor/gettext/src/Utils/MultidimensionalArrayTrait.php
+share/cacti/include/vendor/gettext/src/Utils/ParsedComment.php
+share/cacti/include/vendor/gettext/src/Utils/ParsedFunction.php
+share/cacti/include/vendor/gettext/src/Utils/PhpFunctionsScanner.php
+share/cacti/include/vendor/gettext/src/Utils/StringReader.php
+share/cacti/include/vendor/gettext/src/autoloader.php
+share/cacti/include/vendor/gettext/src/oscarotero.txt
+share/cacti/include/vendor/gettext/src/translator_functions.php
+share/cacti/include/vendor/gettext/tests/AbstractTest.php
+share/cacti/include/vendor/gettext/tests/AssetsTest.php
+share/cacti/include/vendor/gettext/tests/LocalesTest.php
+share/cacti/include/vendor/gettext/tests/MergeEntriesTest.php
+share/cacti/include/vendor/gettext/tests/MergeHeadersTest.php
+share/cacti/include/vendor/gettext/tests/MergeTranslationsTest.php
+share/cacti/include/vendor/gettext/tests/StringsTest.php
+share/cacti/include/vendor/gettext/tests/TranslationTest.php
+share/cacti/include/vendor/gettext/tests/TranslationsTest.php
+share/cacti/include/vendor/gettext/tests/TranslatorTest.php
+share/cacti/include/vendor/gettext/tests/assets/blade/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/blade/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/blade/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/blade/Json.json
+share/cacti/include/vendor/gettext/tests/assets/blade/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/blade/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/blade/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/blade/Po.po
+share/cacti/include/vendor/gettext/tests/assets/blade/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/blade/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/blade/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/blade/input.php
+share/cacti/include/vendor/gettext/tests/assets/jed/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/jed/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/jed/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/jed/Json.json
+share/cacti/include/vendor/gettext/tests/assets/jed/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/jed/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/jed/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/jed/Po.po
+share/cacti/include/vendor/gettext/tests/assets/jed/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/jed/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/jed/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/jed/input.json
+share/cacti/include/vendor/gettext/tests/assets/jscode/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/jscode/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/jscode/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/jscode/Json.json
+share/cacti/include/vendor/gettext/tests/assets/jscode/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/jscode/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/jscode/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/jscode/Po.po
+share/cacti/include/vendor/gettext/tests/assets/jscode/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/jscode/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/jscode/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/jscode/input.js
+share/cacti/include/vendor/gettext/tests/assets/jscode2/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/jscode2/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/jscode2/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/jscode2/Json.json
+share/cacti/include/vendor/gettext/tests/assets/jscode2/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/jscode2/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/jscode2/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/jscode2/Po.po
+share/cacti/include/vendor/gettext/tests/assets/jscode2/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/jscode2/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/jscode2/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/jscode2/input.js
+share/cacti/include/vendor/gettext/tests/assets/phpcode/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/phpcode/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/phpcode/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode/Json.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/phpcode/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/phpcode/Po.po
+share/cacti/include/vendor/gettext/tests/assets/phpcode/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/phpcode/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/phpcode/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/phpcode/input.php
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/Json.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/Po.po
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/phpcode2/input.php
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/Json.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/Po.po
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/phpcode3/input.php
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/Json.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/Po.po
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/phpcode4/input.php
+share/cacti/include/vendor/gettext/tests/assets/po/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/po/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/po/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/po/Json.json
+share/cacti/include/vendor/gettext/tests/assets/po/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/po/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/po/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/po/Po.po
+share/cacti/include/vendor/gettext/tests/assets/po/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/po/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/po/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/po/input.po
+share/cacti/include/vendor/gettext/tests/assets/po2/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/po2/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/po2/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/po2/Json.json
+share/cacti/include/vendor/gettext/tests/assets/po2/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/po2/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/po2/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/po2/Po.po
+share/cacti/include/vendor/gettext/tests/assets/po2/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/po2/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/po2/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/po2/input.po
+share/cacti/include/vendor/gettext/tests/assets/po3/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/po3/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/po3/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/po3/Json.json
+share/cacti/include/vendor/gettext/tests/assets/po3/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/po3/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/po3/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/po3/Po.po
+share/cacti/include/vendor/gettext/tests/assets/po3/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/po3/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/po3/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/po3/input.po
+share/cacti/include/vendor/gettext/tests/assets/twig/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/twig/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/twig/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/twig/Json.json
+share/cacti/include/vendor/gettext/tests/assets/twig/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/twig/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/twig/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/twig/Po.po
+share/cacti/include/vendor/gettext/tests/assets/twig/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/twig/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/twig/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/twig/input.php
+share/cacti/include/vendor/gettext/tests/assets/vuejs/Csv.csv
+share/cacti/include/vendor/gettext/tests/assets/vuejs/CsvDictionary.csv
+share/cacti/include/vendor/gettext/tests/assets/vuejs/Jed.json
+share/cacti/include/vendor/gettext/tests/assets/vuejs/Json
+share/cacti/include/vendor/gettext/tests/assets/vuejs/Json.json
+share/cacti/include/vendor/gettext/tests/assets/vuejs/JsonDictionary.json
+share/cacti/include/vendor/gettext/tests/assets/vuejs/Mo.mo
+share/cacti/include/vendor/gettext/tests/assets/vuejs/PhpArray.php
+share/cacti/include/vendor/gettext/tests/assets/vuejs/Po.po
+share/cacti/include/vendor/gettext/tests/assets/vuejs/Xliff.xlf
+share/cacti/include/vendor/gettext/tests/assets/vuejs/Yaml.yml
+share/cacti/include/vendor/gettext/tests/assets/vuejs/YamlDictionary.yml
+share/cacti/include/vendor/gettext/tests/assets/vuejs/input.vue
+share/cacti/include/vendor/gettext/tests/bootstrap.php
 share/cacti/include/vendor/index.php
 share/cacti/include/vendor/phpgettext/gettext.php
+share/cacti/include/vendor/phpgettext/index.php
 share/cacti/include/vendor/phpgettext/streams.php
 share/cacti/include/vendor/phpmailer/COMMITMENT
 share/cacti/include/vendor/phpmailer/LICENSE
@@ -1715,22 +2005,34 @@ share/cacti/include/vendor/phpseclib/Crypt/Random.php
 share/cacti/include/vendor/phpseclib/Crypt/Rijndael.php
 share/cacti/include/vendor/phpseclib/Crypt/TripleDES.php
 share/cacti/include/vendor/phpseclib/Crypt/Twofish.php
+share/cacti/include/vendor/phpseclib/Crypt/index.php
 share/cacti/include/vendor/phpseclib/File/ANSI.php
 share/cacti/include/vendor/phpseclib/File/ASN1.php
 share/cacti/include/vendor/phpseclib/File/ASN1/Element.php
+share/cacti/include/vendor/phpseclib/File/ASN1/index.php
 share/cacti/include/vendor/phpseclib/File/X509.php
+share/cacti/include/vendor/phpseclib/File/index.php
 share/cacti/include/vendor/phpseclib/Math/BigInteger.php
+share/cacti/include/vendor/phpseclib/Math/index.php
 share/cacti/include/vendor/phpseclib/Net/SCP.php
 share/cacti/include/vendor/phpseclib/Net/SFTP.php
 share/cacti/include/vendor/phpseclib/Net/SFTP/Stream.php
+share/cacti/include/vendor/phpseclib/Net/SFTP/index.php
 share/cacti/include/vendor/phpseclib/Net/SSH1.php
 share/cacti/include/vendor/phpseclib/Net/SSH2.php
+share/cacti/include/vendor/phpseclib/Net/index.php
 share/cacti/include/vendor/phpseclib/System/SSH/Agent.php
 share/cacti/include/vendor/phpseclib/System/SSH/Agent/Identity.php
+share/cacti/include/vendor/phpseclib/System/SSH/Agent/index.php
+share/cacti/include/vendor/phpseclib/System/SSH/index.php
 share/cacti/include/vendor/phpseclib/System/SSH_Agent.php
+share/cacti/include/vendor/phpseclib/System/index.php
 share/cacti/include/vendor/phpseclib/bootstrap.php
+share/cacti/include/vendor/phpseclib/index.php
 share/cacti/include/vendor/phpseclib/openssl.cnf
 share/cacti/include/vendor/phpsnmp/classSNMP.php
+share/cacti/include/vendor/phpsnmp/extension.php
+share/cacti/include/vendor/phpsnmp/index.php
 share/cacti/include/vendor/phpsnmp/mib_parser.php
 share/cacti/index.php
 share/cacti/install/background.php
@@ -1791,6 +2093,8 @@ share/cacti/install/upgrades/1_2_0.php
 share/cacti/install/upgrades/1_2_1.php
 share/cacti/install/upgrades/1_2_2.php
 share/cacti/install/upgrades/1_2_3.php
+share/cacti/install/upgrades/1_2_5.php
+share/cacti/install/upgrades/1_2_7.php
 share/cacti/install/upgrades/index.php
 share/cacti/lib/aggregate.php
 share/cacti/lib/api_aggregate.php
@@ -1894,6 +2198,7 @@ share/cacti/locales/po/zh-CN.po
 share/cacti/locales/po/zh-TW.po
 share/cacti/locales/update-pot.sh
 share/cacti/log/.htaccess
+share/cacti/log/index.php
 share/cacti/logout.php
 share/cacti/managers.php
 share/cacti/mibs/CACTI-BOOST-MIB
@@ -1922,9 +2227,12 @@ share/cacti/resource/script_queries/host_cpu.xml
 share/cacti/resource/script_queries/host_disk.xml
 share/cacti/resource/script_queries/index.php
 share/cacti/resource/script_queries/unix_disk.xml
+share/cacti/resource/script_server/cpoller.xml
+share/cacti/resource/script_server/gexport.xml
 share/cacti/resource/script_server/host_cpu.xml
 share/cacti/resource/script_server/host_disk.xml
 share/cacti/resource/script_server/index.php
+share/cacti/resource/script_server/webseer.xml
 share/cacti/resource/snmp_queries/host_disk.xml
 share/cacti/resource/snmp_queries/index.php
 share/cacti/resource/snmp_queries/interface.xml
@@ -1941,7 +2249,7 @@ share/cacti/scripts/index.php
 share/cacti/scripts/linux_memory.pl
 share/cacti/scripts/loadavg.pl
 share/cacti/scripts/loadavg_multi.pl
-${PLIST.localmemory}share/cacti/scripts/local_memory.pl
+share/cacti/scripts/local_memory.pl
 share/cacti/scripts/netbsd_memory.pl
 share/cacti/scripts/ping.pl
 share/cacti/scripts/query_host_cpu.php
@@ -1950,13 +2258,17 @@ share/cacti/scripts/query_unix_partitions.pl
 share/cacti/scripts/solaris_memory.pl
 share/cacti/scripts/sql.php
 share/cacti/scripts/ss_count_oids.php
+share/cacti/scripts/ss_cpoller.php
 share/cacti/scripts/ss_fping.php
+share/cacti/scripts/ss_gexport.php
 share/cacti/scripts/ss_host_cpu.php
 share/cacti/scripts/ss_host_disk.php
 share/cacti/scripts/ss_hstats.php
 share/cacti/scripts/ss_net_snmp_disk_bytes.php
 share/cacti/scripts/ss_net_snmp_disk_io.php
+share/cacti/scripts/ss_poller.php
 share/cacti/scripts/ss_sql.php
+share/cacti/scripts/ss_webseer.php
 share/cacti/scripts/unix_processes.pl
 share/cacti/scripts/unix_tcp_connections.pl
 share/cacti/scripts/unix_users.pl
diff --git a/net/cacti/distinfo b/net/cacti/distinfo
index 4a49590010d..51db39bd58b 100644
--- a/net/cacti/distinfo
+++ b/net/cacti/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.10 2019/04/29 16:09:05 hauke Exp $
+$NetBSD: distinfo,v 1.11 2020/04/21 13:42:52 mef Exp $
 
-SHA1 (cacti-1.2.3.tar.gz) = 8f9ef47264cd6fcfe3ad2053c9004cd7100127ae
-RMD160 (cacti-1.2.3.tar.gz) = 32e71256b160edf7b57c1a4a906a976911f3c533
-SHA512 (cacti-1.2.3.tar.gz) = 195d71a6eb08770211c30985ea3b96e2c4f84d91f16617a15e84fab0959a91f1f7923462ea931724a60580757662e01b335490f563d50e6e938c313dcf2044d0
-Size (cacti-1.2.3.tar.gz) = 23977004 bytes
+SHA1 (cacti-1.2.7.tar.gz) = ed2b24c0443d573ecba8686764fb1fd5f2dbb95c
+RMD160 (cacti-1.2.7.tar.gz) = d9a231d07f9994b1213bee326068836bff77bdba
+SHA512 (cacti-1.2.7.tar.gz) = 2fc31342aa23b4fa98e6f3cf6b7e42f8cf98f272232a1bceb1b256b2104ea26445c1be1c1ff83bf20d293a3c1e7a21eb3a871623f78069aea9b21151ac57a243
+Size (cacti-1.2.7.tar.gz) = 24819135 bytes
 SHA1 (patch-cacti.sql) = 7bdfe92fc5254762ec4f75019ca380754f5867d5
 SHA1 (patch-cli_install__cacti.php) = 76d6fc73607902d1863fdc54c4c98171c2817454
 SHA1 (patch-include_global.php) = c115a912c63617a4821690829b46ba7350e03c6b
-SHA1 (patch-include_global__settings.php) = 85247ece53fa08c38a6ac70509b0658fb8d4ee0f
-SHA1 (patch-install_functions.php) = 05fb12e1f034043fba8c9ccba0901b602ca5e828
+SHA1 (patch-include_global__settings.php) = e65425a6564541aa578366454a6a4cd5f8db3afc
+SHA1 (patch-install_functions.php) = dcfc37ca08fdd32b779c1f490bf1ef0bb3f7dc9e
 SHA1 (patch-lib_clog__webapi.php) = f17084d66ef21c4315547c389da6d94795ceeed8
 SHA1 (patch-lib_functions.php) = c29ce98afd2a865d3f307b25003af10bc9e8b13e
-SHA1 (patch-lib_installer.php) = 8d5f23369dc5dcfe8a99a3896a590f8d6f147968
+SHA1 (patch-lib_installer.php) = 8406eb68e394b993246519188ecce9300a173c85
 SHA1 (patch-lib_rrd.php) = 1f97271d4d4832f93b3e312b2d25281d1724aeec
 SHA1 (patch-poller__maintenance.php) = 91ad867cd958835412a652ff50ffb1ad3d1074fa
 SHA1 (patch-utilities.php) = 4a681095225c59f1d9a28408978af7b81a64141a
diff --git a/net/cacti/patches/patch-include_global__settings.php b/net/cacti/patches/patch-include_global__settings.php
index 24124d2eec7..00fe7e90c0c 100644
--- a/net/cacti/patches/patch-include_global__settings.php
+++ b/net/cacti/patches/patch-include_global__settings.php
@@ -1,10 +1,10 @@
-$NetBSD: patch-include_global__settings.php,v 1.3 2019/04/29 16:09:05 hauke Exp $
+$NetBSD: patch-include_global__settings.php,v 1.4 2020/04/21 13:42:52 mef Exp $
 
 make log and rrd directories configurable by package variable
 
---- include/global_settings.php.orig	2019-03-30 23:40:22.000000000 +0000
-+++ include/global_settings.php
-@@ -160,10 +160,10 @@ $settings = array(
+--- include/global_settings.php.orig	2019-09-30 03:36:27.000000000 +0900
++++ include/global_settings.php	2020-04-21 22:18:08.198340988 +0900
+@@ -160,7 +160,7 @@ $settings = array(
  			),
  		'path_cactilog' => array(
  			'friendly_name' => __('Cacti Log Path'),
@@ -12,11 +12,7 @@ make log and rrd directories configurable by package variable
 +			'description' => __('The path to your Cacti log file (if blank, defaults to @CACTI_LOGDIR@/cacti.log)'),
  			'method' => 'filepath',
  			'file_type' => 'ascii',
--			'default' => $config['base_path'] . '/log/cacti.log',
-+			'default' => '@CACTI_LOGDIR@' . '/cacti.log',
- 			'max_length' => '255',
- 			'install_check' => 'writable'
- 			),
+ 			'default' => $config['base_path'] . '/log/cacti.log',
 @@ -172,7 +172,7 @@ $settings = array(
  			'description' => __('If you are having issues with Cacti\'s Data Collectors, set this file path and the Data Collectors standard error will be redirected to this file'),
  			'method' => 'filepath',
diff --git a/net/cacti/patches/patch-install_functions.php b/net/cacti/patches/patch-install_functions.php
index 1577151406d..81e22325313 100644
--- a/net/cacti/patches/patch-install_functions.php
+++ b/net/cacti/patches/patch-install_functions.php
@@ -1,10 +1,10 @@
-$NetBSD: patch-install_functions.php,v 1.1 2019/04/29 16:09:05 hauke Exp $
+$NetBSD: patch-install_functions.php,v 1.2 2020/04/21 13:42:52 mef Exp $
 
 Find utilites in PREFIX first.
 Make log directory configurable by package variable
 
---- install/functions.php.orig	2019-03-30 23:40:23.000000000 +0000
-+++ install/functions.php
+--- install/functions.php.orig	2019-09-30 03:36:29.000000000 +0900
++++ install/functions.php	2020-04-21 22:16:27.694372184 +0900
 @@ -298,8 +298,8 @@ function find_best_path($binary_name) {
  		);
  	} else {
@@ -74,16 +74,15 @@ Make log directory configurable by package variable
  			'win32' => 'c:/spine/bin/spine.exe'
  		));
  
-@@ -533,7 +533,7 @@ function install_file_paths() {
- 	if (!config_value_exists('path_cactilog')) {
- 		$input['path_cactilog'] = $settings['path']['path_cactilog'];
- 		if (empty($input['path_cactilog']['default'])) {
--			$input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
-+			$input['path_cactilog']['default'] = '@CACTI_LOGDIR@' . '/cacti.log';
- 		}
- 	} else {
- 		$input['path_cactilog'] = $settings['path']['path_cactilog'];
-@@ -544,7 +544,7 @@ function install_file_paths() {
+@@ -538,14 +538,14 @@ function install_file_paths() {
+ 	}
+ 
+ 	if (empty($input['path_cactilog']['default'])) {
+-		$input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
++		$input['path_cactilog']['default'] = '@CACTI_LOGDIR@' . '/log/cacti.log';
+ 	}
+ 
+ 	/* stderr log file path */
  	if (!config_value_exists('path_cactilog')) {
  		$input['path_stderrlog'] = $settings['path']['path_stderrlog'];
  		if (empty($input['path_stderrlog']['default'])) {
diff --git a/net/cacti/patches/patch-lib_installer.php b/net/cacti/patches/patch-lib_installer.php
index 51ed31e8ec4..7ee4c09d20d 100644
--- a/net/cacti/patches/patch-lib_installer.php
+++ b/net/cacti/patches/patch-lib_installer.php
@@ -1,9 +1,9 @@
-$NetBSD: patch-lib_installer.php,v 1.2 2019/04/29 16:09:05 hauke Exp $
+$NetBSD: patch-lib_installer.php,v 1.3 2020/04/21 13:42:52 mef Exp $
 
 Make log directory configurable by package variable
 
---- lib/installer.php.orig	2019-03-30 23:40:23.000000000 +0000
-+++ lib/installer.php
+--- lib/installer.php.orig	2019-09-30 03:36:29.000000000 +0900
++++ lib/installer.php	2020-04-21 22:17:18.590745257 +0900
 @@ -465,7 +465,7 @@ class Installer implements JsonSerializa
  
  		$always_paths = array(
@@ -13,12 +13,12 @@ Make log directory configurable by package variable
  			$config['base_path'] . '/cache/boost',
  			$config['base_path'] . '/cache/mibcache',
  			$config['base_path'] . '/cache/realtime',
-@@ -3184,7 +3184,7 @@ class Installer implements JsonSerializa
- 
- 	public static function getInstallLog() {
+@@ -3226,7 +3226,7 @@ class Installer implements JsonSerializa
  		global $config;
--		$logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , 1, $total_rows);
-+		$logcontents = tail_file('@CACTI_LOGDIR@' . '/cacti.log', 100, -1, ' INSTALL:' , 1, $total_rows);
+ 
+ 		$page_nr = 1;
+-		$logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , $page_nr, $total_rows);
++		$logcontents = tail_file($config['base_path'] . '/cacti.log', 100, -1, ' INSTALL:' , $page_nr, $total_rows);
  
  		$output_log = '';
  		foreach ($logcontents as $logline) {