[pkg-nagios-changes] [Git][nagios-team/nagvis][master] 5 commits: New upstream version 1.9.41

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / nagvis


Commits:
8ce4662d by Bas Couwenberg at 2024-07-08T20:44:01+02:00
New upstream version 1.9.41
- - - - -
5e0e8420 by Bas Couwenberg at 2024-07-08T20:44:06+02:00
Update upstream source from tag 'upstream/1.9.41'

Update to upstream version '1.9.41'
with Debian dir 615a6cad44da7df67b5d7fa31bdfe8673c7b503c
- - - - -
2c943e09 by Bas Couwenberg at 2024-07-08T20:44:22+02:00
New upstream release.

- - - - -
271e550b by Bas Couwenberg at 2024-07-08T20:45:01+02:00
Refresh patches.

- - - - -
d8658554 by Bas Couwenberg at 2024-07-08T20:45:11+02:00
Set distribution to unstable.

- - - - -


8 changed files:

- ChangeLog
- debian/changelog
- debian/patches/config.patch
- share/frontend/nagvis-js/classes/ViewError.php
- share/server/core/classes/CoreModMultisite.php
- share/server/core/classes/GlobalMainCfg.php
- share/server/core/defines/global.php
- share/server/core/mapcfg/default.php


Changes:

=====================================
ChangeLog
=====================================
@@ -1,3 +1,9 @@
+1.9.41
+Frontend:
+  * FIX: Fix PHP 5.4 compatibility issue (syntax error, unexpected 'list')
+  * Added option "line_width" to default section of global config
+  * FIX: Fix failing reporting of errors when messages contained special characters
+
 1.9.40
 Core:
   * FIX: Fix PHP 5.4 and 5.5 compatibility issue (Fatal error: Arrays are not allowed in class constants)


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+nagvis (1:1.9.41-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Refresh patches.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 08 Jul 2024 20:45:03 +0200
+
 nagvis (1:1.9.40-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/config.patch
=====================================
@@ -6,7 +6,7 @@ Reviewed-by: Markus Frosch <markus at lazyfrosch.de>
 
 --- a/share/server/core/classes/GlobalMainCfg.php
 +++ b/share/server/core/classes/GlobalMainCfg.php
-@@ -1633,11 +1633,11 @@ class GlobalMainCfg {
+@@ -1639,11 +1639,11 @@ class GlobalMainCfg {
       * @author 	Lars Michelsen <lm at larsmichelsen.com>
       */
      private function setPathsByBase($base, $htmlBase) {


=====================================
share/frontend/nagvis-js/classes/ViewError.php
=====================================
@@ -35,8 +35,8 @@ class ViewError {
         js('frontendMessage({'.N
           .'    "type"    : "error",'.N
           .'    "closable": false,'.N
-          .'    "title"   : "'.l('Error').'",'.N
-          .'    "message" : "'.htmlentities($e->getMessage(), ENT_COMPAT, 'UTF-8').'"'.N
+          .'    "title"   : '.json_encode(l('Error')).','.N
+          .'    "message" : '.json_encode(htmlentities($e->getMessage(), ENT_COMPAT, 'UTF-8')).N
           .'});');
         echo '</div>';
 


=====================================
share/server/core/classes/CoreModMultisite.php
=====================================
@@ -223,7 +223,9 @@ class CoreModMultisite extends CoreModule {
         $_BACKEND->execute();
 
         $aMaps = Array();
-        foreach($aObjs AS list($MAP, $state)) {
+        foreach($aObjs AS $aObj) {
+            $MAP = $aObj[0];
+            $state = $aObj[1];
             if ($state !== null) {
                 $MAP->clearMembers();
                 $MAP->setState($state);


=====================================
share/server/core/classes/GlobalMainCfg.php
=====================================
@@ -694,6 +694,12 @@ class GlobalMainCfg {
                     'default'    => '10:#8c00ff,25:#2020ff,40:#00c0ff,55:#00f000,70:#f0f000,85:#ffc000,100:#ff0000',
                     'match'      => MATCH_WEATHER_COLORS,
                 ),
+                'line_width' => Array(
+                    'must'       => 0,
+                    'editable'   => 1,
+                    'default'    => 3,
+                    'match'      => MATCH_INTEGER,
+                ),
                 'zoombar' => Array(
                     'must'          => 0,
                     'editable'      => 1,


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


=====================================
share/server/core/mapcfg/default.php
=====================================
@@ -565,10 +565,10 @@ $mapConfigVars = Array(
         'depends_value' => 'line',
     ),
     'line_width' => Array(
-        'must' => 0,
-        'default' => '3',
-        'match' => MATCH_INTEGER,
-        'depends_on' => 'view_type',
+        'must'          => 0,
+        'default'       => cfg('defaults', 'line_width'),
+        'match'         => MATCH_INTEGER,
+        'depends_on'    => 'view_type',
         'depends_value' => 'line'),
     'line_weather_colors' => Array(
         'must'          => 0,



View it on GitLab: https://salsa.debian.org/nagios-team/nagvis/-/compare/787ffb34169ea6ab481869f0eeaf8a071a96239c...d8658554ce14bdd1a28db904304201fd57cd0364

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/nagios-team/nagvis/-/compare/787ffb34169ea6ab481869f0eeaf8a071a96239c...d8658554ce14bdd1a28db904304201fd57cd0364
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/20240708/236dd8a2/attachment-0001.htm>