Attachment #131383 for bug #175457

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




# Created by: Chris St Denis <chris@smartt.com>
# Date created:			7 Dec 2010
# Whom:				Chris St Denis <chris@smartt.com>
#
# $FreeBSD$
#

PORTNAME=	nagiosql
PORTVERSION=	3.2.0
PORTREVISION=	1
CATEGORIES=	net-mgmt www
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/NagiosQL%20${PORTVERSION}/
DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//g}

USE_BZIP2=	yes
USE_MYSQL=	yes
USE_GETTEXT=	yes
USE_PHP=	mysql gettext session simplexml
IGNORE_WITH_PHP=4
WANT_PHP_WEB=	yes

USERS?=		nagios
GROUPS?=	nagios
NAGIOSUSER?=	nagios

NO_BUILD=	yes
WRKSRC=		${WRKDIR}/${PORTNAME}32
PKGMESSAGE=	${WRKDIR}/pkg-message
SUB_FILES=	pkg-message

SUB_FILES=	pkg-message pkg-install
SUB_LIST=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NAGIOSUSER=${NAGIOSUSER}

PEARDIR?=	${LOCALBASE}/share/pear

OPTIONS_DEFINE=	CURL FTP SSH2
CURL_DESC=	Configure with cURL support
FTP_DESC=	Configure with FTP support
SSH2_DESC=	Configure with SSH2 support

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MCURL}
USE_PHP+=	curl
.endif

.if ${PORT_OPTIONS:MFTP}
USE_PHP+=	ftp
.endif

.if ${PORT_OPTIONS:MSSH2}
USE_PHP+=	ssh2
.endif

post-patch:
	${REINPLACE_CMD} -e "s|\'/etc/nagiosql/|\'${ETCDIR}/|g" \
		-e "s|/opt/nagios/etc/objects/|${LOCALBASE}/etc/nagios/objects/|" \
		-e "s|/opt/nagios/bin/nagios|${LOCALBASE}/bin/nagios|" \
		-e "s|/var/nagios/nagios.lock|/var/spool/nagios/nagios.lock|" \
		-e "s|/var/nagios/rw/nagios.cmd|/var/spool/nagios/rw/nagios.cmd|" \
		-e "s|nagios/etc/|etc/nagios/|" \
		-e "s|nagiosql/etc/|${ETCDIR}/|" \
		-e "s|\>/etc/nagiosql|\>${ETCDIR}|g" \
		-e "s|\>/etc/nagios/|\>${LOCALBASE}/etc/nagios/|g" \
		${WRKSRC}/install/sql/nagiosQL_v32_db_mysql.sql

	${REINPLACE_CMD} -e "s|\"/etc/|\"${LOCALBASE}/etc/|" \
		${WRKSRC}/install/install.php

do-install:
	@${MKDIR} ${WWWDIR}
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} "! ( -name *\.orig -o -name *\.bak )")
	@${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/config

post-install:
	@${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)nagiosql/distinfo (-2 / +2 lines)
1	SHA256 (nagiosql_320.tar.bz2) = a5259d2342752949f005533eec5a68c10e7476b83f192e972d9edcd3ec92d5d1	1	SHA256 (nagiosql_320.tar.bz2) = 32a019ec6b13342257787d83839c5913f87534d840e96ebde8d663e656833d4d
2	SIZE (nagiosql_320.tar.bz2) = 921396	2	SIZE (nagiosql_320.tar.bz2) = 996713




--- ../nagiosql/work/./nagiosql32/admin/contacts.php	2012-03-27 12:47:56.000000000 +0200
+++ ./nagiosql32/admin/contacts.php	2012-04-20 12:39:56.000000000 +0200
@@ -10,10 +10,10 @@
 // Project   : NagiosQL
 // Component : Contact definitions
 // Website   : http://www.nagiosql.org
-// Date      : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Tue, 27 Mar 2012) $
+// Date      : $LastChangedDate: 2012-04-20 12:39:53 +0200 (Fr, 20. Apr 2012) $
 // Author    : $LastChangedBy: martin $
 // Version   : 3.2.0
-// Revision  : $LastChangedRevision: 1308 $
+// Revision  : $LastChangedRevision: 1323 $
 //
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -259,7 +259,7 @@
   	} else {
     	$conttp->setVariable("HOST_OPTION_FIELDS","chbGr1a,chbGr1b,chbGr1c,chbGr1d,chbGr1f");
     	$conttp->setVariable("SERVICE_OPTION_FIELDS","chbGr2a,chbGr2b,chbGr2c,chbGr2d,chbGr2e,chbGr2g");
-		$conttp->setVariable("VERSION_20_VALUE_MUST",",tfFriendly");
+		$conttp->setVariable("VERSION_20_VALUE_MUST",",tfValue2");
   	}
 	// Insert data from database in "modify" mode
 	if (isset($arrModifyData) && ($chkSelModify == "modify")) {

Lines 1-23 Link Here

(-)nagiosql/files/patch-nagiosql32-admin-hosts.php (-23 lines)
1	--- ../nagiosql/work/./nagiosql32/admin/hosts.php 2012-03-09 07:43:00.000000000 +0100
2	+++ ./nagiosql32/admin/hosts.php 2012-04-17 11:54:12.000000000 +0200
3	@@ -10,10 +10,10 @@
4	// Project : NagiosQL
5	// Component : Host definition
6	// Website : http://www.nagiosql.org
7	-// Date : $LastChangedDate: 2012-03-09 07:43:00 +0100 (Fri, 09 Mar 2012) $
8	+// Date : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Do, 05. Apr 2012) $
9	// Author : $LastChangedBy: martin $
10	// Version : 3.2.0
11	-// Revision : $LastChangedRevision: 1282 $
12	+// Revision : $LastChangedRevision: 1315 $
13	//
14	///////////////////////////////////////////////////////////////////////////////
15	//
16	@@ -41,7 +41,6 @@
17	if ($chkSelValue1 != "") {
18	for ($i=1;$i<=8;$i++) {
19	${"chkTfArg$i"} = str_replace("!","::bang::",${"chkTfArg$i"});
20	- ${"chkTfArg$i"} = str_replace("\\","::back::",${"chkTfArg$i"});
21	if (${"chkTfArg$i"} != "") $chkSelValue1 .= "!".${"chkTfArg$i"};
22	}
23	}

Lines 1-23 Link Here

(-)nagiosql/files/patch-nagiosql32-admin-services.php (-23 lines)
1	--- ../nagiosql/work/./nagiosql32/admin/services.php 2012-03-09 07:43:00.000000000 +0100
2	+++ ./nagiosql32/admin/services.php 2012-04-17 11:53:36.000000000 +0200
3	@@ -10,10 +10,10 @@
4	// Project : NagiosQL
5	// Component : Service definition
6	// Website : http://www.nagiosql.org
7	-// Date : $LastChangedDate: 2012-03-09 07:43:00 +0100 (Fri, 09 Mar 2012) $
8	+// Date : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Do, 05. Apr 2012) $
9	// Author : $LastChangedBy: martin $
10	// Version : 3.2.0
11	-// Revision : $LastChangedRevision: 1282 $
12	+// Revision : $LastChangedRevision: 1315 $
13	//
14	///////////////////////////////////////////////////////////////////////////////
15	//
16	@@ -41,7 +41,6 @@
17	if ($chkSelValue1 != "") {
18	for ($i=1;$i<=8;$i++) {
19	${"chkTfArg$i"} = str_replace("!","::bang::",${"chkTfArg$i"});
20	- ${"chkTfArg$i"} = str_replace("\\","::back::",${"chkTfArg$i"});
21	if (${"chkTfArg$i"} != "") $chkSelValue1 .= "!".${"chkTfArg$i"};
22	}
23	}




--- ../nagiosql/work/./nagiosql32/admin/templatedefinitions.php	2012-02-27 13:01:17.000000000 +0100
+++ ./nagiosql32/admin/templatedefinitions.php	2012-04-05 08:12:08.000000000 +0200
@@ -10,10 +10,10 @@
 // Project   : NagiosQL
 // Component : Template definition list
 // Website   : http://www.nagiosql.org
-// Date      : $LastChangedDate: 2012-02-27 13:01:17 +0100 (Mon, 27 Feb 2012) $
+// Date      : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Do, 05. Apr 2012) $
 // Author    : $LastChangedBy: martin $
 // Version   : 3.2.0
-// Revision  : $LastChangedRevision: 1257 $
+// Revision  : $LastChangedRevision: 1315 $
 //
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -102,8 +102,10 @@
 if ($chkMode == "add") {
   	if ($arrDefinition[1] == 1) {
     	$strSQL2 = "SELECT `template_name` FROM `tbl_".$chkPreTab."template` WHERE `id` = ".$arrDefinition[0];
+		$strSQL3 = "SELECT `active` FROM `tbl_".$chkPreTab."template` WHERE `id` = ".$arrDefinition[0];
   	} else {
     	$strSQL2 = "SELECT `name` FROM `tbl_".$chkPreTab."` WHERE `id` = ".$arrDefinition[0];
+		$strSQL3 = "SELECT `active` FROM `tbl_".$chkPreTab."` WHERE `id` = ".$arrDefinition[0];
   	}
   	if (isset($_SESSION['templatedefinition']) && is_array($_SESSION['templatedefinition'])) {
     	$intCheck = 0;
@@ -118,7 +120,7 @@
 			$arrTemp['idTable'] = $arrDefinition[1];
 			$arrTemp['idSort']  = 0;
 			$arrTemp['status'] = 0;
-			$arrTemp['active'] = 0;
+			$arrTemp['active'] = $myDBClass->getFieldData($strSQL3)+0;
 			$_SESSION['templatedefinition'][] = $arrTemp;
     	}
   	} else {
@@ -127,7 +129,7 @@
 		$arrTemp['idTable'] = $arrDefinition[1];
 		$arrTemp['idSort']  = 0;
 		$arrTemp['status'] = 0;
-		$arrTemp['active'] = 0;
+		$arrTemp['active'] = $myDBClass->getFieldData($strSQL3)+0;
 		$_SESSION['templatedefinition'][] = $arrTemp;
   	}
 }




