View | Details | Raw Unified | Return to bug 198051
Collapse All | Expand All

(-)b/net-mgmt/pandorafms_agent/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (pandora/pandorafms_agent_unix-5.1SP1.tar.gz) = b4e4363784a133d4679bdab22c977177ccebc9758e9b6f051d15a7a6a81a7a95
1
SHA256 (pandora/pandorafms_agent_unix-5.1SP2.tar.gz) = dc9ad9e5b6f6d0bae00398c543d05c610f1a438783153f30228daaffa43f7d2f
2
SIZE (pandora/pandorafms_agent_unix-5.1SP1.tar.gz) = 80277
2
SIZE (pandora/pandorafms_agent_unix-5.1SP2.tar.gz) = 78121
(-)b/net-mgmt/pandorafms_console/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (pandora/pandorafms_console-5.1SP1.tar.gz) = 5696fef415db22fd0eaffb3d8286eddfe3d123c86bae9a8a4044b7937efb8742
1
SHA256 (pandora/pandorafms_console-5.1SP2.tar.gz) = 6dd31049ea19413c142582fdf294fc0a6b4a0eaed7281d4e365850201c688387
2
SIZE (pandora/pandorafms_console-5.1SP1.tar.gz) = 27900949
2
SIZE (pandora/pandorafms_console-5.1SP2.tar.gz) = 27951868
(-)b/net-mgmt/pandorafms_console/files/pandora_console.conf.in (-2 / +1 lines)
Lines 2-7 Alias /pandora_console %%WWWDIR%% Link Here
2
2
3
<Location /pandora_console>
3
<Location /pandora_console>
4
    DirectoryIndex index.php
4
    DirectoryIndex index.php
5
    Order deny,allow
5
    Require all granted
6
    Allow from all
7
</Location>
6
</Location>
(-)a/net-mgmt/pandorafms_console/files/patch-WLB-2014110100 (-29 lines)
Removed Link Here
1
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
2
index 9b02b2c..9c1524a 100644
3
--- general/header.php
4
+++ general/header.php
5
@@ -375,15 +375,22 @@ config_check();
6
 		
7
 		<?php
