[pkg-nagios-changes] [Git][nagios-team/pkg-nagvis][upstream] New upstream version 1.9.24

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian Nagios Maintainer Group / pkg-nagvis


Commits:
6db30af2 by Bas Couwenberg at 2021-02-02T15:23:27+01:00
New upstream version 1.9.24
- - - - -


5 changed files:

- ChangeLog
- share/server/core/classes/CoreAuthModPDO.php
- share/server/core/classes/GlobalBackendmkbi.php
- share/server/core/classes/GlobalMapCfg.php
- share/server/core/defines/global.php


Changes:

=====================================
ChangeLog
=====================================
@@ -1,3 +1,10 @@
+1.9.24
+  * FIX: Fix more PHP 7.4 incompatibilites (#265)
+    (This fixes one issue related to the PDO auth module and one issue related
+    to map configurations with numeric object_id attributes.)
+  * FIX: Fix Checkmk BI backend error when pending services are in downtime
+    (Undefined index 'downtime' was shown)
+
 1.9.23
 Frontend:
   * Make NagVis compatible with Checkmk 2.0 auth cookies


=====================================
share/server/core/classes/CoreAuthModPDO.php
=====================================
@@ -92,6 +92,9 @@ class CoreAuthModPDO extends CoreAuthModule {
         }
 
         $data = $res->fetch();
+
+        if (!isset($data['userId']))
+            return 0;
         return intval($data['userId']);
     }
 


=====================================
share/server/core/classes/GlobalBackendmkbi.php
=====================================
@@ -256,6 +256,7 @@ class GlobalBackendmkbi implements GlobalBackendInterface {
         $c = Array(
             PENDING => Array(
                 'normal'   => 0,
+                'downtime' => 0,
             ),
             OK => Array(
                 'normal'   => 0,


=====================================
share/server/core/classes/GlobalMapCfg.php
=====================================
@@ -341,9 +341,17 @@ class GlobalMapCfg {
             if($sFirstChar == '}') {
                 if($obj['type'] === 'global')
                     $id = 0;
-                else
+                else {
                     $id = isset($obj['object_id']) ? $obj['object_id'] : '_'.$iObjId;
 
+                    // In case a numeric object_id is read from the config,
+                    // normalize it to the "_[id]" format (which get's replaced
+                    // later in verifyObjectIds)
+                    if (is_numeric($obj['object_id'])) {
+                        $id = '_'.$obj['object_id'];
+                    }
+                }
+
                 // It might happen that there is a duplicate object on the map
                 // This generates a new object_id for the later objects
                 if(isset($this->mapConfig[$id])) {


=====================================
share/server/core/defines/global.php
=====================================
@@ -23,7 +23,7 @@
  *****************************************************************************/
  
 // NagVis Version
-define('CONST_VERSION', '1.9.23');
+define('CONST_VERSION', '1.9.24');
 
 // Set PHP error handling to standard level
 // Different levels for php versions below 5.1 because PHP 5.1 reports



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/-/commit/6db30af2fef626c45c9ad0dc9d37fc3b8f7d7efc

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/-/commit/6db30af2fef626c45c9ad0dc9d37fc3b8f7d7efc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20210202/f2864417/attachment-0001.html>