--- ../nagiosql/work/./nagiosql32/functions/config_class.php	2012-03-07 10:38:34.000000000 +0100
+++ ./nagiosql32/functions/config_class.php	2012-04-17 11:59:16.000000000 +0200
@@ -10,10 +10,10 @@
 // Project   : NagiosQL
 // Component : Configuration Class
 // Website   : http://www.nagiosql.org
-// Date      : $LastChangedDate: 2012-03-07 10:38:34 +0100 (Wed, 07 Mar 2012) $
+// Date      : $LastChangedDate: 2012-04-17 11:47:05 +0200 (Di, 17. Apr 2012) $
 // Author    : $LastChangedBy: martin $
 // Version   : 3.2.0
-// Revision  : $LastChangedRevision: 1275 $
+// Revision  : $LastChangedRevision: 1319 $
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -749,13 +749,6 @@
   	//
   	///////////////////////////////////////////////////////////////////////////////////////////
 	function createConfigSingle($strTableName,$intDbId = 0,$intMode = 0) {
-		// Get write access groups
-		if (isset($_SESSION['userid'])) {
-			$strAccess   = $this->myVisClass->getAccGroups('write');
-			$strAccWhere = " AND `access_group` IN ($strAccess) ";
-		} else {
-			$strAccWhere = "";
-		}
 		// Do not create configs in common domain
 		if ($this->intDomainId == 0) {
 			$this->processClassMessage(translate('It is not possible to write config files directly from the common domain!')."::",$this->strErrorMessage);
@@ -769,9 +762,9 @@
 			$strDomainWhere = " (`config_id`=".$this->intDomainId.") ";
 		}
 		if ($intDbId == 0) {
-    		$strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' $strAccWhere ORDER BY `id`";
+    		$strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' ORDER BY `id`";
 		} else {
-    		$strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' $strAccWhere AND `id`=$intDbId";
+    		$strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' AND `id`=$intDbId";
 		}
     	$booReturn = $this->myDBClass->getDataArray($strSQL,$arrData,$intDataCount);
     	if (($booReturn != false) && ($intDataCount != 0)) {
@@ -1381,8 +1374,8 @@
 		  	if ($key == "contacts")     	$value = $this->checkTpl($value,"contacts_tploptions","tbl_host",$intDataId,$intSkip);
 		  	if ($key == "contact_groups") 	$value = $this->checkTpl($value,"contact_groups_tploptions","tbl_host",$intDataId,$intSkip);
 		  	if ($key == "use")        		$value = $this->checkTpl($value,"use_template_tploptions","tbl_host",$intDataId,$intSkip);
+			if ($key == "check_command") 	$value = str_replace("\::bang::","\!",$value);
 			if ($key == "check_command") 	$value = str_replace("::bang::","\!",$value);
-			if ($key == "check_command") 	$value = str_replace("::back::","\\\\",$value);
 		}
 		if ($strTableName == "tbl_service") {
 		  	if ($key == "use_template")   	$key = "use";
@@ -1403,8 +1396,8 @@
 		  	if ($key == "contacts")     	$value = $this->checkTpl($value,"contacts_tploptions","tbl_service",$intDataId,$intSkip);
 		  	if ($key == "contact_groups") 	$value = $this->checkTpl($value,"contact_groups_tploptions","tbl_service",$intDataId,$intSkip);
 		  	if ($key == "use")        		$value = $this->checkTpl($value,"use_template_tploptions","tbl_service",$intDataId,$intSkip);
+			if ($key == "check_command") 	$value = str_replace("\::bang::","\!",$value);
 			if ($key == "check_command") 	$value = str_replace("::bang::","\!",$value);
-			if ($key == "check_command") 	$value = str_replace("::back::","\\\\",$value);
 		}
 		if ($strTableName == "tbl_hosttemplate") {
 			if ($key == "template_name")  	$key = "name";




--- ../nagiosql/work/./nagiosql32/functions/import_class.php	2012-03-07 10:38:34.000000000 +0100
+++ ./nagiosql32/functions/import_class.php	2012-04-17 11:47:08.000000000 +0200
@@ -10,10 +10,10 @@
 // Project   : NagiosQL
 // Component : Import Class
 // Website   : http://www.nagiosql.org
-// Date      : $LastChangedDate: 2012-03-07 10:38:34 +0100 (Wed, 07 Mar 2012) $
+// Date      : $LastChangedDate: 2012-04-17 11:47:05 +0200 (Di, 17. Apr 2012) $
 // Author    : $LastChangedBy: martin $
 // Version   : 3.2.0
-// Revision  : $LastChangedRevision: 1275 $
+// Revision  : $LastChangedRevision: 1319 $
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -75,7 +75,7 @@
     	$intRemoveTmp   = 0;
     	$strFileName    = trim($strFileName);
     	$intReturn = $this->myConfigClass->getConfigData($intConfigId,"method",$intMethod);
-		if ($intReturn != 0) { $this->strErrorMessage .= translate('Unable to get configuration data:')."method::"; return(1); }
+		if ($intReturn != 0) { $this->strErrorMessage .= translate('Unable to get configuration data:')." method::"; return(1); }
     	// Read import file
 		// Local file system
 		if ($intMethod == 1) {

Lines 1-11 Link Here

(-)nagiosql/files/patch-nagiosql32-functions-prepend__adm.php (-11 lines)
1	--- ../nagiosql/work/./nagiosql32/functions/prepend_adm.php 2012-03-27 12:47:56.000000000 +0200
2	+++ ./nagiosql32/functions/prepend_adm.php 2012-03-27 12:47:58.000000000 +0200
3	@@ -9,7 +9,7 @@
4	// Project : NagiosQL
5	// Component : Preprocessing script
6	// Website : http://www.nagiosql.org
7	-// Date : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Tue, 27 Mar 2012) $
8	+// Date : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Di, 27. Mär 2012) $
9	// Author : $LastChangedBy: martin $
10	// Version : 3.2.0
11	// Revision : $LastChangedRevision: 1308 $




--- ../nagiosql/work/./nagiosql32/functions/prepend_content.php	2012-02-29 11:01:14.000000000 +0100
+++ ./nagiosql32/functions/prepend_content.php	2012-04-04 07:30:16.000000000 +0200
@@ -178,6 +178,14 @@
 	$chkTfValue19   = addslashes($chkTfValue19);
 	$chkTfValue20   = addslashes($chkTfValue20);
 	$chkTaValue1    = addslashes($chkTaValue1);
+	$chkTfArg1		= addslashes($chkTfArg1);	
+	$chkTfArg2		= addslashes($chkTfArg2);
+	$chkTfArg3		= addslashes($chkTfArg3);
+	$chkTfArg4		= addslashes($chkTfArg4);
+	$chkTfArg5		= addslashes($chkTfArg5);
+	$chkTfArg6		= addslashes($chkTfArg6);
+	$chkTfArg7		= addslashes($chkTfArg7);
+	$chkTfArg8		= addslashes($chkTfArg8);
 	$chkTaFileText  = addslashes($chkTaFileText);
 }
 //
@@ -204,6 +212,14 @@
 $chkTfValue18   = $myVisClass->tfSecure($chkTfValue18);
 $chkTfValue19   = $myVisClass->tfSecure($chkTfValue19);
 $chkTfValue20   = $myVisClass->tfSecure($chkTfValue20);
+$chkTfArg1		= $myVisClass->tfSecure($chkTfArg1);	
+$chkTfArg2		= $myVisClass->tfSecure($chkTfArg2);
+$chkTfArg3		= $myVisClass->tfSecure($chkTfArg3);
+$chkTfArg4		= $myVisClass->tfSecure($chkTfArg4);
+$chkTfArg5		= $myVisClass->tfSecure($chkTfArg5);
+$chkTfArg6		= $myVisClass->tfSecure($chkTfArg6);
+$chkTfArg7		= $myVisClass->tfSecure($chkTfArg7);
+$chkTfArg8		= $myVisClass->tfSecure($chkTfArg8);
 $chkTaValue1    = $myVisClass->tfSecure($chkTaValue1);
 $chkTaFileText  = stripslashes($chkTaFileText);
 //

Lines 1-11 Link Here

(-)nagiosql/files/patch-nagiosql32-templates-admin-user.tpl.htm (-11 lines)
1	--- ../nagiosql/work/./nagiosql32/templates/admin/user.tpl.htm 2012-03-27 12:47:56.000000000 +0200
2	+++ ./nagiosql32/templates/admin/user.tpl.htm 2012-03-27 12:47:58.000000000 +0200
3	@@ -3,7 +3,7 @@
4	<!-- Project : NagiosQL -->
5	<!-- Component : User template -->
6	<!-- Website : http://www.nagiosql.org -->
7	-<!-- Date : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Tue, 27 Mar 2012) $ -->
8	+<!-- Date : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Di, 27. Mär 2012) $ -->
9	<!-- Author : $LastChangedBy: martin $ -->
10	<!-- Version : 3.2.0 -->
11	<!-- Revision : $LastChangedRevision: 1308 $ -->




