3 files changed, 69 insertions, 50 deletions

diff --git a/net-mgmt/jffnms/Makefile b/net-mgmt/jffnms/Makefile
index d8c491f6045d..6090d54ca8d0 100644
--- a/net-mgmt/jffnms/Makefile
+++ b/net-mgmt/jffnms/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	jffnms
-PORTVERSION=	0.7.9
+PORTVERSION=	0.8.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
 
-MAINTAINER=	asa@gascom.ru
+MAINTAINER=	asa@agava.com
 COMMENT=	Very advanced network monitoring and control system
 
 RUN_DEPENDS=	neato:${PORTSDIR}/graphics/graphviz \
@@ -29,13 +29,6 @@ CRONTAB?=	/usr/bin/crontab
 PLIST_SUB=	JFFNMSDIR=${JFFNMSDIR}
 
 do-build:
-	@${REINPLACE_CMD} -e 's|/opt/jffnms|${PREFIX}/${JFFNMSDIR}|g' \
-		-e 's|/usr/bin/php|${LOCALBASE}/bin/php|g' \
-		-e 's|/usr/bin/rrdtool|${LOCALBASE}/bin/rrdtool|g' \
-		-e 's|/usr/bin/nmap|${LOCALBASE}/bin/nmap|g' \
-		-e 's|/usr/bin/neato|${LOCALBASE}/bin/neato|g' \
-		-e 's| /jffnms| /htdocs|g' \
-		${WRKSRC}/conf/config.ini
 
 do-install:
 	@-${RM} ${WRKSRC}/engine/tmpwatch.sh.orig > /dev/null 2>&1
diff --git a/net-mgmt/jffnms/distinfo b/net-mgmt/jffnms/distinfo
index afa114cb4f92..624ddcaba545 100644
--- a/net-mgmt/jffnms/distinfo
+++ b/net-mgmt/jffnms/distinfo
@@ -1,2 +1,2 @@
-MD5 (jffnms-0.7.9.tar.gz) = 8b2b60fa8ba1d6853e0ed2eda2d0d28d
-SIZE (jffnms-0.7.9.tar.gz) = 503953
+MD5 (jffnms-0.8.1.tar.gz) = 39ee72722354496574322e8db6b033c6
+SIZE (jffnms-0.8.1.tar.gz) = 519131
diff --git a/net-mgmt/jffnms/pkg-plist b/net-mgmt/jffnms/pkg-plist
index 585efd883f2d..e6ce7eb60c85 100644
--- a/net-mgmt/jffnms/pkg-plist
+++ b/net-mgmt/jffnms/pkg-plist
@@ -6,15 +6,16 @@
 %%JFFNMSDIR%%/TODO
 %%JFFNMSDIR%%/UPGRADE
 %%JFFNMSDIR%%/UPGRADE.win32.txt
-%%JFFNMSDIR%%/conf/config.ini
-%%JFFNMSDIR%%/conf/config.ini.bak
+%%JFFNMSDIR%%/conf/config.parse.func.inc.php
+%%JFFNMSDIR%%/conf/config.parse.inc.php
 %%JFFNMSDIR%%/conf/config.php
-%%JFFNMSDIR%%/conf/functions.php
+%%JFFNMSDIR%%/conf/jffnms.conf.defaults
 %%JFFNMSDIR%%/docs/apache-example
 %%JFFNMSDIR%%/docs/cisco-example
-%%JFFNMSDIR%%/docs/jffnms-0.7.9.mysql
-%%JFFNMSDIR%%/docs/jffnms-0.7.9.pgsql
+%%JFFNMSDIR%%/docs/jffnms-0.8.1.mysql
+%%JFFNMSDIR%%/docs/jffnms-0.8.1.pgsql
 %%JFFNMSDIR%%/docs/sla-creation-example.txt
+%%JFFNMSDIR%%/docs/unix/crontab
 %%JFFNMSDIR%%/docs/unix/msyslog-example
 %%JFFNMSDIR%%/docs/unix/php.ini.example
 %%JFFNMSDIR%%/docs/unix/snmp.conf