8
 		if ($_GET["refr"]) {
9
+			$_get_refr = strip_tags($_GET["refr"]);
10
 		?>
11
+			refr_time = parseInt("<?php echo $_get_refr; ?>");
12
+			if (isNaN(refr_time)) {
13
+				refr_time = 0;
14
+			}
15
+			
16
 			t = new Date();
17
-			t.setTime (t.getTime () + <?php echo $config["refr"] * 1000; ?>);
18
+			t.setTime (t.getTime () +
19
+				parseInt(<?php echo $config["refr"] * 1000; ?>));
20
 			$("#refrcounter").countdown ({until: t, 
21
 				layout: '%M%nn%M:%S%nn%S',
22
 				labels: ['', '', '', '', '', '', ''],
23
 				onExpiry: function () {
24
 						href = $("a.autorefresh").attr ("href");
25
-						href = href + <?php echo $_GET["refr"]; ?>;
26
+						href = href + refr_time;
27
 						$(document).attr ("location", href);
28
 					}
29
 				});
(-)b/net-mgmt/pandorafms_console/pkg-plist (-4 / +3 lines)
Lines 1-8 Link Here
1
@mode 444
2
@sample %%APACHEETCDIR%%/Includes/pandora_console.conf.sample
3
@owner www
1
@owner www
4
@group www
2
@group www
5
@mode
6
%%WWWDIR%%/ajax.php
3
%%WWWDIR%%/ajax.php
7
%%WWWDIR%%/attachment/index.html
4
%%WWWDIR%%/attachment/index.html
8
%%WWWDIR%%/attachment/mibs/index.html
5
%%WWWDIR%%/attachment/mibs/index.html
Lines 669-674 Link Here
669
%%WWWDIR%%/images/grafica_h.png
666
%%WWWDIR%%/images/grafica_h.png
670
%%WWWDIR%%/images/grafica_m.png
667
%%WWWDIR%%/images/grafica_m.png
671
%%WWWDIR%%/images/grafica_w.png
668
%%WWWDIR%%/images/grafica_w.png
669
%%WWWDIR%%/images/grafico_llave.png
672
%%WWWDIR%%/images/graphmenu_arrow.png
670
%%WWWDIR%%/images/graphmenu_arrow.png
673
%%WWWDIR%%/images/graphmenu_arrow_hide.png
671
%%WWWDIR%%/images/graphmenu_arrow_hide.png
674
%%WWWDIR%%/images/greyback.gif
672
%%WWWDIR%%/images/greyback.gif
Lines 2772-2778 Link Here
2772
@comment install.php
2770
@comment install.php
2773
@unexec if [ -e %D/%%WWWDIR%%/install.php  ];then rm -f %D/%%WWWDIR%%/install.php ;fi
2771
@unexec if [ -e %D/%%WWWDIR%%/install.php  ];then rm -f %D/%%WWWDIR%%/install.php ;fi
2774
%%WWWDIR%%/install.done
2772
%%WWWDIR%%/install.done
2775
@exec [ -e %D/%B/include/config.php ] || cp -p %D/%F %B/install.php
2773
@exec [ -e %B/include/config.php ] || cp -p %D/%F %B/install.php
2776
%%WWWDIR%%/mobile/images/ajax-loader.gif
2774
%%WWWDIR%%/mobile/images/ajax-loader.gif
2777
%%WWWDIR%%/mobile/images/bricks.png
2775
%%WWWDIR%%/mobile/images/bricks.png
2778
%%WWWDIR%%/mobile/images/datos_blue.png
2776
%%WWWDIR%%/mobile/images/datos_blue.png
Lines 2927-2929 Link Here
2927
%%WWWDIR%%/pandoradb.postgreSQL.sql
2925
%%WWWDIR%%/pandoradb.postgreSQL.sql
2928
%%WWWDIR%%/pandoradb.sql
2926
%%WWWDIR%%/pandoradb.sql
2929
%%WWWDIR%%/pandoradb_data.sql
2927
%%WWWDIR%%/pandoradb_data.sql
2928
@sample(,,444) %%APACHEETCDIR%%/Includes/pandora_console.conf.sample
(-)b/net-mgmt/pandorafms_server/bsd.pandora.mk (-1 / +2 lines)
Lines 1-6 Link Here
1
# $FreeBSD: head/net-mgmt/pandorafms_server/bsd.pandora.mk 374927 2014-12-18 22:41:58Z pawel $
1
# $FreeBSD: head/net-mgmt/pandorafms_server/bsd.pandora.mk 374927 2014-12-18 22:41:58Z pawel $
2
2
3
PANDORA_VERSION=	5.1SP1
3
PANDORA_VERSION=	5.1SP2
4
PANDORA_LICENSE=	GPLv2
4
PANDORA_LICENSE=	GPLv2
5
PANDORA_LICENSE_FILE=	${WRKSRC}/COPYING
5
PANDORA_LICENSE_FILE=	${WRKSRC}/COPYING
6
6
Lines 23-28 DISTNAME= ${PORTNAME:S/pandora_/pandorafms_/}-${PANDORA_VERSION} Link Here
23
DIST_SUBDIR=	pandora
23
DIST_SUBDIR=	pandora
24
24
25
NO_BUILD=	yes
25
NO_BUILD=	yes
26
NO_ARCH=	yes
26
27
27
USERS=		pandora
28
USERS=		pandora
28
GROUPS=		pandora
29
GROUPS=		pandora
(-)b/net-mgmt/pandorafms_server/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (pandora/pandorafms_server-5.1SP1.tar.gz) = c7b49da0b941315a59de9d3edebb10f0103eb4ee59956e961d3b6787f4449b27
1
SHA256 (pandora/pandorafms_server-5.1SP2.tar.gz) = ede3c6aa28bc65d8a0fd614c1b4ca697f107ae913d76dae387b984f9eacd3912
2
SIZE (pandora/pandorafms_server-5.1SP1.tar.gz) = 4011575
2
SIZE (pandora/pandorafms_server-5.1SP2.tar.gz) = 4017932
(-)b/net-mgmt/pandorafms_server/pkg-plist (-9 / +7 lines)
Lines 1-12 Link Here
1
@mode 440
2
@sample %%ETCDIR%%/pandora_server.conf.sample
3
@mode 555
4
bin/pandora_exec
5
bin/pandora_server
6
%%TENTACLE%%bin/tentacle_server
7
etc/rc.d/pandora_server
8
etc/rc.d/tentacle_server
9
@mode
10
%%PERL5_MAN3%%/PandoraFMS::Core.3.gz
1
%%PERL5_MAN3%%/PandoraFMS::Core.3.gz
11
%%PERL5_MAN3%%/PandoraFMS::GIS.3.gz
2
%%PERL5_MAN3%%/PandoraFMS::GIS.3.gz
12
%%PERL5_MAN3%%/PandoraFMS::GeoIP.3.gz
3
%%PERL5_MAN3%%/PandoraFMS::GeoIP.3.gz
Lines 115-117 man/man1/tentacle_server.1.gz Link Here
115
%%DATADIR%%/util/trap_rate.sh
106
%%DATADIR%%/util/trap_rate.sh
116
%%DATADIR%%/util/udp_client.pl
107
%%DATADIR%%/util/udp_client.pl
117
%%DATADIR%%/util/windows.README
108
%%DATADIR%%/util/windows.README
109
@mode 555
110
bin/pandora_exec
111
bin/pandora_server
112
%%TENTACLE%%bin/tentacle_server
113
etc/rc.d/pandora_server
114
etc/rc.d/tentacle_server
115
@sample(,,440) %%ETCDIR%%/pandora_server.conf.sample
(-)b/net-mgmt/pandorafms_server/pkg-plist.spool (-18 / +8 lines)
Lines 1-18 Link Here
1
@owner pandora
1
%%USE_LOGDIR%%@dir(pandora,wheel,770) %%LOGDIR%%
2
@group wheel
2
%%USE_SPOOL_OUT%%@dir(pandora,wheel,700) %%SPOOLDIR%%/data_out
3
%%USE_LOGDIR%%@mode 770
3
%%USE_SPOOL_IN%%@dir(pandora,www,770) %%SPOOLDIR%%/data_in/collections
4
%%USE_LOGDIR%%@dir %%LOGDIR%%
4
%%USE_SPOOL_IN%%@dir(pandora,www,770) %%SPOOLDIR%%/data_in/conf
5
%%USE_SPOOL_OUT%%@mode 700
5
%%USE_SPOOL_IN%%@dir(pandora,www,770) %%SPOOLDIR%%/data_in/md5
6
%%USE_SPOOL_OUT%%@dir %%SPOOLDIR%%/data_out
6
%%USE_SPOOL_IN%%@dir(pandora,www,770) %%SPOOLDIR%%/data_in/netflow
7
@mode 770
7
%%USE_SPOOL_IN%%@dir(pandora,www,770) %%SPOOLDIR%%/data_in
8
@group www
8
@dir(pandora,www,770) %%SPOOLDIR%%
9
%%USE_SPOOL_IN%%@dir %%SPOOLDIR%%/data_in/collections
10
%%USE_SPOOL_IN%%@dir %%SPOOLDIR%%/data_in/conf
11
%%USE_SPOOL_IN%%@dir %%SPOOLDIR%%/data_in/md5
12
%%USE_SPOOL_IN%%@dir %%SPOOLDIR%%/data_in/netflow
13
%%USE_SPOOL_IN%%@dir %%SPOOLDIR%%/data_in
14
@dir %%SPOOLDIR%%
15
@comment unset mode/owner/group
16
@mode
17
@owner
18
@group

Return to bug 198051