#!/bin/sh
#
# $FreeBSD$

WWWOWN=%%WWWOWN%%
WWWGRP=%%WWWGRP%%
NAGIOSUSER=%%NAGIOSUSER%%

ETCDIR=%%ETCDIR%%
WWWDIR=%%WWWDIR%%

if [ "$2" = "POST-INSTALL" ]; then
    echo "=========== p o s t - i n s t a l l ================="
	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}
	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/ssh
	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/hosts
	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/services
	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/backup
	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/backup/hosts
	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/backup/services
	chown ${WWWOWN}:${WWWGRP} ${WWWDIR}/config
fi

Lines 1-5 Link Here

(-)nagiosql/files/pkg-message.in (-1 / +1 lines)
1	=======================================================================	1	=======================================================================
2	Nagiosql is now installed. If you intall it for the first time,	2	Nagiosql is now installed. If you install it for the first time,
3	you may have to add an alias in apache config for it.	3	you may have to add an alias in apache config for it.
4		4
5	Alias /nagiosql/ "%%WWWDIR%%/"	5	Alias /nagiosql/ "%%WWWDIR%%/"




%%WWWDIR%%/admin/configtargets.php
%%WWWDIR%%/admin/contactgroups.php
%%WWWDIR%%/admin/contacts.php
%%WWWDIR%%/admin/contacts.php.orig
%%WWWDIR%%/admin/contacttemplates.php
%%WWWDIR%%/admin/datadomain.php
%%WWWDIR%%/admin/delbackup.php

%%WWWDIR%%/admin/hostextinfo.php
%%WWWDIR%%/admin/hostgroups.php
%%WWWDIR%%/admin/hosts.php
%%WWWDIR%%/admin/hosts.php.orig
%%WWWDIR%%/admin/hosttemplates.php
%%WWWDIR%%/admin/import.php
%%WWWDIR%%/admin/index.html

