Update to Observium CE 21.10.1

VERSION

@@ -1 +1 @@
-Observium CE 21.10
+Observium CE 21.10.1

html/includes/contacts-navbar.inc.php

@@ -92,7 +92,9 @@
                                       'offset'      => TRUE,
                                       'html'        => '<a id="contact_' . $transport . '_doc" href="' . $docs_link . '" target="_blank">See documentation for this Transport (new page)</a>');
     }
-    asort($form_params['method']);
+    if (is_array($form_params['method'])) {
+      asort($form_params['method']);
+    }
     $form['row'][$row_tmp]['contact_method']['values'] = $form_params['method'];
 
     $form['row'][++$row]['contact_descr'] = array(

html/includes/entities/counter.inc.php

@@ -540,15 +540,14 @@ function print_counter_form($vars, $single_device = FALSE)
   }
 
   $counter_permitted = generate_query_permitted(array('device', 'counter'));
-  foreach (['counter_class' => 'Counter Class', 'counter_event' => 'Counter Event'] as $param => $param_name)
-  {
+  foreach ([ 'counter_class' => 'Counter Class', 'counter_event' => 'Counter Event' ] as $param => $param_name) {
     $sql = 'SELECT DISTINCT `'.$param.'` FROM `counters` WHERE `counter_deleted` = ?' . $counter_permitted;
-    $entries = dbFetchColumn($sql, [0]);
-    asort($entries);
-    foreach ($entries as $entry)
-    {
-      if ($entry == '') { $entry = OBS_VAR_UNSET; }
-      if ($param == 'counter_class')
+    if ($entries = dbFetchColumn($sql, [ 0 ])) {
+      asort($entries);
+    }
+    foreach ($entries as $entry) {
+      if (safe_empty($entry)) { $entry = OBS_VAR_UNSET; }
+      if ($param === 'counter_class')
       {
         $name = nicecase($entry);
         if (isset($config['counter_types'][$entry]['icon']))

html/includes/entities/printersupply.inc.php

@@ -244,14 +244,13 @@ function print_printersupplies_form($vars, $single_device = FALSE)
     'grid'        => 3,
     'value'       => $vars['status_descr']);
 
-  foreach (['supply_colour' => 'Colour', 'supply_type' => 'Type'] as $param => $param_name)
-  {
+  foreach ([ 'supply_colour' => 'Colour', 'supply_type' => 'Type' ] as $param => $param_name) {
     $sql = 'SELECT DISTINCT `'.$param.'` FROM `printersupplies` WHERE 1' . $GLOBALS['cache']['where']['devices_permitted'];
-    $entries = dbFetchColumn($sql);
-    asort($entries);
-    foreach ($entries as $entry)
-    {
-      if ($entry == '') { $entry = OBS_VAR_UNSET; }
+    if ($entries = dbFetchColumn($sql)) {
+      asort($entries);
+    }
+    foreach ($entries as $entry) {
+      if (safe_empty($entry)) { $entry = OBS_VAR_UNSET; }
       $name = nicecase($entry);
       $form_items[$param][$entry] = $name;
     }
@@ -260,7 +259,7 @@ function print_printersupplies_form($vars, $single_device = FALSE)
       'type'        => 'multiselect',
       'name'        => $param_name,
       'width'       => '100%', //'180px',
-      'grid'        => $param == 'supply_colour' ? 1: 2,
+      'grid'        => $param === 'supply_colour' ? 1: 2,
       'value'       => $vars[$param],
       'values'      => $form_items[$param]);
   }

html/includes/entities/sensor.inc.php

@@ -462,16 +462,16 @@ function print_sensor_form($vars, $single_device = FALSE)
   }
 
   $sensor_permitted = generate_query_permitted(array('device', 'sensor'));
-  foreach (['sensor_class' => 'Sensor Class', 'sensor_event' => 'Sensor Event'] as $param => $param_name)
+  foreach ([ 'sensor_class' => 'Sensor Class', 'sensor_event' => 'Sensor Event' ] as $param => $param_name)
   {
     $sql = 'SELECT DISTINCT `'.$param.'` FROM `sensors` WHERE `sensor_deleted` = ?' . $sensor_permitted;
-    $entries = dbFetchColumn($sql, [0]);
-    asort($entries);
+    if ($entries = dbFetchColumn($sql, [ 0 ])) {
+      asort($entries);
+    }
     foreach ($entries as $entry)
     {
-      if ($entry == '') { $entry = OBS_VAR_UNSET; }
-      if ($param == 'sensor_class')
-      {
+      if (safe_empty($entry)) { $entry = OBS_VAR_UNSET; }
+      if ($param === 'sensor_class') {
         $name = nicecase($entry);
         if (isset($config['sensor_types'][$entry]['icon']))
         {

html/includes/entities/status.inc.php

@@ -387,15 +387,14 @@ function print_status_form($vars, $single_device = FALSE)
   }
 
   $status_permitted = generate_query_permitted(array('device', 'status'));
-  foreach (['entPhysicalClass' => 'Physical Class', 'status_event' => 'Status Event', 'status_name' => 'Status'] as $param => $param_name)
-  {
+  foreach ([ 'entPhysicalClass' => 'Physical Class', 'status_event' => 'Status Event', 'status_name' => 'Status' ] as $param => $param_name) {
     $sql = 'SELECT DISTINCT `'.$param.'` FROM `status` WHERE `status_deleted` = ?' . $status_permitted;
-    $entries = dbFetchColumn($sql, [0]);
-    asort($entries);
-    foreach ($entries as $entry)
-    {
-      if ($entry == '') { $entry = OBS_VAR_UNSET; }
-      if ($param == 'entPhysicalClass')
+    if ($entries = dbFetchColumn($sql, [ 0 ])) {
+      asort($entries);
+    }
+    foreach ($entries as $entry) {
+      if (safe_empty($entry)) { $entry = OBS_VAR_UNSET; }
+      if ($param === 'entPhysicalClass')
       {
         $name = nicecase($entry);
         if (isset($config['icon'][strtolower($entry)]))

html/includes/graphs/application/asterisk_activecall.inc.php

@@ -24,7 +24,7 @@
 );
 
 $i = 0;
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/asterisk_peers.inc.php

@@ -22,7 +22,7 @@
                         );
 
 $i = 0;
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_answers.inc.php

@@ -34,7 +34,7 @@
 );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_cache.inc.php

@@ -30,7 +30,7 @@
 }
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_query_in.inc.php

@@ -28,7 +28,7 @@
 }
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_query_out.inc.php

@@ -28,7 +28,7 @@
 }
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_query_rejected.inc.php

@@ -27,7 +27,7 @@
 );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_req_in.inc.php

@@ -26,7 +26,7 @@
                );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_req_proto.inc.php

@@ -33,7 +33,7 @@
 );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_resolv_dnssec.inc.php

@@ -26,7 +26,7 @@
 );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_resolv_errors.inc.php

@@ -31,7 +31,7 @@
 
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_resolv_queries.inc.php

@@ -30,7 +30,7 @@
 );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_resolv_rtt.inc.php

@@ -28,7 +28,7 @@
 );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_updates.inc.php

@@ -29,7 +29,7 @@
 );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/bind_zone_maint.inc.php

