diff --git a/debian/apache2.conf b/debian/apache2.conf index f0f8b2f..e66d3af 100644 --- a/debian/apache2.conf +++ b/debian/apache2.conf @@ -1,33 +1,40 @@ -# apache configuration for nagios 3.x -# note to users of nagios 1.x and 2.x: +# apache configuration for nagios 4.x +# note to users of nagios 1.x and 2.x and 3.x: # throughout this file are commented out sections which preserve # backwards compatibility with bookmarks/config for older nagios versios. -# simply look for lines following "nagios 1.x:" and "nagios 2.x" comments. +# simply look for lines following "nagios 1.x:" and "nagios 2.x" and "nagios 3.x" comments. -ScriptAlias /cgi-bin/nagios3 /usr/lib/cgi-bin/nagios3 -ScriptAlias /nagios3/cgi-bin /usr/lib/cgi-bin/nagios3 +ScriptAlias /cgi-bin/nagios4 /usr/lib/cgi-bin/nagios4 +ScriptAlias /nagios4/cgi-bin /usr/lib/cgi-bin/nagios4 # nagios 1.x: -#ScriptAlias /cgi-bin/nagios /usr/lib/cgi-bin/nagios3 -#ScriptAlias /nagios/cgi-bin /usr/lib/cgi-bin/nagios3 +#ScriptAlias /cgi-bin/nagios /usr/lib/cgi-bin/nagios4 +#ScriptAlias /nagios/cgi-bin /usr/lib/cgi-bin/nagios4 # nagios 2.x: -#ScriptAlias /cgi-bin/nagios2 /usr/lib/cgi-bin/nagios3 -#ScriptAlias /nagios2/cgi-bin /usr/lib/cgi-bin/nagios3 +#ScriptAlias /cgi-bin/nagios2 /usr/lib/cgi-bin/nagios4 +#ScriptAlias /nagios2/cgi-bin /usr/lib/cgi-bin/nagios4 +# nagios 3.x: +#ScriptAlias /cgi-bin/nagios3 /usr/lib/cgi-bin/nagios4 +#ScriptAlias /nagios3/cgi-bin /usr/lib/cgi-bin/nagios4 # Where the stylesheets (config files) reside -Alias /nagios3/stylesheets /etc/nagios3/stylesheets +Alias /nagios4/stylesheets /etc/nagios4/stylesheets # nagios 1.x: -#Alias /nagios/stylesheets /etc/nagios3/stylesheets +#Alias /nagios/stylesheets /etc/nagios4/stylesheets # nagios 2.x: -#Alias /nagios2/stylesheets /etc/nagios3/stylesheets +#Alias /nagios2/stylesheets /etc/nagios4/stylesheets +# nagios 3.x: +#Alias /nagios3/stylesheets /etc/nagios4/stylesheets # Where the HTML pages live -Alias /nagios3 /usr/share/nagios3/htdocs +Alias /nagios4 /usr/share/nagios4/htdocs +# nagios 3.x: +#Alias /nagios3 /usr/share/nagios4/htdocs # nagios 2.x: -#Alias /nagios2 /usr/share/nagios3/htdocs +#Alias /nagios2 /usr/share/nagios4/htdocs # nagios 1.x: -#Alias /nagios /usr/share/nagios3/htdocs +#Alias /nagios /usr/share/nagios4/htdocs - + Options FollowSymLinks DirectoryIndex index.php index.html @@ -46,13 +53,13 @@ Alias /nagios3 /usr/share/nagios3/htdocs AuthName "Nagios Access" AuthType Basic - AuthUserFile /etc/nagios3/htpasswd.users + AuthUserFile /etc/nagios4/htpasswd.users # nagios 1.x: #AuthUserFile /etc/nagios/htpasswd.users require valid-user - + Options +ExecCGI @@ -61,7 +68,7 @@ Alias /nagios3 /usr/share/nagios3/htdocs # It allows you to see a clickable list of all hostgroups in the # left pane of the Nagios web interface # XXX This is not tested for nagios 2.x use at your own peril -#ScriptAlias /nagios3/side.html /usr/lib/cgi-bin/nagios3/grouplist.cgi +#ScriptAlias /nagios4/side.html /usr/lib/cgi-bin/nagios4/grouplist.cgi # nagios 1.x: -#ScriptAlias /nagios/side.html /usr/lib/cgi-bin/nagios3/grouplist.cgi +#ScriptAlias /nagios/side.html /usr/lib/cgi-bin/nagios4/grouplist.cgi diff --git a/debian/changelog b/debian/changelog index f4e19a9..ffdcc49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +nagios4 (4.3.2) UNRELEASED; urgency=medium + + * add nagios 3 compat paths in apache config + * forward port 3.5.1 patches to 4.3.2 + * forward port of package losely based on + https://launchpad.net/~grey-box/+archive/ubuntu/ppa/+files/nagios4_4.1.1-5ubuntu~precise1.tar.gz + + -- Mario Fetka Fri, 19 May 2017 23:48:51 +0200 + nagios3 (3.5.1.dfsg-2) unstable; urgency=medium * [a72437b] Make apache.conf compatible with apache 2.4.10 (Closes: #762096) diff --git a/debian/conf.d/contacts_nagios2.cfg b/debian/conf.d/contacts_nagios.cfg similarity index 100% rename from debian/conf.d/contacts_nagios2.cfg rename to debian/conf.d/contacts_nagios.cfg diff --git a/debian/conf.d/extinfo_nagios2.cfg b/debian/conf.d/extinfo_nagios.cfg similarity index 100% rename from debian/conf.d/extinfo_nagios2.cfg rename to debian/conf.d/extinfo_nagios.cfg diff --git a/debian/conf.d/generic-host_nagios2.cfg b/debian/conf.d/generic-host_nagios.cfg similarity index 100% rename from debian/conf.d/generic-host_nagios2.cfg rename to debian/conf.d/generic-host_nagios.cfg diff --git a/debian/conf.d/generic-service_nagios2.cfg b/debian/conf.d/generic-service_nagios.cfg similarity index 100% rename from debian/conf.d/generic-service_nagios2.cfg rename to debian/conf.d/generic-service_nagios.cfg diff --git a/debian/conf.d/hostgroups_nagios2.cfg b/debian/conf.d/hostgroups_nagios.cfg similarity index 100% rename from debian/conf.d/hostgroups_nagios2.cfg rename to debian/conf.d/hostgroups_nagios.cfg diff --git a/debian/conf.d/localhost_nagios2.cfg b/debian/conf.d/localhost_nagios.cfg similarity index 100% rename from debian/conf.d/localhost_nagios2.cfg rename to debian/conf.d/localhost_nagios.cfg diff --git a/debian/conf.d/services_nagios2.cfg b/debian/conf.d/services_nagios.cfg similarity index 100% rename from debian/conf.d/services_nagios2.cfg rename to debian/conf.d/services_nagios.cfg diff --git a/debian/conf.d/timeperiods_nagios2.cfg b/debian/conf.d/timeperiods_nagios.cfg similarity index 100% rename from debian/conf.d/timeperiods_nagios2.cfg rename to debian/conf.d/timeperiods_nagios.cfg diff --git a/debian/control b/debian/control index 6c9aebd..69a0576 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: nagios3 +Source: nagios4 Section: net Priority: optional Maintainer: Debian Nagios Maintainer Group @@ -6,8 +6,8 @@ Uploaders: sean finney , Alexander Wirt , Jan Wagner Homepage: http://www.nagios.org/ -Vcs-Browser: http://git.debian.org/?p=pkg-nagios/pkg-nagios3.git -Vcs-Git: git://git.debian.org/pkg-nagios/pkg-nagios3.git +Vcs-Browser: http://git.debian.org/?p=pkg-nagios/pkg-nagios4.git +Vcs-Git: git://git.debian.org/pkg-nagios/pkg-nagios4.git Standards-Version: 3.9.5 Build-Depends: autotools-dev, debhelper (>= 7), @@ -18,7 +18,7 @@ Build-Depends: autotools-dev, libpng-dev, po-debconf -Package: nagios3-common +Package: nagios4-common Architecture: all Depends: adduser, bsd-mailx | mailx, @@ -26,13 +26,12 @@ Depends: adduser, lsb-base (>= 3.0-6), nagios-plugins-basic, ucf (>= 0.28), - libjs-jquery, ${misc:Depends}, ${perl:Depends} Recommends: nagios-plugins -Description: support files for nagios3 +Description: support files for nagios4 Nagios is a monitoring and management system for hosts, services and - networks. nagios3-common contains the common files for the nagios3 package. + networks. nagios4-common contains the common files for the nagios4 package. . Nagios' features include: . @@ -55,24 +54,24 @@ Description: support files for nagios3 . Upstream URL: http://www.nagios.org/ -Package: nagios3-cgi +Package: nagios4-cgi Architecture: any -Replaces: nagios3 (<< 3.2.0), nagios3-common (<< 3.2.0), nagios3-doc (<< 3.2.0) -Breaks: nagios3 (<< 3.2.0), nagios3-common (<< 3.2.0), nagios3-doc (<< 3.2.0) +Replaces: nagios4 (<< 4.1.0), nagios4-common (<< 4.1.0), nagios4-doc (<< 4.1.0) +Breaks: nagios4 (<< 4.1.0), nagios4-common (<< 4.1.0), nagios4-doc (<< 4.1.0) Depends: adduser, apache2-utils, coreutils (>= 4.5.3), libapache2-mod-php5 | php5 | php5-cgi, libjs-jquery, - nagios3-common (= ${source:Version}), + nagios4-common (= ${source:Version}), ucf (>= 0.28), ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} Recommends: apache2 | httpd, nagios-images (>> 0.1) -Description: cgi files for nagios3 +Description: cgi files for nagios4 Nagios is a monitoring and management system for hosts, services and - networks. nagios3-common contains the common files for the nagios3 package. + networks. nagios4-common contains the common files for the nagios4 package. . Nagios' features include: . @@ -95,10 +94,10 @@ Description: cgi files for nagios3 . Upstream URL: http://www.nagios.org/ -Package: nagios3 +Package: nagios4 Architecture: any -Depends: nagios3-cgi (= ${binary:Version}), - nagios3-core (= ${binary:Version}), +Depends: nagios4-cgi (= ${binary:Version}), + nagios4-core (= ${binary:Version}), ${misc:Depends} Suggests: nagios-nrpe-plugin Description: host/service/network monitoring and management system @@ -129,14 +128,14 @@ Description: host/service/network monitoring and management system . Upstream URL: http://www.nagios.org/ -Package: nagios3-core +Package: nagios4-core Architecture: any -Depends: nagios3-common (= ${source:Version}), +Depends: nagios4-common (= ${source:Version}), ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} Suggests: nagios-nrpe-plugin -Replaces: nagios3 +Replaces: nagios4 Description: host/service/network monitoring and management system core files Nagios is a monitoring and management system for hosts, services and networks. @@ -165,11 +164,11 @@ Description: host/service/network monitoring and management system core files . Upstream URL: http://www.nagios.org/ -Package: nagios3-doc +Package: nagios4-doc Section: doc Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} -Description: documentation for nagios3 +Description: documentation for nagios4 Nagios is a monitoring and management system for hosts, services and networks. . @@ -195,16 +194,16 @@ Description: documentation for nagios3 . Upstream URL: http://www.nagios.org/ -Package: nagios3-dbg +Package: nagios4-dbg Section: debug Priority: extra Architecture: any -Depends: nagios3-core (= ${binary:Version}), +Depends: nagios4-core (= ${binary:Version}), ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} Conflicts: icinga-dbg (<= 1.0.1-2) -Description: debugging symbols and debug stuff for nagios3 +Description: debugging symbols and debug stuff for nagios4 Nagios is a monitoring and management system for hosts, services and networks. . @@ -222,7 +221,7 @@ Description: debugging symbols and debug stuff for nagios3 Nagios was written in C and is designed to be easy to understand and modify to fit your own needs. . - This package contains gdb debugging symbols for the nagios3 binaries and the + This package contains gdb debugging symbols for the nagios4 binaries and the mini_epn tool which can help in debugging Nagios problems. . Nagios is a replacement of the Netsaint project. It accepts and uses the diff --git a/debian/mini_epn_nagio3.8.txt b/debian/mini_epn_nagio3.8.txt deleted file mode 100644 index 05bd10d..0000000 --- a/debian/mini_epn_nagio3.8.txt +++ /dev/null @@ -1,31 +0,0 @@ -:man source: Nagios -:man version: {revnumber} -:man manual: mini_epn - -mini_epn(8) -========== - -NAME ----- -mini_epn - too to nagiosplugins inside of an embedded perl interpreter - -SYNOPSIS --------- -*mini_epn* - -DESCRIPTION ------------ -After calling *mini_epn* an embedded perl interpreter gets started and asks for you a script to execute under the interpreter. To exit the interpreter loop press ^d at the prompt. - -EXAMPLES --------- - - # mini_epn - Enter file name: /usr/lib/nagios/plugins/check_linux_raid - embedded perl plugin return code and output was: 0 & 'OK md0 status=[UU]. md1 status=[UU]. - -AUTHOR ------- -This manpage was written by Alexander Wirt for the Debian Distribution. - - diff --git a/debian/mini_epn_nagios3.8 b/debian/mini_epn_nagios3.8 deleted file mode 100644 index f411a71..0000000 --- a/debian/mini_epn_nagios3.8 +++ /dev/null @@ -1,44 +0,0 @@ -'\" t -.\" Title: mini_epn -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 09/19/2009 -.\" Manual: mini_epn -.\" Source: Nagios -.\" Language: English -.\" -.TH "MINI_EPN" "8" "09/19/2009" "Nagios" "mini_epn" -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -mini_epn \- too to nagiosplugins inside of an embedded perl interpreter -.SH "SYNOPSIS" -.sp -\fBmini_epn\fR -.SH "DESCRIPTION" -.sp -After calling \fBmini_epn\fR an embedded perl interpreter gets started and asks for you a script to execute under the interpreter\&. To exit the interpreter loop press ^d at the prompt\&. -.SH "EXAMPLES" -.sp -.if n \{\ -.RS 4 -.\} -.nf -# mini_epn -Enter file name: /usr/lib/nagios/plugins/check_linux_raid -embedded perl plugin return code and output was: 0 & \'OK md0 status=[UU]\&. md1 status=[UU]\&. -.fi -.if n \{\ -.RE -.\} -.SH "AUTHOR" -.sp -This manpage was written by Alexander Wirt for the Debian Distribution\&. diff --git a/debian/nagios3-cgi.config b/debian/nagios3-cgi.config deleted file mode 100644 index b03e16c..0000000 --- a/debian/nagios3-cgi.config +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -e - -. /usr/share/debconf/confmodule - -db_fget nagios3/adminpassword seen || true -password_seen="$RET" - -if [ "$1" = "reconfigure" ]; then - password_seen=false -fi - -if [ "$rootpassword_seen" != "true" ]; then - while [ ! "$passwordsmatch" ]; do - db_input high nagios3/adminpassword || true - db_input high nagios3/adminpassword-repeat || true - db_go || true - db_get nagios3/adminpassword - p1="$RET" - db_get nagios3/adminpassword-repeat - p2="$RET" - if [ "$p1" = "$p2" ]; then - passwordsmatch="yes" - else - db_fset nagios3/adminpassword seen false - db_fset nagios3/adminpassword-repeat seen false - db_fset nagios3/adminpassword-mismatch seen false - db_input critical nagios3/adminpassword-mismatch || true - fi - done -fi -db_go || true diff --git a/debian/nagios3-cgi.dirs b/debian/nagios3-cgi.dirs deleted file mode 100644 index 7d75ba5..0000000 --- a/debian/nagios3-cgi.dirs +++ /dev/null @@ -1,3 +0,0 @@ -etc/nagios3/stylesheets -usr/share/nagios3/htdocs/ssi -usr/lib/cgi-bin diff --git a/debian/nagios3-cgi.install b/debian/nagios3-cgi.install deleted file mode 100644 index 66ba557..0000000 --- a/debian/nagios3-cgi.install +++ /dev/null @@ -1,11 +0,0 @@ -debian-configs/cgi.cfg /etc/nagios3 -debian/httpd.webapps-common /usr/share/nagios3/debian -usr/lib/cgi-bin/* -usr/share/nagios3/htdocs/*.php -usr/share/nagios3/htdocs/contexthelp -usr/share/nagios3/htdocs/images -usr/share/nagios3/htdocs/includes -usr/share/nagios3/htdocs/media -usr/share/nagios3/htdocs/robots.txt -usr/share/nagios3/htdocs/stylesheets/* /etc/nagios3/stylesheets/ -debian/apache2.conf usr/share/nagios3-cgi/ diff --git a/debian/nagios3-cgi.links b/debian/nagios3-cgi.links deleted file mode 100644 index 26707f5..0000000 --- a/debian/nagios3-cgi.links +++ /dev/null @@ -1,4 +0,0 @@ -usr/share/javascript/jquery/jquery.min.js usr/share/nagios3/htdocs/js/jquery-1.7.1.min.js -etc/nagios3/apache2.conf etc/apache2/conf-available/nagios3.conf -usr/share/javascript/jquery/jquery.min.js usr/share/nagios3/htdocs/includes/jquery-1.7.1.min.js -usr/share/javascript/jquery/jquery.min.js usr/share/nagios3/htdocs/js/jquery-1.7.1.min.js diff --git a/debian/nagios3-cgi.postinst b/debian/nagios3-cgi.postinst deleted file mode 100644 index d60fa64..0000000 --- a/debian/nagios3-cgi.postinst +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash - -set -e - -# some shorthands for sanity -en="/etc/nagios3" -enc="/etc/nagios3/conf.d" -usn="/usr/share/nagios3" - -. /usr/share/debconf/confmodule - -if [ -n "$NAG3DEBUG" ]; then - echo "now debugging $0 $@" - set -x -fi - -# location of the default apache configuration for nagios. -apacheconf=$en/apache2.conf -# location of the default htpasswd authentication file. -htpw=$en/htpasswd.users - -setperm() { - local user="$1" - local group="$2" - local mode="$3" - local file="$4" - shift 4 - # only do something when no setting exists - if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then - if [ -e "$file" ]; then - chown "$user":"$group" "$file" - chmod "$mode" "$file" - fi - fi -} - -case "$1" in - configure) - if ! getent passwd nagios > /dev/null ; then - echo 'Adding system-user for nagios' 1>&2 - adduser --system --group --home /var/lib/nagios \ - --disabled-login --force-badname nagios > /dev/null - fi - - db_get nagios3/adminpassword - admpass="$RET" - - # register apache2.conf via ucf: - ucf --debconf-ok /usr/share/nagios3-cgi/apache2.conf $apacheconf - - echo "enabling Apache2 config..." - - COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true) - - # NEW method for Apache >= 2.4 - if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then - . /usr/share/apache2/apache2-maintscript-helper - - apache2_invoke enmod cgi - apache2_invoke enconf nagios3 - - # remove OLD Apache 2.2 link - [ -L /etc/apache2/conf.d/nagios3.conf ] && rm /etc/apache2/conf.d/nagios3.conf - - # OLD methods for Apache < 2.4 - elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then - - # create symlink if not existing - [ -f /etc/apache2/conf.d/nagios3.conf ] || ln -vs $apacheconf /etc/apache2/conf.d/nagios3.conf - if [ -f /etc/init.d/apache2 ] ; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d apache2 reload 3>/dev/null || true - else - /etc/init.d/apache2 reload 3>/dev/null || true - fi - fi - fi - - # we reset the password every run, so if it exists we're running - # after being specifically given a password and can unconditionally set it. - # XXX there's no way of setting the pw w/out giving it on the cmdline? wtf? - if [ -n "$admpass" ]; then - touch "$htpw" - htpasswd -b "$htpw" nagiosadmin "$admpass" - fi - - # everything went well, so now let's reset the password - db_set nagios3/adminpassword "" - db_set nagios3/adminpassword-repeat "" - # ... done with debconf here - db_stop - ;; - abort-upgrade|abort-remove|abort-deconfigure) - ;; - *) - echo "postinst called with unknown argument \$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# diff --git a/debian/nagios3-cgi.postrm b/debian/nagios3-cgi.postrm deleted file mode 100644 index d5273ac..0000000 --- a/debian/nagios3-cgi.postrm +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -e - -# some shorthands for sanity -en="/etc/nagios3" -enc="/etc/nagios3/conf.d" -usn="/usr/share/nagios3" - -case "$1" in - remove) - ;; - purge) - rm -f /etc/nagios3/htpasswd.users - rm -f /etc/nagios3/apache2.conf - if which ucf >/dev/null 2>&1; then - ucf --purge /etc/nagios3/apache2.conf - fi - ;; -esac - -#DEBHELPER# diff --git a/debian/nagios3-cgi.templates b/debian/nagios3-cgi.templates deleted file mode 100644 index 685ec70..0000000 --- a/debian/nagios3-cgi.templates +++ /dev/null @@ -1,16 +0,0 @@ -Template: nagios3/adminpassword -Type: password -_Description: Nagios web administration password: - Please provide the password to be created with the "nagiosadmin" user. - . - This is the username and password you will use to log in to your nagios - installation after configuration is complete. If you do not provide - a password, you will have to configure access to nagios yourself. - -Template: nagios3/adminpassword-repeat -Type: password -_Description: Password confirmation: - -Template: nagios3/adminpassword-mismatch -Type: note -_Description: The passwords do not match diff --git a/debian/nagios3-common.dirs b/debian/nagios3-common.dirs deleted file mode 100644 index d208935..0000000 --- a/debian/nagios3-common.dirs +++ /dev/null @@ -1,10 +0,0 @@ -etc/init.d -etc/nagios3 -etc/nagios3/conf.d -usr/share/nagios3/plugins/eventhandlers -var/lib/nagios3/rw -var/lib/nagios3/spool -var/lib/nagios3/spool/checkresults -var/log/nagios3/archives -var/cache/nagios3 -usr/share/nagios3/debian diff --git a/debian/nagios3-common.install b/debian/nagios3-common.install deleted file mode 100644 index bfe66c5..0000000 --- a/debian/nagios3-common.install +++ /dev/null @@ -1,8 +0,0 @@ -contrib/eventhandlers/* usr/share/nagios3/plugins/eventhandlers -debian-configs/* /etc/nagios3 -debian/conf.d/* /etc/nagios3/conf.d -debian/resource.cfg /etc/nagios3 -sample-config/*.cfg /usr/share/doc/nagios3-common/examples -sample-config/README /usr/share/doc/nagios3-common/examples -sample-config/template-object/*.cfg /usr/share/doc/nagios3-common/examples/template-object -sample-config/template-object/README /usr/share/doc/nagios3-common/examples/template-object diff --git a/debian/nagios3-common.links b/debian/nagios3-common.links deleted file mode 100644 index ca1f177..0000000 --- a/debian/nagios3-common.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/nagios3/htdocs/docs usr/share/doc/nagios3-common/html diff --git a/debian/nagios3-common.lintian-overrides b/debian/nagios3-common.lintian-overrides deleted file mode 100644 index 8a28ef1..0000000 --- a/debian/nagios3-common.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -non-standard-file-perm etc/nagios3/resource.cfg 0600 != 0644 -dir-or-file-in-var-run var/run/nagios3/ diff --git a/debian/nagios3-common.postrm b/debian/nagios3-common.postrm deleted file mode 100644 index 69939b8..0000000 --- a/debian/nagios3-common.postrm +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -e - -# some shorthands for sanity -en="/etc/nagios3" -enc="/etc/nagios3/conf.d" -usn="/usr/share/nagios3" - -case "$1" in - remove) - ;; - purge) - for file in $en/resource.cfg /var/log/nagios3 /var/run/nagios3 \ - /var/lib/nagios3 /var/lib/nagios3/spool \ - /var/lib/nagios3/spool/checkresults \ - /var/cache/nagios3 /var/lib/nagios3/rw; do - dpkg-statoverride --force --remove $file 2>/dev/null || true - done - rm -rf /var/run/nagios3 /var/log/nagios3 /var/lib/nagios3 \ - /var/cache/nagios3 - rm -f /etc/nagios3/conf.d/host-gateway_nagios3.cfg - #rm -f /etc/nagios3/conf.d/extcommands_nagios3.cfg - if which ucf >/dev/null 2>&1; then - ucf --purge /etc/nagios3/conf.d/host-gateway_nagios3.cfg - #ucf --purge /etc/nagios3/conf.d/extcommands_nagios3.cfg - fi - ;; -esac - -#DEBHELPER# diff --git a/debian/nagios3-core.dirs b/debian/nagios3-core.dirs deleted file mode 100644 index fd21446..0000000 --- a/debian/nagios3-core.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin -usr/lib/nagios3 diff --git a/debian/nagios3-core.install b/debian/nagios3-core.install deleted file mode 100644 index e3b74be..0000000 --- a/debian/nagios3-core.install +++ /dev/null @@ -1 +0,0 @@ -usr/sbin/p1.pl usr/lib/nagios3/ diff --git a/debian/nagios3-core.links b/debian/nagios3-core.links deleted file mode 100644 index 059946d..0000000 --- a/debian/nagios3-core.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/nagios3-common usr/share/doc/nagios3-core diff --git a/debian/nagios3-core.manpages b/debian/nagios3-core.manpages deleted file mode 100644 index 0d1b016..0000000 --- a/debian/nagios3-core.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/nagios3.8 -debian/nagios3stats.8 diff --git a/debian/nagios3-core.postinst b/debian/nagios3-core.postinst deleted file mode 100644 index 917c23f..0000000 --- a/debian/nagios3-core.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -e - -#if we stop nagios3 in nagios3.prerm we should also start it here.. -#(#481334) -if [ -x "/etc/init.d/nagios3" ]; then - if ! /etc/init.d/nagios3 status >/dev/null; then - - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d nagios3 start || true - else - /etc/init.d/nagios3 start || true - fi - fi -fi - -#DEBHELPER# diff --git a/debian/nagios3-core.prerm b/debian/nagios3-core.prerm deleted file mode 100644 index 1176c4b..0000000 --- a/debian/nagios3-core.prerm +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -e - -# we attempt to stop nagios3 twice, once in nagios3-common's prerm -# and once here. otherwise, if nagios3+nagios3-common are being purged, -# the /usr/sbin/nagios3 binary could disappear before nagios3-common's -# prerm script runs, which would prevent it from being able to stop -# the binary. -if [ -x "/etc/init.d/nagios3" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d nagios3 stop || true - else - /etc/init.d/nagios3 stop || true - fi -fi - -#DEBHELPER# diff --git a/debian/nagios3-dbg.manpages b/debian/nagios3-dbg.manpages deleted file mode 100644 index b08523c..0000000 --- a/debian/nagios3-dbg.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/mini_epn_nagios3.8 diff --git a/debian/nagios3-dbg.postinst b/debian/nagios3-dbg.postinst deleted file mode 100644 index d1568db..0000000 --- a/debian/nagios3-dbg.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e - -update-alternatives --quiet --install /usr/bin/mini_epn mini_epn /usr/bin/mini_epn_nagios3 10 \ - --slave /usr/share/man/man8/mini_epn.8.gz mini_epn.8.gz /usr/share/man/man8/mini_epn_nagios3.8.gz - -#DEBHELPER# diff --git a/debian/nagios3-dbg.prerm b/debian/nagios3-dbg.prerm deleted file mode 100644 index e0be6a3..0000000 --- a/debian/nagios3-dbg.prerm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ "$1" != "upgrade" ]; then - update-alternatives --remove mini_epn /usr/bin/mini_epn_nagios3 -fi - -#DEBHELPER# diff --git a/debian/nagios3-doc.dirs b/debian/nagios3-doc.dirs deleted file mode 100644 index b5c38de..0000000 --- a/debian/nagios3-doc.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/nagios3/htdocs -etc/nagios3/stylesheets diff --git a/debian/nagios3-doc.install b/debian/nagios3-doc.install deleted file mode 100644 index 6ba7b64..0000000 --- a/debian/nagios3-doc.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/nagios3/htdocs/docs diff --git a/debian/nagios3-doc.links b/debian/nagios3-doc.links deleted file mode 100644 index adf1154..0000000 --- a/debian/nagios3-doc.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/nagios3/htdocs/docs usr/share/doc/nagios3-doc/html -etc/nagios3/stylesheets usr/share/nagios3/stylesheets diff --git a/debian/nagios3-doc.lintian-overrides b/debian/nagios3-doc.lintian-overrides deleted file mode 100644 index 16fdb1c..0000000 --- a/debian/nagios3-doc.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -package-contains-empty-directory usr/share/nagios3/htdocs/ssi/ diff --git a/debian/nagios3.links b/debian/nagios3.links deleted file mode 100644 index 9822c76..0000000 --- a/debian/nagios3.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/nagios3-common usr/share/doc/nagios3 diff --git a/debian/nagios3.lintian-overrides b/debian/nagios3.lintian-overrides deleted file mode 100644 index e0c6ca8..0000000 --- a/debian/nagios3.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -usr-share-doc-symlink-without-dependency nagios3-common diff --git a/debian/nagios4-cgi.config b/debian/nagios4-cgi.config new file mode 100644 index 0000000..11a078e --- /dev/null +++ b/debian/nagios4-cgi.config @@ -0,0 +1,68 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule + +# (taken from the webapps-common httpd functions) +# wc_httpd_installed: test for installed httpds +# usage: +# wc_httpd_installed [ httpd1 httpd2 ... ] +# +# no arguments implies to test for all servers +wc_httpd_installed(){ + local httpds + if [ "$*" ]; then + httpds=$* + else + httpds=$wc_httpd_supported + fi + for f in $httpds; do + if test -x /usr/sbin/$f; then + echo $f + fi + done +} + + +# list of installed servers to check for +default_servers=`wc_httpd_installed apache2 apache apache-ssl apache-perl` +# convert list to comma seperated list +server_list=`echo $default_servers | sed -e 's/[[:space:]][[:space:]]*/, /g'` + +# if they haven't already been prompted, preseed the server selection +db_fget nagios4/httpd seen +if [ "$RET" = "false" ]; then + db_set nagios4/httpd $server_list +fi + +db_input medium nagios4/httpd || true +db_go || true +db_get nagios4/httpd +keepgoing="$RET" + +if [ "$keepgoing" ]; then + db_input medium nagios4/nagios1-in-apacheconf || true + + # the passwords are reset at the end of every postinst run, + # however, they are left in the "seen" state so that the + # admin is not prompted for them at every upgrade. + while [ ! "$passwordsmatch" ]; do + #only ask for a password if no htpasswd exists + test -f /etc/nagios4/htpasswd.users && break + db_input high nagios4/adminpassword || true + db_input high nagios4/adminpassword-repeat || true + db_go || true + db_get nagios4/adminpassword + p1="$RET" + db_get nagios4/adminpassword-repeat + p2="$RET" + if [ "$p1" = "$p2" ]; then + passwordsmatch="yes" + else + db_fset nagios4/adminpassword seen false + db_fset nagios4/adminpassword-repeat seen false + db_fset nagios4/adminpassword-mismatch seen false + db_input critical nagios4/adminpassword-mismatch || true + fi + done +fi +db_go || true diff --git a/debian/nagios4-cgi.dirs b/debian/nagios4-cgi.dirs new file mode 100644 index 0000000..46eec54 --- /dev/null +++ b/debian/nagios4-cgi.dirs @@ -0,0 +1,3 @@ +etc/nagios4/stylesheets +usr/share/nagios4/htdocs/ssi +usr/lib/cgi-bin diff --git a/debian/nagios4-cgi.install b/debian/nagios4-cgi.install new file mode 100644 index 0000000..f80fb7e --- /dev/null +++ b/debian/nagios4-cgi.install @@ -0,0 +1,10 @@ +debian/httpd.webapps-common /usr/share/nagios4/debian +debian-configs/cgi.cfg /etc/nagios4 +usr/share/nagios4/htdocs/*.php +usr/share/nagios4/htdocs/media +usr/share/nagios4/htdocs/contexthelp +usr/share/nagios4/htdocs/robots.txt +usr/share/nagios4/htdocs/images +usr/share/nagios4/htdocs/includes +usr/lib/cgi-bin/* +usr/share/nagios4/htdocs/stylesheets/* /etc/nagios4/stylesheets/ diff --git a/debian/nagios4-cgi.postinst b/debian/nagios4-cgi.postinst new file mode 100644 index 0000000..2be600a --- /dev/null +++ b/debian/nagios4-cgi.postinst @@ -0,0 +1,119 @@ +#!/bin/bash + +set -e + +# some shorthands for sanity +en="/etc/nagios4" +enc="/etc/nagios4/conf.d" +usn="/usr/share/nagios4" + +. /usr/share/debconf/confmodule +. $usn/debian/httpd.webapps-common + +if [ -n "$NAG4DEBUG" ]; then + echo "now debugging $0 $@" + set -x +fi + +# location of the default apache configuration for nagios. +apacheconf=$en/apache2.conf +# location of the default htpasswd authentication file. +htpw=$en/htpasswd.users + +setperm() { + local user="$1" + local group="$2" + local mode="$3" + local file="$4" + shift 4 + # only do something when no setting exists + if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then + chown "$user":"$group" "$file" + chmod "$mode" "$file" + fi +} + +case "$1" in + configure) + if ! getent passwd nagios > /dev/null ; then + echo 'Adding system-user for nagios' 1>&2 + adduser --system --group --home /var/lib/nagios \ + --disabled-login --force-badname nagios > /dev/null + fi + + # get the list of selected servers + db_get nagios4/httpd + servers=$(echo $RET | sed -e 's/,/ /g') + db_get nagios4/adminpassword + admpass="$RET" + # get whether they want support for 1.x urls: + db_get nagios4/nagios1-in-apacheconf + nagiosone="$RET" + + unwanted_servers="" + + #check which servers to uninclude + for s in $wc_httpd_supported + do + if ! echo $servers | grep -q $s + then + unwanted_servers="$s $unwanted_servers" + fi + done + + # register apache2.conf via ucf: + if [ "$nagiosone" = "true" ]; then + ucf --debconf-ok /usr/share/doc/nagios4-common/examples/apache2.nagios1.conf $apacheconf + else + ucf --debconf-ok /usr/share/doc/nagios4-common/examples/apache2.conf $apacheconf + fi + + + # configure the web servers, if it is desired + if [ "$servers" ]; then + if wc_httpd_apache_include $apacheconf nagios4 $servers; then + # reload the selected servers if they are running + running_servers="$(wc_httpd_running $servers)" + if [ "$running_servers" ]; then + wc_httpd_invoke "reload" $running_servers + fi + fi + fi + + if [ "$unwanted_servers" ]; then + servers_to_deconf="$(wc_httpd_apache_configured $apacheconf nagios4 $unwanted_servers)" + if [ "$servers_to_deconf" ]; then + if wc_httpd_apache_uninclude $apacheconf nagios4 $servers_to_deconf; then + # reload the selected servers if they are running + running_servers="$(wc_httpd_running $unwanted_servers)" + if [ "$running_servers" ]; then + wc_httpd_invoke "reload" $running_servers + fi + fi + fi + fi + + + # we reset the password every run, so if it exists we're running + # after being specifically given a password and can unconditionally set it. + # XXX there's no way of setting the pw w/out giving it on the cmdline? wtf? + if [ -n "$admpass" ]; then + touch "$htpw" + htpasswd -b "$htpw" nagiosadmin "$admpass" + fi + + # everything went well, so now let's reset the password + db_set nagios4/adminpassword "" + db_set nagios4/adminpassword-repeat "" + # ... done with debconf here + db_stop + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# diff --git a/debian/nagios4-cgi.postrm b/debian/nagios4-cgi.postrm new file mode 100644 index 0000000..6d75a21 --- /dev/null +++ b/debian/nagios4-cgi.postrm @@ -0,0 +1,20 @@ +#!/bin/sh -e + +# some shorthands for sanity +en="/etc/nagios4" +enc="/etc/nagios4/conf.d" +usn="/usr/share/nagios4" + +case "$1" in + remove) + ;; + purge) + rm -f /etc/nagios4/htpasswd.users + rm -f /etc/nagios4/apache2.conf + if which ucf >/dev/null 2>&1; then + ucf --purge /etc/nagios4/apache2.conf + fi + ;; +esac + +#DEBHELPER# diff --git a/debian/nagios3-cgi.prerm b/debian/nagios4-cgi.prerm similarity index 74% rename from debian/nagios3-cgi.prerm rename to debian/nagios4-cgi.prerm index c7f5832..b4c53db 100644 --- a/debian/nagios3-cgi.prerm +++ b/debian/nagios4-cgi.prerm @@ -1,17 +1,17 @@ #!/bin/sh -e -. /usr/share/nagios3/debian/httpd.webapps-common +. /usr/share/nagios4/debian/httpd.webapps-common -apacheconf="/etc/nagios3/apache2.conf" +apacheconf="/etc/nagios4/apache2.conf" if [ -f $apacheconf ]; then case "$1" in remove) # find the configured servers - configured_servers=`wc_httpd_apache_configured $apacheconf nagios3` + configured_servers=`wc_httpd_apache_configured $apacheconf nagios4` if [ "$configured_servers" ]; then # deconfigure them - wc_httpd_apache_uninclude $apacheconf nagios3 $configured_servers + wc_httpd_apache_uninclude $apacheconf nagios4 $configured_servers # reload the configured servers if they are running running_servers="`wc_httpd_running $configured_servers`" if [ "$running_servers" ]; then diff --git a/debian/nagios4-cgi.templates b/debian/nagios4-cgi.templates new file mode 100644 index 0000000..83de427 --- /dev/null +++ b/debian/nagios4-cgi.templates @@ -0,0 +1,38 @@ +Template: nagios4/httpd +Type: multiselect +Choices: apache2 +Default: apache2 +Description: Apache servers to configure for nagios4: + Please select which apache servers should be configured for nagios4. + . + If you would prefer to perform configuration manually, leave all + servers unselected. + +Template: nagios4/adminpassword +Type: password +Description: Nagios web administration password: + Please provide the password to be created with the "nagiosadmin" user. + . + This is the username and password you will use to log in to your nagios + installation after configuration is complete. If you do not provide + a password, you will have to configure access to nagios yourself. + +Template: nagios4/adminpassword-repeat +Type: password +Description: Password confirmation: + +Template: nagios4/adminpassword-mismatch +Type: note +Description: The passwords do not match + +Template: nagios4/nagios1-in-apacheconf +Type: boolean +Default: false +Description: Enable support for nagios 1.x links in nagios4? + Please choose whether the Apache configuration for nagios4 should + provide compatibility with links from nagios 1.x. + . + If you select this option, the apache configuration used for nagios + will include directives to support URLs from nagios 1.x. + You should not choose this option if you still have nagios 1.x on your + system, or unpredictable results may occur. diff --git a/debian/nagios4-common.dirs b/debian/nagios4-common.dirs new file mode 100644 index 0000000..0f61cab --- /dev/null +++ b/debian/nagios4-common.dirs @@ -0,0 +1,11 @@ +etc/init.d +etc/nagios4 +etc/nagios4/conf.d +usr/share/nagios4/plugins/eventhandlers +var/lib/nagios4/rw +var/lib/nagios4/spool +var/lib/nagios4/spool/checkresults +var/log/nagios4/archives +var/run/nagios4 +var/cache/nagios4 +usr/share/nagios4/debian diff --git a/debian/nagios3-common.docs b/debian/nagios4-common.docs similarity index 100% rename from debian/nagios3-common.docs rename to debian/nagios4-common.docs diff --git a/debian/nagios3-common.examples b/debian/nagios4-common.examples similarity index 88% rename from debian/nagios3-common.examples rename to debian/nagios4-common.examples index 2ac5432..cb0bcdc 100644 --- a/debian/nagios3-common.examples +++ b/debian/nagios4-common.examples @@ -3,3 +3,4 @@ sample-config/template-object/localhost.cfg sample-config/resource.cfg sample-config/nagios.cfg sample-config/cgi.cfg +debian/apache2.conf diff --git a/debian/nagios4-common.install b/debian/nagios4-common.install new file mode 100644 index 0000000..6f42037 --- /dev/null +++ b/debian/nagios4-common.install @@ -0,0 +1,8 @@ +debian-configs/* /etc/nagios4 +debian/resource.cfg /etc/nagios4 +debian/conf.d/* /etc/nagios4/conf.d +sample-config/README /usr/share/doc/nagios4-common/examples +sample-config/*.cfg /usr/share/doc/nagios4-common/examples +sample-config/template-object/README /usr/share/doc/nagios4-common/examples/template-object +sample-config/template-object/*.cfg /usr/share/doc/nagios4-common/examples/template-object +contrib/eventhandlers/* usr/share/nagios4/plugins/eventhandlers diff --git a/debian/nagios4-common.links b/debian/nagios4-common.links new file mode 100644 index 0000000..5c08dd8 --- /dev/null +++ b/debian/nagios4-common.links @@ -0,0 +1 @@ +usr/share/nagios4/htdocs/docs usr/share/doc/nagios4-common/html diff --git a/debian/nagios4-common.lintian-overrides b/debian/nagios4-common.lintian-overrides new file mode 100644 index 0000000..cc6a085 --- /dev/null +++ b/debian/nagios4-common.lintian-overrides @@ -0,0 +1,2 @@ +non-standard-file-perm etc/nagios4/resource.cfg 0600 != 0644 +dir-or-file-in-var-run var/run/nagios4/ diff --git a/debian/nagios3-common.nagios3.default b/debian/nagios4-common.nagios4.default similarity index 67% rename from debian/nagios3-common.nagios3.default rename to debian/nagios4-common.nagios4.default index 5ea3b82..9349374 100644 --- a/debian/nagios3-common.nagios3.default +++ b/debian/nagios4-common.nagios4.default @@ -1,14 +1,14 @@ -# /etc/default/nagios3 +# /etc/default/nagios4 -# Enable Nagios3 at boottime? ("no" disables nagios3) +# Enable Nagios3 at boottime? ("no" disables nagios4) # compatibility note: if this variable is _not_ found Nagios3 will start ENABLED="yes" # location of the nagios configuration file -NAGIOSCFG="/etc/nagios3/nagios.cfg" +NAGIOSCFG="/etc/nagios4/nagios.cfg" # location of the CGI configuration file -CGICFG="/etc/nagios3/cgi.cfg" +CGICFG="/etc/nagios4/cgi.cfg" # nicelevel to run nagios daemon with NICENESS=5 diff --git a/debian/nagios3-common.nagios3.init b/debian/nagios4-common.nagios4.init similarity index 85% rename from debian/nagios3-common.nagios3.init rename to debian/nagios4-common.nagios4.init index 3a1a03d..466b24c 100644 --- a/debian/nagios3-common.nagios3.init +++ b/debian/nagios4-common.nagios4.init @@ -5,10 +5,10 @@ # Clamav version by Magnus Ekdahl # Nagios version by Sean Finney and probably others # nagios2 version by Marc Haber -# nagios3 version by Alexander Wirt +# nagios4 version by Alexander Wirt ### BEGIN INIT INFO -# Provides: nagios3 +# Provides: nagios4 # Required-Start: $local_fs $remote_fs $syslog $named $network $time # Required-Stop: $local_fs $remote_fs $syslog $named $network # Should-Start: @@ -23,15 +23,15 @@ set -e . /lib/lsb/init-functions -DAEMON=/usr/sbin/nagios3 -NAME="nagios3" -DESC="nagios3 monitoring daemon" -NAGIOSCFG="/etc/nagios3/nagios.cfg" -CGICFG="/etc/nagios3/cgi.cfg" +DAEMON=/usr/sbin/nagios4 +NAME="nagios4" +DESC="nagios4 monitoring daemon" +NAGIOSCFG="/etc/nagios4/nagios.cfg" +CGICFG="/etc/nagios4/cgi.cfg" NICENESS=5 [ -x "$DAEMON" ] || exit 0 -[ -r /etc/default/nagios3 ] && . /etc/default/nagios3 +[ -r /etc/default/nagios4 ] && . /etc/default/nagios4 # this is from madduck on IRC, 2006-07-06 @@ -47,18 +47,8 @@ log() log_action_end_msg ${success:-0} "$*" } -check_run () { - if [ ! -d '/var/run/nagios3' ]; - then - mkdir /var/run/nagios3 - chown nagios:nagios /var/run/nagios3 - chmod 0750 /var/run/nagios3 - fi -} - - check_started () { - #nagios3-core can be installed without -cgi + #nagios4-core can be installed without -cgi if [ -e $CGICFG ]; then check_cmd=$(get_config nagios_check_command $CGICFG) @@ -68,7 +58,7 @@ check_started () { fi else #use hardcoded default version - check_cmd="/usr/lib/nagios/plugins/check_nagios /var/cache/nagios3/status.dat 5 '/usr/sbin/nagios3'" + check_cmd="/usr/lib/nagios/plugins/check_nagios /var/cache/nagios4/status.dat 5 '/usr/sbin/nagios4'" fi eval $check_cmd >/dev/null @@ -131,15 +121,19 @@ if [ ! -f "$NAGIOSCFG" ]; then fi THEPIDFILE=$(get_config "lock_file") -[ -n "$THEPIDFILE" ] || THEPIDFILE='/var/run/nagios3/nagios.pid' +[ -n "$THEPIDFILE" ] || THEPIDFILE='/var/run/nagios4/nagios.pid' start () { if [ "$ENABLED" = "no" ]; then - log_warning_msg "Not starting Nagios3 - set ENABLED to yes in /etc/default/nagios3" + log_warning_msg "Not starting Nagios3 - set ENABLED to yes in /etc/defrault/nagios4" exit 0 fi + DIRECTORY=$(dirname $THEPIDFILE) + [ ! -d $DIRECTORY ] && mkdir -p $DIRECTORY + chown nagios:nagios $DIRECTORY + if ! check_started; then if ! check_named_pipe; then log_action_msg "named pipe exists - removing" @@ -162,13 +156,13 @@ start () { stop () { killproc -p $THEPIDFILE ret=$? - if [ `pidof nagios3 | wc -l ` -gt 0 ]; then + if [ `pidof nagios4 | wc -l ` -gt 0 ]; then echo -n "Waiting for $NAME daemon to die.." cnt=0 - while [ `pidof nagios3 | wc -l ` -gt 0 ]; do + while [ `pidof nagios4 | wc -l ` -gt 0 ]; do cnt=`expr "$cnt" + 1` if [ "$cnt" -gt 15 ]; then - kill -9 `pidof nagios3` + kill -9 `pidof nagios4` break fi sleep 1 @@ -218,12 +212,6 @@ reload () { fi } -check() { - $DAEMON -v $NAGIOSCFG -} - -check_run - case "$1" in start) log_daemon_msg "Starting $DESC" "$NAME" diff --git a/debian/nagios3-common.postinst b/debian/nagios4-common.postinst similarity index 61% rename from debian/nagios3-common.postinst rename to debian/nagios4-common.postinst index f775987..a1b0e4b 100644 --- a/debian/nagios3-common.postinst +++ b/debian/nagios4-common.postinst @@ -3,13 +3,13 @@ set -e # some shorthands for sanity -en="/etc/nagios3" -enc="/etc/nagios3/conf.d" -usn="/usr/share/nagios3" +en="/etc/nagios4" +enc="/etc/nagios4/conf.d" +usn="/usr/share/nagios4" . /usr/share/debconf/confmodule -if [ -n "$NAG3DEBUG" ]; then +if [ -n "$NAG4DEBUG" ]; then echo "now debugging $0 $@" set -x fi @@ -22,10 +22,8 @@ setperm() { shift 4 # only do something when no setting exists if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then - if [ -e "$file" ]; then - chown "$user":"$group" "$file" - chmod "$mode" "$file" - fi + chown "$user":"$group" "$file" + chmod "$mode" "$file" fi } @@ -40,13 +38,14 @@ case "$1" in # explicitly set permissions on some files that are dependent # on the uid/gid of the nagios user, which is dynamically created. setperm root nagios 0640 $en/resource.cfg - setperm nagios adm 2751 /var/log/nagios3 - setperm nagios adm 2751 /var/log/nagios3/archives - setperm nagios nagios 0750 /var/lib/nagios3 - setperm nagios nagios 0750 /var/lib/nagios3/spool - setperm nagios nagios 0750 /var/lib/nagios3/spool/checkresults - setperm nagios www-data 02750 /var/cache/nagios3 - setperm nagios www-data 0700 /var/lib/nagios3/rw + setperm nagios adm 2751 /var/log/nagios4 + setperm nagios adm 2751 /var/log/nagios4/archives + setperm nagios nagios 0750 /var/run/nagios4 + setperm nagios nagios 0750 /var/lib/nagios4 + setperm nagios nagios 0750 /var/lib/nagios4/spool + setperm nagios nagios 0750 /var/lib/nagios4/spool/checkresults + setperm nagios www-data 02750 /var/cache/nagios4 + setperm nagios www-data 0700 /var/lib/nagios4/rw db_stop ;; diff --git a/debian/nagios4-common.postrm b/debian/nagios4-common.postrm new file mode 100644 index 0000000..8dadd58 --- /dev/null +++ b/debian/nagios4-common.postrm @@ -0,0 +1,29 @@ +#!/bin/sh -e + +# some shorthands for sanity +en="/etc/nagios4" +enc="/etc/nagios4/conf.d" +usn="/usr/share/nagios4" + +case "$1" in + remove) + ;; + purge) + for file in $en/resource.cfg /var/log/nagios4 /var/run/nagios4 \ + /var/lib/nagios4 /var/lib/nagios4/spool \ + /var/lib/nagios4/spool/checkresults \ + /var/cache/nagios4 /var/lib/nagios4/rw; do + dpkg-statoverride --force --remove $file 2>/dev/null || true + done + rm -rf /var/run/nagios4 /var/log/nagios4 /var/lib/nagios4 \ + /var/cache/nagios4 + rm -f /etc/nagios4/conf.d/host-gateway_nagios4.cfg + #rm -f /etc/nagios4/conf.d/extcommands_nagios4.cfg + if which ucf >/dev/null 2>&1; then + ucf --purge /etc/nagios4/conf.d/host-gateway_nagios4.cfg + #ucf --purge /etc/nagios4/conf.d/extcommands_nagios4.cfg + fi + ;; +esac + +#DEBHELPER# diff --git a/debian/nagios4-core.dirs b/debian/nagios4-core.dirs new file mode 100644 index 0000000..6d92bc6 --- /dev/null +++ b/debian/nagios4-core.dirs @@ -0,0 +1,2 @@ +usr/sbin +usr/lib/nagios4 diff --git a/debian/nagios4-core.links b/debian/nagios4-core.links new file mode 100644 index 0000000..6a4af75 --- /dev/null +++ b/debian/nagios4-core.links @@ -0,0 +1 @@ +usr/share/doc/nagios4-common usr/share/doc/nagios4-core diff --git a/debian/nagios4-core.manpages b/debian/nagios4-core.manpages new file mode 100644 index 0000000..4ccfd3a --- /dev/null +++ b/debian/nagios4-core.manpages @@ -0,0 +1,2 @@ +debian/nagios4.8 +debian/nagios4stats.8 diff --git a/debian/nagios4-core.postinst b/debian/nagios4-core.postinst new file mode 100644 index 0000000..ad60dc0 --- /dev/null +++ b/debian/nagios4-core.postinst @@ -0,0 +1,16 @@ +#!/bin/sh -e + +#if we stop nagios4 in nagios4.prerm we should also start it here.. +#(#481334) +if [ -x "/etc/init.d/nagios4" ]; then + if ! /etc/init.d/nagios4 status >/dev/null; then + + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d nagios4 start || true + else + /etc/init.d/nagios4 start || true + fi + fi +fi + +#DEBHELPER# diff --git a/debian/nagios4-core.prerm b/debian/nagios4-core.prerm new file mode 100644 index 0000000..b49552a --- /dev/null +++ b/debian/nagios4-core.prerm @@ -0,0 +1,16 @@ +#!/bin/sh -e + +# we attempt to stop nagios4 twice, once in nagios4-common's prerm +# and once here. otherwise, if nagios4+nagios4-common are being purged, +# the /usr/sbin/nagios4 binary could disappear before nagios4-common's +# prerm script runs, which would prevent it from being able to stop +# the binary. +if [ -x "/etc/init.d/nagios4" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d nagios4 stop || true + else + /etc/init.d/nagios4 stop || true + fi +fi + +#DEBHELPER# diff --git a/debian/nagios4-dbg.manpages b/debian/nagios4-dbg.manpages new file mode 100644 index 0000000..e69de29 diff --git a/debian/nagios4-dbg.postinst b/debian/nagios4-dbg.postinst new file mode 100644 index 0000000..4e87ce9 --- /dev/null +++ b/debian/nagios4-dbg.postinst @@ -0,0 +1,6 @@ +#!/bin/sh -e + +#update-alternatives --quiet --install /usr/bin/mini_epn mini_epn /usr/bin/mini_epn_nagios4 10 \ +# --slave /usr/share/man/man8/mini_epn.8.gz mini_epn.8.gz /usr/share/man/man8/mini_epn_nagios4.8.gz + +#DEBHELPER# diff --git a/debian/nagios4-dbg.prerm b/debian/nagios4-dbg.prerm new file mode 100644 index 0000000..c901afa --- /dev/null +++ b/debian/nagios4-dbg.prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +#if [ "$1" != "upgrade" ]; then +# update-alternatives --remove mini_epn /usr/bin/mini_epn_nagios4 +#fi + +#DEBHELPER# diff --git a/debian/nagios4-doc.dirs b/debian/nagios4-doc.dirs new file mode 100644 index 0000000..ecdaf59 --- /dev/null +++ b/debian/nagios4-doc.dirs @@ -0,0 +1,2 @@ +usr/share/nagios4/htdocs +etc/nagios4/stylesheets diff --git a/debian/nagios3-doc.doc-base b/debian/nagios4-doc.doc-base similarity index 56% rename from debian/nagios3-doc.doc-base rename to debian/nagios4-doc.doc-base index 713b5cc..ac6eae7 100644 --- a/debian/nagios3-doc.doc-base +++ b/debian/nagios4-doc.doc-base @@ -1,9 +1,9 @@ -Document: nagios3 +Document: nagios4 Title: Nagios Documentation Author: Ethan Galstad Abstract: Nagios user and administrator's documentation Section: Network/Monitoring Format: HTML -Index: /usr/share/nagios3/htdocs/docs/index.html -Files: /usr/share/nagios3/htdocs/docs/*.html +Index: /usr/share/nagios4/htdocs/docs/index.html +Files: /usr/share/nagios4/htdocs/docs/*.html diff --git a/debian/nagios4-doc.install b/debian/nagios4-doc.install new file mode 100644 index 0000000..b2a659e --- /dev/null +++ b/debian/nagios4-doc.install @@ -0,0 +1 @@ +usr/share/nagios4/htdocs/docs diff --git a/debian/nagios4-doc.links b/debian/nagios4-doc.links new file mode 100644 index 0000000..151f6d5 --- /dev/null +++ b/debian/nagios4-doc.links @@ -0,0 +1,2 @@ +usr/share/nagios4/htdocs/docs usr/share/doc/nagios4-doc/html +etc/nagios4/stylesheets usr/share/nagios4/stylesheets diff --git a/debian/nagios4-doc.lintian-overrides b/debian/nagios4-doc.lintian-overrides new file mode 100644 index 0000000..f240151 --- /dev/null +++ b/debian/nagios4-doc.lintian-overrides @@ -0,0 +1 @@ +package-contains-empty-directory usr/share/nagios4/htdocs/ssi/ diff --git a/debian/nagios3.8 b/debian/nagios4.8 similarity index 75% rename from debian/nagios3.8 rename to debian/nagios4.8 index 273f497..25e281e 100644 --- a/debian/nagios3.8 +++ b/debian/nagios4.8 @@ -1,13 +1,13 @@ -.TH nagios3 "8" "February 2006" "sean finney " "nagios" +.TH nagios4 "8" "February 2006" "sean finney " "nagios" .SH NAME -nagios3 \- network/systems status monitoring daemon +nagios4 \- network/systems status monitoring daemon .SH SYNOPSIS -.B nagios3 [\-h] [\-v] [\-s] [\-d] +.B nagios4 [\-h] [\-v] [\-s] [\-d] .br .SH DESCRIPTION -.B nagios3 +.B nagios4 is a daemon program that monitors the status of various network accessible systems, devices, and more. For more information, please consult the online documentation available at http://www.nagios.org, @@ -17,7 +17,7 @@ or on your nagios server's web page. .TP main_config_file The main configuration file. On debian systems this defaults to -/etc/nagios3/nagios.cfg +/etc/nagios4/nagios.cfg .TP \fB\-h\fR A helpful usage message @@ -36,11 +36,11 @@ Starts Nagios in daemon mode (instead of as a foreground process). .SH FILES .TP -.IP /etc/nagios3 -Default configuration directory for nagios3 +.IP /etc/nagios4 +Default configuration directory for nagios4 .SH AUTHOR -nagios3 is written and maintained by Ethan Galstad . This +nagios4 is written and maintained by Ethan Galstad . This manual page was written by sean finney for the Debian GNU/Linux operating system (but it may be freely used, modified, and redistributed by others). diff --git a/debian/nagios4.links b/debian/nagios4.links new file mode 100644 index 0000000..eb676f0 --- /dev/null +++ b/debian/nagios4.links @@ -0,0 +1 @@ +usr/share/doc/nagios4-common usr/share/doc/nagios4 diff --git a/debian/nagios4.lintian-overrides b/debian/nagios4.lintian-overrides new file mode 100644 index 0000000..97d1d06 --- /dev/null +++ b/debian/nagios4.lintian-overrides @@ -0,0 +1 @@ +usr-share-doc-symlink-without-dependency nagios4-common diff --git a/debian/nagios3stats.8 b/debian/nagios4stats.8 similarity index 72% rename from debian/nagios3stats.8 rename to debian/nagios4stats.8 index aec47b3..eeda41b 100644 --- a/debian/nagios3stats.8 +++ b/debian/nagios4stats.8 @@ -1,13 +1,13 @@ -.TH nagios3stats "8" "February 2006" "sean finney " "nagios" +.TH nagios4stats "8" "February 2006" "sean finney " "nagios" .SH NAME -nagios3stats \- report statistics information from the nagios system +nagios4stats \- report statistics information from the nagios system .SH SYNOPSIS -.B nagios3stats [\-hVL] [\-c config] [\-m] [\-d] +.B nagios4stats [\-hVL] [\-c config] [\-m] [\-d] .br .SH DESCRIPTION -.B nagios3stats +.B nagios4stats Is a program designed to provide information on the running nagios system. It can provide a brief summary of information, or it can be used to export specific information about the nagios system @@ -20,15 +20,15 @@ with your nagios server's web page. .TP \fB\-c\fR|\-\-config=FILE The main configuration file. On debian systems this defaults to -/etc/nagios3/nagios.cfg +/etc/nagios4/nagios.cfg .TP \fB\-m\fR|\-\-mrtg Print output in MRTG-compatible format. For more details run -nagios3stats with \-\-help +nagios4stats with \-\-help .TP \fB\-d\fR|\-\-data=VARS Comma-seperated list of variables to output in MRTG format. For -more details run nagios3stats with \-\-help. +more details run nagios4stats with \-\-help. .TP \fB\-h\fR|\-\-help A helpful usage message @@ -41,11 +41,11 @@ Print license details .SH FILES .TP -.IP /etc/nagios3 -Default configuration directory for nagios3 +.IP /etc/nagios4 +Default configuration directory for nagios4 .SH AUTHOR -nagios3 is written and maintained by Ethan Galstad . This +nagios4 is written and maintained by Ethan Galstad . This manual page was written by sean finney for the Debian GNU/Linux operating system (but it may be freely used, modified, and redistributed by others). diff --git a/debian/patches/10_p1_pl_shebang.patch b/debian/patches/10_p1_pl_shebang.patch deleted file mode 100644 index 69d9e16..0000000 --- a/debian/patches/10_p1_pl_shebang.patch +++ /dev/null @@ -1,12 +0,0 @@ -Author: Marc Haber -Description: Fix shebang of perl interpreter ---- a/p1.pl -+++ b/p1.pl -@@ -1,4 +1,6 @@ -- package Embed::Persistent; -+#!/usr/bin/perl -+ -+package Embed::Persistent; - - # p1.pl for Nagios - diff --git a/debian/patches/50_cgi.cfg-debianize.patch b/debian/patches/50_cgi.cfg-debianize.patch index 4e14495..c66bca3 100644 --- a/debian/patches/50_cgi.cfg-debianize.patch +++ b/debian/patches/50_cgi.cfg-debianize.patch @@ -30,7 +30,7 @@ Description: Debianize cgi.cfg +# have to be tweaked a bit, as different versions of the plugin +# use different command line arguments/syntaxes. -+nagios_check_command=/usr/lib/nagios/plugins/check_nagios /var/cache/nagios3/status.dat 5 '/usr/sbin/nagios3' ++nagios_check_command=/usr/lib/nagios/plugins/check_nagios /var/cache/nagios4/status.dat 5 '/usr/sbin/nagios4' # AUTHENTICATION USAGE diff --git a/debian/patches/52_nagios.cfg-debianize.patch b/debian/patches/52_nagios.cfg-debianize.patch index 621e645..b2585f6 100644 --- a/debian/patches/52_nagios.cfg-debianize.patch +++ b/debian/patches/52_nagios.cfg-debianize.patch @@ -2,35 +2,24 @@ Author: Alexander Wirt Description: Debianize nagios.cfg --- a/sample-config/nagios.cfg.in +++ b/sample-config/nagios.cfg.in -@@ -2,10 +2,6 @@ - # - # NAGIOS.CFG - Sample Main Config File for Nagios @VERSION@ - # --# Read the documentation for more information on this configuration --# file. I've provided some comments here, but things may not be so --# clear without further explanation. --# - # Last Modified: 12-14-2008 - # - ############################################################################## @@ -16,9 +12,19 @@ # for historical purposes. This should be the first option specified # in the config file!!! -log_file=@localstatedir@/nagios.log -+log_file=/var/log/nagios3/nagios.log ++log_file=/var/log/nagios4/nagios.log +# Commands definitions -+cfg_file=/etc/nagios3/commands.cfg ++cfg_file=/etc/nagios4/commands.cfg +# Debian also defaults to using the check commands defined by the debian +# nagios-plugins package +cfg_dir=/etc/nagios-plugins/config + -+# Debian uses by default a configuration directory where nagios3-common, ++# Debian uses by default a configuration directory where nagios4-common, +# other packages and the local admin can dump or link configuration +# files into. -+cfg_dir=/etc/nagios3/conf.d ++cfg_dir=/etc/nagios4/conf.d # OBJECT CONFIGURATION FILE(S) # These are the object configuration files in which you define hosts, @@ -57,7 +46,7 @@ Description: Debianize nagios.cfg # when the config files are modified after Nagios starts. -object_cache_file=@localstatedir@/objects.cache -+object_cache_file=/var/cache/nagios3/objects.cache ++object_cache_file=/var/cache/nagios4/objects.cache @@ -66,7 +55,7 @@ Description: Debianize nagios.cfg # restarts. -status_file=@localstatedir@/status.dat -+status_file=/var/cache/nagios3/status.dat ++status_file=/var/cache/nagios4/status.dat @@ -93,7 +82,7 @@ Description: Debianize nagios.cfg # running. -temp_file=@localstatedir@/nagios.tmp -+temp_file=/var/cache/nagios3/nagios.tmp ++temp_file=/var/cache/nagios4/nagios.tmp @@ -102,7 +91,7 @@ Description: Debianize nagios.cfg # placed (assuming you've chosen to do log rotation). -log_archive_path=@localstatedir@/archives -+log_archive_path=/var/log/nagios3/archives ++log_archive_path=/var/log/nagios4/archives @@ -115,15 +104,6 @@ Description: Debianize nagios.cfg -@@ -1142,7 +1147,7 @@ - # embedded Perl interpreter) is located. If you didn't compile - # Nagios with embedded Perl support, this option has no effect. - --p1_file=@bindir@/p1.pl -+p1_file=/usr/lib/nagios3/p1.pl - - - @@ -1226,8 +1231,8 @@ # using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification # commands. @@ -140,7 +120,7 @@ Description: Debianize nagios.cfg # This option determines where Nagios should write debugging information. -debug_file=@localstatedir@/nagios.debug -+debug_file=/var/log/nagios3/nagios.debug ++debug_file=/var/log/nagios4/nagios.debug diff --git a/debian/patches/60_fix_p1.pl_patch_mini_epn.patch b/debian/patches/60_fix_p1.pl_patch_mini_epn.patch deleted file mode 100644 index 85071f3..0000000 --- a/debian/patches/60_fix_p1.pl_patch_mini_epn.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Alexander Wirt -Description: Call p1.pl from /usr/lib/nagios3 ---- a/contrib/mini_epn.c -+++ b/contrib/mini_epn.c -@@ -19,7 +19,7 @@ - #endif - */ - -- char *embedding[] = { "", "p1.pl" }; -+ char *embedding[] = { "", "/usr/lib/nagios3/p1.pl" }; - char *plugin_output ; - char fname[MAX_INPUT_CHARS]; - char *args[] = {"", "0", "", "", NULL }; diff --git a/debian/patches/70_fix_eventhandler_paths.patch b/debian/patches/70_fix_eventhandler_paths.patch index a1fbf6f..2092ae7 100644 --- a/debian/patches/70_fix_eventhandler_paths.patch +++ b/debian/patches/70_fix_eventhandler_paths.patch @@ -7,7 +7,7 @@ Description: Fixes paths for all contributed eventhandlers printfcmd="/usr/bin/printf" -CommandFile="/usr/local/nagios/var/rw/nagios.cmd" -+CommandFile="/var/lib/nagios3/rw/nagios.cmd" ++CommandFile="/var/lib/nagios4/rw/nagios.cmd" # get the current date/time in seconds since UNIX epoch datetime=`date +%s` @@ -18,7 +18,7 @@ Description: Fixes paths for all contributed eventhandlers printfcmd="/usr/bin/printf" -CommandFile="/usr/local/nagios/var/rw/nagios.cmd" -+CommandFile="/var/lib/nagios3/rw/nagios.cmd" ++CommandFile="/var/lib/nagios4/rw/nagios.cmd" # get the current date/time in seconds since UNIX epoch datetime=`date +%s` @@ -29,7 +29,7 @@ Description: Fixes paths for all contributed eventhandlers # Location of the submit_check_result_via_nsca script -SubmitCmd="/usr/local/nagios/libexec/eventhandlers/submit_check_result_via_nsca" -+SubmitCmd="/usr/share/nagios3/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca" ++SubmitCmd="/usr/share/nagios4/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca" # Convert the state string to the corresponding return code return_code=-1 @@ -53,7 +53,7 @@ Description: Fixes paths for all contributed eventhandlers printfcmd="/usr/bin/printf" -CommandFile="/usr/local/nagios/var/rw/nagios.cmd" -+CommandFile="/var/lib/nagios3/rw/nagios.cmd" ++CommandFile="/var/lib/nagios4/rw/nagios.cmd" # get the current date/time in seconds since UNIX epoch datetime=`date +%s` @@ -64,7 +64,7 @@ Description: Fixes paths for all contributed eventhandlers printfcmd="/usr/bin/printf" -CommandFile="/usr/local/nagios/var/rw/nagios.cmd" -+CommandFile="/var/lib/nagios3/rw/nagios.cmd" ++CommandFile="/var/lib/nagios4/rw/nagios.cmd" # get the current date/time in seconds since UNIX epoch datetime=`date +%s` @@ -79,7 +79,7 @@ Description: Fixes paths for all contributed eventhandlers # Location of the event handlers -eventhandlerdir="/usr/local/nagios/libexec/eventhandlers" -+eventhandlerdir="/usr/share/nagios3/plugins/eventhandlers" ++eventhandlerdir="/usr/share/nagios4/plugins/eventhandlers" # Only take action on hard host states... @@ -94,7 +94,7 @@ Description: Fixes paths for all contributed eventhandlers # Location of the event handlers -eventhandlerdir="/usr/local/nagios/libexec/eventhandlers" -+eventhandlerdir="/usr/share/nagios3/plugins/eventhandlers" ++eventhandlerdir="/usr/share/nagios4/plugins/eventhandlers" # Only take action on hard service states... @@ -105,7 +105,7 @@ Description: Fixes paths for all contributed eventhandlers echocmd="/bin/echo" -CommandFile="/usr/local/nagios/var/rw/nagios.cmd" -+CommandFile="/var/lib/nagios3/rw/nagios.cmd" ++CommandFile="/var/lib/nagios4/rw/nagios.cmd" # get the current date/time in seconds since UNIX epoch datetime=`date +%s` diff --git a/debian/patches/80_dont_call_home.patch b/debian/patches/80_dont_call_home.patch deleted file mode 100644 index 0fadf35..0000000 --- a/debian/patches/80_dont_call_home.patch +++ /dev/null @@ -1,4685 +0,0 @@ -commit 16ecc5c1b71b88631af948a41d3fb26ef11e4f9e -Author: Michael Friedrich -Date: Fri Jan 3 15:21:56 2014 +0100 - - html: Remove RSS news feeds and update checks entirely. - - This patch leaves the status.dat/retention.dat parsing functionality in - utils.inc.php intact, even if that was used only for the update check - itsself. - -diff --git a/html/Makefile.in b/html/Makefile.in -index a977e35..6d40b04 100644 ---- a/html/Makefile.in -+++ b/html/Makefile.in -@@ -44,8 +44,6 @@ install: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi - $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) - # $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs -@@ -79,10 +77,6 @@ install: - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done - for file in includes/*.*; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done -- for file in includes/rss/*.*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done -- for file in includes/rss/extlib/*.*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done - - install-unstripped: - $(MAKE) install -diff --git a/html/includes/rss/AUTHORS b/html/includes/rss/AUTHORS -deleted file mode 100644 -index 7d7f3f5..0000000 ---- a/html/includes/rss/AUTHORS -+++ /dev/null -@@ -1 +0,0 @@ --kellan -diff --git a/html/includes/rss/CHANGES b/html/includes/rss/CHANGES -deleted file mode 100644 -index 3346f2b..0000000 ---- a/html/includes/rss/CHANGES -+++ /dev/null -@@ -1,41 +0,0 @@ --Version 0.72 ------------- -- - fix security exploit: http://www.sec-consult.com/216.html -- --Version 0.7 ------------- -- - support for input and output charset encoding -- based on the work in FoF, uses iconv or mbstring if available -- - -- --Version 0.6 ------------- -- - basic support for Atom syndication format -- including support for Atom content constructs -- - fixed support for private feeds (HTTP Auth and SSL) -- (thanks to silverorange.com for providing test feeds) -- - support for some broken webservers -- --Version 0.52 ------------- -- - support GZIP content negoiation -- - PHP 4.3.2 support -- --Version 0.4 ------------- -- - improved error handling, better access for script authors -- - included example scripts of working with MagpieRSS -- - new Smarty plugin for RSS date parsing -- --Version 0.3 ------------- -- - added support for conditional gets (Last-Modified, ETag) -- - now use Snoopy to handle fetching RSS files -- --Version 0.2 ------------- -- - MAJOR CLEAN UP -- - removed kludgy $options array in favour of constants -- - phased out returning arrays -- - added better error handling -- - re-worked comments -diff --git a/html/includes/rss/ChangeLog b/html/includes/rss/ChangeLog -deleted file mode 100644 -index 62fa4f5..0000000 ---- a/html/includes/rss/ChangeLog -+++ /dev/null -@@ -1,405 +0,0 @@ --2005-10-28 14:11 kellan -- -- * extlib/Snoopy.class.inc: a better solution -- --2005-10-28 11:51 kellan -- -- * extlib/Snoopy.class.inc: fix arbtriary code execution -- vulnerability when using curl+ssl -- -- http://www.sec-consult.com/216.html -- --2005-03-08 10:46 kellan -- -- * rss_parse.inc: fix bug w/ atom and date normalization -- --2005-02-09 14:59 kellan -- -- * rss_fetch.inc: fix stale cache bug -- --2005-01-28 02:27 kellan -- -- * rss_parse.inc: support php w/o array_change_case -- --2005-01-23 20:02 kellan -- -- * rss_fetch.inc: fix cache bug introduced by charset encoding -- --2005-01-12 09:14 kellan -- -- * rss_cache.inc, rss_fetch.inc: more sanity checks for when things -- go wrong -- --2004-12-12 13:44 kellan -- -- * INSTALL, rss_cache.inc, rss_utils.inc: detab -- --2004-11-23 20:15 kellan -- -- * rss_parse.inc: fix calling iconv instead of mb_convert_encoding -- --2004-11-22 02:11 kellan -- -- * CHANGES, ChangeLog, rss_parse.inc, scripts/magpie_debug.php: last -- bit of tidying -- --2004-11-22 01:45 kellan -- -- * rss_fetch.inc: detab, bump version -- --2004-11-22 01:43 kellan -- -- * rss_parse.inc: was filtering too much -- --2004-11-22 00:03 kellan -- -- * rss_fetch.inc, rss_parse.inc: cache on $url . $output_encoding -- otherwise we can get munged output -- --2004-11-21 23:52 kellan -- -- * rss_parse.inc: add WARNING -- --2004-11-21 23:45 kellan -- -- * rss_parse.inc: don't set ERROR on notice or warning (rss_fetch -- dies on parse errors) -- --2004-11-21 23:44 kellan -- -- * rss_fetch.inc: add encoding defines (fix timeout error reporting) -- --2004-11-21 20:21 kellan -- -- * rss_parse.inc: incorporate steve's patch -- --2004-11-21 19:26 kellan -- -- * rss_parse.inc: remove old debugging functions, totally -- arbitrarily. might break stuff. can't really explain why i'm -- doing this. -- --2004-10-28 15:52 kellan -- -- * rss_parse.inc: fixed '=' instead of '==' -- --2004-10-26 00:48 kellan -- -- * rss_parse.inc: chance epoch to timestamp to conform w/ php naming -- conventions -- --2004-06-15 12:00 kellan -- -- * rss_parse.inc: [no log message] -- --2004-04-26 14:16 kellan -- -- * rss_fetch.inc: bump version -- --2004-04-26 12:36 kellan -- -- * rss_parse.inc: fix field doubling -- --2004-04-24 17:47 kellan -- -- * CHANGES, ChangeLog: updated -- --2004-04-24 17:35 kellan -- -- * rss_fetch.inc: bumped version -- --2004-04-24 16:52 kellan -- -- * rss_parse.inc: support arbitrary atom content constructs -- -- some refactoring -- --2004-04-24 16:15 kellan -- -- * rss_parse.inc: support summary content contstruct. add normalize -- function -- --2004-03-27 16:29 kellan -- -- * extlib/Snoopy.class.inc: accept self-signed certs -- --2004-03-27 12:53 kellan -- -- * extlib/Snoopy.class.inc: fixed SSL support * set status * set -- error on bad curl -- -- (also ripped out big chunks of dead weight (submit_form) which -- were getting in my way -- --2004-01-25 02:25 kellan -- -- * rss_parse.inc: make RSS 1.0's rdf:about available -- --2004-01-25 02:07 kellan -- -- * rss_parse.inc: clean up text, and line formats. add support item -- rdf:about -- --2004-01-24 23:40 kellan -- -- * CHANGES, ChangeLog: update changes -- --2004-01-24 23:37 kellan -- -- * rss_fetch.inc: updated version -- --2004-01-24 23:35 kellan -- -- * rss_parse.inc: whitespace -- --2004-01-24 23:23 kellan -- -- * extlib/Snoopy.class.inc: support badly formatted http headers -- --2004-01-24 23:20 kellan -- -- * rss_parse.inc: added alpha atom parsing support -- --2003-06-25 22:34 kellan -- -- * extlib/Snoopy.class.inc: fixed fread 4.3.2 compatibility problems -- --2003-06-13 11:31 kellan -- -- * rss_fetch.inc: reset cache on 304 -- --2003-06-12 21:37 kellan -- -- * rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc: -- bumped up version numbers -- --2003-06-12 21:32 kellan -- -- * htdocs/index.html: updated news -- --2003-06-12 21:27 kellan -- -- * NEWS: a manual blog :) -- --2003-06-12 21:22 kellan -- -- * htdocs/index.html: fully qualified img -- --2003-06-12 21:20 kellan -- -- * htdocs/index.html: clean up. added badge. -- --2003-06-12 21:04 kellan -- -- * rss_utils.inc: clean up regex -- --2003-06-12 21:02 kellan -- -- * rss_cache.inc: suppress some warnings -- --2003-05-30 20:44 kellan -- -- * extlib/Snoopy.class.inc: more comments, cleaned up notice -- --2003-05-30 15:14 kellan -- -- * extlib/Snoopy.class.inc: don't advertise gzip support if the user -- hasn't built php with gzinflate support -- --2003-05-12 22:32 kellan -- -- * ChangeLog: changes -- --2003-05-12 22:11 kellan -- -- * htdocs/index.html: announce 0.5 -- --2003-05-12 21:42 kellan -- -- * htdocs/index.html: change -- --2003-05-12 21:39 kellan -- -- * rss_fetch.inc: use gzip -- --2003-05-12 21:37 kellan -- -- * extlib/Snoopy.class.inc: added support gzip encoded content -- negoiation -- --2003-05-12 21:32 kellan -- -- * rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc: fixed -- typoes -- --2003-04-26 21:44 kellan -- -- * rss_parse.inc: fix minor typo -- --2003-04-18 08:19 kellan -- -- * htdocs/cookbook.html: updated cookbook to show more code for -- limiting items -- --2003-03-03 16:02 kellan -- -- * rss_parse.inc, scripts/magpie_slashbox.php: committed (or -- adpated) patch from Nicola (www.technick.com) to quell 'Undefined -- Indexes' notices -- --2003-03-03 15:59 kellan -- -- * rss_fetch.inc: commited patch from nicola (www.technick.com) to -- quell 'undefined indexes' notices. -- -- * Magpie now automatically includes its version in the -- user-agent, & whether cacheing is turned on. -- --2003-02-12 01:22 kellan -- -- * CHANGES, ChangeLog: ChangeLog now auto-generated by cvs2cl -- --2003-02-12 00:21 kellan -- -- * rss_fetch.inc: better errors, hopefully stomped on pesky notices -- --2003-02-12 00:19 kellan -- -- * rss_parse.inc: check to see is xml is supported, if not die -- -- also throw better xml errors -- --2003-02-12 00:18 kellan -- -- * rss_cache.inc: hopefully cleared up some notices that were being -- thrown into the log -- -- fixed a debug statement that was being called as an error -- --2003-02-12 00:15 kellan -- -- * scripts/: magpie_simple.php, magpie_slashbox.php: moved -- magpie_simple to magpie_slashbox, and replaced it with a simpler -- demo. -- --2003-02-12 00:02 kellan -- -- * INSTALL, README, TROUBLESHOOTING: Improved documentation. Better -- install instructions. -- -- TROUBLESHOOTING cover common installation and usage problems -- --2003-01-22 14:40 kellan -- -- * htdocs/cookbook.html: added cookbook.html -- --2003-01-21 23:47 kellan -- -- * cookbook: a magpie cookbook -- --2003-01-20 10:09 kellan -- -- * ChangeLog: updated -- --2003-01-20 09:23 kellan -- -- * scripts/simple_smarty.php: minor clean up -- --2003-01-20 09:15 kellan -- -- * scripts/README: added smarty url -- --2003-01-20 09:14 kellan -- -- * magpie_simple.php, htdocs/index.html, scripts/README, -- scripts/magpie_debug.php, scripts/magpie_simple.php, -- scripts/simple_smarty.php, -- scripts/smarty_plugin/modifier.rss_date_parse.php, -- scripts/templates/simple.smarty: Added scripts directory for -- examples on how to use MagpieRSS -- -- magpie_simple - is a simple example magpie_debug - spew all the -- information from a parsed RSS feed simple_smary - example of -- using magpie with Smarty template system -- smarty_plugin/modifier.rss_date_parse.php - support file for the -- smarty demo templates/simple.smary - template for the smarty demo -- --2003-01-20 09:11 kellan -- -- * rss_fetch.inc, rss_parse.inc: changes to error handling to give -- script authors more access to magpie's errors. -- -- added method magpie_error() to retrieve global MAGPIE_ERROR -- variable for when fetch_rss() returns false -- --2002-10-26 19:02 kellan -- -- * htdocs/index.html: putting the website under source control -- --2002-10-26 18:43 kellan -- -- * AUTHORS, ChangeLog, INSTALL, README: some documentation to make -- it all look official :) -- --2002-10-25 23:04 kellan -- -- * magpie_simple.php: quxx -- --2002-10-25 23:04 kellan -- -- * rss_parse.inc: added support for textinput and image -- --2002-10-25 19:23 kellan -- -- * magpie_simple.php, rss_cache.inc, rss_fetch.inc, rss_parse.inc, -- rss_utils.inc: switched to using Snoopy for fetching remote RSS -- files. -- -- added support for conditional gets -- --2002-10-25 19:22 kellan -- -- * rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc: -- Change comment style to slavishly imitate the phpinsider style -- found in Smarty and Snoopy :) -- --2002-10-25 19:18 kellan -- -- * extlib/Snoopy.class.inc: added Snoopy in order to support -- conditional gets -- --2002-10-23 23:19 kellan -- -- * magpie_simple.php, rss_cache.inc, rss_fetch.inc, rss_parse.inc: -- MAJOR CLEANUP! -- -- * rss_fetch got rid of the options array, replaced it with a more -- PHP-like solution of using defines. constants are setup, with -- defaults, in the function init() -- -- got rid of the idiom of passing back an array, its was awkward to -- deal with in PHP, and unusual (and consquently confusing to -- people). now i return true/false values, and try to setup error -- string where appropiate (rss_cache has the most complete example -- of this) -- -- change the logic for interacting with the cache -- -- * rss_cache major re-working of how error are handled. tried to -- make the code more resillient. the cache is now much more aware -- of MAX_AGE, where before this was being driven out of rss_fetch -- (which was silly) -- -- * rss_parse properly handles xml parse errors. used to sail -- along blithely unaware. -- --2002-09-11 11:11 kellan -- -- * rss_cache.inc, rss_parse.inc, magpie_simple.php, rss_fetch.inc, -- rss_utils.inc: Initial revision -- --2002-09-11 11:11 kellan -- -- * rss_cache.inc, rss_parse.inc, magpie_simple.php, rss_fetch.inc, -- rss_utils.inc: initial import -- -diff --git a/html/includes/rss/INSTALL b/html/includes/rss/INSTALL -deleted file mode 100644 -index 640833d..0000000 ---- a/html/includes/rss/INSTALL -+++ /dev/null -@@ -1,143 +0,0 @@ --REQUIREMENTS -- -- MapieRSS requires a recent PHP 4+ (developed with 4.2.0) -- with xml (expat) support. -- -- Optionally: -- * PHP5 with libxml2 support. -- * cURL for SSL support -- * iconv (preferred) or mb_string for expanded character set support -- --QUICK START -- -- Magpie consists of 4 files (rss_fetch.inc, rss_parser.inc, rss_cache.inc, -- and rss_utils.inc), and the directory extlib (which contains a modified -- version of the Snoopy HTTP client) -- -- Copy these 5 resources to a directory named 'magpierss' in the same -- directory as your PHP script. -- -- At the top of your script add the following line: -- -- require_once('magpierss/rss_fetch.inc'); -- -- Now you can use the fetch_rss() method: -- -- $rss = fetch_rss($url); -- -- Done. That's it. See README for more details on using MagpieRSS. -- --NEXT STEPS -- -- Important: you'll probably want to get the cache directory working in -- order to speed up your application, and not abuse the webserver you're -- downloading the RSS from. -- -- Optionally you can install MagpieRSS in your PHP include path in order to -- make it available server wide. -- -- Lastly you might want to look through the constants in rss_fetch.inc see if -- there is anything you want to override (the defaults are pretty good) -- -- For more info, or if you have trouble, see TROUBLESHOOTING -- --SETTING UP CACHING -- -- Magpie has built-in transparent caching. With caching Magpie will only -- fetch and parse RSS feeds when there is new content. Without this feature -- your pages will be slow, and the sites serving the RSS feed will be annoyed -- with you. -- --** Simple and Automatic ** -- -- By default Magpie will try to create a cache directory named 'cache' in the -- same directory as your PHP script. -- --** Creating a Local Cache Directory ** -- -- Often this will fail, because your webserver doesn't have sufficient -- permissions to create the directory. -- -- Exact instructions for how to do this will vary from install to install and -- platform to platform. The steps are: -- -- 1. Make a directory named 'cache' -- 2. Give the web server write access to that directory. -- -- An example of how to do this on Debian would be: -- -- 1. mkdir /path/to/script/cache -- 2. chgrp www-data /path/to/script/cache -- 3. chmod 775 /path/to/script/cache -- -- On other Unixes you'll need to change 'www-data' to what ever user Apache -- runs as. (on MacOS X the user would be 'www') -- --** Cache in /tmp ** -- -- Sometimes you won't be able to create a local cache directory. Some reasons -- might be: -- -- 1. No shell account -- 2. Insufficient permissions to change ownership of a directory -- 3. Webserver runs as 'nobody' -- -- In these situations using a cache directory in /tmp can often be a good -- option. -- -- The drawback is /tmp is public, so anyone on the box can read the cache -- files. Usually RSS feeds are public information, so you'll have to decide -- how much of an issue that is. -- -- To use /tmp as your cache directory you need to add the following line to -- your script: -- -- define('MAGPIE_CACHE_DIR', '/tmp/magpie_cache'); -- --** Global Cache ** -- -- If you have several applications using Magpie, you can create a single -- shared cache directory, either using the /tmp cache, or somewhere else on -- the system. -- -- The upside is that you'll distribute fetching and parsing feeds across -- several applications. -- --INSTALLING MAGPIE SERVER WIDE -- -- Rather then following the Quickstart instructions which requires you to have -- a copy of Magpie per application, alternately you can place it in some -- shared location. -- --** Adding Magpie to Your Include Path ** -- -- Copy the 5 resources (rss_fetch.inc, rss_parser.inc, rss_cache.inc, -- rss_utils.inc, and extlib) to a directory named 'magpierss' in your include -- path. Now any PHP file on your system can use Magpie with: -- -- require_once('magpierss/rss_fetch.inc'); -- -- Different installs have different include paths, and you'll have to figure -- out what your include_path is. -- -- From shell you can try: -- -- php -i | grep 'include_path' -- -- Alternatley you can create a phpinfo.php file with contains: -- -- -- -- Debian's default is: -- -- /usr/share/php -- -- (though more idealogically pure location would be /usr/local/share/php) -- -- Apple's default include path is: -- -- /usr/lib/php -- -- While the Entropy PHP build seems to use: -- -- /usr/local/php/lib/php -\ No newline at end of file -diff --git a/html/includes/rss/NEWS b/html/includes/rss/NEWS -deleted file mode 100644 -index 5ac6b97..0000000 ---- a/html/includes/rss/NEWS -+++ /dev/null -@@ -1,53 +0,0 @@ --MagpieRSS News -- --MAGPIERSS 0.51 RELEASED -- * important bugfix! -- * fix "silent failure" when PHP doesn't have zlib -- --FEED ON FEEDS USES MAGPIE -- * web-based RSS aggregator built with Magpie -- * easy to install, easy to use. -- http://minutillo.com/steve/feedonfeeds/ -- --MAGPIERSS 0.5 RELEASED -- * supports transparent HTTP gzip content negotiation for reduced bandwidth usage -- * quashed some undefined index notices -- --MAGPIERSS 0.46 RELEASED -- * minor release, more error handling clean up -- * documentation fixes, simpler example -- * new trouble shooting guide for installation and usage problems -- http://magpierss.sourceforge.net/TROUBLESHOOTING -- --MAGPIE NEWS AS RSS -- * releases, bug fixes, releated stories in RSS -- --MAGPIERSS COOKBOOK: SIMPLE PHP RSS HOW TOS -- * answers some of the most frequently asked Magpie questions -- * feedback, suggestions, requests, recipes welcome -- http://magpierss.sourceforge.net/cookbook.html -- --MAGPIERSS 0.4 RELEASED! -- * improved error handling, more flexibility for script authors, backwards compatible -- * new and better examples! including using MagpieRSS and Smarty -- * new Smarty plugin for RSS date parsing -- http://smarty.php.net -- --INFINITE PENGUIN NOW SUPPORTS MAGPIE 0.3 -- * simple, sophisticated RSS viewer -- * includes auto-generated javascript ticker from RSS feed -- http://www.infinitepenguins.net/rss/ -- --TRAUMWIND RELEASES REX BACKEND FOR MAGPIERSS -- * drop in support using regex based XML parser -- * parses improperly formed XML that chokes expat -- http://traumwind.de/blog/magpie/magpie_alike.php -- --MAGPIERSS 0.3 RELEASED! -- * Support added for HTTP Conditional GETs. -- http://fishbowl.pastiche.org/archives/001132.html -- --MAGPIERSS 0.2! -- * Major clean up of the code. Easier to use. -- * Simpler install on shared hosts. -- * Better documentation and comments. -diff --git a/html/includes/rss/README b/html/includes/rss/README -deleted file mode 100644 -index 6af7edb..0000000 ---- a/html/includes/rss/README -+++ /dev/null -@@ -1,48 +0,0 @@ --NAME -- -- MagpieRSS - a simple RSS integration tool -- --SYNOPSIS -- -- require_once(rss_fetch.inc); -- $url = $_GET['url']; -- $rss = fetch_rss( $url ); -- -- echo "Channel Title: " . $rss->channel['title'] . "