%%WWWDIR%%/admin/serviceextinfo.php
%%WWWDIR%%/admin/servicegroups.php
%%WWWDIR%%/admin/services.php
%%WWWDIR%%/admin/services.php.orig
%%WWWDIR%%/admin/servicetemplates.php
%%WWWDIR%%/admin/settings.php
%%WWWDIR%%/admin/specials.php
%%WWWDIR%%/admin/support.php
%%WWWDIR%%/admin/templatedefinitions.php
%%WWWDIR%%/admin/templatedefinitions.php.orig
%%WWWDIR%%/admin/timedefinitions.php
%%WWWDIR%%/admin/timeperiods.php
%%WWWDIR%%/admin/tools.php

%%WWWDIR%%/config/locale/en_GB/LC_MESSAGES/en_GB.po
%%WWWDIR%%/config/locale/en_GB/LC_MESSAGES/index.html
%%WWWDIR%%/config/locale/en_GB/index.html
%%WWWDIR%%/config/locale/es_AR/LC_MESSAGES/es_AR.mo
%%WWWDIR%%/config/locale/es_AR/LC_MESSAGES/es_AR.po
%%WWWDIR%%/config/locale/es_AR/LC_MESSAGES/index.html
%%WWWDIR%%/config/locale/es_AR/index.html
%%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/es_ES.mo
%%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/es_ES.po
%%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/index.html

%%WWWDIR%%/config/locale/it_IT/LC_MESSAGES/it_IT.mo
%%WWWDIR%%/config/locale/it_IT/LC_MESSAGES/it_IT.po
%%WWWDIR%%/config/locale/it_IT/index.html
%%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES/index.html
%%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES/ja_JP.mo
%%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES/ja_JP.po
%%WWWDIR%%/config/locale/ja_JP/index.html
%%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/index.html
%%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/nl_NL.mo
%%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/nl_NL.po
%%WWWDIR%%/config/locale/nl_NL/index.html
%%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES/index.html
%%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES/pl_PL.mo
%%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES/pl_PL.po
%%WWWDIR%%/config/locale/pl_PL/index.html
%%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/index.html
%%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/pt_BR.mo
%%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/pt_BR.po

%%WWWDIR%%/favicon.ico
%%WWWDIR%%/functions/common.js
%%WWWDIR%%/functions/config_class.php
%%WWWDIR%%/functions/config_class.php.orig
%%WWWDIR%%/functions/content_class.php
%%WWWDIR%%/functions/data_class.php
%%WWWDIR%%/functions/import_class.php
%%WWWDIR%%/functions/import_class.php.orig
%%WWWDIR%%/functions/mysql_class.php
%%WWWDIR%%/functions/nag_class.php
%%WWWDIR%%/functions/prepend_adm.php
%%WWWDIR%%/functions/prepend_adm.php.orig
%%WWWDIR%%/functions/prepend_content.php
%%WWWDIR%%/functions/prepend_content.php.orig
%%WWWDIR%%/functions/prepend_scripting.php
%%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/langs/en.js
%%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/license.txt

%%WWWDIR%%/templates/admin/support.tpl.htm
%%WWWDIR%%/templates/admin/timeperiods.tpl.htm
%%WWWDIR%%/templates/admin/user.tpl.htm
%%WWWDIR%%/templates/admin/user.tpl.htm.orig
%%WWWDIR%%/templates/admin/verify.tpl.htm
%%WWWDIR%%/templates/files/commands.tpl.dat
%%WWWDIR%%/templates/files/contactgroups.tpl.dat

@dirrm %%WWWDIR%%/config/locale/ru_RU
@dirrm %%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES
@dirrm %%WWWDIR%%/config/locale/pt_BR
@dirrm %%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES
@dirrm %%WWWDIR%%/config/locale/pl_PL
@dirrm %%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES
@dirrm %%WWWDIR%%/config/locale/nl_NL
@dirrm %%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES
@dirrm %%WWWDIR%%/config/locale/ja_JP
@dirrm %%WWWDIR%%/config/locale/it_IT/LC_MESSAGES
@dirrm %%WWWDIR%%/config/locale/it_IT
@dirrm %%WWWDIR%%/config/locale/fr_FR/LC_MESSAGES
@dirrm %%WWWDIR%%/config/locale/fr_FR
@dirrm %%WWWDIR%%/config/locale/es_ES/LC_MESSAGES
@dirrm %%WWWDIR%%/config/locale/es_ES
@dirrm %%WWWDIR%%/config/locale/es_AR/LC_MESSAGES
@dirrm %%WWWDIR%%/config/locale/es_AR
@dirrm %%WWWDIR%%/config/locale/en_GB/LC_MESSAGES
@dirrm %%WWWDIR%%/config/locale/en_GB
@dirrm %%WWWDIR%%/config/locale/de_DE/LC_MESSAGES

@dirrm %%WWWDIR%%/config/locale/da_DK/LC_MESSAGES
@dirrm %%WWWDIR%%/config/locale/da_DK
@dirrm %%WWWDIR%%/config/locale
@dirrmtry %%WWWDIR%%/config
@dirrm %%WWWDIR%%/admin
@dirrmtry %%WWWDIR%%
@dirrmtry %%ETCDIR%%/services
@dirrmtry %%ETCDIR%%/hosts
@dirrmtry %%ETCDIR%%/backup/services
@dirrmtry %%ETCDIR%%/backup/hosts
@dirrmtry %%ETCDIR%%/backup
@dirrmtry %%ETCDIR%%

Return to bug 175457

Lines 1-12 Link Here

(-)nagiosql/Makefile (-18 / +41 lines)
1	# New ports collection makefile for: nagiosql	1	# Created by: Chris St Denis <chris@smartt.com>
2	# Date created: 7 Dec 2010
3	# Whom: Chris St Denis <chris@smartt.com>
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= nagiosql	4	PORTNAME= nagiosql
9	PORTVERSION= 3.2.0	5	PORTVERSION= 3.2.0
		6	PORTREVISION= 1
10	CATEGORIES= net-mgmt www	7	CATEGORIES= net-mgmt www
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NagiosQL%20${PORTVERSION}/	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NagiosQL%20${PORTVERSION}/
12	DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g}	9	DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g}
Lines 22-57 Link Here
22	USE_BZIP2= yes	19	USE_BZIP2= yes
23	USE_MYSQL= yes	20	USE_MYSQL= yes
24	USE_GETTEXT= yes	21	USE_GETTEXT= yes
25	USE_PHP= mysql gettext ftp session simplexml	22	USE_PHP= mysql gettext session simplexml
26	IGNORE_WITH_PHP=4
27	WANT_PHP_WEB= yes	23	WANT_PHP_WEB= yes
28		24
		25	USERS?= nagios
		26	GROUPS?= nagios
		27	NAGIOSUSER?= nagios
		28
29	NO_BUILD= yes	29	NO_BUILD= yes
30	NO_WRKSUBDIR= yes	30	WRKSRC= ${WRKDIR}/${PORTNAME}32
31	PKGMESSAGE= ${WRKDIR}/pkg-message
32	SUB_FILES= pkg-message
33		31
		32	SUB_FILES= pkg-message pkg-install
		33	SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NAGIOSUSER=${NAGIOSUSER}
		34