@@ -24,35 +25,14 @@
 %%JFFNMSDIR%%/docs/unix/syslog.conf
 %%JFFNMSDIR%%/docs/unix/tac_plus.cfg
 %%JFFNMSDIR%%/docs/unix/tftp
-%%JFFNMSDIR%%/docs/upgrade/jffnms-0.7.8-to-0.7.9.patch
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.aggr
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.apache
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.compaq
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.iis
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.it_rename_bgp
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.mail_from
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.mini_sla
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.pkt_graph
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.pm3
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.temp_aggr
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.win
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.x_fix_internal_ids
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.aggr
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.apache
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.compaq
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.iis
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.it_rename_bgp
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.mail_from
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.mini_sla
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.pkt_graph
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.pm3
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.temp_aggr
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.win
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.x_fix_internal_ids
+%%JFFNMSDIR%%/docs/upgrade/jffnms-0.8.0-to-0.8.1.patch
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.0-to-0.8.1.mysql.diff.x_fix_internal_ids
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.0-to-0.8.1.pgsql.diff.x_fix_internal_ids
 %%JFFNMSDIR%%/docs/utils/adjust_bw.php
 %%JFFNMSDIR%%/docs/utils/clean_auth.php
 %%JFFNMSDIR%%/docs/utils/exp_poller_test.php
 %%JFFNMSDIR%%/docs/utils/export_custom.php
+%%JFFNMSDIR%%/docs/utils/import_custom.php
 %%JFFNMSDIR%%/docs/utils/int_values_convert.php
 %%JFFNMSDIR%%/docs/utils/jffnms-snmp/iptables.inc.php
 %%JFFNMSDIR%%/docs/utils/jffnms-snmp/jffnms-snmp.php
@@ -72,6 +52,7 @@
 %%JFFNMSDIR%%/docs/utils/sql_diff.php
 %%JFFNMSDIR%%/docs/utils/syslog_file_import.php
 %%JFFNMSDIR%%/docs/utils/tftp_put_host_config.php
+%%JFFNMSDIR%%/docs/windows/SYSLOG_JFFNMS.win32.txt
 %%JFFNMSDIR%%/docs/windows/httpd.conf
 %%JFFNMSDIR%%/docs/windows/php.ini
 %%JFFNMSDIR%%/engine/actions/email.inc.php
@@ -88,6 +69,7 @@
 %%JFFNMSDIR%%/engine/backends/rrd.php
 %%JFFNMSDIR%%/engine/backends/verify_interface_number.php
 %%JFFNMSDIR%%/engine/cleanup_raw_tables.php
+%%JFFNMSDIR%%/engine/configs/alteon_webos.inc.php
 %%JFFNMSDIR%%/engine/configs/cisco_catos.inc.php
 %%JFFNMSDIR%%/engine/configs/cisco_cc.inc.php
 %%JFFNMSDIR%%/engine/configs/cisco_sys.inc.php
@@ -99,11 +81,18 @@
 %%JFFNMSDIR%%/engine/consolidate/syslog.php
 %%JFFNMSDIR%%/engine/consolidate/tacacs.php
 %%JFFNMSDIR%%/engine/consolidate/traps.php
+%%JFFNMSDIR%%/engine/discovery/alteon_realservers.inc.php
+%%JFFNMSDIR%%/engine/discovery/alteon_realservices.inc.php
+%%JFFNMSDIR%%/engine/discovery/alteon_virtualservers.inc.php
 %%JFFNMSDIR%%/engine/discovery/apache.inc.php
+%%JFFNMSDIR%%/engine/discovery/apc.inc.php
 %%JFFNMSDIR%%/engine/discovery/bgp_peers.inc.php
+%%JFFNMSDIR%%/engine/discovery/brocade_fcports.inc.php
+%%JFFNMSDIR%%/engine/discovery/brocade_sensors.inc.php
 %%JFFNMSDIR%%/engine/discovery/cisco_accounting.inc.php
 %%JFFNMSDIR%%/engine/discovery/cisco_envmib.inc.php
 %%JFFNMSDIR%%/engine/discovery/cisco_saagent.inc.php
