debmon
/
nagiosql
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

intial commit

This commit is contained in:
Mario Fetka 2017-05-22 11:26:31 +02:00
parent c4f4701ef1
commit b9adf21bc5
24 changed files with 2662 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
debian/README.Debian vendored Normal file
View File

@ -0,0 +1,49 @@
NagiosQL for Debian
-------------------
NagiosQL comes with a web based installer. For security reason you have to
enable it manually:
sudo touch /usr/share/nagiosql/htdocs/install/ENABLE_INSTALLER
Start your browser and enter http://<yourhost>/nagiosql.
After installation, you must remove the file ENABLE_INSTALLER, otherwise
you can' start using NagiosQL:
sudo rm /usr/share/nagiosql/htdocs/install/ENABLE_INSTALLER
In the Webfrontend of NagiosQL login in as user Admin and go to
Administration/Domains -> domain 'localhost'. Please check the settings and
change it to your needs.
For security reasons nagios.cfg and cgi.cfg are not writeable to www-data
as NagiosQL request it. You can read the config files through the web
frontend, but not edit. Unfortunately NagiosQL requests a writeable
nagios.cfg for adding domains or changing values of existing domains.
You can perform the following steps to change permissions of nagios.cfg and
cgi.cfg permanently:
dpkg-statoverride --update --add nagios www-data 0664 /etc/nagios4/nagios.cfg
dpkg-statoverride --update --add nagios www-data 0664 /etc/nagios4/cgi.cfg
Additional remarks:
- this package comes with a configured domain 'localhost' and uses the
following pathes:
/etc/nagiosql/domains/localhost = misc nagios objects
/etc/nagiosql/domains/localhost/hosts = host object
/etc/nagiosql/domains/localhost/services = service objects
/etc/nagiosql/domain-backups/localhost
/etc/nagiosql/domain-backups/localhost/hosts
/etc/nagiosql/domain-backups/localhost/services
- add the following line to nagios.cfg:
cfg_dir=/etc/nagiosql/domains/localhost
check the configs via the web interface and reload nagios4:
/etc/init.d/nagios4 reload
-- Wolfgang Barth <wob@swobspace.net> Sat, 13 Jun 2009 12:30:28 +0200

4
debian/README.source vendored Normal file
View File

@ -0,0 +1,4 @@
This package uses quilt to manage all modifications to the upstream source.
See /usr/share/doc/quilt/README.source for instructions how to generate the
patched source, add a new modification, and remove an existing one.

17
debian/apache.conf vendored Normal file
View File

@ -0,0 +1,17 @@
Alias /nagiosql "/usr/share/nagiosql/htdocs"
<Directory "/usr/share/nagiosql/htdocs">
Options FollowSymLinks
DirectoryIndex index.php
<IfVersion < 2.3>
Order Allow,Deny
Allow From All
</IfVersion>
<IfVersion >= 2.3>
Require all granted
</IfVersion>
</Directory>

26
debian/changelog vendored Normal file
View File