34	PEARDIR?= ${LOCALBASE}/share/pear	35	PEARDIR?= ${LOCALBASE}/share/pear
35		36
36	OPTIONS= CURL "Configure with cURL support" off \	37	OPTIONS_DEFINE= CURL FTP SSH2
37	SSH2 "Configure with SSH2 support" off	38	CURL_DESC= Configure with cURL support
		39	FTP_DESC= Configure with FTP support
		40	SSH2_DESC= Configure with SSH2 support
38		41
39	#.include <bsd.port.pre.mk>	42	.include <bsd.port.options.mk>
40		43
41	.if defined(WITH_CURL)	44	.if ${PORT_OPTIONS:MCURL}
42	USE_PHP+= curl	45	USE_PHP+= curl
43	.endif	46	.endif
44		47
45	.if defined(WITH_SSH2)	48	.if ${PORT_OPTIONS:MFTP}
		49	USE_PHP+= ftp
		50	.endif
		51
		52	.if ${PORT_OPTIONS:MSSH2}
46	USE_PHP+= ssh2	53	USE_PHP+= ssh2
47	.endif	54	.endif
48		55
		56	post-patch:
		57	${REINPLACE_CMD} -e "s\|\'/etc/nagiosql/\|\'${ETCDIR}/\|g" \
		58	-e "s\|/opt/nagios/etc/objects/\|${LOCALBASE}/etc/nagios/objects/\|" \
		59	-e "s\|/opt/nagios/bin/nagios\|${LOCALBASE}/bin/nagios\|" \
		60	-e "s\|/var/nagios/nagios.lock\|/var/spool/nagios/nagios.lock\|" \
		61	-e "s\|/var/nagios/rw/nagios.cmd\|/var/spool/nagios/rw/nagios.cmd\|" \
		62	-e "s\|nagios/etc/\|etc/nagios/\|" \
		63	-e "s\|nagiosql/etc/\|${ETCDIR}/\|" \
		64	-e "s\|\>/etc/nagiosql\|\>${ETCDIR}\|g" \
		65	-e "s\|\>/etc/nagios/\|\>${LOCALBASE}/etc/nagios/\|g" \
		66	${WRKSRC}/install/sql/nagiosQL_v32_db_mysql.sql
		67
		68	${REINPLACE_CMD} -e "s\|\"/etc/\|\"${LOCALBASE}/etc/\|" \
		69	${WRKSRC}/install/install.php
		70
49	do-install:	71	do-install:
50	${MKDIR} ${WWWDIR}	72	@${MKDIR} ${WWWDIR}
51	${CP} -R ${WRKSRC}/${PORTNAME}32/ ${WWWDIR}	73	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} "! ( -name \.orig -o -name \.bak )")
52	${CHOWN} ${WWWOWN}:${WWWGROUP} ${WWWDIR}/config	74	@${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/config
53		75
54	post-install:	76	post-install:
		77	@${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
55	@${CAT} ${PKGMESSAGE}	78	@${CAT} ${PKGMESSAGE}
56		79
57	.include <bsd.port.mk>	80	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)nagiosql/files/patch-nagiosql32-admin-contacts.php (-24 lines)
1	--- ../nagiosql/work/./nagiosql32/admin/contacts.php 2012-03-27 12:47:56.000000000 +0200
2	+++ ./nagiosql32/admin/contacts.php 2012-04-20 12:39:56.000000000 +0200
3	@@ -10,10 +10,10 @@
4	// Project : NagiosQL
5	// Component : Contact definitions
6	// Website : http://www.nagiosql.org
7	-// Date : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Tue, 27 Mar 2012) $
8	+// Date : $LastChangedDate: 2012-04-20 12:39:53 +0200 (Fr, 20. Apr 2012) $
9	// Author : $LastChangedBy: martin $
10	// Version : 3.2.0
11	-// Revision : $LastChangedRevision: 1308 $
12	+// Revision : $LastChangedRevision: 1323 $
13	//
14	///////////////////////////////////////////////////////////////////////////////
15	//
16	@@ -259,7 +259,7 @@
17	} else {
18	$conttp->setVariable("HOST_OPTION_FIELDS","chbGr1a,chbGr1b,chbGr1c,chbGr1d,chbGr1f");
19	$conttp->setVariable("SERVICE_OPTION_FIELDS","chbGr2a,chbGr2b,chbGr2c,chbGr2d,chbGr2e,chbGr2g");
20	- $conttp->setVariable("VERSION_20_VALUE_MUST",",tfFriendly");
21	+ $conttp->setVariable("VERSION_20_VALUE_MUST",",tfValue2");
22	}
23	// Insert data from database in "modify" mode
24	if (isset($arrModifyData) && ($chkSelModify == "modify")) {

Lines 1-44 Link Here

(-)nagiosql/files/patch-nagiosql32-admin-templatedefinitions.php (-44 lines)
1	--- ../nagiosql/work/./nagiosql32/admin/templatedefinitions.php 2012-02-27 13:01:17.000000000 +0100
2	+++ ./nagiosql32/admin/templatedefinitions.php 2012-04-05 08:12:08.000000000 +0200
3	@@ -10,10 +10,10 @@
4	// Project : NagiosQL
5	// Component : Template definition list
6	// Website : http://www.nagiosql.org
7	-// Date : $LastChangedDate: 2012-02-27 13:01:17 +0100 (Mon, 27 Feb 2012) $
8	+// Date : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Do, 05. Apr 2012) $
9	// Author : $LastChangedBy: martin $
10	// Version : 3.2.0
11	-// Revision : $LastChangedRevision: 1257 $
12	+// Revision : $LastChangedRevision: 1315 $
13	//
14	///////////////////////////////////////////////////////////////////////////////
15	//
16	@@ -102,8 +102,10 @@
17	if ($chkMode == "add") {
18	if ($arrDefinition[1] == 1) {
19	$strSQL2 = "SELECT `template_name` FROM `tbl_".$chkPreTab."template` WHERE `id` = ".$arrDefinition[0];
20	+ $strSQL3 = "SELECT `active` FROM `tbl_".$chkPreTab."template` WHERE `id` = ".$arrDefinition[0];
21	} else {
22	$strSQL2 = "SELECT `name` FROM `tbl_".$chkPreTab."` WHERE `id` = ".$arrDefinition[0];
23	+ $strSQL3 = "SELECT `active` FROM `tbl_".$chkPreTab."` WHERE `id` = ".$arrDefinition[0];
24	}
25	if (isset($_SESSION['templatedefinition']) && is_array($_SESSION['templatedefinition'])) {
26	$intCheck = 0;
27	@@ -118,7 +120,7 @@
28	$arrTemp['idTable'] = $arrDefinition[1];
29	$arrTemp['idSort'] = 0;
30	$arrTemp['status'] = 0;
31	- $arrTemp['active'] = 0;
32	+ $arrTemp['active'] = $myDBClass->getFieldData($strSQL3)+0;
33	$_SESSION['templatedefinition'][] = $arrTemp;
34	}
35	} else {
36	@@ -127,7 +129,7 @@
37	$arrTemp['idTable'] = $arrDefinition[1];
38	$arrTemp['idSort'] = 0;
39	$arrTemp['status'] = 0;
40	- $arrTemp['active'] = 0;
41	+ $arrTemp['active'] = $myDBClass->getFieldData($strSQL3)+0;
42	$_SESSION['templatedefinition'][] = $arrTemp;
43	}
44	}