+%%JFFNMSDIR%%/engine/discovery/cisco_serial_port.inc.php
 %%JFFNMSDIR%%/engine/discovery/cpqmib.inc.php
 %%JFFNMSDIR%%/engine/discovery/css_vips.inc.php
 %%JFFNMSDIR%%/engine/discovery/host_information.inc.php
@@ -118,10 +107,17 @@
 %%JFFNMSDIR%%/engine/discovery/snmp_interfaces.inc.php
 %%JFFNMSDIR%%/engine/discovery/storage.inc.php
 %%JFFNMSDIR%%/engine/discovery/tcp_ports.inc.php
-%%JFFNMSDIR%%/engine/exp_poller_child.php
-%%JFFNMSDIR%%/engine/exp_poller_master.php
 %%JFFNMSDIR%%/engine/graphs/acct_bytes.inc.php
 %%JFFNMSDIR%%/engine/graphs/acct_packets.inc.php
+%%JFFNMSDIR%%/engine/graphs/alteon_failures_sessions.inc.php
+%%JFFNMSDIR%%/engine/graphs/alteon_load_average.inc.php
+%%JFFNMSDIR%%/engine/graphs/alteon_memory.inc.php
+%%JFFNMSDIR%%/engine/graphs/alteon_octets.inc.php
+%%JFFNMSDIR%%/engine/graphs/alteon_octets_aggregation.inc.php
+%%JFFNMSDIR%%/engine/graphs/alteon_sessionrate.inc.php
+%%JFFNMSDIR%%/engine/graphs/alteon_sessionrate_aggregation.inc.php
+%%JFFNMSDIR%%/engine/graphs/alteon_sessions.inc.php
+%%JFFNMSDIR%%/engine/graphs/alteon_sessions_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/apache_bpr.inc.php
 %%JFFNMSDIR%%/engine/graphs/apache_cplo.inc.php
 %%JFFNMSDIR%%/engine/graphs/apache_tac.inc.php
@@ -129,14 +125,19 @@
 %%JFFNMSDIR%%/engine/graphs/apache_tkb.inc.php
 %%JFFNMSDIR%%/engine/graphs/apache_tkb_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/apache_workers.inc.php
+%%JFFNMSDIR%%/engine/graphs/apc_load_capacity.inc.php
+%%JFFNMSDIR%%/engine/graphs/apc_time_remaining.inc.php
+%%JFFNMSDIR%%/engine/graphs/apc_voltages.inc.php
 %%JFFNMSDIR%%/engine/graphs/apps_instances.inc.php
 %%JFFNMSDIR%%/engine/graphs/apps_memory.inc.php
 %%JFFNMSDIR%%/engine/graphs/bgp_updates.inc.php
+%%JFFNMSDIR%%/engine/graphs/brocade_sensor.inc.php
 %%JFFNMSDIR%%/engine/graphs/cisco_mac_bytes.inc.php
 %%JFFNMSDIR%%/engine/graphs/cisco_mac_packets.inc.php
 %%JFFNMSDIR%%/engine/graphs/cisco_saagent_jitter.inc.php
 %%JFFNMSDIR%%/engine/graphs/cisco_saagent_packetloss.inc.php
 %%JFFNMSDIR%%/engine/graphs/cisco_saagent_rtl.inc.php
+%%JFFNMSDIR%%/engine/graphs/cisco_serial.inc.php
 %%JFFNMSDIR%%/engine/graphs/cpu_util.inc.php
 %%JFFNMSDIR%%/engine/graphs/cpu_util_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/css_vip_hits.inc.php
@@ -144,6 +145,7 @@
 %%JFFNMSDIR%%/engine/graphs/drop_packets.inc.php
 %%JFFNMSDIR%%/engine/graphs/error_packets.inc.php
 %%JFFNMSDIR%%/engine/graphs/error_rate.inc.php
+%%JFFNMSDIR%%/engine/graphs/frames.inc.php
 %%JFFNMSDIR%%/engine/graphs/hostmib_users_procs.inc.php
 %%JFFNMSDIR%%/engine/graphs/iis_tbr.inc.php
 %%JFFNMSDIR%%/engine/graphs/iis_tcgir.inc.php