@@ -35,7 +35,7 @@
 );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/ceph_iops.inc.php

@@ -25,7 +25,7 @@
 
 $i             = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/ceph_osd.inc.php

@@ -27,7 +27,7 @@
                );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/ceph_speed.inc.php

@@ -15,7 +15,7 @@
 
 $mysql_rrd = get_rrd_path($device, "app-ceph-".$app['app_id'].".rrd");
 
-if (is_file($mysql_rrd))
+if (rrd_is_file($mysql_rrd))
 {
   $rrd_filename = $mysql_rrd;
 }

html/includes/graphs/application/dhcpkit_msgtypes.inc.php

@@ -34,7 +34,7 @@
 );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/dhcpkit_packets.inc.php

@@ -30,7 +30,7 @@
 );
 $i = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   foreach ($array as $ds => $data)
   {

html/includes/graphs/application/dovecot_auth.inc.php

@@ -27,7 +27,7 @@
 $i            = 0;
 $x            = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   $max_colours = safe_count($config['graph_colours'][$colours]);
   foreach ($array as $ds => $data)

html/includes/graphs/application/dovecot_auth_cache.inc.php

@@ -24,7 +24,7 @@
 $i            = 0;
 $x            = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   $max_colours = safe_count($config['graph_colours'][$colours]);
   foreach ($array as $ds => $data)

html/includes/graphs/application/dovecot_cache.inc.php

@@ -24,7 +24,7 @@
 $i            = 0;
 $x            = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   $max_colours = safe_count($config['graph_colours'][$colours]);
   foreach ($array as $ds => $data)

html/includes/graphs/application/dovecot_commands.inc.php

@@ -24,7 +24,7 @@
 $i            = 0;
 $x            = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   $max_colours = safe_count($config['graph_colours'][$colours]);
   foreach ($array as $ds => $data)

html/includes/graphs/application/dovecot_connected.inc.php

@@ -24,7 +24,7 @@
 $i            = 0;
 $x            = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   $max_colours = safe_count($config['graph_colours'][$colours]);
   foreach ($array as $ds => $data)

html/includes/graphs/application/dovecot_cpu.inc.php

@@ -25,7 +25,7 @@
 $i            = 0;
 $x            = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   $max_colours = safe_count($config['graph_colours'][$colours]);
   foreach ($array as $ds => $data)

html/includes/graphs/application/dovecot_io.inc.php

@@ -29,7 +29,7 @@
 $i            = 0;
 $x            = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   $max_colours = safe_count($config['graph_colours'][$colours]);
   foreach ($array as $ds => $data)

html/includes/graphs/application/dovecot_pages.inc.php

@@ -25,7 +25,7 @@
 $i            = 0;
 $x            = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   $max_colours = safe_count($config['graph_colours'][$colours]);
   foreach ($array as $ds => $data)

html/includes/graphs/application/dovecot_storage.inc.php

@@ -27,7 +27,7 @@
 $i            = 0;
 $x            = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   $max_colours = safe_count($config['graph_colours'][$colours]);
   foreach ($array as $ds => $data)

html/includes/graphs/application/dovecot_usage.inc.php

@@ -25,7 +25,7 @@
 $i            = 0;
 $x            = 0;
 
-if (is_file($rrd_filename))
+if (rrd_is_file($rrd_filename))
 {
   $max_colours = safe_count($config['graph_colours'][$colours]);
   foreach ($array as $ds => $data)

html/includes/graphs/application/drbd_disk_bits.inc.php

@@ -17,7 +17,7 @@
 
 $drbd_rrd = get_rrd_path($device, "app-drbd-".$app['app_instance'].".rrd");
 
-if (is_file($drbd_rrd))
+if (rrd_is_file($drbd_rrd))
 {
   $rrd_filename = $drbd_rrd;
 }