Lines 1-61 Link Here

(-)nagiosql/files/patch-nagiosql32-functions-config__class.php (-61 lines)
1	--- ../nagiosql/work/./nagiosql32/functions/config_class.php 2012-03-07 10:38:34.000000000 +0100
2	+++ ./nagiosql32/functions/config_class.php 2012-04-17 11:59:16.000000000 +0200
3	@@ -10,10 +10,10 @@
4	// Project : NagiosQL
5	// Component : Configuration Class
6	// Website : http://www.nagiosql.org
7	-// Date : $LastChangedDate: 2012-03-07 10:38:34 +0100 (Wed, 07 Mar 2012) $
8	+// Date : $LastChangedDate: 2012-04-17 11:47:05 +0200 (Di, 17. Apr 2012) $
9	// Author : $LastChangedBy: martin $
10	// Version : 3.2.0
11	-// Revision : $LastChangedRevision: 1275 $
12	+// Revision : $LastChangedRevision: 1319 $
13	//
14	///////////////////////////////////////////////////////////////////////////////////////////////
15	//
16	@@ -749,13 +749,6 @@
17	//
18	///////////////////////////////////////////////////////////////////////////////////////////
19	function createConfigSingle($strTableName,$intDbId = 0,$intMode = 0) {
20	- // Get write access groups
21	- if (isset($_SESSION['userid'])) {
22	- $strAccess = $this->myVisClass->getAccGroups('write');
23	- $strAccWhere = " AND `access_group` IN ($strAccess) ";
24	- } else {
25	- $strAccWhere = "";
26	- }
27	// Do not create configs in common domain
28	if ($this->intDomainId == 0) {
29	$this->processClassMessage(translate('It is not possible to write config files directly from the common domain!')."::",$this->strErrorMessage);
30	@@ -769,9 +762,9 @@
31	$strDomainWhere = " (`config_id`=".$this->intDomainId.") ";
32	}
33	if ($intDbId == 0) {
34	- $strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' $strAccWhere ORDER BY `id`";
35	+ $strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' ORDER BY `id`";
36	} else {
37	- $strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' $strAccWhere AND `id`=$intDbId";
38	+ $strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' AND `id`=$intDbId";
39	}
40	$booReturn = $this->myDBClass->getDataArray($strSQL,$arrData,$intDataCount);
41	if (($booReturn != false) && ($intDataCount != 0)) {
42	@@ -1381,8 +1374,8 @@
43	if ($key == "contacts") $value = $this->checkTpl($value,"contacts_tploptions","tbl_host",$intDataId,$intSkip);
44	if ($key == "contact_groups") $value = $this->checkTpl($value,"contact_groups_tploptions","tbl_host",$intDataId,$intSkip);
45	if ($key == "use") $value = $this->checkTpl($value,"use_template_tploptions","tbl_host",$intDataId,$intSkip);
46	+ if ($key == "check_command") $value = str_replace("\::bang::","\!",$value);
47	if ($key == "check_command") $value = str_replace("::bang::","\!",$value);
48	- if ($key == "check_command") $value = str_replace("::back::","\\\\",$value);
49	}
50	if ($strTableName == "tbl_service") {
51	if ($key == "use_template") $key = "use";
52	@@ -1403,8 +1396,8 @@
53	if ($key == "contacts") $value = $this->checkTpl($value,"contacts_tploptions","tbl_service",$intDataId,$intSkip);
54	if ($key == "contact_groups") $value = $this->checkTpl($value,"contact_groups_tploptions","tbl_service",$intDataId,$intSkip);
55	if ($key == "use") $value = $this->checkTpl($value,"use_template_tploptions","tbl_service",$intDataId,$intSkip);
56	+ if ($key == "check_command") $value = str_replace("\::bang::","\!",$value);
57	if ($key == "check_command") $value = str_replace("::bang::","\!",$value);
58	- if ($key == "check_command") $value = str_replace("::back::","\\\\",$value);
59	}
60	if ($strTableName == "tbl_hosttemplate") {
61	if ($key == "template_name") $key = "name";

Lines 1-24 Link Here

(-)nagiosql/files/patch-nagiosql32-functions-import__class.php (-24 lines)
1	--- ../nagiosql/work/./nagiosql32/functions/import_class.php 2012-03-07 10:38:34.000000000 +0100
2	+++ ./nagiosql32/functions/import_class.php 2012-04-17 11:47:08.000000000 +0200
3	@@ -10,10 +10,10 @@
4	// Project : NagiosQL
5	// Component : Import Class
6	// Website : http://www.nagiosql.org
7	-// Date : $LastChangedDate: 2012-03-07 10:38:34 +0100 (Wed, 07 Mar 2012) $
8	+// Date : $LastChangedDate: 2012-04-17 11:47:05 +0200 (Di, 17. Apr 2012) $
9	// Author : $LastChangedBy: martin $
10	// Version : 3.2.0
11	-// Revision : $LastChangedRevision: 1275 $
12	+// Revision : $LastChangedRevision: 1319 $
13	//
14	///////////////////////////////////////////////////////////////////////////////////////////////
15	//
16	@@ -75,7 +75,7 @@
17	$intRemoveTmp = 0;
18	$strFileName = trim($strFileName);
19	$intReturn = $this->myConfigClass->getConfigData($intConfigId,"method",$intMethod);
20	- if ($intReturn != 0) { $this->strErrorMessage .= translate('Unable to get configuration data:')."method::"; return(1); }
21	+ if ($intReturn != 0) { $this->strErrorMessage .= translate('Unable to get configuration data:')." method::"; return(1); }
22	// Read import file
23	// Local file system
24	if ($intMethod == 1) {

Lines 1-32 Link Here

(-)nagiosql/files/patch-nagiosql32-functions-prepend__content.php (-32 lines)
1	--- ../nagiosql/work/./nagiosql32/functions/prepend_content.php 2012-02-29 11:01:14.000000000 +0100
2	+++ ./nagiosql32/functions/prepend_content.php 2012-04-04 07:30:16.000000000 +0200
3	@@ -178,6 +178,14 @@
4	$chkTfValue19 = addslashes($chkTfValue19);
5	$chkTfValue20 = addslashes($chkTfValue20);
6	$chkTaValue1 = addslashes($chkTaValue1);
7	+ $chkTfArg1 = addslashes($chkTfArg1);
8	+ $chkTfArg2 = addslashes($chkTfArg2);
9	+ $chkTfArg3 = addslashes($chkTfArg3);
10	+ $chkTfArg4 = addslashes($chkTfArg4);
11	+ $chkTfArg5 = addslashes($chkTfArg5);
12	+ $chkTfArg6 = addslashes($chkTfArg6);
13	+ $chkTfArg7 = addslashes($chkTfArg7);
14	+ $chkTfArg8 = addslashes($chkTfArg8);
15	$chkTaFileText = addslashes($chkTaFileText);
16	}
17	//
18	@@ -204,6 +212,14 @@
19	$chkTfValue18 = $myVisClass->tfSecure($chkTfValue18);
20	$chkTfValue19 = $myVisClass->tfSecure($chkTfValue19);
21	$chkTfValue20 = $myVisClass->tfSecure($chkTfValue20);
22	+$chkTfArg1 = $myVisClass->tfSecure($chkTfArg1);
23	+$chkTfArg2 = $myVisClass->tfSecure($chkTfArg2);
24	+$chkTfArg3 = $myVisClass->tfSecure($chkTfArg3);
25	+$chkTfArg4 = $myVisClass->tfSecure($chkTfArg4);
26	+$chkTfArg5 = $myVisClass->tfSecure($chkTfArg5);
27	+$chkTfArg6 = $myVisClass->tfSecure($chkTfArg6);
28	+$chkTfArg7 = $myVisClass->tfSecure($chkTfArg7);
29	+$chkTfArg8 = $myVisClass->tfSecure($chkTfArg8);
30	$chkTaValue1 = $myVisClass->tfSecure($chkTaValue1);
31	$chkTaFileText = stripslashes($chkTaFileText);
32	//

Line 0 Link Here

(-)nagiosql/files/pkg-install.in (+22 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD$
	4
	5	WWWOWN=%%WWWOWN%%
	6	WWWGRP=%%WWWGRP%%
	7	NAGIOSUSER=%%NAGIOSUSER%%
	8
	9	ETCDIR=%%ETCDIR%%
	10	WWWDIR=%%WWWDIR%%
	11
	12	if [ "$2" = "POST-INSTALL" ]; then
	13	echo "=========== p o s t - i n s t a l l ================="
	14	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}
	15	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/ssh
	16	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/hosts
	17	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/services
	18	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/backup
	19	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/backup/hosts
	20	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/backup/services
	21	chown ${WWWOWN}:${WWWGRP} ${WWWDIR}/config
	22	fi

Lines 8-14 Link Here

(-)nagiosql/pkg-plist (-11 / +26 lines)
8	%%WWWDIR%%/admin/configtargets.php	8	%%WWWDIR%%/admin/configtargets.php
9	%%WWWDIR%%/admin/contactgroups.php	9	%%WWWDIR%%/admin/contactgroups.php
10	%%WWWDIR%%/admin/contacts.php	10	%%WWWDIR%%/admin/contacts.php
11	%%WWWDIR%%/admin/contacts.php.orig
12	%%WWWDIR%%/admin/contacttemplates.php	11	%%WWWDIR%%/admin/contacttemplates.php
13	%%WWWDIR%%/admin/datadomain.php	12	%%WWWDIR%%/admin/datadomain.php
14	%%WWWDIR%%/admin/delbackup.php	13	%%WWWDIR%%/admin/delbackup.php
Lines 22-28 Link Here
22	%%WWWDIR%%/admin/hostextinfo.php	21	%%WWWDIR%%/admin/hostextinfo.php
23	%%WWWDIR%%/admin/hostgroups.php	22	%%WWWDIR%%/admin/hostgroups.php
24	%%WWWDIR%%/admin/hosts.php	23	%%WWWDIR%%/admin/hosts.php
25	%%WWWDIR%%/admin/hosts.php.orig
26	%%WWWDIR%%/admin/hosttemplates.php	24	%%WWWDIR%%/admin/hosttemplates.php
27	%%WWWDIR%%/admin/import.php	25	%%WWWDIR%%/admin/import.php
28	%%WWWDIR%%/admin/index.html	26	%%WWWDIR%%/admin/index.html
Lines 38-50 Link Here
38	%%WWWDIR%%/admin/serviceextinfo.php	36	%%WWWDIR%%/admin/serviceextinfo.php
39	%%WWWDIR%%/admin/servicegroups.php	37	%%WWWDIR%%/admin/servicegroups.php
40	%%WWWDIR%%/admin/services.php	38	%%WWWDIR%%/admin/services.php
41	%%WWWDIR%%/admin/services.php.orig
42	%%WWWDIR%%/admin/servicetemplates.php	39	%%WWWDIR%%/admin/servicetemplates.php
43	%%WWWDIR%%/admin/settings.php	40	%%WWWDIR%%/admin/settings.php
44	%%WWWDIR%%/admin/specials.php	41	%%WWWDIR%%/admin/specials.php
45	%%WWWDIR%%/admin/support.php	42	%%WWWDIR%%/admin/support.php
46	%%WWWDIR%%/admin/templatedefinitions.php	43	%%WWWDIR%%/admin/templatedefinitions.php
47	%%WWWDIR%%/admin/templatedefinitions.php.orig
48	%%WWWDIR%%/admin/timedefinitions.php	44	%%WWWDIR%%/admin/timedefinitions.php
49	%%WWWDIR%%/admin/timeperiods.php	45	%%WWWDIR%%/admin/timeperiods.php
50	%%WWWDIR%%/admin/tools.php	46	%%WWWDIR%%/admin/tools.php
Lines 66-71 Link Here
66	%%WWWDIR%%/config/locale/en_GB/LC_MESSAGES/en_GB.po	62	%%WWWDIR%%/config/locale/en_GB/LC_MESSAGES/en_GB.po
67	%%WWWDIR%%/config/locale/en_GB/LC_MESSAGES/index.html	63	%%WWWDIR%%/config/locale/en_GB/LC_MESSAGES/index.html
68	%%WWWDIR%%/config/locale/en_GB/index.html	64	%%WWWDIR%%/config/locale/en_GB/index.html
		65	%%WWWDIR%%/config/locale/es_AR/LC_MESSAGES/es_AR.mo
		66	%%WWWDIR%%/config/locale/es_AR/LC_MESSAGES/es_AR.po
		67	%%WWWDIR%%/config/locale/es_AR/LC_MESSAGES/index.html
		68	%%WWWDIR%%/config/locale/es_AR/index.html
69	%%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/es_ES.mo	69	%%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/es_ES.mo
70	%%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/es_ES.po	70	%%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/es_ES.po
71	%%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/index.html	71	%%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/index.html
Lines 78-87 Link Here
78	%%WWWDIR%%/config/locale/it_IT/LC_MESSAGES/it_IT.mo	78	%%WWWDIR%%/config/locale/it_IT/LC_MESSAGES/it_IT.mo
79	%%WWWDIR%%/config/locale/it_IT/LC_MESSAGES/it_IT.po	79	%%WWWDIR%%/config/locale/it_IT/LC_MESSAGES/it_IT.po
80	%%WWWDIR%%/config/locale/it_IT/index.html	80	%%WWWDIR%%/config/locale/it_IT/index.html
		81	%%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES/index.html
		82	%%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES/ja_JP.mo
		83	%%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES/ja_JP.po
		84	%%WWWDIR%%/config/locale/ja_JP/index.html
81	%%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/index.html	85	%%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/index.html
82	%%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/nl_NL.mo	86	%%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/nl_NL.mo
83	%%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/nl_NL.po	87	%%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/nl_NL.po
84	%%WWWDIR%%/config/locale/nl_NL/index.html	88	%%WWWDIR%%/config/locale/nl_NL/index.html
		89	%%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES/index.html
		90	%%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES/pl_PL.mo
		91	%%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES/pl_PL.po
		92	%%WWWDIR%%/config/locale/pl_PL/index.html
85	%%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/index.html	93	%%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/index.html
86	%%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/pt_BR.mo	94	%%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/pt_BR.mo
87	%%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/pt_BR.po	95	%%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/pt_BR.po
Lines 104-120 Link Here
104	%%WWWDIR%%/favicon.ico	112	%%WWWDIR%%/favicon.ico
105	%%WWWDIR%%/functions/common.js	113	%%WWWDIR%%/functions/common.js
106	%%WWWDIR%%/functions/config_class.php	114	%%WWWDIR%%/functions/config_class.php
107	%%WWWDIR%%/functions/config_class.php.orig
108	%%WWWDIR%%/functions/content_class.php	115	%%WWWDIR%%/functions/content_class.php
109	%%WWWDIR%%/functions/data_class.php	116	%%WWWDIR%%/functions/data_class.php
110	%%WWWDIR%%/functions/import_class.php	117	%%WWWDIR%%/functions/import_class.php
111	%%WWWDIR%%/functions/import_class.php.orig
112	%%WWWDIR%%/functions/mysql_class.php	118	%%WWWDIR%%/functions/mysql_class.php
113	%%WWWDIR%%/functions/nag_class.php	119	%%WWWDIR%%/functions/nag_class.php
114	%%WWWDIR%%/functions/prepend_adm.php	120	%%WWWDIR%%/functions/prepend_adm.php
115	%%WWWDIR%%/functions/prepend_adm.php.orig
116	%%WWWDIR%%/functions/prepend_content.php	121	%%WWWDIR%%/functions/prepend_content.php
117	%%WWWDIR%%/functions/prepend_content.php.orig
118	%%WWWDIR%%/functions/prepend_scripting.php	122	%%WWWDIR%%/functions/prepend_scripting.php
119	%%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/langs/en.js	123	%%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/langs/en.js
120	%%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/license.txt	124	%%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/license.txt
Lines 355-361 Link Here
355	%%WWWDIR%%/templates/admin/support.tpl.htm	359	%%WWWDIR%%/templates/admin/support.tpl.htm
356	%%WWWDIR%%/templates/admin/timeperiods.tpl.htm	360	%%WWWDIR%%/templates/admin/timeperiods.tpl.htm
357	%%WWWDIR%%/templates/admin/user.tpl.htm	361	%%WWWDIR%%/templates/admin/user.tpl.htm
358	%%WWWDIR%%/templates/admin/user.tpl.htm.orig
359	%%WWWDIR%%/templates/admin/verify.tpl.htm	362	%%WWWDIR%%/templates/admin/verify.tpl.htm
360	%%WWWDIR%%/templates/files/commands.tpl.dat	363	%%WWWDIR%%/templates/files/commands.tpl.dat
361	%%WWWDIR%%/templates/files/contactgroups.tpl.dat	364	%%WWWDIR%%/templates/files/contactgroups.tpl.dat
Lines 463-476 Link Here
463	@dirrm %%WWWDIR%%/config/locale/ru_RU	466	@dirrm %%WWWDIR%%/config/locale/ru_RU
464	@dirrm %%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES	467	@dirrm %%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES
465	@dirrm %%WWWDIR%%/config/locale/pt_BR	468	@dirrm %%WWWDIR%%/config/locale/pt_BR
		469	@dirrm %%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES
		470	@dirrm %%WWWDIR%%/config/locale/pl_PL
466	@dirrm %%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES	471	@dirrm %%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES
467	@dirrm %%WWWDIR%%/config/locale/nl_NL	472	@dirrm %%WWWDIR%%/config/locale/nl_NL
		473	@dirrm %%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES
		474	@dirrm %%WWWDIR%%/config/locale/ja_JP
468	@dirrm %%WWWDIR%%/config/locale/it_IT/LC_MESSAGES	475	@dirrm %%WWWDIR%%/config/locale/it_IT/LC_MESSAGES
469	@dirrm %%WWWDIR%%/config/locale/it_IT	476	@dirrm %%WWWDIR%%/config/locale/it_IT
470	@dirrm %%WWWDIR%%/config/locale/fr_FR/LC_MESSAGES	477	@dirrm %%WWWDIR%%/config/locale/fr_FR/LC_MESSAGES
471	@dirrm %%WWWDIR%%/config/locale/fr_FR	478	@dirrm %%WWWDIR%%/config/locale/fr_FR
472	@dirrm %%WWWDIR%%/config/locale/es_ES/LC_MESSAGES	479	@dirrm %%WWWDIR%%/config/locale/es_ES/LC_MESSAGES
473	@dirrm %%WWWDIR%%/config/locale/es_ES	480	@dirrm %%WWWDIR%%/config/locale/es_ES
		481	@dirrm %%WWWDIR%%/config/locale/es_AR/LC_MESSAGES
		482	@dirrm %%WWWDIR%%/config/locale/es_AR
474	@dirrm %%WWWDIR%%/config/locale/en_GB/LC_MESSAGES	483	@dirrm %%WWWDIR%%/config/locale/en_GB/LC_MESSAGES
475	@dirrm %%WWWDIR%%/config/locale/en_GB	484	@dirrm %%WWWDIR%%/config/locale/en_GB
476	@dirrm %%WWWDIR%%/config/locale/de_DE/LC_MESSAGES	485	@dirrm %%WWWDIR%%/config/locale/de_DE/LC_MESSAGES
Lines 478-483 Link Here
478	@dirrm %%WWWDIR%%/config/locale/da_DK/LC_MESSAGES	487	@dirrm %%WWWDIR%%/config/locale/da_DK/LC_MESSAGES
479	@dirrm %%WWWDIR%%/config/locale/da_DK	488	@dirrm %%WWWDIR%%/config/locale/da_DK
480	@dirrm %%WWWDIR%%/config/locale	489	@dirrm %%WWWDIR%%/config/locale
481	@dirrm %%WWWDIR%%/config	490	@dirrmtry %%WWWDIR%%/config
482	@dirrm %%WWWDIR%%/admin	491	@dirrm %%WWWDIR%%/admin
483	@dirrm %%WWWDIR%%	492	@dirrmtry %%WWWDIR%%
		493	@dirrmtry %%ETCDIR%%/services
		494	@dirrmtry %%ETCDIR%%/hosts
		495	@dirrmtry %%ETCDIR%%/backup/services
		496	@dirrmtry %%ETCDIR%%/backup/hosts
		497	@dirrmtry %%ETCDIR%%/backup
		498	@dirrmtry %%ETCDIR%%