@@ -155,7 +157,9 @@
 %%JFFNMSDIR%%/engine/graphs/packets_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/packets_new.inc.php
 %%JFFNMSDIR%%/engine/graphs/pm_serial.inc.php
+%%JFFNMSDIR%%/engine/graphs/response_time.inc.php
 %%JFFNMSDIR%%/engine/graphs/rtt.inc.php
+%%JFFNMSDIR%%/engine/graphs/sql_records.inc.php
 %%JFFNMSDIR%%/engine/graphs/storage.inc.php
 %%JFFNMSDIR%%/engine/graphs/storage_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/tc_rate.inc.php
@@ -170,6 +174,7 @@
 %%JFFNMSDIR%%/engine/graphs/traffic_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/traffic_pl.inc.php
 %%JFFNMSDIR%%/engine/graphs/traffic_util.inc.php
+%%JFFNMSDIR%%/engine/graphs/traffic_words.inc.php
 %%JFFNMSDIR%%/engine/graphs/ucd_cpu_linux.inc.php
 %%JFFNMSDIR%%/engine/graphs/ucd_cpu_linux_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/ucd_cpu_solaris.inc.php
@@ -180,10 +185,13 @@
 %%JFFNMSDIR%%/engine/handlers/none.inc.php
 %%JFFNMSDIR%%/engine/handlers/rrd_ds.inc.php
 %%JFFNMSDIR%%/engine/handlers/tcp_ports.inc.php
+%%JFFNMSDIR%%/engine/launcher.inc.php
 %%JFFNMSDIR%%/engine/poller.php
+%%JFFNMSDIR%%/engine/poller2.php
 %%JFFNMSDIR%%/engine/poller_helper.php
 %%JFFNMSDIR%%/engine/pollers/apache.php
 %%JFFNMSDIR%%/engine/pollers/bgp_peer_status.php
+%%JFFNMSDIR%%/engine/pollers/brocade_fcport_phystate.php
 %%JFFNMSDIR%%/engine/pollers/buffer.php
 %%JFFNMSDIR%%/engine/pollers/cisco_accounting.php
 %%JFFNMSDIR%%/engine/pollers/cisco_envmib_status.php
@@ -193,6 +201,7 @@
 %%JFFNMSDIR%%/engine/pollers/cisco_saagent_fwpacketloss.php
 %%JFFNMSDIR%%/engine/pollers/cisco_saagent_rtl.php
 %%JFFNMSDIR%%/engine/pollers/cisco_saagent_verify.php
+%%JFFNMSDIR%%/engine/pollers/cisco_serial_port_status.php
 %%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_end.php
 %%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_get_pl.php
 %%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_get_rtt.php
@@ -205,6 +214,7 @@
 %%JFFNMSDIR%%/engine/pollers/livingston_serial_port_status.php
 %%JFFNMSDIR%%/engine/pollers/no_poller.php
 %%JFFNMSDIR%%/engine/pollers/ntp_client.php
+%%JFFNMSDIR%%/engine/pollers/odbc_query.php
 %%JFFNMSDIR%%/engine/pollers/reachability_end.php
 %%JFFNMSDIR%%/engine/pollers/reachability_start.php
 %%JFFNMSDIR%%/engine/pollers/reachability_status.php
@@ -215,6 +225,7 @@
 %%JFFNMSDIR%%/engine/pollers/snmp_interface_status_all.php
 %%JFFNMSDIR%%/engine/pollers/snmp_status.php
 %%JFFNMSDIR%%/engine/pollers/snmp_walk_average.php
+%%JFFNMSDIR%%/engine/pollers/sql_status.php
 %%JFFNMSDIR%%/engine/pollers/tcp_connection_number.php
 %%JFFNMSDIR%%/engine/pollers/tcp_port_content.php
 %%JFFNMSDIR%%/engine/pollers/tcp_status.php
@@ -229,6 +240,8 @@
 %%JFFNMSDIR%%/engine/satellite_distribution.php
 %%JFFNMSDIR%%/engine/shared/.check
 %%JFFNMSDIR%%/engine/shared/catos.inc.php
