svn commit: r489505 - in head/net-mgmt/cacti: . files
Steve Wills
swills at FreeBSD.org
Sun Jan 6 16:32:06 UTC 2019
Author: swills
Date: Sun Jan 6 16:32:03 2019
New Revision: 489505
URL: https://svnweb.freebsd.org/changeset/ports/489505
Log:
net-mgmt/cacti: update to 1.2.0
PR: 234664
Submitted by: Daniel Austin <freebsd-ports at dan.me.uk> (maintainer)
Added:
head/net-mgmt/cacti/files/patch-lib_installer.php (contents, props changed)
Deleted:
head/net-mgmt/cacti/files/patch-scripts__diskfree.pl
Modified:
head/net-mgmt/cacti/Makefile (contents, props changed)
head/net-mgmt/cacti/distinfo (contents, props changed)
head/net-mgmt/cacti/files/patch-include__global.php (contents, props changed)
head/net-mgmt/cacti/files/patch-include__global_settings.php (contents, props changed)
head/net-mgmt/cacti/files/patch-install__functions.php (contents, props changed)
head/net-mgmt/cacti/files/patch-lib__clog_webapi.php (contents, props changed)
head/net-mgmt/cacti/files/patch-lib__functions.php (contents, props changed)
head/net-mgmt/cacti/files/patch-poller_maintenance.php (contents, props changed)
head/net-mgmt/cacti/pkg-plist (contents, props changed)
Modified: head/net-mgmt/cacti/Makefile
==============================================================================
--- head/net-mgmt/cacti/Makefile Sun Jan 6 16:29:22 2019 (r489504)
+++ head/net-mgmt/cacti/Makefile Sun Jan 6 16:32:03 2019 (r489505)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cacti
-PORTVERSION= 1.1.38
+PORTVERSION= 1.2.0
CATEGORIES= net-mgmt www
MASTER_SITES= http://www.cacti.net/downloads/ \
ftp://ftpmirror.uk/freebsd-ports/cacti/
Modified: head/net-mgmt/cacti/distinfo
==============================================================================
--- head/net-mgmt/cacti/distinfo Sun Jan 6 16:29:22 2019 (r489504)
+++ head/net-mgmt/cacti/distinfo Sun Jan 6 16:32:03 2019 (r489505)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541866898
-SHA256 (cacti-1.1.38.tar.gz) = b6c69056e6b2697ada52cb0498b7c29162ead776e7fa4fbf8156cdcb4769899d
-SIZE (cacti-1.1.38.tar.gz) = 9081347
+TIMESTAMP = 1546745499
+SHA256 (cacti-1.2.0.tar.gz) = 89955877f4d2c2f025f11b5f0bbbd658b89a6f8fb3da94525460c11d787dfdad
+SIZE (cacti-1.2.0.tar.gz) = 23258730
Modified: head/net-mgmt/cacti/files/patch-include__global.php
==============================================================================
--- head/net-mgmt/cacti/files/patch-include__global.php Sun Jan 6 16:29:22 2019 (r489504)
+++ head/net-mgmt/cacti/files/patch-include__global.php Sun Jan 6 16:32:03 2019 (r489505)
@@ -1,6 +1,6 @@
---- include/global.php.orig 2017-08-13 04:06:37 UTC
+--- include/global.php.orig 2019-01-03 02:14:26 UTC
+++ include/global.php
-@@ -139,7 +139,7 @@ if ($config['cacti_server_os'] == 'win32') {
+@@ -173,7 +173,7 @@ if ($config['cacti_server_os'] == 'win32') {
$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
}
$config['include_path'] = dirname(__FILE__);
Modified: head/net-mgmt/cacti/files/patch-include__global_settings.php
==============================================================================
--- head/net-mgmt/cacti/files/patch-include__global_settings.php Sun Jan 6 16:29:22 2019 (r489504)
+++ head/net-mgmt/cacti/files/patch-include__global_settings.php Sun Jan 6 16:32:03 2019 (r489505)
@@ -1,14 +1,15 @@
---- include/global_settings.php.orig 2018-02-26 01:12:03 UTC
+--- include/global_settings.php.orig 2019-01-03 02:14:26 UTC
+++ include/global_settings.php
-@@ -143,9 +143,9 @@ $settings = array(
+@@ -160,10 +160,10 @@ $settings = array(
),
'path_cactilog' => array(
'friendly_name' => __('Cacti Log Path'),
- 'description' => __('The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)'),
+ 'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'),
'method' => 'filepath',
+ 'file_type' => 'ascii',
- 'default' => $config['base_path'] . '/log/cacti.log',
-+ 'default' => '/var/log/cacti/log',
- 'max_length' => '255'
++ 'default' => /var/log/cacti/log',
+ 'max_length' => '255',
+ 'install_check' => 'writable'
),
- 'logrotate_enabled' => array(
Modified: head/net-mgmt/cacti/files/patch-install__functions.php
==============================================================================
--- head/net-mgmt/cacti/files/patch-install__functions.php Sun Jan 6 16:29:22 2019 (r489504)
+++ head/net-mgmt/cacti/files/patch-install__functions.php Sun Jan 6 16:32:03 2019 (r489505)
@@ -1,11 +1,11 @@
---- install/functions.php.orig 2017-08-13 04:06:37 UTC
+--- install/functions.php.orig 2019-01-03 02:14:26 UTC
+++ install/functions.php
-@@ -432,7 +432,7 @@ function install_file_paths () {
- if (config_value_exists('path_cactilog')) {
- $input['path_cactilog']['default'] = read_config_option('path_cactilog');
- } else {
+@@ -528,7 +528,7 @@ function install_file_paths() {
+ /* log file path */
+ $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'] = '/var/log/cacti/log';
}
- /* Theme */
+ /* stderr log file path */
Modified: head/net-mgmt/cacti/files/patch-lib__clog_webapi.php
==============================================================================
--- head/net-mgmt/cacti/files/patch-lib__clog_webapi.php Sun Jan 6 16:29:22 2019 (r489504)
+++ head/net-mgmt/cacti/files/patch-lib__clog_webapi.php Sun Jan 6 16:32:03 2019 (r489505)
@@ -1,20 +1,11 @@
---- lib/clog_webapi.php.orig 2017-08-13 04:06:37 UTC
+--- lib/clog_webapi.php.orig 2019-01-03 02:14:26 UTC
+++ lib/clog_webapi.php
-@@ -42,7 +42,7 @@ function clog_purge_logfile() {
- $logfile = read_config_option('path_cactilog');
+@@ -56,7 +56,7 @@ function clog_validate_filename(&$file, &$filepath, &$
+ $logbase = basename($logfile);
if ($logfile == '') {
- $logfile = $config['base_path'] . '/log/cacti.log';
+ $logfile = '/var/log/cacti/log';
}
- $purgefile = dirname($logfile) . '/' . get_nfilter_request_var('filename');
-@@ -85,7 +85,7 @@ function clog_view_logfile() {
- $logfile = $requestedFile;
- }
- } elseif ($logfile == '') {
-- $logfile = $config['base_path'] . '/log/cacti.log';
-+ $logfile = '/var/log/cacti/log';
- }
-
- /* ================= input validation and session storage ================= */
+ $errfile = read_config_option('path_stderrlog');
Modified: head/net-mgmt/cacti/files/patch-lib__functions.php
==============================================================================
--- head/net-mgmt/cacti/files/patch-lib__functions.php Sun Jan 6 16:29:22 2019 (r489504)
+++ head/net-mgmt/cacti/files/patch-lib__functions.php Sun Jan 6 16:32:03 2019 (r489505)
@@ -1,11 +1,11 @@
---- lib/functions.php.orig 2017-08-13 04:06:37 UTC
+--- lib/functions.php.orig 2019-01-03 02:14:26 UTC
+++ lib/functions.php
-@@ -615,7 +615,7 @@ function cacti_log($string, $output = false, $environ
- /* Log to Logfile */
- if (($logdestination == 1 || $logdestination == 2) && read_config_option('log_verbosity') != POLLER_VERBOSITY_NONE) {
- if ($logfile == '') {
-- $logfile = $config['base_path'] . '/log/cacti.log';
-+ $logfile = '/var/log/cacti/log';
- }
-
- /* echo the data to the log (append) */
+@@ -818,7 +818,7 @@ function cacti_log_file() {
+ global $config;
+ $logfile = read_config_option('path_cactilog');
+ if ($logfile == '') {
+- $logfile = $config['base_path'] . '/log/cacti.log';
++ $logfile = '/var/log/cacti/log';
+ }
+ $config['log_path'] = $logfile;
+ return $logfile;
Added: head/net-mgmt/cacti/files/patch-lib_installer.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/cacti/files/patch-lib_installer.php Sun Jan 6 16:32:03 2019 (r489505)
@@ -0,0 +1,11 @@
+--- lib/installer.php.orig 2019-01-06 07:22:22 UTC
++++ lib/installer.php
+@@ -3222,7 +3222,7 @@ class Installer implements JsonSerializable {
+
+ public static function getInstallLog() {
+ global $config;
+- $logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , 1, $total_rows);
++ $logcontents = tail_file('/var/log/cacti/log', 100, -1, ' INSTALL:' , 1, $total_rows);
+
+ $output_log = '';
+ foreach ($logcontents as $logline) {
Modified: head/net-mgmt/cacti/files/patch-poller_maintenance.php
==============================================================================
--- head/net-mgmt/cacti/files/patch-poller_maintenance.php Sun Jan 6 16:29:22 2019 (r489504)
+++ head/net-mgmt/cacti/files/patch-poller_maintenance.php Sun Jan 6 16:32:03 2019 (r489505)
@@ -1,11 +1,11 @@
---- poller_maintenance.php.orig 2018-02-26 01:12:04 UTC
+--- poller_maintenance.php.orig 2019-01-03 02:14:26 UTC
+++ poller_maintenance.php
-@@ -223,7 +223,7 @@ function logrotate_rotatenow () {
-
+@@ -227,7 +227,7 @@ function logrotate_rotatenow() {
+ $logs = array();
$log = read_config_option('path_cactilog');
- if ($log == '') {
+ if (empty($log)) {
- $log = $config['base_path'] . '/log/cacti.log';
+ $log = '/var/log/cacti/log';
}
+ $logs['Cacti'] = $log;
- $run_time = time();
Modified: head/net-mgmt/cacti/pkg-plist
==============================================================================
--- head/net-mgmt/cacti/pkg-plist Sun Jan 6 16:29:22 2019 (r489504)
+++ head/net-mgmt/cacti/pkg-plist Sun Jan 6 16:32:03 2019 (r489505)
@@ -1,3 +1,4 @@
+%%CACTIDIR%%/CHANGELOG
%%CACTIDIR%%/LICENSE
%%CACTIDIR%%/README.md
%%CACTIDIR%%/about.php
@@ -23,11 +24,12 @@
%%CACTIDIR%%/cache/realtime/index.php
%%CACTIDIR%%/cache/spikekill/.htaccess
%%CACTIDIR%%/cache/spikekill/index.php
-%%CACTIDIR%%/%%CACTIUSER%%.sql
+%%CACTIDIR%%/cacti.sql
%%CACTIDIR%%/cdef.php
%%CACTIDIR%%/cli/.htaccess
%%CACTIDIR%%/cli/index.php
%%CACTIDIR%%/cli/add_data_query.php
+%%CACTIDIR%%/cli/add_datasource.php
%%CACTIDIR%%/cli/add_device.php
%%CACTIDIR%%/cli/add_graph_template.php
%%CACTIDIR%%/cli/add_graphs.php
@@ -35,23 +37,28 @@
%%CACTIDIR%%/cli/add_tree.php
%%CACTIDIR%%/cli/analyze_database.php
%%CACTIDIR%%/cli/audit_database.php
-%%CACTIDIR%%/cli/convert_innodb.php
+%%CACTIDIR%%/cli/convert_tables.php
%%CACTIDIR%%/cli/copy_user.php
-%%CACTIDIR%%/cli/data_template_associate_rra.php
%%CACTIDIR%%/cli/host_update_template.php
%%CACTIDIR%%/cli/import_package.php
+%%CACTIDIR%%/cli/input_whitelist.php
+%%CACTIDIR%%/cli/install_cacti.php
%%CACTIDIR%%/cli/md5sum.php
%%CACTIDIR%%/cli/import_template.php
%%CACTIDIR%%/cli/poller_data_sources_reapply_names.php
%%CACTIDIR%%/cli/poller_graphs_reapply_names.php
%%CACTIDIR%%/cli/poller_output_empty.php
%%CACTIDIR%%/cli/poller_reindex_hosts.php
+%%CACTIDIR%%/cli/poller_replicate.php
%%CACTIDIR%%/cli/rebuild_poller_cache.php
%%CACTIDIR%%/cli/remove_device.php
+%%CACTIDIR%%/cli/remove_graphs.php
%%CACTIDIR%%/cli/removespikes.php
%%CACTIDIR%%/cli/reorder_data_query.php
%%CACTIDIR%%/cli/repair_database.php
+%%CACTIDIR%%/cli/repair_graphs.php
%%CACTIDIR%%/cli/repair_templates.php
+%%CACTIDIR%%/cli/splice_rra.php
%%CACTIDIR%%/cli/sqltable_to_php.php
%%CACTIDIR%%/cli/structure_rra_paths.php
%%CACTIDIR%%/cli/upgrade_database.php
@@ -62,116 +69,394 @@
%%CACTIDIR%%/color.php
%%CACTIDIR%%/color_templates.php
%%CACTIDIR%%/color_templates_items.php
+%%CACTIDIR%%/data_debug.php
%%CACTIDIR%%/data_input.php
%%CACTIDIR%%/data_queries.php
%%CACTIDIR%%/data_sources.php
%%CACTIDIR%%/data_source_profiles.php
%%CACTIDIR%%/data_templates.php
-%%CACTIDIR%%/docs/CHANGELOG
-%%CACTIDIR%%/docs/html/LICENSE.html
-%%CACTIDIR%%/docs/html/advanced-topics.html
-%%CACTIDIR%%/docs/html/basics.html
-%%CACTIDIR%%/docs/html/batch-copy-users.html
-%%CACTIDIR%%/docs/html/bsd-ports.html
-%%CACTIDIR%%/docs/html/%%CACTIUSER%%-help.html
-%%CACTIDIR%%/docs/html/cdefs.html
-%%CACTIDIR%%/docs/html/check-%%CACTIUSER%%-poller.html
-%%CACTIDIR%%/docs/html/check-data-gathering.html
-%%CACTIDIR%%/docs/html/check-mysql-updating.html
-%%CACTIDIR%%/docs/html/check-rrd-graph.html
-%%CACTIDIR%%/docs/html/check-rrd-numbers.html
-%%CACTIDIR%%/docs/html/check-rrd-owner.html
-%%CACTIDIR%%/docs/html/check-rrd-updating.html
-%%CACTIDIR%%/docs/html/check-zero-values.html
-%%CACTIDIR%%/docs/html/cli-add-data-query.html
-%%CACTIDIR%%/docs/html/cli-add-device.html
-%%CACTIDIR%%/docs/html/cli-add-graph-template.html
-%%CACTIDIR%%/docs/html/cli-add-graphs.html
-%%CACTIDIR%%/docs/html/cli-add-perms.html
-%%CACTIDIR%%/docs/html/cli-add-tree.html
-%%CACTIDIR%%/docs/html/cli-copy-user.html
-%%CACTIDIR%%/docs/html/cli-poller-graphs-reapply-names.html
-%%CACTIDIR%%/docs/html/cli-poller-output-empty.html
-%%CACTIDIR%%/docs/html/cli-poller-reindex-hosts.html
-%%CACTIDIR%%/docs/html/copying-user.html
-%%CACTIDIR%%/docs/html/create-new-user.html
-%%CACTIDIR%%/docs/html/data-input-methods.html
-%%CACTIDIR%%/docs/html/data-presentation.html
-%%CACTIDIR%%/docs/html/data-queries.html
-%%CACTIDIR%%/docs/html/data-storage.html
-%%CACTIDIR%%/docs/html/debug-miscellaneous.html
-%%CACTIDIR%%/docs/html/debug-rpm-installation.html
-%%CACTIDIR%%/docs/html/debugging.html
-%%CACTIDIR%%/docs/html/delete-users.html
-%%CACTIDIR%%/docs/html/enable-disable-users.html
-%%CACTIDIR%%/docs/html/faq.html
-%%CACTIDIR%%/docs/html/graph-howto.html
-%%CACTIDIR%%/docs/html/graph-overview.html
-%%CACTIDIR%%/docs/html/graph-snmp-oid.html
-%%CACTIDIR%%/docs/html/graph-templates.html
-%%CACTIDIR%%/docs/html/graph-viewing.html
-%%CACTIDIR%%/docs/html/guest-access.html
-%%CACTIDIR%%/docs/html/host-templates.html
-%%CACTIDIR%%/docs/html/host-variables.html
-%%CACTIDIR%%/docs/html/how-to.html
-%%CACTIDIR%%/docs/html/images/data_source_title_example1.png
-%%CACTIDIR%%/docs/html/images/data_source_title_example2.png
-%%CACTIDIR%%/docs/html/images/data_source_title_template.png
-%%CACTIDIR%%/docs/html/images/data_template.png
-%%CACTIDIR%%/docs/html/images/export_template.png
-%%CACTIDIR%%/docs/html/images/graph_template.png
-%%CACTIDIR%%/docs/html/images/graph_tree.png
-%%CACTIDIR%%/docs/html/images/host_template.png
-%%CACTIDIR%%/docs/html/images/import_template.png
-%%CACTIDIR%%/docs/html/images/new_device.png
-%%CACTIDIR%%/docs/html/images/new_graphs.png
-%%CACTIDIR%%/docs/html/images/principles_of_operation.png
-%%CACTIDIR%%/docs/html/images/user_management_batch_copy_1.png
-%%CACTIDIR%%/docs/html/images/user_management_batch_copy_2.png
-%%CACTIDIR%%/docs/html/images/user_management_copy_1.png
-%%CACTIDIR%%/docs/html/images/user_management_copy_2.png
-%%CACTIDIR%%/docs/html/images/user_management_delete_1.png
-%%CACTIDIR%%/docs/html/images/user_management_delete_2.png
-%%CACTIDIR%%/docs/html/images/user_management_edit.png
-%%CACTIDIR%%/docs/html/images/user_management_enable_disable_1.png
-%%CACTIDIR%%/docs/html/images/user_management_enable_disable_2.png
-%%CACTIDIR%%/docs/html/images/user_management_list.png
-%%CACTIDIR%%/docs/html/images/user_management_new.png
-%%CACTIDIR%%/docs/html/index.html
-%%CACTIDIR%%/docs/html/install-unix.html
-%%CACTIDIR%%/docs/html/install-windows.html
-%%CACTIDIR%%/docs/html/installation.html
-%%CACTIDIR%%/docs/html/making-scripts-work-with-%%CACTIUSER%%.html
-%%CACTIDIR%%/docs/html/migration-php-scripts-to-script-server.html
-%%CACTIDIR%%/docs/html/new-graphs.html
-%%CACTIDIR%%/docs/html/operating-principles.html
-%%CACTIDIR%%/docs/html/php-script-server.html
-%%CACTIDIR%%/docs/html/reference.html
-%%CACTIDIR%%/docs/html/requirements.html
-%%CACTIDIR%%/docs/html/rrdtool-features.html
-%%CACTIDIR%%/docs/html/script-query-xml.html
-%%CACTIDIR%%/docs/html/scripts.html
-%%CACTIDIR%%/docs/html/snmp-query-xml.html
-%%CACTIDIR%%/docs/html/template-export.html
-%%CACTIDIR%%/docs/html/template-import.html
-%%CACTIDIR%%/docs/html/templates.html
-%%CACTIDIR%%/docs/html/testing-script-in-script-server.html
-%%CACTIDIR%%/docs/html/unix-configure-%%CACTIUSER%%.html
-%%CACTIDIR%%/docs/html/unix-configure-httpd.html
-%%CACTIDIR%%/docs/html/unix-configure-mysql.html
-%%CACTIDIR%%/docs/html/unix-configure-php.html
-%%CACTIDIR%%/docs/html/unix-configure-spine.html
-%%CACTIDIR%%/docs/html/upgrade-using-hostmib-data-queries.html
-%%CACTIDIR%%/docs/html/upgrade.html
-%%CACTIDIR%%/docs/html/user-management.html
-%%CACTIDIR%%/docs/html/using-spine.html
-%%CACTIDIR%%/docs/html/variables.html
+%%CACTIDIR%%/docs/Aggregate-Templates.html
+%%CACTIDIR%%/docs/Aggregates.html
+%%CACTIDIR%%/docs/Automation-Networks.html
+%%CACTIDIR%%/docs/CDEFs.html
+%%CACTIDIR%%/docs/Cacti-Github.css
+%%CACTIDIR%%/docs/Color-Templates.html
+%%CACTIDIR%%/docs/Colors.html
+%%CACTIDIR%%/docs/Command-Line-Scripts.html
+%%CACTIDIR%%/docs/Contributing-Translations.html
+%%CACTIDIR%%/docs/Contributing.html
+%%CACTIDIR%%/docs/Data-Collectors.html
+%%CACTIDIR%%/docs/Data-Debug.html
+%%CACTIDIR%%/docs/Data-Input-Methods.html
+%%CACTIDIR%%/docs/Data-Profiles.html
+%%CACTIDIR%%/docs/Data-Queries.html
+%%CACTIDIR%%/docs/Data-Source-Templates.html
+%%CACTIDIR%%/docs/Data-Sources.html
+%%CACTIDIR%%/docs/Debugging.html
+%%CACTIDIR%%/docs/Device-Rules.html
+%%CACTIDIR%%/docs/Device-Templates.html
+%%CACTIDIR%%/docs/Devices.html
+%%CACTIDIR%%/docs/Discovered-Devices.html
+%%CACTIDIR%%/docs/Export-Template.html
+%%CACTIDIR%%/docs/External-Links.html
+%%CACTIDIR%%/docs/Frequently-Asked-Questions.html
+%%CACTIDIR%%/docs/GPRINTs.html
+%%CACTIDIR%%/docs/General-Installing-Instructions.html
+%%CACTIDIR%%/docs/Graph-Overview.html
+%%CACTIDIR%%/docs/Graph-Rules.html
+%%CACTIDIR%%/docs/Graph-Templates.html
+%%CACTIDIR%%/docs/Graph-a-Single-SNMP-OID.html
+%%CACTIDIR%%/docs/Graphs.html
+%%CACTIDIR%%/docs/How-To-Data-Query-Templates.html
+%%CACTIDIR%%/docs/How-To-Determine-Template-Version.html
+%%CACTIDIR%%/docs/How-To-SSH-Tunnels.html
+%%CACTIDIR%%/docs/How-to-Graph-Your-Network.html
+%%CACTIDIR%%/docs/How-to-Graph-a-Custom-Collection-Script.html
+%%CACTIDIR%%/docs/Import-Template.html
+%%CACTIDIR%%/docs/Install-Under-CentOS_LAMP.html
+%%CACTIDIR%%/docs/Install-Under-CentOS_LEMP.html
+%%CACTIDIR%%/docs/Installing-Under-Windows.html
+%%CACTIDIR%%/docs/Navigating-The-User-Interface.html
+%%CACTIDIR%%/docs/PHP-Script-Server.html
+%%CACTIDIR%%/docs/Plugin-Creating-Plugins.html
+%%CACTIDIR%%/docs/Plugin-Development.html
+%%CACTIDIR%%/docs/Plugin-Guidelines.html
+%%CACTIDIR%%/docs/Plugin-Hook-API-Ref.html
+%%CACTIDIR%%/docs/Plugin-Reference.html
+%%CACTIDIR%%/docs/Plugins.html
+%%CACTIDIR%%/docs/Principles-of-Operation.html
+%%CACTIDIR%%/docs/RRDTool-Specific-Features.html
+%%CACTIDIR%%/docs/Requirements.html
+%%CACTIDIR%%/docs/SNMP-Data-Queries-Walkthrough.html
+%%CACTIDIR%%/docs/SNMP-New-Data-Query-Walkthrough.html
+%%CACTIDIR%%/docs/SNMP-Options.html
+%%CACTIDIR%%/docs/Script-Data-Query-Walkthrough.html
+%%CACTIDIR%%/docs/Sites.html
+%%CACTIDIR%%/docs/Spine.html
+%%CACTIDIR%%/docs/Standards-Code-Formatting.html
+%%CACTIDIR%%/docs/Standards-Documentation.html
+%%CACTIDIR%%/docs/Standards-FileSystem-Layout.html
+%%CACTIDIR%%/docs/Standards-PHP-Spec-Constructs.html
+%%CACTIDIR%%/docs/Standards-Patch-Creation.html
+%%CACTIDIR%%/docs/Standards-SQL.html
+%%CACTIDIR%%/docs/Standards-Security.html
+%%CACTIDIR%%/docs/System-Utilities.html
+%%CACTIDIR%%/docs/Table-of-Contents.html
+%%CACTIDIR%%/docs/Templates.html
+%%CACTIDIR%%/docs/Tree-Rules.html
+%%CACTIDIR%%/docs/Trees.html
+%%CACTIDIR%%/docs/Upgrading-Cacti-Under-Windows.html
+%%CACTIDIR%%/docs/Upgrading-Cacti.html
+%%CACTIDIR%%/docs/User-Domains.html
+%%CACTIDIR%%/docs/User-Group-Management.html
+%%CACTIDIR%%/docs/User-Management.html
+%%CACTIDIR%%/docs/VDEFs.html
+%%CACTIDIR%%/docs/Variables.html
+%%CACTIDIR%%/docs/Version-Specific-Release-Notes.html
+%%CACTIDIR%%/docs/Viewing-Graphs.html
+%%CACTIDIR%%/docs/images/aggregate-templates-edit1.png
+%%CACTIDIR%%/docs/images/aggregate-templates-edit2.png
+%%CACTIDIR%%/docs/images/aggregate-templates-edit3.png
+%%CACTIDIR%%/docs/images/aggregate-templates-edit4.png
+%%CACTIDIR%%/docs/images/aggregate-templates-edit5.png
+%%CACTIDIR%%/docs/images/aggregate-templates-edit6.png
+%%CACTIDIR%%/docs/images/aggregate-templates-edit7.png
+%%CACTIDIR%%/docs/images/aggregate-templates.png
+%%CACTIDIR%%/docs/images/automation-device-templates-edit1.png
+%%CACTIDIR%%/docs/images/automation-device-templates.png
+%%CACTIDIR%%/docs/images/automation-devices.png
+%%CACTIDIR%%/docs/images/automation-graph-rules-edit1.png
+%%CACTIDIR%%/docs/images/automation-graph-rules-edit2.png
+%%CACTIDIR%%/docs/images/automation-graph-rules-edit3.png
+%%CACTIDIR%%/docs/images/automation-graph-rules-edit4.png
+%%CACTIDIR%%/docs/images/automation-graph-rules-edit5.png
+%%CACTIDIR%%/docs/images/automation-graph-rules.png
+%%CACTIDIR%%/docs/images/automation-networks-edit1.png
+%%CACTIDIR%%/docs/images/automation-networks-edit2.png
+%%CACTIDIR%%/docs/images/automation-networks.png
+%%CACTIDIR%%/docs/images/automation-snmp-options-edit1.png
+%%CACTIDIR%%/docs/images/automation-snmp-options-edit2.png
+%%CACTIDIR%%/docs/images/automation-snmp-options-edit3.png
+%%CACTIDIR%%/docs/images/automation-snmp-options.png
+%%CACTIDIR%%/docs/images/automation-tree-rules-edit1.png
+%%CACTIDIR%%/docs/images/automation-tree-rules-edit2.png
+%%CACTIDIR%%/docs/images/automation-tree-rules-edit3.png
+%%CACTIDIR%%/docs/images/automation-tree-rules-edit4.png
+%%CACTIDIR%%/docs/images/automation-tree-rules.png
+%%CACTIDIR%%/docs/images/cacti-page-layout.png
+%%CACTIDIR%%/docs/images/cacti-tree-view-page.png
+%%CACTIDIR%%/docs/images/cdef-01.preview.png
+%%CACTIDIR%%/docs/images/cdefs-edit1.png
+%%CACTIDIR%%/docs/images/cdefs-edit2.png
+%%CACTIDIR%%/docs/images/cdefs-edit3.png
+%%CACTIDIR%%/docs/images/cdefs.png
+%%CACTIDIR%%/docs/images/color-templates-edit1.png
+%%CACTIDIR%%/docs/images/color-templates-edit2.png
+%%CACTIDIR%%/docs/images/color-templates.png
+%%CACTIDIR%%/docs/images/colors-edit1.png
+%%CACTIDIR%%/docs/images/colors-edit2.png
+%%CACTIDIR%%/docs/images/colors.png
+%%CACTIDIR%%/docs/images/data-collectors-edit-main.png
+%%CACTIDIR%%/docs/images/data-collectors-edit-remote1.png
+%%CACTIDIR%%/docs/images/data-collectors-edit-remote2.png
+%%CACTIDIR%%/docs/images/data-collectors.png
+%%CACTIDIR%%/docs/images/data-debug.png
+%%CACTIDIR%%/docs/images/data-debug1.png
+%%CACTIDIR%%/docs/images/data-debug2.PNG
+%%CACTIDIR%%/docs/images/data-debug3.png
+%%CACTIDIR%%/docs/images/data-debug4.png
+%%CACTIDIR%%/docs/images/data-input-method-and-query.png
+%%CACTIDIR%%/docs/images/data-input-methods-edit1.png
+%%CACTIDIR%%/docs/images/data-input-methods-edit2.png
+%%CACTIDIR%%/docs/images/data-input-methods-edit3.png
+%%CACTIDIR%%/docs/images/data-input-methods.png
+%%CACTIDIR%%/docs/images/data-queries-edit1.png
+%%CACTIDIR%%/docs/images/data-queries-edit2.png
+%%CACTIDIR%%/docs/images/data-queries.png
+%%CACTIDIR%%/docs/images/data-source-profiles-edit1.png
+%%CACTIDIR%%/docs/images/data-source-profiles-edit2.png
+%%CACTIDIR%%/docs/images/data-source-profiles.png
+%%CACTIDIR%%/docs/images/data-source-title-example1.png
+%%CACTIDIR%%/docs/images/data-source-title-example2.png
+%%CACTIDIR%%/docs/images/data-source-title-template.png
+%%CACTIDIR%%/docs/images/data-template.png
+%%CACTIDIR%%/docs/images/data-templates-copy.png
+%%CACTIDIR%%/docs/images/data-templates-new.png
+%%CACTIDIR%%/docs/images/data-templates-new1.png
+%%CACTIDIR%%/docs/images/data-templates-new2.png
+%%CACTIDIR%%/docs/images/data-templates-view-edit1.png
+%%CACTIDIR%%/docs/images/data-templates-view-edit2.png
+%%CACTIDIR%%/docs/images/data-templates-view.png
+%%CACTIDIR%%/docs/images/data-templates.png
+%%CACTIDIR%%/docs/images/dc-01.preview.png
+%%CACTIDIR%%/docs/images/dev-01.preview.png
+%%CACTIDIR%%/docs/images/dev-02.preview.png
+%%CACTIDIR%%/docs/images/dev-03.preview.png
+%%CACTIDIR%%/docs/images/dev-10.preview.png
+%%CACTIDIR%%/docs/images/dev-11.preview.png
+%%CACTIDIR%%/docs/images/dev-12.preview.png
+%%CACTIDIR%%/docs/images/dev-13.preview.png
+%%CACTIDIR%%/docs/images/dev-20.preview.png
+%%CACTIDIR%%/docs/images/dev-21.preview.png
+%%CACTIDIR%%/docs/images/dev-30.png
+%%CACTIDIR%%/docs/images/dev-31.preview.png
+%%CACTIDIR%%/docs/images/dev-dev-10.preview.png
+%%CACTIDIR%%/docs/images/dev-dev-11_0.preview.png
+%%CACTIDIR%%/docs/images/dev-dev-12.preview.png
+%%CACTIDIR%%/docs/images/dev-dev-13.png
+%%CACTIDIR%%/docs/images/dev-dev-14.png
+%%CACTIDIR%%/docs/images/dev-dq-01.preview.png
+%%CACTIDIR%%/docs/images/dev-dq-02.preview.png
+%%CACTIDIR%%/docs/images/dev-dq-03.preview.png
+%%CACTIDIR%%/docs/images/dev-dq-20.preview.png
+%%CACTIDIR%%/docs/images/dev-dq-21.preview.png
+%%CACTIDIR%%/docs/images/dev-dq-22.preview.png
+%%CACTIDIR%%/docs/images/dev-dq-23.png
+%%CACTIDIR%%/docs/images/dev-dq-24.preview.png
+%%CACTIDIR%%/docs/images/dev-dq-25.preview.png
+%%CACTIDIR%%/docs/images/dev-dq-26.preview.png
+%%CACTIDIR%%/docs/images/dev-dt-01.preview.png
+%%CACTIDIR%%/docs/images/dev-dt-02.preview.png
+%%CACTIDIR%%/docs/images/dev-dt-03.png
+%%CACTIDIR%%/docs/images/dev-dt-04.preview.png
+%%CACTIDIR%%/docs/images/dev-dt-05.png
+%%CACTIDIR%%/docs/images/dev-gt-01.preview.png
+%%CACTIDIR%%/docs/images/dev-gt-02.png
+%%CACTIDIR%%/docs/images/dev-gt-04_0.preview.png
+%%CACTIDIR%%/docs/images/dev-gt-05.preview.png
+%%CACTIDIR%%/docs/images/dev-gt-06.preview.png
+%%CACTIDIR%%/docs/images/dev-gt-07.png
+%%CACTIDIR%%/docs/images/dev-gt-08.png
+%%CACTIDIR%%/docs/images/dev-gt-09.preview.png
+%%CACTIDIR%%/docs/images/dev-gt-10.preview.png
+%%CACTIDIR%%/docs/images/dev-gt-11.preview.png
+%%CACTIDIR%%/docs/images/dev-gt-12.png
+%%CACTIDIR%%/docs/images/dev-gt-13.png
+%%CACTIDIR%%/docs/images/dev-gt-14.preview.png
+%%CACTIDIR%%/docs/images/device-template-add.png
+%%CACTIDIR%%/docs/images/device-template-new-dqs.png
+%%CACTIDIR%%/docs/images/device-template-new-gt.png
+%%CACTIDIR%%/docs/images/device-template-new-gts.png
+%%CACTIDIR%%/docs/images/device-template-new.png
+%%CACTIDIR%%/docs/images/device-template.png
+%%CACTIDIR%%/docs/images/device-templates-edit.png
+%%CACTIDIR%%/docs/images/device-templates-ssh-add-device.png
+%%CACTIDIR%%/docs/images/device-templates-ssh-tunnel.png
+%%CACTIDIR%%/docs/images/device-templates.png
+%%CACTIDIR%%/docs/images/dim-add01.preview.png
+%%CACTIDIR%%/docs/images/dim-add02.preview.png
+%%CACTIDIR%%/docs/images/dim-add03.preview.png
+%%CACTIDIR%%/docs/images/dim-add04.png
+%%CACTIDIR%%/docs/images/dim-add05.png
+%%CACTIDIR%%/docs/images/dim-add06.preview.png
+%%CACTIDIR%%/docs/images/dim-add07.png
+%%CACTIDIR%%/docs/images/dim-add08.preview.png
+%%CACTIDIR%%/docs/images/dim-add09.preview.png
+%%CACTIDIR%%/docs/images/dim-add10.preview.png
+%%CACTIDIR%%/docs/images/dim-add11.preview.png
+%%CACTIDIR%%/docs/images/dim-add12.preview.png
+%%CACTIDIR%%/docs/images/dim-add13.preview.png
+%%CACTIDIR%%/docs/images/dim-add14.preview.png
+%%CACTIDIR%%/docs/images/dim-add15.preview.png
+%%CACTIDIR%%/docs/images/dim-add16.preview.png
+%%CACTIDIR%%/docs/images/dq-01.preview.png
+%%CACTIDIR%%/docs/images/dq-02.preview.png
+%%CACTIDIR%%/docs/images/dq-03.preview.png
+%%CACTIDIR%%/docs/images/dq-10.preview.png
+%%CACTIDIR%%/docs/images/dq-12.preview.png
+%%CACTIDIR%%/docs/images/dq-13.png
+%%CACTIDIR%%/docs/images/dq-14.png
+%%CACTIDIR%%/docs/images/dq-15.preview.png
+%%CACTIDIR%%/docs/images/dq-add-01.preview.png
+%%CACTIDIR%%/docs/images/dq-add-02.preview.png
+%%CACTIDIR%%/docs/images/dq-add-03.preview.png
+%%CACTIDIR%%/docs/images/ds-01.preview.png
+%%CACTIDIR%%/docs/images/dt-01.preview.png
+%%CACTIDIR%%/docs/images/dt-02.preview.png
+%%CACTIDIR%%/docs/images/dt-03.preview.png
+%%CACTIDIR%%/docs/images/dt-04.preview.png
+%%CACTIDIR%%/docs/images/dt-05.preview.png
+%%CACTIDIR%%/docs/images/export-template.png
+%%CACTIDIR%%/docs/images/external-links-edit1.png
+%%CACTIDIR%%/docs/images/external-links-example1.png
+%%CACTIDIR%%/docs/images/external-links.png
+%%CACTIDIR%%/docs/images/gm-01.preview.png
+%%CACTIDIR%%/docs/images/gprint-presets-edit.png
+%%CACTIDIR%%/docs/images/gprint-presets.png
+%%CACTIDIR%%/docs/images/graph-01.png
+%%CACTIDIR%%/docs/images/graph-10.png
+%%CACTIDIR%%/docs/images/graph-template.png
+%%CACTIDIR%%/docs/images/graph-templates-edit1.png
+%%CACTIDIR%%/docs/images/graph-templates-edit2.png
+%%CACTIDIR%%/docs/images/graph-templates-edit3.png
+%%CACTIDIR%%/docs/images/graph-templates-edit4.png
+%%CACTIDIR%%/docs/images/graph-templates-edit5.png
+%%CACTIDIR%%/docs/images/graph-templates-edit6.png
+%%CACTIDIR%%/docs/images/graph-templates-item1.png
+%%CACTIDIR%%/docs/images/graph-templates-item1s.png
+%%CACTIDIR%%/docs/images/graph-templates-item2.png
+%%CACTIDIR%%/docs/images/graph-templates-item2s.png
+%%CACTIDIR%%/docs/images/graph-templates-item3.png
+%%CACTIDIR%%/docs/images/graph-templates-item3s.png
+%%CACTIDIR%%/docs/images/graph-templates-item4.png
+%%CACTIDIR%%/docs/images/graph-templates-item4s.png
+%%CACTIDIR%%/docs/images/graph-templates-new1.png
+%%CACTIDIR%%/docs/images/graph-templates-new2.png
+%%CACTIDIR%%/docs/images/graph-templates-new3.png
+%%CACTIDIR%%/docs/images/graph-templates.png
+%%CACTIDIR%%/docs/images/graph-templates1.png
+%%CACTIDIR%%/docs/images/graph-tree.png
+%%CACTIDIR%%/docs/images/gt-01.preview.png
+%%CACTIDIR%%/docs/images/gt-02.preview.png
+%%CACTIDIR%%/docs/images/gt-03.preview.png
+%%CACTIDIR%%/docs/images/gt-04.preview.png
+%%CACTIDIR%%/docs/images/gt-05.preview.png
+%%CACTIDIR%%/docs/images/gt-06.preview.png
+%%CACTIDIR%%/docs/images/gt-10.preview.png
+%%CACTIDIR%%/docs/images/gt-11.preview.png
+%%CACTIDIR%%/docs/images/import-template.png
+%%CACTIDIR%%/docs/images/logo.png
+%%CACTIDIR%%/docs/images/new_device.png
+%%CACTIDIR%%/docs/images/new_graphs.png
+%%CACTIDIR%%/docs/images/patch_creation_branch.png
+%%CACTIDIR%%/docs/images/patch_creation_clone.png
+%%CACTIDIR%%/docs/images/patch_creation_pull_request_1.png
+%%CACTIDIR%%/docs/images/patch_creation_pull_request_2.png
+%%CACTIDIR%%/docs/images/patch_creation_pull_request_3.png
+%%CACTIDIR%%/docs/images/plugins-dependencies.png
+%%CACTIDIR%%/docs/images/plugins-uninstall.png
+%%CACTIDIR%%/docs/images/plugins.png
+%%CACTIDIR%%/docs/images/principles_of_operation.png
+%%CACTIDIR%%/docs/images/r-dev1.png
+%%CACTIDIR%%/docs/images/r-dev2.png
+%%CACTIDIR%%/docs/images/r-dev3.png
+%%CACTIDIR%%/docs/images/r-dev4.png
+%%CACTIDIR%%/docs/images/r-dim1_0.png
+%%CACTIDIR%%/docs/images/r-dim2.png
+%%CACTIDIR%%/docs/images/r-dim3.png
+%%CACTIDIR%%/docs/images/r-dim4.png
+%%CACTIDIR%%/docs/images/r-dim5.png
+%%CACTIDIR%%/docs/images/r-dim6_0.png
+%%CACTIDIR%%/docs/images/r-dq-1.png
+%%CACTIDIR%%/docs/images/r-dq-dev1_0.png
+%%CACTIDIR%%/docs/images/r-dq-dev2.png
+%%CACTIDIR%%/docs/images/r-dq-dev3.png
+%%CACTIDIR%%/docs/images/r-dq-dt1.png
+%%CACTIDIR%%/docs/images/r-dq-dt2.png
+%%CACTIDIR%%/docs/images/r-dq-dt3.png
+%%CACTIDIR%%/docs/images/r-dq1_0.png
+%%CACTIDIR%%/docs/images/r-dq2.png
+%%CACTIDIR%%/docs/images/r-dq3.png
+%%CACTIDIR%%/docs/images/r-dq3_0.png
+%%CACTIDIR%%/docs/images/r-dq4.png
+%%CACTIDIR%%/docs/images/r-dq5.png
+%%CACTIDIR%%/docs/images/r-dq6.png
+%%CACTIDIR%%/docs/images/r-dq7.png
+%%CACTIDIR%%/docs/images/r-dt1.png
+%%CACTIDIR%%/docs/images/r-dt2.png
+%%CACTIDIR%%/docs/images/r-dt3.png
+%%CACTIDIR%%/docs/images/r-gt1.png
+%%CACTIDIR%%/docs/images/r-gt2.png
+%%CACTIDIR%%/docs/images/r-gt3.png
+%%CACTIDIR%%/docs/images/r-gt4.png
+%%CACTIDIR%%/docs/images/r-gt5.png
+%%CACTIDIR%%/docs/images/r-gt6.png
+%%CACTIDIR%%/docs/images/router_ping_graph.png
+%%CACTIDIR%%/docs/images/snmp_dqw_table1.png
+%%CACTIDIR%%/docs/images/snmp_dqw_table2.png
+%%CACTIDIR%%/docs/images/snmp_dqw_table3.png
+%%CACTIDIR%%/docs/images/system-utilities-boost1.png
+%%CACTIDIR%%/docs/images/system-utilities-boost2.png
+%%CACTIDIR%%/docs/images/system-utilities-main1.png
+%%CACTIDIR%%/docs/images/system-utilities-main2.png
+%%CACTIDIR%%/docs/images/system-utilities-main3.png
+%%CACTIDIR%%/docs/images/system-utilities-main4.png
+%%CACTIDIR%%/docs/images/system-utilities-rrdcleaner.png
+%%CACTIDIR%%/docs/images/system-utilities-viewagentcache.png
+%%CACTIDIR%%/docs/images/system-utilities-viewagentlog.png
+%%CACTIDIR%%/docs/images/system-utilities-viewagentmanagers.png
+%%CACTIDIR%%/docs/images/system-utilities-viewclog.png
+%%CACTIDIR%%/docs/images/system-utilities-viewdqcache.png
+%%CACTIDIR%%/docs/images/system-utilities-viewpcache.png
+%%CACTIDIR%%/docs/images/system-utilities-viewulog.png
+%%CACTIDIR%%/docs/images/user-domains-edit1.png
+%%CACTIDIR%%/docs/images/user-domains-edit2.png
+%%CACTIDIR%%/docs/images/user-domains.png
+%%CACTIDIR%%/docs/images/user-groups-edit-general.png
+%%CACTIDIR%%/docs/images/user-groups-edit-graph-permissions.png
+%%CACTIDIR%%/docs/images/user-groups-edit-members.png
+%%CACTIDIR%%/docs/images/user-groups-edit-permissions.png
+%%CACTIDIR%%/docs/images/user-groups.png
+%%CACTIDIR%%/docs/images/users-batch-copy1.png
+%%CACTIDIR%%/docs/images/users-batch-copy2.png
+%%CACTIDIR%%/docs/images/users-copy1.png
+%%CACTIDIR%%/docs/images/users-copy2.png
+%%CACTIDIR%%/docs/images/users-delete1.png
+%%CACTIDIR%%/docs/images/users-delete2.png
+%%CACTIDIR%%/docs/images/users-edit.png
+%%CACTIDIR%%/docs/images/users-enable-disable1.png
+%%CACTIDIR%%/docs/images/users-enable-disable2.png
+%%CACTIDIR%%/docs/images/users-list.png
+%%CACTIDIR%%/docs/images/users-new.png
+%%CACTIDIR%%/docs/images/users-permissions-device.png
+%%CACTIDIR%%/docs/images/users-permissions-graph-policy1.png
+%%CACTIDIR%%/docs/images/users-permissions-graph-policy2.png
+%%CACTIDIR%%/docs/images/users-permissions-graph.png
+%%CACTIDIR%%/docs/images/users-permissions-templates.png
+%%CACTIDIR%%/docs/images/users-permissions.png
+%%CACTIDIR%%/docs/images/users-settings.png
+%%CACTIDIR%%/docs/images/users-settings1.png
+%%CACTIDIR%%/docs/images/users-settings2.png
+%%CACTIDIR%%/docs/images/users-settings3.png
+%%CACTIDIR%%/docs/images/vdefs-edit1.png
+%%CACTIDIR%%/docs/images/vdefs-edit2.png
+%%CACTIDIR%%/docs/images/vdefs-edit3.png
+%%CACTIDIR%%/docs/images/vdefs-edit4.png
+%%CACTIDIR%%/docs/images/vdefs.png
%%CACTIDIR%%/docs/index.php
-%%CACTIDIR%%/docs/pdf/manual.pdf
-%%CACTIDIR%%/docs/txt/manual.txt
-%%CACTIDIR%%/formats/%%CACTIUSER%%_group.format
-%%CACTIDIR%%/formats/%%CACTIUSER%%_group_dark.format
-%%CACTIDIR%%/formats/%%CACTIUSER%%_monitor.format
+%%CACTIDIR%%/formats/cacti_group.format
+%%CACTIDIR%%/formats/cacti_group_dark.format
+%%CACTIDIR%%/formats/cacti_monitor.format
%%CACTIDIR%%/formats/default.format
%%CACTIDIR%%/formats/index.php
%%CACTIDIR%%/formats/lotus_notes.format
@@ -196,12 +481,13 @@
%%CACTIDIR%%/images/auth_background.gif
%%CACTIDIR%%/images/bullet_arrow_down.png
%%CACTIDIR%%/images/bullet_arrow_up.png
-%%CACTIDIR%%/images/%%CACTIUSER%%_about_logo.gif
-%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop.gif
-%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop2.gif
-%%CACTIDIR%%/images/%%CACTIUSER%%_error_image.png
-%%CACTIDIR%%/images/%%CACTIUSER%%_logo.gif
-%%CACTIDIR%%/images/%%CACTIUSER%%_logo_new.gif
+%%CACTIDIR%%/images/cacti_about_logo.gif
+%%CACTIDIR%%/images/cacti_backdrop.gif
+%%CACTIDIR%%/images/cacti_backdrop2.gif
+%%CACTIDIR%%/images/cacti_error_image.png
+%%CACTIDIR%%/images/cacti_logo.gif
+%%CACTIDIR%%/images/cacti_logo_new.gif
+%%CACTIDIR%%/images/cacti_logo.svg
%%CACTIDIR%%/images/calendar.gif
%%CACTIDIR%%/images/chart_curve_go.png
%%CACTIDIR%%/images/cog.png
@@ -222,6 +508,7 @@
%%CACTIDIR%%/images/index.php
%%CACTIDIR%%/images/install_icon.png
%%CACTIDIR%%/images/install_icon_disabled.png
+%%CACTIDIR%%/images/location.png
%%CACTIDIR%%/images/menuarrow.gif
%%CACTIDIR%%/images/move_down.gif
%%CACTIDIR%%/images/move_left.gif
@@ -233,6 +520,8 @@
%%CACTIDIR%%/images/server_chart.png
%%CACTIDIR%%/images/server_chart_curve.png
%%CACTIDIR%%/images/server_dataquery.png
+%%CACTIDIR%%/images/server_device_template.png
+%%CACTIDIR%%/images/server_edit.png
%%CACTIDIR%%/images/server_graph_template.png
%%CACTIDIR%%/images/server_table.png
%%CACTIDIR%%/images/shadow.gif
@@ -240,7 +529,7 @@
%%CACTIDIR%%/images/site.png
%%CACTIDIR%%/images/spikekill.gif
%%CACTIDIR%%/images/stop.png
-%%CACTIDIR%%/images/tab_%%CACTIUSER%%.gif
+%%CACTIDIR%%/images/tab_cacti.gif
%%CACTIDIR%%/images/tab_clog.png
%%CACTIDIR%%/images/tab_clog_down.png
%%CACTIDIR%%/images/tab_console.gif
@@ -273,31 +562,67 @@
%%CACTIDIR%%/images/view_page.png
%%CACTIDIR%%/include/auth.php
%%CACTIDIR%%/include/bottom_footer.php
-%%CACTIDIR%%/include/%%CACTIUSER%%_version
+%%CACTIDIR%%/include/cacti_version
+%%CACTIDIR%%/include/cli_check.php
%%CACTIDIR%%/include/config.php.sample
%%CACTIDIR%%/include/content/README
%%CACTIDIR%%/include/content/basic-example.html
%%CACTIDIR%%/include/content/iframe-example.html
%%CACTIDIR%%/include/content/index.php
%%CACTIDIR%%/include/content/php-example.html
-%%CACTIDIR%%/include/csrf/LICENSE
-%%CACTIDIR%%/include/csrf/NEWS
-%%CACTIDIR%%/include/csrf/README
-%%CACTIDIR%%/include/csrf/csrf-magic.js
-%%CACTIDIR%%/include/csrf/csrf-magic.php
-%%CACTIDIR%%/include/csrf/index.php
-%%CACTIDIR%%/include/fa/css/font-awesome.css
-%%CACTIDIR%%/include/fa/css/font-awesome.css.map
-%%CACTIDIR%%/include/fa/css/font-awesome.min.css
+%%CACTIDIR%%/include/fa/css/fontawesome.css
%%CACTIDIR%%/include/fa/css/index.php
-%%CACTIDIR%%/include/fa/fonts/FontAwesome.otf
-%%CACTIDIR%%/include/fa/fonts/fontawesome-webfont.eot
-%%CACTIDIR%%/include/fa/fonts/fontawesome-webfont.svg
-%%CACTIDIR%%/include/fa/fonts/fontawesome-webfont.ttf
-%%CACTIDIR%%/include/fa/fonts/fontawesome-webfont.woff
-%%CACTIDIR%%/include/fa/fonts/fontawesome-webfont.woff2
-%%CACTIDIR%%/include/fa/fonts/index.php
%%CACTIDIR%%/include/fa/index.php
+%%CACTIDIR%%/include/fa/less/_animated.less
+%%CACTIDIR%%/include/fa/less/_bordered-pulled.less
+%%CACTIDIR%%/include/fa/less/_core.less
+%%CACTIDIR%%/include/fa/less/_fixed-width.less
+%%CACTIDIR%%/include/fa/less/_icons.less
+%%CACTIDIR%%/include/fa/less/_larger.less
+%%CACTIDIR%%/include/fa/less/_list.less
+%%CACTIDIR%%/include/fa/less/_mixins.less
+%%CACTIDIR%%/include/fa/less/_rotated-flipped.less
+%%CACTIDIR%%/include/fa/less/_screen-reader.less
+%%CACTIDIR%%/include/fa/less/_stacked.less
+%%CACTIDIR%%/include/fa/less/_variables.less
+%%CACTIDIR%%/include/fa/less/fa-brands.less
+%%CACTIDIR%%/include/fa/less/fa-regular.less
+%%CACTIDIR%%/include/fa/less/fa-solid.less
+%%CACTIDIR%%/include/fa/less/fontawesome.less
+%%CACTIDIR%%/include/fa/less/index.php
+%%CACTIDIR%%/include/fa/scss/_animated.scss
+%%CACTIDIR%%/include/fa/scss/_bordered-pulled.scss
+%%CACTIDIR%%/include/fa/scss/_core.scss
+%%CACTIDIR%%/include/fa/scss/_fixed-width.scss
+%%CACTIDIR%%/include/fa/scss/_icons.scss
+%%CACTIDIR%%/include/fa/scss/_larger.scss
+%%CACTIDIR%%/include/fa/scss/_list.scss
+%%CACTIDIR%%/include/fa/scss/_mixins.scss
+%%CACTIDIR%%/include/fa/scss/_rotated-flipped.scss
+%%CACTIDIR%%/include/fa/scss/_screen-reader.scss
+%%CACTIDIR%%/include/fa/scss/_stacked.scss
+%%CACTIDIR%%/include/fa/scss/_variables.scss
+%%CACTIDIR%%/include/fa/scss/fa-brands.scss
+%%CACTIDIR%%/include/fa/scss/fa-regular.scss
+%%CACTIDIR%%/include/fa/scss/fa-solid.scss
+%%CACTIDIR%%/include/fa/scss/fontawesome.scss
+%%CACTIDIR%%/include/fa/scss/index.php
+%%CACTIDIR%%/include/fa/webfonts/fa-brands-400.eot
+%%CACTIDIR%%/include/fa/webfonts/fa-brands-400.svg
+%%CACTIDIR%%/include/fa/webfonts/fa-brands-400.ttf
+%%CACTIDIR%%/include/fa/webfonts/fa-brands-400.woff
+%%CACTIDIR%%/include/fa/webfonts/fa-brands-400.woff2
+%%CACTIDIR%%/include/fa/webfonts/fa-regular-400.eot
+%%CACTIDIR%%/include/fa/webfonts/fa-regular-400.svg
+%%CACTIDIR%%/include/fa/webfonts/fa-regular-400.ttf
+%%CACTIDIR%%/include/fa/webfonts/fa-regular-400.woff
+%%CACTIDIR%%/include/fa/webfonts/fa-regular-400.woff2
+%%CACTIDIR%%/include/fa/webfonts/fa-solid-900.eot
+%%CACTIDIR%%/include/fa/webfonts/fa-solid-900.svg
+%%CACTIDIR%%/include/fa/webfonts/fa-solid-900.ttf
+%%CACTIDIR%%/include/fa/webfonts/fa-solid-900.woff
+%%CACTIDIR%%/include/fa/webfonts/fa-solid-900.woff2
+%%CACTIDIR%%/include/fa/webfonts/index.php
%%CACTIDIR%%/include/fonts/DejaVuSans-Bold.ttf
%%CACTIDIR%%/include/fonts/DejaVuSansCondensed-Bold.ttf
%%CACTIDIR%%/include/global.php
@@ -350,6 +675,8 @@
%%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-nl.js
%%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-norwegian_norway.js
%%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-polish_poland.js
+%%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-portuguese_brazil.js
+%%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-portuguese_portugal.js
%%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-pt-BR.js
%%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-romanian_romania.js
%%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-russian_russia.js
@@ -429,375 +756,12 @@
%%CACTIDIR%%/include/js/jquery.timepicker.js
%%CACTIDIR%%/include/js/jquery.ui.touch.punch.js
%%CACTIDIR%%/include/js/jquery.zoom.js
-%%CACTIDIR%%/include/js/jquery-migrate.js
%%CACTIDIR%%/include/js/jquery-ui.js
%%CACTIDIR%%/include/js/js.storage.js
%%CACTIDIR%%/include/js/jstree.js
%%CACTIDIR%%/include/js/pace.js
%%CACTIDIR%%/include/js/screenfull.js
%%CACTIDIR%%/include/layout.js
-%%CACTIDIR%%/include/phpgettext/gettext.php
-%%CACTIDIR%%/include/phpgettext/streams.php
-%%CACTIDIR%%/include/phpmailer/LICENSE
-%%CACTIDIR%%/include/phpmailer/PHPMailerAutoload.php
-%%CACTIDIR%%/include/phpmailer/VERSION
-%%CACTIDIR%%/include/phpmailer/class.phpmailer.php
-%%CACTIDIR%%/include/phpmailer/class.phpmaileroauth.php
-%%CACTIDIR%%/include/phpmailer/class.pop3.php
-%%CACTIDIR%%/include/phpmailer/class.smtp.php
-%%CACTIDIR%%/include/phpmailer/index.php
-%%CACTIDIR%%/include/phpmailer/language/index.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-am.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-ar.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-az.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-ba.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-be.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-bg.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-ca.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-ch.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-cs.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-da.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-de.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-el.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-eo.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-es.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-et.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-fa.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-fi.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-fo.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-fr.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-gl.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-he.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-hr.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-hu.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-id.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-it.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-ja.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-ka.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-ko.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-lt.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-lv.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-ms.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-nb.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-nl.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-pl.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-pt.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-pt_br.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-ro.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-rs.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-ru.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-sk.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-sl.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-sv.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-tr.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-uk.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-vi.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-zh.php
-%%CACTIDIR%%/include/phpmailer/language/phpmailer.lang-zh_cn.php
-%%CACTIDIR%%/include/phpseclib/Crypt/AES.php
-%%CACTIDIR%%/include/phpseclib/Crypt/Base.php
-%%CACTIDIR%%/include/phpseclib/Crypt/Blowfish.php
-%%CACTIDIR%%/include/phpseclib/Crypt/DES.php
-%%CACTIDIR%%/include/phpseclib/Crypt/Hash.php
-%%CACTIDIR%%/include/phpseclib/Crypt/RC2.php
-%%CACTIDIR%%/include/phpseclib/Crypt/RC4.php
-%%CACTIDIR%%/include/phpseclib/Crypt/RSA.php
-%%CACTIDIR%%/include/phpseclib/Crypt/Random.php
-%%CACTIDIR%%/include/phpseclib/Crypt/Rijndael.php
-%%CACTIDIR%%/include/phpseclib/Crypt/TripleDES.php
-%%CACTIDIR%%/include/phpseclib/Crypt/Twofish.php
-%%CACTIDIR%%/include/phpseclib/File/ANSI.php
-%%CACTIDIR%%/include/phpseclib/File/ASN1.php
-%%CACTIDIR%%/include/phpseclib/File/ASN1/Element.php
-%%CACTIDIR%%/include/phpseclib/File/X509.php
-%%CACTIDIR%%/include/phpseclib/Math/BigInteger.php
-%%CACTIDIR%%/include/phpseclib/Net/SCP.php
-%%CACTIDIR%%/include/phpseclib/Net/SFTP.php
-%%CACTIDIR%%/include/phpseclib/Net/SFTP/Stream.php
-%%CACTIDIR%%/include/phpseclib/Net/SSH1.php
-%%CACTIDIR%%/include/phpseclib/Net/SSH2.php
-%%CACTIDIR%%/include/phpseclib/System/SSH/Agent.php
-%%CACTIDIR%%/include/phpseclib/System/SSH/Agent/Identity.php
-%%CACTIDIR%%/include/phpseclib/System/SSH_Agent.php
-%%CACTIDIR%%/include/phpseclib/bootstrap.php
-%%CACTIDIR%%/include/phpseclib/openssl.cnf
-%%CACTIDIR%%/include/phpsnmp/classSNMP.php
-%%CACTIDIR%%/include/phptwig/Autoloader.php
-%%CACTIDIR%%/include/phptwig/BaseNodeVisitor.php
-%%CACTIDIR%%/include/phptwig/CHANGELOG
-%%CACTIDIR%%/include/phptwig/Cache/Filesystem.php
-%%CACTIDIR%%/include/phptwig/Cache/Null.php
-%%CACTIDIR%%/include/phptwig/CacheInterface.php
-%%CACTIDIR%%/include/phptwig/Compiler.php
-%%CACTIDIR%%/include/phptwig/CompilerInterface.php
-%%CACTIDIR%%/include/phptwig/Environment.php
-%%CACTIDIR%%/include/phptwig/Error.php
-%%CACTIDIR%%/include/phptwig/Error/Loader.php
-%%CACTIDIR%%/include/phptwig/Error/Runtime.php
-%%CACTIDIR%%/include/phptwig/Error/Syntax.php
-%%CACTIDIR%%/include/phptwig/ExistsLoaderInterface.php
-%%CACTIDIR%%/include/phptwig/ExpressionParser.php
-%%CACTIDIR%%/include/phptwig/Extension.php
-%%CACTIDIR%%/include/phptwig/Extension/Core.php
-%%CACTIDIR%%/include/phptwig/Extension/Debug.php
-%%CACTIDIR%%/include/phptwig/Extension/Escaper.php
-%%CACTIDIR%%/include/phptwig/Extension/GlobalsInterface.php
-%%CACTIDIR%%/include/phptwig/Extension/InitRuntimeInterface.php
-%%CACTIDIR%%/include/phptwig/Extension/Optimizer.php
-%%CACTIDIR%%/include/phptwig/Extension/Profiler.php
-%%CACTIDIR%%/include/phptwig/Extension/Sandbox.php
-%%CACTIDIR%%/include/phptwig/Extension/Staging.php
-%%CACTIDIR%%/include/phptwig/Extension/StringLoader.php
-%%CACTIDIR%%/include/phptwig/ExtensionInterface.php
-%%CACTIDIR%%/include/phptwig/FileExtensionEscapingStrategy.php
-%%CACTIDIR%%/include/phptwig/Filter.php
-%%CACTIDIR%%/include/phptwig/Filter/Function.php
-%%CACTIDIR%%/include/phptwig/Filter/Method.php
-%%CACTIDIR%%/include/phptwig/Filter/Node.php
-%%CACTIDIR%%/include/phptwig/FilterCallableInterface.php
-%%CACTIDIR%%/include/phptwig/FilterInterface.php
-%%CACTIDIR%%/include/phptwig/Function.php
-%%CACTIDIR%%/include/phptwig/Function/Function.php
-%%CACTIDIR%%/include/phptwig/Function/Method.php
-%%CACTIDIR%%/include/phptwig/Function/Node.php
-%%CACTIDIR%%/include/phptwig/FunctionCallableInterface.php
-%%CACTIDIR%%/include/phptwig/FunctionInterface.php
-%%CACTIDIR%%/include/phptwig/LICENSE
-%%CACTIDIR%%/include/phptwig/Lexer.php
-%%CACTIDIR%%/include/phptwig/LexerInterface.php
-%%CACTIDIR%%/include/phptwig/Loader/Array.php
-%%CACTIDIR%%/include/phptwig/Loader/Chain.php
-%%CACTIDIR%%/include/phptwig/Loader/Filesystem.php
-%%CACTIDIR%%/include/phptwig/Loader/String.php
-%%CACTIDIR%%/include/phptwig/LoaderInterface.php
-%%CACTIDIR%%/include/phptwig/Markup.php
-%%CACTIDIR%%/include/phptwig/Node.php
-%%CACTIDIR%%/include/phptwig/Node/AutoEscape.php
-%%CACTIDIR%%/include/phptwig/Node/Block.php
-%%CACTIDIR%%/include/phptwig/Node/BlockReference.php
-%%CACTIDIR%%/include/phptwig/Node/Body.php
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list