Attachment #182085 for bug #217707




# $FreeBSD: head/net-mgmt/cacti/Makefile 433809 2017-02-10 15:50:53Z vanilla $

PORTNAME=	cacti
PORTVERSION=	1.1.4
CATEGORIES=	net-mgmt www
MASTER_SITES=	http://www.cacti.net/downloads/ \
		ftp://ftpmirror.uk/freebsd-ports/cacti/

RUN_DEPENDS=	rrdtool:databases/rrdtool

USES=		cpe mysql php:web shebangfix
USE_PHP=	ctype filter gd gettext gmp hash json ldap mbstring openssl pcre pdo pdo_mysql posix session simplexml sockets snmp xml zlib
NO_ARCH=	yes
NO_BUILD=	yes
PKGMESSAGE=	${WRKDIR}/pkg-message
SUB_FILES=	pkg-message
SHEBANG_FILES=	scripts/3com_cable_modem.pl \
		scripts/diskfree.pl \

USERS?=		${CACTIUSER}
GROUPS?=	${CACTIGROUP}

WRKSRC=		${WRKDIR}/${PORTNAME}-${SITEDISTVERSION}

SITEDISTVERSION=	${PORTVERSION:S/${PATCHLEVEL}$//}

PLIST_SUB+=	CACTIDIR=${CACTIDIR}  CACTIUSER=${CACTIUSER} \
		CACTIGROUP=${CACTIGROUP}
SUB_LIST+=	CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \

Lines 1-3 Link Here

(-)net-mgmt/cacti/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1486494702	1	TIMESTAMP = 1493106955
2	SHA256 (cacti-1.0.1.tar.gz) = cc36b83653cecd2be0a4a239927dcdaafeb81e7fd7ad6f97c664edcb7fb07628	2	SHA256 (cacti-1.1.4.tar.gz) = a8eb7f8bec3e5950d91740305cd03ab4100ee5f0ef51758a24b0452153a1a6e4
3	SIZE (cacti-1.0.1.tar.gz) = 7230227	3	SIZE (cacti-1.1.4.tar.gz) = 7845591




--- poller_maintenance.php.orig	2017-04-24 03:25:50.000000000 +0100
+++ poller_maintenance.php	2017-04-25 14:27:06.327800000 +0100
@@ -175,13 +175,13 @@
 
 	$log = read_config_option('path_cactilog');
 	if ($log == '') {
-		$log = $config['base_path'] . '/log/cacti.log';
+		$log = '/var/log/cacti/log';
 	}
 
 	set_config_option('logrotate_lastrun', time());
 	clearstatcache();
 
-	if (is_writable(dirname($log) . '/') && is_writable($log)) {
+	if (is_writable('/var/log/cacti') && is_writable($log)) {
 		$perms = octdec(substr(decoct( fileperms($log) ), 2));
 		$owner = fileowner($log);




%%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/calendar.gif

%%CACTIDIR%%/images/transparent_line.gif
%%CACTIDIR%%/images/tree.png
%%CACTIDIR%%/images/uninstall_icon.gif
%%CACTIDIR%%/images/view_aggregate_children.png
%%CACTIDIR%%/images/view_none.gif
%%CACTIDIR%%/images/view_page.png
%%CACTIDIR%%/include/auth.php

%%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/index.php
%%CACTIDIR%%/include/fa/fonts/FontAwesome.otf

%%CACTIDIR%%/include/js/jquery-ui.js
%%CACTIDIR%%/include/js/jstree.js
%%CACTIDIR%%/include/js/pace.js
%%CACTIDIR%%/include/js/screenfull.js
%%CACTIDIR%%/include/layout.js
%%CACTIDIR%%/include/main.css
%%CACTIDIR%%/include/phpgettext/gettext.php

%%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/%%CACTIUSER%%_logo.gif
%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.svg
%%CACTIDIR%%/include/themes/classic/images/favicon.ico
%%CACTIDIR%%/include/themes/classic/images/index.php
%%CACTIDIR%%/include/themes/classic/images/map-opacity.png
%%CACTIDIR%%/include/themes/classic/images/map-pointer.png

%%CACTIDIR%%/include/themes/dark/images/bar.png
%%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/index.php
%%CACTIDIR%%/include/themes/dark/images/map-opacity.png
%%CACTIDIR%%/include/themes/dark/images/map-pointer.png

%%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/%%CACTIUSER%%_logo.gif
%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.svg
%%CACTIDIR%%/include/themes/modern/images/favicon.ico
%%CACTIDIR%%/include/themes/modern/images/index.php
%%CACTIDIR%%/include/themes/modern/images/map-opacity.png
%%CACTIDIR%%/include/themes/modern/images/map-pointer.png

%%CACTIDIR%%/include/themes/modern/main.js
%%CACTIDIR%%/include/themes/modern/pace.css
%%CACTIDIR%%/include/themes/modern/rrdtheme.php
%%CACTIDIR%%/include/themes/paper-plane/c3.css
%%CACTIDIR%%/include/themes/paper-plane/default/32px.png
%%CACTIDIR%%/include/themes/paper-plane/default/40px.png
%%CACTIDIR%%/include/themes/paper-plane/default/index.php
%%CACTIDIR%%/include/themes/paper-plane/default/style.css
%%CACTIDIR%%/include/themes/paper-plane/default/style.min.css
%%CACTIDIR%%/include/themes/paper-plane/default/throbber.gif
%%CACTIDIR%%/include/themes/paper-plane/images/bar-alpha.png
%%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/%%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/index.php
%%CACTIDIR%%/include/themes/paper-plane/images/map-opacity.png
%%CACTIDIR%%/include/themes/paper-plane/images/map-pointer.png
%%CACTIDIR%%/include/themes/paper-plane/images/map.png
%%CACTIDIR%%/include/themes/paper-plane/images/preview-opacity.png
%%CACTIDIR%%/include/themes/paper-plane/images/tab_list.gif
%%CACTIDIR%%/include/themes/paper-plane/images/tab_preview.gif
%%CACTIDIR%%/include/themes/paper-plane/images/tab_tree.gif
%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_flat_0_aaaaaa_40x100.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_flat_75_ffffff_40x100.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_55_fbf9ee_1x400.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_65_ffffff_1x400.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_75_dadada_1x400.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_75_e6e6e6_1x400.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_95_fef1ec_1x400.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_highlight-soft_75_cccccc_1x100.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-colorpicker.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_222222_256x240.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_2e83ff_256x240.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_454545_256x240.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_888888_256x240.png
%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_cd0a0a_256x240.png
%%CACTIDIR%%/include/themes/paper-plane/index.php
%%CACTIDIR%%/include/themes/paper-plane/jquery-ui.css
%%CACTIDIR%%/include/themes/paper-plane/jquery-ui.org.css
%%CACTIDIR%%/include/themes/paper-plane/jquery.colorpicker.css
%%CACTIDIR%%/include/themes/paper-plane/jquery.multiselect.css
%%CACTIDIR%%/include/themes/paper-plane/jquery.timepicker.css
%%CACTIDIR%%/include/themes/paper-plane/jquery.zoom.css
%%CACTIDIR%%/include/themes/paper-plane/main.css
%%CACTIDIR%%/include/themes/paper-plane/main.js
%%CACTIDIR%%/include/themes/paper-plane/pace.css
%%CACTIDIR%%/include/themes/paper-plane/rrdtheme.php
%%CACTIDIR%%/include/themes/paw/c3.css
%%CACTIDIR%%/include/themes/paw/default/32px.png
%%CACTIDIR%%/include/themes/paw/default/40px.png

%%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/%%CACTIUSER%%_logo.gif
%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.svg
%%CACTIDIR%%/include/themes/paw/images/favicon.ico
%%CACTIDIR%%/include/themes/paw/images/index.php
%%CACTIDIR%%/include/themes/paw/images/map-opacity.png
%%CACTIDIR%%/include/themes/paw/images/map-pointer.png

%%CACTIDIR%%/install/0_8_8h_to_1_0_0.php
%%CACTIDIR%%/install/0_8_to_0_8_1.php
%%CACTIDIR%%/install/1_0_0_to_1_0_1.php
%%CACTIDIR%%/install/1_0_1_to_1_0_2.php
%%CACTIDIR%%/install/1_0_2_to_1_0_3.php
%%CACTIDIR%%/install/1_0_3_to_1_0_4.php
%%CACTIDIR%%/install/1_0_4_to_1_0_5.php
%%CACTIDIR%%/install/1_0_5_to_1_0_6.php
%%CACTIDIR%%/install/1_0_6_to_1_1_0.php
%%CACTIDIR%%/install/1_1_0_to_1_1_1.php
%%CACTIDIR%%/install/1_1_1_to_1_1_2.php
%%CACTIDIR%%/install/1_1_2_to_1_1_3.php
%%CACTIDIR%%/install/1_1_3_to_1_1_4.php
%%CACTIDIR%%/install/colors.csv
%%CACTIDIR%%/install/functions.php
%%CACTIDIR%%/install/import_colors.php

%%CACTIDIR%%/locales/LC_MESSAGES/spanish_spain.mo
%%CACTIDIR%%/locales/LC_MESSAGES/swedish_sweden.mo
%%CACTIDIR%%/locales/po/%%CACTIUSER%%.pot
%%CACTIDIR%%/locales/po/german_germany.po
%%CACTIDIR%%/locales/po/russian_russia.po
%%CACTIDIR%%/logout.php
%%CACTIDIR%%/managers.php
%%CACTIDIR%%/mibs/CACTI-BOOST-MIB

Return to bug 217707

Lines 1-7 Link Here

(-)net-mgmt/cacti/Makefile (-7 / +2 lines)
1	# $FreeBSD: head/net-mgmt/cacti/Makefile 433809 2017-02-10 15:50:53Z vanilla $	1	# $FreeBSD: head/net-mgmt/cacti/Makefile 433809 2017-02-10 15:50:53Z vanilla $
2		2
3	PORTNAME= cacti	3	PORTNAME= cacti
4	PORTVERSION= 1.0.1	4	PORTVERSION= 1.1.4
5	CATEGORIES= net-mgmt www	5	CATEGORIES= net-mgmt www
6	MASTER_SITES= http://www.cacti.net/downloads/ \	6	MASTER_SITES= http://www.cacti.net/downloads/ \
7	ftp://ftpmirror.uk/freebsd-ports/cacti/	7	ftp://ftpmirror.uk/freebsd-ports/cacti/
Lines 15-24 Link Here
15	RUN_DEPENDS= rrdtool:databases/rrdtool	15	RUN_DEPENDS= rrdtool:databases/rrdtool
16		16
17	USES= cpe mysql php:web shebangfix	17	USES= cpe mysql php:web shebangfix
18	USE_PHP= ctype filter gd gmp hash json ldap mbstring openssl pcre pdo pdo_mysql posix session simplexml sockets snmp xml zlib	18	USE_PHP= ctype filter gd gettext gmp hash json ldap mbstring openssl pcre pdo pdo_mysql posix session simplexml sockets snmp xml zlib
19	NO_ARCH= yes	19	NO_ARCH= yes
20	NO_BUILD= yes	20	NO_BUILD= yes
21	PKGMESSAGE= ${WRKDIR}/pkg-message
22	SUB_FILES= pkg-message	21	SUB_FILES= pkg-message
23	SHEBANG_FILES= scripts/3com_cable_modem.pl \	22	SHEBANG_FILES= scripts/3com_cable_modem.pl \
24	scripts/diskfree.pl \	23	scripts/diskfree.pl \
Lines 40-49 Link Here
40	USERS?= ${CACTIUSER}	39	USERS?= ${CACTIUSER}
41	GROUPS?= ${CACTIGROUP}	40	GROUPS?= ${CACTIGROUP}
42		41
43	WRKSRC= ${WRKDIR}/${PORTNAME}-${SITEDISTVERSION}
44
45	SITEDISTVERSION= ${PORTVERSION:S/${PATCHLEVEL}$//}
46
47	PLIST_SUB+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \	42	PLIST_SUB+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \
48	CACTIGROUP=${CACTIGROUP}	43	CACTIGROUP=${CACTIGROUP}
49	SUB_LIST+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \	44	SUB_LIST+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \

Lines 1-14 Link Here

(-)net-mgmt/cacti/files/patch-poller_maintenance.php (-9 / +12 lines)
1	--- poller_maintenance.php.orig 2017-02-04 14:23:37.951265000 +0000	1	--- poller_maintenance.php.orig 2017-04-24 03:25:50.000000000 +0100
2	+++ poller_maintenance.php 2017-02-04 14:24:49.403929000 +0000	2	+++ poller_maintenance.php 2017-04-25 14:27:06.327800000 +0100
3	@@ -172,10 +172,10 @@	3	@@ -175,13 +175,13 @@
4	*/	4
5	function logrotate_rotatenow () {	5	$log = read_config_option('path_cactilog');
6	global $config;	6	if ($log == '') {
7	- $log = $config['base_path'] . '/log/cacti.log';	7	- $log = $config['base_path'] . '/log/cacti.log';
8	+ $log = '/var/log/cacti/log';	8	+ $log = '/var/log/cacti/log';
		9	}
		10
9	set_config_option('logrotate_lastrun', time());	11	set_config_option('logrotate_lastrun', time());
10	clearstatcache();	12	clearstatcache();
11	- if (is_writable($config['base_path'] . '/log/') && is_writable($log)) {	13
		14	- if (is_writable(dirname($log) . '/') && is_writable($log)) {
12	+ if (is_writable('/var/log/cacti') && is_writable($log)) {	15	+ if (is_writable('/var/log/cacti') && is_writable($log)) {
13	$perms = octdec(substr(decoct( fileperms($log) ), 2));	16	$perms = octdec(substr(decoct( fileperms($log) ), 2));
14	$owner = fileowner($log);	17	$owner = fileowner($log);

Lines 197-202 Link Here

(-)net-mgmt/cacti/pkg-plist (+71 lines)
197	%%CACTIDIR%%/images/%%CACTIUSER%%_about_logo.gif	197	%%CACTIDIR%%/images/%%CACTIUSER%%_about_logo.gif
198	%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop.gif	198	%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop.gif
199	%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop2.gif	199	%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop2.gif
		200	%%CACTIDIR%%/images/%%CACTIUSER%%_error_image.png
200	%%CACTIDIR%%/images/%%CACTIUSER%%_logo.gif	201	%%CACTIDIR%%/images/%%CACTIUSER%%_logo.gif
201	%%CACTIDIR%%/images/%%CACTIUSER%%_logo_new.gif	202	%%CACTIDIR%%/images/%%CACTIUSER%%_logo_new.gif
202	%%CACTIDIR%%/images/calendar.gif	203	%%CACTIDIR%%/images/calendar.gif
Lines 263-268 Link Here
263	%%CACTIDIR%%/images/transparent_line.gif	264	%%CACTIDIR%%/images/transparent_line.gif
264	%%CACTIDIR%%/images/tree.png	265	%%CACTIDIR%%/images/tree.png
265	%%CACTIDIR%%/images/uninstall_icon.gif	266	%%CACTIDIR%%/images/uninstall_icon.gif
		267	%%CACTIDIR%%/images/view_aggregate_children.png
266	%%CACTIDIR%%/images/view_none.gif	268	%%CACTIDIR%%/images/view_none.gif
267	%%CACTIDIR%%/images/view_page.png	269	%%CACTIDIR%%/images/view_page.png
268	%%CACTIDIR%%/include/auth.php	270	%%CACTIDIR%%/include/auth.php
Lines 280-285 Link Here
280	%%CACTIDIR%%/include/csrf/csrf-magic.php	282	%%CACTIDIR%%/include/csrf/csrf-magic.php
281	%%CACTIDIR%%/include/csrf/index.php	283	%%CACTIDIR%%/include/csrf/index.php
282	%%CACTIDIR%%/include/fa/css/font-awesome.css	284	%%CACTIDIR%%/include/fa/css/font-awesome.css
		285	%%CACTIDIR%%/include/fa/css/font-awesome.css.map
283	%%CACTIDIR%%/include/fa/css/font-awesome.min.css	286	%%CACTIDIR%%/include/fa/css/font-awesome.min.css
284	%%CACTIDIR%%/include/fa/css/index.php	287	%%CACTIDIR%%/include/fa/css/index.php
285	%%CACTIDIR%%/include/fa/fonts/FontAwesome.otf	288	%%CACTIDIR%%/include/fa/fonts/FontAwesome.otf
Lines 379-384 Link Here
379	%%CACTIDIR%%/include/js/jquery-ui.js	382	%%CACTIDIR%%/include/js/jquery-ui.js
380	%%CACTIDIR%%/include/js/jstree.js	383	%%CACTIDIR%%/include/js/jstree.js
381	%%CACTIDIR%%/include/js/pace.js	384	%%CACTIDIR%%/include/js/pace.js
		385	%%CACTIDIR%%/include/js/screenfull.js
382	%%CACTIDIR%%/include/layout.js	386	%%CACTIDIR%%/include/layout.js
383	%%CACTIDIR%%/include/main.css	387	%%CACTIDIR%%/include/main.css
384	%%CACTIDIR%%/include/phpgettext/gettext.php	388	%%CACTIDIR%%/include/phpgettext/gettext.php
Lines 756-762 Link Here
756	%%CACTIDIR%%/include/themes/classic/images/bar-opacity.png	760	%%CACTIDIR%%/include/themes/classic/images/bar-opacity.png
757	%%CACTIDIR%%/include/themes/classic/images/bar-pointer.png	761	%%CACTIDIR%%/include/themes/classic/images/bar-pointer.png
758	%%CACTIDIR%%/include/themes/classic/images/bar.png	762	%%CACTIDIR%%/include/themes/classic/images/bar.png
		763	%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.gif
759	%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.svg	764	%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.svg
		765	%%CACTIDIR%%/include/themes/classic/images/favicon.ico
760	%%CACTIDIR%%/include/themes/classic/images/index.php	766	%%CACTIDIR%%/include/themes/classic/images/index.php
761	%%CACTIDIR%%/include/themes/classic/images/map-opacity.png	767	%%CACTIDIR%%/include/themes/classic/images/map-opacity.png
762	%%CACTIDIR%%/include/themes/classic/images/map-pointer.png	768	%%CACTIDIR%%/include/themes/classic/images/map-pointer.png
Lines 816-822 Link Here
816	%%CACTIDIR%%/include/themes/dark/images/bar.png	822	%%CACTIDIR%%/include/themes/dark/images/bar.png
817	%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop.gif	823	%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop.gif
818	%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop2.gif	824	%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop2.gif
		825	%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.gif
819	%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.svg	826	%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.svg
		827	%%CACTIDIR%%/include/themes/dark/images/favicon.ico
820	%%CACTIDIR%%/include/themes/dark/images/index.php	828	%%CACTIDIR%%/include/themes/dark/images/index.php
821	%%CACTIDIR%%/include/themes/dark/images/map-opacity.png	829	%%CACTIDIR%%/include/themes/dark/images/map-opacity.png
822	%%CACTIDIR%%/include/themes/dark/images/map-pointer.png	830	%%CACTIDIR%%/include/themes/dark/images/map-pointer.png
Lines 862-868 Link Here
862	%%CACTIDIR%%/include/themes/modern/images/bar-opacity.png	870	%%CACTIDIR%%/include/themes/modern/images/bar-opacity.png
863	%%CACTIDIR%%/include/themes/modern/images/bar-pointer.png	871	%%CACTIDIR%%/include/themes/modern/images/bar-pointer.png
864	%%CACTIDIR%%/include/themes/modern/images/bar.png	872	%%CACTIDIR%%/include/themes/modern/images/bar.png
		873	%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.gif
865	%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.svg	874	%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.svg
		875	%%CACTIDIR%%/include/themes/modern/images/favicon.ico
866	%%CACTIDIR%%/include/themes/modern/images/index.php	876	%%CACTIDIR%%/include/themes/modern/images/index.php
867	%%CACTIDIR%%/include/themes/modern/images/map-opacity.png	877	%%CACTIDIR%%/include/themes/modern/images/map-opacity.png
868	%%CACTIDIR%%/include/themes/modern/images/map-pointer.png	878	%%CACTIDIR%%/include/themes/modern/images/map-pointer.png
Lines 895-900 Link Here
895	%%CACTIDIR%%/include/themes/modern/main.js	905	%%CACTIDIR%%/include/themes/modern/main.js
896	%%CACTIDIR%%/include/themes/modern/pace.css	906	%%CACTIDIR%%/include/themes/modern/pace.css
897	%%CACTIDIR%%/include/themes/modern/rrdtheme.php	907	%%CACTIDIR%%/include/themes/modern/rrdtheme.php
		908	%%CACTIDIR%%/include/themes/paper-plane/c3.css
		909	%%CACTIDIR%%/include/themes/paper-plane/default/32px.png
		910	%%CACTIDIR%%/include/themes/paper-plane/default/40px.png
		911	%%CACTIDIR%%/include/themes/paper-plane/default/index.php
		912	%%CACTIDIR%%/include/themes/paper-plane/default/style.css
		913	%%CACTIDIR%%/include/themes/paper-plane/default/style.min.css
		914	%%CACTIDIR%%/include/themes/paper-plane/default/throbber.gif
		915	%%CACTIDIR%%/include/themes/paper-plane/images/bar-alpha.png
		916	%%CACTIDIR%%/include/themes/paper-plane/images/bar-opacity.png
		917	%%CACTIDIR%%/include/themes/paper-plane/images/bar-pointer.png
		918	%%CACTIDIR%%/include/themes/paper-plane/images/bar.png
		919	%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.gif
		920	%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.svg
		921	%%CACTIDIR%%/include/themes/paper-plane/images/favicon.ico
		922	%%CACTIDIR%%/include/themes/paper-plane/images/index.php
		923	%%CACTIDIR%%/include/themes/paper-plane/images/map-opacity.png
		924	%%CACTIDIR%%/include/themes/paper-plane/images/map-pointer.png
		925	%%CACTIDIR%%/include/themes/paper-plane/images/map.png
		926	%%CACTIDIR%%/include/themes/paper-plane/images/preview-opacity.png
		927	%%CACTIDIR%%/include/themes/paper-plane/images/tab_list.gif
		928	%%CACTIDIR%%/include/themes/paper-plane/images/tab_preview.gif
		929	%%CACTIDIR%%/include/themes/paper-plane/images/tab_tree.gif
		930	%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_flat_0_aaaaaa_40x100.png
		931	%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_flat_75_ffffff_40x100.png
		932	%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_55_fbf9ee_1x400.png
		933	%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_65_ffffff_1x400.png
		934	%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_75_dadada_1x400.png
		935	%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_75_e6e6e6_1x400.png
		936	%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_95_fef1ec_1x400.png
		937	%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_highlight-soft_75_cccccc_1x100.png
		938	%%CACTIDIR%%/include/themes/paper-plane/images/ui-colorpicker.png
		939	%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_222222_256x240.png
		940	%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_2e83ff_256x240.png
		941	%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_454545_256x240.png
		942	%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_888888_256x240.png
		943	%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_cd0a0a_256x240.png
		944	%%CACTIDIR%%/include/themes/paper-plane/index.php
		945	%%CACTIDIR%%/include/themes/paper-plane/jquery-ui.css
		946	%%CACTIDIR%%/include/themes/paper-plane/jquery-ui.org.css
		947	%%CACTIDIR%%/include/themes/paper-plane/jquery.colorpicker.css
		948	%%CACTIDIR%%/include/themes/paper-plane/jquery.multiselect.css
		949	%%CACTIDIR%%/include/themes/paper-plane/jquery.timepicker.css
		950	%%CACTIDIR%%/include/themes/paper-plane/jquery.zoom.css
		951	%%CACTIDIR%%/include/themes/paper-plane/main.css
		952	%%CACTIDIR%%/include/themes/paper-plane/main.js
		953	%%CACTIDIR%%/include/themes/paper-plane/pace.css
		954	%%CACTIDIR%%/include/themes/paper-plane/rrdtheme.php
898	%%CACTIDIR%%/include/themes/paw/c3.css	955	%%CACTIDIR%%/include/themes/paw/c3.css
899	%%CACTIDIR%%/include/themes/paw/default/32px.png	956	%%CACTIDIR%%/include/themes/paw/default/32px.png
900	%%CACTIDIR%%/include/themes/paw/default/40px.png	957	%%CACTIDIR%%/include/themes/paw/default/40px.png
Lines 906-912 Link Here
906	%%CACTIDIR%%/include/themes/paw/images/bar-opacity.png	963	%%CACTIDIR%%/include/themes/paw/images/bar-opacity.png
907	%%CACTIDIR%%/include/themes/paw/images/bar-pointer.png	964	%%CACTIDIR%%/include/themes/paw/images/bar-pointer.png
908	%%CACTIDIR%%/include/themes/paw/images/bar.png	965	%%CACTIDIR%%/include/themes/paw/images/bar.png
		966	%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.gif
909	%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.svg	967	%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.svg
		968	%%CACTIDIR%%/include/themes/paw/images/favicon.ico
910	%%CACTIDIR%%/include/themes/paw/images/index.php	969	%%CACTIDIR%%/include/themes/paw/images/index.php
911	%%CACTIDIR%%/include/themes/paw/images/map-opacity.png	970	%%CACTIDIR%%/include/themes/paw/images/map-opacity.png
912	%%CACTIDIR%%/include/themes/paw/images/map-pointer.png	971	%%CACTIDIR%%/include/themes/paw/images/map-pointer.png
Lines 978-983 Link Here
978	%%CACTIDIR%%/install/0_8_8h_to_1_0_0.php	1037	%%CACTIDIR%%/install/0_8_8h_to_1_0_0.php
979	%%CACTIDIR%%/install/0_8_to_0_8_1.php	1038	%%CACTIDIR%%/install/0_8_to_0_8_1.php
980	%%CACTIDIR%%/install/1_0_0_to_1_0_1.php	1039	%%CACTIDIR%%/install/1_0_0_to_1_0_1.php
		1040	%%CACTIDIR%%/install/1_0_1_to_1_0_2.php
		1041	%%CACTIDIR%%/install/1_0_2_to_1_0_3.php
		1042	%%CACTIDIR%%/install/1_0_3_to_1_0_4.php
		1043	%%CACTIDIR%%/install/1_0_4_to_1_0_5.php
		1044	%%CACTIDIR%%/install/1_0_5_to_1_0_6.php
		1045	%%CACTIDIR%%/install/1_0_6_to_1_1_0.php
		1046	%%CACTIDIR%%/install/1_1_0_to_1_1_1.php
		1047	%%CACTIDIR%%/install/1_1_1_to_1_1_2.php
		1048	%%CACTIDIR%%/install/1_1_2_to_1_1_3.php
		1049	%%CACTIDIR%%/install/1_1_3_to_1_1_4.php
981	%%CACTIDIR%%/install/colors.csv	1050	%%CACTIDIR%%/install/colors.csv
982	%%CACTIDIR%%/install/functions.php	1051	%%CACTIDIR%%/install/functions.php
983	%%CACTIDIR%%/install/import_colors.php	1052	%%CACTIDIR%%/install/import_colors.php
Lines 1045-1050 Link Here
1045	%%CACTIDIR%%/locales/LC_MESSAGES/spanish_spain.mo	1114	%%CACTIDIR%%/locales/LC_MESSAGES/spanish_spain.mo
1046	%%CACTIDIR%%/locales/LC_MESSAGES/swedish_sweden.mo	1115	%%CACTIDIR%%/locales/LC_MESSAGES/swedish_sweden.mo
1047	%%CACTIDIR%%/locales/po/%%CACTIUSER%%.pot	1116	%%CACTIDIR%%/locales/po/%%CACTIUSER%%.pot
		1117	%%CACTIDIR%%/locales/po/german_germany.po
		1118	%%CACTIDIR%%/locales/po/russian_russia.po
1048	%%CACTIDIR%%/logout.php	1119	%%CACTIDIR%%/logout.php
1049	%%CACTIDIR%%/managers.php	1120	%%CACTIDIR%%/managers.php
1050	%%CACTIDIR%%/mibs/CACTI-BOOST-MIB	1121	%%CACTIDIR%%/mibs/CACTI-BOOST-MIB