+%%JFFNMSDIR%%/engine/shared/percentile.inc.php
+%%JFFNMSDIR%%/engine/shared/webos.inc.php
 %%JFFNMSDIR%%/engine/temp/.check
 %%JFFNMSDIR%%/engine/tftp_get_host_config.php
 %%JFFNMSDIR%%/engine/ticket/tiba.inc.php
@@ -248,16 +261,17 @@
 %%JFFNMSDIR%%/htdocs/.check
 %%JFFNMSDIR%%/htdocs/.htaccess
 %%JFFNMSDIR%%/htdocs/admin/adm/adm_alarms.php
-%%JFFNMSDIR%%/htdocs/admin/adm/adm_auth.php
-%%JFFNMSDIR%%/htdocs/admin/adm/adm_hosts.php
+%%JFFNMSDIR%%/htdocs/admin/adm/adm_hosts.inc.php
 %%JFFNMSDIR%%/htdocs/admin/adm/adm_hosts_config.php
 %%JFFNMSDIR%%/htdocs/admin/adm/adm_interfaces.php
+%%JFFNMSDIR%%/htdocs/admin/adm/adm_journals.inc.php
 %%JFFNMSDIR%%/htdocs/admin/adm/adm_nad.php
 %%JFFNMSDIR%%/htdocs/admin/adm/adm_profiles.php
 %%JFFNMSDIR%%/htdocs/admin/adm/adm_profiles_options.php
-%%JFFNMSDIR%%/htdocs/admin/adm/adm_satellites.php
+%%JFFNMSDIR%%/htdocs/admin/adm/adm_satellites.inc.php
 %%JFFNMSDIR%%/htdocs/admin/adm/adm_standard.php
 %%JFFNMSDIR%%/htdocs/admin/adm/adm_triggers_rules.php
+%%JFFNMSDIR%%/htdocs/admin/adm/adm_users.inc.php
 %%JFFNMSDIR%%/htdocs/admin/adm/structures.php
 %%JFFNMSDIR%%/htdocs/admin/adm/test.php
 %%JFFNMSDIR%%/htdocs/admin/calendar.php
@@ -270,15 +284,15 @@
 %%JFFNMSDIR%%/htdocs/admin/menu.php
 %%JFFNMSDIR%%/htdocs/admin/menu_frame.php
 %%JFFNMSDIR%%/htdocs/admin/menu_interface_list.php
-%%JFFNMSDIR%%/htdocs/admin/reports/journal_report.php
 %%JFFNMSDIR%%/htdocs/admin/reports/state_report.php
 %%JFFNMSDIR%%/htdocs/admin/sat_session.inc.php
 %%JFFNMSDIR%%/htdocs/admin/satellite.php
 %%JFFNMSDIR%%/htdocs/admin/setup.php
 %%JFFNMSDIR%%/htdocs/admin/tools.php
 %%JFFNMSDIR%%/htdocs/auth.php
-%%JFFNMSDIR%%/htdocs/blank.html
+%%JFFNMSDIR%%/htdocs/blank.php
 %%JFFNMSDIR%%/htdocs/controls.php
+%%JFFNMSDIR%%/htdocs/default.css
 %%JFFNMSDIR%%/htdocs/events.php
 %%JFFNMSDIR%%/htdocs/frame_interfaces.php
 %%JFFNMSDIR%%/htdocs/frame_interfaces_events.php
@@ -287,18 +301,24 @@
 %%JFFNMSDIR%%/htdocs/images/a-right.png
 %%JFFNMSDIR%%/htdocs/images/a-top.png
 %%JFFNMSDIR%%/htdocs/images/a-up.png
+%%JFFNMSDIR%%/htdocs/images/a1-down.png
 %%JFFNMSDIR%%/htdocs/images/alert.gif
 %%JFFNMSDIR%%/htdocs/images/alert.png
+%%JFFNMSDIR%%/htdocs/images/alert2.gif
 %%JFFNMSDIR%%/htdocs/images/all.png
 %%JFFNMSDIR%%/htdocs/images/ar.png
 %%JFFNMSDIR%%/htdocs/images/at.png
 %%JFFNMSDIR%%/htdocs/images/au.png
