Attachment 208010 Details for Bug 240999 – 1.2.7

[patch] 1.2.7

cacti-1.2.7.diff (text/plain), 43.30 KB, created by Michael Muenz on 2019-10-02 08:39:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Muenz

Created: 2019-10-02 08:39:47 UTC

Size: 43.30 KB

patch

obsolete

>diff -uNr cacti/Makefile cacti127/Makefile
>--- cacti/Makefile	2019-08-19 22:25:28.000000000 +0200
>+++ cacti127/Makefile	2019-10-02 10:13:30.611124000 +0200
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/net-mgmt/cacti/Makefile 509310 2019-08-19 20:25:28Z kai $
> 
> PORTNAME=	cacti
>-PORTVERSION=	1.2.5
>+PORTVERSION=	1.2.7
> CATEGORIES=	net-mgmt www
> MASTER_SITES=	http://www.cacti.net/downloads/ \
> 		ftp://ftpmirror.uk/freebsd-ports/cacti/
>diff -uNr cacti/distinfo cacti127/distinfo
>--- cacti/distinfo	2019-08-19 22:25:28.000000000 +0200
>+++ cacti127/distinfo	2019-10-01 20:57:23.152919000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1563799623
>-SHA256 (cacti-1.2.5.tar.gz) = bba3342f9bf285340eaded3545bbfaecd435f60cc5eacd74300fc90113cc9dc9
>-SIZE (cacti-1.2.5.tar.gz) = 24677665
>+TIMESTAMP = 1569956243
>+SHA256 (cacti-1.2.7.tar.gz) = 45b4d57964aa2e11176f03f866be9c4e5850eaa5abe83137b61b3fe9d7ddce34
>+SIZE (cacti-1.2.7.tar.gz) = 24819135
>diff -uNr cacti/files/patch-include__global.php cacti127/files/patch-include__global.php
>--- cacti/files/patch-include__global.php	2019-04-10 23:10:00.000000000 +0200
>+++ cacti127/files/patch-include__global.php	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- include/global.php.orig	2019-03-30 23:40:22 UTC
>-+++ include/global.php
>-@@ -216,7 +216,7 @@ if ($config['cacti_server_os'] == 'win32') {
>- 	$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
>- }
>- $config['include_path'] = dirname(__FILE__);
>--$config['rra_path'] = $config['base_path'] . '/rra';
>-+$config['rra_path'] = '/var/db/cacti/rra';
>- 
>- /* for multiple pollers, we need to know this location */
>- if (!isset($scripts_path)) {
>diff -uNr cacti/files/patch-include__global_settings.php cacti127/files/patch-include__global_settings.php
>--- cacti/files/patch-include__global_settings.php	2019-01-08 19:13:55.000000000 +0100
>+++ cacti127/files/patch-include__global_settings.php	1970-01-01 01:00:00.000000000 +0100
>@@ -1,15 +0,0 @@
>---- include/global_settings.php.orig	2019-01-03 02:14:26 UTC
>-+++ include/global_settings.php
>-@@ -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 &lt;path_cacti&gt;/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',
>- 			'install_check' => 'writable'
>- 			),
>diff -uNr cacti/files/patch-include_global.php cacti127/files/patch-include_global.php
>--- cacti/files/patch-include_global.php	1970-01-01 01:00:00.000000000 +0100
>+++ cacti127/files/patch-include_global.php	2019-10-02 10:14:41.088346000 +0200
>@@ -0,0 +1,11 @@
>+--- include/global.php.orig	2019-10-02 05:40:32 UTC
>++++ include/global.php
>+@@ -225,7 +225,7 @@ if ($config['cacti_server_os'] == 'win32') {
>+ 	$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
>+ }
>+ $config['include_path'] = dirname(__FILE__);
>+-$config['rra_path'] = $config['base_path'] . '/rra';
>++$config['rra_path'] = '/var/db/cacti/rra';
>+ 
>+ /* for multiple pollers, we need to know this location */
>+ if (!isset($scripts_path)) {
>diff -uNr cacti/files/patch-include_global__settings.php cacti127/files/patch-include_global__settings.php
>--- cacti/files/patch-include_global__settings.php	1970-01-01 01:00:00.000000000 +0100
>+++ cacti127/files/patch-include_global__settings.php	2019-10-02 10:14:41.088367000 +0200
>@@ -0,0 +1,15 @@
>+--- include/global_settings.php.orig	2019-10-02 05:40:09 UTC
>++++ include/global_settings.php
>+@@ -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 &lt;path_cacti&gt;/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',
>+ 			'install_check' => 'writable',
>+ 			'install_blank' => true
>diff -uNr cacti/files/patch-install__functions.php cacti127/files/patch-install__functions.php
>--- cacti/files/patch-install__functions.php	2019-08-19 22:25:28.000000000 +0200
>+++ cacti127/files/patch-install__functions.php	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- install/functions.php.orig	2019-07-15 19:23:30 UTC
>-+++ install/functions.php
>-@@ -538,7 +538,7 @@ function install_file_paths() {
>- 	}
>- 
>- 	if (empty($input['path_cactilog']['default'])) {
>--		$input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
>-+		$input['path_cactilog']['default'] = '/var/log/cacti/log';
>- 	}
>- 
>- 	/* stderr log file path */
>diff -uNr cacti/files/patch-install_functions.php cacti127/files/patch-install_functions.php
>--- cacti/files/patch-install_functions.php	1970-01-01 01:00:00.000000000 +0100
>+++ cacti127/files/patch-install_functions.php	2019-10-02 10:14:41.088385000 +0200
>@@ -0,0 +1,11 @@
>+--- install/functions.php.orig	2019-10-02 05:41:46 UTC
>++++ install/functions.php
>+@@ -538,7 +538,7 @@ function install_file_paths() {
>+ 	}
>+ 
>+ 	if (empty($input['path_cactilog']['default'])) {
>+-		$input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
>++		$input['path_cactilog']['default'] = '/var/log/cacti/log';
>+ 	}
>+ 
>+ 	/* stderr log file path */
>diff -uNr cacti/files/patch-lib__clog_webapi.php cacti127/files/patch-lib__clog_webapi.php
>--- cacti/files/patch-lib__clog_webapi.php	2019-01-06 17:32:03.000000000 +0100
>+++ cacti127/files/patch-lib__clog_webapi.php	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- lib/clog_webapi.php.orig	2019-01-03 02:14:26 UTC
>-+++ lib/clog_webapi.php
>-@@ -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';
>- 	}
>- 
>- 	$errfile = read_config_option('path_stderrlog');
>diff -uNr cacti/files/patch-lib__functions.php cacti127/files/patch-lib__functions.php
>--- cacti/files/patch-lib__functions.php	2019-01-06 17:32:03.000000000 +0100
>+++ cacti127/files/patch-lib__functions.php	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- lib/functions.php.orig	2019-01-03 02:14:26 UTC
>-+++ lib/functions.php
>-@@ -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;
>diff -uNr cacti/files/patch-lib_clog__webapi.php cacti127/files/patch-lib_clog__webapi.php
>--- cacti/files/patch-lib_clog__webapi.php	1970-01-01 01:00:00.000000000 +0100
>+++ cacti127/files/patch-lib_clog__webapi.php	2019-10-02 10:14:41.088402000 +0200
>@@ -0,0 +1,11 @@
>+--- lib/clog_webapi.php.orig	2019-10-02 05:42:03 UTC
>++++ lib/clog_webapi.php
>+@@ -58,7 +58,7 @@ function clog_validate_filename(&$file, &$filepath, &$
>+ 	$logbase = basename($logfile);
>+ 
>+ 	if ($logfile == '') {
>+-		$logfile = $config['base_path'] . '/log/cacti.log';
>++		$logfile = '/var/log/cacti/log';
>+ 	}
>+ 
>+ 	$errfile = read_config_option('path_stderrlog');
>diff -uNr cacti/files/patch-lib_functions.php cacti127/files/patch-lib_functions.php
>--- cacti/files/patch-lib_functions.php	1970-01-01 01:00:00.000000000 +0100
>+++ cacti127/files/patch-lib_functions.php	2019-10-02 10:14:41.088419000 +0200
>@@ -0,0 +1,11 @@
>+--- lib/functions.php.orig	2019-10-02 05:42:12 UTC
>++++ lib/functions.php
>+@@ -854,7 +854,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;
>diff -uNr cacti/files/patch-lib_installer.php cacti127/files/patch-lib_installer.php
>--- cacti/files/patch-lib_installer.php	2019-08-19 22:25:28.000000000 +0200
>+++ cacti127/files/patch-lib_installer.php	2019-10-02 10:14:41.088435000 +0200
>@@ -1,11 +1,11 @@
>---- lib/installer.php.orig	2019-07-26 03:05:22 UTC
>+--- lib/installer.php.orig	2019-10-02 05:42:35 UTC
> +++ lib/installer.php
>-@@ -3216,7 +3216,7 @@ class Installer implements JsonSerializable {
>+@@ -3226,7 +3226,7 @@ class Installer implements JsonSerializable {
>  		global $config;
>  
>  		$page_nr = 1;
>--		$logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , $page_no, $total_rows);
>-+		$logcontents = tail_file('/var/log/cacti/log', 100, -1, ' INSTALL:' , $page_no, $total_rows);
>+-		$logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , $page_nr, $total_rows);
>++		$logcontents = tail_file('/var/log/cacti/log', 100, -1, ' INSTALL:' , 1, $total_rows);
>  
>  		$output_log = '';
>  		foreach ($logcontents as $logline) {
>diff -uNr cacti/files/patch-poller__maintenance.php cacti127/files/patch-poller__maintenance.php
>--- cacti/files/patch-poller__maintenance.php	1970-01-01 01:00:00.000000000 +0100
>+++ cacti127/files/patch-poller__maintenance.php	2019-10-02 10:14:41.088452000 +0200
>@@ -0,0 +1,11 @@
>+--- poller_maintenance.php.orig	2019-10-02 05:42:56 UTC
>++++ poller_maintenance.php
>+@@ -227,7 +227,7 @@ function logrotate_rotatenow() {
>+ 	$logs = array();
>+ 	$log = read_config_option('path_cactilog');
>+ 	if (empty($log)) {
>+-		$log = $config['base_path'] . '/log/cacti.log';
>++		$log = '/var/log/cacti/log';
>+ 	}
>+ 	$logs['Cacti'] = $log;
>+ 
>diff -uNr cacti/files/patch-poller_maintenance.php cacti127/files/patch-poller_maintenance.php
>--- cacti/files/patch-poller_maintenance.php	2019-01-06 17:32:03.000000000 +0100
>+++ cacti127/files/patch-poller_maintenance.php	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- poller_maintenance.php.orig	2019-01-03 02:14:26 UTC
>-+++ poller_maintenance.php
>-@@ -227,7 +227,7 @@ function logrotate_rotatenow() {
>- 	$logs = array();
>- 	$log = read_config_option('path_cactilog');
>- 	if (empty($log)) {
>--		$log = $config['base_path'] . '/log/cacti.log';
>-+		$log = '/var/log/cacti/log';
>- 	}
>- 	$logs['Cacti'] = $log;
>- 
>diff -uNr cacti/files/patch-utilities.php cacti127/files/patch-utilities.php
>--- cacti/files/patch-utilities.php	2017-08-15 01:20:01.000000000 +0200
>+++ cacti127/files/patch-utilities.php	2019-10-02 10:14:41.088471000 +0200
>@@ -1,6 +1,6 @@
>---- utilities.php.orig	2017-08-13 04:06:37 UTC
>+--- utilities.php.orig	2019-10-02 05:43:04 UTC
> +++ utilities.php
>-@@ -877,7 +877,7 @@ function utilities_view_logfile() {
>+@@ -918,7 +918,7 @@ function utilities_view_logfile() {
>  	}
>  
>  	if ($logfile == '') {
>@@ -8,8 +8,8 @@
> +		$logfile = '/var/log/cacti/log';
>  	}
>  
>- 	/* ================= input validation and session storage ================= */
>-@@ -1199,7 +1199,7 @@ function utilities_clear_logfile() {
>+ 	if (get_nfilter_request_var('filename') != '') {
>+@@ -1244,7 +1244,7 @@ function utilities_clear_logfile() {
>  	$logfile = read_config_option('path_cactilog');
>  
>  	if ($logfile == '') {
>diff -uNr cacti/pkg-plist cacti127/pkg-plist
>--- cacti/pkg-plist	2019-08-19 22:25:28.000000000 +0200
>+++ cacti127/pkg-plist	2019-10-02 10:13:36.873157000 +0200
>@@ -24,10 +24,9 @@
> %%CACTIDIR%%/cache/realtime/index.php
> %%CACTIDIR%%/cache/spikekill/.htaccess
> %%CACTIDIR%%/cache/spikekill/index.php
>-%%CACTIDIR%%/cacti.sql
>+%%CACTIDIR%%/%%CACTIUSER%%.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
>@@ -42,10 +41,11 @@
> %%CACTIDIR%%/cli/copy_user.php
> %%CACTIDIR%%/cli/host_update_template.php
> %%CACTIDIR%%/cli/import_package.php
>+%%CACTIDIR%%/cli/import_template.php
>+%%CACTIDIR%%/cli/index.php
> %%CACTIDIR%%/cli/input_whitelist.php
>-%%CACTIDIR%%/cli/install_cacti.php
>+%%CACTIDIR%%/cli/install_%%CACTIUSER%%.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
>@@ -73,8 +73,8 @@
> %%CACTIDIR%%/data_debug.php
> %%CACTIDIR%%/data_input.php
> %%CACTIDIR%%/data_queries.php
>-%%CACTIDIR%%/data_sources.php
> %%CACTIDIR%%/data_source_profiles.php
>+%%CACTIDIR%%/data_sources.php
> %%CACTIDIR%%/data_templates.php
> %%CACTIDIR%%/docs/Aggregate-Templates.html
> %%CACTIDIR%%/docs/Aggregates.html
>@@ -192,22 +192,22 @@
> %%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/cacti_add_device_site.JPG
>-%%CACTIDIR%%/docs/images/cacti_add_sites.JPG
>-%%CACTIDIR%%/docs/images/cacti_default_tree.png
>-%%CACTIDIR%%/docs/images/cacti_device_datasource.JPG
>-%%CACTIDIR%%/docs/images/cacti_graph_managment.JPG
>-%%CACTIDIR%%/docs/images/cacti_graph_managment_graph.JPG
>-%%CACTIDIR%%/docs/images/cacti_graph_template_options.JPG
>-%%CACTIDIR%%/docs/images/cacti_remote_poller_setup.JPG
>-%%CACTIDIR%%/docs/images/cacti_sites_automation.JPG
>-%%CACTIDIR%%/docs/images/cacti_sites_page.png
>-%%CACTIDIR%%/docs/images/cacti_system_utilities.JPG
>-%%CACTIDIR%%/docs/images/cacti_thold_enable.JPG
>-%%CACTIDIR%%/docs/images/cacti_thold_plugin_install.JPG
>-%%CACTIDIR%%/docs/images/cacti_trees_screen.png
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%-page-layout.png
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%-tree-view-page.png
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_add_device_site.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_add_sites.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_default_tree.png
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_device_datasource.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_managment.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_managment_graph.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_template_options.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_remote_poller_setup.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_sites_automation.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_sites_page.png
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_system_utilities.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_thold_enable.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_thold_plugin_install.JPG
>+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_trees_screen.png
> %%CACTIDIR%%/docs/images/cdef-01.preview.png
> %%CACTIDIR%%/docs/images/cdefs-edit1.png
> %%CACTIDIR%%/docs/images/cdefs-edit2.png
>@@ -478,9 +478,9 @@
> %%CACTIDIR%%/docs/images/vdefs-edit4.png
> %%CACTIDIR%%/docs/images/vdefs.png
> %%CACTIDIR%%/docs/index.php
>-%%CACTIDIR%%/formats/cacti_group.format
>-%%CACTIDIR%%/formats/cacti_group_dark.format
>-%%CACTIDIR%%/formats/cacti_monitor.format
>+%%CACTIDIR%%/formats/%%CACTIUSER%%_group.format
>+%%CACTIDIR%%/formats/%%CACTIUSER%%_group_dark.format
>+%%CACTIDIR%%/formats/%%CACTIUSER%%_monitor.format
> %%CACTIDIR%%/formats/default.format
> %%CACTIDIR%%/formats/index.php
> %%CACTIDIR%%/formats/lotus_notes.format
>@@ -505,13 +505,13 @@
> %%CACTIDIR%%/images/auth_background.gif
> %%CACTIDIR%%/images/bullet_arrow_down.png
> %%CACTIDIR%%/images/bullet_arrow_up.png
>-%%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/%%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.svg
>+%%CACTIDIR%%/images/%%CACTIUSER%%_logo_new.gif
> %%CACTIDIR%%/images/calendar.gif
> %%CACTIDIR%%/images/chart_curve_go.png
> %%CACTIDIR%%/images/cog.png
>@@ -553,7 +553,7 @@
> %%CACTIDIR%%/images/site.png
> %%CACTIDIR%%/images/spikekill.gif
> %%CACTIDIR%%/images/stop.png
>-%%CACTIDIR%%/images/tab_cacti.gif
>+%%CACTIDIR%%/images/tab_%%CACTIUSER%%.gif
> %%CACTIDIR%%/images/tab_clog.png
> %%CACTIDIR%%/images/tab_clog_down.png
> %%CACTIDIR%%/images/tab_console.gif
>@@ -586,7 +586,7 @@
> %%CACTIDIR%%/images/view_page.png
> %%CACTIDIR%%/include/auth.php
> %%CACTIDIR%%/include/bottom_footer.php
>-%%CACTIDIR%%/include/cacti_version
>+%%CACTIDIR%%/include/%%CACTIUSER%%_version
> %%CACTIDIR%%/include/cli_check.php
> %%CACTIDIR%%/include/config.php.sample
> %%CACTIDIR%%/include/content/README
>@@ -782,6 +782,7 @@
> %%CACTIDIR%%/include/js/d3.js
> %%CACTIDIR%%/include/js/dygraph-combined.js
> %%CACTIDIR%%/include/js/index.php
>+%%CACTIDIR%%/include/js/jquery-ui.js
> %%CACTIDIR%%/include/js/jquery.colorpicker.js
> %%CACTIDIR%%/include/js/jquery.cookie.js
> %%CACTIDIR%%/include/js/jquery.dropdown.js
>@@ -798,7 +799,6 @@
> %%CACTIDIR%%/include/js/jquery.timepicker.js
> %%CACTIDIR%%/include/js/jquery.ui.touch.punch.js
> %%CACTIDIR%%/include/js/jquery.zoom.js
>-%%CACTIDIR%%/include/js/jquery-ui.js
> %%CACTIDIR%%/include/js/js.storage.js
> %%CACTIDIR%%/include/js/jstree.js
> %%CACTIDIR%%/include/js/pace.js
>@@ -821,8 +821,8 @@
> %%CACTIDIR%%/include/themes/classic/images/bar-opacity.png
> %%CACTIDIR%%/include/themes/classic/images/bar-pointer.png
> %%CACTIDIR%%/include/themes/classic/images/bar.png
>-%%CACTIDIR%%/include/themes/classic/images/cacti_logo.gif
>-%%CACTIDIR%%/include/themes/classic/images/cacti_logo.svg
>+%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.gif
>+%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.svg
> %%CACTIDIR%%/include/themes/classic/images/favicon.ico
> %%CACTIDIR%%/include/themes/classic/images/favicon.png
> %%CACTIDIR%%/include/themes/classic/images/index.php
>@@ -851,6 +851,7 @@
> %%CACTIDIR%%/include/themes/classic/jquery-ui.css
> %%CACTIDIR%%/include/themes/classic/jquery.colorpicker.css
> %%CACTIDIR%%/include/themes/classic/jquery.multiselect.css
>+%%CACTIDIR%%/include/themes/classic/jquery.multiselect.filter.css
> %%CACTIDIR%%/include/themes/classic/jquery.timepicker.css
> %%CACTIDIR%%/include/themes/classic/jquery.zoom.css
> %%CACTIDIR%%/include/themes/classic/main.css
>@@ -870,10 +871,10 @@
> %%CACTIDIR%%/include/themes/dark/images/bar-opacity.png
> %%CACTIDIR%%/include/themes/dark/images/bar-pointer.png
> %%CACTIDIR%%/include/themes/dark/images/bar.png
>-%%CACTIDIR%%/include/themes/dark/images/cacti_backdrop.gif
>-%%CACTIDIR%%/include/themes/dark/images/cacti_backdrop2.gif
>-%%CACTIDIR%%/include/themes/dark/images/cacti_logo.gif
>-%%CACTIDIR%%/include/themes/dark/images/cacti_logo.svg
>+%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop.gif
>+%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop2.gif
>+%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.gif
>+%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.svg
> %%CACTIDIR%%/include/themes/dark/images/favicon.ico
> %%CACTIDIR%%/include/themes/dark/images/favicon.png
> %%CACTIDIR%%/include/themes/dark/images/index.php
>@@ -903,6 +904,7 @@
> %%CACTIDIR%%/include/themes/dark/jquery-ui.css
> %%CACTIDIR%%/include/themes/dark/jquery.colorpicker.css
> %%CACTIDIR%%/include/themes/dark/jquery.multiselect.css
>+%%CACTIDIR%%/include/themes/dark/jquery.multiselect.filter.css
> %%CACTIDIR%%/include/themes/dark/jquery.timepicker.css
> %%CACTIDIR%%/include/themes/dark/jquery.zoom.css
> %%CACTIDIR%%/include/themes/dark/main.css
>@@ -924,8 +926,8 @@
> %%CACTIDIR%%/include/themes/modern/images/bar-opacity.png
> %%CACTIDIR%%/include/themes/modern/images/bar-pointer.png
> %%CACTIDIR%%/include/themes/modern/images/bar.png
>-%%CACTIDIR%%/include/themes/modern/images/cacti_logo.gif
>-%%CACTIDIR%%/include/themes/modern/images/cacti_logo.svg
>+%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.gif
>+%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.svg
> %%CACTIDIR%%/include/themes/modern/images/favicon.ico
> %%CACTIDIR%%/include/themes/modern/images/favicon.png
> %%CACTIDIR%%/include/themes/modern/images/index.php
>@@ -954,6 +956,7 @@
> %%CACTIDIR%%/include/themes/modern/jquery-ui.css
> %%CACTIDIR%%/include/themes/modern/jquery.colorpicker.css
> %%CACTIDIR%%/include/themes/modern/jquery.multiselect.css
>+%%CACTIDIR%%/include/themes/modern/jquery.multiselect.filter.css
> %%CACTIDIR%%/include/themes/modern/jquery.timepicker.css
> %%CACTIDIR%%/include/themes/modern/jquery.zoom.css
> %%CACTIDIR%%/include/themes/modern/main.css
>@@ -974,8 +977,8 @@
> %%CACTIDIR%%/include/themes/paper-plane/images/bar-opacity.png
> %%CACTIDIR%%/include/themes/paper-plane/images/bar-pointer.png
> %%CACTIDIR%%/include/themes/paper-plane/images/bar.png
>-%%CACTIDIR%%/include/themes/paper-plane/images/cacti_logo.gif
>-%%CACTIDIR%%/include/themes/paper-plane/images/cacti_logo.svg
>+%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.gif
>+%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.svg
> %%CACTIDIR%%/include/themes/paper-plane/images/favicon.ico
> %%CACTIDIR%%/include/themes/paper-plane/images/favicon.png
> %%CACTIDIR%%/include/themes/paper-plane/images/index.php
>@@ -1004,6 +1007,7 @@
> %%CACTIDIR%%/include/themes/paper-plane/jquery-ui.css
> %%CACTIDIR%%/include/themes/paper-plane/jquery.colorpicker.css
> %%CACTIDIR%%/include/themes/paper-plane/jquery.multiselect.css
>+%%CACTIDIR%%/include/themes/paper-plane/jquery.multiselect.filter.css
> %%CACTIDIR%%/include/themes/paper-plane/jquery.timepicker.css
> %%CACTIDIR%%/include/themes/paper-plane/jquery.zoom.css
> %%CACTIDIR%%/include/themes/paper-plane/main.css
>@@ -1024,8 +1028,8 @@
> %%CACTIDIR%%/include/themes/paw/images/bar-opacity.png
> %%CACTIDIR%%/include/themes/paw/images/bar-pointer.png
> %%CACTIDIR%%/include/themes/paw/images/bar.png
>-%%CACTIDIR%%/include/themes/paw/images/cacti_logo.gif
>-%%CACTIDIR%%/include/themes/paw/images/cacti_logo.svg
>+%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.gif
>+%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.svg
> %%CACTIDIR%%/include/themes/paw/images/favicon.ico
> %%CACTIDIR%%/include/themes/paw/images/favicon.png
> %%CACTIDIR%%/include/themes/paw/images/index.php
>@@ -1054,6 +1058,7 @@
> %%CACTIDIR%%/include/themes/paw/jquery-ui.css
> %%CACTIDIR%%/include/themes/paw/jquery.colorpicker.css
> %%CACTIDIR%%/include/themes/paw/jquery.multiselect.css
>+%%CACTIDIR%%/include/themes/paw/jquery.multiselect.filter.css
> %%CACTIDIR%%/include/themes/paw/jquery.timepicker.css
> %%CACTIDIR%%/include/themes/paw/jquery.zoom.css
> %%CACTIDIR%%/include/themes/paw/main.css
>@@ -1074,8 +1079,8 @@
> %%CACTIDIR%%/include/themes/sunrise/images/bar-opacity.png
> %%CACTIDIR%%/include/themes/sunrise/images/bar-pointer.png
> %%CACTIDIR%%/include/themes/sunrise/images/bar.png
>-%%CACTIDIR%%/include/themes/sunrise/images/cacti_logo.gif
>-%%CACTIDIR%%/include/themes/sunrise/images/cacti_logo.svg
>+%%CACTIDIR%%/include/themes/sunrise/images/%%CACTIUSER%%_logo.gif
>+%%CACTIDIR%%/include/themes/sunrise/images/%%CACTIUSER%%_logo.svg
> %%CACTIDIR%%/include/themes/sunrise/images/favicon.ico
> %%CACTIDIR%%/include/themes/sunrise/images/favicon.png
> %%CACTIDIR%%/include/themes/sunrise/images/index.php
>@@ -1104,6 +1109,7 @@
> %%CACTIDIR%%/include/themes/sunrise/jquery-ui.css
> %%CACTIDIR%%/include/themes/sunrise/jquery.colorpicker.css
> %%CACTIDIR%%/include/themes/sunrise/jquery.multiselect.css
>+%%CACTIDIR%%/include/themes/sunrise/jquery.multiselect.filter.css
> %%CACTIDIR%%/include/themes/sunrise/jquery.timepicker.css
> %%CACTIDIR%%/include/themes/sunrise/jquery.zoom.css
> %%CACTIDIR%%/include/themes/sunrise/main.css
>@@ -1113,6 +1119,34 @@
> %%CACTIDIR%%/include/top_general_header.php
> %%CACTIDIR%%/include/top_graph_header.php
> %%CACTIDIR%%/include/top_header.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/LICENSE
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/README.md
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/UNICODE-LICENSE.txt
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules.bat
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/composer.json
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/phpunit.xml
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/Category.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/CldrData.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Docs.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Exporter.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Html.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Json.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Php.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Po.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Prettyjson.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/Exporter/Xml.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/FormulaConverter.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/Language.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/autoloader.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/cldr-data/main/en-US/languages.json
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/cldr-data/main/en-US/scripts.json
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/cldr-data/main/en-US/territories.json
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/src/cldr-data/supplemental/plurals.json
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/tests/Get/GetTest.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/tests/Rules/RulesTest.php
>+%%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/tests/bootstrap.php
> %%CACTIDIR%%/include/vendor/csrf/LICENSE
> %%CACTIDIR%%/include/vendor/csrf/NEWS
> %%CACTIDIR%%/include/vendor/csrf/README
>@@ -1659,6 +1693,234 @@
> %%CACTIDIR%%/include/vendor/flag-icon-css/sass/index.php
> %%CACTIDIR%%/include/vendor/flag-icon-css/svgo.yaml
> %%CACTIDIR%%/include/vendor/flag-icon-css/yarn.lock
>+%%CACTIDIR%%/include/vendor/gettext/CHANGELOG.md
>+%%CACTIDIR%%/include/vendor/gettext/CONTRIBUTING.md
>+%%CACTIDIR%%/include/vendor/gettext/LICENSE
>+%%CACTIDIR%%/include/vendor/gettext/README.md
>+%%CACTIDIR%%/include/vendor/gettext/composer.json
>+%%CACTIDIR%%/include/vendor/gettext/oscarotero.php
>+%%CACTIDIR%%/include/vendor/gettext/phpcs.xml
>+%%CACTIDIR%%/include/vendor/gettext/phpunit.xml
>+%%CACTIDIR%%/include/vendor/gettext/src/BaseTranslator.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/Blade.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/Csv.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/CsvDictionary.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/Extractor.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/ExtractorInterface.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/Jed.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/JsCode.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/Json.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/JsonDictionary.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/Mo.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/PhpCode.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/Po.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/Twig.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/VueJs.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/Xliff.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/Yaml.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Extractors/YamlDictionary.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/Csv.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/CsvDictionary.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/Generator.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/GeneratorInterface.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/Jed.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/Json.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/JsonDictionary.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/Mo.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/Po.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/Xliff.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/Yaml.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Generators/YamlDictionary.php
>+%%CACTIDIR%%/include/vendor/gettext/src/GettextTranslator.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Merge.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Translation.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Translations.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Translator.php
>+%%CACTIDIR%%/include/vendor/gettext/src/TranslatorInterface.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/CsvTrait.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/DictionaryTrait.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/FunctionsScanner.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/HeadersExtractorTrait.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/HeadersGeneratorTrait.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/JsFunctionsScanner.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/MultidimensionalArrayTrait.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/ParsedComment.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/ParsedFunction.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/PhpFunctionsScanner.php
>+%%CACTIDIR%%/include/vendor/gettext/src/Utils/StringReader.php
>+%%CACTIDIR%%/include/vendor/gettext/src/autoloader.php
>+%%CACTIDIR%%/include/vendor/gettext/src/oscarotero.txt
>+%%CACTIDIR%%/include/vendor/gettext/src/translator_functions.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/AbstractTest.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/AssetsTest.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/LocalesTest.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/MergeEntriesTest.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/MergeHeadersTest.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/MergeTranslationsTest.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/StringsTest.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/TranslationTest.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/TranslationsTest.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/TranslatorTest.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/blade/input.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jed/input.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode/input.js
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/jscode2/input.js
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode/input.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode2/input.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode3/input.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/phpcode4/input.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po/input.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po2/input.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/po3/input.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/twig/input.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/Csv.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/CsvDictionary.csv
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/Jed.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/Json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/Json.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/JsonDictionary.json
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/Mo.mo
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/PhpArray.php
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/Po.po
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/Xliff.xlf
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/Yaml.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/YamlDictionary.yml
>+%%CACTIDIR%%/include/vendor/gettext/tests/assets/vuejs/input.vue
>+%%CACTIDIR%%/include/vendor/gettext/tests/bootstrap.php
> %%CACTIDIR%%/include/vendor/index.php
> %%CACTIDIR%%/include/vendor/phpgettext/gettext.php
> %%CACTIDIR%%/include/vendor/phpgettext/index.php
>@@ -1776,12 +2038,12 @@
> %%CACTIDIR%%/install/colors.csv
> %%CACTIDIR%%/install/functions.php
> %%CACTIDIR%%/install/index.php
>-%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz
> %%CACTIDIR%%/install/install.css
> %%CACTIDIR%%/install/install.js
> %%CACTIDIR%%/install/install.php
> %%CACTIDIR%%/install/step_json.php
> %%CACTIDIR%%/install/templates/Cacti_Stats.xml.gz
>+%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz
> %%CACTIDIR%%/install/templates/Generic_SNMP_Device.xml.gz
> %%CACTIDIR%%/install/templates/Local_Linux_Machine.xml.gz
> %%CACTIDIR%%/install/templates/NetSNMP_Device.xml.gz
>@@ -1808,14 +2070,10 @@
> %%CACTIDIR%%/install/upgrades/1_0_0.php
> %%CACTIDIR%%/install/upgrades/1_0_4.php
> %%CACTIDIR%%/install/upgrades/1_0_5.php
>-%%CACTIDIR%%/install/upgrades/1_1_2.php
>-%%CACTIDIR%%/install/upgrades/1_1_4.php
>-%%CACTIDIR%%/install/upgrades/1_1_6.php
>-%%CACTIDIR%%/install/upgrades/1_1_7.php
>-%%CACTIDIR%%/install/upgrades/1_1_8.php
> %%CACTIDIR%%/install/upgrades/1_1_11.php
> %%CACTIDIR%%/install/upgrades/1_1_14.php
> %%CACTIDIR%%/install/upgrades/1_1_17.php
>+%%CACTIDIR%%/install/upgrades/1_1_2.php
> %%CACTIDIR%%/install/upgrades/1_1_20.php
> %%CACTIDIR%%/install/upgrades/1_1_26.php
> %%CACTIDIR%%/install/upgrades/1_1_28.php
>@@ -1824,11 +2082,16 @@
> %%CACTIDIR%%/install/upgrades/1_1_35.php
> %%CACTIDIR%%/install/upgrades/1_1_36.php
> %%CACTIDIR%%/install/upgrades/1_1_37.php
>+%%CACTIDIR%%/install/upgrades/1_1_4.php
>+%%CACTIDIR%%/install/upgrades/1_1_6.php
>+%%CACTIDIR%%/install/upgrades/1_1_7.php
>+%%CACTIDIR%%/install/upgrades/1_1_8.php
> %%CACTIDIR%%/install/upgrades/1_2_0.php
> %%CACTIDIR%%/install/upgrades/1_2_1.php
> %%CACTIDIR%%/install/upgrades/1_2_2.php
> %%CACTIDIR%%/install/upgrades/1_2_3.php
> %%CACTIDIR%%/install/upgrades/1_2_5.php
>+%%CACTIDIR%%/install/upgrades/1_2_7.php
> %%CACTIDIR%%/install/upgrades/index.php
> %%CACTIDIR%%/lib/aggregate.php
> %%CACTIDIR%%/lib/api_aggregate.php
>@@ -1909,7 +2172,7 @@
> %%CACTIDIR%%/locales/index.php
> %%CACTIDIR%%/locales/po/ar-SA.po
> %%CACTIDIR%%/locales/po/bg-BG.po
>-%%CACTIDIR%%/locales/po/cacti.pot
>+%%CACTIDIR%%/locales/po/%%CACTIUSER%%.pot
> %%CACTIDIR%%/locales/po/de-DE.po
> %%CACTIDIR%%/locales/po/el-GR.po
> %%CACTIDIR%%/locales/po/es-ES.po
>@@ -2020,9 +2283,9 @@
> @comment
> @owner %%CACTIUSER%%
> @group %%CACTIGROUP%%
>-@dir /var/log/cacti
>-@dir /var/db/cacti/rra
>-@dir /var/db/cacti/scripts
>-@dir /var/db/cacti
>+@dir /var/db/%%CACTIUSER%%/rra
>+@dir /var/db/%%CACTIUSER%%/scripts
>+@dir /var/db/%%CACTIUSER%%
>+@dir /var/log/%%CACTIUSER%%
> @group wheel
> @owner root

Flags:

kai: maintainer-approval+
m.muenz: maintainer-approval+

Actions: View | Diff

Attachments on bug 240999: 208010