From jonas at schiebtsich.net Wed Apr 1 03:00:09 2009 From: jonas at schiebtsich.net (jonas sonntag) Date: Wed Apr 1 03:00:15 2009 Subject: ports/133266: [PATCH] net-p2p/gtk-gnutella: update to 0.96.6 Message-ID: <200904010946.n319k32G092469@elaine.jbhosting.de> >Number: 133266 >Category: ports >Synopsis: [PATCH] net-p2p/gtk-gnutella: update to 0.96.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Apr 01 10:00:07 UTC 2009 >Closed-Date: >Last-Modified: >Originator: jonas sonntag >Release: FreeBSD 7.0-RELEASE-p4 amd64 >Organization: >Environment: System: FreeBSD elaine.jbhosting.de 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #1: Thu Sep 4 16:11:10 CEST >Description: - Update to 0.96.6 Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- gtk-gnutella-0.96.6.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net-p2p/gtk-gnutella/Makefile,v retrieving revision 1.50 diff -u -r1.50 Makefile --- Makefile 22 Jul 2008 13:45:36 -0000 1.50 +++ Makefile 1 Apr 2009 09:43:59 -0000 @@ -43,7 +43,7 @@ # PORTNAME= gtk-gnutella -PORTVERSION= 0.96.5 +PORTVERSION= 0.96.6 CATEGORIES= net-p2p ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net-p2p/gtk-gnutella/distinfo,v retrieving revision 1.25 diff -u -r1.25 distinfo --- distinfo 22 Jul 2008 13:45:36 -0000 1.25 +++ distinfo 1 Apr 2009 09:43:59 -0000 @@ -1,3 +1,3 @@ -MD5 (gtk-gnutella-0.96.5.tar.bz2) = 539fbdf65c6038d1da2e5cebede52e43 -SHA256 (gtk-gnutella-0.96.5.tar.bz2) = 02c0f661f112739c011e0a12ebfc58d8fcb8ce6f660cc03be610ba664050b529 -SIZE (gtk-gnutella-0.96.5.tar.bz2) = 13634700 +MD5 (gtk-gnutella-0.96.6.tar.bz2) = 0f8f1241faf5c204b77a4ddfd878c148 +SHA256 (gtk-gnutella-0.96.6.tar.bz2) = 1e9e9952658134448675a991aca583b2a6bcacdc144b8a81628e1505b4567e8f +SIZE (gtk-gnutella-0.96.6.tar.bz2) = 15739240 --- gtk-gnutella-0.96.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: From edwin at FreeBSD.org Wed Apr 1 03:00:21 2009 From: edwin at FreeBSD.org (edwin@FreeBSD.org) Date: Wed Apr 1 03:00:28 2009 Subject: ports/133266: [PATCH] net-p2p/gtk-gnutella: update to 0.96.6 Message-ID: <200904011000.n31A0KDk028194@freefall.freebsd.org> Synopsis: [PATCH] net-p2p/gtk-gnutella: update to 0.96.6 Class-Changed-From-To: update->maintainer-update Class-Changed-By: edwin Class-Changed-When: Wed Apr 1 10:00:20 UTC 2009 Class-Changed-Why: Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=133266 From miwi at FreeBSD.org Wed Apr 1 03:21:24 2009 From: miwi at FreeBSD.org (miwi@FreeBSD.org) Date: Wed Apr 1 03:21:36 2009 Subject: ports/133263: Unbroken x11-toolkits/plib on CURRENT Message-ID: <200904011021.n31ALN9p062528@freefall.freebsd.org> Synopsis: Unbroken x11-toolkits/plib on CURRENT Responsible-Changed-From-To: freebsd-ports-bugs->miwi Responsible-Changed-By: miwi Responsible-Changed-When: Wed Apr 1 10:21:23 UTC 2009 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=133263 From miwi at FreeBSD.org Wed Apr 1 03:21:27 2009 From: miwi at FreeBSD.org (miwi@FreeBSD.org) Date: Wed Apr 1 03:21:36 2009 Subject: ports/133266: [PATCH] net-p2p/gtk-gnutella: update to 0.96.6 Message-ID: <200904011021.n31ALRMu063018@freefall.freebsd.org> Synopsis: [PATCH] net-p2p/gtk-gnutella: update to 0.96.6 Responsible-Changed-From-To: freebsd-ports-bugs->miwi Responsible-Changed-By: miwi Responsible-Changed-When: Wed Apr 1 10:21:26 UTC 2009 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=133266 From ports at logvinov.com Wed Apr 1 04:00:08 2009 From: ports at logvinov.com (Alexander Logvinov) Date: Wed Apr 1 04:00:15 2009 Subject: ports/133267: [PATCH] sysutils/watchfolder: provide rc_subr script Message-ID: <200904011056.n31AuI9C020279@blg.akavia.ru> >Number: 133267 >Category: ports >Synopsis: [PATCH] sysutils/watchfolder: provide rc_subr script >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Apr 01 11:00:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Alexander Logvinov >Release: FreeBSD 6.4-RELEASE i386 >Organization: >Environment: >Description: Provide rc_subr script >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/watchfolder/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 27 Mar 2009 09:53:34 -0000 1.6 +++ Makefile 1 Apr 2009 10:51:19 -0000 @@ -7,6 +7,7 @@ PORTNAME= watchfolder PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://dstunrea.sdf-eu.org/files/ \ CRITICAL @@ -17,6 +18,7 @@ MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/watchd-${PORTVERSION} +USE_RC_SUBR= watchd post-patch: @${REINPLACE_CMD} -e 's|gcc $$(OPT)|${CC} ${CFLAGS}|' \ Index: files/watchd.in =================================================================== RCS file: files/watchd.in diff -N files/watchd.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/watchd.in 1 Apr 2009 10:51:19 -0000 @@ -0,0 +1,29 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: watchd +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf[.local] to enable watchd +# +# watchd_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable watchd. + +. %%RC_SUBR%% + +name="watchd" +rcvar=${name}_enable + +load_rc_config $name + +: ${watchd_enable="NO"} +: ${watchd_config="%%PREFIX%%/etc/watchd.conf"} +: ${watchd_log="/var/log/watchd.log"} + +command="%%PREFIX%%/bin/watchd" +command_args="${watchd_config} >> ${watchd_log}" +required_files="${watchd_config}" + +run_rc_command "$1" >Release-Note: >Audit-Trail: >Unformatted: From edwin at FreeBSD.org Wed Apr 1 04:00:19 2009 From: edwin at FreeBSD.org (edwin@FreeBSD.org) Date: Wed Apr 1 04:00:26 2009 Subject: ports/133267: [PATCH] sysutils/watchfolder: provide rc_subr script Message-ID: <200904011100.n31B0JWI012001@freefall.freebsd.org> Synopsis: [PATCH] sysutils/watchfolder: provide rc_subr script Responsible-Changed-From-To: freebsd-ports-bugs->ehaupt Responsible-Changed-By: edwin Responsible-Changed-When: Wed Apr 1 11:00:18 UTC 2009 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=133267 From ntarmos at cs.uoi.gr Wed Apr 1 05:30:05 2009 From: ntarmos at cs.uoi.gr (Nikos Ntarmos) Date: Wed Apr 1 05:30:43 2009 Subject: ports/133231: [PATCH] x11-wm/awesome: add D-Bus option Message-ID: <200904011230.n31CU3uN033046@freefall.freebsd.org> The following reply was made to PR ports/133231; it has been noted by GNATS. From: Nikos Ntarmos To: bug-followup@FreeBSD.ORG Cc: Subject: Re: ports/133231: [PATCH] x11-wm/awesome: add D-Bus option Date: Wed, 1 Apr 2009 15:23:58 +0300 --AqsLC8rIMeq19msA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The patch looks good to me but the portrevision will require a bump. Please used the attached diff instead (the same as the one submitted by Pierre plus a hunk for the portrevision). Thanks. \n\n --AqsLC8rIMeq19msA Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="awesome-dbus-option-portrevision.diff" --- Makefile.orig +++ Makefile @@ -7,6 +7,7 @@ PORTNAME= awesome PORTVERSION= 3.2 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ \ http://redundancy.redundancy.org/mirror/ @@ -22,7 +23,6 @@ xcb-util>=0.3.3:${PORTSDIR}/x11/xcb-util \ xproto>=7.0.11:${PORTSDIR}/x11/xproto LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ - dbus-1.3:${PORTSDIR}/devel/dbus \ ev.3:${PORTSDIR}/devel/libev \ freetype.9:${PORTSDIR}/print/freetype2 \ xcb.2:${PORTSDIR}/x11/libxcb \ @@ -43,6 +43,8 @@ MANCOMPRESSED= yes PORTDOCS= AUTHORS BUGS LICENSE README +OPTIONS+= DBUS "Enable D-BUS support" On + .include .if (exists(${LOCALBASE}/libdata/pkgconfig/cairo.pc) && \ @@ -50,12 +52,19 @@ IGNORE= cannot find dependency: The cairo exists but not with XCB support. Please reinstall graphics/cairo with XCB support .endif +.ifdef(WITH_DBUS) +LIB_DEPENDS += dbus-1.3:${PORTSDIR}/devel/dbus +CMAKE_ARGS += -DWITH_DBUS=YES +.else +CMAKE_ARGS += -DWITH_DBUS=NO +.endif + pre-configure: @${REINPLACE_CMD} \ -e 's/"generate luadoc" ON/\"generate luadoc" OFF/g' \ ${WRKSRC}/awesomeConfig.cmake @${REINPLACE_CMD} \ - -e 's,tr ,env LC_ALL="C" tr ,g' \ + -e 's,tr ,env LC_ALL="C" ${TR} ,g' \ -e 's,gperf,${LOCALBASE}/bin/gperf,g' \ ${WRKSRC}/build-utils/gperf.sh .if defined(NOPORTDOCS) --AqsLC8rIMeq19msA-- From wouter at fizzyflux.nl Wed Apr 1 05:30:05 2009 From: wouter at fizzyflux.nl (Wouter Oosterveld) Date: Wed Apr 1 05:30:43 2009 Subject: ports/133268: [ports][security/nmap] New recommended version Message-ID: <200904011206.n31C6QcB040944@canoe.trimm.net> >Number: 133268 >Category: ports >Synopsis: [ports][security/nmap] New recommended version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Apr 01 12:30:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Wouter Oosterveld >Release: FreeBSD 6.3-RELEASE amd64 >Organization: None >Environment: System: FreeBSD canoe.trimm.net 6.3-RELEASE FreeBSD 6.3-RELEASE #1: Wed Jan 30 17:20:21 CET 2008 root@canoe.trimm.net:/usr/obj/usr/src/sys/CANOE amd64 >Description: Update port security/nmap to recommended version. Fyodor notes: "Note that I've removed 4.76 from the D/L page as I think 4.85BETA5 is the way to go in general." - http:///seclists.org/nmap-dev/2009/q1/0870.html >How-To-Repeat: >Fix: --- nmap_4.85BETA5.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # security/nmap # security/nmap/files # security/nmap/files/patch-configure # security/nmap/files/patch-libdnet-stripped__src__eth-bsd.c # security/nmap/files/patch-Makefile.in # security/nmap/files/patch-nmap.cc # security/nmap/files/patch-tcpip.cc # security/nmap/Makefile # security/nmap/distinfo # security/nmap/pkg-descr # security/nmap/pkg-plist # echo c - security/nmap mkdir -p security/nmap > /dev/null 2>&1 echo c - security/nmap/files mkdir -p security/nmap/files > /dev/null 2>&1 echo x - security/nmap/files/patch-configure sed 's/^X//' >security/nmap/files/patch-configure << '058ca0a46c0da230a1b866d2b434b0a8' X--- configure.orig 2008-06-15 09:05:12.000000000 +0200 X+++ configure 2008-08-03 12:41:04.000000000 +0200 X@@ -1930,7 +1930,7 @@ X ac_compiler_gnu=$ac_cv_c_compiler_gnu X if test -n "$ac_tool_prefix"; then X # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. X-set dummy ${ac_tool_prefix}gcc; ac_word=$2 X+set dummy ${ac_tool_prefix}$CXX; ac_word=$2 X { echo "$as_me:$LINENO: checking for $ac_word" >&5 X echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } X if test "${ac_cv_prog_CC+set}" = set; then X@@ -7337,8 +7337,8 @@ X no_lua="yes" X ;; X *) X- CPPFLAGS="-I$with_liblua/include $CPPFLAGS" X- LDFLAGS="-L$with_liblua/lib $LDFLAGS" X+ CPPFLAGS="-I${LUA_INCDIR} $CPPFLAGS" X+ LDFLAGS="-L${LUA_LIBDIR} $LDFLAGS" X ;; X esac X 058ca0a46c0da230a1b866d2b434b0a8 echo x - security/nmap/files/patch-libdnet-stripped__src__eth-bsd.c sed 's/^X//' >security/nmap/files/patch-libdnet-stripped__src__eth-bsd.c << '2401c9f95661a6ca9920a5aeb7215d7a' X# X# $FreeBSD: ports/security/nmap/files/patch-libdnet-stripped__src__eth-bsd.c,v 1.1 2006/06/06 01:30:16 mnag Exp $ X# X# - nmap fails to attach to bpf when more than 128 bpfs are busy. X# PR: 98080 X# X--- libdnet-stripped/src/eth-bsd.c.orig X+++ libdnet-stripped/src/eth-bsd.c X@@ -45,7 +45,7 @@ X int i; X X if ((e = calloc(1, sizeof(*e))) != NULL) { X- for (i = 0; i < 128; i++) { X+ for (i = 0; i < 1024; i++) { X snprintf(file, sizeof(file), "/dev/bpf%d", i); X e->fd = open(file, O_WRONLY); X if (e->fd != -1 || errno != EBUSY) 2401c9f95661a6ca9920a5aeb7215d7a echo x - security/nmap/files/patch-Makefile.in sed 's/^X//' >security/nmap/files/patch-Makefile.in << 'f6b68a49cdb30293802378da357880f6' X--- Makefile.in.orig 2008-01-24 02:36:01.000000000 +0100 X+++ Makefile.in 2008-04-13 16:48:40.000000000 +0200 X@@ -11,7 +11,7 @@ X srcdir = @srcdir@ X nmaplibexecdir = @libexecdir@/nmap X nmapdatadir = @datadir@/nmap X-deskdir = $(prefix)/share/applications X+deskdir = $(LOCALBASE)/share/applications X NMAPDEVDIR=~/nmap-dev X X export NBASEDIR=@NBASEDIR@ f6b68a49cdb30293802378da357880f6 echo x - security/nmap/files/patch-nmap.cc sed 's/^X//' >security/nmap/files/patch-nmap.cc << '7ab24d917799ec984de6ab79b4b721a0' X--- nmap.cc.orig Sat Dec 22 07:32:03 2007 X+++ nmap.cc Thu Jan 10 20:41:30 2008 X@@ -99,6 +99,7 @@ X X /* $Id: nmap.cc 6633 2007-12-22 06:32:03Z fyodor $ */ X X+#include X #include "nmap.h" X #include "osscan.h" X #include "osscan2.h" 7ab24d917799ec984de6ab79b4b721a0 echo x - security/nmap/files/patch-tcpip.cc sed 's/^X//' >security/nmap/files/patch-tcpip.cc << 'c9442e3c7598e9a9d9d389f54cbf1ffe' X--- tcpip.cc.orig Fri Dec 8 04:01:19 2006 X+++ tcpip.cc Wed Jan 3 17:15:05 2007 X@@ -133,6 +133,8 @@ X #endif /* NETINET_IF_ETHER_H */ X #endif /* HAVE_NETINET_IF_ETHER_H */ X X+#include X+ X extern NmapOps o; X X #ifdef WIN32 X@@ -1959,7 +1961,7 @@ X X // Returns whether the system supports pcap_get_selectable_fd() properly X bool pcap_selectable_fd_valid() { X-#if defined(WIN32) || defined(MACOSX) X+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) X return false; X #endif X return true; X@@ -1972,7 +1974,7 @@ X results. If you just want to test whether the function is supported, X use pcap_selectable_fd_valid() instead. */ X int my_pcap_get_selectable_fd(pcap_t *p) { X-#if defined(WIN32) || defined(MACOSX) X+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) X return -1; X #else X assert(pcap_selectable_fd_valid()); c9442e3c7598e9a9d9d389f54cbf1ffe echo x - security/nmap/Makefile sed 's/^X//' >security/nmap/Makefile << '843e79ee054783564c8ca51f6fe38f0b' X# Ports collection makefile for: nmap X# Date created: Tue Aug 04, 1998 X# Whom: David O'Brien (obrien@NUXI.com) X# X# $FreeBSD: ports/security/nmap/Makefile,v 1.113 2008/09/24 14:47:04 miwi Exp $ X# X XPORTNAME= nmap XDISTVERSION= 4.85BETA6 XCATEGORIES= security ipv6 XMASTER_SITES= http://nmap.org/dist/ \ X http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \ X http://www.mirrorservice.org/sites/ftp.wiretapped.net/pub/security/network-mapping/nmap/ \ X http://mirror.sg.depaul.edu/pub/security/nmap/ X XMAINTAINER= daniel@roe.ch XCOMMENT= Port scanning utility for large networks X XLIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ X dnet.1:${PORTSDIR}/net/libdnet X XUSE_LUA= 5.1 XLUA_COMPS= lua XUSE_BZIP2= yes XUSE_GMAKE= yes XGNU_CONFIGURE= yes XCONFIGURE_ARGS= --without-localdirs \ X --without-zenmap \ X --with-libpcre=${LOCALBASE} \ X --with-libdnet=${LOCALBASE} \ X --with-liblua=${LOCALBASE} XCONFIGURE_ENV= LUA_INCDIR="${LUA_INCDIR}" LUA_LIBDIR="${LUA_LIBDIR}" X XMAN1= nmap.1 X X.ifndef WITHOUT_SSL XUSE_OPENSSL= yes XCONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} XCONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${OPENSSLINC}" X.else XCONFIGURE_ARGS+= --without-openssl X.endif X Xpost-configure: X @${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile X Xpost-install: X.ifndef NOPORTDOCS X @${MKDIR} ${DOCSDIR} X @for doc in CHANGELOG HACKING docs/nmap.dtd; do \ X ${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}; \ X done X.endif X X.include 843e79ee054783564c8ca51f6fe38f0b echo x - security/nmap/distinfo sed 's/^X//' >security/nmap/distinfo << '1e077c1061e08ca18c0f70252ffb9777' XMD5 (nmap-4.85BETA6.tar.bz2) = 330aa3080845150d1df3f598a821e310 XSHA256 (nmap-4.85BETA6.tar.bz2) = 22a54b5d4ff4a358fc959ac023b7af5119b0c849abd143a362ade04862b2a9e4 XSIZE (nmap-4.85BETA6.tar.bz2) = 6454053 1e077c1061e08ca18c0f70252ffb9777 echo x - security/nmap/pkg-descr sed 's/^X//' >security/nmap/pkg-descr << '47f50fbf14ccd67eabf56e33763f5cf5' XNmap is a utility for network exploration or security auditing. It Xsupports ping scanning (determine which hosts are up), many port Xscanning techniques, version detection (determine service protocols Xand application versions listening behind ports), and TCP/IP Xfingerprinting (remote host OS or device identification). Nmap also Xoffers flexible target and port specification, decoy/stealth scanning, XsunRPC scanning, and much more. X XWWW: http://nmap.org/ X XSee the web page and the Phrack Magazine article (Volume 7, Issue 51 XSeptember 01, 1997, article 11 of 17) http://nmap.org/p51-11.html 47f50fbf14ccd67eabf56e33763f5cf5 echo x - security/nmap/pkg-plist sed 's/^X//' >security/nmap/pkg-plist << '4819acb3613e688ada293942a317c5de' Xbin/nmap Xbin/ncat Xbin/ndiff X%%DATADIR%%/scripts/script.db X%%DATADIR%%/scripts/rpcinfo.nse X%%DATADIR%%/scripts/nbstat.nse X%%DATADIR%%/scripts/finger.nse X%%DATADIR%%/scripts/whois.nse X%%DATADIR%%/scripts/upnp-info.nse X%%DATADIR%%/scripts/telnet-brute.nse X%%DATADIR%%/scripts/sslv2.nse X%%DATADIR%%/scripts/sshv1.nse X%%DATADIR%%/scripts/ssh-hostkey.nse X%%DATADIR%%/scripts/sql-injection.nse X%%DATADIR%%/scripts/snmp-sysdescr.nse X%%DATADIR%%/scripts/snmp-brute.nse X%%DATADIR%%/scripts/sniffer-detect.nse X%%DATADIR%%/scripts/smtp-strangeport.nse X%%DATADIR%%/scripts/smtp-open-relay.nse X%%DATADIR%%/scripts/smtp-commands.nse X%%DATADIR%%/scripts/smb-system-info.nse X%%DATADIR%%/scripts/smb-server-stats.nse X%%DATADIR%%/scripts/smb-security-mode.nse X%%DATADIR%%/scripts/smb-pwdump.nse X%%DATADIR%%/scripts/smb-os-discovery.nse X%%DATADIR%%/scripts/smb-enum-users.nse X%%DATADIR%%/scripts/smb-enum-shares.nse X%%DATADIR%%/scripts/smb-enum-sessions.nse X%%DATADIR%%/scripts/smb-enum-processes.nse X%%DATADIR%%/scripts/smb-enum-domains.nse X%%DATADIR%%/scripts/smb-check-vulns.nse X%%DATADIR%%/scripts/smb-brute.nse X%%DATADIR%%/scripts/skypev2-version.nse X%%DATADIR%%/scripts/robots.txt.nse X%%DATADIR%%/scripts/realvnc-auth-bypass.nse X%%DATADIR%%/scripts/pptp-version.nse X%%DATADIR%%/scripts/pop3-capabilities.nse X%%DATADIR%%/scripts/pop3-brute.nse X%%DATADIR%%/scripts/mysql-info.nse X%%DATADIR%%/scripts/ms-sql-info.nse X%%DATADIR%%/scripts/irc-info.nse X%%DATADIR%%/scripts/iax2-version.nse X%%DATADIR%%/scripts/http-trace.nse X%%DATADIR%%/scripts/http-passwd.nse X%%DATADIR%%/scripts/http-open-proxy.nse X%%DATADIR%%/scripts/http-auth.nse X%%DATADIR%%/scripts/html-title.nse X%%DATADIR%%/scripts/ftp-brute.nse X%%DATADIR%%/scripts/ftp-bounce.nse X%%DATADIR%%/scripts/ftp-anon.nse X%%DATADIR%%/scripts/dns-zone-transfer.nse X%%DATADIR%%/scripts/dns-recursion.nse X%%DATADIR%%/scripts/dns-random-txid.nse X%%DATADIR%%/scripts/dns-random-srcport.nse X%%DATADIR%%/scripts/daytime.nse X%%DATADIR%%/scripts/banner.nse X%%DATADIR%%/scripts/auth-spoof.nse X%%DATADIR%%/scripts/auth-owners.nse X%%DATADIR%%/scripts/asn-query.nse X@dirrm %%DATADIR%%/scripts X%%DATADIR%%/nselib/http.lua X%%DATADIR%%/nselib/ipOps.lua X%%DATADIR%%/nselib/strbuf.lua X%%DATADIR%%/nselib/stdnse.lua X%%DATADIR%%/nselib/shortport.lua X%%DATADIR%%/nselib/packet.lua X%%DATADIR%%/nselib/match.lua X%%DATADIR%%/nselib/listop.lua X%%DATADIR%%/nselib/url.lua X%%DATADIR%%/nselib/tab.lua X%%DATADIR%%/nselib/datafiles.lua X%%DATADIR%%/nselib/comm.lua X%%DATADIR%%/nselib/base64.lua X%%DATADIR%%/nselib/unpwdb.lua X%%DATADIR%%/nselib/snmp.lua X%%DATADIR%%/nselib/pop3.lua X%%DATADIR%%/nselib/dns.lua X%%DATADIR%%/nselib/ssh2.lua X%%DATADIR%%/nselib/ssh1.lua X%%DATADIR%%/nselib/smbauth.lua X%%DATADIR%%/nselib/smb.lua X%%DATADIR%%/nselib/nsedebug.lua X%%DATADIR%%/nselib/netbios.lua X%%DATADIR%%/nselib/msrpctypes.lua X%%DATADIR%%/nselib/msrpcperformance.lua X%%DATADIR%%/nselib/msrpc.lua X@dirrm %%DATADIR%%/nselib X%%DATADIR%%/nmap-mac-prefixes X%%DATADIR%%/nmap-os-db X%%DATADIR%%/nmap-protocols X%%DATADIR%%/nmap-rpc X%%DATADIR%%/nmap-service-probes X%%DATADIR%%/nmap-services X%%DATADIR%%/nmap.dtd X%%DATADIR%%/nmap.xsl X@dirrm %%DATADIR%% X%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG X%%PORTDOCS%%%%DOCSDIR%%/HACKING X%%PORTDOCS%%%%DOCSDIR%%/nmap.dtd X%%PORTDOCS%%@dirrm %%DOCSDIR%% 4819acb3613e688ada293942a317c5de exit --- nmap_4.85BETA5.shar ends here --- >Release-Note: >Audit-Trail: >Unformatted: From edwin at FreeBSD.org Wed Apr 1 05:30:46 2009 From: edwin at FreeBSD.org (edwin@FreeBSD.org) Date: Wed Apr 1 05:30:53 2009 Subject: ports/133268: [ports][security/nmap] New recommended version Message-ID: <200904011230.n31CUki5037602@freefall.freebsd.org> Synopsis: [ports][security/nmap] New recommended version State-Changed-From-To: open->feedback State-Changed-By: edwin State-Changed-When: Wed Apr 1 12:30:45 UTC 2009 State-Changed-Why: Awaiting maintainers feedback (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=133268 From edwin at FreeBSD.org Wed Apr 1 05:40:04 2009 From: edwin at FreeBSD.org (Edwin Groothuis) Date: Wed Apr 1 05:40:10 2009 Subject: ports/133268: [ports][security/nmap] New recommended version Message-ID: <200904011240.n31Ce41U047929@freefall.freebsd.org> The following reply was made to PR ports/133268; it has been noted by GNATS. From: Edwin Groothuis To: daniel@roe.ch Cc: bug-followup@FreeBSD.org Subject: Re: ports/133268: [ports][security/nmap] New recommended version Date: Wed, 1 Apr 2009 12:30:44 UT Maintainer of security/nmap, Please note that PR ports/133268 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/133268 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org From trasz at FreeBSD.org Wed Apr 1 06:10:02 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Wed Apr 1 06:10:09 2009 Subject: ports/133269: [PATCH] comms/gammu: update to 1.23.92 Message-ID: <20090401130323.240A839BA3@pin.if.uz.zgora.pl> >Number: 133269 >Category: ports >Synopsis: [PATCH] comms/gammu: update to 1.23.92 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Apr 01 13:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Edward Tomasz Napierala >Release: FreeBSD 7.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD pin.if.uz.zgora.pl 7.2-PRERELEASE FreeBSD 7.2-PRERELEASE #0: Mon Mar 23 14:15:41 CET 2009 >Description: - Update to 1.23.92 Removed file(s): - files/patch-gammu-backupsms.c Port maintainer (bsam@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- gammu-1.23.92.patch begins here --- diff -ruN --exclude=CVS /usr/ports/comms/gammu/Makefile /home/trasz/gammu/Makefile --- /usr/ports/comms/gammu/Makefile 2009-03-12 09:01:19.000000000 +0100 +++ /home/trasz/gammu/Makefile 2009-04-01 15:02:53.000000000 +0200 @@ -2,12 +2,11 @@ # Date created: 12 december 2003 # Whom: Kirill Bezzubets # -# $FreeBSD: ports/comms/gammu/Makefile,v 1.42 2009/03/12 08:01:19 bsam Exp $ +# $FreeBSD: ports/comms/gammu/Makefile,v 1.43 2009/03/24 19:12:57 makc Exp $ # PORTNAME= gammu -PORTVERSION= 1.23.1 -PORTREVISION= 1 +PORTVERSION= 1.23.92 CATEGORIES= comms MASTER_SITES= ftp://dl.cihar.com/gammu/releases/ \ http://dl.cihar.com/gammu/releases/ diff -ruN --exclude=CVS /usr/ports/comms/gammu/distinfo /home/trasz/gammu/distinfo --- /usr/ports/comms/gammu/distinfo 2009-03-03 08:29:40.000000000 +0100 +++ /home/trasz/gammu/distinfo 2009-04-01 15:02:53.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (gammu-1.23.1.tar.gz) = 60853feea8d5b22b5cebfeec911caa14 -SHA256 (gammu-1.23.1.tar.gz) = 175f17d9413d6e9c59a3134899c915a08dc119400337d994560213727560ccd2 -SIZE (gammu-1.23.1.tar.gz) = 2852548 +MD5 (gammu-1.23.92.tar.gz) = 3b2b0ffdd8eeb05169c76b564773162b +SHA256 (gammu-1.23.92.tar.gz) = 4885419c698bbd3f11df008659de8bc90c3e4a17c0e40d424cd721435ef2f3c2 +SIZE (gammu-1.23.92.tar.gz) = 2936485 diff -ruN --exclude=CVS /usr/ports/comms/gammu/files/patch-CMakeLists.txt /home/trasz/gammu/files/patch-CMakeLists.txt --- /usr/ports/comms/gammu/files/patch-CMakeLists.txt 2009-03-11 12:20:12.000000000 +0100 +++ /home/trasz/gammu/files/patch-CMakeLists.txt 2009-04-01 15:02:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2009-02-25 19:46:07.000000000 +0300 -+++ CMakeLists.txt 2009-03-11 13:04:48.000000000 +0300 -@@ -547,7 +547,7 @@ +--- CMakeLists.txt.orig 2009-03-26 12:06:15.000000000 +0100 ++++ CMakeLists.txt 2009-03-31 23:40:16.000000000 +0200 +@@ -548,7 +548,7 @@ set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "Path for documentation installation") mark_as_advanced (INSTALL_DOC_DIR) @@ -9,32 +9,3 @@ mark_as_advanced (INSTALL_MAN_DIR) # Phone and protocol configuration -@@ -698,11 +698,13 @@ - COMPONENT "pkgconfig" - ) - -+if(INSTALL_DOC) - install ( - FILES ${DOCS} - DESTINATION "${INSTALL_DOC_DIR}" - COMPONENT "docs" - ) -+endif(INSTALL_DOC) - - # We want some tests. Even when cross compiling for Windows tests can be - # done in Wine. This is better than nothing, even though Wine is a bit -@@ -860,10 +860,14 @@ - - add_subdirectory(utils) - -+option(INSTALL_DOC "Install documentation" ON) -+ -+if(INSTALL_DOC) - add_subdirectory(docs/config) - add_subdirectory(docs/develop) - add_subdirectory(docs/sql) - add_subdirectory(docs/user) -+endif(WITH_DOC) - - add_subdirectory(contrib) - diff -ruN --exclude=CVS /usr/ports/comms/gammu/files/patch-gammu-backupsms.c /home/trasz/gammu/files/patch-gammu-backupsms.c --- /usr/ports/comms/gammu/files/patch-gammu-backupsms.c 2009-03-12 09:01:19.000000000 +0100 +++ /home/trasz/gammu/files/patch-gammu-backupsms.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- gammu/backupsms.c.orig 2009-03-12 10:06:22.000000000 +0300 -+++ gammu/backupsms.c 2009-03-12 10:06:38.000000000 +0300 -@@ -23,7 +23,7 @@ - GSM_SMSFolders folders; - bool BackupFromFolder[GSM_MAX_SMS_FOLDERS]; - bool start = true; -- bool DeleteAfter, askdelete = true; -+ bool DeleteAfter = false, askdelete = true; - int j, smsnum = 0; - - if (argc == 4) { --- gammu-1.23.92.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: From edwin at FreeBSD.org Wed Apr 1 06:10:16 2009 From: edwin at FreeBSD.org (edwin@FreeBSD.org) Date: Wed Apr 1 06:10:22 2009 Subject: ports/133269: [PATCH] comms/gammu: update to 1.23.92 Message-ID: <200904011310.n31DAFkf087881@freefall.freebsd.org> Synopsis: [PATCH] comms/gammu: update to 1.23.92 Responsible-Changed-From-To: freebsd-ports-bugs->bsam Responsible-Changed-By: edwin Responsible-Changed-When: Wed Apr 1 13:10:14 UTC 2009 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=133269 From ports at christianserving.org Wed Apr 1 06:30:03 2009 From: ports at christianserving.org (Jim Riggs) Date: Wed Apr 1 06:30:13 2009 Subject: ports/133164: [PATCH] net-mgmt/zabbix: update to 1.6.3 Message-ID: <200904011330.n31DU3iT013757@freefall.freebsd.org> The following reply was made to PR ports/133164; it has been noted by GNATS. From: Jim Riggs To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/133164: [PATCH] net-mgmt/zabbix: update to 1.6.3 Date: Wed, 01 Apr 2009 08:10:01 -0500 This is a multi-part message in MIME format. --------------030801060004030106010301 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit This includes the requested patch. --------------030801060004030106010301 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="zabbix-1.6.3,1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="zabbix-1.6.3,1.patch" ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix/Makefile /root/portwork/zabbix/Makefile --- /usr/ports/net-mgmt/zabbix/Makefile 2009-03-23 10:06:19.000000000 -0500 +++ /root/portwork/zabbix/Makefile 2009-03-28 13:27:00.000000000 -0500 @@ -6,8 +6,7 @@ # PORTNAME= zabbix -PORTVERSION= 1.6.2 -PORTREVISION= 1 +PORTVERSION= 1.6.3 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= SF diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix/distinfo /root/portwork/zabbix/distinfo --- /usr/ports/net-mgmt/zabbix/distinfo 2009-02-26 05:59:18.000000000 -0600 +++ /root/portwork/zabbix/distinfo 2009-03-28 12:52:43.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (zabbix-1.6.2.tar.gz) = 33da3661868a04042c596a819896446f -SHA256 (zabbix-1.6.2.tar.gz) = e982419f45b2ac814e804a1a340c7e563fe5230bb5295b17e5767c89fa25550e -SIZE (zabbix-1.6.2.tar.gz) = 8229465 +MD5 (zabbix-1.6.3.tar.gz) = e0852158804ff548faf3a1c1344ffc0d +SHA256 (zabbix-1.6.3.tar.gz) = e29428f8c7f7d56d189077fb29605b084b7c10c02cb04671923f686ef5299a31 +SIZE (zabbix-1.6.3.tar.gz) = 8323979 diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix/files/patch-USH-162.1 /root/portwork/zabbix/files/patch-USH-162.1 --- /usr/ports/net-mgmt/zabbix/files/patch-USH-162.1 2009-03-23 10:06:19.000000000 -0500 +++ /root/portwork/zabbix/files/patch-USH-162.1 1969-12-31 18:00:00.000000000 -0600 @@ -1,135 +0,0 @@ -Index: include/validate.inc.php -=================================================================== ---- frontends/php/include/validate.inc.php (revision 6592) -+++ frontends/php/include/validate.inc.php (revision 6593) -@@ -198,19 +198,21 @@ - return $ret; - } - -- function calc_exp($fields,$field,$expression){ -+ function calc_exp($fields,$field,$expression){ - //SDI("$field - expression: ".$expression); - -- if(zbx_strstr($expression,"{}") && !isset($_REQUEST[$field])) -+ if(zbx_strstr($expression,'{}') && !isset($_REQUEST[$field])) - return FALSE; - -- if(zbx_strstr($expression,"{}") && !is_array($_REQUEST[$field])) -- $expression = str_replace("{}",'$_REQUEST["'.$field.'"]',$expression); -+ if(zbx_strstr($expression,'{}') && !is_array($_REQUEST[$field])) -+ $expression = str_replace('{}','$_REQUEST["'.$field.'"]',$expression); - -- if(zbx_strstr($expression,"{}") && is_array($_REQUEST[$field])){ -+ if(zbx_strstr($expression,'{}') && is_array($_REQUEST[$field])){ - foreach($_REQUEST[$field] as $key => $val){ -- $expression2 = str_replace("{}",'$_REQUEST["'.$field.'"]["'.$key.'"]',$expression); -- if(calc_exp2($fields,$field,$expression2)==FALSE) -+ if(!ereg('^[a-zA-Z0-9_]+$',$key)) return FALSE; -+ -+ $expression2 = str_replace('{}','$_REQUEST["'.$field.'"]["'.$key.'"]',$expression); -+ if(calc_exp2($fields,$field,$expression2)==FALSE) - return FALSE; - } - return TRUE; -@@ -219,7 +221,7 @@ - return calc_exp2($fields,$field,$expression); - } - -- function unset_not_in_list(&$fields){ -+ function unset_not_in_list(&$fields){ - foreach($_REQUEST as $key => $val){ - if(!isset($fields[$key])){ - unset_request($key,'unset_not_in_list'); -@@ -382,7 +384,7 @@ - } - } - -- function check_field(&$fields, &$field, $checks){ -+ function check_field(&$fields, &$field, $checks){ - list($type,$opt,$flags,$validation,$exception)=$checks; - - if($flags&P_UNSET_EMPTY && isset($_REQUEST[$field]) && $_REQUEST[$field]==''){ -@@ -473,9 +475,7 @@ - include_once "include/page_footer.php"; - } - -- function check_fields(&$fields, $show_messages=true){ -- -- global $_REQUEST; -+ function check_fields(&$fields, $show_messages=true){ - global $system_fields; - - $err = ZBX_VALID_OK; -Index: locales.php -=================================================================== ---- frontends/php/locales.php (revision 6592) -+++ frontends/php/locales.php (revision 6593) -@@ -19,11 +19,11 @@ - **/ - ?> - AddOption('id','locales'); - $frmLcls->SetHelp($help); - -- $fileFrom = 'include/locales/'.$_REQUEST['srclang'].".inc.php"; -- if(file_exists($fileFrom)){ -- include($fileFrom); - -+ $fileFrom = 'include/locales/'.$_REQUEST['srclang'].'.inc.php'; -+ if(ereg('^[A-Za-z0-9_]+$', $_REQUEST['srclang']) && file_exists($fileFrom)){ -+ include($fileFrom); - if(!isset($TRANSLATION) || !is_array($TRANSLATION)){ -- error("Passed SOURCE is NOT valid PHP file."); -+ error('Passed SOURCE is NOT valid PHP file.'); - } - $transFrom = $TRANSLATION; - } - unset($TRANSLATION); - -- $frmLcls->AddVar('extlang',$_REQUEST['extlang']); -- -- if($_REQUEST['extlang'] != 'new'){ -- $fileTo = 'include/locales/'.$_REQUEST['extlang'].".inc.php"; -+ $frmLcls->addVar('extlang',$_REQUEST['extlang']); -+ if(ereg('^[A-Za-z0-9_]+$', $_REQUEST['srclang']) && ($_REQUEST['extlang'] != 'new')){ -+ $fileTo = 'include/locales/'.$_REQUEST['extlang'].'.inc.php'; - if(file_exists($fileTo)){ - include($fileTo); - - if(!isset($TRANSLATION) || !is_array($TRANSLATION)){ -- error("Passed DEST is NOT valid PHP file."); -+ error('Passed DEST is NOT valid PHP file.'); - } - $transTo = $TRANSLATION; - // header('Content-Type: text/html; charset='.$TRANSLATION['S_HTML_CHARSET']); - ------ - -This hunk fixes typo in the bugfix for local file inclusion inside -locales.php - -Index: branches/1.6/frontends/php/locales.php -=================================================================== ---- frontends/php/locales.php (revision 6885) -+++ frontends/php/locales.php (revision 6886) -@@ -193,7 +193,7 @@ - unset($TRANSLATION); - - $frmLcls->addVar('extlang',$_REQUEST['extlang']); -- if(ereg('^[A-Za-z0-9_]+$', $_REQUEST['srclang']) && ($_REQUEST['extlang'] != 'new')){ -+ if(ereg('^[A-Za-z0-9_]+$', $_REQUEST['extlang']) && ($_REQUEST['extlang'] != 'new')){ - $fileTo = 'include/locales/'.$_REQUEST['extlang'].'.inc.php'; - if(file_exists($fileTo)){ - include($fileTo); diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix/files/patch-USH-162.2 /root/portwork/zabbix/files/patch-USH-162.2 --- /usr/ports/net-mgmt/zabbix/files/patch-USH-162.2 2009-03-23 10:06:19.000000000 -0500 +++ /root/portwork/zabbix/files/patch-USH-162.2 1969-12-31 18:00:00.000000000 -0600 @@ -1,2622 +0,0 @@ -Index: frontends/php/include/perm.inc.php -=================================================================== ---- frontends/php/include/perm.inc.php (revision 6620) -+++ frontends/php/include/perm.inc.php (revision 6621) -@@ -44,7 +44,7 @@ - $USER_DETAILS = NULL; - $login = FALSE; - -- $sessionid = get_cookie('zbx_sessionid'); -+ $sessionid = get_request('sessionid',get_cookie('zbx_sessionid')); - - if(!is_null($sessionid)){ - $sql = 'SELECT u.*,s.* '. -Index: frontends/php/include/validate.inc.php -=================================================================== ---- frontends/php/include/validate.inc.php (revision 6620) -+++ frontends/php/include/validate.inc.php (revision 6621) -@@ -428,8 +429,12 @@ - } - } - else if($opt == O_OPT){ -- if(!isset($_REQUEST[$field])) -+ if(!isset($_REQUEST[$field])){ - return ZBX_VALID_OK; -+ } -+ else if(($flags&P_ACT) && !isset($_REQUEST['zbx_form'])){ -+ return ZBX_VALID_ERROR; -+ } - } - - check_trim($_REQUEST[$field]); -@@ -458,17 +463,21 @@ - return ZBX_VALID_OK; - } - --// VAR TYPE OPTIONAL FLAGS VALIDATION EXCEPTION -+// VAR TYPE OPTIONAL FLAGS VALIDATION EXCEPTION - $system_fields=array( -- "sessionid"=> array(T_ZBX_STR, O_OPT, P_SYS, HEX(),NULL), -- "switch_node"=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID,NULL), -- "triggers_hash"=> array(T_ZBX_STR, O_OPT, P_SYS, NOT_EMPTY,NULL), -- 'print'=> array(T_ZBX_INT, O_OPT, P_SYS, IN("1"),NULL), -+ 'sessionid'=> array(T_ZBX_STR, O_OPT, P_SYS, HEX(), 'isset({zbx_form})'), -+ 'zbx_form'=> array(T_ZBX_STR, O_OPT, P_SYS, NOT_EMPTY, NULL), -+// -+ 'switch_node'=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID,NULL), -+ 'triggers_hash'=> array(T_ZBX_STR, O_OPT, P_SYS, NOT_EMPTY,NULL), -+ 'print'=> array(T_ZBX_INT, O_OPT, P_SYS, IN('1'),NULL), -+ -+// table sorting - 'sort'=> array(T_ZBX_STR, O_OPT, P_SYS, NULL,NULL), - 'sortorder'=> array(T_ZBX_STR, O_OPT, P_SYS, NULL,NULL) - ); - -- function invalid_url(){ -+ function invalid_url(){ - include_once "include/page_header.php"; - unset_all(); - show_error_message(S_INVALID_URL); -Index: frontends/php/include/classes/cform.inc.php -=================================================================== ---- frontends/php/include/classes/cform.inc.php (revision 6620) -+++ frontends/php/include/classes/cform.inc.php (revision 6621) -@@ -22,46 +22,44 @@ - class CForm extends CTag{ - /* public */ - function CForm($action=NULL, $method='post', $enctype=NULL){ -- parent::CTag("form","yes"); -- $this->SetMethod($method); -- $this->SetAction($action); -- $this->SetEnctype($enctype); -+ parent::CTag('form','yes'); -+ $this->setMethod($method); -+ $this->setAction($action); -+ $this->setEnctype($enctype); -+ -+ $this->addVar('zbx_form', 'action'); -+ $this->addVar('sessionid', $_COOKIE['zbx_sessionid']); - } - -- function SetMethod($value='post'){ -+ function setMethod($value='post'){ - return $this->options['method'] = $value; - } - -- function SetAction($value){ -+ function setAction($value){ - global $page; - - if(is_null($value)){ -- if(isset($page['file'])){ -- $value = $page['file']; -- } -- else{ -- $value = "#"; -- } -+ $value = isset($page['file'])?$page['file']:'#'; - } - - return $this->options['action'] = $value; - } - -- function SetEnctype($value=NULL){ -+ function setEnctype($value=NULL){ - if(is_null($value)){ -- return $this->DelOption("enctype"); -+ return $this->DelOption('enctype'); - } - else if(!is_string($value)){ - return $this->error("Incorrect value for SetEnctype [$value]"); - } - -- return $this->AddOption("enctype",$value); -+ return $this->addOption('enctype',$value); - } - -- function AddVar($name, $value){ -+ function addVar($name, $value){ - if(empty($value) && $value != 0) return $value; - -- return $this->AddItem(new CVar($name, $value)); -+ return $this->addItem(new CVar($name, $value)); - } - } - ?> -Index: frontends/php/include/classes/cformtable.inc.php -=================================================================== ---- frontends/php/include/classes/cformtable.inc.php (revision 6620) -+++ frontends/php/include/classes/cformtable.inc.php (revision 6621) -@@ -46,48 +46,48 @@ - } - - parent::CForm($action,$method,$enctype); -- $this->SetTitle($title); -- $this->SetAlign('center'); -- $this->SetHelp(); -+ $this->setTitle($title); -+ $this->setAlign('center'); -+ $this->setHelp(); - - // $frm_link = new CLink(); --// $frm_link->SetName("formtable"); --// $this->AddItemToTopRow($frm_link); -+// $frm_link->setName("formtable"); -+// $this->addItemToTopRow($frm_link); - -- $this->AddVar($form_variable, get_request($form_variable, 1)); -- $this->AddVar('form_refresh',get_request('form_refresh',0)+1); -+ $this->addVar($form_variable, get_request($form_variable, 1)); -+ $this->addVar('form_refresh',get_request('form_refresh',0)+1); - - $this->bottom_items = new CCol(SPACE,'form_row_last'); -- $this->bottom_items->SetColSpan(2); -+ $this->bottom_items->setColSpan(2); - } - -- function SetAction($value){ -+ function setAction($value){ - - if(is_string($value)) -- return parent::SetAction($value); -+ return parent::setAction($value); - elseif(is_null($value)) -- return parent::SetAction($value); -+ return parent::setAction($value); - else - return $this->error("Incorrect value for SetAction [$value]"); - } - -- function SetName($value){ -+ function setName($value){ - if(!is_string($value)){ - return $this->error("Incorrect value for SetAlign [$value]"); - } -- $this->AddOption('name',$value); -- $this->AddOption('id',$value); -+ $this->addOption('name',$value); -+ $this->addOption('id',$value); - return true; - } - -- function SetAlign($value){ -+ function setAlign($value){ - if(!is_string($value)){ - return $this->error("Incorrect value for SetAlign [$value]"); - } - return $this->align = $value; - } - -- function SetTitle($value=NULL){ -+ function setTitle($value=NULL){ - if(is_null($value)){ - unset($this->title); - return 0; -@@ -101,7 +101,7 @@ - $this->title = unpack_object($value); - } - -- function SetHelp($value=NULL){ -+ function setHelp($value=NULL){ - if(is_null($value)) { - $this->help = new CHelp(); - } -@@ -110,8 +110,8 @@ - } - else if(is_string($value)) { - $this->help = new CHelp($value); -- if($this->GetName()==NULL) -- $this->SetName($value); -+ if($this->getName()==NULL) -+ $this->setName($value); - } - else { - return $this->error("Incorrect value for SetHelp [$value]"); -@@ -119,21 +119,21 @@ - return 0; - } - -- function AddVar($name, $value){ -- $this->AddItemToTopRow(new CVar($name, $value)); -+ function addVar($name, $value){ -+ $this->addItemToTopRow(new CVar($name, $value)); - } - -- function AddItemToTopRow($value){ -+ function addItemToTopRow($value){ - array_push($this->top_items, $value); - } - -- function AddRow($item1, $item2=NULL, $class=NULL){ -+ function addRow($item1, $item2=NULL, $class=NULL){ - if(strtolower(get_class($item1)) == 'crow'){ - - } - else if(strtolower(get_class($item1)) == 'ctable'){ - $td = new CCol($item1,'form_row_c'); -- $td->SetColSpan(2); -+ $td->setColSpan(2); - - $item1 = new CRow($td); - } -@@ -157,7 +157,7 @@ - array_push($this->center_items, $item1); - } - -- function AddSpanRow($value, $class=NULL){ -+ function addSpanRow($value, $class=NULL){ - if(is_string($value)) - $item1=nbsp($value); - -@@ -165,16 +165,16 @@ - if(is_null($class)) $class = 'form_row_c'; - - $col = new CCol($value,$class); -- $col->SetColSpan(2); -+ $col->setColSpan(2); - array_push($this->center_items,new CRow($col)); - } - - -- function AddItemToBottomRow($value){ -- $this->bottom_items->AddItem($value); -+ function addItemToBottomRow($value){ -+ $this->bottom_items->addItem($value); - } - -- function SetTableClass($class){ -+ function setTableClass($class){ - if(is_string($class)){ - $this->tableclass = $class; - } -@@ -186,25 +186,25 @@ - - $tbl = new CTable(NULL,$this->tableclass); - -- $tbl->SetOddRowClass('form_odd_row'); -- $tbl->SetEvenRowClass('form_even_row'); -- $tbl->SetCellSpacing(0); -- $tbl->SetCellPadding(1); -- $tbl->SetAlign($this->align); -+ $tbl->setOddRowClass('form_odd_row'); -+ $tbl->setEvenRowClass('form_even_row'); -+ $tbl->setCellSpacing(0); -+ $tbl->setCellPadding(1); -+ $tbl->setAlign($this->align); - # add first row - $col = new CCol(NULL,'form_row_first'); -- $col->SetColSpan(2); -+ $col->setColSpan(2); - -- if(isset($this->help)) $col->AddItem($this->help); -- if(isset($this->title)) $col->AddItem($this->title); -- foreach($this->top_items as $item) $col->AddItem($item); -+ if(isset($this->help)) $col->addItem($this->help); -+ if(isset($this->title)) $col->addItem($this->title); -+ foreach($this->top_items as $item) $col->addItem($item); - -- $tbl->SetHeader($col); -+ $tbl->setHeader($col); - # add last row -- $tbl->SetFooter($this->bottom_items); -+ $tbl->setFooter($this->bottom_items); - # add center rows - foreach($this->center_items as $item){ -- $tbl->AddRow($item); -+ $tbl->addRow($item); - } - return $tbl->ToString(); - } - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Obtained from svn://svn.zabbix.com/branches/1.6/frontends/php/ - -This hunk adds session identifier transmission during Ajax requests. -It also reshuffles some JavaScript functions and adds many whitespace -changes. - -Index: frontends/php/js/cookies.js -=================================================================== ---- frontends/php/js/cookies.js (revision 6622) -+++ frontends/php/js/cookies.js (revision 6623) -@@ -1,78 +0,0 @@ --//Javascript document --/* --** ZABBIX --** Copyright (C) 2000-2005 SIA Zabbix --** --** This program is free software; you can redistribute it and/or modify --** it under the terms of the GNU General Public License as published by --** the Free Software Foundation; either version 2 of the License, or --** (at your option) any later version. --** --** This program is distributed in the hope that it will be useful, --** but WITHOUT ANY WARRANTY; without even the implied warranty of --** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --** GNU General Public License for more details. --** --** You should have received a copy of the GNU General Public License --** along with this program; if not, write to the Free Software --** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --**/ --// Title: cookies class --// Description: to manipulate cookies on client side --// Author: Aly -- --var cookie ={ --cookies: new Array(), -- --init: function () { -- var allCookies = document.cookie.split('; '); -- for (var i=0;i=0)?this.url.substring(this.url.indexOf('?')+1):''; -- if(this.query.indexOf('#')>=0) this.query=this.query.substring(0,this.query.indexOf('#')); -- -- var protocolSepIndex=this.url.indexOf('://'); -- if(protocolSepIndex>=0){ -- this.protocol=this.url.substring(0,protocolSepIndex).toLowerCase(); -- this.host=this.url.substring(protocolSepIndex+3); -- if(this.host.indexOf('/')>=0) this.host=this.host.substring(0,this.host.indexOf('/')); -- var atIndex=this.host.indexOf('@'); -- if(atIndex>=0){ -- var credentials=this.host.substring(0,atIndex); -- var colonIndex=credentials.indexOf(':'); -- if(colonIndex>=0){ -- this.username=credentials.substring(0,colonIndex); -- this.password=credentials.substring(colonIndex); -- }else{ -- this.username=credentials; -- } -- this.host=this.host.substring(atIndex+1); -- } -- -- var host_ipv6 = this.host.indexOf(']'); -- if(host_ipv6>=0){ -- if(host_ipv6 < (this.host.length-1)){ -- host_ipv6++; -- var host_less = this.host.substring(host_ipv6); -- -- var portColonIndex=host_less.indexOf(':'); -- if(portColonIndex>=0){ -- this.port=host_less.substring(portColonIndex+1); -- this.host=this.host.substring(0,host_ipv6); -- } -- } -- } -- else{ -- var portColonIndex=this.host.indexOf(':'); -- if(portColonIndex>=0){ -- this.port=this.host.substring(portColonIndex+1); -- this.host=this.host.substring(0,portColonIndex); -- } -- } -- this.file=this.url.substring(protocolSepIndex+3); -- this.file=this.file.substring(this.file.indexOf('/')); -- }else{ -- this.file=this.url; -- } -- if(this.file.indexOf('?')>=0) this.file=this.file.substring(0, this.file.indexOf('?')); -- -- var refSepIndex=url.indexOf('#'); -- if(refSepIndex>=0){ -- this.file=this.file.substring(0,refSepIndex); -- this.reference=this.url.substring(this.url.indexOf('#')); -- } -- this.path=this.file; -- if(this.query.length>0) this.file+='?'+this.query; -- if(this.reference.length>0) this.file+='#'+this.reference; -- if(this.query.length > 0) this.getArguments(); --}, -- --getArguments: function(){ -- var args=this.query.split('&'); -- var keyval=''; -- -- if(args.length<1) return; -- -- for(i=0;i 0)?(this.protocol+'://'):''; -- uri += encodeURI((this.username.length > 0)?(this.username):''); -- uri += encodeURI((this.password.length > 0)?(':'+this.password):''); -- uri += (this.host.length > 0)?(this.host):''; -- uri += (this.port.length > 0)?(':'+this.port):''; -- uri += encodeURI((this.path.length > 0)?(this.path):''); -- uri += encodeURI((this.query.length > 0)?('?'+this.query):''); -- uri += encodeURI((this.reference.length > 0)?('#'+this.reference):''); --// alert(uri.getProtocol()+' : '+uri.getHost()+' : '+uri.getPort()+' : '+uri.getPath()+' : '+uri.getQuery()); --return uri; --}, -- --setArgument: function(key,value){ -- -- var valueisset = false; -- if(typeof(key) == 'undefined') throw 'Invalid argument past for setArgument'; -- -- value =('undefined' != typeof(value))?value:''; -- -- for(i=0; i < this.arguments.length; i++){ -- if(this.arguments[i][0] == key){ -- valueisset = true; -- this.arguments[i][1] = value; -- } -- } -- if(!valueisset) this.arguments[this.arguments.length] = new Array(key,value); -- this.formatQuery(); --}, -- --formatQuery: function(){ -- if(this.arguments.lenght < 1) return; -- -- var query = ''; -- for(i=0; i < this.arguments.length; i++){ -- query+=this.arguments[i][0]+'='+this.arguments[i][1]+'&'; -- } -- this.query = query.substring(0,query.length-1); --}, -- --getPort: function(){ -- return this.port; --}, -- --setPort: function(port){ -- this.port = port; --}, -- --getQuery: function(){ -- return this.query; --}, -- --setQuery: function(query){ -- this.query = query; -- this.getArgumentValues(); -- this.formatQuery(); --}, -- --/* Returns the protocol of this URL, i.e. 'http' in the url 'http://server/' */ --getProtocol: function(){ -- return this.protocol; --}, -- --setProtocol: function(protocol){ -- this.protocol = protocol; --}, --/* Returns the host name of this URL, i.e. 'server.com' in the url 'http://server.com/' */ --getHost: function(){ -- return this.host; --}, -- --setHost: function(set){ -- this.host = host; --}, -- --/* Returns the user name part of this URL, i.e. 'joe' in the url 'http://joe@server.com/' */ --getUserName: function(){ -- return this.username; --}, -- --setUserName: function(username){ -- this.username = username; --}, -- --/* Returns the password part of this url, i.e. 'secret' in the url 'http://joe:secret@server.com/' */ --getPassword: function(){ -- return this.password; --}, -- --setPassword: function(password){ -- this.password = password; --}, -- --/* Returns the file part of this url, i.e. everything after the host name. */ --getFile: function(){ -- return this.file = file; --}, -- --setFile: function(file){ -- this.file = file; --}, -- --/* Returns the reference of this url, i.e. 'bookmark' in the url 'http://server/file.html#bookmark' */ --getReference: function(){ -- return this.reference; --}, -- --setReference: function(reference){ -- this.reference = reference; --}, -- --/* Returns the file path of this url, i.e. '/dir/file.html' in the url 'http://server/dir/file.html' */ --getPath: function(){ -- return this.path; --}, -- --setPath: function(path){ -- this.path = path; --} -- --} -\ No newline at end of file -Index: frontends/php/js/updater.js -=================================================================== ---- frontends/php/js/updater.js (revision 6622) -+++ frontends/php/js/updater.js (revision 6623) -@@ -27,7 +27,7 @@ - - setObj4Update: function(id,frequency,url,params){ - var obj = document.getElementById(id); -- if((typeof(obj) == 'undefined')) return false; -+ if(typeof(obj) == 'undefined') return false; - - var obj4update = { - 'id': id, -@@ -65,7 +65,9 @@ - obj4update.ready = false; - - var uri = new url(obj4update.url); -- new Ajax.Updater(obj4update.id, obj4update.url, -+ uri.setArgument('sessionid', cookie.read('zbx_sessionid')); -+ -+ new Ajax.Updater(obj4update.id, uri.getUrl(),//obj4update.url, - { - method: 'post', - 'parameters': obj4update.params, -Index: frontends/php/js/gpc.js -=================================================================== ---- frontends/php/js/gpc.js (revision 0) -+++ frontends/php/js/gpc.js (revision 6623) -@@ -0,0 +1,315 @@ -+//Javascript document -+/* -+** ZABBIX -+** Copyright (C) 2000-2009 SIA Zabbix -+** -+** This program is free software; you can redistribute it and/or modify -+** it under the terms of the GNU General Public License as published by -+** the Free Software Foundation; either version 2 of the License, or -+** (at your option) any later version. -+** -+** This program is distributed in the hope that it will be useful, -+** but WITHOUT ANY WARRANTY; without even the implied warranty of -+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+** GNU General Public License for more details. -+** -+** You should have received a copy of the GNU General Public License -+** along with this program; if not, write to the Free Software -+** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+**/ -+ -+// Title: cookies class -+// Description: to manipulate cookies on client side -+// Author: Aly -+var cookie ={ -+cookies: new Array(), -+ -+init: function () { -+ var allCookies = document.cookie.split('; '); -+ for (var i=0;i=0)?this.url.substring(this.url.indexOf('?')+1):''; -+ if(this.query.indexOf('#')>=0) this.query=this.query.substring(0,this.query.indexOf('#')); -+ -+ var protocolSepIndex=this.url.indexOf('://'); -+ if(protocolSepIndex>=0){ -+ this.protocol=this.url.substring(0,protocolSepIndex).toLowerCase(); -+ this.host=this.url.substring(protocolSepIndex+3); -+ if(this.host.indexOf('/')>=0) this.host=this.host.substring(0,this.host.indexOf('/')); -+ var atIndex=this.host.indexOf('@'); -+ if(atIndex>=0){ -+ var credentials=this.host.substring(0,atIndex); -+ var colonIndex=credentials.indexOf(':'); -+ if(colonIndex>=0){ -+ this.username=credentials.substring(0,colonIndex); -+ this.password=credentials.substring(colonIndex); -+ }else{ -+ this.username=credentials; -+ } -+ this.host=this.host.substring(atIndex+1); -+ } -+ -+ var host_ipv6 = this.host.indexOf(']'); -+ if(host_ipv6>=0){ -+ if(host_ipv6 < (this.host.length-1)){ -+ host_ipv6++; -+ var host_less = this.host.substring(host_ipv6); -+ -+ var portColonIndex=host_less.indexOf(':'); -+ if(portColonIndex>=0){ -+ this.port=host_less.substring(portColonIndex+1); -+ this.host=this.host.substring(0,host_ipv6); -+ } -+ } -+ } -+ else{ -+ var portColonIndex=this.host.indexOf(':'); -+ if(portColonIndex>=0){ -+ this.port=this.host.substring(portColonIndex+1); -+ this.host=this.host.substring(0,portColonIndex); -+ } -+ } -+ this.file=this.url.substring(protocolSepIndex+3); -+ this.file=this.file.substring(this.file.indexOf('/')); -+ }else{ -+ this.file=this.url; -+ } -+ if(this.file.indexOf('?')>=0) this.file=this.file.substring(0, this.file.indexOf('?')); -+ -+ var refSepIndex=url.indexOf('#'); -+ if(refSepIndex>=0){ -+ this.file=this.file.substring(0,refSepIndex); -+ this.reference=this.url.substring(this.url.indexOf('#')); -+ } -+ this.path=this.file; -+ if(this.query.length>0) this.file+='?'+this.query; -+ if(this.reference.length>0) this.file+='#'+this.reference; -+ if(this.query.length > 0) this.getArguments(); -+}, -+ -+getArguments: function(){ -+ var args=this.query.split('&'); -+ var keyval=''; -+ -+ if(args.length<1) return; -+ -+ for(i=0;i 0)?(this.protocol+'://'):''; -+ uri += encodeURI((this.username.length > 0)?(this.username):''); -+ uri += encodeURI((this.password.length > 0)?(':'+this.password):''); -+ uri += (this.host.length > 0)?(this.host):''; -+ uri += (this.port.length > 0)?(':'+this.port):''; -+ uri += encodeURI((this.path.length > 0)?(this.path):''); -+ uri += encodeURI((this.query.length > 0)?('?'+this.query):''); -+ uri += encodeURI((this.reference.length > 0)?('#'+this.reference):''); -+// alert(uri.getProtocol()+' : '+uri.getHost()+' : '+uri.getPort()+' : '+uri.getPath()+' : '+uri.getQuery()); -+return uri; -+}, -+ -+setArgument: function(key,value){ -+ -+ var valueisset = false; -+ if(typeof(key) == 'undefined') throw 'Invalid argument past for setArgument'; -+ -+ value =('undefined' != typeof(value))?value:''; -+ -+ for(i=0; i < this.arguments.length; i++){ -+ if(this.arguments[i][0] == key){ -+ valueisset = true; -+ this.arguments[i][1] = value; -+ } -+ } -+ if(!valueisset) this.arguments[this.arguments.length] = new Array(key,value); -+ this.formatQuery(); -+}, -+ -+formatQuery: function(){ -+ if(this.arguments.lenght < 1) return; -+ -+ var query = ''; -+ for(i=0; i < this.arguments.length; i++){ -+ query+=this.arguments[i][0]+'='+this.arguments[i][1]+'&'; -+ } -+ this.query = query.substring(0,query.length-1); -+}, -+ -+getPort: function(){ -+ return this.port; -+}, -+ -+setPort: function(port){ -+ this.port = port; -+}, -+ -+getQuery: function(){ -+ return this.query; -+}, -+ -+setQuery: function(query){ -+ this.query = query; -+ this.getArgumentValues(); -+ this.formatQuery(); -+}, -+ -+/* Returns the protocol of this URL, i.e. 'http' in the url 'http://server/' */ -+getProtocol: function(){ -+ return this.protocol; -+}, -+ -+setProtocol: function(protocol){ -+ this.protocol = protocol; -+}, -+/* Returns the host name of this URL, i.e. 'server.com' in the url 'http://server.com/' */ -+getHost: function(){ -+ return this.host; -+}, -+ -+setHost: function(set){ -+ this.host = host; -+}, -+ -+/* Returns the user name part of this URL, i.e. 'joe' in the url 'http://joe@server.com/' */ -+getUserName: function(){ -+ return this.username; -+}, -+ -+setUserName: function(username){ -+ this.username = username; -+}, -+ -+/* Returns the password part of this url, i.e. 'secret' in the url 'http://joe:secret@server.com/' */ -+getPassword: function(){ -+ return this.password; -+}, -+ -+setPassword: function(password){ -+ this.password = password; -+}, -+ -+/* Returns the file part of this url, i.e. everything after the host name. */ -+getFile: function(){ -+ return this.file = file; -+}, -+ -+setFile: function(file){ -+ this.file = file; -+}, -+ -+/* Returns the reference of this url, i.e. 'bookmark' in the url 'http://server/file.html#bookmark' */ -+getReference: function(){ -+ return this.reference; -+}, -+ -+setReference: function(reference){ -+ this.reference = reference; -+}, -+ -+/* Returns the file path of this url, i.e. '/dir/file.html' in the url 'http://server/dir/file.html' */ -+getPath: function(){ -+ return this.path; -+}, -+ -+setPath: function(path){ -+ this.path = path; -+} -+} -\ No newline at end of file -Index: frontends/php/js/ajax_req.js -=================================================================== ---- frontends/php/js/ajax_req.js (revision 6622) -+++ frontends/php/js/ajax_req.js (revision 6623) -@@ -19,6 +19,8 @@ - **/ - - function send_params(params){ -+ if(typeof(params) == 'undefined') var params = new Array(); -+ params['sessionid'] = cookie.read('zbx_sessionid'); - - var uri = new url(location.href); - new Ajax.Request(uri.getPath()+"?output=ajax", -Index: frontends/php/dashboard.php -=================================================================== ---- frontends/php/dashboard.php (revision 6622) -+++ frontends/php/dashboard.php (revision 6623) -@@ -42,8 +42,8 @@ - 'view_style'=> array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'), NULL), - 'type'=> array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'), NULL), - -- 'output'=> array(T_ZBX_STR, O_OPT, P_ACT, NULL, NULL), -- 'jsscriptid'=> array(T_ZBX_STR, O_OPT, P_ACT, NULL, NULL), -+ 'output'=> array(T_ZBX_STR, O_OPT, P_SYS, NULL, NULL), -+ 'jsscriptid'=> array(T_ZBX_STR, O_OPT, P_SYS, NULL, NULL), - 'fullscreen'=> array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'), NULL), - - //ajax -@@ -56,7 +56,7 @@ - ); - - check_fields($fields); -- -+ - $available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY, PERM_RES_IDS_ARRAY); - // ACTION ///////////////////////////////////////////////////////////////////////////// - if(isset($_REQUEST['favobj'])){ -Index: frontends/php/include/page_header.php -=================================================================== ---- frontends/php/include/page_header.php (revision 6622) -+++ frontends/php/include/page_header.php (revision 6623) -@@ -428,8 +428,8 @@ - - - -+ - -- - - array(T_ZBX_STR, O_OPT, P_SYS, HEX(), 'isset({zbx_form})'), -- 'zbx_form'=> array(T_ZBX_STR, O_OPT, P_SYS, NOT_EMPTY, NULL), -+ 'sessionid'=> array(T_ZBX_STR, O_OPT, P_SYS, HEX(), NULL), - // - 'switch_node'=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID,NULL), - 'triggers_hash'=> array(T_ZBX_STR, O_OPT, P_SYS, NOT_EMPTY,NULL), -Index: frontends/php/include/classes/ctree.inc.php -=================================================================== ---- frontends/php/include/classes/ctree.inc.php (revision 6622) -+++ frontends/php/include/classes/ctree.inc.php (revision 6623) -@@ -214,7 +214,6 @@ - global $page; - $js = ' - -- - - -+ - -- - - array(T_ZBX_STR, O_OPT, P_SYS, HEX(), 'isset({zbx_form})'), -- 'zbx_form'=> array(T_ZBX_STR, O_OPT, P_SYS, NOT_EMPTY, NULL), -+ 'sessionid'=> array(T_ZBX_STR, O_OPT, P_SYS, HEX(), NULL), - // - 'switch_node'=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID,NULL), - 'triggers_hash'=> array(T_ZBX_STR, O_OPT, P_SYS, NOT_EMPTY,NULL), -Index: frontends/php/include/classes/ctree.inc.php -=================================================================== ---- frontends/php/include/classes/ctree.inc.php (revision 6622) -+++ frontends/php/include/classes/ctree.inc.php (revision 6623) -@@ -214,7 +214,6 @@ - global $page; - $js = ' - -- -