@ -0,0 +1,26 @@
nagiosql (3.2.0-4) UNRELEASED; urgency=medium
* Bump to 3.2.0 branch with servicepack 3
* drop dpatch and switch to quilt
* switch to nagios4 for default nagios implementation
* many small bugfixes for mysqli
-- Mario Fetka <mario.fetka@gmail.com> Sun, 21 May 2017 19:21:36 +0200
nagiosql (3.0.3-1ubuntu2) lucid; urgency=low
* Add missing dependency - dpatch
-- fenris <fenris@ubuntu.com> Tue, 16 Mar 2010 16:41:12 +0800
nagiosql (3.0.3-1ubuntu1) karmic; urgency=low
* Initial release for Ubuntu
-- fenris <fenris@ubuntu.com> Thu, 04 Feb 2010 20:53:48 +0800
nagiosql (3.0.3-1) unstable; urgency=low
* Initial release (Closes: #0000)
-- Wolfgang Barth <wob@swobspace.net> Sat, 13 Jun 2009 12:30:28 +0200

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
8

32
debian/control vendored Normal file
View File

@ -0,0 +1,32 @@
Source: nagiosql
Section: net
Priority: optional
Maintainer: fenris@ubuntu.com
XSBC-Original-Maintainer: Wolfgang Barth <wob@swobspace.net>
Build-Depends: debhelper (>= 7), default-mysql-server | mysql-server, php7.0-ldap | php5-ldap , php7.0-mysql | php5-mysql, rsync
Standards-Version: 3.8.0
Homepage: http://www.nagiosql.org
Package: nagiosql
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, php-ssh2
Recommends: nagios4
Description: Web based administration tool for Nagios 2 and above
It helps you to easily build a complex configuration with all options,
manage and use them. NagiosQL is based on a webserver with PHP, MySQL and
local file or remote access to the Nagios configuration files.
.
The main features are:
.
* create, delete, modify and copy settings
* create and export configuration files
* create and download configuration files
* easy configuration import
* auto backup configuration files
* consistency checks
* syntax verification
* user management
* instant activation of new configs
* many translations
* easy Installation Wizard
* MySQL database platform

43
debian/copyright vendored Normal file
View File

@ -0,0 +1,43 @@
This package was debianized by Wolfgang Barth <wob@swobspace.net> on
Sat, 13 Jun 2009 11:16:45 +0200.
It was downloaded from http://www.nagiosql.org
Upstream Authors:
Martin Willisegger
Rouven Homann
Copyright:
Copyright (C) 2008, 2009 by Martin Willisegger
License:
Redistribution and use in source and binary forms, with or without
modification, are permitted under the terms of the BSD License.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
On Debian systems, the complete text of the BSD License can be
found in `/usr/share/common-licenses/BSD'.
NagiosQL comes with tinymce. The license can be found in
usr/share/nagiosql/htdocs/functions/tinyMCE/jscripts/tiny_mce/license.txt.
The Debian packaging is copyright 2009, Wolfgang Barth <wob@swobspace.net> and
is licensed under the GPL version 2, see `/usr/share/common-licenses/GPL-2'.
To build the package, the original tar file nagiosql3xy.tar.gz has to be
repacked. The content of the upstream source is now in the directory
nagiosql-<version>.orig/.

6
debian/dirs vendored Normal file
View File

@ -0,0 +1,6 @@
usr/share/nagiosql/htdocs
etc/nagiosql
etc/nagiosql/hosts
etc/nagiosql/services
etc/nagiosql/backup/hosts
etc/nagiosql/backup/services

7
debian/docs vendored Normal file
View File

@ -0,0 +1,7 @@
doc/INSTALLATION_deDE.txt
doc/INSTALLATION_enGB.txt
doc/CHANGELOG
doc/README_SSH_KEY
doc/LICENSE
doc/LIZENZ
README.md

1
debian/links vendored Normal file
View File

@ -0,0 +1 @@
etc/nagiosql/apache.conf etc/apache2/conf-available/nagiosql.conf

33
debian/nagiosql.1 vendored Normal file
View File

@ -0,0 +1,33 @@
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH NAGIOSQL SECTION "June 13, 2009"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
nagiosql \- Web based administration tool for Nagios 2 and above
.SH SYNOPSIS
.B http://localhost/nagiosql
.SH DESCRIPTION
nagiosql is web based, so start your browser and enter
http://localhost/nagiosql.
.SH SEE ALSO
.BR /usr/share/doc/nagiosql/*
.br
.BR http://www.nagiosql.org
.SH AUTHOR
nagiosql was written by Martin Willsegger
.PP
This manual page was written by Wolfgang Barth <wob@swobspace.net>,
for the Debian project (and may be used by others).

5
debian/nagiosql.lintian-overrides vendored Normal file
View File

@ -0,0 +1,5 @@
nagiosql: extra-license-file usr/share/nagiosql/htdocs/functions/tinyMCE/jscripts/tiny_mce/license.txt
nagiosql: embedded-javascript-library usr/share/nagiosql/htdocs/functions/tinyMCE/jscripts/tiny_mce/tiny_mce.js
nagiosql: embedded-javascript-library usr/share/nagiosql/htdocs/functions/tinyMCE/jscripts/tiny_mce/tiny_mce_popup.js
nagiosql: embedded-javascript-library usr/share/nagiosql/htdocs/functions/yui/build/yahoo-dom-event/yahoo-dom-event.js
nagiosql: embedded-javascript-library usr/share/nagiosql/htdocs/install/js/prototype.js

280
debian/patches/10_service_pack_1_additional_fixes_only.patch vendored Normal file
View File

@ -0,0 +1,280 @@
diff -uNr nagiosql32.orig/admin/contacts.php nagiosql32/admin/contacts.php
--- nagiosql32.orig/admin/contacts.php 2012-04-20 12:39:53.983095000 +0200
+++ nagiosql32/admin/contacts.php 2012-04-20 12:39:56.000000000 +0200
@@ -10,7 +10,7 @@
// Project : NagiosQL
// Component : Contact definitions
// Website : http://www.nagiosql.org
-// Date : $LastChangedDate: 2012-04-20 12:39:53 +0200 (Fri, 20 Apr 2012) $
+// Date : $LastChangedDate: 2012-04-20 12:39:53 +0200 (Fr, 20. Apr 2012) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
// Revision : $LastChangedRevision: 1323 $
diff -uNr nagiosql32.orig/admin/hosts.php nagiosql32/admin/hosts.php
--- nagiosql32.orig/admin/hosts.php 2012-04-17 12:09:50.082574000 +0200
+++ nagiosql32/admin/hosts.php 2012-04-17 11:54:12.000000000 +0200
@@ -10,10 +10,10 @@
// Project : NagiosQL
// Component : Host definition
// Website : http://www.nagiosql.org
-// Date : $LastChangedDate: 2012-04-17 12:09:50 +0200 (Tue, 17 Apr 2012) $
+// Date : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Do, 05. Apr 2012) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
-// Revision : $LastChangedRevision: 1321 $
+// Revision : $LastChangedRevision: 1315 $
//
///////////////////////////////////////////////////////////////////////////////
//
diff -uNr nagiosql32.orig/admin/services.php nagiosql32/admin/services.php
--- nagiosql32.orig/admin/services.php 2012-04-17 12:09:50.082574000 +0200
+++ nagiosql32/admin/services.php 2012-04-17 11:53:36.000000000 +0200
@@ -10,10 +10,10 @@
// Project : NagiosQL
// Component : Service definition
// Website : http://www.nagiosql.org
-// Date : $LastChangedDate: 2012-04-17 12:09:50 +0200 (Tue, 17 Apr 2012) $
+// Date : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Do, 05. Apr 2012) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
-// Revision : $LastChangedRevision: 1321 $
+// Revision : $LastChangedRevision: 1315 $
//
///////////////////////////////////////////////////////////////////////////////
//
diff -uNr nagiosql32.orig/admin/templatedefinitions.php nagiosql32/admin/templatedefinitions.php
--- nagiosql32.orig/admin/templatedefinitions.php 2012-04-05 08:11:59.091878000 +0200
+++ nagiosql32/admin/templatedefinitions.php 2012-04-05 08:12:08.000000000 +0200
@@ -10,7 +10,7 @@
// Project : NagiosQL
// Component : Template definition list
// Website : http://www.nagiosql.org
-// Date : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Thu, 05 Apr 2012) $
+// Date : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Do, 05. Apr 2012) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
// Revision : $LastChangedRevision: 1315 $
diff -uNr nagiosql32.orig/functions/config_class.php nagiosql32/functions/config_class.php
--- nagiosql32.orig/functions/config_class.php 2013-01-10 09:46:11.799949000 +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: 2013-01-10 09:46:11 +0100 (Thu, 10 Jan 2013) $
+// Date : $LastChangedDate: 2012-04-17 11:47:05 +0200 (Di, 17. Apr 2012) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
-// Revision : $LastChangedRevision: 1351 $
+// Revision : $LastChangedRevision: 1319 $
//
///////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -710,8 +710,6 @@
} else {
$this->myDataClass->writeLog(translate('Writing of the configuration failed - no dataset or not activated dataset found'));
$this->processClassMessage(translate('Writing of the configuration failed - no dataset or not activated dataset found')."::",$this->strErrorMessage);
- $configtp->parse();
- $booReturn = $this->writeConfigFile($configtp->get(),$strFile,0,$intConfigID,$resConfigFile,$strConfigFile);
return(1);
}
$configtp->parse();
@@ -1254,7 +1252,7 @@
if ($strDataValue == 2) {$strDataValue = "*,";} else {$strDataValue = "";}
foreach ($arrDataRel AS $data) {
if ($data['exclude'] == 0) {
- $strDataValue .= $data['strSlave'].",";
+ $strDataValue .= $data['strSlave'].",";
} else if ($this->intNagVersion >=3) {
$strDataValue .= "!".$data['strSlave'].",";
}
diff -uNr nagiosql32.orig/functions/import_class.php nagiosql32/functions/import_class.php
--- nagiosql32.orig/functions/import_class.php 2012-09-18 10:44:22.198475000 +0200
+++ 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-09-18 10:44:22 +0200 (Tue, 18 Sep 2012) $
+// Date : $LastChangedDate: 2012-04-17 11:47:05 +0200 (Di, 17. Apr 2012) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
-// Revision : $LastChangedRevision: 1346 $
+// Revision : $LastChangedRevision: 1319 $
//
///////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -899,7 +899,6 @@
$booResult = $this->myDBClass->insertData($strSQL);
if ($booResult == false) $this->strErrorMessage .= $this->myDBClass->strErrorMessage;
$intSlaveId = $this->myDBClass->intLastId;
-
// Special processing for serviceextinfo
if (($strDataTable == "tbl_serviceextinfo") && ($strKey == "service_description")) {
$strSQL = "SELECT `id` FROM `tbl_host` WHERE `host_name`='".$arrImportData['host_name']['value']."'";
@@ -997,7 +996,7 @@
}
// Does the entry already exist?
$strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` $strLink WHERE `".$arrRelData['target1']."` = '".$elem."'
- $strWhere AND `config_id`=".$this->intDomainId;
+ $strWhere AND `active`='1' AND `config_id`=".$this->intDomainId;
$strId = $this->myDBClass->getFieldData($strSQL);
if ($strId != "") {
$intSlaveId = $strId+0;
@@ -1014,7 +1013,7 @@
}
// Insert relations
$strSQL = "INSERT INTO `".$arrRelData['linkTable']."` SET `idMaster` = ".$intDataId.", `idSlave` = ".$intSlaveId.",
- `exclude`=".$intExclude;
+ `exclude`=".$intExclude;
$booResult = $this->myDBClass->insertData($strSQL);
if ($booResult == false) $this->strErrorMessage .= $this->myDBClass->strErrorMessage;
// Keep values
@@ -1105,7 +1104,7 @@
// Process data values
foreach ($arrValues AS $elem) {
// Does the template already exist? (table 1)
- $strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` WHERE `".$arrRelData['target1']."` = '".$elem."'
+ $strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` WHERE `".$arrRelData['target1']."` = '".$elem."' AND `active`='1'
AND `config_id`=".$this->intDomainId;
$strId = $this->myDBClass->getFieldData($strSQL);
if ($strId != "") {
@@ -1114,7 +1113,7 @@
}
if ($intSlaveId == 0) {
// Does the template already exist? (table 2)
- $strSQL = "SELECT `id` FROM `".$arrRelData['tableName2']."` WHERE `".$arrRelData['target2']."` = '".$elem."'
+ $strSQL = "SELECT `id` FROM `".$arrRelData['tableName2']."` WHERE `".$arrRelData['target2']."` = '".$elem."' AND `active`='1'
AND `config_id`=".$this->intDomainId;
$strId = $this->myDBClass->getFieldData($strSQL);
if ($strId != "") {
@@ -1219,8 +1218,7 @@
// Process data values
foreach ($arrValues AS $elem) {
// Does the entry already exist?
- $strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` WHERE `".$arrRelData['target1']."` = '".$elem."'
- AND `config_id`=".$this->intDomainId;
+ $strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` WHERE `".$arrRelData['target1']."` = '".$elem."' AND `active`='1' AND `config_id`=".$this->intDomainId;
$strId = $this->myDBClass->getFieldData($strSQL);
if ($strId != "") {
$intSlaveId = $strId+0;
@@ -1422,7 +1420,7 @@
}
// Does the entry already exist?
$strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` WHERE `".$arrRelData['target1']."` = '".$elem."'
- $strWhere AND `config_id`=".$this->intDomainId;
+ $strWhere AND `active`='1' AND `config_id`=".$this->intDomainId;
$strId = $this->myDBClass->getFieldData($strSQL);
if ($strId != "") {
$intSlaveId = $strId+0;
diff -uNr nagiosql32.orig/functions/prepend_adm.php nagiosql32/functions/prepend_adm.php
--- nagiosql32.orig/functions/prepend_adm.php 2013-01-10 09:46:11.799949000 +0100
+++ nagiosql32/functions/prepend_adm.php 2012-03-27 12:47:58.000000000 +0200
@@ -9,14 +9,14 @@
// Project : NagiosQL
// Component : Preprocessing script
// Website : http://www.nagiosql.org
-// Date : $LastChangedDate: 2013-01-10 09:46:11 +0100 (Thu, 10 Jan 2013) $
+// Date : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Di, 27. Mär 2012) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
-// Revision : $LastChangedRevision: 1351 $
+// Revision : $LastChangedRevision: 1308 $
//
///////////////////////////////////////////////////////////////////////////////
//error_reporting(E_ALL);
-error_reporting(E_ALL & ~E_STRICT);
+error_reporting(E_ALL);
//
// Security Protection
// ===================
@@ -253,7 +253,7 @@
$_SESSION['userid'] = $arrDataUser[0]['id'];
$_SESSION['groupadm'] = $arrDataUser[0]['admin_enable'];
$_SESSION['startsite'] = $_SESSION['SETS']['path']['base_url']."admin.php";
- $_SESSION['timestamp'] = time();
+ $_SESSION['timestamp'] = mktime();
$_SESSION['logged_in'] = 1;
$_SESSION['domain'] = $arrDataUser[0]['domain'];
// Update language settings
@@ -273,10 +273,8 @@
}
}
if (($_SESSION['logged_in'] == 0) && isset($chkInsName) && ($chkInsName != "") && ($intError == 0)) {
- $chkInsName = mysql_real_escape_string($chkInsName);
- $chkInsPasswd = mysql_real_escape_string($chkInsPasswd);
- $strSQL = "SELECT * FROM `tbl_user` WHERE `username`='".$chkInsName."'
- AND `password`=MD5('".$chkInsPasswd."') AND `active`='1'";
+ $strSQL = "SELECT * FROM `tbl_user` WHERE `username`='".mysql_real_escape_string($chkInsName)."'
+ AND `password`=MD5('$chkInsPasswd') AND `active`='1'";
$booReturn = $myDBClass->getDataArray($strSQL,$arrDataUser,$intDataCount);
if ($booReturn == false) {
$myVisClass->processMessage(translate('Error while selecting data from database:'),$strErrorMessage);
@@ -288,7 +286,7 @@
$_SESSION['userid'] = $arrDataUser[0]['id'];
$_SESSION['groupadm'] = $arrDataUser[0]['admin_enable'];
$_SESSION['startsite'] = $_SESSION['SETS']['path']['base_url'] ."admin.php";
- $_SESSION['timestamp'] = time();
+ $_SESSION['timestamp'] = mktime();
$_SESSION['logged_in'] = 1;
$_SESSION['domain'] = $arrDataUser[0]['domain'];
// Update language settings
@@ -329,9 +327,9 @@
$myVisClass->processMessage($myDBClass->strErrorMessage,$strErrorMessage);
} else if ($intDataCount == 1) {
// Time expired?
- if (time() - $_SESSION['timestamp'] > $_SESSION['SETS']['security']['logofftime']) {
+ if (mktime() - $_SESSION['timestamp'] > $_SESSION['SETS']['security']['logofftime']) {
// Force new login
- $myDataClass->writeLog(translate('Session timeout reached - Seconds:')." ".(time() - $_SESSION['timestamp']." - User: ".$_SESSION['username']));
+ $myDataClass->writeLog(translate('Session timeout reached - Seconds:')." ".(mktime() - $_SESSION['timestamp']." - User: ".$_SESSION['username']));
$_SESSION['logged_in'] = 0;
header("Location: ".$_SESSION['SETS']['path']['protocol']."://".$_SERVER['HTTP_HOST'].$_SESSION['SETS']['path']['base_url']."index.php");
@@ -347,7 +345,7 @@
}
}
// Update login time
- $_SESSION['timestamp'] = time();
+ $_SESSION['timestamp'] = mktime();
if (isset($preContent) && ($preContent == "index.tpl.htm")) {
header("Location: ".$_SESSION['SETS']['path']['protocol']."://".$_SERVER['HTTP_HOST'].$_SESSION['startsite']);
}
diff -uNr nagiosql32.orig/functions/prepend_content.php nagiosql32/functions/prepend_content.php
--- nagiosql32.orig/functions/prepend_content.php 2012-05-03 15:15:32.673020000 +0200
+++ nagiosql32/functions/prepend_content.php 2012-04-04 07:30:16.000000000 +0200
@@ -144,14 +144,14 @@
$chkButValue3 = isset($_POST['butValue3']) ? $_POST['butValue3'] : ""; // Common button value
$chkButValue4 = isset($_POST['butValue4']) ? $_POST['butValue4'] : ""; // Common button value
$chkButValue5 = isset($_POST['butValue5']) ? $_POST['butValue5'] : ""; // Common button value
-$chkTfNullVal1 = (isset($_POST['tfNullVal1']) && ($_POST['tfNullVal1'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal1'])+0 : "NULL"; // Common text NULL field value
-$chkTfNullVal2 = (isset($_POST['tfNullVal2']) && ($_POST['tfNullVal2'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal2'])+0 : "NULL"; // Common text NULL field value
-$chkTfNullVal3 = (isset($_POST['tfNullVal3']) && ($_POST['tfNullVal3'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal3'])+0 : "NULL"; // Common text NULL field value
-$chkTfNullVal4 = (isset($_POST['tfNullVal4']) && ($_POST['tfNullVal4'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal4'])+0 : "NULL"; // Common text NULL field value
-$chkTfNullVal5 = (isset($_POST['tfNullVal5']) && ($_POST['tfNullVal5'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal5'])+0 : "NULL"; // Common text NULL field value
-$chkTfNullVal6 = (isset($_POST['tfNullVal6']) && ($_POST['tfNullVal6'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal6'])+0 : "NULL"; // Common text NULL field value
-$chkTfNullVal7 = (isset($_POST['tfNullVal7']) && ($_POST['tfNullVal7'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal7'])+0 : "NULL"; // Common text NULL field value
-$chkTfNullVal8 = (isset($_POST['tfNullVal8']) && ($_POST['tfNullVal8'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal8'])+0 : "NULL"; // Common text NULL field value
+$chkTfNullVal1 = (isset($_POST['tfNullVal1']) && ($_POST['tfNullVal1'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal1']) : "NULL"; // Common text NULL field value
+$chkTfNullVal2 = (isset($_POST['tfNullVal2']) && ($_POST['tfNullVal2'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal2']) : "NULL"; // Common text NULL field value
+$chkTfNullVal3 = (isset($_POST['tfNullVal3']) && ($_POST['tfNullVal3'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal3']) : "NULL"; // Common text NULL field value
+$chkTfNullVal4 = (isset($_POST['tfNullVal4']) && ($_POST['tfNullVal4'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal4']) : "NULL"; // Common text NULL field value
+$chkTfNullVal5 = (isset($_POST['tfNullVal5']) && ($_POST['tfNullVal5'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal5']) : "NULL"; // Common text NULL field value
+$chkTfNullVal6 = (isset($_POST['tfNullVal6']) && ($_POST['tfNullVal6'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal6']) : "NULL"; // Common text NULL field value
+$chkTfNullVal7 = (isset($_POST['tfNullVal7']) && ($_POST['tfNullVal7'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal7']) : "NULL"; // Common text NULL field value
+$chkTfNullVal8 = (isset($_POST['tfNullVal8']) && ($_POST['tfNullVal8'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal8']) : "NULL"; // Common text NULL field value
//
// Quote special characters
// ==========================
diff -uNr nagiosql32.orig/templates/admin/user.tpl.htm nagiosql32/templates/admin/user.tpl.htm
--- nagiosql32.orig/templates/admin/user.tpl.htm 2012-03-27 12:47:56.208241000 +0200
+++ nagiosql32/templates/admin/user.tpl.htm 2012-03-27 12:47:58.000000000 +0200
@@ -3,7 +3,7 @@
<!-- Project : NagiosQL -->
<!-- Component : User template -->
<!-- Website : http://www.nagiosql.org -->
-<!-- Date : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Tue, 27 Mar 2012) $ -->
+<!-- Date : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Di, 27. Mär 2012) $ -->
<!-- Author : $LastChangedBy: martin $ -->
<!-- Version : 3.2.0 -->
<!-- Revision : $LastChangedRevision: 1308 $ -->

248
debian/patches/20_service_pack_2_additional_fixes_only.patch vendored Normal file
View File

@ -0,0 +1,248 @@
diff -uNr nagiosql32.orig/admin/verify.php nagiosql32/admin/verify.php
--- nagiosql32.orig/admin/verify.php 2012-09-24 14:42:29.052342000 +0200
+++ nagiosql32/admin/verify.php 2012-09-24 13:42:30.000000000 +0200
@@ -10,7 +10,7 @@
// Project : NagiosQL
// Component : Configuration verification
// Website : http://www.nagiosql.org
-// Date : $LastChangedDate: 2012-09-24 14:42:29 +0200 (Mon, 24 Sep 2012) $
+// Date : $LastChangedDate: 2012-09-24 14:42:29 +0200 (Mo, 24. Sep 2012) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
// Revision : $LastChangedRevision: 1347 $
diff -uNr nagiosql32.orig/functions/config_class.php nagiosql32/functions/config_class.php
--- nagiosql32.orig/functions/config_class.php 2017-05-20 19:36:57.228000000 +0200
+++ nagiosql32/functions/config_class.php 2013-01-10 09:46:14.000000000 +0100
@@ -10,10 +10,10 @@
// Project : NagiosQL
// Component : Configuration Class
// Website : http://www.nagiosql.org
-// Date : $LastChangedDate: 2012-04-17 11:47:05 +0200 (Di, 17. Apr 2012) $
+// Date : $LastChangedDate: 2013-01-10 09:46:11 +0100 (Do, 10. Jan 2013) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
-// Revision : $LastChangedRevision: 1319 $
+// Revision : $LastChangedRevision: 1351 $
//
///////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -710,6 +710,8 @@
} else {
$this->myDataClass->writeLog(translate('Writing of the configuration failed - no dataset or not activated dataset found'));
$this->processClassMessage(translate('Writing of the configuration failed - no dataset or not activated dataset found')."::",$this->strErrorMessage);
+ $configtp->parse();
+ $booReturn = $this->writeConfigFile($configtp->get(),$strFile,0,$intConfigID,$resConfigFile,$strConfigFile);
return(1);
}
$configtp->parse();
@@ -1252,7 +1254,7 @@
if ($strDataValue == 2) {$strDataValue = "*,";} else {$strDataValue = "";}
foreach ($arrDataRel AS $data) {
if ($data['exclude'] == 0) {
- $strDataValue .= $data['strSlave'].",";
+ $strDataValue .= $data['strSlave'].",";
} else if ($this->intNagVersion >=3) {
$strDataValue .= "!".$data['strSlave'].",";
}
diff -uNr nagiosql32.orig/functions/import_class.php nagiosql32/functions/import_class.php
--- nagiosql32.orig/functions/import_class.php 2017-05-20 19:36:57.228000000 +0200
+++ nagiosql32/functions/import_class.php 2012-09-18 09:44:24.000000000 +0200
@@ -10,10 +10,10 @@
// Project : NagiosQL
// Component : Import Class
// Website : http://www.nagiosql.org
-// Date : $LastChangedDate: 2012-04-17 11:47:05 +0200 (Di, 17. Apr 2012) $
+// Date : $LastChangedDate: 2012-09-18 10:44:22 +0200 (Di, 18. Sep 2012) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
-// Revision : $LastChangedRevision: 1319 $
+// Revision : $LastChangedRevision: 1346 $
//
///////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -899,6 +899,7 @@
$booResult = $this->myDBClass->insertData($strSQL);
if ($booResult == false) $this->strErrorMessage .= $this->myDBClass->strErrorMessage;
$intSlaveId = $this->myDBClass->intLastId;
+
// Special processing for serviceextinfo
if (($strDataTable == "tbl_serviceextinfo") && ($strKey == "service_description")) {
$strSQL = "SELECT `id` FROM `tbl_host` WHERE `host_name`='".$arrImportData['host_name']['value']."'";
@@ -996,7 +997,7 @@
}
// Does the entry already exist?
$strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` $strLink WHERE `".$arrRelData['target1']."` = '".$elem."'
- $strWhere AND `active`='1' AND `config_id`=".$this->intDomainId;
+ $strWhere AND `config_id`=".$this->intDomainId;
$strId = $this->myDBClass->getFieldData($strSQL);
if ($strId != "") {
$intSlaveId = $strId+0;
@@ -1013,7 +1014,7 @@
}
// Insert relations
$strSQL = "INSERT INTO `".$arrRelData['linkTable']."` SET `idMaster` = ".$intDataId.", `idSlave` = ".$intSlaveId.",
- `exclude`=".$intExclude;
+ `exclude`=".$intExclude;
$booResult = $this->myDBClass->insertData($strSQL);
if ($booResult == false) $this->strErrorMessage .= $this->myDBClass->strErrorMessage;
// Keep values
@@ -1104,7 +1105,7 @@
// Process data values
foreach ($arrValues AS $elem) {
// Does the template already exist? (table 1)
- $strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` WHERE `".$arrRelData['target1']."` = '".$elem."' AND `active`='1'
+ $strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` WHERE `".$arrRelData['target1']."` = '".$elem."'
AND `config_id`=".$this->intDomainId;
$strId = $this->myDBClass->getFieldData($strSQL);
if ($strId != "") {
@@ -1113,7 +1114,7 @@
}
if ($intSlaveId == 0) {
// Does the template already exist? (table 2)
- $strSQL = "SELECT `id` FROM `".$arrRelData['tableName2']."` WHERE `".$arrRelData['target2']."` = '".$elem."' AND `active`='1'
+ $strSQL = "SELECT `id` FROM `".$arrRelData['tableName2']."` WHERE `".$arrRelData['target2']."` = '".$elem."'
AND `config_id`=".$this->intDomainId;
$strId = $this->myDBClass->getFieldData($strSQL);
if ($strId != "") {
@@ -1218,7 +1219,8 @@
// Process data values
foreach ($arrValues AS $elem) {
// Does the entry already exist?
- $strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` WHERE `".$arrRelData['target1']."` = '".$elem."' AND `active`='1' AND `config_id`=".$this->intDomainId;
+ $strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` WHERE `".$arrRelData['target1']."` = '".$elem."'
+ AND `config_id`=".$this->intDomainId;
$strId = $this->myDBClass->getFieldData($strSQL);
if ($strId != "") {
$intSlaveId = $strId+0;
@@ -1420,7 +1422,7 @@
}
// Does the entry already exist?
$strSQL = "SELECT `id` FROM `".$arrRelData['tableName1']."` WHERE `".$arrRelData['target1']."` = '".$elem."'
- $strWhere AND `active`='1' AND `config_id`=".$this->intDomainId;
+ $strWhere AND `config_id`=".$this->intDomainId;
$strId = $this->myDBClass->getFieldData($strSQL);
if ($strId != "") {
$intSlaveId = $strId+0;
diff -uNr nagiosql32.orig/functions/nag_class.php nagiosql32/functions/nag_class.php
--- nagiosql32.orig/functions/nag_class.php 2012-10-03 10:00:02.307645000 +0200
+++ nagiosql32/functions/nag_class.php 2012-10-03 09:00:04.000000000 +0200
@@ -10,7 +10,7 @@
// Project : NagiosQL
// Component : Visualization Class
// Website : http://www.nagiosql.org
-// Date : $LastChangedDate: 2012-10-03 10:00:02 +0200 (Wed, 03 Oct 2012) $
+// Date : $LastChangedDate: 2012-10-03 10:00:02 +0200 (Mi, 03. Okt 2012) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
// Revision : $LastChangedRevision: 1349 $
diff -uNr nagiosql32.orig/functions/prepend_adm.php nagiosql32/functions/prepend_adm.php
--- nagiosql32.orig/functions/prepend_adm.php 2017-05-20 19:36:57.232000000 +0200
+++ nagiosql32/functions/prepend_adm.php 2013-01-10 09:46:14.000000000 +0100
@@ -9,14 +9,14 @@
// Project : NagiosQL
// Component : Preprocessing script
// Website : http://www.nagiosql.org
-// Date : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Di, 27. Mär 2012) $
+// Date : $LastChangedDate: 2013-01-10 09:46:11 +0100 (Do, 10. Jan 2013) $
// Author : $LastChangedBy: martin $
// Version : 3.2.0
-// Revision : $LastChangedRevision: 1308 $
+// Revision : $LastChangedRevision: 1351 $
//
///////////////////////////////////////////////////////////////////////////////
//error_reporting(E_ALL);
-error_reporting(E_ALL);
+error_reporting(E_ALL & ~E_STRICT);
//
// Security Protection
// ===================
@@ -253,7 +253,7 @@
$_SESSION['userid'] = $arrDataUser[0]['id'];
$_SESSION['groupadm'] = $arrDataUser[0]['admin_enable'];
$_SESSION['startsite'] = $_SESSION['SETS']['path']['base_url']."admin.php";
- $_SESSION['timestamp'] = mktime();
+ $_SESSION['timestamp'] = time();
$_SESSION['logged_in'] = 1;
$_SESSION['domain'] = $arrDataUser[0]['domain'];
// Update language settings
@@ -273,8 +273,10 @@
}
}
if (($_SESSION['logged_in'] == 0) && isset($chkInsName) && ($chkInsName != "") && ($intError == 0)) {
- $strSQL = "SELECT * FROM `tbl_user` WHERE `username`='".mysql_real_escape_string($chkInsName)."'
- AND `password`=MD5('$chkInsPasswd') AND `active`='1'";
+ $chkInsName = mysql_real_escape_string($chkInsName);
+ $chkInsPasswd = mysql_real_escape_string($chkInsPasswd);
+ $strSQL = "SELECT * FROM `tbl_user` WHERE `username`='".$chkInsName."'
+ AND `password`=MD5('".$chkInsPasswd."') AND `active`='1'";
$booReturn = $myDBClass->getDataArray($strSQL,$arrDataUser,$intDataCount);
if ($booReturn == false) {
$myVisClass->processMessage(translate('Error while selecting data from database:'),$strErrorMessage);
@@ -286,7 +288,7 @@
$_SESSION['userid'] = $arrDataUser[0]['id'];
$_SESSION['groupadm'] = $arrDataUser[0]['admin_enable'];
$_SESSION['startsite'] = $_SESSION['SETS']['path']['base_url'] ."admin.php";
- $_SESSION['timestamp'] = mktime();
+ $_SESSION['timestamp'] = time();
$_SESSION['logged_in'] = 1;
$_SESSION['domain'] = $arrDataUser[0]['domain'];
// Update language settings
@@ -327,9 +329,9 @@
$myVisClass->processMessage($myDBClass->strErrorMessage,$strErrorMessage);
} else if ($intDataCount == 1) {
// Time expired?
- if (mktime() - $_SESSION['timestamp'] > $_SESSION['SETS']['security']['logofftime']) {
+ if (time() - $_SESSION['timestamp'] > $_SESSION['SETS']['security']['logofftime']) {
// Force new login
- $myDataClass->writeLog(translate('Session timeout reached - Seconds:')." ".(mktime() - $_SESSION['timestamp']." - User: ".$_SESSION['username']));
+ $myDataClass->writeLog(translate('Session timeout reached - Seconds:')." ".(time() - $_SESSION['timestamp']." - User: ".$_SESSION['username']));
$_SESSION['logged_in'] = 0;
header("Location: ".$_SESSION['SETS']['path']['protocol']."://".$_SERVER['HTTP_HOST'].$_SESSION['SETS']['path']['base_url']."index.php");
@@ -345,7 +347,7 @@
}
}
// Update login time
- $_SESSION['timestamp'] = mktime();
+ $_SESSION['timestamp'] = time();
if (isset($preContent) && ($preContent == "index.tpl.htm")) {
header("Location: ".$_SESSION['SETS']['path']['protocol']."://".$_SERVER['HTTP_HOST'].$_SESSION['startsite']);
}
diff -uNr nagiosql32.orig/functions/prepend_content.php nagiosql32/functions/prepend_content.php
--- nagiosql32.orig/functions/prepend_content.php 2017-05-20 19:36:57.232000000 +0200
+++ nagiosql32/functions/prepend_content.php 2012-05-03 08:10:06.000000000 +0200
@@ -144,14 +144,14 @@
$chkButValue3 = isset($_POST['butValue3']) ? $_POST['butValue3'] : ""; // Common button value
$chkButValue4 = isset($_POST['butValue4']) ? $_POST['butValue4'] : ""; // Common button value
$chkButValue5 = isset($_POST['butValue5']) ? $_POST['butValue5'] : ""; // Common button value
-$chkTfNullVal1 = (isset($_POST['tfNullVal1']) && ($_POST['tfNullVal1'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal1']) : "NULL"; // Common text NULL field value
-$chkTfNullVal2 = (isset($_POST['tfNullVal2']) && ($_POST['tfNullVal2'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal2']) : "NULL"; // Common text NULL field value
-$chkTfNullVal3 = (isset($_POST['tfNullVal3']) && ($_POST['tfNullVal3'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal3']) : "NULL"; // Common text NULL field value
-$chkTfNullVal4 = (isset($_POST['tfNullVal4']) && ($_POST['tfNullVal4'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal4']) : "NULL"; // Common text NULL field value
-$chkTfNullVal5 = (isset($_POST['tfNullVal5']) && ($_POST['tfNullVal5'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal5']) : "NULL"; // Common text NULL field value
-$chkTfNullVal6 = (isset($_POST['tfNullVal6']) && ($_POST['tfNullVal6'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal6']) : "NULL"; // Common text NULL field value
-$chkTfNullVal7 = (isset($_POST['tfNullVal7']) && ($_POST['tfNullVal7'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal7']) : "NULL"; // Common text NULL field value
-$chkTfNullVal8 = (isset($_POST['tfNullVal8']) && ($_POST['tfNullVal8'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal8']) : "NULL"; // Common text NULL field value
+$chkTfNullVal1 = (isset($_POST['tfNullVal1']) && ($_POST['tfNullVal1'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal1'])+0 : "NULL"; // Common text NULL field value
+$chkTfNullVal2 = (isset($_POST['tfNullVal2']) && ($_POST['tfNullVal2'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal2'])+0 : "NULL"; // Common text NULL field value
+$chkTfNullVal3 = (isset($_POST['tfNullVal3']) && ($_POST['tfNullVal3'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal3'])+0 : "NULL"; // Common text NULL field value
+$chkTfNullVal4 = (isset($_POST['tfNullVal4']) && ($_POST['tfNullVal4'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal4'])+0 : "NULL"; // Common text NULL field value
+$chkTfNullVal5 = (isset($_POST['tfNullVal5']) && ($_POST['tfNullVal5'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal5'])+0 : "NULL"; // Common text NULL field value
+$chkTfNullVal6 = (isset($_POST['tfNullVal6']) && ($_POST['tfNullVal6'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal6'])+0 : "NULL"; // Common text NULL field value
+$chkTfNullVal7 = (isset($_POST['tfNullVal7']) && ($_POST['tfNullVal7'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal7'])+0 : "NULL"; // Common text NULL field value
+$chkTfNullVal8 = (isset($_POST['tfNullVal8']) && ($_POST['tfNullVal8'] != "")) ? $myVisClass->checkNull($_POST['tfNullVal8'])+0 : "NULL"; // Common text NULL field value
//
// Quote special characters
// ==========================
diff -uNr nagiosql32.orig/templates/admin/servicedependencies.tpl.htm nagiosql32/templates/admin/servicedependencies.tpl.htm
--- nagiosql32.orig/templates/admin/servicedependencies.tpl.htm 2013-01-10 09:46:11.799949000 +0100
+++ nagiosql32/templates/admin/servicedependencies.tpl.htm 2013-01-10 09:46:14.000000000 +0100
@@ -3,7 +3,7 @@
<!-- Project : NagiosQL -->
<!-- Component : servicedependencies template -->
<!-- Website : http://www.nagiosql.org -->
-<!-- Date : $LastChangedDate: 2013-01-10 09:46:11 +0100 (Thu, 10 Jan 2013) $ -->
+<!-- Date : $LastChangedDate: 2013-01-10 09:46:11 +0100 (Do, 10. Jan 2013) $ -->
<!-- Author : $LastChangedBy: martin $ -->
<!-- Version : 3.2.0 -->
<!-- Revision : $LastChangedRevision: 1351 $ -->

1494
debian/patches/30_service_pack_3_additional_fixes_only.patch vendored Normal file
View File

File diff suppressed because it is too large Load Diff

68
debian/patches/31_service_pack_3_additional_fixes_only_mysqli.patch vendored Normal file
View File

@ -0,0 +1,68 @@
diff -uNr nagiosql32/functions/data_class.php nsql/functions/data_class.php
--- nagiosql32/functions/data_class.php 2017-05-21 04:16:26.144000000 +0200
+++ nsql/functions/data_class.php 2017-01-06 14:55:10.000000000 +0100
@@ -110,7 +110,7 @@
$strSQL = "DELETE FROM `".$strTableName."` WHERE `id` = $intDataId $strNoDelete";
$booReturn = $this->myDBClass->insertData($strSQL);
if ($booReturn == false) {
- $this->processClassMessage(translate('Delete failed because a database error:')."::".mysql_error()."::",$this->strInfoMessage);
+ $this->processClassMessage(translate('Delete failed because a database error:')."::".mysqli_error()."::",$this->strInfoMessage);
return(1);
} else if ($this->myDBClass->intAffectedRows == 0) {
$this->processClassMessage(translate('No data deleted. Probably the dataset does not exist or it is protected from delete.')."::",$this->strErrorMessage);
@@ -134,7 +134,7 @@
$strSQL = "DELETE FROM `".$strTableName."` WHERE `id` = ".$elem['id'];
$booReturn = $this->myDBClass->insertData($strSQL);
if ($booReturn == false) {
- $this->processClassMessage(translate('Delete failed because a database error:')."::".mysql_error()."::",$this->strInfoMessage);
+ $this->processClassMessage(translate('Delete failed because a database error:')."::".mysqli_error()."::",$this->strInfoMessage);
return(1);
} else {
$intDeleteCount = $intDeleteCount + $this->myDBClass->intAffectedRows;
diff -uNr nagiosql32/functions/import_class.php nsql/functions/import_class.php
--- nagiosql32/functions/import_class.php 2017-05-21 04:16:11.976000000 +0200
+++ nsql/functions/import_class.php 2017-01-04 13:11:32.000000000 +0100
@@ -632,8 +632,8 @@
if ($strKeyField == "") {$strKey = $strConfigName;} else {$strKey = $strKeyField;}
if ($booResult != true) {
$this->strErrorMessage .= $this->myDBClass->strErrorMessage;
- if ($strKeyField != "") $this->strErrorMessage .= translate('Entry')." <b class=\"blackmessage\">".$strKey." -> ".$arrImportData[$strKeyField]['value']."</b> ".translate('inside')." <b class=\"blackmessage\">".$strTable."</b> ".translate('could not be inserted:')." ".mysql_error()."::";
- if ($strKeyField == "") $this->strErrorMessage .= translate('Entry')." <b class=\"blackmessage\">".$strTemp1." -> ".$strTemp2.translate('inside')."</b> ".$strTable." <b class=\"blackmessage\">".$strTable."</b> ".translate('could not be inserted:')." ".mysql_error()."::";
+ if ($strKeyField != "") $this->strErrorMessage .= translate('Entry')." <b class=\"blackmessage\">".$strKey." -> ".$arrImportData[$strKeyField]['value']."</b> ".translate('inside')." <b class=\"blackmessage\">".$strTable."</b> ".translate('could not be inserted:')." ".mysqli_error()."::";
+ if ($strKeyField == "") $this->strErrorMessage .= translate('Entry')." <b class=\"blackmessage\">".$strTemp1." -> ".$strTemp2.translate('inside')."</b> ".$strTable." <b class=\"blackmessage\">".$strTable."</b> ".translate('could not be inserted:')." ".mysqli_error()."::";
return(1);
} else {
if ($strKeyField != "") $this->strInfoMessage .= translate('Entry')." <b class=\"blackmessage\">".$strKey." -> ".$arrImportData[$strKeyField]['value']."</b> ".translate('inside')." <b class=\"blackmessage\">".$strTable."</b> ".translate('successfully inserted')."::";
@@ -1236,7 +1236,7 @@
// Update data in master table
$arrCommand[0] = $intSlaveId;
$strValue = implode("!",$arrCommand);
- $strSQL = "UPDATE `".$strDataTable."` SET `".$arrRelData['fieldName']."` = '".mysql_real_escape_string($strValue)."' WHERE `id` = ".$intDataId;
+ $strSQL = "UPDATE `".$strDataTable."` SET `".$arrRelData['fieldName']."` = '".mysqli_real_escape_string($strValue)."' WHERE `id` = ".$intDataId;
$booResult = $this->myDBClass->insertData($strSQL);
if ($booResult == false) $this->strErrorMessage .= $this->myDBClass->strErrorMessage;
}
diff -uNr nagiosql32/functions/mysql_class.php nsql/functions/mysql_class.php
--- nagiosql32/functions/mysql_class.php 2017-05-21 04:16:26.144000000 +0200
+++ nsql/functions/mysql_class.php 2017-01-06 14:55:18.000000000 +0100
@@ -330,7 +330,7 @@
//
///////////////////////////////////////////////////////////////////////////////////////////
function dbdisconnect() {
- @mysql_close($this->strDBId);
+ @mysqli_close($this->strDBId);
return true;
}
diff -uNr nagiosql32/functions/prepend_content.php nsql/functions/prepend_content.php
--- nagiosql32/functions/prepend_content.php 2017-05-21 04:16:11.980000000 +0200
+++ nsql/functions/prepend_content.php 2017-01-06 15:15:59.000000000 +0100
@@ -321,7 +321,7 @@
if ($intSuccess != 0) $myVisClass->processMessage(translate('Configuration files successfully written!'),$strInfoMessage);
if ($intError != 0) $myVisClass->processMessage(translate('Some configuration files were not written. Dataset not activated, not found or you do not have write permission!'),$strErrorMessage);
} else if ($preTableName == 'tbl_service') {
- $strSQL = "SELECT `id`, `$preKeyField` FROM `$preTableName` WHERE $strDomainWhere AND `access_group` IN ($strAccess) AND `active`='1' GROUP BY `$preKeyField`";
+ $strSQL = "SELECT `id`, `$preKeyField` FROM `$preTableName` WHERE $strDomainWhere AND `access_group` IN ($strAccess) AND `active`='1' GROUP BY `$preKeyField`, `id`";
$myDBClass->getDataArray($strSQL,$arrData,$intDataCount);
if ($booReturn == false) $myVisClass->processMessage($myDBClass->strErrorMessage,$strErrorMessage);
if ($booReturn && ($intDataCount != 0)) {

94
debian/patches/40_settings_php.patch vendored Normal file
View File

@ -0,0 +1,94 @@
diff -uNr nagiosql32.orig/admin/settings.php nagiosql32/admin/settings.php
--- nagiosql32.orig/admin/settings.php 2012-02-21 14:10:41.579203000 +0100
+++ nagiosql32/admin/settings.php 2017-05-20 20:02:31.568000000 +0200
@@ -92,8 +92,8 @@
}
}
// Write db settings to file
- if (is_writable($strBasePath."config/settings.php")) {
- $filSettings = fopen($strBasePath."config/settings.php","w");
+ if (is_writable("/etc/nagiosql/settings.php")) {
+ $filSettings = fopen("/etc/nagiosql/settings.php","w");
if ($filSettings) {
fwrite($filSettings,"<?php\n");
fwrite($filSettings,"exit;\n");
diff -uNr nagiosql32.orig/admin/support.php nagiosql32/admin/support.php
--- nagiosql32.orig/admin/support.php 2012-03-08 08:40:12.245037000 +0100
+++ nagiosql32/admin/support.php 2017-05-20 20:01:59.792000000 +0200
@@ -211,7 +211,7 @@
}
// File access checks
$conttp->setVariable("RW_CONFIG",translate("Read/Write access:")." settings.php");
-$strConfigFile = "../config/settings.php";
+$strConfigFile = "/etc/nagiosql/settings.php";
if (file_exists($strConfigFile) && is_readable($strConfigFile) && is_writable($strConfigFile)) {
$conttp->setVariable("RW_CONFIG_CLASS","checkgreen");
$conttp->setVariable("RW_CONFIG_RESULT",translate("ok"));
diff -uNr nagiosql32.orig/functions/prepend_adm.php nagiosql32/functions/prepend_adm.php
--- nagiosql32.orig/functions/prepend_adm.php 2017-05-20 20:08:12.900000000 +0200
+++ nagiosql32/functions/prepend_adm.php 2017-05-20 20:04:18.164000000 +0200
@@ -77,14 +77,14 @@
//
// Start installer
// ===============
-$preIniFile = $preBasePath.'config/settings.php';
+$preIniFile = '/etc/nagiosql/settings.php';
if (!file_exists($preIniFile) OR ! is_readable($preIniFile)) {
header("Location: ".$preBaseURL."install/index.php");
}
//
// Read file settings
// ==================
-$SETS = parse_ini_file($preBasePath.'config/settings.php',true);
+$SETS = parse_ini_file('/etc/nagiosql/settings.php',true);
if (!isset($_SESSION['SETS']['db'])) $_SESSION['SETS']['db'] = $SETS['db'];
//
// Include external function/class files - part 1
diff -uNr nagiosql32.orig/functions/prepend_scripting.php nagiosql32/functions/prepend_scripting.php
--- nagiosql32.orig/functions/prepend_scripting.php 2012-02-29 09:54:45.611973000 +0100
+++ nagiosql32/functions/prepend_scripting.php 2017-05-20 20:03:34.636000000 +0200
@@ -42,7 +42,7 @@
// Read settings file
// ==================
$preBasePath = str_replace("scripts","",getcwd());
-$preIniFile = $preBasePath.'config/settings.php';
+$preIniFile = '/etc/nagiosql/settings.php';
//
// Read file settings
// ==================
diff -uNr nagiosql32.orig/install/functions/install_class.php nagiosql32/install/functions/install_class.php
--- nagiosql32.orig/install/functions/install_class.php 2017-05-20 20:08:12.900000000 +0200
+++ nagiosql32/install/functions/install_class.php 2017-05-20 20:05:46.564000000 +0200
@@ -659,7 +659,7 @@
$strBasePath = substr(realpath('.'),0,-7);
$strE_ID = error_reporting();
error_reporting(0);
- $filSettings = fopen($strBasePath."config/settings.php","w");
+ $filSettings = fopen("/etc/nagiosql/settings.php","w");
error_reporting($strE_ID);
if ($filSettings) {
// Write Database Configuration into settings.php
diff -uNr nagiosql32.orig/install/index.php nagiosql32/install/index.php
--- nagiosql32.orig/install/index.php 2017-05-20 20:08:12.904000000 +0200
+++ nagiosql32/install/index.php 2017-05-20 20:04:52.492000000 +0200
@@ -27,7 +27,7 @@
$preContent = "templates/index.tpl.htm";
$preEncode = 'utf-8';
$preLocale = "../config/locale";
-$filConfig = "../config/settings.php";
+$filConfig = "/etc/nagiosql/settings.php";
$preDBType = "mysqli";
$strLangOpt = "";
$intError = 0;
diff -uNr nagiosql32.orig/install/step1.php nagiosql32/install/step1.php
--- nagiosql32.orig/install/step1.php 2017-05-20 20:08:12.904000000 +0200
+++ nagiosql32/install/step1.php 2017-05-20 20:05:19.420000000 +0200
@@ -186,7 +186,7 @@
}
$arrTemplate['CHECK_5_CONTENT_1'] = $strHTML;
// File access checks
-$strConfigFile = "../config/settings.php";
+$strConfigFile = "/etc/nagiosql/settings.php";
if (file_exists($strConfigFile) && is_readable($strConfigFile)) {
$arrTemplate['CHECK_6_CONTENT_1'] = $strHTMLPart1.translate("Read test on settings file (config/settings.php)").$strHTMLPart4.translate("OK")."</span><br>\n";
} else if (file_exists($strConfigFile)&& !is_readable($strConfigFile)) {

12
debian/patches/50_nagios4_debian_pathes.patch vendored Normal file
View File

@ -0,0 +1,12 @@
diff -uNr nagiosql32.orig/install/sql/nagiosQL_v32_db_mysql.sql nagiosql32/install/sql/nagiosQL_v32_db_mysql.sql
--- nagiosql32.orig/install/sql/nagiosQL_v32_db_mysql.sql 2012-03-01 12:24:44.682770000 +0100
+++ nagiosql32/install/sql/nagiosQL_v32_db_mysql.sql 2017-05-20 20:31:30.760000000 +0200
@@ -83,7 +83,7 @@
-- Datasets for table `tbl_configtarget`
--
-INSERT INTO `tbl_configtarget` (`id`, `target`, `alias`, `server`, `method`, `user`, `password`, `ssh_key_path`, `basedir`, `hostconfig`, `serviceconfig`, `backupdir`, `hostbackup`, `servicebackup`, `nagiosbasedir`, `importdir`, `picturedir`, `commandfile`, `binaryfile`, `pidfile`, `conffile`, `version`, `access_group`, `active`, `nodelete`, `last_modified`) VALUES(1, 'localhost', 'Local installation', 'localhost', '1', '', '', '', '/etc/nagiosql/', '/etc/nagiosql/hosts/', '/etc/nagiosql/services/', '/etc/nagiosql/backup/', '/etc/nagiosql/backup/hosts/', '/etc/nagiosql/backup/services/', '/etc/nagiosql/', '/opt/nagios/etc/objects/', '', '/var/nagios/rw/nagios.cmd', '/opt/nagios/bin/nagios', '/var/nagios/nagios.lock', '/etc/nagiosql/nagios.cfg', 3, 0, '1', '1', NOW());
+INSERT INTO `tbl_configtarget` (`id`, `target`, `alias`, `server`, `method`, `user`, `password`, `ssh_key_path`, `basedir`, `hostconfig`, `serviceconfig`, `backupdir`, `hostbackup`, `servicebackup`, `nagiosbasedir`, `importdir`, `picturedir`, `commandfile`, `binaryfile`, `pidfile`, `conffile`, `version`, `access_group`, `active`, `nodelete`, `last_modified`) VALUES(1, 'localhost', 'Local installation', 'localhost', '1', '', '', '', '/etc/nagiosql/', '/etc/nagiosql/hosts/', '/etc/nagiosql/services/', '/etc/nagiosql/backup/', '/etc/nagiosql/backup/hosts/', '/etc/nagiosql/backup/services/', '/etc/nagiosql/', '/etc/nagios4/objects/', '', '/var/lib/nagios4/rw/nagios.cmd', '/usr/sbin/nagios4', '/var/run/nagios4/nagios4.pid', '/etc/nagios4/nagios.cfg', 3, 0, '1', '1', NOW());
-- --------------------------------------------------------

34
debian/patches/60_nagios4_configs_readonly.patch vendored Normal file
View File

@ -0,0 +1,34 @@
--- nagiosql-3.0.3.orig/debian/patches/30_nagios3_configs_readonly.dpatch
+++ nagiosql-3.0.3/debian/patches/30_nagios3_configs_readonly.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_nagios3_configs_readonly.dpatch by <wob@swobspace.eli.st-elisabeth.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad nagiosql-3.0.3~/nagiosql3/admin/domain.php nagiosql-3.0.3/nagiosql3/admin/domain.php
+--- nagiosql-3.0.3~/nagiosql3/admin/domain.php 2009-04-28 15:02:27.000000000 +0200
++++ nagiosql-3.0.3/nagiosql3/admin/domain.php 2009-06-14 14:18:09.000000000 +0200
+@@ -154,11 +154,11 @@
+ }
+ // Nagios base configuration files
+ if (isset($chkInsNagiosBaseDir)) {
+- if (! is_writable($chkInsNagiosBaseDir."nagios.cfg")) {
++ if (! is_readable($chkInsNagiosBaseDir."nagios.cfg")) {
+ $permissionerror .= $chkInsNagiosBaseDir."nagios.cfg ".gettext("is not writeable")."<br>";
+ $isanerror=1;
+ }
+- if (! is_writable($chkInsNagiosBaseDir."cgi.cfg")) {
++ if (! is_readable($chkInsNagiosBaseDir."cgi.cfg")) {
+ $permissionerror .= $chkInsNagiosBaseDir."cgi.cfg ".gettext("is not writeable")."<br>";
+ $isanerror=1;
+ }
+@@ -411,4 +411,4 @@
+ $maintp->setVariable("VERSION_INFO","<a href='http://www.nagiosql.org' target='_blank'>NagiosQL</a> - Version: $setFileVersion");
+ $maintp->parse("footer");
+ $maintp->show("footer");
+-?>
+\ No newline at end of file
++?>

7
debian/patches/series vendored Normal file
View File

@ -0,0 +1,7 @@
10_service_pack_1_additional_fixes_only.patch
20_service_pack_2_additional_fixes_only.patch
30_service_pack_3_additional_fixes_only.patch
31_service_pack_3_additional_fixes_only_mysqli.patch
40_settings_php.patch
50_nagios4_debian_pathes.patch
60_nagios4_configs_readonly.patch

78
debian/postinst vendored Normal file
View File

@ -0,0 +1,78 @@
#!/bin/sh
# postinst script for nagiosql
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <postinst> `abort-remove'
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
setperm() {
user="$1"
group="$2"
mode="$3"
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
}
setgrperm() {
group="$1"
mode="$2"
file="$3"
shift 3
# only do something when no setting exists
if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
chgrp "$group" "$file"
chmod "$mode" "$file"
fi
}
case "$1" in
configure)
# -- /etc/nagiosql directories
for dir in `find /etc/nagiosql -type d 2> /dev/null`; do
[ -d $dir ] && setperm www-data nagios 6755 $dir
done
# -- /etc/nagiosql files
for file in `find /etc/nagiosql -type f -name \*.cfg 2> /dev/null`; do
[ -f $file ] && setperm www-data nagios 0644 $file
done
# -- /etc/nagios4 config files
for cfg in /etc/nagios4/nagios.cfg /etc/nagios/nagios4/cgi.cfg ; do
[ -e $cfg ] && setgrperm www-data 0644 $cfg
done
# -- at last
nsqlcfg="/etc/nagiosql/settings.php"
[ -e $nsqlcfg ] && setperm www-data www-data 0600 $nsqlcfg
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

40
debian/prerm vendored Normal file
View File

@ -0,0 +1,40 @@
#!/bin/sh
# prerm script for nagiosql
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <prerm> `remove'
# * <old-prerm> `upgrade' <new-version>
# * <new-prerm> `failed-upgrade' <old-version>
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
# * <deconfigured's-prerm> `deconfigure' `in-favour'
# <package-being-installed> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
remove|upgrade|deconfigure)
ENABLER="/usr/share/nagiosql/htdocs/install/ENABLE_INSTALLER"
[ -e $ENABLER ] && rm -f $ENABLER
;;
failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

82
debian/rules vendored Executable file
View File

@ -0,0 +1,82 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
DESTDIR = debian/nagiosql
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
dh_testdir
touch $@
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
dh_clean
install: build
dh_testdir
dh_testroot
dh_prep
dh_installdirs
# cp -a nagiosql3/* $(DESTDIR)/usr/share/nagiosql/htdocs/.
mkdir -p $(CURDIR)/$(DESTDIR)/usr/share/nagiosql/htdocs/
rsync -avr --exclude 'debian' --exclude '*-stamp' --exclude '.pc' $(CURDIR)/ $(CURDIR)/$(DESTDIR)/usr/share/nagiosql/htdocs/
rm -rf $(DESTDIR)/usr/share/nagiosql/htdocs/doc
rm -rf $(DESTDIR)/usr/share/nagiosql/htdocs/README.md
install -m 644 debian/apache.conf $(DESTDIR)/etc/nagiosql/
# Build architecture-dependent files here.
binary-arch: install
# Build architecture-independent files here.
binary-indep: install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
dh_installexamples
dh_lintian
# dh_install
# dh_installmenu
# dh_installdebconf
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# dh_installmime
# dh_python
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
dh_link
# dh_strip
dh_compress
dh_fixperms
# dh_perl
# dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (quilt)