+%%JFFNMSDIR%%/htdocs/images/b-left.png
+%%JFFNMSDIR%%/htdocs/images/b-right.png
 %%JFFNMSDIR%%/htdocs/images/be.png
 %%JFFNMSDIR%%/htdocs/images/br.png
 %%JFFNMSDIR%%/htdocs/images/bullet1.png
 %%JFFNMSDIR%%/htdocs/images/bullet2.png
 %%JFFNMSDIR%%/htdocs/images/bullet3.png
 %%JFFNMSDIR%%/htdocs/images/bullet4.png
+%%JFFNMSDIR%%/htdocs/images/bullet5.png
+%%JFFNMSDIR%%/htdocs/images/bullet6.png
 %%JFFNMSDIR%%/htdocs/images/ca.png
 %%JFFNMSDIR%%/htdocs/images/calendar.png
 %%JFFNMSDIR%%/htdocs/images/color.png
@@ -313,8 +333,9 @@
 %%JFFNMSDIR%%/htdocs/images/eu.png
 %%JFFNMSDIR%%/htdocs/images/event.png
 %%JFFNMSDIR%%/htdocs/images/event2.png
-%%JFFNMSDIR%%/htdocs/images/favicon.ico
 %%JFFNMSDIR%%/htdocs/images/filter.png
+%%JFFNMSDIR%%/htdocs/images/filter3.png
+%%JFFNMSDIR%%/htdocs/images/filter4.png
 %%JFFNMSDIR%%/htdocs/images/fr.png
 %%JFFNMSDIR%%/htdocs/images/graph.png
 %%JFFNMSDIR%%/htdocs/images/home.png
@@ -322,7 +343,9 @@
 %%JFFNMSDIR%%/htdocs/images/int1.png
 %%JFFNMSDIR%%/htdocs/images/it.png
 %%JFFNMSDIR%%/htdocs/images/java.png
+%%JFFNMSDIR%%/htdocs/images/jffnms.ico
 %%JFFNMSDIR%%/htdocs/images/jffnms.png
+%%JFFNMSDIR%%/htdocs/images/jffnms_small.png
 %%JFFNMSDIR%%/htdocs/images/lock.png
 %%JFFNMSDIR%%/htdocs/images/log.png
 %%JFFNMSDIR%%/htdocs/images/logoff.png
@@ -332,8 +355,10 @@
 %%JFFNMSDIR%%/htdocs/images/mess.png
 %%JFFNMSDIR%%/htdocs/images/minus.png
 %%JFFNMSDIR%%/htdocs/images/new.png
+%%JFFNMSDIR%%/htdocs/images/new2.png
 %%JFFNMSDIR%%/htdocs/images/normal.png
 %%JFFNMSDIR%%/htdocs/images/nosound.png
+%%JFFNMSDIR%%/htdocs/images/ok.png
 %%JFFNMSDIR%%/htdocs/images/pen.png
 %%JFFNMSDIR%%/htdocs/images/pencil.png
 %%JFFNMSDIR%%/htdocs/images/pl.png
@@ -358,7 +383,6 @@
 %%JFFNMSDIR%%/htdocs/images/uy.png
 %%JFFNMSDIR%%/htdocs/images/world.png
 %%JFFNMSDIR%%/htdocs/index.php
-%%JFFNMSDIR%%/htdocs/journal.php
 %%JFFNMSDIR%%/htdocs/login.php
 %%JFFNMSDIR%%/htdocs/logout.php
 %%JFFNMSDIR%%/htdocs/sounds/18_16b.wav
@@ -451,8 +475,10 @@
 %%JFFNMSDIR%%/lib/api.triggers.inc.php
 %%JFFNMSDIR%%/lib/api.user.inc.php
 %%JFFNMSDIR%%/lib/api.zones.inc.php
+%%JFFNMSDIR%%/lib/gui.admin.inc.php
 %%JFFNMSDIR%%/lib/gui.controls.inc.php
 %%JFFNMSDIR%%/lib/gui.inc.php
+%%JFFNMSDIR%%/lib/gui.toolkit.inc.php
 %%JFFNMSDIR%%/logs/.check
 %%JFFNMSDIR%%/rrd/.check
 %%JFFNMSDIR%%/tftpd/.check