"; -- echo "

    "; -- foreach ($rss->items as $item) { -- $href = $item['link']; -- $title = $item['title']; -- echo "
  • $title
    • "; -- } -- echo "
"; -- --DESCRIPTION -- -- MapieRSS is an XML-based RSS parser in PHP. It attempts to be "PHP-like", -- and simple to use. -- -- Some features include: -- -- * supports RSS 0.9 - 1.0, with limited RSS 2.0 support -- * supports namespaces, and modules, including mod_content and mod_event -- * open minded [1] -- * simple, functional interface, to object oriented backend parser -- * automatic caching of parsed RSS objects makes its easy to integrate -- * supports conditional GET with Last-Modified, and ETag -- * uses constants for easy override of default behaviour -- * heavily commented -- -- --1. By open minded I mean Magpie will accept any tag it finds in good faith that -- it was supposed to be here. For strict validation, look elsewhere. -- -- --GETTING STARTED -- -- -- --COPYRIGHT: -- Copyright(c) 2002 kellan@protest.net. All rights reserved. -- This software is released under the GNU General Public License. -- Please read the disclaimer at the top of the Snoopy.class.inc file. -diff --git a/html/includes/rss/TROUBLESHOOTING b/html/includes/rss/TROUBLESHOOTING -deleted file mode 100644 -index 89068d3..0000000 ---- a/html/includes/rss/TROUBLESHOOTING -+++ /dev/null -@@ -1,152 +0,0 @@ --TROUBLESHOOTING -- -- --Trouble Installing MagpieRSS: -- --1. Fatal error: Failed opening required '/path/to/script/rss_fetch.inc' -- (include_path='.:/usr/local/lib/php:/usr/local/lib/php/pear') -- --2. Cache couldn't make dir './cache'. -- --3. Fatal error: Failed to load PHP's XML Extension. -- http://www.php.net/manual/en/ref.xml.php -- --Trouble Using MagpieRSS -- --4. Warning: MagpieRSS: Failed to fetch example.com/index.rdf. -- (HTTP Error: Invalid protocol "") -- --5. Warning: MagpieRSS: Failed to parse RSS file. -- (not well-formed (invalid token) at line 19, column 98) -- --6. Warning: MagpieRSS: Failed to fetch http://localhost/rss/features.1-0.rss. -- (HTTP Response: HTTP/1.1 404 Not Found) -- --If you would rather provide a custom error, see the COOKBOOK --(http://magpierss.sf.net/cookbook.html) recipe 2. -- --************************************************************************* --1. Fatal error: Failed opening required '/path/to/script/rss_fetch.inc' -- (include_path='.:/usr/local/lib/php:/usr/local/lib/php/pear') -- -- This could mean that: -- -- a) PHP can't find the MagpieRSS files. -- b) PHP found them the MagpieRSS files, but can't read them. -- -- a. Telling PHP where to look for MagpieRSS file. -- -- This might mean your PHP program can't find the MagpieRSS libraries. -- Magpie relies on 4 include files, rss_fetch.inc, rss_parse.inc, -- rss_cache.inc, rss_util.inc, and for normal use you'll need all 4 (see the -- cookbook for exceptions). -- -- This can be fixed by making sure the MagpieRSS files are in your include -- path. -- -- If you can edit your include path (for example your on a shared host) then -- you need to replace: -- -- require_once('rss_fetch.inc'); -- -- -with- -- -- define('MAGPIE_DIR', '/path/to/magpierss/'); -- require_once(MAGPIE_DIR.'rss_fetch.inc'); -- -- b. PHP can't read the MagpieRSS files -- -- All PHP libraries need to be readable by your webserver. -- -- On Unix you can accomplish this with: -- -- chmod 755 rss_fetch.inc rss_parse.inc rss_cache.inc rss_util.inc -- --************************************************************************* --2. Cache couldn't make dir './cache'. -- -- MagpieRSS caches the results of fetched and parsed RSS to reduce the load on -- both your server, and the remote server providing the RSS. It does this by -- writing files to a cache directory. -- -- This error means the webserver doesn't have write access to the current -- directory. -- -- a. Make a webserver writeable cache directory -- -- Find the webserver's group. (on my system it is 'www') -- -- mkdir ./cache -- chgrp www directory_name -- chmod g+w directory_name -- -- (this is the best, and desired solution) -- -- b. Tell MagpieRSS to create the cache directory somewhere the webserver can -- write to. -- -- define('MAGPIE_CACHE_DIR', '/tmp/magpierss'); -- -- (this is not a great solution, and might have security considerations) -- -- c. Turn off cacheing. -- -- Magpie can work fine with cacheing, but it will be slower, and you might -- become a nuiance to the RSS provider, but it is an option. -- -- define('MAGPIE_CACHE_ON', 0); -- -- d. And lastly, do NOT -- -- chmod 777 ./cache -- -- Any of the above solutions are better then this. -- -- NOTE: If none of this works for you, let me know. I've got root, and a -- custom compiled Apache on almost any box I ever touch, so I can be a little -- out of touch with reality. But I won't know that if I don't feedback. -- --************************************************************************* 3. --3. Fatal error: Failed to load PHP's XML Extension. -- http://www.php.net/manual/en/ref.xml.php -- -- -or- -- -- Fatal error: Failed to create an instance of PHP's XML parser. -- http://www.php.net/manual/en/ref.xml.php -- -- Make sure your PHP was built with --with-xml -- -- This has been turned on by default for several versions of PHP, but it might -- be turned off in your build. -- -- See php.net for details on building and configuring PHP. -- -- --************************************************************************* --4. Warning: MagpieRSS: Failed to fetch index.rdf. -- (HTTP Error: Invalid protocol "") -- -- You need to put http:// in front of your the URL to your RSS feed -- --************************************************************************* --5. Warning: MagpieRSS: Failed to parse RSS file. -- (not well-formed (invalid token) at line 19, column 98) -- -- There is a problem with the RSS feed you are trying to read. -- MagpieRSS is an XML parser, and therefore can't parse RSS feed with invalid -- characters. Some RSS parser are based on regular expressions, and can -- parse invalid RSS but they have their own problems. -- -- You could try contacting the author of the RSS feed, and pointing them to -- the online RSS validator at: -- -- http://feeds.archive.org/validator/ -- --************************************************************************* --6. Warning: MagpieRSS: Failed to fetch http://example.com/index.rdf -- (HTTP Response: HTTP/1.1 404 Not Found) -- -- Its a 404! The RSS file ain't there. -- -- -diff --git a/html/includes/rss/cookbook b/html/includes/rss/cookbook -deleted file mode 100644 -index 45dda98..0000000 ---- a/html/includes/rss/cookbook -+++ /dev/null -@@ -1,125 +0,0 @@ --MAGPIERSS RECIPES: Cooking with Corbies -- -- "Four and twenty blackbirds baked in a pie." -- --1. LIMIT THE NUMBER OF HEADLINES(AKA ITEMS) RETURNED. -- --PROBLEM: -- --You want to display the 10 (or 3) most recent headlines, but the RSS feed --contains 15. -- --SOLUTION: -- --$num_items = 10; --$rss = fetch_rss($url); -- --$items = array_slice($rss->items, 0, $num_items); -- --DISCUSSION: -- --Rather then trying to limit the number of items Magpie parses, a much simpler, --and more flexible approach is to take a "slice" of the array of items. And --array_slice() is smart enough to do the right thing if the feed has less items --then $num_items. -- --See: http://www.php.net/array_slice -- -- --2. DISPLAY A CUSTOM ERROR MESSAGE IF SOMETHING GOES WRONG -- --PROBLEM: -- --You don't want Magpie's error messages showing up if something goes wrong. -- --SOLUTION: -- --# Magpie throws USER_WARNINGS only --# so you can cloak these, by only showing ERRORs --error_reporting(E_ERROR); -- --# check the return value of fetch_rss() -- --$rss = fetch_rss($url); -- --if ( $rss ) { --...display rss feed... --} --else { -- echo "An error occured! " . -- "Consider donating more $$$ for restoration of services." . -- "
Error Message: " . magpie_error(); --} -- --DISCUSSION: -- --MagpieRSS triggers a warning in a number of circumstances. The 2 most common --circumstances are: if the specified RSS file isn't properly formed (usually --because it includes illegal HTML), or if Magpie can't download the remote RSS --file, and there is no cached version. -- --If you don't want your users to see these warnings change your error_reporting --settings to only display ERRORs. Another option is to turn off display_error, --so that WARNINGs, and NOTICEs still go to the error_log but not to the webpages. -- --You can do this with: -- --ini_set('display_errors', 0); -- --See: http://www.php.net/error_reporting, -- http://www.php.net/ini_set, -- http://www.php.net/manual/en/ref.errorfunc.php -- --3. GENERATE A NEW RSS FEED -- --PROBLEM: -- --Create an RSS feed for other people to use. -- --SOLUTION: -- --Use Useful Inc's RSSWriter (http://usefulinc.com/rss/rsswriter/) -- --DISCUSSION: -- --An example of turning a Magpie parsed RSS object back into an RSS file is forth --coming. In the meantime RSSWriter has great documentation. -- --4. DISPLAY HEADLINES MORE RECENT THEN X DATE -- --PROBLEM: -- --You only want to display headlines that were published on, or after a certain --date. -- -- --SOLUTION: -- --require 'rss_utils.inc'; -- --# get all headlines published today --$today = getdate(); -- --# today, 12AM --$date = mktime(0,0,0,$today['mon'], $today['mday'], $today['year']); -- --$rss = fetch_rss($url); -- --foreach ( $rss->items as $item ) { -- $published = parse_w3cdtf($item['dc']['date']); -- if ( $published >= $date ) { -- echo "Title: " . $item['title']; -- echo "Published: " . date("h:i:s A", $published); -- echo "

"; -- } --} -- --DISCUSSION: -- --This recipe only works for RSS 1.0 feeds that include the field. --(which is very good RSS style) -- --parse_w3cdtf is defined in rss_utils.inc, and parses RSS style dates into Unix --epoch seconds. -- --See: http://www.php.net/manual/en/ref.datetime.php -diff --git a/html/includes/rss/extlib/Snoopy.class.inc b/html/includes/rss/extlib/Snoopy.class.inc -deleted file mode 100644 -index 3ddecba..0000000 ---- a/html/includes/rss/extlib/Snoopy.class.inc -+++ /dev/null -@@ -1,900 +0,0 @@ -- --Copyright (c): 1999-2000 ispi, all rights reserved --Version: 1.0 -- -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2.1 of the License, or (at your option) any later version. -- * -- * This library 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 -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public -- * License along with this library; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --You may contact the author of Snoopy by e-mail at: --monte@ispi.net -- --Or, write to: --Monte Ohrt --CTO, ispi --237 S. 70th suite 220 --Lincoln, NE 68510 -- --The latest version of Snoopy can be obtained from: --http://snoopy.sourceforge.com -- --*************************************************/ -- --class Snoopy --{ -- /**** Public variables ****/ -- -- /* user definable vars */ -- -- var $host = "www.php.net"; // host name we are connecting to -- var $port = 80; // port we are connecting to -- var $proxy_host = ""; // proxy host to use -- var $proxy_port = ""; // proxy port to use -- var $agent = "Snoopy v1.0"; // agent we masquerade as -- var $referer = ""; // referer info to pass -- var $cookies = array(); // array of cookies to pass -- // $cookies["username"]="joe"; -- var $rawheaders = array(); // array of raw headers to send -- // $rawheaders["Content-type"]="text/html"; -- -- var $maxredirs = 5; // http redirection depth maximum. 0 = disallow -- var $lastredirectaddr = ""; // contains address of last redirected address -- var $offsiteok = true; // allows redirection off-site -- var $maxframes = 0; // frame content depth maximum. 0 = disallow -- var $expandlinks = true; // expand links to fully qualified URLs. -- // this only applies to fetchlinks() -- // or submitlinks() -- var $passcookies = true; // pass set cookies back through redirects -- // NOTE: this currently does not respect -- // dates, domains or paths. -- -- var $user = ""; // user for http authentication -- var $pass = ""; // password for http authentication -- -- // http accept types -- var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; -- -- var $results = ""; // where the content is put -- -- var $error = ""; // error messages sent here -- var $response_code = ""; // response code returned from server -- var $headers = array(); // headers returned from server sent here -- var $maxlength = 500000; // max return data length (body) -- var $read_timeout = 0; // timeout on read operations, in seconds -- // supported only since PHP 4 Beta 4 -- // set to 0 to disallow timeouts -- var $timed_out = false; // if a read operation timed out -- var $status = 0; // http request status -- -- var $curl_path = "/usr/bin/curl"; -- // Snoopy will use cURL for fetching -- // SSL content if a full system path to -- // the cURL binary is supplied here. -- // set to false if you do not have -- // cURL installed. See http://curl.haxx.se -- // for details on installing cURL. -- // Snoopy does *not* use the cURL -- // library functions built into php, -- // as these functions are not stable -- // as of this Snoopy release. -- -- // send Accept-encoding: gzip? -- var $use_gzip = true; -- -- /**** Private variables ****/ -- -- var $_maxlinelen = 4096; // max line length (headers) -- -- var $_httpmethod = "GET"; // default http request method -- var $_httpversion = "HTTP/1.0"; // default http request version -- var $_submit_method = "POST"; // default submit method -- var $_submit_type = "application/x-www-form-urlencoded"; // default submit type -- var $_mime_boundary = ""; // MIME boundary for multipart/form-data submit type -- var $_redirectaddr = false; // will be set if page fetched is a redirect -- var $_redirectdepth = 0; // increments on an http redirect -- var $_frameurls = array(); // frame src urls -- var $_framedepth = 0; // increments on frame depth -- -- var $_isproxy = false; // set if using a proxy server -- var $_fp_timeout = 30; // timeout for socket connection -- --/*======================================================================*\ -- Function: fetch -- Purpose: fetch the contents of a web page -- (and possibly other protocols in the -- future like ftp, nntp, gopher, etc.) -- Input: $URI the location of the page to fetch -- Output: $this->results the output text from the fetch --\*======================================================================*/ -- -- function fetch($URI) -- { -- -- //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS); -- $URI_PARTS = parse_url($URI); -- if (!empty($URI_PARTS["user"])) -- $this->user = $URI_PARTS["user"]; -- if (!empty($URI_PARTS["pass"])) -- $this->pass = $URI_PARTS["pass"]; -- -- switch($URI_PARTS["scheme"]) -- { -- case "http": -- $this->host = $URI_PARTS["host"]; -- if(!empty($URI_PARTS["port"])) -- $this->port = $URI_PARTS["port"]; -- if($this->_connect($fp)) -- { -- if($this->_isproxy) -- { -- // using proxy, send entire URI -- $this->_httprequest($URI,$fp,$URI,$this->_httpmethod); -- } -- else -- { -- $path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : ""); -- // no proxy, send only the path -- $this->_httprequest($path, $fp, $URI, $this->_httpmethod); -- } -- -- $this->_disconnect($fp); -- -- if($this->_redirectaddr) -- { -- /* url was redirected, check if we've hit the max depth */ -- if($this->maxredirs > $this->_redirectdepth) -- { -- // only follow redirect if it's on this site, or offsiteok is true -- if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) -- { -- /* follow the redirect */ -- $this->_redirectdepth++; -- $this->lastredirectaddr=$this->_redirectaddr; -- $this->fetch($this->_redirectaddr); -- } -- } -- } -- -- if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) -- { -- $frameurls = $this->_frameurls; -- $this->_frameurls = array(); -- -- while(list(,$frameurl) = each($frameurls)) -- { -- if($this->_framedepth < $this->maxframes) -- { -- $this->fetch($frameurl); -- $this->_framedepth++; -- } -- else -- break; -- } -- } -- } -- else -- { -- return false; -- } -- return true; -- break; -- case "https": -- if(!$this->curl_path || (!is_executable($this->curl_path))) { -- $this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n"; -- return false; -- } -- $this->host = $URI_PARTS["host"]; -- if(!empty($URI_PARTS["port"])) -- $this->port = $URI_PARTS["port"]; -- if($this->_isproxy) -- { -- // using proxy, send entire URI -- $this->_httpsrequest($URI,$URI,$this->_httpmethod); -- } -- else -- { -- $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : ""); -- // no proxy, send only the path -- $this->_httpsrequest($path, $URI, $this->_httpmethod); -- } -- -- if($this->_redirectaddr) -- { -- /* url was redirected, check if we've hit the max depth */ -- if($this->maxredirs > $this->_redirectdepth) -- { -- // only follow redirect if it's on this site, or offsiteok is true -- if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) -- { -- /* follow the redirect */ -- $this->_redirectdepth++; -- $this->lastredirectaddr=$this->_redirectaddr; -- $this->fetch($this->_redirectaddr); -- } -- } -- } -- -- if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) -- { -- $frameurls = $this->_frameurls; -- $this->_frameurls = array(); -- -- while(list(,$frameurl) = each($frameurls)) -- { -- if($this->_framedepth < $this->maxframes) -- { -- $this->fetch($frameurl); -- $this->_framedepth++; -- } -- else -- break; -- } -- } -- return true; -- break; -- default: -- // not a valid protocol -- $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n'; -- return false; -- break; -- } -- return true; -- } -- -- -- --/*======================================================================*\ -- Private functions --\*======================================================================*/ -- -- --/*======================================================================*\ -- Function: _striplinks -- Purpose: strip the hyperlinks from an html document -- Input: $document document to strip. -- Output: $match an array of the links --\*======================================================================*/ -- -- function _striplinks($document) -- { -- preg_match_all("'<\s*a\s+.*href\s*=\s* # find ]+)) # if quote found, match up to next matching -- # quote, otherwise match up to next space -- 'isx",$document,$links); -- -- -- // catenate the non-empty matches from the conditional subpattern -- -- while(list($key,$val) = each($links[2])) -- { -- if(!empty($val)) -- $match[] = $val; -- } -- -- while(list($key,$val) = each($links[3])) -- { -- if(!empty($val)) -- $match[] = $val; -- } -- -- // return the links -- return $match; -- } -- --/*======================================================================*\ -- Function: _stripform -- Purpose: strip the form elements from an html document -- Input: $document document to strip. -- Output: $match an array of the links --\*======================================================================*/ -- -- function _stripform($document) -- { -- preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements); -- -- // catenate the matches -- $match = implode("\r\n",$elements[0]); -- -- // return the links -- return $match; -- } -- -- -- --/*======================================================================*\ -- Function: _striptext -- Purpose: strip the text from an html document -- Input: $document document to strip. -- Output: $text the resulting text --\*======================================================================*/ -- -- function _striptext($document) -- { -- -- // I didn't use preg eval (//e) since that is only available in PHP 4.0. -- // so, list your entities one by one here. I included some of the -- // more common ones. -- -- $search = array("']*?>.*?'si", // strip out javascript -- "'<[\/\!]*?[^<>]*?>'si", // strip out html tags -- "'([\r\n])[\s]+'", // strip out white space -- "'&(quote|#34);'i", // replace html entities -- "'&(amp|#38);'i", -- "'&(lt|#60);'i", -- "'&(gt|#62);'i", -- "'&(nbsp|#160);'i", -- "'&(iexcl|#161);'i", -- "'&(cent|#162);'i", -- "'&(pound|#163);'i", -- "'&(copy|#169);'i" -- ); -- $replace = array( "", -- "", -- "\\1", -- "\"", -- "&", -- "<", -- ">", -- " ", -- chr(161), -- chr(162), -- chr(163), -- chr(169)); -- -- $text = preg_replace($search,$replace,$document); -- -- return $text; -- } -- --/*======================================================================*\ -- Function: _expandlinks -- Purpose: expand each link into a fully qualified URL -- Input: $links the links to qualify -- $URI the full URI to get the base from -- Output: $expandedLinks the expanded links --\*======================================================================*/ -- -- function _expandlinks($links,$URI) -- { -- -- preg_match("/^[^\?]+/",$URI,$match); -- -- $match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]); -- -- $search = array( "|^http://".preg_quote($this->host)."|i", -- "|^(?!http://)(\/)?(?!mailto:)|i", -- "|/\./|", -- "|/[^\/]+/\.\./|" -- ); -- -- $replace = array( "", -- $match."/", -- "/", -- "/" -- ); -- -- $expandedLinks = preg_replace($search,$replace,$links); -- -- return $expandedLinks; -- } -- --/*======================================================================*\ -- Function: _httprequest -- Purpose: go get the http data from the server -- Input: $url the url to fetch -- $fp the current open file pointer -- $URI the full URI -- $body body contents to send if any (POST) -- Output: --\*======================================================================*/ -- -- function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="") -- { -- if($this->passcookies && $this->_redirectaddr) -- $this->setcookies(); -- -- $URI_PARTS = parse_url($URI); -- if(empty($url)) -- $url = "/"; -- $headers = $http_method." ".$url." ".$this->_httpversion."\r\n"; -- if(!empty($this->agent)) -- $headers .= "User-Agent: ".$this->agent."\r\n"; -- if(!empty($this->host) && !isset($this->rawheaders['Host'])) -- $headers .= "Host: ".$this->host."\r\n"; -- if(!empty($this->accept)) -- $headers .= "Accept: ".$this->accept."\r\n"; -- -- if($this->use_gzip) { -- // make sure PHP was built with --with-zlib -- // and we can handle gzipp'ed data -- if ( function_exists(gzinflate) ) { -- $headers .= "Accept-encoding: gzip\r\n"; -- } -- else { -- trigger_error( -- "use_gzip is on, but PHP was built without zlib support.". -- " Requesting file(s) without gzip encoding.", -- E_USER_NOTICE); -- } -- } -- -- if(!empty($this->referer)) -- $headers .= "Referer: ".$this->referer."\r\n"; -- if(!empty($this->cookies)) -- { -- if(!is_array($this->cookies)) -- $this->cookies = (array)$this->cookies; -- -- reset($this->cookies); -- if ( count($this->cookies) > 0 ) { -- $cookie_headers .= 'Cookie: '; -- foreach ( $this->cookies as $cookieKey => $cookieVal ) { -- $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; "; -- } -- $headers .= substr($cookie_headers,0,-2) . "\r\n"; -- } -- } -- if(!empty($this->rawheaders)) -- { -- if(!is_array($this->rawheaders)) -- $this->rawheaders = (array)$this->rawheaders; -- while(list($headerKey,$headerVal) = each($this->rawheaders)) -- $headers .= $headerKey.": ".$headerVal."\r\n"; -- } -- if(!empty($content_type)) { -- $headers .= "Content-type: $content_type"; -- if ($content_type == "multipart/form-data") -- $headers .= "; boundary=".$this->_mime_boundary; -- $headers .= "\r\n"; -- } -- if(!empty($body)) -- $headers .= "Content-length: ".strlen($body)."\r\n"; -- if(!empty($this->user) || !empty($this->pass)) -- $headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n"; -- -- $headers .= "\r\n"; -- -- // set the read timeout if needed -- if ($this->read_timeout > 0) -- socket_set_timeout($fp, $this->read_timeout); -- $this->timed_out = false; -- -- fwrite($fp,$headers.$body,strlen($headers.$body)); -- -- $this->_redirectaddr = false; -- unset($this->headers); -- -- // content was returned gzip encoded? -- $is_gzipped = false; -- -- while($currentHeader = fgets($fp,$this->_maxlinelen)) -- { -- if ($this->read_timeout > 0 && $this->_check_timeout($fp)) -- { -- $this->status=-100; -- return false; -- } -- -- // if($currentHeader == "\r\n") -- if(preg_match("/^\r?\n$/", $currentHeader) ) -- break; -- -- // if a header begins with Location: or URI:, set the redirect -- if(preg_match("/^(Location:|URI:)/i",$currentHeader)) -- { -- // get URL portion of the redirect -- preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches); -- // look for :// in the Location header to see if hostname is included -- if(!preg_match("|\:\/\/|",$matches[2])) -- { -- // no host in the path, so prepend -- $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port; -- // eliminate double slash -- if(!preg_match("|^/|",$matches[2])) -- $this->_redirectaddr .= "/".$matches[2]; -- else -- $this->_redirectaddr .= $matches[2]; -- } -- else -- $this->_redirectaddr = $matches[2]; -- } -- -- if(preg_match("|^HTTP/|",$currentHeader)) -- { -- if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status)) -- { -- $this->status= $status[1]; -- } -- $this->response_code = $currentHeader; -- } -- -- if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) { -- $is_gzipped = true; -- } -- -- $this->headers[] = $currentHeader; -- } -- -- # $results = fread($fp, $this->maxlength); -- $results = ""; -- while ( $data = fread($fp, $this->maxlength) ) { -- $results .= $data; -- if ( -- strlen($results) > $this->maxlength ) { -- break; -- } -- } -- -- // gunzip -- if ( $is_gzipped ) { -- // per http://www.php.net/manual/en/function.gzencode.php -- $results = substr($results, 10); -- $results = gzinflate($results); -- } -- -- if ($this->read_timeout > 0 && $this->_check_timeout($fp)) -- { -- $this->status=-100; -- return false; -- } -- -- // check if there is a a redirect meta tag -- -- if(preg_match("']*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match)) -- { -- $this->_redirectaddr = $this->_expandlinks($match[1],$URI); -- } -- -- // have we hit our frame depth and is there frame src to fetch? -- if(($this->_framedepth < $this->maxframes) && preg_match_all("']+)'i",$results,$match)) -- { -- $this->results[] = $results; -- for($x=0; $x_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host); -- } -- // have we already fetched framed content? -- elseif(is_array($this->results)) -- $this->results[] = $results; -- // no framed content -- else -- $this->results = $results; -- -- return true; -- } -- --/*======================================================================*\ -- Function: _httpsrequest -- Purpose: go get the https data from the server using curl -- Input: $url the url to fetch -- $URI the full URI -- $body body contents to send if any (POST) -- Output: --\*======================================================================*/ -- -- function _httpsrequest($url,$URI,$http_method,$content_type="",$body="") -- { -- if($this->passcookies && $this->_redirectaddr) -- $this->setcookies(); -- -- $headers = array(); -- -- $URI_PARTS = parse_url($URI); -- if(empty($url)) -- $url = "/"; -- // GET ... header not needed for curl -- //$headers[] = $http_method." ".$url." ".$this->_httpversion; -- if(!empty($this->agent)) -- $headers[] = "User-Agent: ".$this->agent; -- if(!empty($this->host)) -- $headers[] = "Host: ".$this->host; -- if(!empty($this->accept)) -- $headers[] = "Accept: ".$this->accept; -- if(!empty($this->referer)) -- $headers[] = "Referer: ".$this->referer; -- if(!empty($this->cookies)) -- { -- if(!is_array($this->cookies)) -- $this->cookies = (array)$this->cookies; -- -- reset($this->cookies); -- if ( count($this->cookies) > 0 ) { -- $cookie_str = 'Cookie: '; -- foreach ( $this->cookies as $cookieKey => $cookieVal ) { -- $cookie_str .= $cookieKey."=".urlencode($cookieVal)."; "; -- } -- $headers[] = substr($cookie_str,0,-2); -- } -- } -- if(!empty($this->rawheaders)) -- { -- if(!is_array($this->rawheaders)) -- $this->rawheaders = (array)$this->rawheaders; -- while(list($headerKey,$headerVal) = each($this->rawheaders)) -- $headers[] = $headerKey.": ".$headerVal; -- } -- if(!empty($content_type)) { -- if ($content_type == "multipart/form-data") -- $headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary; -- else -- $headers[] = "Content-type: $content_type"; -- } -- if(!empty($body)) -- $headers[] = "Content-length: ".strlen($body); -- if(!empty($this->user) || !empty($this->pass)) -- $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass); -- -- for($curr_header = 0; $curr_header < count($headers); $curr_header++) { -- $cmdline_params .= " -H \"".$headers[$curr_header]."\""; -- } -- -- if(!empty($body)) -- $cmdline_params .= " -d \"$body\""; -- -- if($this->read_timeout > 0) -- $cmdline_params .= " -m ".$this->read_timeout; -- -- $headerfile = uniqid(time()); -- -- # accept self-signed certs -- $cmdline_params .= " -k"; -- exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return); -- -- if($return) -- { -- $this->error = "Error: cURL could not retrieve the document, error $return."; -- return false; -- } -- -- -- $results = implode("\r\n",$results); -- -- $result_headers = file("/tmp/$headerfile"); -- -- $this->_redirectaddr = false; -- unset($this->headers); -- -- for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++) -- { -- -- // if a header begins with Location: or URI:, set the redirect -- if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader])) -- { -- // get URL portion of the redirect -- preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches); -- // look for :// in the Location header to see if hostname is included -- if(!preg_match("|\:\/\/|",$matches[2])) -- { -- // no host in the path, so prepend -- $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port; -- // eliminate double slash -- if(!preg_match("|^/|",$matches[2])) -- $this->_redirectaddr .= "/".$matches[2]; -- else -- $this->_redirectaddr .= $matches[2]; -- } -- else -- $this->_redirectaddr = $matches[2]; -- } -- -- if(preg_match("|^HTTP/|",$result_headers[$currentHeader])) -- { -- $this->response_code = $result_headers[$currentHeader]; -- if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match)) -- { -- $this->status= $match[1]; -- } -- } -- $this->headers[] = $result_headers[$currentHeader]; -- } -- -- // check if there is a a redirect meta tag -- -- if(preg_match("']*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match)) -- { -- $this->_redirectaddr = $this->_expandlinks($match[1],$URI); -- } -- -- // have we hit our frame depth and is there frame src to fetch? -- if(($this->_framedepth < $this->maxframes) && preg_match_all("']+)'i",$results,$match)) -- { -- $this->results[] = $results; -- for($x=0; $x_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host); -- } -- // have we already fetched framed content? -- elseif(is_array($this->results)) -- $this->results[] = $results; -- // no framed content -- else -- $this->results = $results; -- -- unlink("/tmp/$headerfile"); -- -- return true; -- } -- --/*======================================================================*\ -- Function: setcookies() -- Purpose: set cookies for a redirection --\*======================================================================*/ -- -- function setcookies() -- { -- for($x=0; $xheaders); $x++) -- { -- if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match)) -- $this->cookies[$match[1]] = $match[2]; -- } -- } -- -- --/*======================================================================*\ -- Function: _check_timeout -- Purpose: checks whether timeout has occurred -- Input: $fp file pointer --\*======================================================================*/ -- -- function _check_timeout($fp) -- { -- if ($this->read_timeout > 0) { -- $fp_status = socket_get_status($fp); -- if ($fp_status["timed_out"]) { -- $this->timed_out = true; -- return true; -- } -- } -- return false; -- } -- --/*======================================================================*\ -- Function: _connect -- Purpose: make a socket connection -- Input: $fp file pointer --\*======================================================================*/ -- -- function _connect(&$fp) -- { -- if(!empty($this->proxy_host) && !empty($this->proxy_port)) -- { -- $this->_isproxy = true; -- $host = $this->proxy_host; -- $port = $this->proxy_port; -- } -- else -- { -- $host = $this->host; -- $port = $this->port; -- } -- -- $this->status = 0; -- -- if($fp = fsockopen( -- $host, -- $port, -- $errno, -- $errstr, -- $this->_fp_timeout -- )) -- { -- // socket connection succeeded -- -- return true; -- } -- else -- { -- // socket connection failed -- $this->status = $errno; -- switch($errno) -- { -- case -3: -- $this->error="socket creation failed (-3)"; -- case -4: -- $this->error="dns lookup failure (-4)"; -- case -5: -- $this->error="connection refused or timed out (-5)"; -- default: -- $this->error="connection failed (".$errno.")"; -- } -- return false; -- } -- } --/*======================================================================*\ -- Function: _disconnect -- Purpose: disconnect a socket connection -- Input: $fp file pointer --\*======================================================================*/ -- -- function _disconnect($fp) -- { -- return(fclose($fp)); -- } -- -- --/*======================================================================*\ -- Function: _prepare_post_body -- Purpose: Prepare post body according to encoding type -- Input: $formvars - form variables -- $formfiles - form upload files -- Output: post body --\*======================================================================*/ -- -- function _prepare_post_body($formvars, $formfiles) -- { -- settype($formvars, "array"); -- settype($formfiles, "array"); -- -- if (count($formvars) == 0 && count($formfiles) == 0) -- return; -- -- switch ($this->_submit_type) { -- case "application/x-www-form-urlencoded": -- reset($formvars); -- while(list($key,$val) = each($formvars)) { -- if (is_array($val) || is_object($val)) { -- while (list($cur_key, $cur_val) = each($val)) { -- $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&"; -- } -- } else -- $postdata .= urlencode($key)."=".urlencode($val)."&"; -- } -- break; -- -- case "multipart/form-data": -- $this->_mime_boundary = "Snoopy".md5(uniqid(microtime())); -- -- reset($formvars); -- while(list($key,$val) = each($formvars)) { -- if (is_array($val) || is_object($val)) { -- while (list($cur_key, $cur_val) = each($val)) { -- $postdata .= "--".$this->_mime_boundary."\r\n"; -- $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n"; -- $postdata .= "$cur_val\r\n"; -- } -- } else { -- $postdata .= "--".$this->_mime_boundary."\r\n"; -- $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n"; -- $postdata .= "$val\r\n"; -- } -- } -- -- reset($formfiles); -- while (list($field_name, $file_names) = each($formfiles)) { -- settype($file_names, "array"); -- while (list(, $file_name) = each($file_names)) { -- if (!is_readable($file_name)) continue; -- -- $fp = fopen($file_name, "r"); -- $file_content = fread($fp, filesize($file_name)); -- fclose($fp); -- $base_name = basename($file_name); -- -- $postdata .= "--".$this->_mime_boundary."\r\n"; -- $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n"; -- $postdata .= "$file_content\r\n"; -- } -- } -- $postdata .= "--".$this->_mime_boundary."--\r\n"; -- break; -- } -- -- return $postdata; -- } --} -- --?> -diff --git a/html/includes/rss/htdocs/cookbook.html b/html/includes/rss/htdocs/cookbook.html -deleted file mode 100644 -index 2a18e74..0000000 ---- a/html/includes/rss/htdocs/cookbook.html -+++ /dev/null -@@ -1,237 +0,0 @@ -- -- -- Magie RSS Recipes: Simple PHP RSS How To -- -- -- --

--

MagpieRSS Recipes: Cooking with Corbies

-- --

"Four and twenty blackbirds baked in a --pie."

--

--

--

    --
  1. Limit the Number of Headlines(aka Items) Returned
    2. --
  2. Display a Custom Error Message if Something Goes --Wrong
    3. --
  3. Generate a New RSS Feed
    4. --
  4. Display Headlines More Recent then X Date
    5. --
  5. Parse a Local File Containing RSS
    6. -- --
--

-- --

1. Limit the Number of Headlines(aka Items) Returned.

-- --

Problem:

-- --You want to display the 10 (or 3 or whatever) most recent headlines, but the RSS feed --contains 15. -- --

Solution:

-- --
--$num_items = 10;
--$rss = fetch_rss($url);
--
--$items = array_slice($rss->items, 0, $num_items);
--
--foreach ( $items as $item ) {
--
--

Discussion:

-- --Rather then trying to limit the number of items Magpie parses, a much simpler, --and more flexible approach is to take a "slice" of the array of items. And --array_slice() is smart enough to do the right thing if the feed has less items --then $num_items. -- --

See:

http://www.php.net/array_slice --

-- --

2. Display a Custom Error Message if Something Goes Wrong

-- --

Problem:

-- --You don't want Magpie's error messages showing up if something goes wrong. -- --

Solution:

--
--# Magpie throws USER_WARNINGS only
--# so you can cloak these, by only showing ERRORs
--error_reporting(E_ERROR);
--
--# check the return value of fetch_rss()
--
--$rss = fetch_rss($url);
--
--if ( $rss ) {
--...display rss feed...
--}
--else {
--   echo "An error occured!  " .
--        "Consider donating more $$$ for restoration of services." .
--        "<br>Error Message: " . magpie_error();
--}
--
--

Discussion:

-- --MagpieRSS triggers a warning in a number of circumstances. The 2 most common --circumstances are: if the specified RSS file isn't properly formed (usually --because it includes illegal HTML), or if Magpie can't download the remote RSS --file, and there is no cached version. -- --If you don't want your users to see these warnings change your error_reporting --settings to only display ERRORs.
--Another option is to turn off display_error, --so that WARNINGs, and NOTICEs still go to the error_log but not to the webpages. -- --You can do this with: -- --
--# you can also do this in your php.ini file
--ini_set('display_errors', 0);
--
-- --

See:

--http://www.php.net/error_reporting,
--http://www.php.net/ini_set,
--http://www.php.net/manual/en/ref.errorfunc.php
-- --

3. Generate a New RSS Feed

-- --

Problem:

-- --Create an RSS feed for other people to use. -- --

Solution:

-- --Use Useful Inc's RSSWriter. -- --

Discussion:

-- --An example of turning a Magpie parsed RSS object back into an RSS file is --forthcoming. In the meantime RSSWriter is well documented. -- --

4. Display Headlines More Recent then X Date

-- --

Problem:

-- --You only want to display headlines that were published on, or after a certain --date. -- -- --

Solution:

--
--require_once('rss_utils.inc');
--
--# get all headlines published today
--$today = getdate();
--
--# today, 12AM
--$date = mktime(0,0,0,$today['mon'], $today['mday'], $today['year']);
--
--$rss = fetch_rss($url);
--
--foreach ( $rss->items as $item ) {
--   $published = parse_w3cdtf($item['dc']['date']);
--   if ( $published >= $date ) {
--        echo "Title: " . $item['title'];
--        echo "Published: " . date("h:i:s A", $published);
--        echo "<p>";
--    }
--}
--
--

Discussion:

-- --This recipe only works for RSS 1.0 feeds that include the field. --(which is very good RSS style)
--parse_w3cdtf() is defined in --rss_utils.inc, and parses RSS style dates into Unix epoch --seconds. -- --

See:

--http://www.php.net/manual/en/ref.datetime.php -- -- --

5. Parse a Local File Containing RSS

--

Problem:

--MagpieRSS provides fetch_rss() which takes a URL and returns a --parsed RSS object, but what if you want to parse a file stored locally that --doesn't have a URL? -- --

Solution

--
--require_once('rss_parse.inc');
--
--$rss_file = 'some_rss_file.rdf';
--$rss_string = read_file($rss_file);
--$rss = new MagpieRSS( $rss_string );
--
--if ( $rss and !$rss->ERROR) {
--...display rss...
--}
--else {
--    echo "Error: " . $rss->ERROR;
--}
--
--# efficiently read a file into a string
--# in php >= 4.3.0 you can simply use file_get_contents()
--#
--function read_file($filename) {
--    $fh = fopen($filename, 'r') or die($php_errormsg);
--    $rss_string = fread($fh, filesize($filename) );
--    fclose($fh);
--    return $rss_string;
--}
--
-- --

Discussion

--Here we are using MagpieRSS's RSS parser directly without the convience wrapper --of fetch_rss(). We read the contents of the RSS file into a --string, and pass it to the parser constructor. Notice also that error handling --is subtly different. -- --

See:

--http://www.php.net/manual/en/ref.filesystem.php,
--http://www.php.net/manual/en/language.oop.php -- -- -- -- -- -diff --git a/html/includes/rss/htdocs/index.html b/html/includes/rss/htdocs/index.html -deleted file mode 100644 -index e6b24b5..0000000 ---- a/html/includes/rss/htdocs/index.html -+++ /dev/null -@@ -1,419 +0,0 @@ -- -- -- Magpie RSS - PHP RSS Parser -- -- -- -- -- --

MagpieRSS

--

--

MagpieRSS provides an XML-based (expat) RSS parser in PHP.

--

-- MagpieRSS is compatible with RSS .9 through RSS 1.0, and supports the -- RSS 1.0's modules. (with a few exceptions) --

--

--

Project Info

-- --
-- --

News!

--
    -- --
  • -- MagpieRSS --0.51 Released -- -- --
    • -- --
  • -- Feed On Feeds Uses Magpie --
      --
    • server based PHP RSS aggregator built with MagpieRSS
      • --
    • easy to install, easy to use.
      • --
    -- --
    • -- -- --
  • -- MagpieRSS --0.5 Released --
      --
    • supports transparent HTTP gzip content negotiation for reduced bandwidth usage
      • --
    • quashed some undefined index notices
      • --
    -- --
    • -- -- --
  • -- MagpieRSS --0.46 Released --
      --
    • minor release, more error handling clean up
      • --
    • documentation fixes, simpler example
      • --
    • new trouble shooting guide for installation and usage problems --
    -- --
    • -- --
  • -- Magpie News as RSS --
      --
    • releases, bug fixes, releated stories as an RSS feed
      • --
    -- --
    • -- -- --
  • -- MagpieRSS --Cookbook: Simple PHP RSS How Tos --
      --
    • answers some of the most frequently asked Magpie questions
      • --
    • feedback, suggestions, requests, recipes welcome
      • --
    -- --
    • -- --
  • -- MagpieRSS 0.4 Released! --
      --
    • improved error handling, more flexibility for script authors, --backwards compatible
      • --
    • new and better examples! including using MagpieRSS and Smarty
      • --
    • new Smarty plugin for RSS date parsing
      • --
    --
    --
    • -- --
--

--

-- --

Why?

-- I wrote MagpieRSS out of a frustration with the limitations of existing -- solutions. In particular many of the existing PHP solutions seemed to: --
    --
  • use a parser based on regular expressions, making for an inherently -- fragile solution --
  • only support early versions of RSS --
  • discard all the interesting information besides item title, description, -- and link. --
  • not build proper separation between parsing the RSS and displaying it. --
-- In particular I failed to find any PHP RSS parsers that could sufficiently -- parse RSS 1.0 feeds, to be useful on the RSS based event feeds we generate -- at Protest.net. --

--

-- --

Features

-- --
    --
  • --

    Easy to Use

    -- As simple as: --
    --require('rss_fetch.inc');
--$rss = fetch_rss($url);
--
    -- --
    • --
  • --

    Parses RSS 0.9 - RSS 1.0

    -- -- Parses most RSS formats, including support for -- 1.0 modules and limited -- namespace support. RSS is packed into convenient data structures; easy to -- use in PHP, and appropriate for passing to a templating system, like -- Smarty. --
    • --
  • --

    Integrated Object Cache

    -- -- Caching the parsed RSS means that the 2nd request is fast, and that --including the rss_fetch call in your PHP page won't destroy your performance, --and force you to reply on an external cron job. And it happens transparently. -- --
    • --
  • --

    HTTP Conditional GETs

    -- -- Save bandwidth and speed up download times with intelligent use of -- Last-Modified and ETag.
    See HTTP Conditional Get for RSS Hackers --
    • -- --

  • Configurable

    -- -- Makes extensive use of constants to allow overriding default behaviour, and -- installation on shared hosts. --
    • --

  • Modular

    --
      --
    • rss_fetch.inc - wraps a simple interface (fetch_rss()) -- around the library. --
    • rss_parse.inc - provides the RSS parser, and the RSS object --
    • rss_cache.inc - a simple (no GC) object cache, optimized for RSS objects --
    • rss_utils.inc - utility functions for working with RSS. currently -- provides parse_w3cdtf(), for parsing W3CDTF into epoch seconds. --
    --
-- -- --

--

-- --

Magpie's approach to parsing RSS

-- -- Magpie takes a naive, and inclusive approach. Absolutely -- non-validating, as long as the RSS feed is well formed, Magpie will -- cheerfully parse new, and never before seen tags in your RSS feeds. --

--

-- This makes it very simple support the varied versions of RSS simply, but -- forces the consumer of a RSS feed to be cognizant of how it is -- structured.(at least if you want to do something fancy) --

--

-- Magpie parses a RSS feed into a simple object, with 4 fields: -- channel, items, image, and -- textinput. --

--

--

channel

-- $rss->channel contains key-value pairs of all tags, without -- nested tags, found between the root tag (<rdf:RDF>, or <rss>) -- and the end of the document. --

--

--

items

-- $rss->items is an array of associative arrays, each one -- describing a single item. An example that looks like: -- 
--<item rdf:about="http://protest.net/NorthEast/calendrome.cgi?span=event&ID=210257">
--<title>Weekly Peace Vigil</title>
--<link>http://protest.net/NorthEast/calendrome.cgi?span=event&ID=210257</link>
--<description>Wear a white ribbon</description>
--<dc:subject>Peace</dc:subject>
--<ev:startdate>2002-06-01T11:00:00</ev:startdate>
--<ev:location>Northampton, MA</ev:location>
--<ev:enddate>2002-06-01T12:00:00</ev:enddate>
--<ev:type>Protest</ev:type>
--</item>
--

-- Is parsed, and pushed on the $rss->items array as: -- 

--array(
--	title => 'Weekly Peace Vigil',
--	link => 'http://protest.net/NorthEast/calendrome.cgi?span=event&ID=210257',
--	description => 'Wear a white ribbon',
--	dc => array (
--			subject => 'Peace'
--		),
--	ev => array (
--		startdate => '2002-06-01T11:00:00',
--		enddate => '2002-06-01T12:00:00',
--		type => 'Protest',
--		location => 'Northampton, MA'
--	)
--);
--
--

--

--

image and textinput

--$rss->image and $rss-textinput are associative arrays --including name-value pairs for anything found between the respective parent --tags. --

--

-- --

Usage Examples:

-- --A very simple example would be: --
--require_once 'rss_fetch.inc';
--
--$url = 'http://magpie.sf.net/samples/imc.1-0.rdf';
--$rss = fetch_rss($url);
--
--echo "Site: ", $rss->channel['title'], "<br>\n";
--foreach ($rss->items as $item ) {
--	$title = $item[title];
--	$url   = $item[link];
--	echo "<a href=$url>$title</a></li><br>\n";
--}
--
--More soon....in the meantime you can check out a --cool tool built with --MagpieRSS, version 0.1. --

--

-- --

Todos

--

RSS Parser

--
    --
  • Swap in a smarter parser that includes optional -- support for validation, and required fields.
    • -- --
  • Support RSS 2.0 (as much as I'm annoyed by it)
    • -- --
  • Improve support for modules that rely on attributes
    • --
-- --

RSS Cache

--
    --
  • Light-weight garbage collection --
-- --

Fetch RSS

-- --

Misc

--
    --
  • More examples
    • --
  • A test suite
    • --
  • RSS generation, perhaps with RSSwriter? --
    • --
-- --

--

--

RSS Resources

-- . --

--

License and Contact Info

--Magpie is distributed under the GPL license... --

--coded by: kellan (at) protest.net, feedback is always appreciated. --

--SourceForge.net Logo -- -- -- -diff --git a/html/includes/rss/rss_cache.inc b/html/includes/rss/rss_cache.inc -deleted file mode 100644 -index b8d436c..0000000 ---- a/html/includes/rss/rss_cache.inc -+++ /dev/null -@@ -1,200 +0,0 @@ -- -- * Version: 0.51 -- * License: GPL -- * -- * The lastest version of MagpieRSS can be obtained from: -- * http://magpierss.sourceforge.net -- * -- * For questions, help, comments, discussion, etc., please join the -- * Magpie mailing list: -- * http://lists.sourceforge.net/lists/listinfo/magpierss-general -- * -- */ -- --class RSSCache { -- var $BASE_CACHE = './cache'; // where the cache files are stored -- var $MAX_AGE = 3600; // when are files stale, default one hour -- var $ERROR = ""; // accumulate error messages -- -- function RSSCache ($base='', $age='') { -- if ( $base ) { -- $this->BASE_CACHE = $base; -- } -- if ( $age ) { -- $this->MAX_AGE = $age; -- } -- -- // attempt to make the cache directory -- if ( ! file_exists( $this->BASE_CACHE ) ) { -- $status = @mkdir( $this->BASE_CACHE, 0755 ); -- -- // if make failed -- if ( ! $status ) { -- $this->error( -- "Cache couldn't make dir '" . $this->BASE_CACHE . "'." -- ); -- } -- } -- } -- --/*=======================================================================*\ -- Function: set -- Purpose: add an item to the cache, keyed on url -- Input: url from wich the rss file was fetched -- Output: true on sucess --\*=======================================================================*/ -- function set ($url, $rss) { -- $this->ERROR = ""; -- $cache_file = $this->file_name( $url ); -- $fp = @fopen( $cache_file, 'w' ); -- -- if ( ! $fp ) { -- $this->error( -- "Cache unable to open file for writing: $cache_file" -- ); -- return 0; -- } -- -- -- $data = $this->serialize( $rss ); -- fwrite( $fp, $data ); -- fclose( $fp ); -- -- return $cache_file; -- } -- --/*=======================================================================*\ -- Function: get -- Purpose: fetch an item from the cache -- Input: url from wich the rss file was fetched -- Output: cached object on HIT, false on MISS --\*=======================================================================*/ -- function get ($url) { -- $this->ERROR = ""; -- $cache_file = $this->file_name( $url ); -- -- if ( ! file_exists( $cache_file ) ) { -- $this->debug( -- "Cache doesn't contain: $url (cache file: $cache_file)" -- ); -- return 0; -- } -- -- $fp = @fopen($cache_file, 'r'); -- if ( ! $fp ) { -- $this->error( -- "Failed to open cache file for reading: $cache_file" -- ); -- return 0; -- } -- -- if ($filesize = filesize($cache_file) ) { -- $data = fread( $fp, filesize($cache_file) ); -- $rss = $this->unserialize( $data ); -- -- return $rss; -- } -- -- return 0; -- } -- --/*=======================================================================*\ -- Function: check_cache -- Purpose: check a url for membership in the cache -- and whether the object is older then MAX_AGE (ie. STALE) -- Input: url from wich the rss file was fetched -- Output: cached object on HIT, false on MISS --\*=======================================================================*/ -- function check_cache ( $url ) { -- $this->ERROR = ""; -- $filename = $this->file_name( $url ); -- -- if ( file_exists( $filename ) ) { -- // find how long ago the file was added to the cache -- // and whether that is longer then MAX_AGE -- $mtime = filemtime( $filename ); -- $age = time() - $mtime; -- if ( $this->MAX_AGE > $age ) { -- // object exists and is current -- return 'HIT'; -- } -- else { -- // object exists but is old -- return 'STALE'; -- } -- } -- else { -- // object does not exist -- return 'MISS'; -- } -- } -- -- function cache_age( $cache_key ) { -- $filename = $this->file_name( $url ); -- if ( file_exists( $filename ) ) { -- $mtime = filemtime( $filename ); -- $age = time() - $mtime; -- return $age; -- } -- else { -- return -1; -- } -- } -- --/*=======================================================================*\ -- Function: serialize --\*=======================================================================*/ -- function serialize ( $rss ) { -- return serialize( $rss ); -- } -- --/*=======================================================================*\ -- Function: unserialize --\*=======================================================================*/ -- function unserialize ( $data ) { -- return unserialize( $data ); -- } -- --/*=======================================================================*\ -- Function: file_name -- Purpose: map url to location in cache -- Input: url from wich the rss file was fetched -- Output: a file name --\*=======================================================================*/ -- function file_name ($url) { -- $filename = md5( $url ); -- return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) ); -- } -- --/*=======================================================================*\ -- Function: error -- Purpose: register error --\*=======================================================================*/ -- function error ($errormsg, $lvl=E_USER_WARNING) { -- // append PHP's error message if track_errors enabled -- if ( isset($php_errormsg) ) { -- $errormsg .= " ($php_errormsg)"; -- } -- $this->ERROR = $errormsg; -- if ( MAGPIE_DEBUG ) { -- trigger_error( $errormsg, $lvl); -- } -- else { -- error_log( $errormsg, 0); -- } -- } -- -- function debug ($debugmsg, $lvl=E_USER_NOTICE) { -- if ( MAGPIE_DEBUG ) { -- $this->error("MagpieRSS [debug] $debugmsg", $lvl); -- } -- } -- --} -- --?> -diff --git a/html/includes/rss/rss_fetch.inc b/html/includes/rss/rss_fetch.inc -deleted file mode 100644 -index f2fa2fa..0000000 ---- a/html/includes/rss/rss_fetch.inc -+++ /dev/null -@@ -1,458 +0,0 @@ -- -- * License: GPL -- * -- * The lastest version of MagpieRSS can be obtained from: -- * http://magpierss.sourceforge.net -- * -- * For questions, help, comments, discussion, etc., please join the -- * Magpie mailing list: -- * magpierss-general@lists.sourceforge.net -- * -- */ -- --// Setup MAGPIE_DIR for use on hosts that don't include --// the current path in include_path. --// with thanks to rajiv and smarty --if (!defined('DIR_SEP')) { -- define('DIR_SEP', DIRECTORY_SEPARATOR); --} -- --if (!defined('MAGPIE_DIR')) { -- define('MAGPIE_DIR', dirname(__FILE__) . DIR_SEP); --} -- --require_once( MAGPIE_DIR . 'rss_parse.inc' ); --require_once( MAGPIE_DIR . 'rss_cache.inc' ); -- --// for including 3rd party libraries --define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib' . DIR_SEP); --require_once( MAGPIE_EXTLIB . 'Snoopy.class.inc'); -- -- --/* -- * CONSTANTS - redefine these in your script to change the -- * behaviour of fetch_rss() currently, most options effect the cache -- * -- * MAGPIE_CACHE_ON - Should Magpie cache parsed RSS objects? -- * For me a built in cache was essential to creating a "PHP-like" -- * feel to Magpie, see rss_cache.inc for rationale -- * -- * -- * MAGPIE_CACHE_DIR - Where should Magpie cache parsed RSS objects? -- * This should be a location that the webserver can write to. If this -- * directory does not already exist Mapie will try to be smart and create -- * it. This will often fail for permissions reasons. -- * -- * -- * MAGPIE_CACHE_AGE - How long to store cached RSS objects? In seconds. -- * -- * -- * MAGPIE_CACHE_FRESH_ONLY - If remote fetch fails, throw error -- * instead of returning stale object? -- * -- * MAGPIE_DEBUG - Display debugging notices? -- * --*/ -- -- --/*=======================================================================*\ -- Function: fetch_rss: -- Purpose: return RSS object for the give url -- maintain the cache -- Input: url of RSS file -- Output: parsed RSS object (see rss_parse.inc) -- -- NOTES ON CACHEING: -- If caching is on (MAGPIE_CACHE_ON) fetch_rss will first check the cache. -- -- NOTES ON RETRIEVING REMOTE FILES: -- If conditional gets are on (MAGPIE_CONDITIONAL_GET_ON) fetch_rss will -- return a cached object, and touch the cache object upon recieving a -- 304. -- -- NOTES ON FAILED REQUESTS: -- If there is an HTTP error while fetching an RSS object, the cached -- version will be return, if it exists (and if MAGPIE_CACHE_FRESH_ONLY is off) --\*=======================================================================*/ -- --define('MAGPIE_VERSION', '0.72'); -- --$MAGPIE_ERROR = ""; -- --function fetch_rss ($url) { -- // initialize constants -- init(); -- -- if ( !isset($url) ) { -- error("fetch_rss called without a url"); -- return false; -- } -- -- // if cache is disabled -- if ( !MAGPIE_CACHE_ON ) { -- // fetch file, and parse it -- $resp = _fetch_remote_file( $url ); -- if ( is_success( $resp->status ) ) { -- return _response_to_rss( $resp ); -- } -- else { -- error("Failed to fetch $url and cache is off"); -- return false; -- } -- } -- // else cache is ON -- else { -- // Flow -- // 1. check cache -- // 2. if there is a hit, make sure its fresh -- // 3. if cached obj fails freshness check, fetch remote -- // 4. if remote fails, return stale object, or error -- -- $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE ); -- -- if (MAGPIE_DEBUG and $cache->ERROR) { -- debug($cache->ERROR, E_USER_WARNING); -- } -- -- -- $cache_status = 0; // response of check_cache -- $request_headers = array(); // HTTP headers to send with fetch -- $rss = 0; // parsed RSS object -- $errormsg = 0; // errors, if any -- -- // store parsed XML by desired output encoding -- // as character munging happens at parse time -- $cache_key = $url . MAGPIE_OUTPUT_ENCODING; -- -- if (!$cache->ERROR) { -- // return cache HIT, MISS, or STALE -- $cache_status = $cache->check_cache( $cache_key); -- } -- -- // if object cached, and cache is fresh, return cached obj -- if ( $cache_status == 'HIT' ) { -- $rss = $cache->get( $cache_key ); -- if ( isset($rss) and $rss ) { -- // should be cache age -- $rss->from_cache = 1; -- if ( MAGPIE_DEBUG > 1) { -- debug("MagpieRSS: Cache HIT", E_USER_NOTICE); -- } -- return $rss; -- } -- } -- -- // else attempt a conditional get -- -- // setup headers -- if ( $cache_status == 'STALE' ) { -- $rss = $cache->get( $cache_key ); -- if ( $rss and $rss->etag and $rss->last_modified ) { -- $request_headers['If-None-Match'] = $rss->etag; -- $request_headers['If-Last-Modified'] = $rss->last_modified; -- } -- } -- -- $resp = _fetch_remote_file( $url, $request_headers ); -- -- if (isset($resp) and $resp) { -- if ($resp->status == '304' ) { -- // we have the most current copy -- if ( MAGPIE_DEBUG > 1) { -- debug("Got 304 for $url"); -- } -- // reset cache on 304 (at minutillo insistent prodding) -- $cache->set($cache_key, $rss); -- return $rss; -- } -- elseif ( is_success( $resp->status ) ) { -- $rss = _response_to_rss( $resp ); -- if ( $rss ) { -- if (MAGPIE_DEBUG > 1) { -- debug("Fetch successful"); -- } -- // add object to cache -- $cache->set( $cache_key, $rss ); -- return $rss; -- } -- } -- else { -- $errormsg = "Failed to fetch $url "; -- if ( $resp->status == '-100' ) { -- $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)"; -- } -- elseif ( $resp->error ) { -- # compensate for Snoopy's annoying habbit to tacking -- # on '\n' -- $http_error = substr($resp->error, 0, -2); -- $errormsg .= "(HTTP Error: $http_error)"; -- } -- else { -- $errormsg .= "(HTTP Response: " . $resp->response_code .')'; -- } -- } -- } -- else { -- $errormsg = "Unable to retrieve RSS file for unknown reasons."; -- } -- -- // else fetch failed -- -- // attempt to return cached object -- if ($rss) { -- if ( MAGPIE_DEBUG ) { -- debug("Returning STALE object for $url"); -- } -- return $rss; -- } -- -- // else we totally failed -- error( $errormsg ); -- -- return false; -- -- } // end if ( !MAGPIE_CACHE_ON ) { --} // end fetch_rss() -- --/*=======================================================================*\ -- Function: error -- Purpose: set MAGPIE_ERROR, and trigger error --\*=======================================================================*/ -- --function error ($errormsg, $lvl=E_USER_WARNING) { -- global $MAGPIE_ERROR; -- -- // append PHP's error message if track_errors enabled -- if ( isset($php_errormsg) ) { -- $errormsg .= " ($php_errormsg)"; -- } -- if ( $errormsg ) { -- $errormsg = "MagpieRSS: $errormsg"; -- $MAGPIE_ERROR = $errormsg; -- trigger_error( $errormsg, $lvl); -- } --} -- --function debug ($debugmsg, $lvl=E_USER_NOTICE) { -- trigger_error("MagpieRSS [debug] $debugmsg", $lvl); --} -- --/*=======================================================================*\ -- Function: magpie_error -- Purpose: accessor for the magpie error variable --\*=======================================================================*/ --function magpie_error ($errormsg="") { -- global $MAGPIE_ERROR; -- -- if ( isset($errormsg) and $errormsg ) { -- $MAGPIE_ERROR = $errormsg; -- } -- -- return $MAGPIE_ERROR; --} -- --/*=======================================================================*\ -- Function: _fetch_remote_file -- Purpose: retrieve an arbitrary remote file -- Input: url of the remote file -- headers to send along with the request (optional) -- Output: an HTTP response object (see Snoopy.class.inc) --\*=======================================================================*/ --function _fetch_remote_file ($url, $headers = "" ) { -- // Snoopy is an HTTP client in PHP -- $client = new Snoopy(); -- $client->agent = MAGPIE_USER_AGENT; -- $client->read_timeout = MAGPIE_FETCH_TIME_OUT; -- $client->use_gzip = MAGPIE_USE_GZIP; -- if (is_array($headers) ) { -- $client->rawheaders = $headers; -- } -- -- @$client->fetch($url); -- return $client; -- --} -- --/*=======================================================================*\ -- Function: _response_to_rss -- Purpose: parse an HTTP response object into an RSS object -- Input: an HTTP response object (see Snoopy) -- Output: parsed RSS object (see rss_parse) --\*=======================================================================*/ --function _response_to_rss ($resp) { -- $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING ); -- -- // if RSS parsed successfully -- if ( $rss and !$rss->ERROR) { -- -- // find Etag, and Last-Modified -- foreach($resp->headers as $h) { -- // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1" -- if (strpos($h, ": ")) { -- list($field, $val) = explode(": ", $h, 2); -- } -- else { -- $field = $h; -- $val = ""; -- } -- -- if ( $field == 'ETag' ) { -- $rss->etag = $val; -- } -- -- if ( $field == 'Last-Modified' ) { -- $rss->last_modified = $val; -- } -- } -- -- return $rss; -- } // else construct error message -- else { -- $errormsg = "Failed to parse RSS file."; -- -- if ($rss) { -- $errormsg .= " (" . $rss->ERROR . ")"; -- } -- error($errormsg); -- -- return false; -- } // end if ($rss and !$rss->error) --} -- --/*=======================================================================*\ -- Function: init -- Purpose: setup constants with default values -- check for user overrides --\*=======================================================================*/ --function init () { -- if ( defined('MAGPIE_INITALIZED') ) { -- return; -- } -- else { -- define('MAGPIE_INITALIZED', true); -- } -- -- if ( !defined('MAGPIE_CACHE_ON') ) { -- define('MAGPIE_CACHE_ON', true); -- } -- -- if ( !defined('MAGPIE_CACHE_DIR') ) { -- define('MAGPIE_CACHE_DIR', './cache'); -- } -- -- if ( !defined('MAGPIE_CACHE_AGE') ) { -- define('MAGPIE_CACHE_AGE', 60*60); // one hour -- } -- -- if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) { -- define('MAGPIE_CACHE_FRESH_ONLY', false); -- } -- -- if ( !defined('MAGPIE_OUTPUT_ENCODING') ) { -- define('MAGPIE_OUTPUT_ENCODING', 'ISO-8859-1'); -- } -- -- if ( !defined('MAGPIE_INPUT_ENCODING') ) { -- define('MAGPIE_INPUT_ENCODING', null); -- } -- -- if ( !defined('MAGPIE_DETECT_ENCODING') ) { -- define('MAGPIE_DETECT_ENCODING', true); -- } -- -- if ( !defined('MAGPIE_DEBUG') ) { -- define('MAGPIE_DEBUG', 0); -- } -- -- if ( !defined('MAGPIE_USER_AGENT') ) { -- $ua = 'MagpieRSS/'. MAGPIE_VERSION . ' (+http://magpierss.sf.net'; -- -- if ( MAGPIE_CACHE_ON ) { -- $ua = $ua . ')'; -- } -- else { -- $ua = $ua . '; No cache)'; -- } -- -- define('MAGPIE_USER_AGENT', $ua); -- } -- -- if ( !defined('MAGPIE_FETCH_TIME_OUT') ) { -- define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout -- } -- -- // use gzip encoding to fetch rss files if supported? -- if ( !defined('MAGPIE_USE_GZIP') ) { -- define('MAGPIE_USE_GZIP', true); -- } --} -- --// NOTE: the following code should really be in Snoopy, or at least --// somewhere other then rss_fetch! -- --/*=======================================================================*\ -- HTTP STATUS CODE PREDICATES -- These functions attempt to classify an HTTP status code -- based on RFC 2616 and RFC 2518. -- -- All of them take an HTTP status code as input, and return true or false -- -- All this code is adapted from LWP's HTTP::Status. --\*=======================================================================*/ -- -- --/*=======================================================================*\ -- Function: is_info -- Purpose: return true if Informational status code --\*=======================================================================*/ --function is_info ($sc) { -- return $sc >= 100 && $sc < 200; --} -- --/*=======================================================================*\ -- Function: is_success -- Purpose: return true if Successful status code --\*=======================================================================*/ --function is_success ($sc) { -- return $sc >= 200 && $sc < 300; --} -- --/*=======================================================================*\ -- Function: is_redirect -- Purpose: return true if Redirection status code --\*=======================================================================*/ --function is_redirect ($sc) { -- return $sc >= 300 && $sc < 400; --} -- --/*=======================================================================*\ -- Function: is_error -- Purpose: return true if Error status code --\*=======================================================================*/ --function is_error ($sc) { -- return $sc >= 400 && $sc < 600; --} -- --/*=======================================================================*\ -- Function: is_client_error -- Purpose: return true if Error status code, and its a client error --\*=======================================================================*/ --function is_client_error ($sc) { -- return $sc >= 400 && $sc < 500; --} -- --/*=======================================================================*\ -- Function: is_client_error -- Purpose: return true if Error status code, and its a server error --\*=======================================================================*/ --function is_server_error ($sc) { -- return $sc >= 500 && $sc < 600; --} -- --?> -diff --git a/html/includes/rss/rss_parse.inc b/html/includes/rss/rss_parse.inc -deleted file mode 100644 -index 56d420f..0000000 ---- a/html/includes/rss/rss_parse.inc -+++ /dev/null -@@ -1,605 +0,0 @@ -- --* @version 0.7a --* @license GPL --* --*/ -- --define('RSS', 'RSS'); --define('ATOM', 'Atom'); -- --require_once (MAGPIE_DIR . 'rss_utils.inc'); -- --/** --* Hybrid parser, and object, takes RSS as a string and returns a simple object. --* --* see: rss_fetch.inc for a simpler interface with integrated caching support --* --*/ --class MagpieRSS { -- var $parser; -- -- var $current_item = array(); // item currently being parsed -- var $items = array(); // collection of parsed items -- var $channel = array(); // hash of channel fields -- var $textinput = array(); -- var $image = array(); -- var $feed_type; -- var $feed_version; -- var $encoding = ''; // output encoding of parsed rss -- -- var $_source_encoding = ''; // only set if we have to parse xml prolog -- -- var $ERROR = ""; -- var $WARNING = ""; -- -- // define some constants -- -- var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright'); -- var $_KNOWN_ENCODINGS = array('UTF-8', 'US-ASCII', 'ISO-8859-1'); -- -- // parser variables, useless if you're not a parser, treat as private -- var $stack = array(); // parser stack -- var $inchannel = false; -- var $initem = false; -- var $incontent = false; // if in Atom field -- var $intextinput = false; -- var $inimage = false; -- var $current_namespace = false; -- -- -- /** -- * Set up XML parser, parse source, and return populated RSS object.. -- * -- * @param string $source string containing the RSS to be parsed -- * -- * NOTE: Probably a good idea to leave the encoding options alone unless -- * you know what you're doing as PHP's character set support is -- * a little weird. -- * -- * NOTE: A lot of this is unnecessary but harmless with PHP5 -- * -- * -- * @param string $output_encoding output the parsed RSS in this character -- * set defaults to ISO-8859-1 as this is PHP's -- * default. -- * -- * NOTE: might be changed to UTF-8 in future -- * versions. -- * -- * @param string $input_encoding the character set of the incoming RSS source. -- * Leave blank and Magpie will try to figure it -- * out. -- * -- * -- * @param bool $detect_encoding if false Magpie won't attempt to detect -- * source encoding. (caveat emptor) -- * -- */ -- function MagpieRSS ($source, $output_encoding='ISO-8859-1', -- $input_encoding=null, $detect_encoding=true) -- { -- # if PHP xml isn't compiled in, die -- # -- if (!function_exists('xml_parser_create')) { -- $this->error( "Failed to load PHP's XML Extension. " . -- "http://www.php.net/manual/en/ref.xml.php", -- E_USER_ERROR ); -- } -- -- list($parser, $source) = $this->create_parser($source, -- $output_encoding, $input_encoding, $detect_encoding); -- -- -- if (!is_resource($parser)) { -- $this->error( "Failed to create an instance of PHP's XML parser. " . -- "http://www.php.net/manual/en/ref.xml.php", -- E_USER_ERROR ); -- } -- -- -- $this->parser = $parser; -- -- # pass in parser, and a reference to this object -- # setup handlers -- # -- xml_set_object( $this->parser, $this ); -- xml_set_element_handler($this->parser, -- 'feed_start_element', 'feed_end_element' ); -- -- xml_set_character_data_handler( $this->parser, 'feed_cdata' ); -- -- $status = xml_parse( $this->parser, $source ); -- -- if (! $status ) { -- $errorcode = xml_get_error_code( $this->parser ); -- if ( $errorcode != XML_ERROR_NONE ) { -- $xml_error = xml_error_string( $errorcode ); -- $error_line = xml_get_current_line_number($this->parser); -- $error_col = xml_get_current_column_number($this->parser); -- $errormsg = "$xml_error at line $error_line, column $error_col"; -- -- $this->error( $errormsg ); -- } -- } -- -- xml_parser_free( $this->parser ); -- -- $this->normalize(); -- } -- -- function feed_start_element($p, $element, &$attrs) { -- $el = $element = strtolower($element); -- $attrs = array_change_key_case($attrs, CASE_LOWER); -- -- // check for a namespace, and split if found -- $ns = false; -- if ( strpos( $element, ':' ) ) { -- list($ns, $el) = split( ':', $element, 2); -- } -- if ( $ns and $ns != 'rdf' ) { -- $this->current_namespace = $ns; -- } -- -- # if feed type isn't set, then this is first element of feed -- # identify feed from root element -- # -- if (!isset($this->feed_type) ) { -- if ( $el == 'rdf' ) { -- $this->feed_type = RSS; -- $this->feed_version = '1.0'; -- } -- elseif ( $el == 'rss' ) { -- $this->feed_type = RSS; -- $this->feed_version = $attrs['version']; -- } -- elseif ( $el == 'feed' ) { -- $this->feed_type = ATOM; -- $this->feed_version = $attrs['version']; -- $this->inchannel = true; -- } -- return; -- } -- -- if ( $el == 'channel' ) -- { -- $this->inchannel = true; -- } -- elseif ($el == 'item' or $el == 'entry' ) -- { -- $this->initem = true; -- if ( isset($attrs['rdf:about']) ) { -- $this->current_item['about'] = $attrs['rdf:about']; -- } -- } -- -- // if we're in the default namespace of an RSS feed, -- // record textinput or image fields -- elseif ( -- $this->feed_type == RSS and -- $this->current_namespace == '' and -- $el == 'textinput' ) -- { -- $this->intextinput = true; -- } -- -- elseif ( -- $this->feed_type == RSS and -- $this->current_namespace == '' and -- $el == 'image' ) -- { -- $this->inimage = true; -- } -- -- # handle atom content constructs -- elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) -- { -- // avoid clashing w/ RSS mod_content -- if ($el == 'content' ) { -- $el = 'atom_content'; -- } -- -- $this->incontent = $el; -- -- -- } -- -- // if inside an Atom content construct (e.g. content or summary) field treat tags as text -- elseif ($this->feed_type == ATOM and $this->incontent ) -- { -- // if tags are inlined, then flatten -- $attrs_str = join(' ', -- array_map('map_attrs', -- array_keys($attrs), -- array_values($attrs) ) ); -- -- $this->append_content( "<$element $attrs_str>" ); -- -- array_unshift( $this->stack, $el ); -- } -- -- // Atom support many links per containging element. -- // Magpie treats link elements of type rel='alternate' -- // as being equivalent to RSS's simple link element. -- // -- elseif ($this->feed_type == ATOM and $el == 'link' ) -- { -- if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) -- { -- $link_el = 'link'; -- } -- else { -- $link_el = 'link_' . $attrs['rel']; -- } -- -- $this->append($link_el, $attrs['href']); -- } -- // set stack[0] to current element -- else { -- array_unshift($this->stack, $el); -- } -- } -- -- -- -- function feed_cdata ($p, $text) { -- if ($this->feed_type == ATOM and $this->incontent) -- { -- $this->append_content( $text ); -- } -- else { -- $current_el = join('_', array_reverse($this->stack)); -- $this->append($current_el, $text); -- } -- } -- -- function feed_end_element ($p, $el) { -- $el = strtolower($el); -- -- if ( $el == 'item' or $el == 'entry' ) -- { -- $this->items[] = $this->current_item; -- $this->current_item = array(); -- $this->initem = false; -- } -- elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) -- { -- $this->intextinput = false; -- } -- elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) -- { -- $this->inimage = false; -- } -- elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) -- { -- $this->incontent = false; -- } -- elseif ($el == 'channel' or $el == 'feed' ) -- { -- $this->inchannel = false; -- } -- elseif ($this->feed_type == ATOM and $this->incontent ) { -- // balance tags properly -- // note: i don't think this is actually neccessary -- if ( $this->stack[0] == $el ) -- { -- $this->append_content(""); -- } -- else { -- $this->append_content("<$el />"); -- } -- -- array_shift( $this->stack ); -- } -- else { -- array_shift( $this->stack ); -- } -- -- $this->current_namespace = false; -- } -- -- function concat (&$str1, $str2="") { -- if (!isset($str1) ) { -- $str1=""; -- } -- $str1 .= $str2; -- } -- -- -- -- function append_content($text) { -- if ( $this->initem ) { -- $this->concat( $this->current_item[ $this->incontent ], $text ); -- } -- elseif ( $this->inchannel ) { -- $this->concat( $this->channel[ $this->incontent ], $text ); -- } -- } -- -- // smart append - field and namespace aware -- function append($el, $text) { -- if (!$el) { -- return; -- } -- if ( $this->current_namespace ) -- { -- if ( $this->initem ) { -- $this->concat( -- $this->current_item[ $this->current_namespace ][ $el ], $text); -- } -- elseif ($this->inchannel) { -- $this->concat( -- $this->channel[ $this->current_namespace][ $el ], $text ); -- } -- elseif ($this->intextinput) { -- $this->concat( -- $this->textinput[ $this->current_namespace][ $el ], $text ); -- } -- elseif ($this->inimage) { -- $this->concat( -- $this->image[ $this->current_namespace ][ $el ], $text ); -- } -- } -- else { -- if ( $this->initem ) { -- $this->concat( -- $this->current_item[ $el ], $text); -- } -- elseif ($this->intextinput) { -- $this->concat( -- $this->textinput[ $el ], $text ); -- } -- elseif ($this->inimage) { -- $this->concat( -- $this->image[ $el ], $text ); -- } -- elseif ($this->inchannel) { -- $this->concat( -- $this->channel[ $el ], $text ); -- } -- -- } -- } -- -- function normalize () { -- // if atom populate rss fields -- if ( $this->is_atom() ) { -- $this->channel['description'] = $this->channel['tagline']; -- for ( $i = 0; $i < count($this->items); $i++) { -- $item = $this->items[$i]; -- if ( isset($item['summary']) ) -- $item['description'] = $item['summary']; -- if ( isset($item['atom_content'])) -- $item['content']['encoded'] = $item['atom_content']; -- -- $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified']; -- if ( $atom_date ) { -- $epoch = @parse_w3cdtf($atom_date); -- if ($epoch and $epoch > 0) { -- $item['date_timestamp'] = $epoch; -- } -- } -- -- $this->items[$i] = $item; -- } -- } -- elseif ( $this->is_rss() ) { -- $this->channel['tagline'] = $this->channel['description']; -- for ( $i = 0; $i < count($this->items); $i++) { -- $item = $this->items[$i]; -- if ( isset($item['description'])) -- $item['summary'] = $item['description']; -- if ( isset($item['content']['encoded'] ) ) -- $item['atom_content'] = $item['content']['encoded']; -- -- if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) { -- $epoch = @parse_w3cdtf($item['dc']['date']); -- if ($epoch and $epoch > 0) { -- $item['date_timestamp'] = $epoch; -- } -- } -- elseif ( isset($item['pubdate']) ) { -- $epoch = @strtotime($item['pubdate']); -- if ($epoch > 0) { -- $item['date_timestamp'] = $epoch; -- } -- } -- -- $this->items[$i] = $item; -- } -- } -- } -- -- -- function is_rss () { -- if ( $this->feed_type == RSS ) { -- return $this->feed_version; -- } -- else { -- return false; -- } -- } -- -- function is_atom() { -- if ( $this->feed_type == ATOM ) { -- return $this->feed_version; -- } -- else { -- return false; -- } -- } -- -- /** -- * return XML parser, and possibly re-encoded source -- * -- */ -- function create_parser($source, $out_enc, $in_enc, $detect) { -- if ( substr(phpversion(),0,1) == 5) { -- $parser = $this->php5_create_parser($in_enc, $detect); -- } -- else { -- list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect); -- } -- if ($out_enc) { -- $this->encoding = $out_enc; -- xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $out_enc); -- } -- -- return array($parser, $source); -- } -- -- /** -- * Instantiate an XML parser under PHP5 -- * -- * PHP5 will do a fine job of detecting input encoding -- * if passed an empty string as the encoding. -- * -- * All hail libxml2! -- * -- */ -- function php5_create_parser($in_enc, $detect) { -- // by default php5 does a fine job of detecting input encodings -- if(!$detect && $in_enc) { -- return xml_parser_create($in_enc); -- } -- else { -- return xml_parser_create(''); -- } -- } -- -- /** -- * Instaniate an XML parser under PHP4 -- * -- * Unfortunately PHP4's support for character encodings -- * and especially XML and character encodings sucks. As -- * long as the documents you parse only contain characters -- * from the ISO-8859-1 character set (a superset of ASCII, -- * and a subset of UTF-8) you're fine. However once you -- * step out of that comfy little world things get mad, bad, -- * and dangerous to know. -- * -- * The following code is based on SJM's work with FoF -- * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss -- * -- */ -- function php4_create_parser($source, $in_enc, $detect) { -- if ( !$detect ) { -- return array(xml_parser_create($in_enc), $source); -- } -- -- if (!$in_enc) { -- if (preg_match('//m', $source, $m)) { -- $in_enc = strtoupper($m[1]); -- $this->source_encoding = $in_enc; -- } -- else { -- $in_enc = 'UTF-8'; -- } -- } -- -- if ($this->known_encoding($in_enc)) { -- return array(xml_parser_create($in_enc), $source); -- } -- -- // the dectected encoding is not one of the simple encodings PHP knows -- -- // attempt to use the iconv extension to -- // cast the XML to a known encoding -- // @see http://php.net/iconv -- -- if (function_exists('iconv')) { -- $encoded_source = iconv($in_enc,'UTF-8', $source); -- if ($encoded_source) { -- return array(xml_parser_create('UTF-8'), $encoded_source); -- } -- } -- -- // iconv didn't work, try mb_convert_encoding -- // @see http://php.net/mbstring -- if(function_exists('mb_convert_encoding')) { -- $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc ); -- if ($encoded_source) { -- return array(xml_parser_create('UTF-8'), $encoded_source); -- } -- } -- -- // else -- $this->error("Feed is in an unsupported character encoding. ($in_enc) " . -- "You may see strange artifacts, and mangled characters.", -- E_USER_NOTICE); -- -- return array(xml_parser_create(), $source); -- } -- -- function known_encoding($enc) { -- $enc = strtoupper($enc); -- if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) { -- return $enc; -- } -- else { -- return false; -- } -- } -- -- function error ($errormsg, $lvl=E_USER_WARNING) { -- // append PHP's error message if track_errors enabled -- if ( isset($php_errormsg) ) { -- $errormsg .= " ($php_errormsg)"; -- } -- if ( MAGPIE_DEBUG ) { -- trigger_error( $errormsg, $lvl); -- } -- else { -- error_log( $errormsg, 0); -- } -- -- $notices = E_USER_NOTICE|E_NOTICE; -- if ( $lvl&$notices ) { -- $this->WARNING = $errormsg; -- } else { -- $this->ERROR = $errormsg; -- } -- } -- -- --} // end class RSS -- --function map_attrs($k, $v) { -- return "$k=\"$v\""; --} -- --// patch to support medieval versions of PHP4.1.x, --// courtesy, Ryan Currie, ryan@digibliss.com -- --if (!function_exists('array_change_key_case')) { -- define("CASE_UPPER",1); -- define("CASE_LOWER",0); -- -- -- function array_change_key_case($array,$case=CASE_LOWER) { -- if ($case=CASE_LOWER) $cmd=strtolower; -- elseif ($case=CASE_UPPER) $cmd=strtoupper; -- foreach($array as $key=>$value) { -- $output[$cmd($key)]=$value; -- } -- return $output; -- } -- --} -- --?> -diff --git a/html/includes/rss/rss_utils.inc b/html/includes/rss/rss_utils.inc -deleted file mode 100644 -index 2a29e72..0000000 ---- a/html/includes/rss/rss_utils.inc -+++ /dev/null -@@ -1,67 +0,0 @@ -- -- * Version: 0.51 -- * License: GPL -- * -- * The lastest version of MagpieRSS can be obtained from: -- * http://magpierss.sourceforge.net -- * -- * For questions, help, comments, discussion, etc., please join the -- * Magpie mailing list: -- * magpierss-general@lists.sourceforge.net -- */ -- -- --/*======================================================================*\ -- Function: parse_w3cdtf -- Purpose: parse a W3CDTF date into unix epoch -- -- NOTE: http://www.w3.org/TR/NOTE-datetime --\*======================================================================*/ -- --function parse_w3cdtf ( $date_str ) { -- -- # regex to match wc3dtf -- $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/"; -- -- if ( preg_match( $pat, $date_str, $match ) ) { -- list( $year, $month, $day, $hours, $minutes, $seconds) = -- array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]); -- -- # calc epoch for current date assuming GMT -- $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year); -- -- $offset = 0; -- if ( $match[10] == 'Z' ) { -- # zulu time, aka GMT -- } -- else { -- list( $tz_mod, $tz_hour, $tz_min ) = -- array( $match[8], $match[9], $match[10]); -- -- # zero out the variables -- if ( ! $tz_hour ) { $tz_hour = 0; } -- if ( ! $tz_min ) { $tz_min = 0; } -- -- $offset_secs = (($tz_hour*60)+$tz_min)*60; -- -- # is timezone ahead of GMT? then subtract offset -- # -- if ( $tz_mod == '+' ) { -- $offset_secs = $offset_secs * -1; -- } -- -- $offset = $offset_secs; -- } -- $epoch = $epoch + $offset; -- return $epoch; -- } -- else { -- return -1; -- } --} -- --?> -diff --git a/html/includes/rss/scripts/README b/html/includes/rss/scripts/README -deleted file mode 100644 -index e37afe5..0000000 ---- a/html/includes/rss/scripts/README -+++ /dev/null -@@ -1,27 +0,0 @@ --Some example on how to use Magpie: -- --* magpie_simple.php * -- Simple example of fetching and parsing an RSS file. Expects to be -- called with a query param 'rss_url=http://' -- --* simple_smarty.php * -- Similiar to magpie_simple, but using the Smarty template engine to do -- display. Also demostrates using rss_utils.inc and a smarty plugin to -- parse and display when each RSS item was published. -- --* magpie_debug.php * -- Displays all the information available from a parsed feed. -- --* smarty_plugin/modifier.rss_date_parse.php * -- -- A Smarty plugin for parsing RSS style dates. You must include rss_utils.inc -- for this plugin to work. It also must be installed in the Smarty plugin -- directory, see the Smarty docs for details. -- --* templates/simple.smarty -- A Smarty template used by simple_smarty.php which demostrates -- displaying an RSS feed and using the date parse plugin. -- -- --The Smarty template engine and documentation on how to use it are available from --http://smarty.php.net -diff --git a/html/includes/rss/scripts/magpie_debug.php b/html/includes/rss/scripts/magpie_debug.php -deleted file mode 100644 -index 84549db..0000000 ---- a/html/includes/rss/scripts/magpie_debug.php -+++ /dev/null -@@ -1,80 +0,0 @@ --Example Output"; -- echo "Channel: " . $rss->channel['title'] . "

"; -- echo "

    "; -- foreach ($rss->items as $item) { -- $href = $item['link']; -- $title = $item['title']; -- echo "
  • $title
    • "; -- } -- echo "
"; --} --else { -- echo "Error: " . magpie_error(); --} --?> -- --
-- RSS URL:
-- --
-- --

Parsed Results (var_dump'ed)

--
--
--
-- --Error: PHP compiled without XML support (--with-xml), Mapgie won't work without PHP support for XML.
\n"; -- exit; -- } -- else { -- echo "OK: Found an XML parser.
\n"; -- } -- -- if ( ! function_exists('gzinflate') ) { -- echo "Warning: PHP compiled without Zlib support (--with-zlib). No support for GZIP encoding.
\n"; -- } -- else { -- echo "OK: Support for GZIP encoding.
\n"; -- } -- -- if ( ! (function_exists('iconv') and function_exists('mb_convert_encoding') ) ) { -- echo "Warning: No support for iconv (--with-iconv) or multi-byte strings (--enable-mbstring)." . -- "No support character set munging.
\n"; -- } -- else { -- echo "OK: Support for character munging.
\n"; -- } --} -- --?> -diff --git a/html/includes/rss/scripts/magpie_simple.php b/html/includes/rss/scripts/magpie_simple.php -deleted file mode 100644 -index 282735e..0000000 ---- a/html/includes/rss/scripts/magpie_simple.php -+++ /dev/null -@@ -1,29 +0,0 @@ --channel['title'] . "

"; -- echo "

    "; -- foreach ($rss->items as $item) { -- $href = $item['link']; -- $title = $item['title']; -- echo "
  • $title
    • "; -- } -- echo "
"; --} --?> -- --
-- RSS URL:
-- --
-- --

--

Security Note:

--This is a simple example script. If this was a real script we probably wouldn't allow strangers to submit random URLs, and we certainly wouldn't simply echo anything passed in the URL. Additionally its a bad idea to leave this example script lying around. --

-\ No newline at end of file -diff --git a/html/includes/rss/scripts/magpie_slashbox.php b/html/includes/rss/scripts/magpie_slashbox.php -deleted file mode 100644 -index bbef30b..0000000 ---- a/html/includes/rss/scripts/magpie_slashbox.php -+++ /dev/null -@@ -1,66 +0,0 @@ -- -- -- -- --
-- --
-- --"; -- $rss = fetch_rss( $url ); -- echo slashbox ($rss); --} -- --echo "
";
--print_r($rss);
--echo "
"; --?> -- -- -- -- --"; -- echo ""; -- -- # get the channel title and link properties off of the rss object -- # -- $title = $rss->channel['title']; -- $link = $rss->channel['link']; -- -- echo "$title"; -- echo ""; -- -- # foreach over each item in the array. -- # displaying simple links -- # -- # we could be doing all sorts of neat things with the dublin core -- # info, or the event info, or what not, but keeping it simple for now. -- # -- foreach ($rss->items as $item ) { -- echo ""; -- echo ""; -- echo $item['title']; -- echo ""; -- } -- -- echo ""; --} -- --?> -diff --git a/html/includes/rss/scripts/simple_smarty.php b/html/includes/rss/scripts/simple_smarty.php -deleted file mode 100644 -index a904d88..0000000 ---- a/html/includes/rss/scripts/simple_smarty.php -+++ /dev/null -@@ -1,58 +0,0 @@ --compile_check = true; -- --// url of an rss file --$url = $_GET['rss_url']; -- -- --if ( $url ) { -- // assign a variable to smarty for use in the template -- $smarty->assign('rss_url', $url); -- -- // use MagpieRSS to fetch remote RSS file, and parse it -- $rss = fetch_rss( $url ); -- -- // if fetch_rss returned false, we encountered an error -- if ( !$rss ) { -- $smarty->assign( 'error', magpie_error() ); -- } -- $smarty->assign('rss', $rss ); -- -- $item = $rss->items[0]; -- $date = parse_w3cdtf( $item['dc']['date'] ); -- $smarty->assign( 'date', $date ); --} -- --// parse smarty template, and display using the variables we assigned --$smarty->display('simple.smarty'); -- --?> -diff --git a/html/includes/rss/scripts/smarty_plugin/modifier.rss_date_parse.php b/html/includes/rss/scripts/smarty_plugin/modifier.rss_date_parse.php -deleted file mode 100644 -index 593270e..0000000 ---- a/html/includes/rss/scripts/smarty_plugin/modifier.rss_date_parse.php -+++ /dev/null -@@ -1,31 +0,0 @@ -- -diff --git a/html/includes/rss/scripts/templates/simple.smarty b/html/includes/rss/scripts/templates/simple.smarty -deleted file mode 100644 -index c0761cf..0000000 ---- a/html/includes/rss/scripts/templates/simple.smarty -+++ /dev/null -@@ -1,46 +0,0 @@ -- -- --A Simple RSS Box: I'm not a designer -- -- -- --
--RSS File: -- -- --
-- --Displaying: {$rss_url} --

-- --{* if $error display the error -- elseif parsed RSS object display the RSS -- else solicit user for a URL --*} -- --{if $error } --Error: {$error} --{elseif $rss} -- -- -- -- -- {foreach from=$rss->items item=item} -- -- -- -- -- {/foreach} --
-- {$rss->channel.title} --
-- {$item.title} -- -- {$item.dc.date|rss_date_parse|date_format:"%A, %B %e, %Y"} --
--{else} -- Enter the URL of an RSS file to display. --{/if} -- -- -- -diff --git a/html/includes/utils.inc.php b/html/includes/utils.inc.php -index 1fbd948..0a9a1d9 100644 ---- a/html/includes/utils.inc.php -+++ b/html/includes/utils.inc.php -@@ -3,120 +3,6 @@ - - require_once(dirname(__FILE__).'/../config.inc.php'); - --function get_update_information(){ -- global $cfg; -- -- // initialize array -- $updateinfo=array( -- "found_update_info" => false, -- "update_checks_enabled" => true, -- "last_update_check" => "", -- "update_available" => false, -- "update_version" => "", -- ); -- -- // first read CGI config file to determine main file location -- $ccfc=read_cgi_config_file(); -- //print_r($ccfc); -- -- // read main config file to determine file locations -- if(isset($ccf['main_config_file'])) -- $mcf=$ccf['main_config_file']; -- else -- $mcf=""; -- $mcfc=read_main_config_file($mcf); -- //print_r($mcfc); -- -- if(isset($mcf['status_file'])) -- $sf=$mcf['status_file']; -- else -- $sf=""; -- -- if(isset($mcf['state_retention_file'])) -- $rf=$mcf['state_retention_file']; -- else -- $rf=""; -- -- -- /////////////////////////////////////////////// -- // GET PROGRAM VARIABLES FROM MAIN CONFIG FILE -- /////////////////////////////////////////////// -- -- // are update checks enabled? -- if(isset($mcfc['check_for_updates']) && $mcfc['check_for_updates']=="0") -- $updateinfo["update_checks_enabled"]=false; -- -- -- ///////////////////////////////////////// -- // DETERMINE UPDATE INFO FROM STATUS FILE -- ///////////////////////////////////////// -- -- // read status file (just first few lines) -- $sfc=read_status_file($sf,50); -- //print_r($sfc); -- //exit(); -- -- // last update time -- if(isset($sfc['info']['last_update_check'])){ -- $updateinfo["last_update_check"]=$sfc['info']['last_update_check']; -- $updateinfo["found_update_info"]=true; -- } -- -- // update available -- if(isset($sfc['info']['update_available'])){ -- if($sfc['info']['update_available']=="1") -- $updateinfo["update_available"]=true; -- else -- $updateinfo["update_available"]=false; -- } -- -- // update version -- if(isset($sfc['info']['new_version'])){ -- $updateinfo["update_version"]=$sfc['info']['new_version']; -- } -- -- // did we find update information in the status file? if so, we're done -- if($updateinfo["found_update_info"]==true) -- return $updateinfo; -- -- -- //////////////////////////////////////////// -- // DETERMINE UPDATE INFO FROM RETENTION FILE -- //////////////////////////////////////////// -- -- // Nagios might be shutdown (ie, no status file), so try and read data from the retention file -- -- // read retentiion file (just first few lines) -- $rfc=read_retention_file($rf,50); -- //print_r($rfc); -- //exit(); -- -- // last update time -- if(isset($rfc['info']['last_update_check'])){ -- $updateinfo["last_update_check"]=$rfc['info']['last_update_check']; -- $updateinfo["found_update_info"]=true; -- } -- -- // update available -- if(isset($rfc['info']['update_available'])){ -- if($rfc['info']['update_available']=="1") -- $updateinfo["update_available"]=true; -- else -- $updateinfo["update_available"]=false; -- } -- -- // update version -- if(isset($rfc['info']['new_version'])){ -- $updateinfo["update_version"]=$rfc['info']['new_version']; -- } -- -- -- return $updateinfo; -- } -- -- -- -- - //////////////////////////////////////////////////////////////////////////////////////////////// - // FILE PROCESSING FUNCTIONS - //////////////////////////////////////////////////////////////////////////////////////////////// -@@ -470,4 +356,4 @@ function read_retention_file($thefile="",$maxlines=0){ - return $contents; - } - --?> -\ No newline at end of file -+?> -diff --git a/html/main.php b/html/main.php -index a3bff3c..607a023 100644 ---- a/html/main.php -+++ b/html/main.php -@@ -13,17 +13,6 @@ $this_version="3.4.1"; - Nagios Core - - -- -- -- - - - -@@ -44,34 +33,6 @@ $this_version="3.4.1"; - - - -- --

-- --
--
Warning: Automatic Update Checks are Disabled!
--
Disabling update checks presents a possible security risk. Visit nagios.org to check for updates manually or enable update checks in your Nagios config file.
--
-- --
--
A new version of Nagios Core is available!
--
Visit nagios.org to download Nagios .
--
-- --
-- -- -- -
-
-
-@@ -87,12 +48,6 @@ $this_version="3.4.1"; - -
- -- --
--

Don't Miss...

--
--
-- -
- -
-@@ -110,11 +65,6 @@ $this_version="3.4.1"; - -
- -- --
--

Latest News

--
--
-
- - -diff --git a/html/rss-corefeed.php b/html/rss-corefeed.php -deleted file mode 100644 -index fbf8215..0000000 ---- a/html/rss-corefeed.php -+++ /dev/null -@@ -1,50 +0,0 @@ --"; -- -- foreach ($rss->items as $item){ -- $x++; -- if($x>3) -- break; -- //$href = $item['link']; -- //$title = $item['title']; -- $desc = $item['description']; -- $html .="
  • {$item['description']}
    • "; -- } -- $html .=""; -- -- print $html; -- } -- else{ -- $html = " -- An error occurred while trying to fetch the Nagios Core feed. Stay on top of what's happening by visiting http://www.nagios.org/. -- "; -- print $html; -- } -- } -- -- --?> -\ No newline at end of file -diff --git a/html/rss-newsfeed.php b/html/rss-newsfeed.php -deleted file mode 100644 -index 52d7901..0000000 ---- a/html/rss-newsfeed.php -+++ /dev/null -@@ -1,48 +0,0 @@ --\n"; -- -- foreach ($rss->items as $item){ -- $x++; -- if($x>3) -- break; -- $href = $item['link']; -- $title = $item['title']; -- $html .="
  • $title
    • "; -- } -- $html .=' --
  • More news...
    • -- '; -- -- print $html; -- } -- else{ -- $html = " -- An error occurred while trying to fetch the latest Nagios news. Stay on top of what's happening by visiting http://www.nagios.org/news. -- "; -- print $html; -- } -- } -- -- --?> -\ No newline at end of file diff --git a/debian/patches/99_fix_php_warning.patch b/debian/patches/99_fix_php_warning.patch deleted file mode 100644 index 2f4b508..0000000 --- a/debian/patches/99_fix_php_warning.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Alexander Wirt -Description: No description. ---- a/html/index.php -+++ b/html/index.php -@@ -8,6 +8,7 @@ - - - -Description: Stop cgi-bin/status.c from listing unauthorized hosts and - services in servicegroup view -Upstream bugreport: http://tracker.nagios.org/view.php?id=456 ---- a/cgi/status.c -+++ b/cgi/status.c -@@ -2547,6 +2547,10 @@ - if(temp_host == NULL) - continue; - -+ /* make sure user has rights to view this host */ -+ if(is_authorized_for_host(temp_host, ¤t_authdata) == FALSE) -+ continue; -+ - /* skip this if it isn't a new host... */ - if(temp_host == last_host) - continue; -@@ -2752,6 +2756,10 @@ - if(temp_host == NULL) - continue; - -+ /* make sure user has rights to view this host */ -+ if(is_authorized_for_host(temp_host, ¤t_authdata) == FALSE) -+ continue; -+ - /* skip this if it isn't a new host... */ - if(temp_host == last_host) - continue; -@@ -2936,6 +2944,10 @@ - if(temp_service == last_service) - continue; - -+ /* make sure user has rights to view this service */ -+ if(is_authorized_for_service(temp_service, ¤t_authdata) == FALSE) -+ continue; -+ - /* find the service status */ - temp_servicestatus = find_servicestatus(temp_service->host_name, temp_service->description); - if(temp_servicestatus == NULL) -@@ -3290,6 +3302,10 @@ - if(temp_host == NULL) - continue; - -+ /* make sure user has rights to view this host */ -+ if(is_authorized_for_host(temp_host, ¤t_authdata) == FALSE) -+ continue; -+ - /* get the status of the host */ - temp_hoststatus = find_hoststatus(temp_host->name); - if(temp_hoststatus == NULL) diff --git a/debian/patches/remove_javascript b/debian/patches/remove_javascript deleted file mode 100644 index 8808584..0000000 --- a/debian/patches/remove_javascript +++ /dev/null @@ -1,19 +0,0 @@ ---- a/html/Makefile.in -+++ b/html/Makefile.in -@@ -26,7 +26,6 @@ - rm -f docs/*~ - rm -f docs/images/*.jbf - rm -f stylesheets/*~ -- rm -f js/*~ - - distclean: clean - rm -f Makefile config.inc.php -@@ -61,8 +60,6 @@ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done - for file in contexthelp/*.html; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done -- for file in js/*.js; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done - # for file in docs/*.html; \ - # do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done - # for file in docs/images/*.*; \ diff --git a/debian/patches/series b/debian/patches/series index 4f4fe8f..08791fa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,6 @@ -remove_javascript -10_p1_pl_shebang.patch 40_fix_spurious_dollar_signs_added_to_command_lines.patch 50_cgi.cfg-debianize.patch 51_commands.cfg-debianize.patch 52_nagios.cfg-debianize.patch 55_strip_logarchivepath.patch -60_fix_p1.pl_patch_mini_epn.patch 70_fix_eventhandler_paths.patch -80_dont_call_home.patch -99_fix_php_warning.patch diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in index 34b73a3..2afed84 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] nagios3-cgi.templates +[type: gettext/rfc822deb] nagios4-cgi.templates diff --git a/debian/po/cs.po b/debian/po/cs.po index b6985c2..f467f32 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: nagios3 2.4-1\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4 2.4-1\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2006-08-13 17:01+0200\n" "Last-Translator: Martin Sin \n" @@ -18,13 +18,13 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Heslo webové administrace Nagios:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "" @@ -32,7 +32,7 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -44,36 +44,36 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Potvrzení hesla:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Hesla nesouhlasí" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Servery Apache pro nastavení s nagios3:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Servery Apache pro nastavení s nagios4:" -#~ msgid "Please select which apache servers should be configured for nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." #~ msgstr "" -#~ "Vyberte prosím, které servery apache nastavit pro použití s nagios3." +#~ "Vyberte prosím, které servery apache nastavit pro použití s nagios4." #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " #~ "unselected." #~ msgstr "Pokud dáváte přednost ruční konfiguraci, nevybírejte žádné servery." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Povolit podporu odkazů nagios 1.x v nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Povolit podporu odkazů nagios 1.x v nagios4?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Vyberte si prosím, zda má konfigurace Apache pro nagios3 poskytovat " +#~ "Vyberte si prosím, zda má konfigurace Apache pro nagios4 poskytovat " #~ "kompatibilitu s odkazy z nagios 1.x." #~ msgid "" diff --git a/debian/po/da.po b/debian/po/da.po index 920ab52..a23aec6 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -1,12 +1,12 @@ -# Danish translation nagios3. -# Copyright (C) 2010 nagios3 og nedenstående oversættere. -# This file is distributed under the same license as nagios3 package. +# Danish translation nagios4. +# Copyright (C) 2010 nagios4 og nedenstående oversættere. +# This file is distributed under the same license as nagios4 package. # Joe Hansen , 2010. # msgid "" msgstr "" -"Project-Id-Version: nagios3\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2010-11-30 17:30+01:00\n" "Last-Translator: Joe Hansen \n" @@ -18,13 +18,13 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Adgangskode for Nagios' internetadministration:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "" @@ -32,7 +32,7 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -44,22 +44,22 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Bekræftelse af adgangskode:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Adgangskoderne er ikke ens" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Apacheservere at konfigurere for nagios3:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Apacheservere at konfigurere for nagios4:" -#~ msgid "Please select which apache servers should be configured for nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." #~ msgstr "" -#~ "Vælg venligst hvilke apacheservere der skal konfigureres for nagios3." +#~ "Vælg venligst hvilke apacheservere der skal konfigureres for nagios4." #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " @@ -67,14 +67,14 @@ msgstr "Adgangskoderne er ikke ens" #~ msgstr "" #~ "Hvis du ønsker at udføre konfigurationen manuelt, så vælg ingen servere." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Aktiver understøttelse for nagios 1.x-henvisninger i nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Aktiver understøttelse for nagios 1.x-henvisninger i nagios4?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Vælg venligst hvorvidt Apachekonfigurationen for nagios3 skal tilbyde " +#~ "Vælg venligst hvorvidt Apachekonfigurationen for nagios4 skal tilbyde " #~ "kompatibilitet med henvisninger fra nagios 1.x." #~ msgid "" diff --git a/debian/po/de.po b/debian/po/de.po index 9663496..b5c9de3 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,12 +1,12 @@ # translation of po-debconf template to German # Copyright (C) 2006, Matthias Julius -# This file is distributed under the same license as the nagios3 package. +# This file is distributed under the same license as the nagios4 package. # # Matthias Julius , 2006. msgid "" msgstr "" -"Project-Id-Version: nagios3 2.5-3\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4 2.5-3\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2006-11-27 22:53-0500\n" "Last-Translator: Matthias Julius \n" @@ -19,13 +19,13 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Passwort für die Web-Administration von nagios:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "" @@ -34,7 +34,7 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -47,22 +47,22 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Passwortbestätigung:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Die Passwörter stimmen nicht überein." -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Für nagios3 einzurichtende Apache-Server:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Für nagios4 einzurichtende Apache-Server:" -#~ msgid "Please select which apache servers should be configured for nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." #~ msgstr "" -#~ "Bitte wählen Sie, welche Apache-Server für nagios3 eingerichtet werden " +#~ "Bitte wählen Sie, welche Apache-Server für nagios4 eingerichtet werden " #~ "sollen." #~ msgid "" @@ -72,14 +72,14 @@ msgstr "Die Passwörter stimmen nicht überein." #~ "Falls Sie es vorziehen, die Einrichtung manuell durchzuführen, lassen Sie " #~ "alle Server deselektiert." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Unterstützung für nagios-1.x-Links in nagios3 freischalten?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Unterstützung für nagios-1.x-Links in nagios4 freischalten?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Bitte wählen Sie, ob die Apache-Konfiguration für nagios3 Kompatibilität " +#~ "Bitte wählen Sie, ob die Apache-Konfiguration für nagios4 Kompatibilität " #~ "mit Links von nagios 1.x zur Verfügung stellen soll." #~ msgid "" diff --git a/debian/po/es.po b/debian/po/es.po index 56eeec7..349d91c 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -1,6 +1,6 @@ -# nagios3 po-debconf translation to spanish +# nagios4 po-debconf translation to spanish # Copyright (C) 2004 Software in the Public Interest -# This file is distributed under the same license as the nagios3 package. +# This file is distributed under the same license as the nagios4 package. # # Changes: # - Initial translation @@ -27,8 +27,8 @@ # msgid "" msgstr "" -"Project-Id-Version: nagios3 2.5\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4 2.5\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2006-10-23 23:28-0500\n" "Last-Translator: Rudy Godoy \n" @@ -41,13 +41,13 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Clave de administración web de Nagios" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "" @@ -55,7 +55,7 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -69,23 +69,23 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Confirmar clave:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Las contraseñas no coinciden" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Servidores apache que se deberían configurar para nagios3:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Servidores apache que se deberían configurar para nagios4:" -#~ msgid "Please select which apache servers should be configured for nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." #~ msgstr "" #~ "Por favor, seleccione los servidores apache que se deberían configurar " -#~ "para nagios3." +#~ "para nagios4." #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " @@ -94,14 +94,14 @@ msgstr "Las contraseñas no coinciden" #~ "No elija ningún servidor si prefiere realizar la configuración de forma " #~ "manual." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "¿Desea activar el soporte para enlaces de nagios 1.x en nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "¿Desea activar el soporte para enlaces de nagios 1.x en nagios4?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Indique si la configuración de apache para nagios3 debería ser " +#~ "Indique si la configuración de apache para nagios4 debería ser " #~ "compatible\n" #~ "con enlaces de nagios 1.x." diff --git a/debian/po/eu.po b/debian/po/eu.po index c002e33..981c458 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -1,12 +1,12 @@ -# translation of nagios3-eu.po to Euskara +# translation of nagios4-eu.po to Euskara # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Piarres Beobide , 2008. msgid "" msgstr "" -"Project-Id-Version: nagios3-eu\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4-eu\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2008-09-16 10:46+0200\n" "Last-Translator: Piarres Beobide \n" @@ -19,20 +19,20 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Nagios web kudeatzaile pasahitza:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "Mesedez ezarri \"nagiosadmin\" erabiltzailearen pasahitza." #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -44,22 +44,22 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Pasahitz berrespena:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Pasahitzak ez datoz bat" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Nagios3-rako konfiguratu behar diren apache zerbitzariak:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "nagios4-rako konfiguratu behar diren apache zerbitzariak:" -#~ msgid "Please select which apache servers should be configured for nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." #~ msgstr "" -#~ "Mesedez hautatu zein apache zerbitzari konfiguratu behar dira nagios3-" +#~ "Mesedez hautatu zein apache zerbitzari konfiguratu behar dira nagios4-" #~ "rako.apache konfiguratuta errepikatu arte." #~ msgid "" @@ -69,14 +69,14 @@ msgstr "Pasahitzak ez datoz bat" #~ "Eskuzko instalazio bat egitea nahigo baduzu, utzi zerbitzari guztiak " #~ "hautatu gabe." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Nagios 1.x loturako gaitu nagios3-an?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Nagios 1.x loturako gaitu nagios4-an?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Mesedez hautatu Apache zerbitzariko nagios3 konfigurazioak nagios 1.x " +#~ "Mesedez hautatu Apache zerbitzariko nagios4 konfigurazioak nagios 1.x " #~ "bertsioko loturekin bateragarritasuna mantendu behar duen ala ez." #~ msgid "" diff --git a/debian/po/fi.po b/debian/po/fi.po index f4c05fe..3ff3270 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" -"Project-Id-Version: nagios3\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: \n" "Last-Translator: Esko Arajärvi \n" @@ -15,20 +15,20 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Nagios-verkkoylläpidon salasana:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "Anna salasana käyttäjätunnukselle ”nagiosadmin”." #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -40,22 +40,22 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Salasanan vahvistus:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Salasanat eivät täsmää." -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Apache-palvelimet, joiden asetuksia muokataan nagios3:a varten:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Apache-palvelimet, joiden asetuksia muokataan nagios4:a varten:" -#~ msgid "Please select which apache servers should be configured for nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." #~ msgstr "" -#~ "Valitse minkä Apache-palvelimien asetuksia tulisi muokata nagios3:n " +#~ "Valitse minkä Apache-palvelimien asetuksia tulisi muokata nagios4:n " #~ "käyttöönottamiseksi." #~ msgid "" @@ -63,14 +63,14 @@ msgstr "Salasanat eivät täsmää." #~ "unselected." #~ msgstr "Jos haluat tehdä asetukset käsin, älä valitse mitään palvelinta." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Otetaanko nagiosin version 1.x linkkien tuki käyttöön nagios3:ssa?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Otetaanko nagiosin version 1.x linkkien tuki käyttöön nagios4:ssa?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Valitse tulisiko nagios3:n Apache-asetusten olla yhteensopivia nagios 1.x:" +#~ "Valitse tulisiko nagios4:n Apache-asetusten olla yhteensopivia nagios 1.x:" #~ "n linkkien kanssa." #~ msgid "" diff --git a/debian/po/fr.po b/debian/po/fr.po index 4f0ddd6..5811a6c 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -1,12 +1,12 @@ -# Nagios3 +# nagios4 # Copyright (C) 2006 -# This file is distributed under the same license as the Nagios3 package. +# This file is distributed under the same license as the nagios4 package. # Sean Finney, Marc Haber et Joerg Jasper , 2006 # msgid "" msgstr "" -"Project-Id-Version: nagios3_2.4-1\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4_2.4-1\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2006-06-07 10:58+0100\n" "Last-Translator: Steve Petruzzello \n" @@ -21,13 +21,13 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Mot de passe pour l'administration web de Nagios:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "" @@ -36,7 +36,7 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -49,21 +49,21 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Confirmation du mot de passe:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Mots de passe diffrents" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Serveurs Apache configurer pour Nagios3:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Serveurs Apache configurer pour nagios4:" -#~ msgid "Please select which apache servers should be configured for nagios3." -#~ msgstr "Veuillez choisir le(s) serveur(s) web configurer pour Nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." +#~ msgstr "Veuillez choisir le(s) serveur(s) web configurer pour nagios4." #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " @@ -72,14 +72,14 @@ msgstr "Mots de passe diff #~ "Si vous prfrez configurer vous-mme ce paquet, ne slectionnez aucun " #~ "serveur." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Faut-il activer la gestion des liens de Nagios1.x pour Nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Faut-il activer la gestion des liens de Nagios1.x pour nagios4?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Veuillez choisir si la configuration d'Apache pour Nagios3 doit permettre " +#~ "Veuillez choisir si la configuration d'Apache pour nagios4 doit permettre " #~ "la compatibilit avec les liens de Nagios1.x." #~ msgid "" diff --git a/debian/po/it.po b/debian/po/it.po index 624bf8a..f2dc37c 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,12 +1,12 @@ -# Italian (it) translation of debconf templates for nagios3 +# Italian (it) translation of debconf templates for nagios4 # Copyright (C) 2008 Software in the Public Interest -# This file is distributed under the same license as the nagios3 package. +# This file is distributed under the same license as the nagios4 package. # Luca Monducci , 2008. # msgid "" msgstr "" -"Project-Id-Version: nagios3 3.0.3\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4 3.0.3\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2008-11-15 21:02+0100\n" "Last-Translator: Luca Monducci \n" @@ -18,20 +18,20 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Password per l'amministrazione di nagios da web:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "Inserire la password da associare all'utente \"nagiosadmin\"." #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -43,22 +43,22 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Conferma della password:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Le password non coincidono" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Server Apache da configurare per nagios3:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Server Apache da configurare per nagios4:" -#~ msgid "Please select which apache servers should be configured for nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." #~ msgstr "" -#~ "Selezionare quali server Apache devono essere configurati per nagios3." +#~ "Selezionare quali server Apache devono essere configurati per nagios4." #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " @@ -67,14 +67,14 @@ msgstr "Le password non coincidono" #~ "Per effettuare una configurazione manuale, lasciare tutti i server non " #~ "selezionati." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Attivare il supporto per i collegamenti di nagios 1.x in nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Attivare il supporto per i collegamenti di nagios 1.x in nagios4?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Scegliere se la configurazione di Apache per nagios3 deve fornire anche " +#~ "Scegliere se la configurazione di Apache per nagios4 deve fornire anche " #~ "la compatibilità con i collegamenti di nagios 1.x." #~ msgid "" diff --git a/debian/po/ja.po b/debian/po/ja.po index e12534c..a7bb9cb 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -1,11 +1,11 @@ -# Japanese debconf templates translation for nagios3. +# Japanese debconf templates translation for nagios4. # Copyright (C) 2007 Noritada Kobayashi -# This file is distributed under the same license as the nagios3 package. +# This file is distributed under the same license as the nagios4 package. # msgid "" msgstr "" -"Project-Id-Version: nagios3 (debconf) 2.6-3\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4 (debconf) 2.6-3\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2007-03-02 22:03+0900\n" "Last-Translator: Noritada Kobayashi \n" @@ -17,20 +17,20 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "nagios ウェブ管理用パスワード:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "\"nagiosadmin\" ユーザ用に作成するパスワードを入力してください。" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -42,21 +42,21 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "パスワードの確認:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "パスワードが一致しません" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "nagios3 の設定をする Apache サーバ:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "nagios4 の設定をする Apache サーバ:" -#~ msgid "Please select which apache servers should be configured for nagios3." -#~ msgstr "nagios3 の設定をする Apache サーバを選択してください。" +#~ msgid "Please select which apache servers should be configured for nagios4." +#~ msgstr "nagios4 の設定をする Apache サーバを選択してください。" #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " @@ -64,14 +64,14 @@ msgstr "パスワードが一致しません" #~ msgstr "" #~ "手動で設定を行う方がよい場合は、どのサーバも選択せずに次に進んでください。" -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "nagios3 内で nagios 1.x のリンクのサポートを有効にしますか?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "nagios4 内で nagios 1.x のリンクのサポートを有効にしますか?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "nagios3 用の Apache の設定によって nagios 1.x 由来のリンクとの互換性を与え" +#~ "nagios4 用の Apache の設定によって nagios 1.x 由来のリンクとの互換性を与え" #~ "るかどうかを選択してください。" #~ msgid "" diff --git a/debian/po/nl.po b/debian/po/nl.po index 83d8564..c115488 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -1,12 +1,12 @@ -# Dutch translation of nagios3 debconf templates. +# Dutch translation of nagios4 debconf templates. # Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the nagios3 package. +# This file is distributed under the same license as the nagios4 package. # Jeroen Schot , 2012. # msgid "" msgstr "" -"Project-Id-Version: nagios3 3.2.3-3\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4 3.2.3-3\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2012-01-06 10:59+0100\n" "Last-Translator: Jeroen Schot \n" @@ -18,20 +18,20 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Nagios webbeheerwachtwoord:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "Kies een wachtwoord voor de gebruiker \"nagiosadmin\"." #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -43,21 +43,21 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Wachtwoord ter bevestiging:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "De wachtwoorden komen niet overeen" -#~ msgid "Apache servers to configure for nagios3:" +#~ msgid "Apache servers to configure for nagios4:" #~ msgstr "Automatisch te configureren apache-servers:" -#~ msgid "Please select which apache servers should be configured for nagios3." -#~ msgstr "Welke apache-servers moeten er worden geconfigureerd voor nagios3?" +#~ msgid "Please select which apache servers should be configured for nagios4." +#~ msgstr "Welke apache-servers moeten er worden geconfigureerd voor nagios4?" #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " @@ -66,14 +66,14 @@ msgstr "De wachtwoorden komen niet overeen" #~ "Als u de configuratie liever handmatig doet, selecteer dan geen enkele " #~ "server." -#~ msgid "Enable support for nagios 1.x links in nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" #~ msgstr "Ondersteuning activeren voor nagios-1.x-links?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Geef aan of de Apache-configuratie van nagios3 compatibiliteit moet " +#~ "Geef aan of de Apache-configuratie van nagios4 compatibiliteit moet " #~ "aanbieden met links van nagios 1.x." #~ msgid "" diff --git a/debian/po/pl.po b/debian/po/pl.po index 03e5a13..f779ac6 100644 --- a/debian/po/pl.po +++ b/debian/po/pl.po @@ -6,8 +6,8 @@ # msgid "" msgstr "" -"Project-Id-Version: nagios3 3.0.3-3\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4 3.0.3-3\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2008-11-20 17:20+0100\n" "Last-Translator: Łukasz Paździora \n" @@ -19,20 +19,20 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Hasło administratora Nagios:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "Proszę podać hasło dla użytkownika \"nagiosadmin\"." #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -44,23 +44,23 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Potwierdzenie hasła:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Hasła nie są takie same" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Konfiguracja serwerów Apache dla nagios3:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Konfiguracja serwerów Apache dla nagios4:" -#~ msgid "Please select which apache servers should be configured for nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." #~ msgstr "" #~ "Proszę wybrać, które serwery apache powinny zostać skonfigurowane dla " -#~ "nagios3." +#~ "nagios4." #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " @@ -69,14 +69,14 @@ msgstr "Hasła nie są takie same" #~ "Nie zaznaczaj żadnego serwera jeżeli chcesz przeprowadzić konfigurację " #~ "ręcznie." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Włączyć obsługę linków z nagios 1.x w nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Włączyć obsługę linków z nagios 1.x w nagios4?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Czy konfiguracja Apache dla nagios3 powinna być kompatybilna z linkami z " +#~ "Czy konfiguracja Apache dla nagios4 powinna być kompatybilna z linkami z " #~ "nagios 1.x." #~ msgid "" diff --git a/debian/po/pt.po b/debian/po/pt.po index c268c8c..d5db5c8 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -1,12 +1,12 @@ -# translation of nagios3 debconf to Portuguese +# translation of nagios4 debconf to Portuguese # Copyright (C) 2007 Américo Monteiro -# This file is distributed under the same license as the nagios3 package. +# This file is distributed under the same license as the nagios4 package. # # Américo Monteiro , 2007. msgid "" msgstr "" -"Project-Id-Version: nagios3 2.9-1\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4 2.9-1\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2007-08-04 04:08+0100\n" "Last-Translator: Américo Monteiro \n" @@ -19,13 +19,13 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Password de administração Web do Nagios:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "" @@ -34,7 +34,7 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -46,23 +46,23 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Confirmação da password:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "As passwords não condizem." -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Servidores Apache a configurar para nagios3:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Servidores Apache a configurar para nagios4:" -#~ msgid "Please select which apache servers should be configured for nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." #~ msgstr "" #~ "Por favor seleccione quais servidores Apache deverão ser configurados " -#~ "para nagios3." +#~ "para nagios4." #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " @@ -71,14 +71,14 @@ msgstr "As passwords não condizem." #~ "Se você preferir efectuar a configuração manualmente, não seleccione " #~ "nenhum servidor." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Activar suporte para atalhos do nagios 1.x no nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Activar suporte para atalhos do nagios 1.x no nagios4?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Por favor escolha se a configuração do Apache para nagios3 deverá " +#~ "Por favor escolha se a configuração do Apache para nagios4 deverá " #~ "providenciar compatibilidade com atalhos do nagios 1.x." #~ msgid "" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 61deeeb..9db52f5 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -1,12 +1,12 @@ -# nagios3 Brazilian Portuguese translation. -# Copyright (C) THE nagios3's COPYRIGHT HOLDER -# This file is distributed under the same license as nagios3 package. +# nagios4 Brazilian Portuguese translation. +# Copyright (C) THE nagios4's COPYRIGHT HOLDER +# This file is distributed under the same license as nagios4 package. # Bruno Gurgel Gomes de Oliveira , 2008. # msgid "" msgstr "" -"Project-Id-Version: nagios3_3.0.3-1\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4_3.0.3-1\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2008-07-25 19:40-0300\n" "Last-Translator: Bruno Gurgel Gomes de Oliveira \n" @@ -20,20 +20,20 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Senha de administração web do Nagios:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "Por favor, forneça a senha a ser criada com o usuário \"nagiosadmin\"." #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -45,23 +45,23 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Confirmação de senha:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "As senhas não coincidem" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Servidores apache a serem configurados para o nagios3:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Servidores apache a serem configurados para o nagios4:" -#~ msgid "Please select which apache servers should be configured for nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." #~ msgstr "" #~ "Por favor, selecione quais servidores apache deverão ser configurados " -#~ "para o nagios3." +#~ "para o nagios4." #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " @@ -70,14 +70,14 @@ msgstr "As senhas não coincidem" #~ "Se você preferir realizar a configuração manualmente, não selecione " #~ "nenhum servidor." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Habilitar suporte para links do nagios 1.x no nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Habilitar suporte para links do nagios 1.x no nagios4?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Por favor, selecione se a configuração do Apache para o nagios3 deve " +#~ "Por favor, selecione se a configuração do Apache para o nagios4 deve " #~ "fornecer compatibilidade com links do nagios 1.x." #~ msgid "" diff --git a/debian/po/ru.po b/debian/po/ru.po index 067f0f7..951a297 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2008-09-15 19:06+0400\n" "Last-Translator: Yuri Kozlov \n" @@ -21,20 +21,20 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Пароль для веб-администрирования Nagios:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "Введите пароль для создаваемой учётной записи \"nagiosadmin\"." #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -46,35 +46,35 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Введите пароль ещё раз:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Пароли не совпадают" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Серверы apache для настройки под nagios3:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Серверы apache для настройки под nagios4:" -#~ msgid "Please select which apache servers should be configured for nagios3." -#~ msgstr "Выберите серверы apache, которые нужно настроить для nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." +#~ msgstr "Выберите серверы apache, которые нужно настроить для nagios4." #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " #~ "unselected." #~ msgstr "Если вы хотите выполнить настройку вручную, то ничего не выбирайте." -#~ msgid "Enable support for nagios 1.x links in nagios3?" -#~ msgstr "Включить поддержку ссылок nagios 1.x в nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" +#~ msgstr "Включить поддержку ссылок nagios 1.x в nagios4?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" -#~ "Выберите, нужно ли настраивать Apache в nagios3 для предоставления " +#~ "Выберите, нужно ли настраивать Apache в nagios4 для предоставления " #~ "обратной совместимости по ссылкам с nagios 1.x." #~ msgid "" diff --git a/debian/po/sv.po b/debian/po/sv.po index 92a9712..33eeeb2 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -1,12 +1,12 @@ -# translation of nagios3.po to swedish +# translation of nagios4.po to swedish # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Martin Bagge , 2008. msgid "" msgstr "" -"Project-Id-Version: nagios3\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: 2008-09-17 23:30+0100\n" "Last-Translator: Martin Bagge \n" @@ -19,20 +19,20 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "Lösenord för nagios webbadministration:" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "Ange lösenordet som ska användas för användaren \"nagiosadmin\"." #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -44,21 +44,21 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "Upprepa lösenordet:" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "Lösenorden stämmer inte överrens" -#~ msgid "Apache servers to configure for nagios3:" -#~ msgstr "Ange vilken apacheversion som ska förberedas för nagios3:" +#~ msgid "Apache servers to configure for nagios4:" +#~ msgstr "Ange vilken apacheversion som ska förberedas för nagios4:" -#~ msgid "Please select which apache servers should be configured for nagios3." -#~ msgstr "Ange den apacheserver som ska ställas in för nagios3." +#~ msgid "Please select which apache servers should be configured for nagios4." +#~ msgstr "Ange den apacheserver som ska ställas in för nagios4." #~ msgid "" #~ "If you would prefer to perform configuration manually, leave all servers " @@ -67,11 +67,11 @@ msgstr "Lösenorden stämmer inte överrens" #~ "Om du föredrar att ställa in apache manuellt markerar du inte något av " #~ "alternativen." -#~ msgid "Enable support for nagios 1.x links in nagios3?" +#~ msgid "Enable support for nagios 1.x links in nagios4?" #~ msgstr "Aktivera stöd för länkar som de såg ut inagios 1.x?" #~ msgid "" -#~ "Please choose whether the Apache configuration for nagios3 should provide " +#~ "Please choose whether the Apache configuration for nagios4 should provide " #~ "compatibility with links from nagios 1.x." #~ msgstr "" #~ "Ange om du vill att inställningarna i Apache ska ha stöd för länkar från " diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 401ab2a..250fd22 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: nagios3\n" -"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n" +"Project-Id-Version: nagios4\n" +"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n" "POT-Creation-Date: 2013-06-26 23:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -19,20 +19,20 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "Nagios web administration password:" msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "Please provide the password to be created with the \"nagiosadmin\" user." msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:1001 +#: ../nagios4-cgi.templates:1001 msgid "" "This is the username and password you will use to log in to your nagios " "installation after configuration is complete. If you do not provide a " @@ -41,12 +41,12 @@ msgstr "" #. Type: password #. Description -#: ../nagios3-cgi.templates:2001 +#: ../nagios4-cgi.templates:2001 msgid "Password confirmation:" msgstr "" #. Type: note #. Description -#: ../nagios3-cgi.templates:3001 +#: ../nagios4-cgi.templates:3001 msgid "The passwords do not match" msgstr "" diff --git a/debian/rules b/debian/rules index 6997b10..af8c6e4 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# debian/rules makefile for nagios3 +# debian/rules makefile for nagios4 # Last modified: # $Id$ @@ -24,12 +24,12 @@ SHELL = /bin/sh -e CONFIGURE = CFLAGS='$(CFLAGS)' ./configure --prefix=/usr \ --mandir=/usr/share/man \ --bindir=/usr/sbin \ - --sbindir=/usr/lib/cgi-bin/nagios3 \ - --datadir=/usr/share/nagios3/htdocs \ - --sysconfdir=/etc/nagios3 \ + --sbindir=/usr/lib/cgi-bin/nagios4 \ + --datadir=/usr/share/nagios4/htdocs \ + --sysconfdir=/etc/nagios4 \ --infodir=/usr/share/info \ --libexecdir=/usr/lib/nagios/plugins \ - --localstatedir=/var/lib/nagios3 \ + --localstatedir=/var/lib/nagios4 \ --enable-event-broker \ --enable-embedded-perl \ --with-nagios-user=nagios \ @@ -37,13 +37,13 @@ CONFIGURE = CFLAGS='$(CFLAGS)' ./configure --prefix=/usr \ --with-command-user=nagios \ --with-command-group=nagios \ --with-init-dir=/etc/init.d \ - --with-lockfile=/var/run/nagios3/nagios3.pid \ + --with-lockfile=/var/run/nagios4/nagios4.pid \ --with-mail=/usr/bin/mail \ --with-perlcache \ --build=$(DEB_BUILD_GNU_TYPE) \ --host=$(DEB_HOST_GNU_TYPE) \ - --with-htmurl=/nagios3 \ - --with-cgiurl=/cgi-bin/nagios3 + --with-htmurl=/nagios4 \ + --with-cgiurl=/cgi-bin/nagios4 clean: dh_testdir -a @@ -98,23 +98,23 @@ install-stamp: build-stamp fix-configs-stamp # zero out INSTALL_OPTS to prevent chowning at build-time make install-unstripped DESTDIR=$b/tmp INSTALL_OPTS="" # move some arch-indep stuff to the other packages - chgrp www-data ${b}/nagios3-common/var/cache/nagios3 - chmod g+s ${b}/nagios3-common/var/cache/nagios3 - chown root:www-data ${b}/nagios3-common/var/lib/nagios3/rw - chmod 700 ${b}/nagios3-common/var/lib/nagios3/rw - mv debian/tmp/usr/sbin/nagios ${b}/nagios3-core/usr/sbin/nagios3 - mv debian/tmp/usr/sbin/nagiostats ${b}/nagios3-core/usr/sbin/nagios3stats + chgrp www-data ${b}/nagios4-common/var/cache/nagios4 + chmod g+s ${b}/nagios4-common/var/cache/nagios4 + chown root:www-data ${b}/nagios4-common/var/lib/nagios4/rw + chmod 700 ${b}/nagios4-common/var/lib/nagios4/rw + mv debian/tmp/usr/sbin/nagios ${b}/nagios4-core/usr/sbin/nagios4 + mv debian/tmp/usr/sbin/nagiostats ${b}/nagios4-core/usr/sbin/nagios4stats dh_link -i dh_lintian dh_installdocs -i - dh_installman -a -pnagios3 + dh_installman -a -pnagios4 dh_installlogrotate dh_installchangelogs -i dh_install -i - dh_installinit --name nagios3 -- defaults 30 18 + dh_installinit --name nagios4 -- defaults 30 18 dh_installexamples - chmod 755 ${b}/nagios3-common/var/lib/nagios3 - rm ${b}/nagios3-common/etc/nagios3/cgi.cfg + chmod 755 ${b}/nagios4-common/var/lib/nagios4 + rm ${b}/nagios4-common/etc/nagios4/cgi.cfg touch install-stamp binary: binary-arch binary-indep @@ -127,14 +127,14 @@ binary-arch: install-stamp dh_installdocs -a dh_installdebconf -a dh_install -a - chmod 600 ${b}/nagios3-common/etc/nagios3/resource.cfg + chmod 600 ${b}/nagios4-common/etc/nagios4/resource.cfg # fix permissions of p1 - chmod 755 ${b}/nagios3-core/usr/lib/nagios3/p1.pl - mkdir -p ${b}/nagios3-dbg/usr/bin/ - mv contrib/mini_epn ${b}/nagios3-dbg/usr/bin/mini_epn_nagios3 - dh_strip -a --dbg-package=nagios3-dbg + #chmod 755 ${b}/nagios4-core/usr/lib/nagios4/p1.pl + mkdir -p ${b}/nagios4-dbg/usr/bin/ + #mv contrib/mini_epn ${b}/nagios4-dbg/usr/bin/mini_epn_nagios4 + dh_strip -a --dbg-package=nagios4-dbg dh_compress -a -X.php - dh_fixperms -a -X/var/cache/nagios3 + dh_fixperms -a -X/var/cache/nagios4 dh_makeshlibs -a -V dh_installdeb -a dh_perl -a @@ -146,7 +146,7 @@ binary-arch: install-stamp binary-indep: install-stamp dh_link -i dh_compress -i - dh_fixperms -i -Xnagios3/resource.cfg + dh_fixperms -i -Xnagios4/resource.cfg dh_installdebconf -i dh_perl -i dh_installdeb -i